#966 Prevent duplication of attachments when the form gets reloaded.

SVN:2.0[3295]

application/applicationextension.inc.php

@@ -17,248 +17,34 @@
 //   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) 
+ * Class iPlugin
+ * Management of application plugin 
  *
- * @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 = '');
+	public function OnFormCancel($sTempId); // temp id is made of session_id and transaction_id, it identifies the object in a unique way
 
-	/**
-	 *	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);
 }
 
@@ -268,102 +54,46 @@ interface iApplicationObjectExtension
  * 
  * 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;
+	// Possible types of menu into which new items can be added
+	const MENU_OBJLIST_ACTIONS = 1; 	// $param is a DBObjectSet containing the list of objects
+	const MENU_OBJLIST_TOOLKIT = 2;		// $param is a DBObjectSet containing the list of objects
+	const MENU_OBJDETAILS_ACTIONS = 3;	// $param is a DBObject instance: the object currently displayed
+	const MENU_DASHBOARD_ACTIONS = 4;	// $param is a Dashboard instance: the dashboard currently displayed
+	const MENU_USER_ACTIONS = 5;		// $param is a null ??
 
 	/**
-	 * 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
+	 * Get the list of items to be added to a 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 above
 	 * @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
+	 * @return Array 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
+ * Each menu items is defined by an instance of an object derived from the class
+ * ApplicationPopupMenu below
+ *
  */
 abstract class ApplicationPopupMenuItem
 {
-	/** @ignore */
 	protected $sUID;
-	/** @ignore */
 	protected $sLabel;
 	
-	/**
-	 *	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)
-	 */	
 	public function __construct($sUID, $sLabel)
 	{
 		$this->sUID = $sUID;
 		$this->sLabel = $sLabel;
 	}
 	
-	/**
-	 *	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;
@@ -372,11 +102,9 @@ abstract class ApplicationPopupMenuItem
 	/**
 	 * 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();
@@ -385,21 +113,14 @@ abstract class ApplicationPopupMenuItem
 
 /**
  * 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
-	 * 	 
+	 * Class for adding an item that browses to the given URL
 	 * @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
@@ -412,7 +133,6 @@ class URLPopupMenuItem extends ApplicationPopupMenuItem
 		$this->sTarget = $sTarget;
 	}
 	
-	/** @ignore */
 	public function GetMenuItem()
 	{
 		return array ('label' => $this->GetLabel(), 'url' => $this->sURL, 'target' => $this->sTarget);	
@@ -421,16 +141,10 @@ class URLPopupMenuItem extends ApplicationPopupMenuItem
 
 /**
  * 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;
 	
 	/**
@@ -447,13 +161,11 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 		$this->aIncludeJSFiles = $aIncludeJSFiles;
 	}
 	
-	/** @ignore */
 	public function GetMenuItem()
 	{
 		return array ('label' => $this->GetLabel(), 'onclick' => $this->sJSCode, 'url' => '#');
 	}
 	
-	/** @ignore */
 	public function GetLinkedScripts()
 	{
 		return $this->aIncludeJSFiles;
@@ -463,23 +175,17 @@ class JSPopupMenuItem extends ApplicationPopupMenuItem
 /**
  * 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	
+	 * Class for inserting a separator into a popup menu
 	 */
 	public function __construct()
 	{
-		parent::__construct('_separator_'.(self::$idx++), '');
+		parent::__construct('', '');
 	}
 	
-	/** @ignore */
 	public function GetMenuItem()
 	{
 		return array ('label' => '<hr class="menu-separator">', 'url' => '');
@@ -488,40 +194,34 @@ class SeparatorPopupMenuItem extends ApplicationPopupMenuItem
 
 /**
  * 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
+ * - 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
+ * - 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.
+ * - 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.
+	 * @param WebPage $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.
+	 * @param WebPage $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.
+	 * @param WebPage $oPage The page to insert stuff into.
 	 * @return string The HTML content to add into the page
 	 */
 	public function GetBannerHtml(iTopWebPage $oPage);

application/cmdbabstract.class.inc.php

@@ -80,7 +80,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 {
 	protected $m_iFormId; // The ID of the form used to edit the object (when in edition mode !)
 	static $iGlobalFormId = 1;
-	protected $aFieldsMap;
 
 	/**
 	 * returns what will be the next ID for the forms
@@ -290,16 +289,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 
 		return $aFieldsMap;
 	}
-	
-	/**
-	 * Add a field to the map: attcode => id used when building a form
-	 * @param string $sAttCode The attribute code of the field being edited
-	 * @param string $sInputId The unique ID of the control/widget in the page
-	 */
-	protected function AddToFieldsMap($sAttCode, $sInputId)
-	{
-		$this->aFieldsMap[$sAttCode] = $sInputId;
-	}
 
 	function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
 	{
@@ -356,7 +345,7 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 				$sDisplayValue = ''; // not used
 				$aArgs = array('this' => $this);
 				$sHTMLValue = "<span id=\"field_{$sInputId}\">".self::GetFormElementForField($oPage, $sClass, $sAttCode, $oAttDef, $oValue, $sDisplayValue, $sInputId, '', $iFlags, $aArgs).'</span>';
-				$this->AddToFieldsMap($sAttCode,  $sInputId);
+				$aFieldsMap[$sAttCode] = $sInputId;
 				$oPage->add($sHTMLValue);
 			}
 			else
@@ -1611,10 +1600,10 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 				$oPage->add_ready_script("$('#{$iId}_m').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$iId'); });");
 				$oPage->add_ready_script("$('#{$iId}_s').bind('keyup change', function(evt, sFormId) { return UpdateDuration('$iId'); });");
 				$aVal = AttributeDuration::SplitDuration($value);
-				$sDays = "<input title=\"$sHelpText\" type=\"text\" style=\"text-align:right\" size=\"3\" name=\"attr_{$sFieldPrefix}{$sAttCode}[d]{$sNameSuffix}\" value=\"{$aVal['days']}\" id=\"{$iId}_d\"/>";
-				$sHours = "<input title=\"$sHelpText\" type=\"text\" style=\"text-align:right\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[h]{$sNameSuffix}\" value=\"{$aVal['hours']}\" id=\"{$iId}_h\"/>";
-				$sMinutes = "<input title=\"$sHelpText\" type=\"text\" style=\"text-align:right\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[m]{$sNameSuffix}\" value=\"{$aVal['minutes']}\" id=\"{$iId}_m\"/>";
-				$sSeconds = "<input title=\"$sHelpText\" type=\"text\" style=\"text-align:right\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[s]{$sNameSuffix}\" value=\"{$aVal['seconds']}\" id=\"{$iId}_s\"/>";
+				$sDays = "<input title=\"$sHelpText\" type=\"text\" size=\"3\" name=\"attr_{$sFieldPrefix}{$sAttCode}[d]{$sNameSuffix}\" value=\"{$aVal['days']}\" id=\"{$iId}_d\"/>";
+				$sHours = "<input title=\"$sHelpText\" type=\"text\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[h]{$sNameSuffix}\" value=\"{$aVal['hours']}\" id=\"{$iId}_h\"/>";
+				$sMinutes = "<input title=\"$sHelpText\" type=\"text\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[m]{$sNameSuffix}\" value=\"{$aVal['minutes']}\" id=\"{$iId}_m\"/>";
+				$sSeconds = "<input title=\"$sHelpText\" type=\"text\" size=\"2\" name=\"attr_{$sFieldPrefix}{$sAttCode}[s]{$sNameSuffix}\" value=\"{$aVal['seconds']}\" id=\"{$iId}_s\"/>";
 				$sHidden = "<input type=\"hidden\" id=\"{$iId}\" value=\"".htmlentities($value, ENT_QUOTES, 'UTF-8')."\"/>";
 				$sHTMLValue = Dict::Format('UI:DurationForm_Days_Hours_Minutes_Seconds', $sDays, $sHours, $sMinutes, $sSeconds).$sHidden."&nbsp;".$sValidationField;
 				$oPage->add_ready_script("$('#{$iId}').bind('update', function(evt, sFormId) { return ToggleDurationField('$iId'); });");				
@@ -1830,7 +1819,6 @@ abstract class cmdbAbstractObject extends CMDBObject implements iDisplay
 	public function DisplayModifyForm(WebPage $oPage, $aExtraParams = array())
 	{
 		self::$iGlobalFormId++;
-		$this->aFieldsMap = array();
 		$sPrefix = '';
 		if (isset($aExtraParams['formPrefix']))
 		{
@@ -1975,8 +1963,7 @@ EOF
 		// Now display the relations, one tab per relation
 		if (!isset($aExtraParams['noRelations']))
 		{
-			$this->DisplayBareRelations($oPage, true); // Edit mode, will fill $this->aFieldsMap
-			$aFieldsMap = array_merge($aFieldsMap, $this->aFieldsMap);
+			$this->DisplayBareRelations($oPage, true); // Edit mode
 		}
 
 		$oPage->SetCurrentTab('');

application/dashlet.class.inc.php

@@ -458,7 +458,7 @@ abstract class DashletGroupBy extends Dashlet
 
 				case 'month':
 					$sGroupByLabel = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Month', $sAttLabel);
-					$sGroupByExpr = "DATE_FORMAT($sClassAlias.$sAttCode, '%Y-%m')"; // yyyy-mm
+					$sGroupByExpr = "DATE_FORMAT($sClassAlias.$sAttCode, '%m')"; // 0 -> 31
 					break;
 
 				case 'day_of_week':
@@ -468,7 +468,7 @@ abstract class DashletGroupBy extends Dashlet
 
 				case 'day_of_month':
 					$sGroupByLabel = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:DayOfMonth', $sAttLabel);
-					$sGroupByExpr = "DATE_FORMAT($sClassAlias.$sAttCode, '%Y-%m-%d')"; // mm-dd
+					$sGroupByExpr = "DATE_FORMAT($sClassAlias.$sAttCode, '%e')"; // 0 -> 31
 					break;
 
 				default:

application/displayblock.class.inc.php

@@ -78,14 +78,7 @@ class DisplayBlock
 			$aKeys[] = $oObject->GetKey();	
 		}
 		$oSet->Rewind();
-		if (count($aKeys) > 0)
-		{
-			$oDummyFilter->AddCondition('id', $aKeys, 'IN');
-		}
-		else
-		{
-			$oDummyFilter->AddCondition('id', 0, '=');
-		}
+		$oDummyFilter->AddCondition('id', $aKeys, 'IN');
 		$oBlock = new DisplayBlock($oDummyFilter, $sStyle, false, $aParams); // DisplayBlocks built this way are synchronous
 		return $oBlock;
 	}

application/itopwebpage.class.inc.php

@@ -82,7 +82,6 @@ class iTopWebPage extends NiceWebPage
 		
 		$sSearchAny = addslashes(Dict::S('UI:SearchValue:Any'));
 		$sSearchNbSelected = addslashes(Dict::S('UI:SearchValue:NbSelected'));
-		$this->add_dict_entry('UI:FillAllMandatoryFields');
 		
 		$bForceMenuPane = utils::ReadParam('force_menu_pane', null);
 		$sInitClosed = '';
@@ -141,7 +140,6 @@ class iTopWebPage extends NiceWebPage
 				
 					}
 		});
-		window.clearTimeout(iPaneVisWatchDog);
 		myLayout.addPinBtn( "#tPinMenu", "west" );
 		//myLayout.open( "west" );
 		$('.ui-layout-resizer-west .ui-layout-toggler').css({background: 'transparent'});
@@ -392,11 +390,6 @@ EOF
 			
 		});
 
-		
-		function FixPaneVis()
-		{
-			$('.ui-layout-center, .ui-layout-north, .ui-layout-south').css({display: 'block'});
-		}
 EOF
 		);
 	}
@@ -553,7 +546,6 @@ EOF
 
 		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
@@ -568,7 +560,7 @@ EOF
 					}
 					$sHtml .= "<script type=\"text/javascript\" src=\"$s_script\"></script>\n";
 			}
-			$this->add_script("var iPaneVisWatchDog  = window.setTimeout('FixPaneVis()',5000);\n\$(document).ready(function() {\n{$this->m_sInitScript};\nwindow.setTimeout('onDelayedReady()',10)\n});");
+			$this->add_script("\$(document).ready(function() {\n{$this->m_sInitScript};\nwindow.setTimeout('onDelayedReady()',10)\n});");
 			if (count($this->m_aReadyScripts)>0)
 			{
 				$this->add_script("\nonDelayedReady = function() {\n".implode("\n", $this->m_aReadyScripts)."\n}\n");
@@ -582,6 +574,7 @@ EOF
 				}
 				$sHtml .= "</script>\n";
 			}
+			$this->output_dict_entries();
 		}
 	
 		if (count($this->a_styles)>0)

application/loginwebpage.class.inc.php

@@ -148,26 +148,6 @@ EOF
 			$this->add("<tr><td colspan=\"2\" class=\"center v-spacer\"> <input type=\"submit\" value=\"".Dict::S('UI:Button:Login')."\" /></td></tr>\n");
 			$this->add("</table>\n");
 			$this->add("<input type=\"hidden\" name=\"loginop\" value=\"login\" />\n");
-						
-			// 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");
@@ -240,9 +220,20 @@ EOF
 		return MetaModel::GetConfig()->GetSecureConnectionRequired();
 	}
 
+	static function IsConnectionSecure()
+	{
+		$bSecured = false;
+
+		if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off'))
+		{
+			$bSecured = true;
+		}
+		return $bSecured;
+	}
+	
 	protected static function Login()
 	{
-		if (self::SecureConnectionRequired() && !utils::IsConnectionSecure())
+		if (self::SecureConnectionRequired() && !self::IsConnectionSecure())
 		{
 			// Non secured URL... request for a secure connection
 			throw new Exception('Secure connection required!');			
@@ -436,7 +427,6 @@ EOF
 				$oPage = new LoginWebPage();
 				$oPage->DisplayChangePwdForm(true); // old pwd was wrong
 				$oPage->output();
-				exit;
 			}
 			$sMessage = Dict::S('UI:Login:PasswordChanged');
 		}

application/portalwebpage.class.inc.php

@@ -138,17 +138,6 @@ try
 			changeMonth: true,
 			changeYear: true
 		});
-
-	$(".datetime-pick").datepicker({
-		showOn: 'button',
-		buttonImage: '../images/calendar.png',
-		buttonImageOnly: true,
-		dateFormat: 'yy-mm-dd 00:00:00',
-		constrainInput: false,
-		changeMonth: true,
-		changeYear: true
-		});
-
 	//$('.resizable').resizable(); // Make resizable everything that claims to be resizable !
 	$('.caselog_header').click( function () { $(this).toggleClass('open').next('.caselog_entry').toggle(); });
 }

application/query.class.inc.php

@@ -47,7 +47,7 @@ abstract class Query extends cmdbAbstractObject
 		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())));
+		MetaModel::Init_AddAttribute(new AttributeString("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
@@ -88,7 +88,7 @@ class QueryOQL extends Query
 
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
-		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
 		
 		if (!$bEditMode)
 		{
@@ -102,7 +102,6 @@ class QueryOQL extends Query
 			}
 			$oPage->p(Dict::S('UI:Query:UrlForExcel').':<br/><textarea cols="80" rows="3" READONLY>'.$sUrl.'</textarea>');		
 		}
-		return $aFieldsMap;
 	}
 }
 

application/shortcut.class.inc.php

@@ -142,7 +142,6 @@ EOF
 
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
-		return array();
 	}
 	// End of the minimal implementation of iDisplay
 }

application/ui.linkswidget.class.inc.php

@@ -106,7 +106,7 @@ class UILinksWidget
 		$sPrefix = "$this->m_sAttCode{$this->m_sNameSuffix}";
 		$aRow = array();
 		$aFieldsMap = array();
-		if(is_object($linkObjOrId) && (!$linkObjOrId->IsNew()))
+		if(is_object($linkObjOrId))
 		{
 			$key = $linkObjOrId->GetKey();
 			$iRemoteObjKey =  $linkObjOrId->Get($this->m_sExtKeyToRemote);
@@ -130,24 +130,12 @@ class UILinksWidget
 		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);
-				$oRemoteObj = MetaModel::GetObject($this->m_sRemoteClass, $iRemoteObjKey);
-				$oNewLinkObj->Set($this->m_sExtKeyToMe, $oCurrentObj); // Setting the extkey with the object also fills the related external fields
-				$linkObjOrId = -$iRemoteObjKey;
-			}
-			else
-			{
-				$iRemoteObjKey = -$linkObjOrId;
-				$oNewLinkObj = MetaModel::NewObject($this->m_sLinkedClass);
-				$oRemoteObj = MetaModel::GetObject($this->m_sRemoteClass, -$linkObjOrId);
-				$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 .= "[$linkObjOrId][";
+			$iRemoteObjKey = -$linkObjOrId;
+			$oNewLinkObj = MetaModel::NewObject($this->m_sLinkedClass);
+			$oRemoteObj = MetaModel::GetObject($this->m_sRemoteClass, -$linkObjOrId);
+			$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
 			$sNameSuffix = "]"; // To make a tabular form
 			$aArgs['prefix'] = $sPrefix;
 			$aArgs['wizHelper'] = "oWizardHelper{$this->m_iInputId}_".(-$linkObjOrId);
@@ -287,7 +275,6 @@ EOF
 		$sHtmlValue = '';
 		$sTargetClass = self::GetTargetClass($this->m_sClass, $this->m_sAttCode);
 		$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();
 		while($oCurrentLink = $oValue->Fetch())
@@ -297,7 +284,7 @@ EOF
 			if ($oCurrentLink->IsNew())
 			{
 				$key = -$oLinkedObj->GetKey();
-				$aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $oCurrentLink, $aArgs, $oCurrentObj);
+				$aForm[$key] = $this->GetFormRow($oPage, $oLinkedObj, $key, $aArgs, $oCurrentObj);
 			}
 			else
 			{
@@ -310,9 +297,8 @@ EOF
 		$sDuplicates = ($this->m_bDuplicatesAllowed) ? '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}');
+		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);
 		oWidget{$this->m_iInputId}.Init();
-		$('#{$this->m_iInputId}').bind('update_value', function() { $(this).val(oWidget{$this->m_iInputId}.GetUpdatedValue()); })
 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();\" >";

application/utils.inc.php

@@ -508,7 +508,7 @@ class utils
 	{
 		// Build an absolute URL to this page on this server/port
 		$sServerName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
-		$sProtocol = self::IsConnectionSecure() ? 'https' : 'http';
+		$sProtocol = (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!="off")) ? 'https' : 'http';
 		$iPort = isset($_SERVER['SERVER_PORT']) ? $_SERVER['SERVER_PORT'] : 80;
 		if ($sProtocol == 'http')
 		{
@@ -571,25 +571,6 @@ class utils
 		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:

application/webpage.class.inc.php

@@ -651,7 +651,6 @@ class WebPage implements Page
 		{
 			$sClass = isset($aAction['class']) ? " class=\"{$aAction['class']}\"" : "";
 			$sOnClick = isset($aAction['onclick']) ? " onclick=\"{$aAction['onclick']}\"" : "";
-			$sTarget = isset($aAction['target']) ? " target=\"{$aAction['target']}\"" : "";
 			if (empty($aAction['url']))
 			{
 				if ($sPrevUrl != '') // Don't output consecutively two separators...
@@ -662,52 +661,41 @@ class WebPage implements Page
 			}
 			else
 			{
-				$sHtml .= "<li><a $sTarget href=\"{$aAction['url']}\"$sClass $sOnClick>{$aAction['label']}</a></li>";
+				$sHtml .= "<li><a 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>";			
+			$sHtml .= "<div class=\"actions_button\"><a href='{$aAction['url']}'>{$aAction['label']}</a></div>";			
 		}
 		
 		return $sHtml;
 	}
 
-	protected function output_dict_entries($bReturnOutput = false)
+	protected function output_dict_entries()
 	{
-		$sHtml = '';
 		if (count($this->a_dict_entries)>0)
 		{
-			$sHtml .= "<script type=\"text/javascript\">\n";
-			$sHtml .= "var Dict = {};\n";
-			$sHtml .= "Dict._entries = {};\n";
-			$sHtml .= "Dict.S = function(sEntry) {\n";
-			$sHtml .= "   if (sEntry in Dict._entries)\n";
-			$sHtml .= "   {\n";
-			$sHtml .= "      return Dict._entries[sEntry];\n";
-			$sHtml .= "   }\n";
-			$sHtml .= "   else\n";
-			$sHtml .= "   {\n";
-			$sHtml .= "      return sEntry;\n";
-			$sHtml .= "   }\n";
-			$sHtml .= "};\n";
+			echo "<script type=\"text/javascript\">\n";
+			echo "var Dict = {};\n";
+			echo "Dict._entries = {};\n";
+			echo "Dict.S = function(sEntry) {\n";
+			echo "   if (sEntry in Dict._entries)\n";
+			echo "   {\n";
+			echo "      return Dict._entries[sEntry];\n";
+			echo "   }\n";
+			echo "   else\n";
+			echo "   {\n";
+			echo "      return sEntry;\n";
+			echo "   }\n";
+			echo "};\n";
 			foreach($this->a_dict_entries as $s_entry => $s_value)
 			{
-				$sHtml .= "Dict._entries['$s_entry'] = '".addslashes($s_value)."';\n";
+				echo "Dict._entries['$s_entry'] = '".addslashes($s_value)."';\n";
 			}
-			$sHtml .= "</script>\n";
-		}
-		
-		if ($bReturnOutput)
-		{
-			return $sHtml;
-		}
-		else
-		{
-			echo $sHtml;
+			echo "</script>\n";
 		}
 	}
 }

core/attributedef.class.inc.php

@@ -1693,6 +1693,12 @@ class AttributeEncryptedString extends AttributeString
 // Example: [[Server:db1.tnut.com]]
 define('WIKI_OBJECT_REGEXP', '/\[\[(.+):(.+)\]\]/U');
 
+// <url>
+// Example: http://romain:trustno1@127.0.0.1:8888/iTop-trunk/modules/itop-caches/itop-caches.php?agument=machin%20#monAncre
+define('WIKI_URL', "/(https?|ftp)\:\/\/([a-z0-9+!*(),;?&=\$_.-]+(\:[a-z0-9+!*(),;?&=\$_.-]+)?@)?([a-z0-9-.]{3,})(\:[0-9]{2,5})?(\/([a-z0-9+\$_-]\.?)+)*\/?(\?[a-z+&\$_.-][a-z0-9;:@&%=+\/\$_.-]*)?(#[a-z_.-][a-z0-9+\$_.-]*)?/i");
+//                   SHEME............. USER.................... PASSWORD...................... HOST/IP......... PORT.......... PATH...................... GET................................... ANCHOR....................
+// Origin of this regexp: http://www.php.net/manual/fr/function.preg-match.php#93824
+
 
 /**
  * Map a text column (size > ?) to an attribute 
@@ -1713,8 +1719,7 @@ class AttributeText extends AttributeString
 
 	static public function RenderWikiHtml($sText)
 	{
-		$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 ! */))
+		if (preg_match_all(WIKI_URL, $sText, $aAllMatches, PREG_SET_ORDER /* important !*/ |PREG_OFFSET_CAPTURE /* important ! */))
 		{
 			$aUrls = array();
 			$i = count($aAllMatches);
@@ -2644,6 +2649,10 @@ class AttributeDuration extends AttributeInteger
 	protected function GetSQLCol() {return "INT(11) UNSIGNED";}
 
 	public function GetNullValue() {return '0';}
+	public function GetDefaultValue()
+	{
+		return 0;
+	}
 
 	public function MakeRealValue($proposedValue, $oHostObj)
 	{
@@ -3294,17 +3303,17 @@ class AttributeURL extends AttributeString
 		$sTarget = $this->Get("target");
 		if (empty($sTarget)) $sTarget = "_blank";
 		$sLabel = Str::pure2html($sValue);
-		if (strlen($sLabel) > 255)
+		if (strlen($sLabel) > 40)
 		{
-			// Truncate the length to 128 characters, by removing the middle
-			$sLabel = substr($sLabel, 0, 100).'.....'.substr($sLabel, -20);
+			// Truncate the length to about 40 characters, by removing the middle
+			$sLabel = substr($sLabel, 0, 25).'...'.substr($sLabel, -15);
 		}
 		return "<a target=\"$sTarget\" href=\"$sValue\">$sLabel</a>";
 	}
 
 	public function GetValidationPattern()
 	{
-		return $this->GetOptional('validation_pattern', '^'.utils::GetConfig()->Get('url_validation_pattern').'$');
+		return "^(http|https|ftp)\://[a-zA-Z0-9\-\.]+(:[a-zA-Z0-9]*)?/?([a-zA-Z0-9\-\._\?\,\'/\\\+&amp;%\$#\=~])*$";
 	}
 }
 
@@ -4464,7 +4473,7 @@ class AttributeComputedFieldVoid extends AttributeDefinition
 	public function GetEditClass() {return "";}
 	
 	public function GetValuesDef() {return null;} 
-	public function GetPrerequisiteAttributes() {return $this->GetOptional("depends_on", array());} 
+	public function GetPrerequisiteAttributes() {return $this->Get("depends_on");} 
 
 	public function IsDirectField() {return true;} 
 	public function IsScalar() {return true;} 

core/backgroundprocess.inc.php

@@ -18,7 +18,7 @@
 
 
 /**
- * interface iBackgroundProcess
+ * Class BackgroundProcess
  * Any extension that must be called regularly to be executed in the background 
  *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL

core/backgroundtask.class.inc.php

@@ -1,76 +0,0 @@
-<?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/>
-
-
-/**
- * Class BackgroundTask
- * A class to record information about the execution of background processes 
- *
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-class BackgroundTask extends DBObject
-{
-	public static function Init()
-	{
-		$aParams = array
-		(
-			"category" => "core/cmdb",
-			"key_type" => "autoincrement",
-			"name_attcode" => "class_name",
-			"state_attcode" => "",
-			"reconc_keys" => array(),
-			"db_table" => "priv_backgroundtask",
-			"db_key_field" => "id",
-			"db_finalclass_field" => "",
-			"display_template" => "",
-		);
-		MetaModel::Init_Params($aParams);
-
-		MetaModel::Init_AddAttribute(new AttributeString("class_name", array("allowed_values"=>null, "sql"=>"class_name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("first_run_date", array("allowed_values"=>null, "sql"=>"first_run_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("latest_run_date", array("allowed_values"=>null, "sql"=>"latest_run_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDateTime("next_run_date", array("allowed_values"=>null, "sql"=>"next_run_date", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
-		
-		MetaModel::Init_AddAttribute(new AttributeInteger("total_exec_count", array("allowed_values"=>null, "sql"=>"total_exec_count", "default_value"=>"0", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDecimal("latest_run_duration", array("allowed_values"=>null, "sql"=>"latest_run_duration", "digits"=> 8, "decimals"=> 3, "default_value"=>"0", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDecimal("min_run_duration", array("allowed_values"=>null, "sql"=>"min_run_duration", "digits"=> 8, "decimals"=> 3, "default_value"=>"0", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDecimal("max_run_duration", array("allowed_values"=>null, "sql"=>"max_run_duration", "digits"=> 8, "decimals"=> 3, "default_value"=>"0", "is_null_allowed"=>true, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeDecimal("average_run_duration", array("allowed_values"=>null, "sql"=>"average_run_duration", "digits"=> 8, "decimals"=> 3, "default_value"=>"0", "is_null_allowed"=>true, "depends_on"=>array())));
-
-		MetaModel::Init_AddAttribute(new AttributeBoolean("running", array("allowed_values"=>null, "sql"=>"running", "default_value"=>false, "is_null_allowed"=>false, "depends_on"=>array())));
-		MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values"=>new ValueSetEnum('active,paused'), "sql"=>"status", "default_value"=>'active', "is_null_allowed"=>false, "depends_on"=>array())));
-	}
-	
-	public function ComputeDurations($fLatestDuration)
-	{
-		$iTotalRun = $this->Get('total_exec_count');
-		$fAverageDuration = ($this->Get('average_run_duration') * $iTotalRun + $fLatestDuration) / (1+$iTotalRun);
-		$this->Set('average_run_duration', sprintf('%.3f',$fAverageDuration));
-		$this->Set('total_exec_count', 1+$iTotalRun);
-		if ($fLatestDuration < $this->Get('min_run_duration'))
-		{
-			$this->Set('min_run_duration', sprintf('%.3f',$fLatestDuration));
-		}
-		if ($fLatestDuration > $this->Get('max_run_duration'))
-		{
-			$this->Set('max_run_duration', sprintf('%.3f',$fLatestDuration));
-		}
-		$this->Set('latest_run_duration', sprintf('%.3f',$fLatestDuration));
-	}
-}

core/bulkchange.class.inc.php

@@ -299,7 +299,7 @@ class BulkChange
 			// 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);
+			$oReconFilter->AddCondition($sForeignAttCode, $value, '=');
 			$aResults[$iCol] = new CellStatus_Void($aRowData[$iCol]);
 		}
 

core/cmdbsource.class.inc.php

@@ -58,29 +58,15 @@ class CMDBSource
 		self::$m_sDBUser = $sUser;
 		self::$m_sDBPwd = $sPwd;
 		self::$m_sDBName = $sSource;
-
-		$aConnectInfo = explode(':', self::$m_sDBHost);
-		if (count($aConnectInfo) > 1)
+		if (!self::$m_resDBLink = @mysqli_connect($sServer, $sUser, $sPwd))
 		{
-			// Override the default port
-			$sServer = $aConnectInfo[0];
-			$iPort = $aConnectInfo[1];
-			self::$m_resDBLink = @mysqli_connect($sServer, self::$m_sDBUser, self::$m_sDBPwd, '', $iPort);
-		}
-		else
-		{
-			self::$m_resDBLink = @mysqli_connect(self::$m_sDBHost, self::$m_sDBUser, self::$m_sDBPwd);
-		}
-
-		if (!self::$m_resDBLink)
-		{
-			throw new MySQLException('Could not connect to the DB server', array('host'=>self::$m_sDBHost, 'user'=>self::$m_sDBUser));
+			throw new MySQLException('Could not connect to the DB server', array('host'=>$sServer, 'user'=>$sUser));
 		}
 		if (!empty($sSource))
 		{
 			if (!((bool)mysqli_query(self::$m_resDBLink, "USE `$sSource`")))
 			{
-				throw new MySQLException('Could not select DB', array('host'=>self::$m_sDBHost, 'user'=>self::$m_sDBUser, 'db_name'=>self::$m_sDBName));
+				throw new MySQLException('Could not select DB', array('host'=>$sServer, 'user'=>$sUser, 'db_name'=>$sSource));
 			}
 		}
 	}

core/config.class.inc.php

@@ -606,17 +606,6 @@ class Config
 			'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,
-		),
 	);
 
 	public function IsProperty($sPropCode)
@@ -758,7 +747,6 @@ class Config
 			'core/action.class.inc.php',
 			'core/trigger.class.inc.php',
 			'synchro/synchrodatasource.class.inc.php',
-			'core/backgroundtask.class.inc.php',
 		);
 		$this->m_aDataModels = array();
 		$this->m_aWebServiceCategories = array(
@@ -1581,6 +1569,10 @@ class Config
 					{
 						$aWebServiceCategories = array_unique(array_merge($aWebServiceCategories, $aModuleInfo['webservice']));
 					}
+					if (isset($aModuleInfo['dictionary']))
+					{
+						$aDictionaries = array_unique(array_merge($aDictionaries, $aModuleInfo['dictionary']));
+					}
 					if (isset($aModuleInfo['settings']))
 					{
 						list($sName, $sVersion) = ModuleDiscovery::GetModuleName($sModuleId);
@@ -1616,17 +1608,6 @@ class Config
 			$this->SetAppModules($aAppModules);
 			$this->SetDataModels($aDataModels);
 			$this->SetWebServiceCategories($aWebServiceCategories);
-
-			// Scan dictionaries
-			//
-			if (!is_null($sModulesDir))
-			{
-				foreach(glob(APPROOT.$sModulesDir.'/dictionaries/*.dict.php') as $sFilePath)
-				{
-					$sFile = basename($sFilePath);
-					$aDictionaries[] = $sModulesDir.'/dictionaries/'.$sFile;
-				}
-			}
 			$this->SetDictionaries($aDictionaries);
 		}
 	}

core/dbobject.class.php

@@ -455,10 +455,7 @@ abstract class DBObject
 					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);
+						$oRemote = MetaModel::GetObject($oExtKeyAttDef->GetTargetClass(), $iRemote);
 					}
 					else
 					{
@@ -512,9 +509,6 @@ abstract class DBObject
 	/**
 	 * 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
 	 */
@@ -525,10 +519,7 @@ abstract class DBObject
 		{
 			$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);
+			$oObj = MetaModel::GetObject($sTargetClass, $objkey);
 			if (is_object($oObj))
 			{
 				$value = $oObj->Get($oAttDef->GetExtAttCode());
@@ -1785,11 +1776,6 @@ abstract class DBObject
 		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;
-		}
 		$aTransitionDef = $aStateTransitions[$sStimulusCode];
 
 		// Change the state before proceeding to the actions, this is necessary because an action might

core/event.class.inc.php

@@ -107,7 +107,7 @@ class Event extends DBObject implements iDisplay
 	
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
-		if ($bEditMode) return array(); // Not editable
+		if ($bEditMode) return; // Not editable
 		
 		$aDetails = array();
 		$sClass = get_class($this);
@@ -118,7 +118,6 @@ class Event extends DBObject implements iDisplay
 			$aDetails[] = array('label' => '<span title="'.MetaModel::GetDescription($sClass, $sAttCode).'">'.MetaModel::GetLabel($sClass, $sAttCode).'</span>', 'value' => $sDisplayValue);
 		}
 		$oPage->Details($aDetails);
-		return array();
 	}
 }
 

core/expression.class.inc.php

@@ -383,7 +383,7 @@ class ScalarExpression extends UnaryExpression
 {
 	public function __construct($value)
 	{
-		if (!is_scalar($value) && !is_null($value) && (!$value instanceof OqlHexValue))
+		if (!is_scalar($value) && !is_null($value))
 		{
 			throw new CoreException('Attempt to create a scalar expression from a non scalar', array('var_type'=>gettype($value)));
 		}
@@ -879,63 +879,31 @@ class FunctionExpression extends Expression
 	 */	
 	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'")
 			{
+				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')
+					);
+				}
 				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);
-			}
 		}
 		return $sRes;
 	}

core/metamodel.class.php

@@ -1967,30 +1967,15 @@ abstract class MetaModel
 	{
 		return array_unique(self::$m_aRootClasses);
 	}
-	public static function EnumParentClasses($sClass, $iOption = ENUM_PARENT_CLASSES_EXCLUDELEAF, $bRootFirst = true)
+	public static function EnumParentClasses($sClass, $iOption = ENUM_PARENT_CLASSES_EXCLUDELEAF)
 	{
 		self::_check_subclass($sClass);	
-		if ($bRootFirst)
+		if ($iOption == ENUM_PARENT_CLASSES_EXCLUDELEAF)
 		{
-			$aRes = self::$m_aParentClasses[$sClass];
-		}
-		else
-		{
-			$aRes = array_reverse(self::$m_aParentClasses[$sClass], true);
-		}
-		if ($iOption != ENUM_PARENT_CLASSES_EXCLUDELEAF)
-		{
-			if ($bRootFirst)
-			{
-				// Leaf class at the end
-				$aRes[] = $sClass;
-			}
-			else
-			{
-				// Leaf class on top
-				array_unshift($aRes, $sClass);
-			}
+			return self::$m_aParentClasses[$sClass];
 		}
+		$aRes = self::$m_aParentClasses[$sClass];
+		$aRes[] = $sClass;
 		return $aRes;
 	}
 	public static function EnumChildClasses($sClass, $iOption = ENUM_CHILD_CLASSES_EXCLUDETOP)

core/oql/oql-lexer.php

@@ -17,7 +17,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-
 /**
  * OQL syntax analyzer, to be used prior to run the lexical analyzer
  *
@@ -120,11 +119,6 @@ class OQLLexerRaw
                 '/\G-/ ',
                 '/\GAND/ ',
                 '/\GOR/ ',
-                '/\G\\|/ ',
-                '/\G&/ ',
-                '/\G\\^/ ',
-                '/\G<</ ',
-                '/\G>>/ ',
                 '/\G,/ ',
                 '/\G\\(/ ',
                 '/\G\\)/ ',
@@ -174,8 +168,7 @@ class OQLLexerRaw
                 '/\GABOVE STRICT/ ',
                 '/\GNOT ABOVE/ ',
                 '/\GNOT ABOVE STRICT/ ',
-                '/\G(0x[0-9a-fA-F]+)/ ',
-                '/\G([0-9]+)/ ',
+                '/\G(0x[0-9a-fA-F]+|[0-9]+)/ ',
                 '/\G\"([^\\\\\"]|\\\\\"|\\\\\\\\)*\"|'.chr(94).chr(39).'([^\\\\'.chr(39).']|\\\\'.chr(39).'|\\\\\\\\)*'.chr(39).'/ ',
                 '/\G([_a-zA-Z][_a-zA-Z0-9]*|`[^`]+`)/ ',
                 '/\G:([_a-zA-Z][_a-zA-Z0-9]*->[_a-zA-Z][_a-zA-Z0-9]*|[_a-zA-Z][_a-zA-Z0-9]*)/ ',
@@ -340,299 +333,269 @@ class OQLLexerRaw
     function yy_r1_13($yy_subpatterns)
     {
 
-	$this->token = OQLParser::BITWISE_OR;
+	$this->token = OQLParser::COMA;
     }
     function yy_r1_14($yy_subpatterns)
     {
 
-	$this->token = OQLParser::BITWISE_AND;
+	$this->token = OQLParser::PAR_OPEN;
     }
     function yy_r1_15($yy_subpatterns)
     {
 
-	$this->token = OQLParser::BITWISE_XOR;
+	$this->token = OQLParser::PAR_CLOSE;
     }
     function yy_r1_16($yy_subpatterns)
     {
 
-	$this->token = OQLParser::BITWISE_LEFT_SHIFT;
+	$this->token = OQLParser::REGEXP;
     }
     function yy_r1_17($yy_subpatterns)
     {
 
-	$this->token = OQLParser::BITWISE_RIGHT_SHIFT;
+	$this->token = OQLParser::EQ;
     }
     function yy_r1_18($yy_subpatterns)
     {
 
-	$this->token = OQLParser::COMA;
+	$this->token = OQLParser::NOT_EQ;
     }
     function yy_r1_19($yy_subpatterns)
     {
 
-	$this->token = OQLParser::PAR_OPEN;
+	$this->token = OQLParser::GT;
     }
     function yy_r1_20($yy_subpatterns)
     {
 
-	$this->token = OQLParser::PAR_CLOSE;
+	$this->token = OQLParser::LT;
     }
     function yy_r1_21($yy_subpatterns)
     {
 
-	$this->token = OQLParser::REGEXP;
+	$this->token = OQLParser::GE;
     }
     function yy_r1_22($yy_subpatterns)
     {
 
-	$this->token = OQLParser::EQ;
+	$this->token = OQLParser::LE;
     }
     function yy_r1_23($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NOT_EQ;
+	$this->token = OQLParser::LIKE;
     }
     function yy_r1_24($yy_subpatterns)
     {
 
-	$this->token = OQLParser::GT;
+	$this->token = OQLParser::NOT_LIKE;
     }
     function yy_r1_25($yy_subpatterns)
     {
 
-	$this->token = OQLParser::LT;
+	$this->token = OQLParser::IN;
     }
     function yy_r1_26($yy_subpatterns)
     {
 
-	$this->token = OQLParser::GE;
+	$this->token = OQLParser::NOT_IN;
     }
     function yy_r1_27($yy_subpatterns)
     {
 
-	$this->token = OQLParser::LE;
+	$this->token = OQLParser::INTERVAL;
     }
     function yy_r1_28($yy_subpatterns)
     {
 
-	$this->token = OQLParser::LIKE;
+	$this->token = OQLParser::F_IF;
     }
     function yy_r1_29($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NOT_LIKE;
+	$this->token = OQLParser::F_ELT;
     }
     function yy_r1_30($yy_subpatterns)
     {
 
-	$this->token = OQLParser::IN;
+	$this->token = OQLParser::F_COALESCE;
     }
     function yy_r1_31($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NOT_IN;
+	$this->token = OQLParser::F_ISNULL;
     }
     function yy_r1_32($yy_subpatterns)
     {
 
-	$this->token = OQLParser::INTERVAL;
+	$this->token = OQLParser::F_CONCAT;
     }
     function yy_r1_33($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_IF;
+	$this->token = OQLParser::F_SUBSTR;
     }
     function yy_r1_34($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_ELT;
+	$this->token = OQLParser::F_TRIM;
     }
     function yy_r1_35($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_COALESCE;
+	$this->token = OQLParser::F_DATE;
     }
     function yy_r1_36($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_ISNULL;
+	$this->token = OQLParser::F_DATE_FORMAT;
     }
     function yy_r1_37($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_CONCAT;
+	$this->token = OQLParser::F_CURRENT_DATE;
     }
     function yy_r1_38($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_SUBSTR;
+	$this->token = OQLParser::F_NOW;
     }
     function yy_r1_39($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_TRIM;
+	$this->token = OQLParser::F_TIME;
     }
     function yy_r1_40($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DATE;
+	$this->token = OQLParser::F_TO_DAYS;
     }
     function yy_r1_41($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DATE_FORMAT;
+	$this->token = OQLParser::F_FROM_DAYS;
     }
     function yy_r1_42($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_CURRENT_DATE;
+	$this->token = OQLParser::F_YEAR;
     }
     function yy_r1_43($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_NOW;
+	$this->token = OQLParser::F_MONTH;
     }
     function yy_r1_44($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_TIME;
+	$this->token = OQLParser::F_DAY;
     }
     function yy_r1_45($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_TO_DAYS;
+	$this->token = OQLParser::F_HOUR;
     }
     function yy_r1_46($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_FROM_DAYS;
+	$this->token = OQLParser::F_MINUTE;
     }
     function yy_r1_47($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_YEAR;
+	$this->token = OQLParser::F_SECOND;
     }
     function yy_r1_48($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_MONTH;
+	$this->token = OQLParser::F_DATE_ADD;
     }
     function yy_r1_49($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DAY;
+	$this->token = OQLParser::F_DATE_SUB;
     }
     function yy_r1_50($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_HOUR;
+	$this->token = OQLParser::F_ROUND;
     }
     function yy_r1_51($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_MINUTE;
+	$this->token = OQLParser::F_FLOOR;
     }
     function yy_r1_52($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_SECOND;
+	$this->token = OQLParser::F_INET_ATON;
     }
     function yy_r1_53($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DATE_ADD;
+	$this->token = OQLParser::F_INET_NTOA;
     }
     function yy_r1_54($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_DATE_SUB;
+	$this->token = OQLParser::BELOW;
     }
     function yy_r1_55($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_ROUND;
+	$this->token = OQLParser::BELOW_STRICT;
     }
     function yy_r1_56($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_FLOOR;
+	$this->token = OQLParser::NOT_BELOW;
     }
     function yy_r1_57($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_INET_ATON;
+	$this->token = OQLParser::NOT_BELOW_STRICT;
     }
     function yy_r1_58($yy_subpatterns)
     {
 
-	$this->token = OQLParser::F_INET_NTOA;
+	$this->token = OQLParser::ABOVE;
     }
     function yy_r1_59($yy_subpatterns)
     {
 
-	$this->token = OQLParser::BELOW;
+	$this->token = OQLParser::ABOVE_STRICT;
     }
     function yy_r1_60($yy_subpatterns)
     {
 
-	$this->token = OQLParser::BELOW_STRICT;
+	$this->token = OQLParser::NOT_ABOVE;
     }
     function yy_r1_61($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NOT_BELOW;
+	$this->token = OQLParser::NOT_ABOVE_STRICT;
     }
     function yy_r1_62($yy_subpatterns)
     {
 
-	$this->token = OQLParser::NOT_BELOW_STRICT;
+	$this->token = OQLParser::NUMVAL;
     }
     function yy_r1_63($yy_subpatterns)
     {
 
-	$this->token = OQLParser::ABOVE;
+	$this->token = OQLParser::STRVAL;
     }
     function yy_r1_64($yy_subpatterns)
     {
 
-	$this->token = OQLParser::ABOVE_STRICT;
+	$this->token = OQLParser::NAME;
     }
     function yy_r1_65($yy_subpatterns)
-    {
-
-	$this->token = OQLParser::NOT_ABOVE;
-    }
-    function yy_r1_66($yy_subpatterns)
-    {
-
-	$this->token = OQLParser::NOT_ABOVE_STRICT;
-    }
-    function yy_r1_67($yy_subpatterns)
-    {
-
-	$this->token = OQLParser::HEXVAL;
-    }
-    function yy_r1_68($yy_subpatterns)
-    {
-
-	$this->token = OQLParser::NUMVAL;
-    }
-    function yy_r1_69($yy_subpatterns)
-    {
-
-	$this->token = OQLParser::STRVAL;
-    }
-    function yy_r1_70($yy_subpatterns)
-    {
-
-	$this->token = OQLParser::NAME;
-    }
-    function yy_r1_71($yy_subpatterns)
     {
 
 	$this->token = OQLParser::VARNAME;
     }
-    function yy_r1_72($yy_subpatterns)
+    function yy_r1_66($yy_subpatterns)
     {
 
 	$this->token = OQLParser::DOT;

core/oql/oql-lexer.plex

@@ -95,11 +95,6 @@ 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     = "!="
@@ -161,11 +156,8 @@ not_above_strict = "NOT ABOVE STRICT"
 //
 // 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]+)/
+// The following seems to work...
+numval     = /(0x[0-9a-fA-F]+|[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]*)/
@@ -212,21 +204,6 @@ 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;
 }
@@ -374,9 +351,6 @@ not_above {
 not_above_strict {
 	$this->token = OQLParser::NOT_ABOVE_STRICT;
 }
-hexval {
-	$this->token = OQLParser::HEXVAL;
-}
 numval {
 	$this->token = OQLParser::NUMVAL;
 }

core/oql/oql-parser.y

@@ -164,23 +164,19 @@ name(A) ::= 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);}
+
+num_value(A) ::= NUMVAL(X). {A=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;}
@@ -194,12 +190,6 @@ 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;}
 

core/oql/oqlquery.class.inc.php

@@ -54,27 +54,6 @@ class OqlName
 	} 
 }
 
-/**
- * 
- * 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;

core/ormstopwatch.class.inc.php

@@ -1,5 +1,5 @@
 <?php
-// Copyright (C) 2010-2012 Combodo SARL
+// Copyright (C) 2010-2013 Combodo SARL
 //
 //   This file is part of iTop.
 //
@@ -162,8 +162,7 @@ class ormStopWatch
 		}
 		else
 		{
-			$iElapsedTemp = ''; //$this->ComputeDuration($oHostObject, $oAttDef, $this->iLastStart, time());
-			$aProperties['Elapsed'] = $this->iTimeSpent.' + '.$iElapsedTemp.' s + <img src="../images/indicator.gif">';
+			$aProperties['Elapsed'] = 'running <img src="../images/indicator.gif">';
 		}
 
 		$aProperties['Started'] = $oAttDef->SecondsToDate($this->iStarted);
@@ -183,7 +182,7 @@ class ormStopWatch
 			}
 			$aProperties[$iPercent.'%'] = $sThresholdDesc;
 		}
-		$sRes = "<TABLE class=\"listResults\">";
+		$sRes = "<TABLE>";
 		$sRes .= "<TBODY>";
 		foreach ($aProperties as $sProperty => $sValue)
 		{
@@ -387,9 +386,9 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 
 	public function Process($iTimeLimit)
 	{
+		$aList = array();
 		foreach (MetaModel::GetClasses() as $sClass)
 		{
-			$aList = array();
 			foreach (MetaModel::ListAttributeDefs($sClass) as $sAttCode => $oAttDef)
 			{
 				if ($oAttDef instanceof AttributeStopWatch)
@@ -398,8 +397,8 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 					{
 						$iPercent = $aThresholdData['percent']; // could be different than the index !
 		
-						$sExpression = "SELECT $sClass WHERE {$sAttCode}_laststart AND {$sAttCode}_{$iThreshold}_triggered = 0 AND {$sAttCode}_{$iThreshold}_deadline < NOW()";
-						//echo $sExpression."<br/>\n";
+						$sNow = date('Y-m-d H:i:s');
+						$sExpression = "SELECT $sClass WHERE {$sAttCode}_laststart AND {$sAttCode}_{$iThreshold}_triggered = 0 AND {$sAttCode}_{$iThreshold}_deadline < '$sNow'";
 						$oFilter = DBObjectSearch::FromOQL($sExpression);
 						$oSet = new DBObjectSet($oFilter);
 						while ((time() < $iTimeLimit) && ($oObj = $oSet->Fetch()))
@@ -407,7 +406,6 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							$sClass = get_class($oObj);
 
 							$aList[] = $sClass.'::'.$oObj->GetKey().' '.$sAttCode.' '.$iThreshold;
-							//echo $sClass.'::'.$oObj->GetKey().' '.$sAttCode.' '.$iThreshold."\n";
 
 							// Execute planned actions
 							//
@@ -416,7 +414,6 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 								$sVerb = $aActionData['verb'];
 								$aParams = $aActionData['params'];
 								$sParams = implode(', ', $aParams);
-								//echo "Calling: $sVerb($sParams)<br/>\n";
 								$aCallSpec = array($oObj, $sVerb);
 								call_user_func_array($aCallSpec, $aParams);
 							}
@@ -438,12 +435,12 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 							// Activate any existing trigger
 							// 
 							$sClassList = implode("', '", MetaModel::EnumParentClasses($sClass, ENUM_PARENT_CLASSES_ALL));
-							$oSet = new DBObjectSet(
+							$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 = $oSet->Fetch())
+							while ($oTrigger = $oTriggerSet->Fetch())
 							{
 								$oTrigger->DoActivate($oObj->ToArgs('this'));
 							}
@@ -454,9 +451,6 @@ class CheckStopWatchThresholds implements iBackgroundProcess
 		}
 
 		$iProcessed = count($aList);
-		return "Triggered $iProcessed threshold(s)";
+		return "Triggered $iProcessed threshold(s):".implode(", ", $aList);
 	}
 }
-
-
-?>

css/light-grey.css

@@ -8,11 +8,6 @@ body {
 	overflow: hidden;	/* Remove scroll bars on browser window */
 }
 
-/* to prevent flicker, hide the pane's content until it's ready */
-.ui-layout-center, .ui-layout-north, .ui-layout-south {
-    display: none;
-}
-
 .raw_output {
     font-family: Courier-New, Courier, Arial, Helvetica;
     font-size: 8pt;

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

@@ -350,7 +350,8 @@ EOF
 			$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" onChange="ajaxFileUpload();"><span style="display:none;" id="attachment_loading">&nbsp;<img src="../images/indicator.gif"></span> '.$sMaxUpload);
+			$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_ready_script('$("#file").off("change.itop-attachments").on("change.itop-attachments", function() {ajaxFileUpload();});'); // Workaround for a Chrome 36 bug causing multiple (12!) times the same upload. See http://www.redmine.org/issues/17151
 			$oPage->p('<span style="display:none;" id="attachment_loading">Loading, please wait...</span>');
 			$oPage->p('<input type="hidden" id="attachment_plugin" name="attachment_plugin"/>');
 			$oPage->add('</fieldset>');

datamodels/1.x/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml

@@ -1277,15 +1277,14 @@
           <type>Overload-cmdbAbstractObject</type>
           <code><![CDATA[	public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
-		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
 		if (!$bEditMode)
 		{
-			$oPage->add('<fieldset>');
-			$oPage->add('<legend>'.Dict::S('Class:Document:PreviewTab').'</legend>');
+			$oPage->SetCurrentTab(Dict::S('Class:Document:PreviewTab'));
 			$oPage->add($this->DisplayDocumentInline($oPage, 'contents'));
-			$oPage->add('</fieldset>');
+			$oPage->SetCurrentTab(Dict::S('UI:PropertiesTab'));
 		}
-		return $aFieldsMap;
+		parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
+		
 	}]]></code>
         </method>
       </methods>

datamodels/1.x/itop-config-mgmt-1.0.0/fr.dict.itop-config-mgmt.php

@@ -553,7 +553,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:Document/Attribute:service_list+' => 'Services liés à ce document',
 	'Class:Document/Attribute:ticket_list' => 'Tickets',
 	'Class:Document/Attribute:ticket_list+' => 'Tickets liés à ce document',
-	'Class:Document:PreviewTab' => 'Aperçu',
+	'Class:Document:PreviewTab' => 'Entrevue',
 	'Class:Subnet/Name' => '%1$s / %2$s',
 	'Class:Software' => 'Logiciel',
 	'Class:Software+' => '',

datamodels/1.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -571,11 +571,6 @@
           </group>
         </groups>
       </profile>
-      <profile id="12" _delta="define">
-        <name>Portal power user</name>
-        <description>Users having this profile will have the rights to see all the tickets for a customer in the portal. This profile must be used in conjunction with other profiles (e.g. Portal User or Administrator).</description>
-        <groups/>
-      </profile>
     </profiles>
   </user_rights>
 </itop_design>

datamodels/1.x/itop-request-mgmt-1.0.0/main.itop-request-mgmt.php

@@ -16,7 +16,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-define('PORTAL_POWER_USER_PROFILE', 'Portal power user');
 
 define('PORTAL_SERVICECATEGORY_QUERY', 'SELECT Service AS s JOIN SLA AS sla ON sla.service_id=s.id JOIN lnkContractToSLA AS ln ON ln.sla_id=sla.id JOIN CustomerContract AS cc ON ln.contract_id=cc.id WHERE cc.org_id = :org_id');
 define('PORTAL_SERVICE_SUBCATEGORY_QUERY', 'SELECT ServiceSubcategory WHERE service_id = :svc_id');

datamodels/2.x/authent-external/es_cr.dict.authent-external.php

@@ -39,7 +39,7 @@
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:UserExternal' => 'Usuario Externo',
+	'Class:UserExternal' => 'Usuario Externo (Webserver)',
 	'Class:UserExternal+' => 'Usuario Autenticado fuera de iTop',
 ));
 

datamodels/2.x/authent-ldap/es_cr.dict.authent-ldap.php

@@ -39,7 +39,8 @@
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-  'Class:UserLDAP' => 'Usuario LDAP',
+	'Class:UserInternal' => 'Usuario Interno',
+	'Class:UserLDAP' => 'Usuario LDAP',
 	'Class:UserLDAP+' => 'Usuario Autenticado vía LDAP',
 	'Class:UserLDAP/Attribute:password' => 'Contraseña',
 	'Class:UserLDAP/Attribute:password+' => 'Contraseña',

datamodels/2.x/authent-local/es_cr.dict.authent-local.php

@@ -22,6 +22,8 @@
  *
  * @copyright   Copyright (C) 2010-2012 Combodo SARL
  * @license     http://opensource.org/licenses/AGPL-3.0
+
+
  */
 
 // Dictionnay conventions
@@ -39,6 +41,7 @@
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:UserInternal' => 'Usuario Interno',
 	'Class:UserLocal' => 'Usuario de iTop',
 	'Class:UserLocal+' => 'Usuario Autenticado vía iTop',
 	'Class:UserLocal/Attribute:password' => 'Contraseña',

datamodels/2.x/itop-attachments/ja.dict.itop-attachments.php

@@ -35,4 +35,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Attachment:Max_Ko' => '(最大ファイルサイズ: %1$s KB)',
 	'Attachments:NoAttachment' => '添付はありません。',
 ));
-?>
+?>

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

@@ -350,7 +350,8 @@ EOF
 			$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" onChange="ajaxFileUpload();"><span style="display:none;" id="attachment_loading">&nbsp;<img src="../images/indicator.gif"></span> '.$sMaxUpload);
+			$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_ready_script('$("#file").off("change.itop-attachments").on("change.itop-attachments", function() {ajaxFileUpload();});'); // Workaround for a Chrome 36 bug causing multiple (12!) times the same upload. See http://www.redmine.org/issues/17151
 			$oPage->p('<span style="display:none;" id="attachment_loading">Loading, please wait...</span>');
 			$oPage->p('<input type="hidden" id="attachment_plugin" name="attachment_plugin"/>');
 			$oPage->add('</fieldset>');

datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml

@@ -1102,7 +1102,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>20</rank>
                   <items>
                     <item id="parent_id">
@@ -2093,7 +2093,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>20</rank>
                   <items>
                     <item id="parent_id">
@@ -3082,7 +3082,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>20</rank>
                   <items>
                     <item id="parent_id">
@@ -4215,7 +4215,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>20</rank>
                   <items>
                     <item id="parent_id">
@@ -5290,7 +5290,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>20</rank>
                   <items>
                     <item id="parent_id">

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

@@ -32,8 +32,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:NewChange+' => 'Crear Ticket de Cambio',
 	'Menu:SearchChanges' => 'Búsqueda de Cambios',
 	'Menu:SearchChanges+' => 'Búsqueda de Tickets de Cambios',
-	'Menu:Change:Shortcuts' => 'Accesos Rápidos',
-	'Menu:Change:Shortcuts+' => 'Accesos Rápidos',
+	'Menu:Change:Shortcuts' => 'Acceso Rápido',
+	'Menu:Change:Shortcuts+' => 'Acceso Rápido',
 	'Menu:WaitingAcceptance' => 'Cambios Esperando ser Aceptados',
 	'Menu:WaitingAcceptance+' => 'Cambios Esperando ser Aceptados',
 	'Menu:WaitingApproval' => 'Cambios Esperando ser Aprobados',
@@ -134,8 +134,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Change/Attribute:related_incident_list+' => 'Incidentes Relacionados',
 	'Class:Change/Attribute:child_changes_list' => 'Cambios Hijo',
 	'Class:Change/Attribute:child_changes_list+' => 'Cambios Hijo',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Nombre del Padre',
-	'Class:Change/Attribute:parent_id_friendlyname+' => 'Nombre del Padre',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent friendly name',
+	'Class:Change/Attribute:parent_id_friendlyname+' => 'Parent friendly name',
 	'Class:Change/Attribute:parent_id_finalclass_recall' => 'Tipo de Cambio',
 	'Class:Change/Attribute:parent_id_finalclass_recall+' => 'Tipo de Cambio',
 	'Class:Change/Stimulus:ev_validate' => 'Validar',

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

@@ -1,245 +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/>
-
-/**
- * @copyright   Copyright (C) 2010-2012 Combodo SARL
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:RoutineChange' => 'ルーチン変更',
-	'Class:RoutineChange+' => '',
-	'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_approve' => '承認',
-	'Class:RoutineChange/Stimulus:ev_approve+' => '',
-	'Class:RoutineChange/Stimulus:ev_replan' => '再計画',
-	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => '否認',
-	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
-	'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:NormalChange' => '通常変更',
-	'Class:NormalChange+' => '',
-	'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' => '緊急変更',
-	'Class:EmergencyChange+' => '',
-	'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+' => '',
-	'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+' => '担当している変更(エージェントとして)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近7日間のカテゴリ別の変更',
-	'UI-ChangeManagementOverview-Last-7-days' => '最近7日間の変更数',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => '最近7日間のドメイン別変更',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => '最近7日間の状態別変更',
-	'Class:Change' => '変更',
-	'Class:Change+' => '',
-	'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:creation_date' => '作成日',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:impact' => 'インパクト',
-	'Class:Change/Attribute:impact+' => '',
-	'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:no' => 'いいえ',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => 'はい',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:fallback' => 'フォールバック',
-	'Class:Change/Attribute:fallback+' => '',
-	'Class:Change/Attribute:parent_id' => '親変更',
-	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:parent_name' => '親変更参照',
-	'Class:Change/Attribute:parent_name+' => '',
-	'Class:Change/Attribute:related_request_list' => '関連要求',
-	'Class:Change/Attribute:related_request_list+' => '',
-	'Class:Change/Attribute:related_problems_list' => '関連問題',
-	'Class:Change/Attribute:related_problems_list+' => '',
-	'Class:Change/Attribute:child_changes_list' => '子変更',
-	'Class:Change/Attribute:child_changes_list+' => '',
-	'Class:Change/Attribute:parent_id_friendlyname' => '親のフレンドリー名',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Class:Change/Attribute:parent_id_finalclass_recall' => '変更タイプ',
-	'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
-	'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/Stimulus:ev_validate' => '受け付け',
-	'Class:RoutineChange/Stimulus:ev_validate+' => '',
-	'Class:RoutineChange/Stimulus:ev_reject' => '却下',
-	'Class:RoutineChange/Stimulus:ev_reject+' => '',
-	'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:EmergencyChange/Stimulus:ev_validate' => '受け付け',
-	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
-	'Class:EmergencyChange/Stimulus:ev_reject' => '却下',
-	'Class:EmergencyChange/Stimulus:ev_reject+' => '',
-));
-?>
+<?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('JA JP', 'Japanese', '日本語', 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+' => '担当している変更(エージェントとして)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近7日間のカテゴリ別の変更',
+	'UI-ChangeManagementOverview-Last-7-days' => '最近7日間の変更数',
+	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => '最近7日間のドメイン別変更',
+	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => '最近7日間の状態別変更',
+));
+
+// 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('JA JP', 'Japanese', '日本語', array (
+	'Class:Change' => '変更',
+	'Class:Change+' => '',
+	'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:creation_date' => '作成日',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:impact' => 'インパクト',
+	'Class:Change/Attribute:impact+' => '',
+	'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:fallback' => 'フォールバック',
+	'Class:Change/Attribute:fallback+' => '',
+	'Class:Change/Attribute:parent_id' => '親変更',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:parent_name' => '親変更参照',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:related_request_list' => '関連要求',
+	'Class:Change/Attribute:related_request_list+' => '',
+	'Class:Change/Attribute:related_problems_list' => '関連問題',
+	'Class:Change/Attribute:related_problems_list+' => '',
+	'Class:Change/Attribute:child_changes_list' => '子変更',
+	'Class:Change/Attribute:child_changes_list+' => '',
+	'Class:Change/Attribute:parent_id_friendlyname' => '親のフレンドリー名',
+	'Class:Change/Attribute:parent_id_friendlyname+' => '',
+	'Class:Change/Attribute:parent_id_finalclass_recall' => '変更タイプ',
+	'Class:Change/Attribute:parent_id_finalclass_recall+' => '',
+	'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('JA JP', 'Japanese', '日本語', array (
+	'Class:RoutineChange' => 'ルーチン変更',
+	'Class:RoutineChange+' => '',
+	'Class:RoutineChange/Stimulus:ev_validate' => '受け付け',
+	'Class:RoutineChange/Stimulus:ev_validate+' => '',
+	'Class:RoutineChange/Stimulus:ev_reject' => '却下',
+	'Class:RoutineChange/Stimulus:ev_reject+' => '',
+	'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_approve' => '承認',
+	'Class:RoutineChange/Stimulus:ev_approve+' => '',
+	'Class:RoutineChange/Stimulus:ev_replan' => '再計画',
+	'Class:RoutineChange/Stimulus:ev_replan+' => '',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => '否認',
+	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
+	'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('JA JP', 'Japanese', '日本語', 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('JA JP', 'Japanese', '日本語', array (
+	'Class:NormalChange' => '通常変更',
+	'Class:NormalChange+' => '',
+	'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('JA JP', 'Japanese', '日本語', array (
+	'Class:EmergencyChange' => '緊急変更',
+	'Class:EmergencyChange+' => '',
+	'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+' => '',
+));
+
+?>

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

@@ -765,7 +765,7 @@
                     </item>
                   </items>
                 </item>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>20</rank>
                   <items>
                     <item id="parent_id">

datamodels/2.x/itop-change-mgmt/es_cr.dict.itop-change-mgmt.php

@@ -32,8 +32,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:NewChange+' => 'Crear Ticket de Cambio',
 	'Menu:SearchChanges' => 'Búsqueda de Cambios',
 	'Menu:SearchChanges+' => 'Búsqueda de Tickets de Cambios',
-	'Menu:Change:Shortcuts' => 'Accesos Rápidos',
-	'Menu:Change:Shortcuts+' => 'Accesos Rápidos',
+	'Menu:Change:Shortcuts' => 'Acceso Rápido',
+	'Menu:Change:Shortcuts+' => 'Acceso Rápido',
 	'Menu:WaitingAcceptance' => 'Cambios Esperando ser Aceptados',
 	'Menu:WaitingAcceptance+' => 'Cambios Esperando ser Aceptados',
 	'Menu:WaitingApproval' => 'Cambios Esperando ser Aprobados',
@@ -114,12 +114,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Change/Attribute:related_request_list+' => 'Requerimientos Relacionados',
 	'Class:Change/Attribute:related_incident_list' => 'Incidentes Relacionados',
 	'Class:Change/Attribute:related_incident_list+' => 'Incidentes Relacionados',
-	'Class:Change/Attribute:related_problems_list' => 'Problemas Relacionados',
-	'Class:Change/Attribute:related_problems_list+' => 'Problemas Relacionados',
 	'Class:Change/Attribute:child_changes_list' => 'Cambios Hijo',
 	'Class:Change/Attribute:child_changes_list+' => 'Cambios Hijo',
-	'Class:Change/Attribute:parent_id_friendlyname' => 'Nombre del Cambio Padre',
-	'Class:Change/Attribute:parent_id_friendlyname+' => 'Nombre del Cambio Padre',
+	'Class:Change/Attribute:parent_id_friendlyname' => 'Parent change friendly name',
+	'Class:Change/Attribute:parent_id_friendlyname+' => 'Parent change friendly name',
 	'Class:Change/Stimulus:ev_assign' => 'Asignar',
 	'Class:Change/Stimulus:ev_assign+' => 'Asignar',
 	'Class:Change/Stimulus:ev_plan' => 'Planificar',

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

@@ -470,7 +470,6 @@
             <attribute id="org_id"/>
             <attribute id="org_name"/>
             <attribute id="email"/>
-            <attribute id="employee_number"/>
           </attributes>
         </reconciliation>
       </properties>
@@ -971,30 +970,7 @@
       <fields>
         <field id="file" xsi:type="AttributeBlob"/>
       </fields>
-      <methods>
-        <method id="DisplayBareRelations">
-          <static>false</static>
-          <access>public</access>
-          <type>Overload-cmdbAbstractObject</type>
-        <comment><![CDATA[/**
-	 * Overload the display of the properties to add a tab (the first one)
-	 * with the preview of the document
-	 */
-	]]></comment>
-          <code><![CDATA[public function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
-	{
-		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
-		if (!$bEditMode)
-		{
-			$oPage->add('<fieldset>');
-			$oPage->add('<legend>'.Dict::S('Class:Document:PreviewTab').'</legend>');
-			$oPage->add($this->DisplayDocumentInline($oPage, 'file'));
-			$oPage->add('</fieldset>');
-		}
-		return $aFieldsMap;
-	}]]></code>
-        </method>
-      </methods>
+      <methods/>
       <presentation>
         <details>
           <items>

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

@@ -1037,7 +1037,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ConfigManagementOverview+' => 'Übersicht',
 	'Menu:Contact' => 'Kontakte',
 	'Menu:Contact+' => 'Kontakte',
-	'Menu:Contact:Count' => '%1$d kontakten',
 	'Menu:Person' => 'Personen',
 	'Menu:Person+' => 'Alle Personen',
 	'Menu:Team' => 'Teams',
@@ -1081,7 +1080,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:SearchCIs' => 'Nach CIs suchen',
 	'Menu:SearchCIs+' => 'Nach CIs suchen',
 	'Menu:ConfigManagement:Devices' => 'Geräte',
-	'Menu:ConfigManagement:AllDevices' => 'Infrastruktur',
+	'Menu:ConfigManagement:AllDevices' => 'Anzahl der Geräte: %1$d',
 	'Menu:ConfigManagement:virtualization' => 'Virtualisierung',
 	'Menu:ConfigManagement:EndUsers' => 'Endbenutzer-Geräte',
 	'Menu:ConfigManagement:SWAndApps' => 'Software und Anwendungen',
@@ -1098,6 +1097,5 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:Software+' => '',
 	'UI_WelcomeMenu_AllConfigItems' => 'Zusammenfassung',
 	'Menu:ConfigManagement:Typology' => 'Typologie-Konfiguration',
-	'Class:Document:PreviewTab' => 'Vorschau',
 ));
 ?>

datamodels/2.x/itop-config-mgmt/en.dict.itop-config-mgmt.php

@@ -312,7 +312,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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:contacts_list+' => 'All the contracts 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',
@@ -375,7 +375,7 @@ Dict::Add('EN US', 'English', 'English', array(
 Dict::Add('EN US', 'English', 'English', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
-	'Class:Rack/Attribute:nb_u' => 'Rack units',
+	'Class:Rack/Attribute:nb_u' => 'NB U',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Devices',
 	'Class:Rack/Attribute:device_list+' => 'All the physical devices racked into this rack',
@@ -462,7 +462,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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' => 'NB U',
 	'Class:DatacenterDevice/Attribute:nb_u+' => '',
 	'Class:DatacenterDevice/Attribute:managementip' => 'Management ip',
 	'Class:DatacenterDevice/Attribute:managementip+' => '',
@@ -665,7 +665,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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' => 'NB U',
 	'Class:Enclosure/Attribute:nb_u+' => '',
 	'Class:Enclosure/Attribute:device_list' => 'Devices',
 	'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure',
@@ -1714,7 +1714,6 @@ Dict::Add('EN US', 'English', 'English', array(
 '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',
@@ -1782,17 +1781,16 @@ Dict::Add('EN US', 'English', 'English', array(
 // Add translation for Fieldsets
 
 Dict::Add('EN US', 'English', 'English', array(
-'Server:baseinfo' => 'General information',
+'Server:baseinfo' => 'General informations',
 'Server:Date' => 'Date',
-'Server:moreinfo' => 'More information',
-'Server:otherinfo' => 'Other information',
-'Person:info' => 'General information',
+'Server:moreinfo' => 'More informations',
+'Server:otherinfo' => 'Other informations',
+'Person:info' => 'General informations',
 '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',
 ));
 ?>

datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php

@@ -33,7 +33,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Relation:impacts/Description' => 'Elementos Impactados por',
 	'Relation:impacts/VerbUp' => 'Impacto...',
 	'Relation:impacts/VerbDown' => 'Elementos Impactados por...',
-	'Relation:depends on/Description' => 'Elementos de los cuales depende',
+	'Relation:depends on/Description' => 'Elementos de los cuales este elemento depende',
 	'Relation:depends on/VerbUp' => 'Depende de...',
 	'Relation:depends on/VerbDown' => 'Impactos...',
 ));
@@ -81,7 +81,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Organization' => 'Organización',
 	'Class:Organization+' => 'Organización',
 	'Class:Organization/Attribute:name' => 'Nombre',
-	'Class:Organization/Attribute:name+' => 'Nombre de la Organización',
+	'Class:Organization/Attribute:name+' => 'Nombre',
 	'Class:Organization/Attribute:code' => 'Código',
 	'Class:Organization/Attribute:code+' => 'Código de Organización  (RFC, DUNS, Siret, etc.)',
 	'Class:Organization/Attribute:status' => 'Estatus',
@@ -98,7 +98,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
 	'Class:Organization/Attribute:deliverymodel_name+' => 'Nombre del Modelo de Entrega',
-	'Class:Organization/Attribute:parent_id_friendlyname' => 'Organización Padre',
+	'Class:Organization/Attribute:parent_id_friendlyname' => 'Padre',
 	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organización Padre',
 ));
 
@@ -142,8 +142,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contact' => 'Contacto',
 	'Class:Contact+' => 'Contacto',
-	'Class:Contact/Attribute:name' => 'Nombre',
-	'Class:Contact/Attribute:name+' => 'Nombre del Contacto',
+	'Class:Contact/Attribute:name' => 'Apellidos',
+	'Class:Contact/Attribute:name+' => 'Apellidos',
 	'Class:Contact/Attribute:status' => 'Estatus',
 	'Class:Contact/Attribute:status+' => 'Estatus',
 	'Class:Contact/Attribute:status/Value:active' => 'Activo',
@@ -179,14 +179,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Person' => 'Persona',
 	'Class:Person+' => 'Persona',
-	'Class:Person/Attribute:name' => 'Nombre',
-	'Class:Person/Attribute:name+' => 'Nombre de la Persona',
-	'Class:Person/Attribute:first_name' => 'Apellidos',
-	'Class:Person/Attribute:first_name+' => 'Apellidos',
+	'Class:Person/Attribute:first_name' => 'Nombre',
+	'Class:Person/Attribute:first_name+' => 'Nombre',
 	'Class:Person/Attribute:employee_number' => 'Número de Empleado',
 	'Class:Person/Attribute:employee_number+' => 'Número de Empleado',
-	'Class:Person/Attribute:mobile_phone' => 'Móvil',
-	'Class:Person/Attribute:mobile_phone+' => 'Móvil',
+	'Class:Person/Attribute:mobile_phone' => 'Celular',
+	'Class:Person/Attribute:mobile_phone+' => 'Celular',
 	'Class:Person/Attribute:location_id' => 'Localidad',
 	'Class:Person/Attribute:location_id+' => 'Localidad',
 	'Class:Person/Attribute:location_name' => 'Nombre de Localidad',
@@ -224,7 +222,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Document' => 'Documento',
 	'Class:Document+' => 'Documento',
 	'Class:Document/Attribute:name' => 'Nombre',
-	'Class:Document/Attribute:name+' => 'Nombre del Documento',
+	'Class:Document/Attribute:name+' => 'Nombre',
 	'Class:Document/Attribute:org_id' => 'Organización',
 	'Class:Document/Attribute:org_id+' => 'Organización',
 	'Class:Document/Attribute:org_name' => 'Nombre de la Organización',
@@ -294,7 +292,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:FunctionalCI' => 'EC Funcional',
 	'Class:FunctionalCI+' => 'Elemento de Configuración Funcional',
 	'Class:FunctionalCI/Attribute:name' => 'Nombre',
-	'Class:FunctionalCI/Attribute:name+' => 'Nombre del Elemento de Configuración',
+	'Class:FunctionalCI/Attribute:name+' => 'Nombre',
 	'Class:FunctionalCI/Attribute:description' => 'Descripción',
 	'Class:FunctionalCI/Attribute:description+' => 'Descripción',
 	'Class:FunctionalCI/Attribute:org_id' => 'Organización',
@@ -474,8 +472,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DatacenterDevice/Attribute:powerB_id+' => 'Fuente de Poder B',
 	'Class:DatacenterDevice/Attribute:powerB_name' => 'Fuente de Poder B',
 	'Class:DatacenterDevice/Attribute:powerB_name+' => 'Fuente de Poder B',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'Puertos de Fibra Óptica',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Puertos de Fibra Óptica',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'Puertos de Fibra',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Puertos de Fibra',
 	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
 	'Class:DatacenterDevice/Attribute:san_list+' => 'SANs',
 ));
@@ -931,7 +929,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:LogicalVolume' => 'Volumen Lógico',
 	'Class:LogicalVolume+' => 'Volumen Lógico',
 	'Class:LogicalVolume/Attribute:name' => 'Nombre',
-	'Class:LogicalVolume/Attribute:name+' => 'Nombre del Volumen Lógico',
+	'Class:LogicalVolume/Attribute:name+' => 'Nombre',
 	'Class:LogicalVolume/Attribute:lun_id' => 'LUN',
 	'Class:LogicalVolume/Attribute:lun_id+' => 'LUN',
 	'Class:LogicalVolume/Attribute:description' => 'Descripción',
@@ -1017,7 +1015,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Tape' => 'Cinta',
 	'Class:Tape+' => 'Cinta',
 	'Class:Tape/Attribute:name' => 'Nombre',
-	'Class:Tape/Attribute:name+' => 'Nombre de la Cinta',
+	'Class:Tape/Attribute:name+' => 'Nombre',
 	'Class:Tape/Attribute:description' => 'Descriptción',
 	'Class:Tape/Attribute:description+' => 'Descriptción',
 	'Class:Tape/Attribute:size' => 'Tamaño',
@@ -1036,7 +1034,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NASFileSystem' => 'Filesysten en NAS',
 	'Class:NASFileSystem+' => 'Filesysten en NAS',
 	'Class:NASFileSystem/Attribute:name' => 'Nombre',
-	'Class:NASFileSystem/Attribute:name+' => 'Nombre del Filesystem de Red',
+	'Class:NASFileSystem/Attribute:name+' => 'Nombre',
 	'Class:NASFileSystem/Attribute:description' => 'Descripción',
 	'Class:NASFileSystem/Attribute:description+' => 'Descripción',
 	'Class:NASFileSystem/Attribute:raid_level' => 'Nivel de RAID',
@@ -1057,7 +1055,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => 'Software',
 	'Class:Software/Attribute:name' => 'Nombre',
-	'Class:Software/Attribute:name+' => 'Nombre del Software',
+	'Class:Software/Attribute:name+' => 'Nombre',
 	'Class:Software/Attribute:vendor' => 'Proveedor',
 	'Class:Software/Attribute:vendor+' => 'Proveedor',
 	'Class:Software/Attribute:version' => 'Versión',
@@ -1092,7 +1090,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Patch' => 'Parche',
 	'Class:Patch+' => 'Parche',
 	'Class:Patch/Attribute:name' => 'Nombre',
-	'Class:Patch/Attribute:name+' => 'Nombre del Parche',
+	'Class:Patch/Attribute:name+' => 'Nombre',
 	'Class:Patch/Attribute:documents_list' => 'Documentos',
 	'Class:Patch/Attribute:documents_list+' => 'Documentos',
 	'Class:Patch/Attribute:description' => 'Descripción',
@@ -1139,7 +1137,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Licence' => 'Licencia',
 	'Class:Licence+' => 'Licencia',
 	'Class:Licence/Attribute:name' => 'Nombre',
-	'Class:Licence/Attribute:name+' => 'Nombre de la Licencia',
+	'Class:Licence/Attribute:name+' => 'Nombre',
 	'Class:Licence/Attribute:documents_list' => 'Documentos',
 	'Class:Licence/Attribute:documents_list+' => 'Documentos',
 	'Class:Licence/Attribute:org_id' => 'Compañía',
@@ -1154,14 +1152,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Licence/Attribute:start_date+' => 'Fecha de Inicio',
 	'Class:Licence/Attribute:end_date' => 'Fecha de Fin',
 	'Class:Licence/Attribute:end_date+' => 'Fecha de Fin',
-	'Class:Licence/Attribute:licence_key' => 'Llave',
-	'Class:Licence/Attribute:licence_key+' => 'Llave',
-	'Class:Licence/Attribute:perpetual' => 'Perpetuidad',
-	'Class:Licence/Attribute:perpetual+' => 'Licenciamiento Perpetuo',
-	'Class:Licence/Attribute:perpetual/Value:no' => 'No',
-	'Class:Licence/Attribute:perpetual/Value:no+' => 'No',
-	'Class:Licence/Attribute:perpetual/Value:yes' => 'Si',
-	'Class:Licence/Attribute:perpetual/Value:yes+' => 'Si',
+	'Class:Licence/Attribute:licence_key' => 'LLave',
+	'Class:Licence/Attribute:licence_key+' => 'LLave',
 	'Class:Licence/Attribute:finalclass' => 'Tipo',
 	'Class:Licence/Attribute:finalclass+' => 'Tipo',
 ));
@@ -1223,7 +1215,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Typology' => 'Tipología',
 	'Class:Typology+' => 'Tipología',
 	'Class:Typology/Attribute:name' => 'Nombre',
-	'Class:Typology/Attribute:name+' => 'Nombre del Tipo',
+	'Class:Typology/Attribute:name+' => 'Nombre',
 	'Class:Typology/Attribute:finalclass' => 'Tipo',
 	'Class:Typology/Attribute:finalclass+' => 'Tipo',
 ));
@@ -1485,7 +1477,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NetworkInterface' => 'Interfaz de Red',
 	'Class:NetworkInterface+' => 'Interfaz de Red',
 	'Class:NetworkInterface/Attribute:name' => 'Nombre',
-	'Class:NetworkInterface/Attribute:name+' => 'Nombre de la Interfaz de Red',
+	'Class:NetworkInterface/Attribute:name+' => 'Nombre',
 	'Class:NetworkInterface/Attribute:finalclass' => 'Tipo',
 	'Class:NetworkInterface/Attribute:finalclass+' => 'Tipo',
 ));
@@ -1542,8 +1534,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:FiberChannelInterface' => 'Intefaz de Fibra Óptica',
-	'Class:FiberChannelInterface+' => 'Intefaz de Fibra Óptica',
+	'Class:FiberChannelInterface' => 'Intefaz de Fibra',
+	'Class:FiberChannelInterface+' => 'Intefaz de Fibra',
 	'Class:FiberChannelInterface/Attribute:speed' => 'Velocidad',
 	'Class:FiberChannelInterface/Attribute:speed+' => 'Velocidad',
 	'Class:FiberChannelInterface/Attribute:topology' => 'Topología',
@@ -1646,7 +1638,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Group' => 'Grupo',
 	'Class:Group+' => 'Grupo',
 	'Class:Group/Attribute:name' => 'Nombre',
-	'Class:Group/Attribute:name+' => 'Nombre del Grupo',
+	'Class:Group/Attribute:name+' => 'Nombre',
 	'Class:Group/Attribute:status' => 'Estatus',
 	'Class:Group/Attribute:status+' => 'Estatus',
 	'Class:Group/Attribute:status/Value:implementation' => 'No Productivo',
@@ -1705,7 +1697,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 'Menu:Organization' => 'Organizaciones',
 'Menu:Organization+' => 'Organizaciones',
 'Menu:Application' => 'Aplicaciones',
-'Menu:Application+' => 'Aplicaciones/Programas',
+'Menu:Application+' => 'Aplicaciones/Pogramas',
 'Menu:DBServer' => 'Servidores de Base de Datos',
 'Menu:DBServer+' => 'Servidores de Base de Datos',
 'Menu:Audit' => 'Auditoría',
@@ -1713,7 +1705,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 'Menu:ConfigManagement+' => 'Administración de la Configuración',
 'Menu:ConfigManagementOverview' => 'Resumen de Infraestructura',
 'Menu:ConfigManagementOverview+' => 'Resumen de Infraestructura',
-'Menu:Contact:Count' => '%1$d Contactos',
+'Menu:Contact:Count' => 'Contactos',
 'Menu:Contact' => 'Contactos',
 'Menu:Contact+' => 'Contactos',
 'Menu:Person' => 'Personas',
@@ -1746,8 +1738,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 'Menu:Server+' => 'Servidores',
 'Menu:Printer' => 'Impresoras',
 'Menu:Printer+' => 'Impresoras',
-'Menu:MobilePhone' => 'Teléfonos Móviles',
-'Menu:MobilePhone+' => 'Teléfonos Móviles',
+'Menu:MobilePhone' => 'Teléfonos Celulares',
+'Menu:MobilePhone+' => 'Teléfonos Celulares',
 'Menu:PC' => 'PCs y Laptops',
 'Menu:PC+' => 'PCs y Laptops',
 'Menu:NewContact' => 'Nuevo Contacto',
@@ -1789,10 +1781,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 'Server:otherinfo' => 'Otra Información',
 'Person:info' => 'Información General',
 'Person:notifiy' => 'Notificación',
-'Class:Subnet/Tab:IPUsage' => 'Uso de IP',
-'Class:Subnet/Tab:IPUsage-explain' => 'Interfases con IP en el rango: <em>%1$s</em> a <em>%2$s</em>',
-'Class:Subnet/Tab:FreeIPs' => 'IPs Libres',
-'Class:Subnet/Tab:FreeIPs-count' => 'IPs Libres: %1$s',
-'Class:Subnet/Tab:FreeIPs-explain' => 'Aquí está un extracto de 10 direcciones IP Libres',
+
 ));
 ?>

datamodels/2.x/itop-config-mgmt/fr.dict.itop-config-mgmt.php

@@ -1669,7 +1669,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:ConfigManagementOverview+' => 'Tableaux de bord',
 	'Menu:Contact' => 'Contacts',
 	'Menu:Contact+' => 'Contacts',
-	'Menu:Contact:Count' => '%1$d contacts',
 	'Menu:Person' => 'Personnes',
 	'Menu:Person+' => 'Toutes les personnes',
 	'Menu:Team' => 'Equipes',
@@ -1773,6 +1772,5 @@ Dict::Add('FR FR', 'French', 'Français', array(
 'Class:Subnet/Tab:FreeIPs' => 'IP disponibles',
 'Class:Subnet/Tab:FreeIPs-count' => 'IP disponibles: %1$s',
 'Class:Subnet/Tab:FreeIPs-explain' => 'Voici un échantillon de dix addresses IP disponibles',
-'Class:Document:PreviewTab' => 'Aperçu',
 ));
 ?>

datamodels/2.x/itop-config-mgmt/hu.dict.itop-config-mgmt.php

@@ -657,7 +657,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:ConfigManagementOverview+' => '',
 	'Menu:Contact' => 'Kapcsolattartók',
 	'Menu:Contact+' => '',
-	'Menu:Contact:Count' => '%1$d',
 	'Menu:Person' => 'Személyek',
 	'Menu:Person+' => '',
 	'Menu:Team' => 'Csoportok',
@@ -701,7 +700,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:SearchCIs' => 'CI keresés',
 	'Menu:SearchCIs+' => '',
 	'Menu:ConfigManagement:Devices' => 'Eszközök',
-	'Menu:ConfigManagement:AllDevices' => 'Infrastruktúra',
+	'Menu:ConfigManagement:AllDevices' => 'Eszközök száma: %1$d',
 	'Menu:ConfigManagement:SWAndApps' => 'Szoftverek és egyedi alkalmazások',
 	'Menu:ConfigManagement:Misc' => 'Egyéb',
 	'Menu:Group' => 'CI csoportok',

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

@@ -657,7 +657,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'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',
@@ -701,7 +700,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:SearchCIs' => 'Ricerca CIs',
 	'Menu:SearchCIs+' => 'Ricerca CIs',
 	'Menu:ConfigManagement:Devices' => 'Dispositvi',
-	'Menu:ConfigManagement:AllDevices' => 'Infrastrutture',
+	'Menu:ConfigManagement:AllDevices' => 'Numero di dispositivi: %1$d',
 	'Menu:ConfigManagement:SWAndApps' => 'Software e Applicazioni',
 	'Menu:ConfigManagement:Misc' => 'Varie',
 	'Menu:Group' => 'Gruppi di CIs',

datamodels/2.x/itop-config-mgmt/pt_br.dict.itop-config-mgmt.php

@@ -658,7 +658,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:ConfigManagementOverview+' => 'Visão Global',
 	'Menu:Contact' => 'Contatos',
 	'Menu:Contact+' => 'Contatos',
-	'Menu:Contact:Count' => '%1$d contatos',
 	'Menu:Person' => 'Pessoas',
 	'Menu:Person+' => 'Todas Pessoas',
 	'Menu:Team' => 'Equipes',
@@ -702,7 +701,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:SearchCIs' => 'Pesquisa para CIs',
 	'Menu:SearchCIs+' => 'Pesquisa para CIs',
 	'Menu:ConfigManagement:Devices' => 'Dispositivo',
-	'Menu:ConfigManagement:AllDevices' => 'Infra-estrutura',
+	'Menu:ConfigManagement:AllDevices' => 'Número de dispositivos: %1$d',
 	'Menu:ConfigManagement:SWAndApps' => 'Software e Aplicações',
 	'Menu:ConfigManagement:Misc' => 'Diversos',
 	'Menu:Group' => 'Grupo de CIs',

datamodels/2.x/itop-config-mgmt/ru.dict.itop-config-mgmt.php

@@ -1036,7 +1036,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:ConfigManagementOverview+' => 'Обзор',
 	'Menu:Contact' => 'Контакты',
 	'Menu:Contact+' => 'Контакты',
-	'Menu:Contact:Count' => '%1$d',
 	'Menu:Person' => 'Лица',
 	'Menu:Person+' => 'Все лица',
 	'Menu:Team' => 'Команды',
@@ -1080,9 +1079,9 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:SearchCIs' => 'Поиск КЕ',
 	'Menu:SearchCIs+' => 'Поиск КЕ',
 	'Menu:ConfigManagement:Devices' => 'Устройства',
-	'Menu:ConfigManagement:AllDevices' => 'Инфраструктура',
-	'Menu:ConfigManagement:virtualization' => 'Виртуализация',
-	'Menu:ConfigManagement:EndUsers' => 'Оконечные устройства',
+	'Menu:ConfigManagement:AllDevices' => 'Количество устройств: %1$d',
+	'Menu:ConfigManagement:virtualization' => 'Виртуализация~~',
+	'Menu:ConfigManagement:EndUsers' => 'Оконечные устройства~~',
 	'Menu:ConfigManagement:SWAndApps' => 'ПО и приложения',
 	'Menu:ConfigManagement:Misc' => 'Разное',
 	'Menu:Group' => 'Группы КЕ',
@@ -1097,6 +1096,5 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:Software+' => '',
 	'UI_WelcomeMenu_AllConfigItems' => 'Общее~~',
 	'Menu:ConfigManagement:Typology' => 'Конфигурация топологии~~',
-	'Class:Document:PreviewTab' => 'Предпросмотр',
 ));
 ?>

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

@@ -1007,7 +1007,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 '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',
@@ -1051,7 +1050,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 'Menu:SearchCIs' => 'KK ara',
 'Menu:SearchCIs+' => 'KK ara',
 'Menu:ConfigManagement:Devices' => 'Cihazlar',
-'Menu:ConfigManagement:AllDevices' => 'Altyapı',
+'Menu:ConfigManagement:AllDevices' => 'Cihaz sayısı: %1$d',
 'Menu:ConfigManagement:SWAndApps' => 'Yazılım ve uygulamalar',
 'Menu:ConfigManagement:Misc' => 'Diğer',
 'Menu:Group' => 'KK Grupları',

datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php

@@ -1009,7 +1009,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 'Menu:ConfigManagementOverview+' => '总览',
 'Menu:Contact' => '联系人',
 'Menu:Contact+' => '联系人',
-'Menu:Contact:Count' => '%1$d',
 'Menu:Person' => '人员',
 'Menu:Person+' => '所有人员',
 'Menu:Team' => '团队',
@@ -1053,7 +1052,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 'Menu:SearchCIs' => '查找CI',
 'Menu:SearchCIs+' => '查找CI',
 'Menu:ConfigManagement:Devices' => '设备',
-'Menu:ConfigManagement:AllDevices' => '基础架构',
+'Menu:ConfigManagement:AllDevices' => '设备数量: %1$d',
 'Menu:ConfigManagement:SWAndApps' => '软件和应用程序',
 'Menu:ConfigManagement:Misc' => '杂项',
 'Menu:Group' => 'CI族',

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

@@ -761,10 +761,6 @@
       </properties>
       <fields>
         <field id="rack_id" xsi:type="AttributeExternalKey">
-          <filter><![CDATA[SELECT Rack WHERE location_id= :this->location_id]]></filter>
-          <dependencies>
-            <attribute id="location_id"/>
-          </dependencies>
           <sql>rack_id</sql>
           <target_class>Rack</target_class>
           <is_null_allowed>false</is_null_allowed>

datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml

@@ -1315,7 +1315,7 @@
 
 			case 'new':
 			case 'approved':
-			$sIcon = self::MakeIconFromName('incident.png');
+			$sIcon = self::MakeIconFromName('user-request.png');
 			$iEscalationDeadline = $this->Get('tto_escalation_deadline');
 			if ($iEscalationDeadline != null)
 			{
@@ -1335,7 +1335,7 @@
 			break;
 			
 			case 'assigned':
-			$sIcon = self::MakeIconFromName('incident.png');
+			$sIcon = self::MakeIconFromName('user-request.png');
 			$iEscalationDeadline = $this->Get('ttr_escalation_deadline');
 			if ($iEscalationDeadline != null)
 			{
@@ -1795,7 +1795,7 @@
             <item id="col:col3">
               <rank>80</rank>
               <items>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>10</rank>
                   <items>
                     <item id="parent_incident_id">

datamodels/2.x/itop-incident-mgmt-itil/es_cr.dict.itop-incident-mgmt-itil.php

@@ -33,8 +33,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:NewIncident+' => 'Crear Ticket de Incidente',
 	'Menu:SearchIncidents' => 'Búsqueda por Incidentes',
 	'Menu:SearchIncidents+' => 'Búsqueda por tickets de Incidente',
-	'Menu:Incident:Shortcuts' => 'Accesos Rápidos',
-	'Menu:Incident:Shortcuts+' => 'Accesos Rápidos',
+	'Menu:Incident:Shortcuts' => 'Acceso Rápido',
+	'Menu:Incident:Shortcuts+' => 'Acceso Rápido',
 	'Menu:Incident:MyIncidents' => 'Incidentes Asignados a Mí',
 	'Menu:Incident:MyIncidents+' => 'Incidentes Asignados a Mí (como Analista)',
 	'Menu:Incident:EscalatedIncidents' => 'Incidentes Escalados',
@@ -200,10 +200,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Incident/Attribute:parent_change_ref+' => 'Ref. Cambio Padre',
 	'Class:Incident/Attribute:child_incidents_list' => 'Incidentes Hijos',
 	'Class:Incident/Attribute:child_incidents_list+' => 'Incidentes Hijos',
-	'Class:Incident/Attribute:related_request_list' => 'Requerimientos Relacionados',
-	'Class:Incident/Attribute:related_request_list+' => 'Requerimientos Relacionados',
-	'Class:Incident/Attribute:parent_problem_id' => 'Problema Padre',
-	'Class:Incident/Attribute:parent_problem_id+' => 'Problema Padre',
 	'Class:Incident/Attribute:public_log' => 'Bitácora Pública',
 	'Class:Incident/Attribute:public_log+' => 'Bitácora Pública',
 	'Class:Incident/Attribute:user_satisfaction' => 'Satisfacción del Usuario',

datamodels/2.x/itop-incident-mgmt-itil/ja.dict.itop-incident-mgmt-itil.php

@@ -1,215 +1,240 @@
-<?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
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:Incident' => 'インシデント',
-	'Class:Incident+' => '',
-	'Class:Incident/Attribute:status' => '状態',
-	'Class:Incident/Attribute:status+' => '',
-	'Class:Incident/Attribute:status/Value:new' => '新規',
-	'Class:Incident/Attribute:status/Value:new+' => '',
-	'Class:Incident/Attribute:status/Value:escalated_tto' => 'エスカレートTTO',
-	'Class:Incident/Attribute:status/Value:escalated_tto+' => '',
-	'Class:Incident/Attribute:status/Value:assigned' => '割り当て',
-	'Class:Incident/Attribute:status/Value:assigned+' => '',
-	'Class:Incident/Attribute:status/Value:escalated_ttr' => 'エスカレートTTR',
-	'Class:Incident/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:Incident/Attribute:status/Value:pending' => '保留中',
-	'Class:Incident/Attribute:status/Value:pending+' => '',
-	'Class:Incident/Attribute:status/Value:resolved' => '解決済み',
-	'Class:Incident/Attribute:status/Value:resolved+' => '',
-	'Class:Incident/Attribute:status/Value:closed' => 'クローズ',
-	'Class:Incident/Attribute:status/Value:closed+' => '',
-	'Class:Incident/Attribute:impact' => 'インパクト',
-	'Class:Incident/Attribute:impact+' => '',
-	'Class:Incident/Attribute:impact/Value:1' => '部門',
-	'Class:Incident/Attribute:impact/Value:1+' => '',
-	'Class:Incident/Attribute:impact/Value:2' => 'サービス',
-	'Class:Incident/Attribute:impact/Value:2+' => '',
-	'Class:Incident/Attribute:impact/Value:3' => '個人',
-	'Class:Incident/Attribute:impact/Value:3+' => '',
-	'Class:Incident/Attribute:priority' => '優先度',
-	'Class:Incident/Attribute:priority+' => '',
-	'Class:Incident/Attribute:priority/Value:1' => '重大',
-	'Class:Incident/Attribute:priority/Value:1+' => '重大',
-	'Class:Incident/Attribute:priority/Value:2' => '高',
-	'Class:Incident/Attribute:priority/Value:2+' => '高',
-	'Class:Incident/Attribute:priority/Value:3' => '中',
-	'Class:Incident/Attribute:priority/Value:3+' => '中',
-	'Class:Incident/Attribute:priority/Value:4' => '低',
-	'Class:Incident/Attribute:priority/Value:4+' => '低',
-	'Class:Incident/Attribute:urgency' => '緊急度',
-	'Class:Incident/Attribute:urgency+' => '',
-	'Class:Incident/Attribute:urgency/Value:1' => '至急',
-	'Class:Incident/Attribute:urgency/Value:1+' => '至急',
-	'Class:Incident/Attribute:urgency/Value:2' => '高',
-	'Class:Incident/Attribute:urgency/Value:2+' => '高',
-	'Class:Incident/Attribute:urgency/Value:3' => '中',
-	'Class:Incident/Attribute:urgency/Value:3+' => '中',
-	'Class:Incident/Attribute:urgency/Value:4' => '低',
-	'Class:Incident/Attribute:urgency/Value:4+' => '低',
-	'Class:Incident/Attribute:origin' => '情報源',
-	'Class:Incident/Attribute:origin+' => '',
-	'Class:Incident/Attribute:origin/Value:mail' => 'メール',
-	'Class:Incident/Attribute:origin/Value:mail+' => 'メール',
-	'Class:Incident/Attribute:origin/Value:monitoring' => 'モニタリング',
-	'Class:Incident/Attribute:origin/Value:monitoring+' => 'モニタリング',
-	'Class:Incident/Attribute:origin/Value:phone' => '電話',
-	'Class:Incident/Attribute:origin/Value:phone+' => '電話',
-	'Class:Incident/Attribute:origin/Value:portal' => 'ポータル',
-	'Class:Incident/Attribute:origin/Value:portal+' => 'ポータル',
-	'Class:Incident/Attribute:service_id' => 'サービス',
-	'Class:Incident/Attribute:service_id+' => '',
-	'Class:Incident/Attribute:servicesubcategory_id' => 'サービス中分類',
-	'Class:Incident/Attribute:servicesubcategory_id+' => '',
-	'Class:Incident/Attribute:escalation_flag' => 'エスカレーションフラグ',
-	'Class:Incident/Attribute:escalation_flag+' => '',
-	'Class:Incident/Attribute:escalation_flag/Value:no' => 'いいえ',
-	'Class:Incident/Attribute:escalation_flag/Value:no+' => 'いいえ',
-	'Class:Incident/Attribute:escalation_flag/Value:yes' => 'はい',
-	'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'はい',
-	'Class:Incident/Attribute:escalation_reason' => '理由',
-	'Class:Incident/Attribute:escalation_reason+' => '',
-	'Class:Incident/Attribute:assignment_date' => '割り当て日',
-	'Class:Incident/Attribute:assignment_date+' => '',
-	'Class:Incident/Attribute:resolution_date' => '解決日',
-	'Class:Incident/Attribute:resolution_date+' => '',
-	'Class:Incident/Attribute:last_pending_date' => '最終保留日',
-	'Class:Incident/Attribute:last_pending_date+' => '',
-	'Class:Incident/Attribute:cumulatedpending' => '合計保留',
-	'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 期限',
-	'Class:Incident/Attribute:tto_escalation_deadline+' => '',
-	'Class:Incident/Attribute:sla_tto_passed' => 'SLA tto 合格',
-	'Class:Incident/Attribute:sla_tto_passed+' => '',
-	'Class:Incident/Attribute:sla_tto_over' => 'SLA tto オーバー',
-	'Class:Incident/Attribute:sla_tto_over+' => '',
-	'Class:Incident/Attribute:ttr_escalation_deadline' => 'TTR 期限',
-	'Class:Incident/Attribute:ttr_escalation_deadline+' => '',
-	'Class:Incident/Attribute:sla_ttr_passed' => 'SLA ttr 合格',
-	'Class:Incident/Attribute:sla_ttr_passed+' => '',
-	'Class:Incident/Attribute:sla_ttr_over' => 'SLA ttr オーバー',
-	'Class:Incident/Attribute:sla_ttr_over+' => '',
-	'Class:Incident/Attribute:time_spent' => '解決遅れ',
-	'Class:Incident/Attribute:time_spent+' => '',
-	'Class:Incident/Attribute:resolution_code' => '解決コード',
-	'Class:Incident/Attribute:resolution_code+' => '',
-	'Class:Incident/Attribute:resolution_code/Value:assistance' => '補助',
-	'Class:Incident/Attribute:resolution_code/Value:assistance+' => '補助',
-	'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'バグ修正',
-	'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'バグ修正',
-	'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'ハードウエア修理',
-	'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'ハードウエア修理',
-	'Class:Incident/Attribute:resolution_code/Value:other' => 'その他',
-	'Class:Incident/Attribute:resolution_code/Value:other+' => 'その他',
-	'Class:Incident/Attribute:resolution_code/Value:software patch' => 'ソフトウエアパッチ',
-	'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'ソフトウエアパッチ',
-	'Class:Incident/Attribute:resolution_code/Value:system update' => 'システム更新',
-	'Class:Incident/Attribute:resolution_code/Value:system update+' => 'システム更新',
-	'Class:Incident/Attribute:resolution_code/Value:training' => '研修',
-	'Class:Incident/Attribute:resolution_code/Value:training+' => '研修',
-	'Class:Incident/Attribute:solution' => '解決',
-	'Class:Incident/Attribute:solution+' => '',
-	'Class:Incident/Attribute:pending_reason' => '保留理由',
-	'Class:Incident/Attribute:pending_reason+' => '',
-	'Class:Incident/Attribute:parent_incident_id' => '親インシデント',
-	'Class:Incident/Attribute:parent_incident_id+' => '',
-	'Class:Incident/Attribute:parent_change_id' => '親変更',
-	'Class:Incident/Attribute:parent_change_id+' => '',
-	'Class:Incident/Attribute:child_incidents_list' => '子インシデント',
-	'Class:Incident/Attribute:child_incidents_list+' => '',
-	'Class:Incident/Attribute:public_log' => 'パブリックログ',
-	'Class:Incident/Attribute:public_log+' => '',
-	'Class:Incident/Attribute:user_satisfaction' => 'ユーザ満足度',
-	'Class:Incident/Attribute:user_satisfaction+' => '',
-	'Class:Incident/Attribute:user_satisfaction/Value:1' => '非常に満足',
-	'Class:Incident/Attribute:user_satisfaction/Value:1+' => '非常に満足',
-	'Class:Incident/Attribute:user_satisfaction/Value:2' => '十分満足',
-	'Class:Incident/Attribute:user_satisfaction/Value:2+' => '十分満足',
-	'Class:Incident/Attribute:user_satisfaction/Value:3' => '多少不満',
-	'Class:Incident/Attribute:user_satisfaction/Value:3+' => '多少不満',
-	'Class:Incident/Attribute:user_satisfaction/Value:4' => '非常に不満',
-	'Class:Incident/Attribute:user_satisfaction/Value:4+' => '非常に不満',
-	'Class:Incident/Attribute:user_comment' => 'ユーザコメント',
-	'Class:Incident/Attribute:user_comment+' => '',
-	'Class:Incident/Stimulus:ev_assign' => '割り当て',
-	'Class:Incident/Stimulus:ev_assign+' => '',
-	'Class:Incident/Stimulus:ev_reassign' => '再割り当て',
-	'Class:Incident/Stimulus:ev_reassign+' => '',
-	'Class:Incident/Stimulus:ev_pending' => '保留',
-	'Class:Incident/Stimulus:ev_pending+' => '',
-	'Class:Incident/Stimulus:ev_timeout' => 'タイムアウト',
-	'Class:Incident/Stimulus:ev_timeout+' => '',
-	'Class:Incident/Stimulus:ev_autoresolve' => '自動解決',
-	'Class:Incident/Stimulus:ev_autoresolve+' => '',
-	'Class:Incident/Stimulus:ev_autoclose' => '自動クローズ',
-	'Class:Incident/Stimulus:ev_autoclose+' => '',
-	'Class:Incident/Stimulus:ev_resolve' => '解決とマーク',
-	'Class:Incident/Stimulus:ev_resolve+' => '',
-	'Class:Incident/Stimulus:ev_close' => 'このリクエストをクローズ',
-	'Class:Incident/Stimulus:ev_close+' => '',
-	'Class:Incident/Stimulus:ev_reopen' => '再オープン',
-	'Class:Incident/Stimulus:ev_reopen+' => '',
-	'Menu:IncidentManagement' => 'インシデント管理',
-	'Menu:IncidentManagement+' => 'インシデント管理',
-	'Menu:Incident:Overview' => '概要',
-	'Menu:Incident:Overview+' => '概要',
-	'Menu:NewIncident' => '新規インシデント',
-	'Menu:NewIncident+' => 'インシデントチケット作成',
-	'Menu:SearchIncidents' => 'インシデント検索',
-	'Menu:SearchIncidents+' => 'インシデントチケット検索',
-	'Menu:Incident:Shortcuts' => 'ショートカット',
-	'Menu:Incident:Shortcuts+' => '',
-	'Menu:Incident:MyIncidents' => '担当しているインシデント',
-	'Menu:Incident:MyIncidents+' => '担当しているインシデント(エージェント)',
-	'Menu:Incident:EscalatedIncidents' => 'エスカレーションされたインシデント',
-	'Menu:Incident:EscalatedIncidents+' => 'エスカレーションされたインシデント',
-	'Menu:Incident:OpenIncidents' => '全オープンインシデント',
-	'Menu:Incident:OpenIncidents+' => '全オープンインシデント',
-	'Menu:Incident:UnassignedIncidents' => '未割り当てインシデント',
-	'Menu:Incident:UnassignedIncidents+' => '未割り当てインシデント',
-	'Menu:Incident:HelpdeskIncidents' => 'レベル2へ割り当てられたインシデント',
-	'Menu:Incident:HelpdeskIncidents+' => 'レベル2へ割り当てられたインシデント',
-	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => '最近14日の優先度別インシデント',
-	'UI-IncidentManagementOverview-Last-14-days' => '最近14日のインシデント数',
-	'UI-IncidentManagementOverview-OpenIncidentByStatus' => '状態別オープンインシデント',
-	'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'エージェント別オープンインシデント',
-	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => '顧客別オープンインシデント',
-	'Class:Incident/Attribute:status/Value:waiting_for_approval' => '承認待ち',
-	'Class:Incident/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:Incident/Attribute:service_name' => 'サービス名',
-	'Class:Incident/Attribute:service_name+' => '',
-	'Class:Incident/Attribute:servicesubcategory_name' => 'サービス中分類名',
-	'Class:Incident/Attribute:servicesubcategory_name+' => '',
-	'Class:Incident/Attribute:parent_incident_ref' => '親インシデント参照',
-	'Class:Incident/Attribute:parent_incident_ref+' => '',
-	'Class:Incident/Attribute:parent_change_ref' => '親変更参照',
-	'Class:Incident/Attribute:parent_change_ref+' => '',
-	'Class:Incident/Attribute:parent_incident_id_friendlyname' => '親インシデント名',
-	'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '',
-));
-?>
+<?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('JA JP', 'Japanese', '日本語', array (
+	'Menu:IncidentManagement' => 'インシデント管理',
+	'Menu:IncidentManagement+' => 'インシデント管理',
+	'Menu:Incident:Overview' => '概要',
+	'Menu:Incident:Overview+' => '概要',
+	'Menu:NewIncident' => '新規インシデント',
+	'Menu:NewIncident+' => 'インシデントチケット作成',
+	'Menu:SearchIncidents' => 'インシデント検索',
+	'Menu:SearchIncidents+' => 'インシデントチケット検索',
+	'Menu:Incident:Shortcuts' => 'ショートカット',
+	'Menu:Incident:Shortcuts+' => '', 
+	'Menu:Incident:MyIncidents' => '担当しているインシデント',
+	'Menu:Incident:MyIncidents+' => '担当しているインシデント(エージェント)',
+	'Menu:Incident:EscalatedIncidents' => 'エスカレーションされたインシデント',
+	'Menu:Incident:EscalatedIncidents+' => 'エスカレーションされたインシデント',
+	'Menu:Incident:OpenIncidents' => '全オープンインシデント',
+	'Menu:Incident:OpenIncidents+' => '全オープンインシデント',
+	'Menu:Incident:UnassignedIncidents' => '未割り当てインシデント',
+	'Menu:Incident:UnassignedIncidents+' => '未割り当てインシデント',
+	'Menu:Incident:HelpdeskIncidents' => 'レベル2へ割り当てられたインシデント',
+	'Menu:Incident:HelpdeskIncidents+' => 'レベル2へ割り当てられたインシデント',
+	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => '最近14日の優先度別インシデント',
+	'UI-IncidentManagementOverview-Last-14-days' => '最近14日のインシデント数',
+	'UI-IncidentManagementOverview-OpenIncidentByStatus' => '状態別オープンインシデント',
+	'UI-IncidentManagementOverview-OpenIncidentByAgent' => 'エージェント別オープンインシデント',
+	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => '顧客別オープンインシデント',
+));
+
+
+
+
+// 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('JA JP', 'Japanese', '日本語', array(
+	'Class:Incident' => 'インシデント',
+	'Class:Incident+' => '',
+	'Class:Incident/Attribute:status' => '状態',
+	'Class:Incident/Attribute:status+' => '',
+	'Class:Incident/Attribute:status/Value:new' => '新規',
+	'Class:Incident/Attribute:status/Value:new+' => '',
+	'Class:Incident/Attribute:status/Value:escalated_tto' => 'エスカレートTTO',
+	'Class:Incident/Attribute:status/Value:escalated_tto+' => '',
+	'Class:Incident/Attribute:status/Value:assigned' => '割り当て',
+	'Class:Incident/Attribute:status/Value:assigned+' => '',
+	'Class:Incident/Attribute:status/Value:escalated_ttr' => 'エスカレートTTR',
+	'Class:Incident/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:Incident/Attribute:status/Value:waiting_for_approval' => '承認待ち',
+	'Class:Incident/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:Incident/Attribute:status/Value:pending' => '保留中',
+	'Class:Incident/Attribute:status/Value:pending+' => '',
+	'Class:Incident/Attribute:status/Value:resolved' => '解決済み',
+	'Class:Incident/Attribute:status/Value:resolved+' => '',
+	'Class:Incident/Attribute:status/Value:closed' => 'クローズ',
+	'Class:Incident/Attribute:status/Value:closed+' => '',
+	'Class:Incident/Attribute:impact' => 'インパクト',
+	'Class:Incident/Attribute:impact+' => '',
+	'Class:Incident/Attribute:impact/Value:1' => '部門',
+	'Class:Incident/Attribute:impact/Value:1+' => '',
+	'Class:Incident/Attribute:impact/Value:2' => 'サービス',
+	'Class:Incident/Attribute:impact/Value:2+' => '',
+	'Class:Incident/Attribute:impact/Value:3' => '個人',
+	'Class:Incident/Attribute:impact/Value:3+' => '',
+	'Class:Incident/Attribute:priority' => '優先度',
+	'Class:Incident/Attribute:priority+' => '',
+	'Class:Incident/Attribute:priority/Value:1' => '重大',
+	'Class:Incident/Attribute:priority/Value:1+' => '重大',
+	'Class:Incident/Attribute:priority/Value:2' => '高',
+	'Class:Incident/Attribute:priority/Value:2+' => '高',
+	'Class:Incident/Attribute:priority/Value:3' => '中',
+	'Class:Incident/Attribute:priority/Value:3+' => '中',
+	'Class:Incident/Attribute:priority/Value:4' => '低',
+	'Class:Incident/Attribute:priority/Value:4+' => '低',
+	'Class:Incident/Attribute:urgency' => '緊急度',
+	'Class:Incident/Attribute:urgency+' => '',
+	'Class:Incident/Attribute:urgency/Value:1' => '至急',
+	'Class:Incident/Attribute:urgency/Value:1+' => '至急',
+	'Class:Incident/Attribute:urgency/Value:2' => '高',
+	'Class:Incident/Attribute:urgency/Value:2+' => '高',
+	'Class:Incident/Attribute:urgency/Value:3' => '中',
+	'Class:Incident/Attribute:urgency/Value:3+' => '中',
+	'Class:Incident/Attribute:urgency/Value:4' => '低',
+	'Class:Incident/Attribute:urgency/Value:4+' => '低',
+	'Class:Incident/Attribute:origin' => '情報源',
+	'Class:Incident/Attribute:origin+' => '',
+	'Class:Incident/Attribute:origin/Value:mail' => 'メール',
+	'Class:Incident/Attribute:origin/Value:mail+' => 'メール',
+	'Class:Incident/Attribute:origin/Value:monitoring' => 'モニタリング',
+	'Class:Incident/Attribute:origin/Value:monitoring+' => 'モニタリング',
+	'Class:Incident/Attribute:origin/Value:phone' => '電話',
+	'Class:Incident/Attribute:origin/Value:phone+' => '電話',
+	'Class:Incident/Attribute:origin/Value:portal' => 'ポータル',
+	'Class:Incident/Attribute:origin/Value:portal+' => 'ポータル',
+	'Class:Incident/Attribute:service_id' => 'サービス',
+	'Class:Incident/Attribute:service_id+' => '',
+	'Class:Incident/Attribute:service_name' => 'サービス名',
+	'Class:Incident/Attribute:service_name+' => '',
+	'Class:Incident/Attribute:servicesubcategory_id' => 'サービス中分類',
+	'Class:Incident/Attribute:servicesubcategory_id+' => '',
+	'Class:Incident/Attribute:servicesubcategory_name' => 'サービス中分類名',
+	'Class:Incident/Attribute:servicesubcategory_name+' => '',
+	'Class:Incident/Attribute:escalation_flag' => 'エスカレーションフラグ',
+	'Class:Incident/Attribute:escalation_flag+' => '',
+	'Class:Incident/Attribute:escalation_flag/Value:no' => 'いいえ',
+	'Class:Incident/Attribute:escalation_flag/Value:no+' => 'いいえ',
+	'Class:Incident/Attribute:escalation_flag/Value:yes' => 'はい',
+	'Class:Incident/Attribute:escalation_flag/Value:yes+' => 'はい',
+	'Class:Incident/Attribute:escalation_reason' => '理由',
+	'Class:Incident/Attribute:escalation_reason+' => '',
+	'Class:Incident/Attribute:assignment_date' => '割り当て日',
+	'Class:Incident/Attribute:assignment_date+' => '',
+	'Class:Incident/Attribute:resolution_date' => '解決日',
+	'Class:Incident/Attribute:resolution_date+' => '',
+	'Class:Incident/Attribute:last_pending_date' => '最終保留日',
+	'Class:Incident/Attribute:last_pending_date+' => '',
+	'Class:Incident/Attribute:cumulatedpending' => '合計保留',
+	'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 期限',
+	'Class:Incident/Attribute:tto_escalation_deadline+' => '',
+	'Class:Incident/Attribute:sla_tto_passed' => 'SLA tto 合格',
+	'Class:Incident/Attribute:sla_tto_passed+' => '',
+	'Class:Incident/Attribute:sla_tto_over' => 'SLA tto オーバー',
+	'Class:Incident/Attribute:sla_tto_over+' => '',
+	'Class:Incident/Attribute:ttr_escalation_deadline' => 'TTR 期限',
+	'Class:Incident/Attribute:ttr_escalation_deadline+' => '',
+	'Class:Incident/Attribute:sla_ttr_passed' => 'SLA ttr 合格',
+	'Class:Incident/Attribute:sla_ttr_passed+' => '',
+	'Class:Incident/Attribute:sla_ttr_over' => 'SLA ttr オーバー',
+	'Class:Incident/Attribute:sla_ttr_over+' => '',
+	'Class:Incident/Attribute:time_spent' => '解決遅れ',
+	'Class:Incident/Attribute:time_spent+' => '',
+	'Class:Incident/Attribute:resolution_code' => '解決コード',
+	'Class:Incident/Attribute:resolution_code+' => '',
+	'Class:Incident/Attribute:resolution_code/Value:assistance' => '補助',
+	'Class:Incident/Attribute:resolution_code/Value:assistance+' => '補助',
+	'Class:Incident/Attribute:resolution_code/Value:bug fixed' => 'バグ修正',
+	'Class:Incident/Attribute:resolution_code/Value:bug fixed+' => 'バグ修正',
+	'Class:Incident/Attribute:resolution_code/Value:hardware repair' => 'ハードウエア修理',
+	'Class:Incident/Attribute:resolution_code/Value:hardware repair+' => 'ハードウエア修理',
+	'Class:Incident/Attribute:resolution_code/Value:other' => 'その他',
+	'Class:Incident/Attribute:resolution_code/Value:other+' => 'その他',
+	'Class:Incident/Attribute:resolution_code/Value:software patch' => 'ソフトウエアパッチ',
+	'Class:Incident/Attribute:resolution_code/Value:software patch+' => 'ソフトウエアパッチ',
+	'Class:Incident/Attribute:resolution_code/Value:system update' => 'システム更新',
+	'Class:Incident/Attribute:resolution_code/Value:system update+' => 'システム更新',
+	'Class:Incident/Attribute:resolution_code/Value:training' => '研修',
+	'Class:Incident/Attribute:resolution_code/Value:training+' => '研修',
+	'Class:Incident/Attribute:solution' => '解決',
+	'Class:Incident/Attribute:solution+' => '',
+	'Class:Incident/Attribute:pending_reason' => '保留理由',
+	'Class:Incident/Attribute:pending_reason+' => '',
+	'Class:Incident/Attribute:parent_incident_id' => '親インシデント',
+	'Class:Incident/Attribute:parent_incident_id+' => '',
+	'Class:Incident/Attribute:parent_incident_ref' => '親インシデント参照',
+	'Class:Incident/Attribute:parent_incident_ref+' => '',
+	'Class:Incident/Attribute:parent_change_id' => '親変更',
+	'Class:Incident/Attribute:parent_change_id+' => '',
+	'Class:Incident/Attribute:parent_change_ref' => '親変更参照',
+	'Class:Incident/Attribute:parent_change_ref+' => '',
+	'Class:Incident/Attribute:child_incidents_list' => '子インシデント',
+	'Class:Incident/Attribute:child_incidents_list+' => '',
+	'Class:Incident/Attribute:public_log' => 'パブリックログ',
+	'Class:Incident/Attribute:public_log+' => '',
+	'Class:Incident/Attribute:user_satisfaction' => 'ユーザ満足度',
+	'Class:Incident/Attribute:user_satisfaction+' => '',
+	'Class:Incident/Attribute:user_satisfaction/Value:1' => '非常に満足',
+	'Class:Incident/Attribute:user_satisfaction/Value:1+' => '非常に満足',
+	'Class:Incident/Attribute:user_satisfaction/Value:2' => '十分満足',
+	'Class:Incident/Attribute:user_satisfaction/Value:2+' => '十分満足',
+	'Class:Incident/Attribute:user_satisfaction/Value:3' => '多少不満',
+	'Class:Incident/Attribute:user_satisfaction/Value:3+' => '多少不満',
+	'Class:Incident/Attribute:user_satisfaction/Value:4' => '非常に不満',
+	'Class:Incident/Attribute:user_satisfaction/Value:4+' => '非常に不満',
+	'Class:Incident/Attribute:user_comment' => 'ユーザコメント',
+	'Class:Incident/Attribute:user_comment+' => '',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname' => '親インシデント名',
+	'Class:Incident/Attribute:parent_incident_id_friendlyname+' => '',
+	'Class:Incident/Stimulus:ev_assign' => '割り当て',
+	'Class:Incident/Stimulus:ev_assign+' => '',
+	'Class:Incident/Stimulus:ev_reassign' => '再割り当て',
+	'Class:Incident/Stimulus:ev_reassign+' => '',
+	'Class:Incident/Stimulus:ev_pending' => '保留',
+	'Class:Incident/Stimulus:ev_pending+' => '',
+	'Class:Incident/Stimulus:ev_timeout' => 'タイムアウト',
+	'Class:Incident/Stimulus:ev_timeout+' => '',
+	'Class:Incident/Stimulus:ev_autoresolve' => '自動解決',
+	'Class:Incident/Stimulus:ev_autoresolve+' => '',
+	'Class:Incident/Stimulus:ev_autoclose' => '自動クローズ',
+	'Class:Incident/Stimulus:ev_autoclose+' => '',
+	'Class:Incident/Stimulus:ev_resolve' => '解決とマーク',
+	'Class:Incident/Stimulus:ev_resolve+' => '',
+	'Class:Incident/Stimulus:ev_close' => 'このリクエストをクローズ',
+	'Class:Incident/Stimulus:ev_close+' => '',
+	'Class:Incident/Stimulus:ev_reopen' => '再オープン',
+	'Class:Incident/Stimulus:ev_reopen+' => '',
+));
+
+
+?>

datamodels/2.x/itop-knownerror-mgmt/de.dict.itop-knownerror-mgmt.php

@@ -98,9 +98,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:FAQCategory/Attribute:name+' => '',
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
 	'Class:FAQCategory/Attribute:faq_list+' => '',
-	'Menu:ProblemManagement' => 'Problem Management',
-	'Menu:ProblemManagement+' => 'Problem Management',
-	'Menu:Problem:Shortcuts' => 'Shortcuts',
 	'Menu:NewError' => 'Neuer bekannter Fehler',
 	'Menu:NewError+' => '',
 	'Menu:SearchError' => 'Nach bekannten Fehler suchen',

datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php

@@ -172,9 +172,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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',

datamodels/2.x/itop-knownerror-mgmt/es_cr.dict.itop-knownerror-mgmt.php

@@ -57,7 +57,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:KnownError' => 'Error Conocido',
 	'Class:KnownError+' => 'Documentación para un error conocido',
 	'Class:KnownError/Attribute:name' => 'Nombre',
-	'Class:KnownError/Attribute:name+' => 'Nombre del Error Conocido',
+	'Class:KnownError/Attribute:name+' => 'Nombre',
 	'Class:KnownError/Attribute:org_id' => 'Organización',
 	'Class:KnownError/Attribute:org_id+' => 'Organización',
 	'Class:KnownError/Attribute:cust_name' => 'Nombre',
@@ -164,17 +164,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 //
 
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Class:FAQCategory' => 'Categoría de Preguntas y Respuesta Frecuentes',
-	'Class:FAQCategory+' => 'Categoría de Preguntas y Respuesta Frecuentes',
+	'Class:FAQCategory' => 'Categoría de Preguntas y Respusta Frecuentes',
+	'Class:FAQCategory+' => 'Categoría de Preguntas y Respusta Frecuentes',
 	'Class:FAQCategory/Attribute:name' => 'Nombre',
-	'Class:FAQCategory/Attribute:name+' => 'Nombre de Categoría de Preguntas y Respuestas Frecuentes',
+	'Class:FAQCategory/Attribute:name+' => 'Nombre',
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
 	'Class:FAQCategory/Attribute:faq_list+' => 'FAQs',
 ));
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
-	'Menu:ProblemManagement' => 'Gestión de problemas',
-	'Menu:ProblemManagement+' => 'Gestión de problemas',
-	'Menu:Problem:Shortcuts' => 'Acceso Rápido',
 	'Menu:NewError' => 'Nuevo Error Conocido',
 	'Menu:NewError+' => 'Nuevo Error Conocido',
 	'Menu:SearchError' => 'Búsqueda de Errores Conocidos',

datamodels/2.x/itop-knownerror-mgmt/fr.dict.itop-knownerror-mgmt.php

@@ -145,9 +145,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 ));
 
 Dict::Add('FR FR', 'French', 'Français', array(
-	'Menu:ProblemManagement' => 'Gestion des problèmes',
-	'Menu:ProblemManagement+' => 'Gestion des problèmes',
-	'Menu:Problem:Shortcuts' => 'Raccourcis',
 	'Menu:NewError' => 'Nouvelle erreur connue',
 	'Menu:NewError+' => 'Créer une erreur connue',
 	'Menu:SearchError' => 'Rechercher une erreur connue',

datamodels/2.x/itop-knownerror-mgmt/hu.dict.itop-knownerror-mgmt.php

@@ -90,9 +90,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Class:lnkDocumentError/Attribute:doc_name+' => '',
 	'Class:lnkDocumentError/Attribute:error_name' => 'Hiba megnevezése',
 	'Class:lnkDocumentError/Attribute:error_name+' => '',
-	'Menu:ProblemManagement' => 'Probléma menedzsment',
-	'Menu:ProblemManagement+' => '',
-	'Menu:Problem:Shortcuts' => 'Gyorsmenü',
 	'Menu:NewError' => 'Új ismert hiba',
 	'Menu:NewError+' => '',
 	'Menu:SearchError' => 'Ismert hiba keresés',

datamodels/2.x/itop-knownerror-mgmt/it.dict.itop-knownerror-mgmt.php

@@ -49,105 +49,102 @@
 // 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: 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: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',
+));
 ?>

datamodels/2.x/itop-knownerror-mgmt/ja.dict.itop-knownerror-mgmt.php

@@ -1,127 +1,187 @@
-<?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
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('JA JP', 'Japanese', '日本語', 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:problem_id' => '関連する問題',
-	'Class:KnownError/Attribute:problem_id+' => '',
-	'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' => 'CI',
-	'Class:KnownError/Attribute:ci_list+' => '',
-	'Class:KnownError/Attribute:document_list' => '文書',
-	'Class:KnownError/Attribute:document_list+' => '',
-	'Class:lnkErrorToFunctionalCI' => 'リンク エラー/機能的CI',
-	'Class:lnkErrorToFunctionalCI+' => '既知のエラーに関連するインフラ',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'エラー',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason' => '理由',
-	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
-	'Class:lnkDocumentToError' => 'リンク 文書/エラー',
-	'Class:lnkDocumentToError+' => '文書と既知のエラー間のリンク',
-	'Class:lnkDocumentToError/Attribute:document_id' => '文書',
-	'Class:lnkDocumentToError/Attribute:document_id+' => '',
-	'Class:lnkDocumentToError/Attribute:error_id' => 'エラー',
-	'Class:lnkDocumentToError/Attribute:error_id+' => '',
-	'Class:lnkDocumentToError/Attribute:link_type' => 'リンクタイプ',
-	'Class:lnkDocumentToError/Attribute:link_type+' => '',
-	'Class:FAQ' => 'FAQ',
-	'Class:FAQ+' => 'よくある質問',
-	'Class:FAQ/Attribute:title' => 'タイトル',
-	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => '要約',
-	'Class:FAQ/Attribute:summary+' => '',
-	'Class:FAQ/Attribute:description' => '説明',
-	'Class:FAQ/Attribute:description+' => '',
-	'Class:FAQ/Attribute:category_id' => 'カテゴリ',
-	'Class:FAQ/Attribute:category_id+' => '',
-	'Class:FAQ/Attribute:error_code' => 'エラーコード',
-	'Class:FAQ/Attribute:error_code+' => '',
-	'Class:FAQ/Attribute:key_words' => 'キーワード',
-	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQCategory' => 'FAQカテゴリ',
-	'Class:FAQCategory+' => 'FAQのためのカテゴリ',
-	'Class:FAQCategory/Attribute:name' => '名前',
-	'Class:FAQCategory/Attribute:name+' => '',
-	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
-	'Class:FAQCategory/Attribute:faq_list+' => '',
-	'Class:KnownError/Attribute:cust_name' => '顧客名',
-	'Class:KnownError/Attribute:cust_name+' => '',
-	'Class:KnownError/Attribute:problem_ref' => '参照',
-	'Class:KnownError/Attribute:problem_ref+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI名',
-	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'エラー名',
-	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
-	'Class:lnkDocumentToError/Attribute:document_name' => '文書名',
-	'Class:lnkDocumentToError/Attribute:document_name+' => '',
-	'Class:lnkDocumentToError/Attribute:error_name' => 'エラー名',
-	'Class:lnkDocumentToError/Attribute:error_name+' => '',
-	'Class:FAQ/Attribute:category_name' => 'カテゴリ名',
-	'Class:FAQ/Attribute:category_name+' => '',
-	'Menu:ProblemManagement' => '問題管理',
-	'Menu:ProblemManagement+' => '問題管理',
-	'Menu:Problem:Shortcuts' => 'ショートカット',
-	'Menu:NewError' => '新規既知のエラー',
-	'Menu:NewError+' => '新規既知のエラーの作成',
-	'Menu:SearchError' => '既知のエラー検索',
-	'Menu:SearchError+' => '既知のエラー検索',
-	'Menu:Problem:KnownErrors' => '全ての既知のエラー',
-	'Menu:Problem:KnownErrors+' => '全ての既知のエラー',
-	'Menu:FAQCategory' => 'FAQカテゴリ',
-	'Menu:FAQCategory+' => '全てのFAQカテゴリ',
-	'Menu:FAQ' => 'FAQ',
-	'Menu:FAQ+' => '全FAQ',
-));
-?>
+<?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('JA JP', 'Japanese', '日本語', 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' => 'CI',
+	'Class:KnownError/Attribute:ci_list+' => '',
+	'Class:KnownError/Attribute:document_list' => '文書',
+	'Class:KnownError/Attribute:document_list+' => '',
+));
+
+//
+// Class: lnkErrorToFunctionalCI
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkErrorToFunctionalCI' => 'リンク エラー/機能的CI',
+	'Class:lnkErrorToFunctionalCI+' => '既知のエラーに関連するインフラ',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI名',
+	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'エラー',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'エラー名',
+	'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason' => '理由',
+	'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '',
+));
+
+//
+// Class: lnkDocumentToError
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkDocumentToError' => 'リンク 文書/エラー',
+	'Class:lnkDocumentToError+' => '文書と既知のエラー間のリンク',
+	'Class:lnkDocumentToError/Attribute:document_id' => '文書',
+	'Class:lnkDocumentToError/Attribute:document_id+' => '',
+	'Class:lnkDocumentToError/Attribute:document_name' => '文書名',
+	'Class:lnkDocumentToError/Attribute:document_name+' => '',
+	'Class:lnkDocumentToError/Attribute:error_id' => 'エラー',
+	'Class:lnkDocumentToError/Attribute:error_id+' => '',
+	'Class:lnkDocumentToError/Attribute:error_name' => 'エラー名',
+	'Class:lnkDocumentToError/Attribute:error_name+' => '',
+	'Class:lnkDocumentToError/Attribute:link_type' => 'リンクタイプ',
+	'Class:lnkDocumentToError/Attribute:link_type+' => '',
+));
+
+//
+// Class: FAQ
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:FAQ' => 'FAQ',
+	'Class:FAQ+' => 'よくある質問',
+	'Class:FAQ/Attribute:title' => 'タイトル',
+	'Class:FAQ/Attribute:title+' => '',
+	'Class:FAQ/Attribute:summary' => '要約',
+	'Class:FAQ/Attribute:summary+' => '',
+	'Class:FAQ/Attribute:description' => '説明',
+	'Class:FAQ/Attribute:description+' => '',
+	'Class:FAQ/Attribute:category_id' => 'カテゴリ',
+	'Class:FAQ/Attribute:category_id+' => '',
+	'Class:FAQ/Attribute:category_name' => 'カテゴリ名',
+	'Class:FAQ/Attribute:category_name+' => '',
+	'Class:FAQ/Attribute:error_code' => 'エラーコード',
+	'Class:FAQ/Attribute:error_code+' => '',
+	'Class:FAQ/Attribute:key_words' => 'キーワード',
+	'Class:FAQ/Attribute:key_words+' => '',
+));
+
+//
+// Class: FAQcategory
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:FAQCategory' => 'FAQカテゴリ',
+	'Class:FAQCategory+' => 'FAQのためのカテゴリ',
+	'Class:FAQCategory/Attribute:name' => '名前',
+	'Class:FAQCategory/Attribute:name+' => '',
+	'Class:FAQCategory/Attribute:faq_list' => 'FAQ',
+	'Class:FAQCategory/Attribute:faq_list+' => '',
+));
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Menu:NewError' => '新規既知のエラー',
+	'Menu:NewError+' => '新規既知のエラーの作成',
+	'Menu:SearchError' => '既知のエラー検索',
+	'Menu:SearchError+' => '既知のエラー検索',
+        'Menu:Problem:KnownErrors' => '全ての既知のエラー',
+        'Menu:Problem:KnownErrors+' => '全ての既知のエラー',
+	'Menu:FAQCategory' => 'FAQカテゴリ',
+	'Menu:FAQCategory+' => '全てのFAQカテゴリ',
+	'Menu:FAQ' => 'FAQ',
+	'Menu:FAQ+' => '全FAQ',
+
+));
+?>

datamodels/2.x/itop-knownerror-mgmt/pt_br.dict.itop-knownerror-mgmt.php

@@ -91,9 +91,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkDocumentError/Attribute:doc_name+' => '',
 	'Class:lnkDocumentError/Attribute:error_name' => 'Nome Erro',
 	'Class:lnkDocumentError/Attribute:error_name+' => '',
-	'Menu:ProblemManagement' => 'Gerenciamento Problemas',
-	'Menu:ProblemManagement+' => 'Gerenciamento Problemas',
-	'Menu:Problem:Shortcuts' => 'Atalhos',
 	'Menu:NewError' => 'Novo erro conhecido',
 	'Menu:NewError+' => 'Criação de um novo erro conhecido',
 	'Menu:SearchError' => 'Pesquisar Erros Conhecidos',

datamodels/2.x/itop-knownerror-mgmt/ru.dict.itop-knownerror-mgmt.php

@@ -98,9 +98,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:FAQCategory/Attribute:name+' => '',
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
 	'Class:FAQCategory/Attribute:faq_list+' => '',
-	'Menu:ProblemManagement' => 'Управление проблемами',
-	'Menu:ProblemManagement+' => 'Управление проблемами',
-	'Menu:Problem:Shortcuts' => 'Ярлыки',
 	'Menu:NewError' => 'Новая известная ошибка',
 	'Menu:NewError+' => 'Создание новой известной ошибки',
 	'Menu:SearchError' => 'Поиск известных ошибок',

datamodels/2.x/itop-knownerror-mgmt/tr.dict.itop-knownerror-mgmt.php

@@ -50,105 +50,102 @@
 // 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: 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: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',
+));
 ?>

datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php

@@ -141,9 +141,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 ));
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
-	'Menu:ProblemManagement' => '问题管理',
-	'Menu:ProblemManagement+' => '问题管理',
-	'Menu:Problem:Shortcuts' => '快捷方式',
 	'Menu:NewError' => '新的已知错误',
 	'Menu:NewError+' => '新已知错误的创建',
 	'Menu:SearchError' => '搜索已知错误',

datamodels/2.x/itop-problem-mgmt/ja.dict.itop-problem-mgmt.php

@@ -1,117 +1,156 @@
-<?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
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('JA JP', 'Japanese', '日本語', 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:service_id' => 'サービス',
-	'Class:Problem/Attribute:service_id+' => '',
-	'Class:Problem/Attribute:servicesubcategory_id' => 'サービスサブカテゴリ',
-	'Class:Problem/Attribute:servicesubcategory_id+' => '',
-	'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:urgency/Value:4' => '低',
-	'Class:Problem/Attribute:urgency/Value:4+' => '低',
-	'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:priority/Value:4' => '低',
-	'Class:Problem/Attribute:priority/Value:4+' => '低',
-	'Class:Problem/Attribute:related_change_id' => '関連する変更',
-	'Class:Problem/Attribute:related_change_id+' => '',
-	'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/Attribute:related_request_list' => '関連する要求',
-	'Class:Problem/Attribute:related_request_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+' => '',
-	'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/Attribute:service_name' => 'サービス名',
-	'Class:Problem/Attribute:service_name+' => '',
-	'Class:Problem/Attribute:servicesubcategory_name' => 'サービスサブカテゴリ',
-	'Class:Problem/Attribute:servicesubcategory_name+' => '',
-	'Class:Problem/Attribute:related_change_ref' => '関連する変更参照',
-	'Class:Problem/Attribute:related_change_ref+' => '',
-));
-?>
+<?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('JA JP', 'Japanese', '日本語', 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('JA JP', 'Japanese', '日本語', 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: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:urgency/Value:4' => '低',
+	'Class:Problem/Attribute:urgency/Value:4+' => '低',
+	'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:priority/Value:4' => '低',
+	'Class:Problem/Attribute:priority/Value:4+' => '低',
+	'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: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/Attribute:related_request_list' => '関連する要求',
+	'Class:Problem/Attribute:related_request_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+' => '',
+));
+
+?>

datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -599,11 +599,6 @@
           </group>
         </groups>
       </profile>
-      <profile id="12" _delta="define">
-        <name>Portal power user</name>
-        <description>Users having this profile will have the rights to see all the tickets for a customer in the portal. Must be used in conjunction with other profiles (e.g. Portal User).</description>
-        <groups/>
-      </profile>
     </profiles>
   </user_rights>
 </itop_design>

datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml

@@ -2110,7 +2110,7 @@
             <item id="col:col3">
               <rank>70</rank>
               <items>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>10</rank>
                   <items>
                     <item id="parent_request_id">

datamodels/2.x/itop-request-mgmt-itil/es_cr.dict.itop-request-mgmt-itil.php

@@ -29,8 +29,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:RequestManagement+' => 'Administración de Requerimientos',
 	'Menu:RequestManagementProvider' => 'Proveedor de Mesa de Ayuda',
 	'Menu:RequestManagementProvider+' => 'Proveedor de Mesa de Ayuda',
-	'Menu:UserRequest:Provider' => 'Requerimientos Abiertos transferidos a Proveedor',
-	'Menu:UserRequest:Provider+' => 'Requerimientos Abiertos transferidos a Proveedor',
+	'Menu:UserRequest:Provider' => 'Reequerimientos Abiertos transferidos a Proveedor',
+	'Menu:UserRequest:Provider+' => 'Reequerimientos Abiertos transferidos a Proveedor',
 	'Menu:UserRequest:Overview' => 'Resumen de Requerimientos',
 	'Menu:UserRequest:Overview+' => 'Resumen de Requerimientos',
 	'Menu:NewUserRequest' => 'Nuevo Requerimiento',
@@ -54,7 +54,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI-RequestManagementOverview-Last-14-days' => 'Número de Requerimientos de los Últimos 14 días',
 	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Requerimientos Abiertos por Estatus',
 	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Requerimientos Abiertos por Analista',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Requerimientos Abiertos por Tipo',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Requerimientos Abiretos por Tipo',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Requerimientos Abiertos por Cliente',
 	'Class:UserRequest:KnownErrorList' => 'Errores Conocidos',
 ));

datamodels/2.x/itop-request-mgmt-itil/ja.dict.itop-request-mgmt-itil.php

@@ -1,242 +1,267 @@
-<?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
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:UserRequest' => 'ユーザ要求',
-	'Class:UserRequest+' => '',
-	'Class:UserRequest/Attribute:status' => '状態',
-	'Class:UserRequest/Attribute:status+' => '',
-	'Class:UserRequest/Attribute:status/Value:new' => '新規',
-	'Class:UserRequest/Attribute:status/Value:new+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'エスカレーションTTO',
-	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
-	'Class:UserRequest/Attribute:status/Value:assigned' => '割り当て済み',
-	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'エスカレーションTTR',
-	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => '承認待ち',
-	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
-	'Class:UserRequest/Attribute:status/Value:approved' => '承認済み',
-	'Class:UserRequest/Attribute:status/Value:approved+' => '',
-	'Class:UserRequest/Attribute:status/Value:rejected' => '否認済み',
-	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
-	'Class:UserRequest/Attribute:status/Value:pending' => '保留中',
-	'Class:UserRequest/Attribute:status/Value:pending+' => '',
-	'Class:UserRequest/Attribute:status/Value:resolved' => '解決済み',
-	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
-	'Class:UserRequest/Attribute:status/Value:closed' => 'クローズ',
-	'Class:UserRequest/Attribute:status/Value:closed+' => '',
-	'Class:UserRequest/Attribute:request_type' => '要求タイプ',
-	'Class:UserRequest/Attribute:request_type+' => '',
-	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'サービス要求',
-	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'サービス要求',
-	'Class:UserRequest/Attribute:impact' => 'インパクト',
-	'Class:UserRequest/Attribute:impact+' => '',
-	'Class:UserRequest/Attribute:impact/Value:1' => '部門',
-	'Class:UserRequest/Attribute:impact/Value:1+' => '',
-	'Class:UserRequest/Attribute:impact/Value:2' => 'サービス',
-	'Class:UserRequest/Attribute:impact/Value:2+' => '',
-	'Class:UserRequest/Attribute:impact/Value:3' => '人',
-	'Class:UserRequest/Attribute:impact/Value:3+' => '',
-	'Class:UserRequest/Attribute:priority' => '優先度',
-	'Class:UserRequest/Attribute:priority+' => '',
-	'Class:UserRequest/Attribute:priority/Value:1' => '最優先',
-	'Class:UserRequest/Attribute:priority/Value:1+' => '最優先',
-	'Class:UserRequest/Attribute:priority/Value:2' => '高',
-	'Class:UserRequest/Attribute:priority/Value:2+' => '高',
-	'Class:UserRequest/Attribute:priority/Value:3' => '中',
-	'Class:UserRequest/Attribute:priority/Value:3+' => '中',
-	'Class:UserRequest/Attribute:priority/Value:4' => '低',
-	'Class:UserRequest/Attribute:priority/Value:4+' => '低',
-	'Class:UserRequest/Attribute:urgency' => '緊急度',
-	'Class:UserRequest/Attribute:urgency+' => '',
-	'Class:UserRequest/Attribute:urgency/Value:1' => '至急',
-	'Class:UserRequest/Attribute:urgency/Value:1+' => '至急',
-	'Class:UserRequest/Attribute:urgency/Value:2' => '高',
-	'Class:UserRequest/Attribute:urgency/Value:2+' => '高',
-	'Class:UserRequest/Attribute:urgency/Value:3' => '中',
-	'Class:UserRequest/Attribute:urgency/Value:3+' => '中',
-	'Class:UserRequest/Attribute:urgency/Value:4' => '低',
-	'Class:UserRequest/Attribute:urgency/Value:4+' => '低',
-	'Class:UserRequest/Attribute:origin' => '起源',
-	'Class:UserRequest/Attribute:origin+' => '',
-	'Class:UserRequest/Attribute:origin/Value:mail' => 'メール',
-	'Class:UserRequest/Attribute:origin/Value:mail+' => 'メール',
-	'Class:UserRequest/Attribute:origin/Value:phone' => '電話',
-	'Class:UserRequest/Attribute:origin/Value:phone+' => '電話',
-	'Class:UserRequest/Attribute:origin/Value:portal' => 'ポータル',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => 'ポータル',
-	'Class:UserRequest/Attribute:approver_id' => '承認者',
-	'Class:UserRequest/Attribute:approver_id+' => '',
-	'Class:UserRequest/Attribute:service_id' => 'サービス',
-	'Class:UserRequest/Attribute:service_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'サービスサブカテゴリ',
-	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:escalation_flag' => 'エスカレーションフラグ',
-	'Class:UserRequest/Attribute:escalation_flag+' => '',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'いいえ',
-	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'いいえ',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'はい',
-	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'はい',
-	'Class:UserRequest/Attribute:escalation_reason' => 'エスカレーションの理由',
-	'Class:UserRequest/Attribute:escalation_reason+' => '',
-	'Class:UserRequest/Attribute:assignment_date' => '割り当て日',
-	'Class:UserRequest/Attribute:assignment_date+' => '',
-	'Class:UserRequest/Attribute:resolution_date' => '解決日',
-	'Class:UserRequest/Attribute:resolution_date+' => '',
-	'Class:UserRequest/Attribute:last_pending_date' => '最後の保留日',
-	'Class:UserRequest/Attribute:last_pending_date+' => '',
-	'Class:UserRequest/Attribute: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期限',
-	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto 合格',
-	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
-	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto オーバー',
-	'Class:UserRequest/Attribute:sla_tto_over+' => '',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR期限',
-	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr 合格',
-	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
-	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr オーバー',
-	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
-	'Class:UserRequest/Attribute:time_spent' => '解決遅れ',
-	'Class:UserRequest/Attribute:time_spent+' => '',
-	'Class:UserRequest/Attribute:resolution_code' => '解決コード',
-	'Class:UserRequest/Attribute:resolution_code+' => '',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => '補助',
-	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '補助',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'バグ修正',
-	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'バグ修正',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'ハードウエア修理',
-	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'ハードウエア修理',
-	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'その他',
-	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'その他',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'ソフトウエアパッチ',
-	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'ソフトウエアパッチ',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'システム更新',
-	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'システム更新',
-	'Class:UserRequest/Attribute:resolution_code/Value:training' => '研修',
-	'Class:UserRequest/Attribute:resolution_code/Value:training+' => '研修',
-	'Class:UserRequest/Attribute:solution' => '解決',
-	'Class:UserRequest/Attribute:solution+' => '',
-	'Class:UserRequest/Attribute:pending_reason' => '保留理由',
-	'Class:UserRequest/Attribute:pending_reason+' => '',
-	'Class:UserRequest/Attribute:parent_request_id' => '親要求',
-	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_id' => '親問題',
-	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_id' => '親変更',
-	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:related_request_list' => '子要求',
-	'Class:UserRequest/Attribute:related_request_list+' => '',
-	'Class:UserRequest/Attribute:public_log' => '公開ログ',
-	'Class:UserRequest/Attribute:public_log+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction' => 'ユーザ満足度',
-	'Class:UserRequest/Attribute:user_satisfaction+' => '',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => '非常に満足',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '非常に満足',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => '十分満足',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '十分満足',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => '多少不満',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '多少不満',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => '非常に不満',
-	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '非常に不満',
-	'Class:UserRequest/Attribute:user_comment' => 'ユーザコメント',
-	'Class:UserRequest/Attribute:user_comment+' => '',
-	'Class:UserRequest/Stimulus:ev_assign' => '割り当て',
-	'Class:UserRequest/Stimulus:ev_assign+' => '',
-	'Class:UserRequest/Stimulus:ev_reassign' => '再割り当て',
-	'Class:UserRequest/Stimulus:ev_reassign+' => '',
-	'Class:UserRequest/Stimulus:ev_approve' => '承認',
-	'Class:UserRequest/Stimulus:ev_approve+' => '',
-	'Class:UserRequest/Stimulus:ev_reject' => '否認',
-	'Class:UserRequest/Stimulus:ev_reject+' => '',
-	'Class:UserRequest/Stimulus:ev_pending' => '保留',
-	'Class:UserRequest/Stimulus:ev_pending+' => '',
-	'Class:UserRequest/Stimulus:ev_timeout' => 'タイムアウト',
-	'Class:UserRequest/Stimulus:ev_timeout+' => '',
-	'Class:UserRequest/Stimulus:ev_autoresolve' => '自動解決',
-	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
-	'Class:UserRequest/Stimulus:ev_autoclose' => '自動クローズ',
-	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
-	'Class:UserRequest/Stimulus:ev_resolve' => '解決済みとマーク',
-	'Class:UserRequest/Stimulus:ev_resolve+' => '',
-	'Class:UserRequest/Stimulus:ev_close' => 'この要求をクローズ',
-	'Class:UserRequest/Stimulus:ev_close+' => '',
-	'Class:UserRequest/Stimulus:ev_reopen' => '再オープン',
-	'Class:UserRequest/Stimulus:ev_reopen+' => '',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval' => '承認待ち',
-	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
-	'Menu:RequestManagement' => 'ヘルプデスク',
-	'Menu:RequestManagement+' => 'ヘルプデスクk',
-	'Menu:RequestManagementProvider' => 'ヘルプデスクプロバイダー',
-	'Menu:RequestManagementProvider+' => 'ヘルプディスクプロバイダー',
-	'Menu:UserRequest:Provider' => 'プロバイダーに移管されたオープンな要求',
-	'Menu:UserRequest:Provider+' => 'プロバイダーに移管されたオープンな要求',
-	'Menu:UserRequest:Overview' => '概要',
-	'Menu:UserRequest:Overview+' => '概要',
-	'Menu:NewUserRequest' => '新規ユーザ要求',
-	'Menu:NewUserRequest+' => '新規ユーザ要求チケットの作成',
-	'Menu:SearchUserRequests' => 'ユーザ要求検索',
-	'Menu:SearchUserRequests+' => 'ユーザ要求チケットの検索',
-	'Menu:UserRequest:Shortcuts' => 'ショートカット',
-	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => '私に割り当てられた要求',
-	'Menu:UserRequest:MyRequests+' => '私に割り当てられた要求（エージェントとして）',
-	'Menu:UserRequest:MySupportRequests' => '私のサポートコール',
-	'Menu:UserRequest:MySupportRequests+' => '私のサポートコール',
-	'Menu:UserRequest:EscalatedRequests' => 'エスカレートされた要求',
-	'Menu:UserRequest:EscalatedRequests+' => 'エスカレートされた要求',
-	'Menu:UserRequest:OpenRequests' => '全てのオープンな要求',
-	'Menu:UserRequest:OpenRequests+' => '全てのオープンな要求',
-	'UI:WelcomeMenu:MyAssignedCalls' => '私に割り当てられた要求',
-	'UI-RequestManagementOverview-RequestByType-last-14-days' => '最近14日間のタイプ別要求',
-	'UI-RequestManagementOverview-Last-14-days' => '最近14日間の要求数',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => 'ステータス別のオープンなリクエスト',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => 'エージェント別のオープンなリクエスト',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'タイプ別のオープンなリクエスト',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => '顧客別のオープンなリクエスト',
-	'Class:UserRequest:KnownErrorList' => '既知のエラー',
-	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'モニタリング',
-	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'モニタリング',
-	'Class:UserRequest/Attribute:approver_email' => '承認者メール',
-	'Class:UserRequest/Attribute:approver_email+' => '',
-	'Class:UserRequest/Attribute:service_name' => 'サービス名',
-	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'サービスサブカテゴリ名',
-	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => '参照要求',
-	'Class:UserRequest/Attribute:parent_request_ref+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => '参照問題',
-	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => '参照変更',
-	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => '親要求id名',
-	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
-));
-?>
+<?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('JA JP', 'Japanese', '日本語', array(
+	'Menu:RequestManagement' => 'ヘルプデスク',
+	'Menu:RequestManagement+' => 'ヘルプデスクk',
+	'Menu:RequestManagementProvider' => 'ヘルプデスクプロバイダー',
+	'Menu:RequestManagementProvider+' => 'ヘルプディスクプロバイダー',
+	'Menu:UserRequest:Provider' => 'プロバイダーに移管されたオープンな要求',
+	'Menu:UserRequest:Provider+' => 'プロバイダーに移管されたオープンな要求',
+	'Menu:UserRequest:Overview' => '概要',
+	'Menu:UserRequest:Overview+' => '概要',
+	'Menu:NewUserRequest' => '新規ユーザ要求',
+	'Menu:NewUserRequest+' => '新規ユーザ要求チケットの作成',
+	'Menu:SearchUserRequests' => 'ユーザ要求検索',
+	'Menu:SearchUserRequests+' => 'ユーザ要求チケットの検索',
+	'Menu:UserRequest:Shortcuts' => 'ショートカット',
+	'Menu:UserRequest:Shortcuts+' => '',
+	'Menu:UserRequest:MyRequests' => '私に割り当てられた要求',
+	'Menu:UserRequest:MyRequests+' => '私に割り当てられた要求（エージェントとして）',
+	'Menu:UserRequest:MySupportRequests' => "私のサポートコール",
+	'Menu:UserRequest:MySupportRequests+' => "私のサポートコール",
+	'Menu:UserRequest:EscalatedRequests' => 'エスカレートされた要求',
+	'Menu:UserRequest:EscalatedRequests+' => 'エスカレートされた要求',
+	'Menu:UserRequest:OpenRequests' => '全てのオープンな要求',
+	'Menu:UserRequest:OpenRequests+' => '全てのオープンな要求',
+	'Menu:UserRequest:OpenProblems' => '全てのオープンな問題',
+	'Menu:UserRequest:OpenProblems+' => '全てのオープンな問題',
+	'UI:WelcomeMenu:MyAssignedCalls' => '私に割り当てられた要求',
+	'UI-RequestManagementOverview-RequestByType-last-14-days' => '最近14日間のタイプ別要求',
+	'UI-RequestManagementOverview-Last-14-days' => '最近14日間の要求数',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => 'ステータス別のオープンなリクエスト',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => 'エージェント別のオープンなリクエスト',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'タイプ別のオープンなリクエスト',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => '顧客別のオープンなリクエスト',
+	'Class:UserRequest:KnownErrorList' => '既知のエラー',
+));
+
+// 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('JA JP', 'Japanese', '日本語', array(
+	'Class:UserRequest' => 'ユーザ要求',
+	'Class:UserRequest+' => '',
+	'Class:UserRequest/Attribute:status' => '状態',
+	'Class:UserRequest/Attribute:status+' => '',
+	'Class:UserRequest/Attribute:status/Value:new' => '新規',
+	'Class:UserRequest/Attribute:status/Value:new+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto' => 'エスカレーションTTO',
+	'Class:UserRequest/Attribute:status/Value:escalated_tto+' => '',
+	'Class:UserRequest/Attribute:status/Value:assigned' => '割り当て済み',
+	'Class:UserRequest/Attribute:status/Value:assigned+' => '',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr' => 'エスカレーションTTR',
+	'Class:UserRequest/Attribute:status/Value:escalated_ttr+' => '',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval' => '承認待ち',
+	'Class:UserRequest/Attribute:status/Value:waiting_for_approval+' => '',
+	'Class:UserRequest/Attribute:status/Value:approved' => '承認済み',
+	'Class:UserRequest/Attribute:status/Value:approved+' => '',
+	'Class:UserRequest/Attribute:status/Value:rejected' => '否認済み',
+	'Class:UserRequest/Attribute:status/Value:rejected+' => '',
+	'Class:UserRequest/Attribute:status/Value:pending' => '保留中',
+	'Class:UserRequest/Attribute:status/Value:pending+' => '',
+	'Class:UserRequest/Attribute:status/Value:resolved' => '解決済み',
+	'Class:UserRequest/Attribute:status/Value:resolved+' => '',
+	'Class:UserRequest/Attribute:status/Value:closed' => 'クローズ',
+	'Class:UserRequest/Attribute:status/Value:closed+' => '',
+	'Class:UserRequest/Attribute:request_type' => '要求タイプ',
+	'Class:UserRequest/Attribute:request_type+' => '',
+	'Class:UserRequest/Attribute:request_type/Value:service_request' => 'サービス要求',
+	'Class:UserRequest/Attribute:request_type/Value:service_request+' => 'サービス要求',
+	'Class:UserRequest/Attribute:impact' => 'インパクト',
+	'Class:UserRequest/Attribute:impact+' => '',
+	'Class:UserRequest/Attribute:impact/Value:1' => '部門',
+	'Class:UserRequest/Attribute:impact/Value:1+' => '',
+	'Class:UserRequest/Attribute:impact/Value:2' => 'サービス',
+	'Class:UserRequest/Attribute:impact/Value:2+' => '',
+	'Class:UserRequest/Attribute:impact/Value:3' => '人',
+	'Class:UserRequest/Attribute:impact/Value:3+' => '',
+	'Class:UserRequest/Attribute:priority' => '優先度',
+	'Class:UserRequest/Attribute:priority+' => '',
+	'Class:UserRequest/Attribute:priority/Value:1' => '最優先',
+	'Class:UserRequest/Attribute:priority/Value:1+' => '最優先',
+	'Class:UserRequest/Attribute:priority/Value:2' => '高',
+	'Class:UserRequest/Attribute:priority/Value:2+' => '高',
+	'Class:UserRequest/Attribute:priority/Value:3' => '中',
+	'Class:UserRequest/Attribute:priority/Value:3+' => '中',
+	'Class:UserRequest/Attribute:priority/Value:4' => '低',
+	'Class:UserRequest/Attribute:priority/Value:4+' => '低',
+	'Class:UserRequest/Attribute:urgency' => '緊急度',
+	'Class:UserRequest/Attribute:urgency+' => '',
+	'Class:UserRequest/Attribute:urgency/Value:1' => '至急',
+	'Class:UserRequest/Attribute:urgency/Value:1+' => '至急',
+	'Class:UserRequest/Attribute:urgency/Value:2' => '高',
+	'Class:UserRequest/Attribute:urgency/Value:2+' => '高',
+	'Class:UserRequest/Attribute:urgency/Value:3' => '中',
+	'Class:UserRequest/Attribute:urgency/Value:3+' => '中',
+	'Class:UserRequest/Attribute:urgency/Value:4' => '低',
+	'Class:UserRequest/Attribute:urgency/Value:4+' => '低',
+	'Class:UserRequest/Attribute:origin' => '起源',
+	'Class:UserRequest/Attribute:origin+' => '',
+	'Class:UserRequest/Attribute:origin/Value:mail' => 'メール',
+	'Class:UserRequest/Attribute:origin/Value:mail+' => 'メール',
+	'Class:UserRequest/Attribute:origin/Value:monitoring' => 'モニタリング',
+	'Class:UserRequest/Attribute:origin/Value:monitoring+' => 'モニタリング',
+	'Class:UserRequest/Attribute:origin/Value:phone' => '電話',
+	'Class:UserRequest/Attribute:origin/Value:phone+' => '電話',
+	'Class:UserRequest/Attribute:origin/Value:portal' => 'ポータル',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'ポータル',
+	'Class:UserRequest/Attribute:approver_id' => '承認者',
+	'Class:UserRequest/Attribute:approver_id+' => '',
+	'Class:UserRequest/Attribute:approver_email' => '承認者メール',
+	'Class:UserRequest/Attribute:approver_email+' => '',
+	'Class:UserRequest/Attribute:service_id' => 'サービス',
+	'Class:UserRequest/Attribute:service_id+' => '',
+	'Class:UserRequest/Attribute:service_name' => 'サービス名',
+	'Class:UserRequest/Attribute:service_name+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'サービスサブカテゴリ',
+	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'サービスサブカテゴリ名',
+	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
+	'Class:UserRequest/Attribute:escalation_flag' => 'エスカレーションフラグ',
+	'Class:UserRequest/Attribute:escalation_flag+' => '',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no' => 'いいえ',
+	'Class:UserRequest/Attribute:escalation_flag/Value:no+' => 'いいえ',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes' => 'はい',
+	'Class:UserRequest/Attribute:escalation_flag/Value:yes+' => 'はい',
+	'Class:UserRequest/Attribute:escalation_reason' => 'エスカレーションの理由',
+	'Class:UserRequest/Attribute:escalation_reason+' => '',
+	'Class:UserRequest/Attribute:assignment_date' => '割り当て日',
+	'Class:UserRequest/Attribute:assignment_date+' => '',
+	'Class:UserRequest/Attribute:resolution_date' => '解決日',
+	'Class:UserRequest/Attribute:resolution_date+' => '',
+	'Class:UserRequest/Attribute:last_pending_date' => '最後の保留日',
+	'Class:UserRequest/Attribute:last_pending_date+' => '',
+	'Class:UserRequest/Attribute: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期限',
+	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA tto 合格',
+	'Class:UserRequest/Attribute:sla_tto_passed+' => '',
+	'Class:UserRequest/Attribute:sla_tto_over' => 'SLA tto オーバー',
+	'Class:UserRequest/Attribute:sla_tto_over+' => '',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline' => 'TTR期限',
+	'Class:UserRequest/Attribute:ttr_escalation_deadline+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_passed' => 'SLA ttr 合格',
+	'Class:UserRequest/Attribute:sla_ttr_passed+' => '',
+	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA ttr オーバー',
+	'Class:UserRequest/Attribute:sla_ttr_over+' => '',
+	'Class:UserRequest/Attribute:time_spent' => '解決遅れ',
+	'Class:UserRequest/Attribute:time_spent+' => '',
+	'Class:UserRequest/Attribute:resolution_code' => '解決コード',
+	'Class:UserRequest/Attribute:resolution_code+' => '',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance' => '補助',
+	'Class:UserRequest/Attribute:resolution_code/Value:assistance+' => '補助',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed' => 'バグ修正',
+	'Class:UserRequest/Attribute:resolution_code/Value:bug fixed+' => 'バグ修正',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair' => 'ハードウエア修理',
+	'Class:UserRequest/Attribute:resolution_code/Value:hardware repair+' => 'ハードウエア修理',
+	'Class:UserRequest/Attribute:resolution_code/Value:other' => 'その他',
+	'Class:UserRequest/Attribute:resolution_code/Value:other+' => 'その他',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch' => 'ソフトウエアパッチ',
+	'Class:UserRequest/Attribute:resolution_code/Value:software patch+' => 'ソフトウエアパッチ',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update' => 'システム更新',
+	'Class:UserRequest/Attribute:resolution_code/Value:system update+' => 'システム更新',
+	'Class:UserRequest/Attribute:resolution_code/Value:training' => '研修',
+	'Class:UserRequest/Attribute:resolution_code/Value:training+' => '研修',
+	'Class:UserRequest/Attribute:solution' => '解決',
+	'Class:UserRequest/Attribute:solution+' => '',
+	'Class:UserRequest/Attribute:pending_reason' => '保留理由',
+	'Class:UserRequest/Attribute:pending_reason+' => '',
+	'Class:UserRequest/Attribute:parent_request_id' => '親要求',
+	'Class:UserRequest/Attribute:parent_request_id+' => '',
+	'Class:UserRequest/Attribute:parent_request_ref' => '参照要求',
+	'Class:UserRequest/Attribute:parent_request_ref+' => '',
+	'Class:UserRequest/Attribute:parent_problem_id' => '親問題',
+	'Class:UserRequest/Attribute:parent_problem_id+' => '',
+	'Class:UserRequest/Attribute:parent_problem_ref' => '参照問題',
+	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
+	'Class:UserRequest/Attribute:parent_change_id' => '親変更',
+	'Class:UserRequest/Attribute:parent_change_id+' => '',
+	'Class:UserRequest/Attribute:parent_change_ref' => '参照変更',
+	'Class:UserRequest/Attribute:parent_change_ref+' => '',
+	'Class:UserRequest/Attribute:related_request_list' => '子要求',
+	'Class:UserRequest/Attribute:related_request_list+' => '',
+	'Class:UserRequest/Attribute:public_log' => '公開ログ',
+	'Class:UserRequest/Attribute:public_log+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction' => 'ユーザ満足度',
+	'Class:UserRequest/Attribute:user_satisfaction+' => '',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1' => '非常に満足',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:1+' => '非常に満足',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2' => '十分満足',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:2+' => '十分満足',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3' => '多少不満',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:3+' => '多少不満',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4' => '非常に不満',
+	'Class:UserRequest/Attribute:user_satisfaction/Value:4+' => '非常に不満',
+	'Class:UserRequest/Attribute:user_comment' => 'ユーザコメント',
+	'Class:UserRequest/Attribute:user_comment+' => '',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname' => '親要求id名',
+	'Class:UserRequest/Attribute:parent_request_id_friendlyname+' => '',
+	'Class:UserRequest/Stimulus:ev_assign' => '割り当て',
+	'Class:UserRequest/Stimulus:ev_assign+' => '',
+	'Class:UserRequest/Stimulus:ev_reassign' => '再割り当て',
+	'Class:UserRequest/Stimulus:ev_reassign+' => '',
+	'Class:UserRequest/Stimulus:ev_approve' => '承認',
+	'Class:UserRequest/Stimulus:ev_approve+' => '',
+	'Class:UserRequest/Stimulus:ev_reject' => '否認',
+	'Class:UserRequest/Stimulus:ev_reject+' => '',
+	'Class:UserRequest/Stimulus:ev_pending' => '保留',
+	'Class:UserRequest/Stimulus:ev_pending+' => '',
+	'Class:UserRequest/Stimulus:ev_timeout' => 'タイムアウト',
+	'Class:UserRequest/Stimulus:ev_timeout+' => '',
+	'Class:UserRequest/Stimulus:ev_autoresolve' => '自動解決',
+	'Class:UserRequest/Stimulus:ev_autoresolve+' => '',
+	'Class:UserRequest/Stimulus:ev_autoclose' => '自動クローズ',
+	'Class:UserRequest/Stimulus:ev_autoclose+' => '',
+	'Class:UserRequest/Stimulus:ev_resolve' => '解決済みとマーク',
+	'Class:UserRequest/Stimulus:ev_resolve+' => '',
+	'Class:UserRequest/Stimulus:ev_close' => 'この要求をクローズ',
+	'Class:UserRequest/Stimulus:ev_close+' => '',
+	'Class:UserRequest/Stimulus:ev_reopen' => '再オープン',
+	'Class:UserRequest/Stimulus:ev_reopen+' => '',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval' => '承認待ち',
+	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
+));
+
+
+
+?>

datamodels/2.x/itop-request-mgmt-itil/main.itop-request-mgmt-itil.php

@@ -16,8 +16,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-define('PORTAL_POWER_USER_PROFILE', 'Portal power user');
-
 define('PORTAL_SERVICECATEGORY_QUERY', 'SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :org_id');
 define('PORTAL_SERVICE_SUBCATEGORY_QUERY', 'SELECT ServiceSubcategory WHERE service_id = :svc_id AND request_type="service_request"');
 

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

@@ -2095,7 +2095,7 @@
             <item id="col:col3">
               <rank>70</rank>
               <items>
-                <item id="fieldset:Ticket:relation">
+                <item id="fieldset:Relations">
                   <rank>10</rank>
                   <items>
                     <item id="parent_request_id">

datamodels/2.x/itop-request-mgmt/es_cr.dict.itop-request-mgmt.php

@@ -29,8 +29,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:RequestManagement+' => 'Administración de Requerimientos',
 	'Menu:RequestManagementProvider' => 'Proveedor de Mesa de Ayuda',
 	'Menu:RequestManagementProvider+' => 'Proveedor de Mesa de Ayuda',
-	'Menu:UserRequest:Provider' => 'Requerimientos Abiertos transferidos a Proveedor',
-	'Menu:UserRequest:Provider+' => 'Requerimientos Abiertos transferidos a Proveedor',
+	'Menu:UserRequest:Provider' => 'Reequerimientos Abiertos transferidos a Proveedor',
+	'Menu:UserRequest:Provider+' => 'Reequerimientos Abiertos transferidos a Proveedor',
 	'Menu:UserRequest:Overview' => 'Resumen de Requerimientos',
 	'Menu:UserRequest:Overview+' => 'Resumen de Requerimientos',
 	'Menu:NewUserRequest' => 'Nuevo Requerimiento',
@@ -54,12 +54,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'UI-RequestManagementOverview-Last-14-days' => 'Número de Requerimientos de los Últimos 14 días',
 	'UI-RequestManagementOverview-OpenRequestByStatus' => 'Requerimientos Abiertos por Estatus',
 	'UI-RequestManagementOverview-OpenRequestByAgent' => 'Requerimientos Abiertos por Analista',
-	'UI-RequestManagementOverview-OpenRequestByType' => 'Requerimientos Abiertos por Tipo',
+	'UI-RequestManagementOverview-OpenRequestByType' => 'Requerimientos Abiretos por Tipo',
 	'UI-RequestManagementOverview-OpenRequestByCustomer' => 'Requerimientos Abiertos por Cliente',
 	'Class:UserRequest:KnownErrorList' => 'Errores Conocidos',
 	'Menu:UserRequest:MyWorkOrders' => 'Ordenes de Trabajo asignadas a Mí',
 	'Menu:UserRequest:MyWorkOrders+' => 'Ordenes de Trabajo asignadas a Mí',
-	'Class:Problem:KnownProblemList' => 'Problemas Conocidos',
+	'Class:Problem:KnownProblemList' => 'Problemas',
 ));
 
 // Dictionnay conventions

datamodels/2.x/itop-request-mgmt/ja.dict.itop-request-mgmt.php

@@ -216,6 +216,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:UserRequest:EscalatedRequests+' => '',
 	'Menu:UserRequest:OpenRequests' => '全てのオープンな要求',
 	'Menu:UserRequest:OpenRequests+' => '',
+	'Menu:UserRequest:OpenProblems' => '全てのオープンな問題',
+	'Menu:UserRequest:OpenProblems+' => '',
 	'UI:WelcomeMenu:MyAssignedCalls' => '私に割り当てられた要求',
 	'UI-RequestManagementOverview-RequestByType-last-14-days' => '最近14日の要求(タイプ別)',
 	'UI-RequestManagementOverview-Last-14-days' => '最近14日の要求(日別)',
@@ -258,7 +260,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Portal:UserRequest:MoreInfo' => '追加情報',
 	'Portal:Details-Service-Element' => 'サービス要素',
 	'Portal:NoClosedTicket' => 'クローズされた要求はありません',
-	'Portal:NoService' => 'サービスはありません',
+	'Portal:NoService' => '~~',
 	'Portal:ListOpenProblems' => '進行中の問題',
 	'Portal:ShowProblem' => '問題',
 	'Portal:ShowFaqs' => 'FAQs',

datamodels/2.x/itop-request-mgmt/main.itop-request-mgmt.php

@@ -16,8 +16,6 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 
-define('PORTAL_POWER_USER_PROFILE', 'Portal power user');
-
 define('PORTAL_SERVICECATEGORY_QUERY', 'SELECT Service AS s JOIN lnkCustomerContractToService AS l1 ON l1.service_id=s.id JOIN CustomerContract AS cc ON l1.customercontract_id=cc.id WHERE cc.org_id = :org_id');
 define('PORTAL_SERVICE_SUBCATEGORY_QUERY', 'SELECT ServiceSubcategory WHERE service_id = :svc_id');
 

datamodels/2.x/itop-service-mgmt-provider/data.sample.serviceelements.xml

@@ -64,7 +64,7 @@
 </ServiceSubcategory>
 <ServiceSubcategory alias="ServiceSubcategory" id="11">
 <name>New mobile phone ordering</name>
-<description>Order a new mobile phone, for a new employee or for replacing a broken phone.</description>
+<description>Ordér a new mobile phone, for a new employee or for replacing a broken phone.</description>
 <service_id>4</service_id>
 <status></status>
 <request_type>service_request</request_type>
@@ -112,7 +112,7 @@
 <request_type>incident</request_type>
 </ServiceSubcategory>
 <ServiceSubcategory alias="ServiceSubcategory" id="18">
-<name>Windows installation/upgrade</name>
+<name>Windows installation/ / Upgrade</name>
 <description>Ask for installing or upgrading Windows on a computer.</description>
 <service_id>3</service_id>
 <status></status>

datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

@@ -1586,7 +1586,7 @@
         </field>
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
-            <value>service_request</value>
+            <value>servicerequest</value>
             <value>incident</value>
           </values>
           <sql>request_type</sql>

datamodels/2.x/itop-service-mgmt-provider/de.dict.itop-service-mgmt-provider.php

@@ -151,8 +151,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'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-Request',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:request_type/Value:servicerequest' => 'Service-Request',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => '',
 	'Class:SLT/Attribute:metric' => 'Metrisch',
 	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO (Time To Own)',
@@ -341,4 +341,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Rollenname',
 	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
 ));
-?>
+?>

datamodels/2.x/itop-service-mgmt-provider/en.dict.itop-service-mgmt-provider.php

@@ -377,8 +377,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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:request_type/Value:servicerequest' => 'service request',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => 'service request',
 	'Class:SLT/Attribute:metric' => 'Metric',
 	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',

datamodels/2.x/itop-service-mgmt-provider/es_cr.dict.itop-service-mgmt-provider.php

@@ -94,7 +94,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contract' => 'Contrato',
 	'Class:Contract+' => 'Contrato',
 	'Class:Contract/Attribute:name' => 'Nombre',
-	'Class:Contract/Attribute:name+' => 'Nombre del Contrato',
+	'Class:Contract/Attribute:name+' => 'Nombre',
 	'Class:Contract/Attribute:org_id' => 'Cliente',
 	'Class:Contract/Attribute:org_id+' => 'Cliente',
 	'Class:Contract/Attribute:organization_name' => 'Cliente',
@@ -230,7 +230,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceFamily' => 'Familia de Servicios',
 	'Class:ServiceFamily+' => 'Familia de Servicios',
 	'Class:ServiceFamily/Attribute:name' => 'Nombre',
-	'Class:ServiceFamily/Attribute:name+' => 'Nombre de la Familia de Servicios',
+	'Class:ServiceFamily/Attribute:name+' => 'Nombre',
 	'Class:ServiceFamily/Attribute:services_list' => 'Servicios',
 	'Class:ServiceFamily/Attribute:services_list+' => 'Servicios',
 ));
@@ -243,7 +243,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Service' => 'Servicio',
 	'Class:Service+' => 'Servicio',
 	'Class:Service/Attribute:name' => 'Nombre',
-	'Class:Service/Attribute:name+' => 'Nombre del Servicio',
+	'Class:Service/Attribute:name+' => 'Nombre',
 	'Class:Service/Attribute:org_id' => 'Proveedor',
 	'Class:Service/Attribute:org_id+' => 'Proveedor',
 	'Class:Service/Attribute:organization_name' => 'Proveedor',
@@ -310,7 +310,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceSubcategory' => 'Subcategoría',
 	'Class:ServiceSubcategory+' => 'Subcategoría',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nombre',
-	'Class:ServiceSubcategory/Attribute:name+' => 'Nombre de Subcategoría',
+	'Class:ServiceSubcategory/Attribute:name+' => 'Nombre',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descripción',
 	'Class:ServiceSubcategory/Attribute:description+' => 'Descripción',
 	'Class:ServiceSubcategory/Attribute:service_id' => 'Servicio',
@@ -341,7 +341,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLA' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA+' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA/Attribute:name' => 'Nombre',
-	'Class:SLA/Attribute:name+' => 'Nombre de SLA',
+	'Class:SLA/Attribute:name+' => 'Nombre',
 	'Class:SLA/Attribute:description' => 'Descripción',
 	'Class:SLA/Attribute:description+' => 'Descripción',
 	'Class:SLA/Attribute:org_id' => 'Proveedor',
@@ -362,7 +362,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLT' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT+' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT/Attribute:name' => 'Nombre',
-	'Class:SLT/Attribute:name+' => 'Nombre de SLT',
+	'Class:SLT/Attribute:name+' => 'Nombre',
 	'Class:SLT/Attribute:priority' => 'Prioridad',
 	'Class:SLT/Attribute:priority+' => 'Prioridad',
 	'Class:SLT/Attribute:priority/Value:1' => 'Crítico',
@@ -475,7 +475,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DeliveryModel' => 'Modelo de Entrega',
 	'Class:DeliveryModel+' => 'Modelo de Entrega',
 	'Class:DeliveryModel/Attribute:name' => 'Nombre',
-	'Class:DeliveryModel/Attribute:name+' => 'Nombre de Modelo de Entrega',
+	'Class:DeliveryModel/Attribute:name+' => 'Nombre',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organización',
 	'Class:DeliveryModel/Attribute:org_id+' => 'Organización',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Organización',

datamodels/2.x/itop-service-mgmt-provider/fr.dict.itop-service-mgmt-provider.php

@@ -323,8 +323,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:SLT/Attribute:request_type/Value:other' => 'other',
 	'Class:SLT/Attribute:request_type/Value:other+' => 'other',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'demande de service',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'demande de service',
+	'Class:SLT/Attribute:request_type/Value:servicerequest' => 'demande de service',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => 'demande de service',
 	'Class:SLT/Attribute:metric' => 'Métrique',
 	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',

datamodels/2.x/itop-service-mgmt-provider/ja.dict.itop-service-mgmt-provider.php

@@ -62,8 +62,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => '名前',
 	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:services_list' => 'サービス',
-	'Class:ServiceFamily/Attribute:services_list+' => '',
 	'Class:Service' => 'サービス',
 	'Class:Service+' => '',
 	'Class:Service/Attribute:name' => '名前',
@@ -152,8 +150,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:SLT/Attribute:request_type+' => '',
 	'Class:SLT/Attribute:request_type/Value:incident' => 'インシデント',
 	'Class:SLT/Attribute:request_type/Value:incident+' => '',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'サービス要求',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:request_type/Value:servicerequest' => 'サービス要求',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => '',
 	'Class:SLT/Attribute:metric' => 'メトリック',
 	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
@@ -299,6 +297,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI名',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'サービス',
+	'Class:ServiceFamily/Attribute:services_list+' => '',
 	'Class:Service/Attribute:organization_name' => '名前',
 	'Class:Service/Attribute:organization_name+' => '',
 	'Class:lnkDocumentToService/Attribute:service_name' => 'サービス名',

datamodels/2.x/itop-service-mgmt-provider/module.itop-service-mgmt-provider.php

@@ -17,7 +17,7 @@ SetupWebPage::AddModule(
 		),
 		'mandatory' => false,
 		'visible' => true,
-		'installer' => 'ServiceMgmtProviderInstaller',
+		'installer' => 'ServiceMgmtInstaller',
 
 		// Components
 		//
@@ -52,11 +52,11 @@ SetupWebPage::AddModule(
 	)
 );
 
-if (!class_exists('ServiceMgmtProviderInstaller'))
+if (!class_exists('ServiceMgmtInstaller'))
 {
 	// Module installation handler
 	//
-	class ServiceMgmtProviderInstaller extends ModuleInstallerAPI
+	class ServiceMgmtInstaller extends ModuleInstallerAPI
 	{
 		public static function BeforeWritingConfig(Config $oConfiguration)
 		{
@@ -76,8 +76,6 @@ if (!class_exists('ServiceMgmtProviderInstaller'))
 			{
 				// 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');
 			}
 		}
 	

datamodels/2.x/itop-service-mgmt/data.sample.serviceelements.xml

@@ -64,7 +64,7 @@
 </ServiceSubcategory>
 <ServiceSubcategory alias="ServiceSubcategory" id="11">
 <name>New mobile phone ordering</name>
-<description>Order a new mobile phone, for a new employee or for replacing a broken phone.</description>
+<description>Ordér a new mobile phone, for a new employee or for replacing a broken phone.</description>
 <service_id>4</service_id>
 <status></status>
 <request_type>service_request</request_type>
@@ -112,7 +112,7 @@
 <request_type>incident</request_type>
 </ServiceSubcategory>
 <ServiceSubcategory alias="ServiceSubcategory" id="18">
-<name>Windows installation/upgrade</name>
+<name>Windows installation/ / Upgrade</name>
 <description>Ask for installing or upgrading Windows on a computer.</description>
 <service_id>3</service_id>
 <status></status>

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

@@ -1581,7 +1581,7 @@
         </field>
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
-            <value>service_request</value>
+            <value>servicerequest</value>
             <value>incident</value>
           </values>
           <sql>request_type</sql>

datamodels/2.x/itop-service-mgmt/de.dict.itop-service-mgmt.php

@@ -156,8 +156,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'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-Request',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:request_type/Value:servicerequest' => 'Service-Request',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => '',
 	'Class:SLT/Attribute:metric' => 'Metrisch',
 	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO (Time To Own)',
@@ -356,4 +356,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Rollen-Name',
 	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
 ));
-?>
+?>

datamodels/2.x/itop-service-mgmt/en.dict.itop-service-mgmt.php

@@ -379,8 +379,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'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:request_type/Value:servicerequest' => 'service request',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => 'service request',
 	'Class:SLT/Attribute:metric' => 'Metric',
 	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',

datamodels/2.x/itop-service-mgmt/es_cr.dict.itop-service-mgmt.php

@@ -91,7 +91,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contract' => 'Contrato',
 	'Class:Contract+' => 'Contrato',
 	'Class:Contract/Attribute:name' => 'Nombre',
-	'Class:Contract/Attribute:name+' => 'Nombre del Contacto',
+	'Class:Contract/Attribute:name+' => 'Nombre',
 	'Class:Contract/Attribute:org_id' => 'Cliente',
 	'Class:Contract/Attribute:org_id+' => 'Cliente',
 	'Class:Contract/Attribute:organization_name' => 'Cliente',
@@ -110,10 +110,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contract/Attribute:cost+' => 'Costo',
 	'Class:Contract/Attribute:cost_currency' => 'Moneda',
 	'Class:Contract/Attribute:cost_currency+' => 'Moneda',
-	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dólares',
-	'Class:Contract/Attribute:cost_currency/Value:dollars+' => 'Dólares de E.U.A',
-	'Class:Contract/Attribute:cost_currency/Value:pesos' => 'Pesos',
-	'Class:Contract/Attribute:cost_currency/Value:pesos+' => 'Pesos',
+	'Class:Contract/Attribute:cost_currency/Value:Dolares' => 'Dólares',
+	'Class:Contract/Attribute:cost_currency/Value:Dolares+' => 'Dólares de E.U.A',
+	'Class:Contract/Attribute:cost_currency/Value:Pesos' => 'Pesos',
+	'Class:Contract/Attribute:cost_currency/Value:Pesos+' => 'Pesos',
 	'Class:Contract/Attribute:contracttype_id' => 'Tipo de Contrato',
 	'Class:Contract/Attribute:contracttype_id+' => 'Tipo de Contrato',
 	'Class:Contract/Attribute:contracttype_name' => 'Tipo de Contrato',
@@ -137,7 +137,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contract/Attribute:finalclass' => 'Tipo',
 	'Class:Contract/Attribute:finalclass+' => 'Tipo',
 ));
-
 //
 // Class: CustomerContract
 //
@@ -147,10 +146,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CustomerContract+' => 'Acuerdo con Cliente',
 	'Class:CustomerContract/Attribute:services_list' => 'Servicios',
 	'Class:CustomerContract/Attribute:services_list+' => 'Servicios',
-	'Class:CustomerContract/Attribute:functionalcis_list' => 'ECs',
-	'Class:CustomerContract/Attribute:functionalcis_list+' => 'Todos los Elementos de Configuración cubiertos por este Contrato',
-	'Class:CustomerContract/Attribute:providercontracts_list' => 'Contratos con Proveedores',
-	'Class:CustomerContract/Attribute:providercontracts_list+' => 'Todos los contratos con proveedores para la entrega del Servicio (underpinning contract)',
 ));
 
 //
@@ -213,10 +208,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Contrato con Proveedor',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => 'Contrato con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contraro con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => 'Contraro con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'Contraro con Proveedor',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => 'Contraro con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'EC',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => 'Elemento de Configuración',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'Elemento de Configuración',
@@ -231,7 +226,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceFamily' => 'Familia de Servicios',
 	'Class:ServiceFamily+' => 'Familia de Servicios',
 	'Class:ServiceFamily/Attribute:name' => 'Nombre',
-	'Class:ServiceFamily/Attribute:name+' => 'Nombre de la Familia de Servicios',
+	'Class:ServiceFamily/Attribute:name+' => 'Nombre',
 	'Class:ServiceFamily/Attribute:services_list' => 'Servicios',
 	'Class:ServiceFamily/Attribute:services_list+' => 'Servicios',
 ));
@@ -244,7 +239,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Service' => 'Servicio',
 	'Class:Service+' => 'Servicio',
 	'Class:Service/Attribute:name' => 'Nombre',
-	'Class:Service/Attribute:name+' => 'Nombre del Servicio',
+	'Class:Service/Attribute:name+' => 'Nombre',
 	'Class:Service/Attribute:org_id' => 'Proveedor',
 	'Class:Service/Attribute:org_id+' => 'Proveedor',
 	'Class:Service/Attribute:organization_name' => 'Proveedor',
@@ -319,7 +314,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceSubcategory' => 'Subcategoría',
 	'Class:ServiceSubcategory+' => 'Subcategoría',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nombre',
-	'Class:ServiceSubcategory/Attribute:name+' => 'Nombre de la Subcategoria',
+	'Class:ServiceSubcategory/Attribute:name+' => 'Nombre',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descripción',
 	'Class:ServiceSubcategory/Attribute:description+' => 'Descripción',
 	'Class:ServiceSubcategory/Attribute:service_id' => 'Servicio',
@@ -350,7 +345,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLA' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA+' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA/Attribute:name' => 'Nombre',
-	'Class:SLA/Attribute:name+' => 'Nombre del SLA',
+	'Class:SLA/Attribute:name+' => 'Nombre',
 	'Class:SLA/Attribute:description' => 'Descripción',
 	'Class:SLA/Attribute:description+' => 'Descripción',
 	'Class:SLA/Attribute:org_id' => 'Proveedor',
@@ -371,7 +366,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLT' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT+' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT/Attribute:name' => 'Nombre',
-	'Class:SLT/Attribute:name+' => 'Nombre del SLT',
+	'Class:SLT/Attribute:name+' => 'Nombre',
 	'Class:SLT/Attribute:priority' => 'Prioridad',
 	'Class:SLT/Attribute:priority+' => 'Prioridad',
 	'Class:SLT/Attribute:priority/Value:1' => 'Crítico',
@@ -484,7 +479,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DeliveryModel' => 'Modelo de Entrega',
 	'Class:DeliveryModel+' => 'Modelo de Entrega',
 	'Class:DeliveryModel/Attribute:name' => 'Nombre',
-	'Class:DeliveryModel/Attribute:name+' => 'Nombre del Modelo de Entrega',
+	'Class:DeliveryModel/Attribute:name+' => 'Nombre',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organización',
 	'Class:DeliveryModel/Attribute:org_id+' => 'Organización',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Organización',

datamodels/2.x/itop-service-mgmt/fr.dict.itop-service-mgmt.php

@@ -329,8 +329,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'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' => 'demande de service',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'demande de service',
+	'Class:SLT/Attribute:request_type/Value:servicerequest' => 'demande de service',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => 'demande de service',
 	'Class:SLT/Attribute:metric' => 'Métrique',
 	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',

datamodels/2.x/itop-service-mgmt/ja.dict.itop-service-mgmt.php

@@ -1,355 +1,516 @@
-<?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
- * @licence	http://opensource.org/licenses/AGPL-3.0
- */
-
-Dict::Add('JA JP', 'Japanese', '日本語', array(
-	'Class:ContractType' => '契約タイプ',
-	'Class:ContractType+' => '',
-	'Class:CustomerContract' => '顧客契約',
-	'Class:CustomerContract+' => '',
-	'Class:CustomerContract/Attribute:services_list' => 'サービス',
-	'Class:CustomerContract/Attribute:services_list+' => '',
-	'Class:ProviderContract' => 'プロバイダー契約',
-	'Class:ProviderContract+' => '',
-	'Class:ProviderContract/Attribute:functionalcis_list' => 'CI',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => '',
-	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => 'サービスレベルアグリーメント',
-	'Class:ProviderContract/Attribute:coverage' => 'サービス時間帯',
-	'Class:ProviderContract/Attribute:coverage+' => '',
-	'Class:lnkContactToContract' => 'リンク 連絡先/契約',
-	'Class:lnkContactToContract+' => '',
-	'Class:lnkContactToContract/Attribute:contract_id' => '契約',
-	'Class:lnkContactToContract/Attribute:contract_id+' => '',
-	'Class:lnkContactToContract/Attribute:contact_id' => '連絡先',
-	'Class:lnkContactToContract/Attribute:contact_id+' => '',
-	'Class:lnkContractToDocument' => 'リンク 契約/文書',
-	'Class:lnkContractToDocument+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_id' => '契約',
-	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
-	'Class:lnkContractToDocument/Attribute:document_id' => '文書',
-	'Class:lnkContractToDocument/Attribute:document_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract' => 'リンク 機能的CI/プロバイダー契約',
-	'Class:lnkFunctionalCIToProviderContract+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'プロバイダー契約',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
-	'Class:ServiceFamily' => 'サービスファミリ',
-	'Class:ServiceFamily+' => '',
-	'Class:ServiceFamily/Attribute:name' => '名前',
-	'Class:ServiceFamily/Attribute:name+' => '',
-	'Class:ServiceFamily/Attribute:services_list' => 'サービス',
-	'Class:ServiceFamily/Attribute:services_list+' => '',
-	'Class:Service' => 'サービス',
-	'Class:Service+' => '',
-	'Class:Service/Attribute:name' => '名前',
-	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'プロバイダー',
-	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:servicefamily_id' => 'サービスファミリ',
-	'Class:Service/Attribute:servicefamily_id+' => '',
-	'Class:Service/Attribute:description' => '説明',
-	'Class:Service/Attribute:description+' => '',
-	'Class:Service/Attribute:documents_list' => '文書',
-	'Class:Service/Attribute:documents_list+' => '',
-	'Class:Service/Attribute:contacts_list' => '連絡先',
-	'Class:Service/Attribute:contacts_list+' => '',
-	'Class:Service/Attribute:status' => '状態',
-	'Class:Service/Attribute:status+' => '',
-	'Class:Service/Attribute:status/Value:implementation' => '実装中',
-	'Class:Service/Attribute:status/Value:implementation+' => '実装中',
-	'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:customercontracts_list' => '顧客契約',
-	'Class:Service/Attribute:customercontracts_list+' => '',
-	'Class:Service/Attribute:providercontracts_list' => 'プロバイダー契約',
-	'Class:Service/Attribute:providercontracts_list+' => '',
-	'Class:Service/Attribute:functionalcis_list' => '依存するCI',
-	'Class:Service/Attribute:functionalcis_list+' => '',
-	'Class:Service/Attribute:servicesubcategories_list' => 'サービスサブカテゴリ',
-	'Class:Service/Attribute:servicesubcategories_list+' => '',
-	'Class:lnkDocumentToService' => 'リンク 文書/サービス',
-	'Class:lnkDocumentToService+' => '',
-	'Class:lnkDocumentToService/Attribute:service_id' => 'サービス',
-	'Class:lnkDocumentToService/Attribute:service_id+' => '',
-	'Class:lnkDocumentToService/Attribute:document_id' => '文書',
-	'Class:lnkDocumentToService/Attribute:document_id+' => '',
-	'Class:lnkContactToService' => 'リンク 連絡先/サービス',
-	'Class:lnkContactToService+' => '',
-	'Class:lnkContactToService/Attribute:service_id' => 'サービス',
-	'Class:lnkContactToService/Attribute:service_id+' => '',
-	'Class:lnkContactToService/Attribute:contact_id' => '連絡先',
-	'Class:lnkContactToService/Attribute:contact_id+' => '',
-	'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:request_type' => '要求タイプ',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'インシデント',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'インシデント',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'サービス要求',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'サービス要求',
-	'Class:ServiceSubcategory/Attribute:status' => '状態',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => '実装中',
-	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '実装中',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => '廃止済み',
-	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => '廃止済み',
-	'Class:ServiceSubcategory/Attribute:status/Value:production' => '稼働中',
-	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '稼働中',
-	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '',
-	'Class:SLA/Attribute:name' => '名前',
-	'Class:SLA/Attribute:name+' => '',
-	'Class:SLA/Attribute:description' => '説明',
-	'Class:SLA/Attribute:description+' => '',
-	'Class:SLA/Attribute:org_id' => 'プロバイダ',
-	'Class:SLA/Attribute:org_id+' => '',
-	'Class:SLA/Attribute:slts_list' => 'SLT',
-	'Class:SLA/Attribute:slts_list+' => '',
-	'Class:SLA/Attribute:customercontracts_list' => '顧客連絡先',
-	'Class:SLA/Attribute:customercontracts_list+' => '',
-	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '',
-	'Class:SLT/Attribute:name' => '名前',
-	'Class:SLT/Attribute:name+' => '',
-	'Class:SLT/Attribute:priority' => '優先度',
-	'Class:SLT/Attribute:priority+' => '',
-	'Class:SLT/Attribute:priority/Value:1' => '最優先',
-	'Class:SLT/Attribute:priority/Value:1+' => '最優先',
-	'Class:SLT/Attribute:priority/Value:2' => '高',
-	'Class:SLT/Attribute:priority/Value:2+' => '高',
-	'Class:SLT/Attribute:priority/Value:3' => '中',
-	'Class:SLT/Attribute:priority/Value:3+' => '中',
-	'Class:SLT/Attribute:priority/Value:4' => '低',
-	'Class:SLT/Attribute:priority/Value:4+' => '低',
-	'Class:SLT/Attribute:request_type' => '要求タイプ',
-	'Class:SLT/Attribute:request_type+' => '',
-	'Class:SLT/Attribute:request_type/Value:incident' => 'インシデント',
-	'Class:SLT/Attribute:request_type/Value:incident+' => 'インシデント',
-	'Class:SLT/Attribute:request_type/Value:service_request' => 'サービス要求',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => 'サービス要求',
-	'Class:SLT/Attribute: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' => '値',
-	'Class:SLT/Attribute:value+' => '',
-	'Class:SLT/Attribute:unit' => '単位',
-	'Class:SLT/Attribute:unit+' => '',
-	'Class:SLT/Attribute:unit/Value:hours' => '時間',
-	'Class:SLT/Attribute:unit/Value:hours+' => '時間',
-	'Class:SLT/Attribute:unit/Value:minutes' => '分',
-	'Class:SLT/Attribute:unit/Value:minutes+' => '分',
-	'Class:lnkSLAToSLT' => 'リンク 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' => 'リンク 顧客契約/サービス',
-	'Class:lnkCustomerContractToService+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => '顧客契約',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_id' => 'サービス',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
-	'Class:lnkProviderContractToService' => 'リンク プロバイダ契約/サービス',
-	'Class:lnkProviderContractToService+' => '',
-	'Class:lnkProviderContractToService/Attribute:service_id' => 'サービス',
-	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'プロバイダ契約',
-	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
-	'Class:lnkFunctionalCIToService' => 'リンク 機能的CI/サービス',
-	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'サービス',
-	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
-	'Class:DeliveryModel' => '提供モデル',
-	'Class:DeliveryModel+' => '',
-	'Class:DeliveryModel/Attribute:name' => '名前',
-	'Class:DeliveryModel/Attribute:name+' => '',
-	'Class:DeliveryModel/Attribute:org_id' => '組織',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
-	'Class:DeliveryModel/Attribute:description' => '説明',
-	'Class:DeliveryModel/Attribute:description+' => '',
-	'Class:DeliveryModel/Attribute:contacts_list' => '連絡先',
-	'Class:DeliveryModel/Attribute:contacts_list+' => '',
-	'Class:DeliveryModel/Attribute:customers_list' => '顧客',
-	'Class:DeliveryModel/Attribute:customers_list+' => '',
-	'Class:lnkDeliveryModelToContact' => 'Link 提供モデル/連絡先',
-	'Class:lnkDeliveryModelToContact+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => '提供モデル',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => '連絡先',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id' => '役割',
-	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
-	'Menu:ServiceManagement' => 'サービス管理',
-	'Menu:ServiceManagement+' => 'サービス管理概要',
-	'Menu:Service:Overview' => '概要',
-	'Menu:Service:Overview+' => '',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'サービスレベル別契約',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'ステータス別契約',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30日以内に終了する契約',
-	'Menu:ServiceType' => 'サービスタイプ',
-	'Menu:ServiceType+' => 'サービスタイプ',
-	'Menu:ProviderContract' => 'プロバイダー契約',
-	'Menu:ProviderContract+' => 'プロバイダー契約',
-	'Menu:CustomerContract' => '顧客契約',
-	'Menu:CustomerContract+' => '顧客契約',
-	'Menu:ServiceSubcategory' => 'サービスサブカテゴリ',
-	'Menu:ServiceSubcategory+' => 'サービスサブカテゴリ',
-	'Menu:Service' => 'サービス',
-	'Menu:Service+' => 'サービス',
-	'Menu:ServiceElement' => 'サービス要素',
-	'Menu:ServiceElement+' => 'サービス要素',
-	'Menu:SLA' => 'SLA',
-	'Menu:SLA+' => 'サービスレベルアグリーメント',
-	'Menu:SLT' => 'SLT',
-	'Menu:SLT+' => 'サービスレベルターゲット',
-	'Menu:DeliveryModel' => '提供モデル',
-	'Menu:DeliveryModel+' => '提供モデル',
-	'Menu:ServiceFamily' => 'サービスファミリ',
-	'Menu:ServiceFamily+' => 'サービスファミリ',
-	'Menu:Procedure' => '手順カタログ',
-	'Menu:Procedure+' => '全ての手順カタログ',
-	'Class:Contract' => '契約',
-	'Class:Contract+' => '',
-	'Class:Contract/Attribute:name' => '名前',
-	'Class:Contract/Attribute:name+' => '',
-	'Class:Contract/Attribute:org_id' => '顧客',
-	'Class:Contract/Attribute:org_id+' => '',
-	'Class:Contract/Attribute:organization_name' => '顧客名',
-	'Class:Contract/Attribute:organization_name+' => '共通の名前',
-	'Class:Contract/Attribute:contacts_list' => '連絡先',
-	'Class:Contract/Attribute:contacts_list+' => '',
-	'Class:Contract/Attribute:documents_list' => '文書',
-	'Class:Contract/Attribute:documents_list+' => '',
-	'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:contracttype_id' => '契約タイプ',
-	'Class:Contract/Attribute:contracttype_id+' => '',
-	'Class:Contract/Attribute:contracttype_name' => '契約タイプ名',
-	'Class:Contract/Attribute:contracttype_name+' => '',
-	'Class:Contract/Attribute:billing_frequency' => '課金頻度',
-	'Class:Contract/Attribute:billing_frequency+' => '',
-	'Class:Contract/Attribute:cost_unit' => '費用単位',
-	'Class:Contract/Attribute:cost_unit+' => '',
-	'Class:Contract/Attribute:provider_id' => 'プロバイダー',
-	'Class:Contract/Attribute:provider_id+' => '',
-	'Class:Contract/Attribute:provider_name' => 'プロバイダー名',
-	'Class:Contract/Attribute:provider_name+' => '共通名',
-	'Class:Contract/Attribute:status' => '状態',
-	'Class:Contract/Attribute:status+' => '',
-	'Class:Contract/Attribute:status/Value:implementation' => '実装',
-	'Class:Contract/Attribute:status/Value:implementation+' => '実装',
-	'Class:Contract/Attribute:status/Value:obsolete' => '廃止',
-	'Class:Contract/Attribute:status/Value:obsolete+' => '廃止',
-	'Class:Contract/Attribute:status/Value:production' => '稼働',
-	'Class:Contract/Attribute:status/Value:production+' => '稼働',
-	'Class:Contract/Attribute:finalclass' => 'タイプ',
-	'Class:Contract/Attribute:finalclass+' => '',
-	'Class:ProviderContract/Attribute:contracttype_id' => '契約タイプ',
-	'Class:ProviderContract/Attribute:contracttype_id+' => '',
-	'Class:ProviderContract/Attribute:contracttype_name' => '契約タイプ名',
-	'Class:ProviderContract/Attribute:contracttype_name+' => '',
-	'Class:lnkContactToContract/Attribute:contract_name' => '契約名',
-	'Class:lnkContactToContract/Attribute:contract_name+' => '',
-	'Class:lnkContactToContract/Attribute:contact_name' => '連絡先名',
-	'Class:lnkContactToContract/Attribute:contact_name+' => '',
-	'Class:lnkContractToDocument/Attribute:contract_name' => '契約名',
-	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
-	'Class:lnkContractToDocument/Attribute:document_name' => '文書名',
-	'Class:lnkContractToDocument/Attribute:document_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'プロバイダー契約名',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI名',
-	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
-	'Class:Service/Attribute:organization_name' => 'プロバイダー名',
-	'Class:Service/Attribute:organization_name+' => '',
-	'Class:Service/Attribute:servicefamily_name' => 'サービスファミリ名',
-	'Class:Service/Attribute:servicefamily_name+' => '',
-	'Class:lnkDocumentToService/Attribute:service_name' => 'サービス名',
-	'Class:lnkDocumentToService/Attribute:service_name+' => '',
-	'Class:lnkDocumentToService/Attribute:document_name' => '文書名',
-	'Class:lnkDocumentToService/Attribute:document_name+' => '',
-	'Class:lnkContactToService/Attribute:service_name' => 'サービス名',
-	'Class:lnkContactToService/Attribute:service_name+' => '',
-	'Class:lnkContactToService/Attribute:contact_name' => '連絡先名',
-	'Class:lnkContactToService/Attribute:contact_name+' => '',
-	'Class:ServiceSubcategory/Attribute:service_name' => 'サービス名',
-	'Class:ServiceSubcategory/Attribute:service_name+' => '',
-	'Class:SLA/Attribute:organization_name' => 'プロバイダ名',
-	'Class:SLA/Attribute:organization_name+' => '共通名',
-	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA名',
-	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT名',
-	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => '顧客契約名',
-	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:service_name' => 'サービス名',
-	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA名',
-	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:service_name' => 'サービス名',
-	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'プロバイダ契約名',
-	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'サービス名',
-	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI名',
-	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
-	'Class:DeliveryModel/Attribute:organization_name' => '組織名',
-	'Class:DeliveryModel/Attribute:organization_name+' => '共通名',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => '提供モデル名',
-	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => '連絡先名',
-	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
-	'Class:lnkDeliveryModelToContact/Attribute: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('JA JP', 'Japanese', '日本語', array(
+'Menu:ServiceManagement' => 'サービス管理',
+'Menu:ServiceManagement+' => 'サービス管理概要',
+'Menu:Service:Overview' => '概要',
+'Menu:Service:Overview+' => '',
+'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'サービスレベル別契約',
+'UI-ServiceManagementMenu-ContractsByStatus' => 'ステータス別契約',
+'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30日以内に終了する契約',
+
+'Menu:ServiceType' => 'サービスタイプ',
+'Menu:ServiceType+' => 'サービスタイプ',
+'Menu:ProviderContract' => 'プロバイダー契約',
+'Menu:ProviderContract+' => 'プロバイダー契約',
+'Menu:CustomerContract' => '顧客契約',
+'Menu:CustomerContract+' => '顧客契約',
+'Menu:ServiceSubcategory' => 'サービスサブカテゴリ',
+'Menu:ServiceSubcategory+' => 'サービスサブカテゴリ',
+'Menu:Service' => 'サービス',
+'Menu:Service+' => 'サービス',
+'Menu:ServiceElement' => 'サービス要素',
+'Menu:ServiceElement+' => 'サービス要素',
+'Menu:SLA' => 'SLA',
+'Menu:SLA+' => 'サービスレベルアグリーメント',
+'Menu:SLT' => 'SLT',
+'Menu:SLT+' => 'サービスレベルターゲット',
+'Menu:RequestTemplate' => '要求テンプレート',
+'Menu:RequestTemplate+' => '全ての要求テンプレート',
+'Menu:DeliveryModel' => '提供モデル',
+'Menu:DeliveryModel+' => '提供モデル',
+'Menu:ServiceFamily' => 'サービスファミリ',
+'Menu:ServiceFamily+' => 'サービスファミリ',
+'Menu:Procedure' => '手順カタログ',
+'Menu:Procedure+' => '全ての手順カタログ',
+
+
+
+));
+
+
+//
+// Class: ContractType
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:ContractType' => '契約タイプ',
+	'Class:ContractType+' => '',
+));
+
+//
+// Class: Contract
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Contract' => '契約',
+	'Class:Contract+' => '',
+	'Class:Contract/Attribute:name' => '名前',
+	'Class:Contract/Attribute:name+' => '',
+	'Class:Contract/Attribute:org_id' => '顧客',
+	'Class:Contract/Attribute:org_id+' => '',
+	'Class:Contract/Attribute:organization_name' => '顧客名',
+	'Class:Contract/Attribute:organization_name+' => '共通の名前',
+	'Class:Contract/Attribute:contacts_list' => '連絡先',
+	'Class:Contract/Attribute:contacts_list+' => '',
+	'Class:Contract/Attribute:documents_list' => '文書',
+	'Class:Contract/Attribute:documents_list+' => '',
+	'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:contracttype_id' => '契約タイプ',
+	'Class:Contract/Attribute:contracttype_id+' => '',
+	'Class:Contract/Attribute:contracttype_name' => '契約タイプ名',
+	'Class:Contract/Attribute:contracttype_name+' => '',
+	'Class:Contract/Attribute:billing_frequency' => '課金頻度',
+	'Class:Contract/Attribute:billing_frequency+' => '',
+	'Class:Contract/Attribute:cost_unit' => '費用単位',
+	'Class:Contract/Attribute:cost_unit+' => '',
+	'Class:Contract/Attribute:provider_id' => 'プロバイダー',
+	'Class:Contract/Attribute:provider_id+' => '',
+	'Class:Contract/Attribute:provider_name' => 'プロバイダー名',
+	'Class:Contract/Attribute:provider_name+' => '共通名',
+	'Class:Contract/Attribute:status' => '状態',
+	'Class:Contract/Attribute:status+' => '',
+	'Class:Contract/Attribute:status/Value:implementation' => '実装',
+	'Class:Contract/Attribute:status/Value:implementation+' => '実装',
+	'Class:Contract/Attribute:status/Value:obsolete' => '廃止',
+	'Class:Contract/Attribute:status/Value:obsolete+' => '廃止',
+	'Class:Contract/Attribute:status/Value:production' => '稼働',
+	'Class:Contract/Attribute:status/Value:production+' => '稼働',
+	'Class:Contract/Attribute:finalclass' => 'タイプ',
+	'Class:Contract/Attribute:finalclass+' => '',
+));
+//
+// Class: CustomerContract
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:CustomerContract' => '顧客契約',
+	'Class:CustomerContract+' => '',
+	'Class:CustomerContract/Attribute:services_list' => 'サービス',
+	'Class:CustomerContract/Attribute:services_list+' => '',
+));
+
+//
+// Class: ProviderContract
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:ProviderContract' => 'プロバイダー契約',
+	'Class:ProviderContract+' => '',
+	'Class:ProviderContract/Attribute:functionalcis_list' => 'CI',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => '',
+	'Class:ProviderContract/Attribute:sla' => 'SLA',
+	'Class:ProviderContract/Attribute:sla+' => 'サービスレベルアグリーメント',
+	'Class:ProviderContract/Attribute:coverage' => 'サービス時間帯',
+	'Class:ProviderContract/Attribute:coverage+' => '',
+	'Class:ProviderContract/Attribute:contracttype_id' => '契約タイプ',
+	'Class:ProviderContract/Attribute:contracttype_id+' => '',
+	'Class:ProviderContract/Attribute:contracttype_name' => '契約タイプ名',
+	'Class:ProviderContract/Attribute:contracttype_name+' => '',
+));
+
+//
+// Class: lnkContactToContract
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkContactToContract' => 'リンク 連絡先/契約',
+	'Class:lnkContactToContract+' => '',
+	'Class:lnkContactToContract/Attribute:contract_id' => '契約',
+	'Class:lnkContactToContract/Attribute:contract_id+' => '',
+	'Class:lnkContactToContract/Attribute:contract_name' => '契約名',
+	'Class:lnkContactToContract/Attribute:contract_name+' => '',
+	'Class:lnkContactToContract/Attribute:contact_id' => '連絡先',
+	'Class:lnkContactToContract/Attribute:contact_id+' => '',
+	'Class:lnkContactToContract/Attribute:contact_name' => '連絡先名',
+	'Class:lnkContactToContract/Attribute:contact_name+' => '',
+));
+
+//
+// Class: lnkContractToDocument
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkContractToDocument' => 'リンク 契約/文書',
+	'Class:lnkContractToDocument+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_id' => '契約',
+	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
+	'Class:lnkContractToDocument/Attribute:contract_name' => '契約名',
+	'Class:lnkContractToDocument/Attribute:contract_name+' => '',
+	'Class:lnkContractToDocument/Attribute:document_id' => '文書',
+	'Class:lnkContractToDocument/Attribute:document_id+' => '',
+	'Class:lnkContractToDocument/Attribute:document_name' => '文書名',
+	'Class:lnkContractToDocument/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToProviderContract
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkFunctionalCIToProviderContract' => 'リンク 機能的CI/プロバイダー契約',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'プロバイダー契約',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name' => 'プロバイダー契約名',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_name+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name' => 'CI名',
+	'Class:lnkFunctionalCIToProviderContract/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: ServiceFamily
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:ServiceFamily' => 'サービスファミリ',
+	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily/Attribute:name' => '名前',
+	'Class:ServiceFamily/Attribute:name+' => '',
+	'Class:ServiceFamily/Attribute:services_list' => 'サービス',
+	'Class:ServiceFamily/Attribute:services_list+' => '',
+));
+
+//
+// Class: Service
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:Service' => 'サービス',
+	'Class:Service+' => '',
+	'Class:Service/Attribute:name' => '名前',
+	'Class:Service/Attribute:name+' => '',
+	'Class:Service/Attribute:org_id' => 'プロバイダー',
+	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:organization_name' => 'プロバイダー名',
+	'Class:Service/Attribute:organization_name+' => '',
+	'Class:Service/Attribute:servicefamily_id' => 'サービスファミリ',
+	'Class:Service/Attribute:servicefamily_id+' => '',
+	'Class:Service/Attribute:servicefamily_name' => 'サービスファミリ名',
+	'Class:Service/Attribute:servicefamily_name+' => '',
+	'Class:Service/Attribute:description' => '説明',
+	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:documents_list' => '文書',
+	'Class:Service/Attribute:documents_list+' => '',
+	'Class:Service/Attribute:contacts_list' => '連絡先',
+	'Class:Service/Attribute:contacts_list+' => '',
+	'Class:Service/Attribute:status' => '状態',
+	'Class:Service/Attribute:status+' => '',
+	'Class:Service/Attribute:status/Value:implementation' => '実装中',
+	'Class:Service/Attribute:status/Value:implementation+' => '実装中',
+	'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:customercontracts_list' => '顧客契約',
+	'Class:Service/Attribute:customercontracts_list+' => '',
+	'Class:Service/Attribute:providercontracts_list' => 'プロバイダー契約',
+	'Class:Service/Attribute:providercontracts_list+' => '',
+	'Class:Service/Attribute:functionalcis_list' => '依存するCI',
+	'Class:Service/Attribute:functionalcis_list+' => '',
+	'Class:Service/Attribute:servicesubcategories_list' => 'サービスサブカテゴリ',
+	'Class:Service/Attribute:servicesubcategories_list+' => '',
+));
+
+//
+// Class: lnkDocumentToService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkDocumentToService' => 'リンク 文書/サービス',
+	'Class:lnkDocumentToService+' => '',
+	'Class:lnkDocumentToService/Attribute:service_id' => 'サービス',
+	'Class:lnkDocumentToService/Attribute:service_id+' => '',
+	'Class:lnkDocumentToService/Attribute:service_name' => 'サービス名',
+	'Class:lnkDocumentToService/Attribute:service_name+' => '',
+	'Class:lnkDocumentToService/Attribute:document_id' => '文書',
+	'Class:lnkDocumentToService/Attribute:document_id+' => '',
+	'Class:lnkDocumentToService/Attribute:document_name' => '文書名',
+	'Class:lnkDocumentToService/Attribute:document_name+' => '',
+));
+
+//
+// Class: lnkContactToService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkContactToService' => 'リンク 連絡先/サービス',
+	'Class:lnkContactToService+' => '',
+	'Class:lnkContactToService/Attribute:service_id' => 'サービス',
+	'Class:lnkContactToService/Attribute:service_id+' => '',
+	'Class:lnkContactToService/Attribute:service_name' => 'サービス名',
+	'Class:lnkContactToService/Attribute:service_name+' => '',
+	'Class:lnkContactToService/Attribute:contact_id' => '連絡先',
+	'Class:lnkContactToService/Attribute:contact_id+' => '',
+	'Class:lnkContactToService/Attribute:contact_name' => '連絡先名',
+	'Class:lnkContactToService/Attribute:contact_name+' => '',
+));
+
+//
+// Class: ServiceSubcategory
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', 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:ServiceSubcategory/Attribute:request_type' => '要求タイプ',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'インシデント',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'インシデント',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'サービス要求',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'サービス要求',
+	'Class:ServiceSubcategory/Attribute:status' => '状態',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => '実装中',
+	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '実装中',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => '廃止済み',
+	'Class:ServiceSubcategory/Attribute:status/Value:obsolete+' => '廃止済み',
+	'Class:ServiceSubcategory/Attribute:status/Value:production' => '稼働中',
+	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '稼働中',
+));
+
+//
+// Class: SLA
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:SLA' => 'SLA',
+	'Class:SLA+' => '',
+	'Class:SLA/Attribute:name' => '名前',
+	'Class:SLA/Attribute:name+' => '',
+	'Class:SLA/Attribute:description' => '説明',
+	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:org_id' => 'プロバイダ',
+	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:organization_name' => 'プロバイダ名',
+	'Class:SLA/Attribute:organization_name+' => '共通名',
+	'Class:SLA/Attribute:slts_list' => 'SLT',
+	'Class:SLA/Attribute:slts_list+' => '',
+	'Class:SLA/Attribute:customercontracts_list' => '顧客連絡先',
+	'Class:SLA/Attribute:customercontracts_list+' => '',
+));
+
+//
+// Class: SLT
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:SLT' => 'SLT',
+	'Class:SLT+' => '',
+	'Class:SLT/Attribute:name' => '名前',
+	'Class:SLT/Attribute:name+' => '',
+	'Class:SLT/Attribute:priority' => '優先度',
+	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority/Value:1' => '最優先',
+	'Class:SLT/Attribute:priority/Value:1+' => '最優先',
+	'Class:SLT/Attribute:priority/Value:2' => '高',
+	'Class:SLT/Attribute:priority/Value:2+' => '高',
+	'Class:SLT/Attribute:priority/Value:3' => '中',
+	'Class:SLT/Attribute:priority/Value:3+' => '中',
+	'Class:SLT/Attribute:priority/Value:4' => '低',
+	'Class:SLT/Attribute:priority/Value:4+' => '低',
+	'Class:SLT/Attribute:request_type' => '要求タイプ',
+	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident' => 'インシデント',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'インシデント',
+	'Class:SLT/Attribute:request_type/Value:servicerequest' => 'サービス要求',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => 'サービス要求',
+	'Class:SLT/Attribute: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' => '値',
+	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:unit' => '単位',
+	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit/Value:hours' => '時間',
+	'Class:SLT/Attribute:unit/Value:hours+' => '時間',
+	'Class:SLT/Attribute:unit/Value:minutes' => '分',
+	'Class:SLT/Attribute:unit/Value:minutes+' => '分',
+));
+
+//
+// Class: lnkSLAToSLT
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkSLAToSLT' => 'リンク SLA / SLT',
+	'Class:lnkSLAToSLT+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
+	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:sla_name' => 'SLA名',
+	'Class:lnkSLAToSLT/Attribute:sla_name+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_id' => 'SLT',
+	'Class:lnkSLAToSLT/Attribute:slt_id+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT名',
+	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
+));
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkCustomerContractToService' => 'リンク 顧客契約/サービス',
+	'Class:lnkCustomerContractToService+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => '顧客契約',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => '顧客契約名',
+	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_id' => 'サービス',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:service_name' => 'サービス名',
+	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA名',
+	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
+));
+
+//
+// Class: lnkProviderContractToService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkProviderContractToService' => 'リンク プロバイダ契約/サービス',
+	'Class:lnkProviderContractToService+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_id' => 'サービス',
+	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
+	'Class:lnkProviderContractToService/Attribute:service_name' => 'サービス名',
+	'Class:lnkProviderContractToService/Attribute:service_name+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id' => 'プロバイダ契約',
+	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'プロバイダ契約名',
+	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
+));
+
+//
+// Class: lnkFunctionalCIToService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkFunctionalCIToService' => 'リンク 機能的CI/サービス',
+	'Class:lnkFunctionalCIToService+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'サービス',
+	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:service_name' => 'サービス名',
+	'Class:lnkFunctionalCIToService/Attribute:service_name+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id' => 'CI',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_id+' => '',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name' => 'CI名',
+	'Class:lnkFunctionalCIToService/Attribute:functionalci_name+' => '',
+));
+
+//
+// Class: DeliveryModel
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:DeliveryModel' => '提供モデル',
+	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel/Attribute:name' => '名前',
+	'Class:DeliveryModel/Attribute:name+' => '',
+	'Class:DeliveryModel/Attribute:org_id' => '組織',
+	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:organization_name' => '組織名',
+	'Class:DeliveryModel/Attribute:organization_name+' => '共通名',
+	'Class:DeliveryModel/Attribute:description' => '説明',
+	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list' => '連絡先',
+	'Class:DeliveryModel/Attribute:contacts_list+' => '',
+	'Class:DeliveryModel/Attribute:customers_list' => '顧客',
+	'Class:DeliveryModel/Attribute:customers_list+' => '',
+));
+
+//
+// Class: lnkDeliveryModelToContact
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', array(
+	'Class:lnkDeliveryModelToContact' => 'Link 提供モデル/連絡先',
+	'Class:lnkDeliveryModelToContact+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => '提供モデル',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name' => '提供モデル名',
+	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id' => '連絡先',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name' => '連絡先名',
+	'Class:lnkDeliveryModelToContact/Attribute:contact_name+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id' => '役割',
+	'Class:lnkDeliveryModelToContact/Attribute:role_id+' => '',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name' => '役割名',
+	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
+));
+
+
+?>

datamodels/2.x/itop-service-mgmt/module.itop-service-mgmt.php

@@ -17,7 +17,6 @@ SetupWebPage::AddModule(
 		),
 		'mandatory' => false,
 		'visible' => true,
-		'installer' => 'ServiceMgmtInstaller',
 
 		// Components
 		//
@@ -52,41 +51,4 @@ SetupWebPage::AddModule(
 	)
 );
 
-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)
-		{
-		}
-	}
-}
 ?>

datamodels/2.x/itop-service-mgmt/ru.dict.itop-service-mgmt.php

@@ -156,8 +156,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'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 request~~',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:request_type/Value:servicerequest' => 'service request~~',
+	'Class:SLT/Attribute:request_type/Value:servicerequest+' => '',
 	'Class:SLT/Attribute:metric' => 'Метрика',
 	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO~~',
@@ -356,4 +356,4 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Class:lnkDeliveryModelToContact/Attribute:role_name' => 'Role name~~',
 	'Class:lnkDeliveryModelToContact/Attribute:role_name+' => '',
 ));
-?>
+?>

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

@@ -773,7 +773,7 @@
           </attributes>
         </naming>
         <display_template/>
-        <icon>images/nas.png</icon>
+        <icon>images/nas.jpeg</icon>
         <reconciliation>
           <attributes>
             <attribute id="name"/>