N°8142 - User Request and Incident menu label standardisation

2026-03-30 06:14:12 +02:00 · 2026-03-09 18:01:02 +01:00
228 changed files with 3733 additions and 5286 deletions
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -27,9 +27,6 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');

 class UISearchFormForeignKeys
 {
-	private $m_sRemoteClass;
-	private $m_iInputId;
-
 	public function __construct($sTargetClass, $iInputId = null)
 	{
 		$this->m_sRemoteClass = $sTargetClass;
@@ -43,7 +40,7 @@ class UISearchFormForeignKeys
 	 *
 	 * @throws \Exception
 	 */
-	public function ShowModalSearchForeignKeys($oPage)
+	public function ShowModalSearchForeignKeys($oPage, $sTitle)
 	{

 		$oFilter = new DBObjectSearch($this->m_sRemoteClass);
@@ -63,6 +60,8 @@ class UISearchFormForeignKeys
 			]
 		));
 		$sEmptyList = Dict::S('UI:Message:EmptyList:UseSearchForm');
+		$sCancel = Dict::S('UI:Button:Cancel');
+		$sAdd = Dict::S('UI:Button:Add');

 		$oPage->add(
 			<<<HTML
@@ -74,6 +73,39 @@ class UISearchFormForeignKeys
 </form>
 HTML
 		);
+
+		$oPage->add_ready_script(
+			<<<JS
+ $('#dlg_{$this->m_iInputId}').dialog({ 
+ 			width: $(window).width()*0.8, 
+ 			height: $(window).height()*0.8, 
+ 			autoOpen: false, 
+ 			modal: true, 
+ 			resizeStop: oForeignKeysWidget{$this->m_iInputId}.UpdateSizes,
+            buttons: [
+				{
+					text: Dict.S('UI:Button:Cancel'),
+					class: "cancel ibo-is-alternative ibo-is-neutral",
+					click: function() {
+						$('#dlg_{$this->m_iInputId}').dialog('close');
+					}
+				},
+				{
+					text:  Dict.S('UI:Button:Add'),
+					id: 'btn_ok_{$this->m_iInputId}',
+					class: "ok ibo-is-regular ibo-is-primary",
+					click: function() {
+						oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);							
+					}
+				},
+			],
+
+ });
+$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});
+$('#SearchFormToAdd_{$this->m_iInputId} form').on('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);
+$('#SearchFormToAdd_{$this->m_iInputId}').on('resize', oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);
+JS
+		);
 	}

 	public function GetFullListForeignKeysFromSelection($oPage, $oFullSetFilter)
@@ -87,4 +119,31 @@ HTML
 			IssueLog::Error($e->getMessage()."\nDebug trace:\n".$e->getTraceAsString());
 		}
 	}
+
+	/**
+	 * Search for objects to be linked to the current object (i.e "remote" objects)
+	 *
+	 * @param WebPage $oP The page used for the output (usually an AjaxWebPage)
+	 * @param string $sRemoteClass Name of the "remote" class to perform the search on, must be a derived class of m_sRemoteClass
+	 *
+	 * @throws \Exception
+	 */
+	public function ListResultsSearchForeignKeys(WebPage $oP, $sRemoteClass = '')
+	{
+		if ($sRemoteClass != '') {
+			// assert(MetaModel::IsParentClass($this->m_sRemoteClass, $sRemoteClass));
+			$oFilter = new DBObjectSearch($sRemoteClass);
+		} else {
+			// No remote class specified use the one defined in the linkedset
+			$oFilter = new DBObjectSearch($this->m_sRemoteClass);
+		}
+
+		$oBlock = new DisplayBlock($oFilter, 'list', false);
+		$oBlock->Display(
+			$oP,
+			"ResultsToAdd_{$this->m_iInputId}",
+			['menu' => false, 'cssCount' => "#count_{$this->m_iInputId}", 'selection_mode' => true, 'table_id' => "add_{$this->m_iInputId}"]
+		);
+	}
+
 }
--- a/application/utils.inc.php
+++ b/application/utils.inc.php
@@ -122,11 +122,6 @@ class utils
 	 * @since 3.0.0
 	 */
 	public const ENUM_SANITIZATION_FILTER_VARIABLE_NAME = 'variable_name';
-	/**
-	 * @var string For module codes (e.g. `itop-portal-base`, `combodo-webhook-integration`, `some-module-code-x.y`, ...)
-	 * @since 3.2.3 3.3.0 N°8554
-	 */
-	public const ENUM_SANITIZATION_FILTER_MODULE_CODE = 'module_code';
 	/**
 	 * @var string
 	 * @since 2.7.10 3.0.0
@@ -398,7 +393,6 @@ class utils
 	 * @since 2.7.10 N°6606 use the utils::ENUM_SANITIZATION_* const
 	 * @since 2.7.10 N°6606 new case for ENUM_SANITIZATION_FILTER_PHP_CLASS
 	 * @since 3.2.1-1 N°8242 Allow value to be an array for every filter
-	 * @since 3.2.3 3.3.0 N°8554 new case for ENUM_SANITIZATION_FILTER_MODULE_CODE
 	 *
 	 * @link https://www.php.net/manual/en/filter.filters.sanitize.php PHP sanitization filters
 	 */
@@ -486,7 +480,7 @@ class utils
 				);
 				break;

-				// For XML / HTML node selector
+				// For XML / HTML node id selector
 			case static::ENUM_SANITIZATION_FILTER_ELEMENT_SELECTOR:
 				$retValue = filter_var(
 					$value,
@@ -499,15 +493,6 @@ class utils
 				$retValue = preg_replace('/[^a-zA-Z0-9_]/', '', $value);
 				break;

-			case static::ENUM_SANITIZATION_FILTER_MODULE_CODE:
-				// Module codes allow all alphabets letters, numbers, dash and dot characters
-				$retValue = filter_var(
-					$value,
-					FILTER_VALIDATE_REGEXP,
-					['options' => ['regexp' => '/^[\p{L}\d.-]+$/u']]
-				);
-				break;
-
 				// For URL
 			case static::ENUM_SANITIZATION_FILTER_URL:
 				$retValue = filter_var($value, FILTER_SANITIZE_URL);
--- a/composer.json
+++ b/composer.json
@@ -15,38 +15,38 @@
    "apereo/phpcas": "dev-master",
    "guzzlehttp/guzzle": "^7.5.1",
    "league/oauth2-google": "^4.0.1",
-    "nikic/php-parser": "^4.14.0",
+    "nikic/php-parser": "dev-master",
    "pear/archive_tar": "~1.4.14",
    "pelago/emogrifier": "^7.2.0",
    "psr/log": "^3.0.0",
-    "scssphp/scssphp": "dev-combodo/1.x",
+    "scssphp/scssphp": "^1.12.1",
+    "soundasleep/html2text": "~2.1",
    "symfony/console": "~6.4.0",
    "symfony/dotenv": "~6.4.0",
+    "symfony/form": "^6.4",
    "symfony/framework-bundle": "~6.4.0",
    "symfony/http-foundation": "~6.4.0",
    "symfony/http-kernel": "~6.4.0",
-    "symfony/runtime": "~6.4.0",
+    "symfony/mailer": "^6.4",
+    "symfony/security-csrf": "^6.4",
    "symfony/twig-bundle": "~6.4.0",
-    "symfony/var-dumper": "~6.4.0",
+    "symfony/validator" : "^6.4",
    "symfony/yaml": "~6.4.0",
-    "symfony/mailer": "~6.4.0",
    "tecnickcom/tcpdf": "^6.6.0",
-    "thenetworg/oauth2-azure": "^2.0",
-    "soundasleep/html2text": "~2.1"
+    "thenetworg/oauth2-azure": "^2.0"
  },
  "require-dev": {
-    "symfony/debug-bundle": "~6.4.0",
    "symfony/stopwatch": "~6.4.0",
    "symfony/web-profiler-bundle": "~6.4.0"
  },
  "repositories": [
    {
      "type": "vcs",
-      "url": "https://github.com/EsupPortail/phpCAS"
+      "url": "https://github.com/Combodo/PHP-Parser"
    },
    {
      "type": "vcs",
-      "url": "https://github.com/combodo-itop-libs/scssphp"
+      "url": "https://github.com/EsupPortail/phpCAS"
    }
  ],
  "suggest": {
@@ -68,10 +68,7 @@
    },
    "sort-packages": true,
    "classmap-authoritative": true,
-    "platform-check": true,
-    "allow-plugins": {
-      "symfony/runtime": true
-    }
+    "platform-check": true
  },
  "autoload": {
    "classmap": [
@@ -80,7 +77,6 @@
      "sources"
    ],
    "exclude-from-classmap": [
-      "application/twigextension.class.inc.php",
      "core/oql/build/PHP/",
      "core/apc-emulation.php",
      "application/startup.inc.php",
@@ -100,7 +96,7 @@
  "extra": {
    "symfony": {
      "allow-contrib": false,
-      "require": "3.4.*"
+      "require": "6.4.*"
    },
    "runtime": {
      "dotenv_path": "resources/symfony/.env"
--- a/composer.lock
+++ b/composer.lock
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -928,7 +928,7 @@ class Config
 			'type' => 'string',
 			'description' => 'Actions that are available as direct buttons next to the "Actions" menu',
 			// examples... not used
-			'default' => 'UI:Menu:Modify,UI:Menu:New,UI:Menu:impacts_down,UI:Menu:impacts_up',
+			'default' => 'UI:Menu:Modify,UI:Menu:New',
 			'value' => 'UI:Menu:Modify',
 			'source_of_value' => '',
 			'show_in_conf_sample' => true,
@@ -1748,14 +1748,6 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
-		'security.force_login_when_no_delegated_authentication_endpoints_list' => [
-			'type'                => 'bool',
-			'description'         => 'If true, when no execution policy is defined, the user will be forced to log in (instead of being automatically logged in with the default profile)',
-			'default'             => false,
-			'value'               => false,
-			'source_of_value'     => '',
-			'show_in_conf_sample' => false,
-		],
 		'behind_reverse_proxy' => [
 			'type' => 'bool',
 			'description' => 'If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)',
--- a/core/inlineimage.class.inc.php
+++ b/core/inlineimage.class.inc.php
@@ -298,46 +298,6 @@ N°8681	 * @param string|null $sHtml The HTML fragment to process
 		return $sHtml;
 	}

-	/**
-	 * Replace <img> tags with a data-img-id attribute by the actual image in base64 representation
-	 * so that the image can be displayed even if the download URL is not accessible (e.g. in unauthenticated approval templates)
-	 *
-	 * @param string $sHtml The HTML fragment to process
-	 *
-	 * @return String The modified HTML
-	 * @since 3.2.3
-	 */
-	public static function ReplaceInlineImagesWithBase64Representation(string $sHtml): String
-	{
-		return preg_replace_callback(
-			'/<img\s+[^>]*'.static::DOM_ATTR_ID.'="(\d+)"[^>]*>/i',
-			function ($matches) {
-
-				// Extract inline image ID from the tag
-				$id = $matches[1];
-
-				try {
-					// Retrieve inline image
-					$oInline = MetaModel::GetObject(InlineImage::class, $id, true, true);
-					$oOrmDocument = $oInline->Get('contents');
-
-					// Replace src image by the base64 representation
-					$sInlineImageAsBase64 = base64_encode($oOrmDocument->GetData());
-					$sDataUri = 'data:'.$oOrmDocument->GetMimeType().';base64,'.$sInlineImageAsBase64;
-					$sImage = preg_replace('/src=["\'][^"\']+["\']/', 'src="'.$sDataUri.'"', $matches[0]);
-
-					// Remove sensitive information (the image ID and secret) from the tag
-					$sImage = preg_replace('/'.static::DOM_ATTR_ID.'="\d+"\s+'.static::DOM_ATTR_SECRET.'="\w+"/', '', $sImage);
-				} catch (Exception $e) {
-					$sImage = '<img src="" alt="'.Dict::S('UI:MissingInlineImage').'">';
-				}
-
-				return $sImage;
-			},
-			$sHtml
-		);
-	}
-
 	/**
 	 * Add an extra attribute data-img-id for images which are based on an actual InlineImage
 	 * so that we can later reconstruct the full "src" URL when needed
--- a/core/log.class.inc.php
+++ b/core/log.class.inc.php
@@ -691,7 +691,7 @@ abstract class LogAPI
 		static::$m_oMockMetaModelConfig = $oMetaModelConfig;
 	}

-	public static function Exception(string $sMessage, throwable $oException, ?string $sChannel = null, array $aContext = []): void
+	public static function Exception(string $sMessage, throwable $oException, string $sChannel = null, array $aContext = []): void
 	{
 		$aErrorLogs = [];
 		$aErrorLogs[] = static::PrepareErrorLog($sMessage, $oException, $aContext);
--- a/datamodels/2.x/itop-attachments/dictionaries/en.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/en.dict.itop-attachments.php
@@ -47,7 +47,7 @@ or ask your '.ITOP_APPLICATION_SHORT.' administrator if the '.ITOP_APPLICATION_S

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Attachment' => 'Attachment',
-	'Class:Attachment+' => 'File: text or image, linked to a single object. It can\'t be modified, only deleted. Attachment can\'t be created outside of its object edition.',
+	'Class:Attachment+' => '',
 	'Class:Attachment/Attribute:expire' => 'Expire',
 	'Class:Attachment/Attribute:expire+' => '',
 	'Class:Attachment/Attribute:temp_id' => 'Temporary id',
--- a/datamodels/2.x/itop-attachments/dictionaries/fr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/fr.dict.itop-attachments.php
@@ -38,8 +38,8 @@ Soit demandez à votre administrateur système s\'il reste de la place disque di
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Attachment' => 'Pièce jointe',
-	'Class:Attachment+' => 'Fichier : texte ou image, associé à un et un seul object, supprimable mais non modifiable, non créable en dehors d\'un objet',
+	'Class:Attachment' => 'Attachement',
+	'Class:Attachment+' => '',
 	'Class:Attachment/Attribute:expire' => 'Expire',
 	'Class:Attachment/Attribute:expire+' => '',
 	'Class:Attachment/Attribute:temp_id' => 'Id Temporaire',
@@ -82,12 +82,12 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:TriggerOnAttachmentDownload' => 'Déclencheur sur le téléchargement d\'une pièce jointe d\'un objet',
-	'Class:TriggerOnAttachmentDownload+' => 'Déclencheur sur le téléchargement d\'une pièce jointe depuis un objet de la classe donnée ou d\'une classe enfant.',
+	'Class:TriggerOnAttachmentDownload+' => '',
 	'Class:TriggerOnAttachmentCreate'                         => 'Déclencheur sur la création d\'une pièce jointe',
-	'Class:TriggerOnAttachmentCreate+'                        => 'Déclencheur sur la création d\'une pièce jointe d\'un objet',
+	'Class:TriggerOnAttachmentCreate+'                        => '',
 	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email' => 'Ajoute le fichier dans l\'email',
 	'Class:TriggerOnAttachmentCreate/Attribute:file_in_email+' => 'Si coché, le fichier sera automatiquement attaché à l\'email quand l\'action email est lancée',
 	'Class:TriggerOnAttachmentDelete'                         => 'Déclencheur sur la suppression d\'une pièce jointe',
-	'Class:TriggerOnAttachmentDelete+'                        => 'Déclencheur sur la suppression d\'une pièce jointe d\'un objet',
+	'Class:TriggerOnAttachmentDelete+'                        => '',
 	'Class:TriggerOnObject:TriggerClassAttachment/ReadOnlyMessage' => 'Les Triggers sur les objets ne sont pas autorisés sur la classe Attachement. Veuillez utiliser les triggers spécifiques pour cette classe',
 ]);
--- a/datamodels/2.x/itop-backup/module.itop-backup.php
+++ b/datamodels/2.x/itop-backup/module.itop-backup.php
@@ -41,11 +41,6 @@ SetupWebPage::AddModule(
 		'doc.manual_setup' => '',
 		'doc.more_information' => '',

-		// Security
-		'delegated_authentication_endpoints' => [
-			'ajax.backup.php',
-		],
-
 		// Default settings
 		//
 		'settings' => [
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/en.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/en.dict.itop-bridge-cmdb-services.php
@@ -35,7 +35,7 @@

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
-	'Class:lnkFunctionalCIToProviderContract+' => 'This link models the functional CIs that are supported by an external company through a provider contract.',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
@@ -53,7 +53,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkFunctionalCIToService' => 'Link FunctionalCI / Service',
-	'Class:lnkFunctionalCIToService+' => 'This link models the functional CIs that are required to deliver a Service and whose malfunction would affect the quality of the Service.',
+	'Class:lnkFunctionalCIToService+' => '',
 	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/fr.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/fr.dict.itop-bridge-cmdb-services.php
@@ -12,8 +12,8 @@
 *
 */
 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI fonctionnel / Contrat fournisseur',
-	'Class:lnkFunctionalCIToProviderContract+' => 'Ce lien modélise les équipments (CI fonctionnel) qui sont supportés par une société externe à travers un Contrat fournisseur.',
+	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
@@ -30,8 +30,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkFunctionalCIToService' => 'Lien CI fonctionnel / Service',
-	'Class:lnkFunctionalCIToService+' => 'Ce lien modélise les équipments (CI fonctionnel) qui sont nécessaires pour délivrer un Service et dont le dysfonctionnement affecterait la qualité du Service en question.',
+	'Class:lnkFunctionalCIToService' => 'Lien CI / Service',
+	'Class:lnkFunctionalCIToService+' => '',
 	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Service',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/en.dict.itop-bridge-cmdb-ticket.php
@@ -36,7 +36,7 @@

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkFunctionalCIToTicket' => 'Link FunctionalCI / Ticket',
-	'Class:lnkFunctionalCIToTicket+' => 'This link models the functional CIs that are concerned by a Ticket (such as a User Request, an Incident, a Change, ...)',
+	'Class:lnkFunctionalCIToTicket+' => '',
 	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/fr.dict.itop-bridge-cmdb-ticket.php
@@ -12,8 +12,8 @@
 *
 */
 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkFunctionalCIToTicket' => 'Lien CI fonctionnel / Ticket',
-	'Class:lnkFunctionalCIToTicket+' => 'Ce lien modélise les équipments (CI fonctionnel) qui sont concernés par un Ticket (comme une Demande utilisateur, un Incident, un Changement,...)',
+	'Class:lnkFunctionalCIToTicket' => 'Lien CI / Ticket',
+	'Class:lnkFunctionalCIToTicket+' => '',
 	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => '',
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/en.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/en.dict.itop-change-mgmt-itil.php
@@ -64,7 +64,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Change' => 'Change',
-	'Class:Change+' => 'Abstract class. A type of Ticket to handle Change which has an effect on delivered Services.',
+	'Class:Change+' => '',
 	'Class:Change/Attribute:status' => 'Status',
 	'Class:Change/Attribute:status+' => '',
 	'Class:Change/Attribute:status/Value:new' => 'New',
@@ -167,7 +167,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:RoutineChange' => 'Routine Change',
-	'Class:RoutineChange+' => 'Standard change with low risk, without the need for additional authorization, and for which a validated procedure exists and must be applied.',
+	'Class:RoutineChange+' => '',
 	'Class:RoutineChange/Stimulus:ev_validate' => 'Validate',
 	'Class:RoutineChange/Stimulus:ev_validate+' => '',
 	'Class:RoutineChange/Stimulus:ev_reject' => 'Reject',
@@ -197,8 +197,8 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:ApprovedChange' => 'Change To Approve',
-	'Class:ApprovedChange+' => 'Abstract class. Normal Change and Emergency Change which requires an approval.',
+	'Class:ApprovedChange' => 'Approved Changes',
+	'Class:ApprovedChange+' => '',
 	'Class:ApprovedChange/Attribute:approval_date' => 'Approval Date',
 	'Class:ApprovedChange/Attribute:approval_date+' => '',
 	'Class:ApprovedChange/Attribute:approval_comment' => 'Approval comment',
@@ -233,7 +233,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:NormalChange' => 'Normal Change',
-	'Class:NormalChange+' => 'Type of Change',
+	'Class:NormalChange+' => '',
 	'Class:NormalChange/Attribute:acceptance_date' => 'Acceptance date',
 	'Class:NormalChange/Attribute:acceptance_date+' => '',
 	'Class:NormalChange/Attribute:acceptance_comment' => 'Acceptance comment',
@@ -268,7 +268,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:EmergencyChange' => 'Emergency Change',
-	'Class:EmergencyChange+' => 'Change Ticket to manage emergency situations (malfunctions, security). The approval process is accelerated. The Emergency Change is implemented as soon as possible.',
+	'Class:EmergencyChange+' => '',
 	'Class:EmergencyChange/Stimulus:ev_validate' => 'Validate',
 	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
 	'Class:EmergencyChange/Stimulus:ev_reject' => 'Reject',
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/fr.dict.itop-change-mgmt-itil.php
@@ -51,8 +51,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Change' => 'Ticket de changement',
-	'Class:Change+' => 'Classe abstraite. Une catégorie de Ticket pour gérer les Changements qui peuvent avoir un effet sur les Services délivrés.',
+	'Class:Change' => 'Ticket de Changement',
+	'Class:Change+' => '',
 	'Class:Change/Attribute:status' => 'Etat',
 	'Class:Change/Attribute:status+' => '',
 	'Class:Change/Attribute:status/Value:new' => 'Nouveau',
@@ -178,8 +178,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:RoutineChange' => 'Changement de routine',
-	'Class:RoutineChange+' => 'Changement standard à faible risque, sans nécessité d\'autorisation supplémentaire, et pour lequel une procédure validée existe et doit être appliquée.',
+	'Class:RoutineChange' => 'Changement de Routine',
+	'Class:RoutineChange+' => '',
 	'Class:RoutineChange/Stimulus:ev_validate' => 'Valider',
 	'Class:RoutineChange/Stimulus:ev_validate+' => '',
 	'Class:RoutineChange/Stimulus:ev_reject' => 'Refuser',
@@ -209,8 +209,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:ApprovedChange' => 'Changement à approuver',
-	'Class:ApprovedChange+' => 'Classe abstraite. Changement normal ou Changement urgent qui nécessite une approbation.',
+	'Class:ApprovedChange' => 'Changement pré-approuvé',
+	'Class:ApprovedChange+' => '',
 	'Class:ApprovedChange/Attribute:approval_date' => 'Date d\'approbation',
 	'Class:ApprovedChange/Attribute:approval_date+' => '',
 	'Class:ApprovedChange/Attribute:approval_comment' => 'Commentaire sur l\'approbation',
@@ -244,8 +244,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:NormalChange' => 'Changement normal',
-	'Class:NormalChange+' => 'Type de Changement. A planifier, à évaluer et à autoriser avant son déploiement. Utilisé pour les changements à risque moyen ou fort, non standardisé et non urgent',
+	'Class:NormalChange' => 'Changement Normal',
+	'Class:NormalChange+' => '',
 	'Class:NormalChange/Attribute:acceptance_date' => 'Date d\'acceptation',
 	'Class:NormalChange/Attribute:acceptance_date+' => '',
 	'Class:NormalChange/Attribute:acceptance_comment' => 'Commentaire sur l\'acceptation',
@@ -280,7 +280,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:EmergencyChange' => 'Changement urgent',
-	'Class:EmergencyChange+' => 'Ticket de Changement pour gérer les cas d\'urgence (dysfonctionnement, sécurité). Le processus d\'approbation est accéléré. Le Changement urgent est effectué dès que possible.',
+	'Class:EmergencyChange+' => '',
 	'Class:EmergencyChange/Stimulus:ev_validate' => 'Valider',
 	'Class:EmergencyChange/Stimulus:ev_validate+' => '',
 	'Class:EmergencyChange/Stimulus:ev_reject' => 'Rejeter',
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/sk.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/sk.dict.itop-change-mgmt-itil.php
@@ -185,7 +185,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 //

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
-	'Class:ApprovedChange' => 'Change To Approve~~',
+	'Class:ApprovedChange' => 'Approved Changes~~',
 	'Class:ApprovedChange+' => '~~',
 	'Class:ApprovedChange/Attribute:approval_date' => 'Approval Date~~',
 	'Class:ApprovedChange/Attribute:approval_date+' => '~~',
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/en.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/en.dict.itop-change-mgmt.php
@@ -64,7 +64,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Change' => 'Change',
-	'Class:Change+' => 'A type of Ticket to handle Change which has an effect on delivered Services.',
+	'Class:Change+' => '',
 	'Class:Change/Attribute:status' => 'Status',
 	'Class:Change/Attribute:status+' => '',
 	'Class:Change/Attribute:status/Value:new' => 'New',
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/fr.dict.itop-change-mgmt.php
@@ -51,8 +51,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Change' => 'Ticket de changement',
-	'Class:Change+' => 'Une catégorie de Ticket pour gérer les Changements qui peuvent avoir un effet sur les Services délivrés.',
+	'Class:Change' => 'Ticket de Changement',
+	'Class:Change+' => '',
 	'Class:Change/Attribute:status' => 'Etat',
 	'Class:Change/Attribute:status+' => '',
 	'Class:Change/Attribute:status/Value:new' => 'Nouveau',
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/cs.dict.itop-config-mgmt.php
@@ -494,8 +494,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Všechny konfigurační položky, které tvoří toto aplikační řešení',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Obchodní procesy',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Všechny obchodní procesy závisející na tomto aplikačním řešení',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Stav',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'aktivní',
@@ -517,8 +515,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Aplikační řešení',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Všechna aplikační řešení, která ovlivňují tento proces',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Stav',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'aktivní',
@@ -583,7 +579,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 //

 Dict::Add('CS CZ', 'Czech', 'Čeština', [
-	'Class:WebServer' => 'Web Server',
+	'Class:WebServer' => 'Web server',
 	'Class:WebServer+' => '',
 	'Class:WebServer/Attribute:webapp_list' => 'Web aplikace',
 	'Class:WebServer/Attribute:webapp_list+' => 'Všechny webové aplikace dostupné na tomto web serveru',
@@ -615,8 +611,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:MiddlewareInstance' => 'Instance middlewaru',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Název middlewaru',
@@ -649,8 +643,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Název web serveru',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -848,7 +840,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [

 Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:Tape' => 'Páska',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Název',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Popis',
@@ -898,8 +890,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Dokumenty',
 	'Class:Software/Attribute:documents_list+' => 'Všechny dokumenty spojené s tímto software',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Typ',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
@@ -1065,8 +1055,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Název rodiny OS',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1076,8 +1064,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:OSFamily' => 'Rodina OS',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1175,8 +1161,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Název výrobce',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1544,12 +1528,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 // Add translation for Fieldsets

 Dict::Add('CS CZ', 'Czech', 'Čeština', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Obecné informace',
 	'Server:Date' => 'Data',
 	'Server:moreinfo' => 'Více informací',
@@ -1638,8 +1616,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 //

 Dict::Add('CS CZ', 'Czech', 'Čeština', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/da.dict.itop-config-mgmt.php
@@ -493,8 +493,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Forretningsprocesser',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktiv',
@@ -516,8 +514,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Anvendelsområder',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Liste over applikations løsninger',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktiv',
@@ -614,8 +610,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:MiddlewareInstance' => 'Middleware instans',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware navn',
@@ -648,8 +642,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Web servernavn',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -847,7 +839,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [

 Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:Tape' => 'Bånd',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Navn',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Beskrivelse',
@@ -897,8 +889,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Dokument',
 	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Type',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
@@ -1064,8 +1054,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'OS familienavn',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1075,8 +1063,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:OSFamily' => 'OS-Familie',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1174,8 +1160,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Mærkenavn',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1543,12 +1527,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 // Add translation for Fieldsets

 Dict::Add('DA DA', 'Danish', 'Dansk', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Almindelig Informationen',
 	'Server:Date' => 'Dato',
 	'Server:moreinfo' => 'Yderligere Information',
@@ -1637,8 +1615,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 //

 Dict::Add('DA DA', 'Danish', 'Dansk', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/de.dict.itop-config-mgmt.php
@@ -493,8 +493,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Alle CIs, aus denen diese Anwendungslösung besteht',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business-Prozesse',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Alle Geschäftsprozesse, die von dieser Anwendungslösung abhängen',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'aktiv',
@@ -516,8 +514,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Anwendungslösungen',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Alle Anwendungslösungen, die sich auf diesen Geschäftsprozess auswirken',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'aktiv',
@@ -614,8 +610,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:MiddlewareInstance' => 'Middleware-Instanz',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware-Name',
@@ -648,8 +642,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Webservername',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -847,7 +839,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', [

 Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:Tape' => 'Tape',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Name',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Beschreibung',
@@ -897,8 +889,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Dokumente',
 	'Class:Software/Attribute:documents_list+' => 'Alle mit dieser Software verknüpften Dokumente',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Typ',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DB-Server',
@@ -1064,8 +1054,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'OS-Familienname',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1075,8 +1063,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:OSFamily' => 'OS-Familie',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1174,8 +1160,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Markenname',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1543,12 +1527,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 // Add translation for Fieldsets

 Dict::Add('DE DE', 'German', 'Deutsch', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Allgemeine Informationen',
 	'Server:Date' => 'Datum',
 	'Server:moreinfo' => 'Weitere Informationen',
@@ -1637,8 +1615,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 //

 Dict::Add('DE DE', 'German', 'Deutsch', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en.dict.itop-config-mgmt.php
@@ -57,7 +57,26 @@ Dict::Add('EN US', 'English', 'English', [
 //////////////////////////////////////////////////////////////////////
 // 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:<class_name>/UniquenessRule:<rule_code>
+// Class:<class_name>/UniquenessRule:<rule_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
 //

 //
@@ -66,7 +85,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContactToFunctionalCI' => 'Link Contact / FunctionalCI',
-	'Class:lnkContactToFunctionalCI+' => 'Manages Contacts linked to Functional CIs. This can be a team responsible for the equipment, to assign related Tickets, or the person to whom an individual device such as a PC or phone is assigned, to manage the inventory.',
+	'Class:lnkContactToFunctionalCI+' => '',
 	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
@@ -84,7 +103,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:FunctionalCI' => 'Functional CI',
-	'Class:FunctionalCI+' => 'Abstract class grouping most Configuration Items types used for CMDB.',
+	'Class:FunctionalCI+' => '',
 	'Class:FunctionalCI/Attribute:name' => 'Name',
 	'Class:FunctionalCI/Attribute:name+' => '',
 	'Class:FunctionalCI/Attribute:description' => 'Description',
@@ -123,7 +142,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:PhysicalDevice' => 'Physical Device',
-	'Class:PhysicalDevice+' => 'Abstract class grouping physical types of Configuration Items. A Physical Device can be located. It has usually a Brand and Model.',
+	'Class:PhysicalDevice+' => '',
 	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Serial number',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
@@ -163,7 +182,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Rack' => 'Rack',
-	'Class:Rack+' => 'A physical container for Datacenter Devices and Enclosures.',
+	'Class:Rack+' => '',
 	'Class:Rack/ComplementaryName' => '%1$s - %2$s',
 	'Class:Rack/Attribute:nb_u' => 'Rack units',
 	'Class:Rack/Attribute:nb_u+' => '',
@@ -179,7 +198,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:TelephonyCI' => 'Telephony CI',
-	'Class:TelephonyCI+' => 'Abstract class grouping telephony devices',
+	'Class:TelephonyCI+' => '',
 	'Class:TelephonyCI/Attribute:phonenumber' => 'Phone number',
 	'Class:TelephonyCI/Attribute:phonenumber+' => '',
 ]);
@@ -190,7 +209,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Phone' => 'Phone',
-	'Class:Phone+' => 'End User device. Plain wired phone',
+	'Class:Phone+' => '',
 ]);

 //
@@ -199,7 +218,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:MobilePhone' => 'Mobile Phone',
-	'Class:MobilePhone+' => 'End User device. Wireless phone',
+	'Class:MobilePhone+' => '',
 	'Class:MobilePhone/Attribute:imei' => 'IMEI',
 	'Class:MobilePhone/Attribute:imei+' => '',
 	'Class:MobilePhone/Attribute:hw_pin' => 'Hardware PIN',
@@ -212,7 +231,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:IPPhone' => 'IP Phone',
-	'Class:IPPhone+' => 'Physical device dedicated to phone calls, connected to a network',
+	'Class:IPPhone+' => '',
 ]);

 //
@@ -221,7 +240,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Tablet' => 'Tablet',
-	'Class:Tablet+' => 'End User device. For example iPad, Galaxy Note/Tab Nexus, Kindle...',
+	'Class:Tablet+' => '',
 ]);

 //
@@ -230,7 +249,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ConnectableCI' => 'Connectable CI',
-	'Class:ConnectableCI+' => 'Physical Device which can be connected to a network.',
+	'Class:ConnectableCI+' => 'Physical CI',
 	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Network devices',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device',
@@ -244,7 +263,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:DatacenterDevice' => 'Datacenter Device',
-	'Class:DatacenterDevice+' => 'A physical equipment, connected to the network and installed in a data center, usually in a Rack or an Enclosure. This can include Servers, Network Devices, Storage Systems, SAN Switches, Tape Libraries, NAS Devices, etc.',
+	'Class:DatacenterDevice+' => '',
 	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
@@ -283,7 +302,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:NetworkDevice' => 'Network Device',
-	'Class:NetworkDevice+' => 'Any type of network device: router, switch, hub, load balancer, firewall…',
+	'Class:NetworkDevice+' => '',
 	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Network type',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
@@ -305,7 +324,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Server' => 'Server',
-	'Class:Server+' => 'Datacenter Device managing access to centralized resources or services. It contains an OS Version executing Software Instances.',
+	'Class:Server+' => '',
 	'Class:Server/ComplementaryName' => '%1$s - %2$s',
 	'Class:Server/Attribute:osfamily_id' => 'OS family',
 	'Class:Server/Attribute:osfamily_id+' => '',
@@ -333,7 +352,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:StorageSystem' => 'Storage System',
-	'Class:StorageSystem+' => 'Storage system that can be attached either to a SAN or to an Ethernet network. The logical unit of storage managed by a Storage System is a Logical Volume.',
+	'Class:StorageSystem+' => '',
 	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Logical volumes',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'All the logical volumes in this storage system',
@@ -345,7 +364,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:SANSwitch' => 'SAN Switch',
-	'Class:SANSwitch+' => 'A SAN Switch is a network switch compatible with the Fibre Channel protocol used by storage networks. It is a Datacenter Device.',
+	'Class:SANSwitch+' => '',
 	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Devices',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'All the devices connected to this SAN switch',
@@ -357,7 +376,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:TapeLibrary' => 'Tape Library',
-	'Class:TapeLibrary+' => 'Datacenter Device which hosts multiple magnetic Tapes (or cartridge). Tape Libraries are used for data backup or archiving.',
+	'Class:TapeLibrary+' => '',
 	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Tapes',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library',
@@ -369,7 +388,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:NAS' => 'NAS',
-	'Class:NAS+' => 'High-capacity storage device racked in a datacenter and connected to a network. In '.ITOP_APPLICATION_SHORT.' a NAS (Network-attached storage) is hosting NAS File Systems.',
+	'Class:NAS+' => '',
 	'Class:NAS/ComplementaryName' => '%1$s - %2$s',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS',
@@ -381,7 +400,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:PC' => 'PC',
-	'Class:PC+' => 'Connectable CI. A Personal Computer (PC) is a Physical Device, Desktop or Laptop, running an operating system and designed to execute Software Instances.',
+	'Class:PC+' => '',
 	'Class:PC/ComplementaryName' => '%1$s - %2$s',
 	'Class:PC/Attribute:osfamily_id' => 'OS family',
 	'Class:PC/Attribute:osfamily_id+' => '',
@@ -409,7 +428,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Printer' => 'Printer',
-	'Class:Printer+' => 'Connectable CI. Physical Device connected either to the network or to a PC.',
+	'Class:Printer+' => '',
 	'Class:Printer/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -419,7 +438,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:PowerConnection' => 'Power Connection',
-	'Class:PowerConnection+' => 'Abstract class grouping physical devices used for electrical power supply.',
+	'Class:PowerConnection+' => '',
 	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -429,7 +448,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:PowerSource' => 'Power Source',
-	'Class:PowerSource+' => 'Physical Power Connection. Used in a datacenter to document any kind of power source (main power inlet, breaker…) that is not a PDU.',
+	'Class:PowerSource+' => '',
 	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
 	'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source',
@@ -441,7 +460,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:PDU' => 'PDU',
-	'Class:PDU+' => 'Power Connection. PDU (Power Distribution Unit) is a device fitted with multiple outputs designed to distribute electric power, especially to racks of computers and networking equipment located within a datacenter.',
+	'Class:PDU+' => '',
 	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
@@ -459,8 +478,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Peripheral' => 'Peripheral',
-	'Class:Peripheral+' => 'Physical device, used to document any kind of computer peripheral.
-For example: external hard drives, scanners, input devices (trackballs, bar code scanners), etc…',
+	'Class:Peripheral+' => '',
 	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -470,7 +488,7 @@ For example: external hard drives, scanners, input devices (trackballs, bar code

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Enclosure' => 'Enclosure',
-	'Class:Enclosure+' => 'Cabinet is a physical structure in which to mount IT equipment such as Servers, Network Device... In  '.ITOP_APPLICATION_SHORT.' an Enclosure can be mounted inside a Rack or directly fitted on the wall of a datacenter.',
+	'Class:Enclosure+' => '',
 	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '',
@@ -488,13 +506,11 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ApplicationSolution' => 'Application Solution',
-	'Class:ApplicationSolution+' => 'Application Solutions describe complex applications that are made of (or depend on) several basic components. The main information conveyed by an Application Solution is its list of relationships.',
+	'Class:ApplicationSolution+' => '',
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active',
@@ -513,11 +529,9 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:BusinessProcess' => 'Business Process',
-	'Class:BusinessProcess+' => 'A Business Process is used to document a high-level process or an important application for the operations. It is quite similar to an Application Solution but for describing higher level applications or whole processes in the organization.',
+	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'active',
@@ -526,51 +540,13 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:BusinessProcess/Attribute:status/Value:inactive+' => 'inactive',
 ]);

-//
-// Class: Software
-//
-
-Dict::Add('EN US', 'English', 'English', [
-	'Class:Software' => 'Software',
-	'Class:Software+' => 'Software is a generic item in the software catalog. It has a particular version. In '.ITOP_APPLICATION_SHORT.' a Software has a category amongst: DB Server, Middleware, PC Software, Web Server and Other Software.',
-	'Class:Software/ComplementaryName' => '%1$s - %2$s',
-	'Class:Software/Attribute:name' => 'Name',
-	'Class:Software/Attribute:name+' => '',
-	'Class:Software/Attribute:vendor' => 'Vendor',
-	'Class:Software/Attribute:vendor+' => '',
-	'Class:Software/Attribute:version' => 'Version',
-	'Class:Software/Attribute:version+' => '',
-	'Class:Software/Attribute:documents_list' => 'Documents',
-	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software',
-  'Class:Software/Attribute:logo' => 'Logo',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs',
-	'Class:Software/Attribute:type' => 'Type',
-	'Class:Software/Attribute:type+' => '',
-	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
-	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server',
-	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
-	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
-	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software',
-	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
-	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server',
-	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances',
-	'Class:Software/Attribute:softwareinstance_list+' => 'All the software instances for this software',
-	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches',
-	'Class:Software/Attribute:softwarepatch_list+' => 'All the patchs for this software',
-	'Class:Software/Attribute:softwarelicence_list' => 'Software Licenses',
-	'Class:Software/Attribute:softwarelicence_list+' => 'All the licenses for this software',
-]);
-
 //
 // Class: SoftwareInstance
 //

 Dict::Add('EN US', 'English', 'English', [
 	'Class:SoftwareInstance' => 'Software Instance',
-	'Class:SoftwareInstance+' => 'Abstract class representing the deployment of a Software on a device (Server, PC, VirtualMachine). In '.ITOP_APPLICATION_SHORT.' there are different types of Software Instance: DB Server, Middleware, PC Software, Web Server and Other Software',
+	'Class:SoftwareInstance+' => '',
 	'Class:SoftwareInstance/Attribute:system_id' => 'System',
 	'Class:SoftwareInstance/Attribute:system_id+' => 'The system can be a Server, a Virtual Machine, a PC, ...',
 	'Class:SoftwareInstance/Attribute:system_name' => 'System name',
@@ -599,7 +575,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Middleware' => 'Middleware',
-	'Class:Middleware+' => 'Software Instance offering services to other software (like: Tomcat, JBoss, Talend, Microsoft BizTalk, IBM Websphere or Lotus Domino) installed on a specific system (PC, Server or Virtual Machine).',
+	'Class:Middleware+' => '',
 	'Class:Middleware/Attribute:middlewareinstance_list' => 'Middleware instances',
 	'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware',
 ]);
@@ -610,7 +586,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:DBServer' => 'DB Server',
-	'Class:DBServer+' => 'Software Instance offering database services (MySQL 8.0, Oracle, SQL Server, DB2…) installed on a specific system (PC, Server or Virtual Machine).',
+	'Class:DBServer+' => '',
 	'Class:DBServer/Attribute:dbschema_list' => 'DB schemas',
 	'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server',
 ]);
@@ -620,8 +596,8 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:WebServer' => 'Web Server',
-	'Class:WebServer+' => 'It is a Software Instance, offering Web services (like Apache 2.4, Nginx 1.29.4, IIS 7.0) installed on a specific system (PC, Server or Virtual Machine).',
+	'Class:WebServer' => 'Web server',
+	'Class:WebServer+' => '',
 	'Class:WebServer/Attribute:webapp_list' => 'Web applications',
 	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server',
 ]);
@@ -632,7 +608,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:PCSoftware' => 'PC Software',
-	'Class:PCSoftware+' => 'Software Instance for software (like MS Office, Adobe Photoshop or Filezilla) installed on a PC.',
+	'Class:PCSoftware+' => '',
 ]);

 //
@@ -641,7 +617,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:OtherSoftware' => 'Other Software',
-	'Class:OtherSoftware+' => 'Any type of Software Instance that do not fit in the other categories: PC Software, Middleware, DB server or Web Server.',
+	'Class:OtherSoftware+' => '',
 ]);

 //
@@ -650,10 +626,8 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:MiddlewareInstance' => 'Middleware Instance',
-	'Class:MiddlewareInstance+' => 'Functional CI representing a service delivered by a Middleware.',
+	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name',
@@ -666,7 +640,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:DatabaseSchema' => 'Database Schema',
-	'Class:DatabaseSchema+' => 'Dabatase instance running of a specific DB server.',
+	'Class:DatabaseSchema+' => '',
 	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB server',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
@@ -680,14 +654,12 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:WebApplication' => 'Web Application',
-	'Class:WebApplication+' => 'Instance of an application accessible using a web browser and that runs on a given Web Server instance. For eg. this iTop that you\'re looking at.',
+	'Class:WebApplication+' => '',
 	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s',
 	'Class:WebApplication/Attribute:webserver_id' => 'Web server',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Web server name',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -698,7 +670,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:VirtualDevice' => 'Virtual Device',
-	'Class:VirtualDevice+' => 'Abstract class used for server virtualization (Virtual Host and Virtual Machine).',
+	'Class:VirtualDevice+' => '',
 	'Class:VirtualDevice/Attribute:status' => 'Status',
 	'Class:VirtualDevice/Attribute:status+' => '',
 	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'implementation',
@@ -719,7 +691,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:VirtualHost' => 'Virtual Host',
-	'Class:VirtualHost+' => 'Abstract class used for Virtual Devices (Hypervisor, Farm,...) hosting Virtual Machines.',
+	'Class:VirtualHost+' => '',
 	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Virtual machines',
 	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'All the virtual machines hosted by this host',
 ]);
@@ -730,7 +702,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Hypervisor' => 'Hypervisor',
-	'Class:Hypervisor+' => 'Virtual Host. Virtualization software (MS Hyper-V, VMWare ESX, Xen, etc.), running on a physical Server and supporting the creation of Virtual Machines.',
+	'Class:Hypervisor+' => '',
 	'Class:Hypervisor/Attribute:farm_id' => 'Farm',
 	'Class:Hypervisor/Attribute:farm_id+' => '',
 	'Class:Hypervisor/Attribute:farm_name' => 'Farm name',
@@ -747,7 +719,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Farm' => 'Farm',
-	'Class:Farm+' => 'Virtual Host. A Farm (or cluster) is a group of Hypervisors pooled together and sharing storage resources to provide an overall fault tolerant system for hosting Virtual Machines.',
+	'Class:Farm+' => '',
 	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
 	'Class:Farm/Attribute:hypervisor_list+' => 'All the hypervisors that compose this farm',
 	'Class:Farm/Attribute:redundancy' => 'High availability',
@@ -762,7 +734,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:VirtualMachine' => 'Virtual Machine',
-	'Class:VirtualMachine+' => 'Virtual Device equivalent to a Server, it is hosted either on an Hypervisor or on a Farm.',
+	'Class:VirtualMachine+' => '',
 	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Virtual host',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
@@ -796,7 +768,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:LogicalVolume' => 'Logical Volume',
-	'Class:LogicalVolume+' => 'The unit of storage managed inside a Storage System. It can be accessed by multiple Servers and Virtual Devices.',
+	'Class:LogicalVolume+' => '',
 	'Class:LogicalVolume/Attribute:name' => 'Name',
 	'Class:LogicalVolume/Attribute:name+' => '',
 	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
@@ -822,8 +794,8 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:lnkServerToVolume' => 'Link Server / LogicalVolume',
-	'Class:lnkServerToVolume+' => 'This many-to-many link indicates that a Server uses a Logical Volume (a storage unit managed inside a Storage System). Several Servers can use the same Logical Volume.',
+	'Class:lnkServerToVolume' => 'Link Server / Volume',
+	'Class:lnkServerToVolume+' => '',
 	'Class:lnkServerToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
@@ -842,8 +814,8 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:lnkVirtualDeviceToVolume' => 'Link VirtualDevice / LogicalVolume',
-	'Class:lnkVirtualDeviceToVolume+' => 'This many-to-many link indicates that a Virtual Device uses a Logical Volume (a storage unit managed inside a Storage System). Several Virtual Devices can use the same Logical Volume.',
+	'Class:lnkVirtualDeviceToVolume' => 'Link Virtual Device / Volume',
+	'Class:lnkVirtualDeviceToVolume+' => '',
 	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
@@ -862,8 +834,8 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:lnkSanToDatacenterDevice' => 'Link SANSwitch / DatacenterDevice',
-	'Class:lnkSanToDatacenterDevice+' => 'This many-to-many link models the network connection between a SAN Switch and a Datacenter Device (a Server, a Network Device, etc.).',
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Datacenter Device',
+	'Class:lnkSanToDatacenterDevice+' => '',
 	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN switch',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
@@ -885,7 +857,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Tape' => 'Tape',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Name',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Description',
@@ -904,7 +876,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:NASFileSystem' => 'NAS File System',
-	'Class:NASFileSystem+' => 'Represents a shared file system hosted inside a given NAS (Network Attached Storage).',
+	'Class:NASFileSystem+' => '',
 	'Class:NASFileSystem/Attribute:name' => 'Name',
 	'Class:NASFileSystem/Attribute:name+' => '',
 	'Class:NASFileSystem/Attribute:description' => 'Description',
@@ -919,13 +891,49 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:NASFileSystem/Attribute:nas_name+' => '',
 ]);

+//
+// Class: Software
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:Software' => 'Software',
+	'Class:Software+' => '',
+	'Class:Software/ComplementaryName' => '%1$s - %2$s',
+	'Class:Software/Attribute:name' => 'Name',
+	'Class:Software/Attribute:name+' => '',
+	'Class:Software/Attribute:vendor' => 'Vendor',
+	'Class:Software/Attribute:vendor+' => '',
+	'Class:Software/Attribute:version' => 'Version',
+	'Class:Software/Attribute:version+' => '',
+	'Class:Software/Attribute:documents_list' => 'Documents',
+	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software',
+	'Class:Software/Attribute:type' => 'Type',
+	'Class:Software/Attribute:type+' => '',
+	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
+	'Class:Software/Attribute:type/Value:DBServer+' => 'DB Server',
+	'Class:Software/Attribute:type/Value:Middleware' => 'Middleware',
+	'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware',
+	'Class:Software/Attribute:type/Value:OtherSoftware' => 'Other Software',
+	'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC Software',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web Server',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server',
+	'Class:Software/Attribute:softwareinstance_list' => 'Software Instances',
+	'Class:Software/Attribute:softwareinstance_list+' => 'All the software instances for this software',
+	'Class:Software/Attribute:softwarepatch_list' => 'Software Patches',
+	'Class:Software/Attribute:softwarepatch_list+' => 'All the patchs for this software',
+	'Class:Software/Attribute:softwarelicence_list' => 'Software Licenses',
+	'Class:Software/Attribute:softwarelicence_list+' => 'All the licenses for this software',
+]);
+
 //
 // Class: Patch
 //

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Patch' => 'Patch',
-	'Class:Patch+' => 'Abstract class, for patch, hotfix, security fix or service pack for an OS or a Software.',
+	'Class:Patch+' => '',
 	'Class:Patch/Attribute:name' => 'Name',
 	'Class:Patch/Attribute:name+' => '',
 	'Class:Patch/Attribute:documents_list' => 'Documents',
@@ -942,7 +950,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:OSPatch' => 'OS Patch',
-	'Class:OSPatch+' => 'Patch, hotfix, security fix or service pack for a given operating system.',
+	'Class:OSPatch+' => '',
 	'Class:OSPatch/Attribute:functionalcis_list' => 'Devices',
 	'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed',
 	'Class:OSPatch/Attribute:osversion_id' => 'OS version',
@@ -957,7 +965,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:SoftwarePatch' => 'Software Patch',
-	'Class:SoftwarePatch+' => 'Patch, hotfix, security fix or service pack for a given software.',
+	'Class:SoftwarePatch+' => '',
 	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
 	'Class:SoftwarePatch/Attribute:software_id+' => '',
 	'Class:SoftwarePatch/Attribute:software_name' => 'Software name',
@@ -972,7 +980,8 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Licence' => 'License',
-	'Class:Licence+' => 'Abstract class. A license contract for a particular OS version or Software',
+	'Class:Licence+' => '',
+
 	'Class:Licence/Attribute:name' => 'Name',
 	'Class:Licence/Attribute:name+' => '',
 	'Class:Licence/Attribute:documents_list' => 'Documents',
@@ -1007,7 +1016,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:OSLicence' => 'OS License',
-	'Class:OSLicence+' => 'A license contract for a particular operating system. The license is related to one operating system (for example Windows 2008 R2) and can be associated with several servers or virtual machines.',
+	'Class:OSLicence+' => '',
 	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:OSLicence/Attribute:osversion_id' => 'OS version',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
@@ -1025,7 +1034,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:SoftwareLicence' => 'Software License',
-	'Class:SoftwareLicence+' => 'A license contract for a particular software. The license is related to one software (for example MS Office 2010) and can be associated with several instances of this software.',
+	'Class:SoftwareLicence+' => '',
 	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
@@ -1041,7 +1050,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDocumentToLicence' => 'Link Document / License',
-	'Class:lnkDocumentToLicence+' => 'Link used when a Document is applicable to a License.',
+	'Class:lnkDocumentToLicence+' => '',
 	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'License',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
@@ -1059,15 +1068,13 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:OSVersion' => 'OS Version',
-	'Class:OSVersion+' => 'Typology. List of the possible values for the "OS Version" of a computer (Server, Virtual Machine or PC). The OS Versions are organized per OS Family.',
+	'Class:OSVersion+' => '',
 	'Class:OSVersion/Attribute:osfamily_id' => 'OS family',
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
 	'Class:OSVersion/Attribute:ospatches_list' => 'OS patches',
 	'Class:OSVersion/Attribute:ospatches_list+' => 'All the OS patches for this OS version',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family',
 ]);

 //
@@ -1076,11 +1083,9 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:OSFamily' => 'OS Family',
-	'Class:OSFamily+' => 'Typology. List of the possible values for the "OS Family" attribute of Servers, Virtual Machines and PCs.',
+	'Class:OSFamily+' => '',
 	'Class:OSFamily/Attribute:osversions_list' => 'OS versions',
 	'Class:OSFamily/Attribute:osversions_list+' => 'All the OS versions for this OS family',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists',
 ]);

 //
@@ -1089,7 +1094,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Brand' => 'Brand',
-	'Class:Brand+' => 'Typology. List of the possible values for the "Brand" attribute of Physical Device.',
+	'Class:Brand+' => '',
 	'Class:Brand/Attribute:iosversions_list' => 'IOS versions',
 	'Class:Brand/Attribute:iosversions_list+' => 'All the IOS versions from this brand',
 	'Class:Brand/Attribute:logo' => 'Logo',
@@ -1108,7 +1113,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Model' => 'Device Model',
-	'Class:Model+' => 'Typology. List the possible values for the Model attribute of a Physical Device. Each Model belongs to a single Brand, and usually applies to a single type of Physical Device.',
+	'Class:Model+' => '',
 	'Class:Model/ComplementaryName' => '%1$s - %2$s',
 	'Class:Model/Attribute:brand_id' => 'Brand',
 	'Class:Model/Attribute:brand_id+' => '',
@@ -1166,7 +1171,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:NetworkDeviceType' => 'Network Device Type',
-	'Class:NetworkDeviceType+' => 'Typology. The possible values for the "Type" of a Network Device (e.g. Router, Switch, Firewall, etc.).',
+	'Class:NetworkDeviceType+' => '',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Network devices',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type',
 ]);
@@ -1177,15 +1182,13 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:IOSVersion' => 'IOS Version',
-	'Class:IOSVersion+' => 'Typology. Possible values for the versions of operating system for network devices (IOS from Cisco\'s Internetwork Operating System).',
+	'Class:IOSVersion+' => '',
 	'Class:IOSVersion/Attribute:brand_id' => 'Brand',
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Brand name',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
 	'Class:IOSVersion/Attribute:networkdevices_list' => 'Network devices',
 	'Class:IOSVersion/Attribute:networkdevices_list+' => 'All the network devices running this IOS version',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand',
 ]);

 //
@@ -1194,7 +1197,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDocumentToPatch' => 'Link Document / Patch',
-	'Class:lnkDocumentToPatch+' => 'Link used when a Document is applicable to a Patch.',
+	'Class:lnkDocumentToPatch+' => '',
 	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
@@ -1212,7 +1215,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Software Instance / Software Patch',
-	'Class:lnkSoftwareInstanceToSoftwarePatch+' => 'This link indicates that a software patch has been applied to a software instance.',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
@@ -1230,7 +1233,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkFunctionalCIToOSPatch' => 'Link FunctionalCI / OS patch',
-	'Class:lnkFunctionalCIToOSPatch+' => 'Models the deployment of an OS Patch on a device.',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
@@ -1248,7 +1251,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDocumentToSoftware' => 'Link Document / Software',
-	'Class:lnkDocumentToSoftware+' => 'Link used when a Document is applicable to Software.',
+	'Class:lnkDocumentToSoftware+' => '',
 	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
@@ -1266,7 +1269,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Subnet' => 'Subnet',
-	'Class:Subnet+' => 'Segment of an IP network, defined by an IP address and a mask',
+	'Class:Subnet+' => '',
 	'Class:Subnet/Name' => '%1$s/%2$s',
 	'Class:Subnet/ComplementaryName' => '%1$s - %2$s',
 	'Class:Subnet/Attribute:description' => 'Description',
@@ -1291,7 +1294,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:VLAN' => 'VLAN',
-	'Class:VLAN+' => 'A Virtual LAN is used to group together in a logical way networks Subnets and Physical Interfaces that participate in the same VLAN.',
+	'Class:VLAN+' => '',
 	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag',
 	'Class:VLAN/Attribute:vlan_tag+' => '',
 	'Class:VLAN/Attribute:description' => 'Description',
@@ -1312,7 +1315,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkSubnetToVLAN' => 'Link Subnet / VLAN',
-	'Class:lnkSubnetToVLAN+' => 'This many-to-many link indicates that a VLAN is present on a Subnet. Several VLANs can be present on the same Subnet and a VLAN can span several Subnets.',
+	'Class:lnkSubnetToVLAN+' => '',
 	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
@@ -1332,7 +1335,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:NetworkInterface' => 'Network Interface',
-	'Class:NetworkInterface+' => 'Abstract class for all types of network interfaces.',
+	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => 'Name',
 	'Class:NetworkInterface/Attribute:name+' => '',
 	'Class:NetworkInterface/Attribute:finalclass' => 'NetworkInterface sub-class',
@@ -1345,7 +1348,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:IPInterface' => 'IP Interface',
-	'Class:IPInterface+' => 'Abstract class. A type of Network Interface with an IP address',
+	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP address',
 	'Class:IPInterface/Attribute:ipaddress+' => '',

@@ -1367,16 +1370,12 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:PhysicalInterface' => 'Physical Interface',
-	'Class:PhysicalInterface+' => 'A type of IP Interface that represents a physical network interface (e.g. an Ethernet card).',
+	'Class:PhysicalInterface+' => '',
 	'Class:PhysicalInterface/Name' => '%2$s %1$s',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Device',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name',
 	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization',
-	'Class:PhysicalInterface/Attribute:org_id+' => '',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location',
-	'Class:PhysicalInterface/Attribute:location_id+' => '',
 	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
 	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
 ]);
@@ -1387,7 +1386,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Link PhysicalInterface / VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN+' => 'This link indicates when a network interface is part of a VLAN (Virtual Local Area Network).',
+	'Class:lnkPhysicalInterfaceToVLAN+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Physical Interface',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
@@ -1409,7 +1408,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:LogicalInterface' => 'Logical Interface',
-	'Class:LogicalInterface+' => 'IP Interface which is not associated permanently with a particular physical port, the association is dynamic. It can be used for Virtual Machine.',
+	'Class:LogicalInterface+' => '',
 	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Virtual machine',
 	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
 	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name',
@@ -1422,7 +1421,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:FiberChannelInterface' => 'Fiber Channel Interface',
-	'Class:FiberChannelInterface+' => 'Network Interface to a high-speed network technology primarily used for connecting Storage Systems.',
+	'Class:FiberChannelInterface+' => '',
 	'Class:FiberChannelInterface/Attribute:speed' => 'Speed',
 	'Class:FiberChannelInterface/Attribute:speed+' => '',
 	'Class:FiberChannelInterface/Attribute:topology' => 'Topology',
@@ -1441,7 +1440,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice',
-	'Class:lnkConnectableCIToNetworkDevice+' => 'Defines on which network equipment a device is connected.',
+	'Class:lnkConnectableCIToNetworkDevice+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Network device',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
@@ -1469,7 +1468,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link ApplicationSolution / FunctionalCI',
-	'Class:lnkApplicationSolutionToFunctionalCI+' => 'Models the membership of a device to an Application Solution. The meaning of this relationship varies depending on the types of Application Solution.',
+	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
@@ -1487,7 +1486,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess',
-	'Class:lnkApplicationSolutionToBusinessProcess+' => 'Models the relationship between an Application Solution and a Business Process.',
+	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Business process',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
@@ -1505,7 +1504,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Group' => 'Group',
-	'Class:Group+' => 'Group is designed to define explicit sets of configurations items for any project purpose. In contrast to Application Solution, a Group is not impacted by any of its component and does not impact them. For example when doing an OS migration, Group can be convenient to gather “Servers to be migrated”. Migrated servers being removed from the group as the migration progresses.',
+	'Class:Group+' => '',
 	'Class:Group/ComplementaryName' => '%1$s - %2$s',
 	'Class:Group/Attribute:name' => 'Name',
 	'Class:Group/Attribute:name+' => '',
@@ -1526,6 +1525,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Group/Attribute:type' => 'Type',
 	'Class:Group/Attribute:type+' => '',
 	'Class:Group/Attribute:parent_id' => 'Parent Group',
+
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => 'Name',
 	'Class:Group/Attribute:parent_name+' => '',
@@ -1540,8 +1540,8 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:lnkGroupToCI' => 'Link Group / FunctionalCI',
-	'Class:lnkGroupToCI+' => 'This link indicates when a Functional CI is part of a Group.',
+	'Class:lnkGroupToCI' => 'Link Group / CI',
+	'Class:lnkGroupToCI+' => '',
 	'Class:lnkGroupToCI/Name' => '%1$s / %2$s',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Group',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
@@ -1555,13 +1555,30 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ]);

+// Add translation for Fieldsets
+
+Dict::Add('EN US', 'English', 'English', [
+	'Server:baseinfo' => 'General information',
+	'Server:Date' => 'Dates',
+	'Server:moreinfo' => 'More information',
+	'Server:otherinfo' => 'Other information',
+	'Server:power' => 'Power supply',
+	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
+	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet is used or not',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces having an IP in the range: <em>%1$s</em> to <em>%2$s</em>',
+	'Class:Subnet/Tab:FreeIPs' => 'Free IPs',
+	'Class:Subnet/Tab:FreeIPs-count' => 'Free IPs: %1$s',
+	'Class:Subnet/Tab:FreeIPs-explain' => 'Here is an extract of 10 free IP addresses',
+	'Class:Document:PreviewTab' => 'Preview',
+]);
+
 //
 // Class: lnkDocumentToFunctionalCI
 //

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDocumentToFunctionalCI' => 'Link Document / FunctionalCI',
-	'Class:lnkDocumentToFunctionalCI+' => 'Link used when a Document is applicable to a Functional CI.',
+	'Class:lnkDocumentToFunctionalCI+' => '',
 	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
@@ -1573,29 +1590,6 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
 ]);

-// Add translation for Fieldsets
-
-Dict::Add('EN US', 'English', 'English', [
-	'ConfigMgmt:baseinfo' => 'General',
-	'ConfigMgmt:moreinfo' => 'CI specifics',
-	'ConfigMgmt:otherinfo' => 'Dates and description',
-	'Storage:moreinfo' => 'Storage specifics',
-	'Software:moreinfo' => 'Software specifics',
-	'Phone:moreinfo' => 'Phone specifics',
-	'Server:baseinfo' => 'General',
-	'Server:moreinfo' => 'Device specifics',
-	'Server:Date' => 'Dates',
-	'Server:otherinfo' => 'Description',
-	'Server:power' => 'Power supply',
-	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
-	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet is used or not',
-	'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',
-]);
-
 //
 // Application Menu
 //
@@ -1646,3 +1640,14 @@ Dict::Add('EN US', 'English', 'English', [
 	'Menu:Software' => 'Software catalog',
 	'Menu:Software+' => 'Software catalog',
 ]);
+
+//
+// Class: PhysicalInterface
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id',
+	'Class:PhysicalInterface/Attribute:org_id+' => '',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id',
+	'Class:PhysicalInterface/Attribute:location_id+' => '',
+]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/en_gb.dict.itop-config-mgmt.php
@@ -59,6 +59,26 @@ Dict::Add('EN GB', 'British English', 'British English', [
 //////////////////////////////////////////////////////////////////////
 //

+// 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:<class_name>/UniquenessRule:<rule_code>
+// Class:<class_name>/UniquenessRule:<rule_code>+
+
+//////////////////////////////////////////////////////////////////////
+// Note: The classes have been grouped by categories: bizmodel
+//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
+// Classes in 'bizmodel'
+//////////////////////////////////////////////////////////////////////
+//
+
 //
 // Class: lnkContactToFunctionalCI
 //
@@ -491,8 +511,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Business processes',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'active',
@@ -514,8 +532,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Application solutions',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'active',
@@ -580,7 +596,7 @@ Dict::Add('EN GB', 'British English', 'British English', [
 //

 Dict::Add('EN GB', 'British English', 'British English', [
-	'Class:WebServer' => 'Web Server',
+	'Class:WebServer' => 'Web server',
 	'Class:WebServer+' => '',
 	'Class:WebServer/Attribute:webapp_list' => 'Web applications',
 	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server',
@@ -612,8 +628,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:MiddlewareInstance' => 'Middleware Instance',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware name',
@@ -646,8 +660,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Web server name',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -845,7 +857,7 @@ Dict::Add('EN GB', 'British English', 'British English', [

 Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:Tape' => 'Tape',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Name',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Description',
@@ -895,8 +907,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Documents',
 	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Type',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
@@ -1063,8 +1073,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'OS family name',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1074,8 +1082,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:OSFamily' => 'OS Family',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1173,8 +1179,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Brand name',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1362,10 +1366,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Device name',
 	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization',
-	'Class:PhysicalInterface/Attribute:org_id+' => '',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location',
-	'Class:PhysicalInterface/Attribute:location_id+' => '',
 	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
 	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
 ]);
@@ -1548,16 +1548,10 @@ Dict::Add('EN GB', 'British English', 'British English', [
 // Add translation for Fieldsets

 Dict::Add('EN GB', 'British English', 'British English', [
-	'ConfigMgmt:baseinfo' => 'General',
-	'ConfigMgmt:moreinfo' => 'CI specifics',
-	'ConfigMgmt:otherinfo' => 'Dates and description',
-	'Storage:moreinfo' => 'Storage specifics',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
-	'Server:baseinfo' => 'General',
-	'Server:moreinfo' => 'Device specifics',
+	'Server:baseinfo' => 'General information',
 	'Server:Date' => 'Dates',
-	'Server:otherinfo' => 'Description',
+	'Server:moreinfo' => 'More information',
+	'Server:otherinfo' => 'Other information',
 	'Server:power' => 'Power supply',
 	'Class:Subnet/Tab:IPUsage' => 'IP Usage',
 	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet is used or not',
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php
@@ -122,7 +122,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:PhysicalDevice' => 'Dispositivo Físico',
-	'Class:PhysicalDevice+' => '',
+	'Class:PhysicalDevice+' => 'Dispositivo Físico',
 	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Número de Serie',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => 'Número de Serie',
@@ -178,7 +178,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:TelephonyCI' => 'EC Telefónico',
-	'Class:TelephonyCI+' => '',
+	'Class:TelephonyCI+' => 'EC Telefónico',
 	'Class:TelephonyCI/Attribute:phonenumber' => 'Número Telefónico',
 	'Class:TelephonyCI/Attribute:phonenumber+' => 'Número Telefónico',
 ]);
@@ -189,7 +189,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Phone' => 'Teléfono',
-	'Class:Phone+' => '',
+	'Class:Phone+' => 'Teléfono',
 ]);

 //
@@ -198,7 +198,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:MobilePhone' => 'Teléfono Móvil',
-	'Class:MobilePhone+' => '',
+	'Class:MobilePhone+' => 'Teléfono Móvil',
 	'Class:MobilePhone/Attribute:imei' => 'IMEI',
 	'Class:MobilePhone/Attribute:imei+' => 'IMEI',
 	'Class:MobilePhone/Attribute:hw_pin' => 'PIN',
@@ -211,7 +211,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:IPPhone' => 'Teléfono IP',
-	'Class:IPPhone+' => '',
+	'Class:IPPhone+' => 'Teléfono IP',
 ]);

 //
@@ -243,7 +243,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:DatacenterDevice' => 'Dispositivos de Centro de Datos',
-	'Class:DatacenterDevice+' => '',
+	'Class:DatacenterDevice+' => 'Dispositivos de Centro de Datos',
 	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => 'Rack',
@@ -281,7 +281,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:NetworkDevice' => 'Dispositivo de Red',
-	'Class:NetworkDevice+' => '',
+	'Class:NetworkDevice+' => 'Dispositivo de Red',
 	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Tipo de Red',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => 'Tipo de Red',
@@ -303,7 +303,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Server' => 'Servidor',
-	'Class:Server+' => '',
+	'Class:Server+' => 'Servidor',
 	'Class:Server/ComplementaryName' => '%1$s - %2$s',
 	'Class:Server/Attribute:osfamily_id' => 'Familia de SO',
 	'Class:Server/Attribute:osfamily_id+' => 'Familia de SO',
@@ -331,7 +331,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:StorageSystem' => 'Sistema de Almacenamiento',
-	'Class:StorageSystem+' => '',
+	'Class:StorageSystem+' => 'Sistema de Almacenamiento',
 	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumenes Lógicos',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Volumenes Lógicos',
@@ -343,7 +343,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SANSwitch' => 'Switch de SAN',
-	'Class:SANSwitch+' => '',
+	'Class:SANSwitch+' => 'Switch de SAN',
 	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Dispositivos',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Dispositivos',
@@ -355,7 +355,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:TapeLibrary' => 'Libreria de Cintas',
-	'Class:TapeLibrary+' => '',
+	'Class:TapeLibrary+' => 'Libreria de Cintas',
 	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Cintas',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Cintas',
@@ -367,10 +367,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:NAS' => 'NAS',
-	'Class:NAS+' => '',
+	'Class:NAS+' => 'NAS',
 	'Class:NAS/ComplementaryName' => '%1$s - %2$s',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems',
-	'Class:NAS/Attribute:nasfilesystem_list+' => '',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'Filesystems',
 ]);

 //
@@ -379,7 +379,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:PC' => 'PC/Laptop',
-	'Class:PC+' => '',
+	'Class:PC+' => 'PC/Laptop',
 	'Class:PC/ComplementaryName' => '%1$s - %2$s',
 	'Class:PC/Attribute:osfamily_id' => 'Familia de SO',
 	'Class:PC/Attribute:osfamily_id+' => 'Familia de SO',
@@ -407,7 +407,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Printer' => 'Impresora',
-	'Class:Printer+' => '',
+	'Class:Printer+' => 'Impresora',
 	'Class:Printer/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -417,7 +417,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:PowerConnection' => 'Conexión Eléctrica',
-	'Class:PowerConnection+' => '',
+	'Class:PowerConnection+' => 'Conexión Eléctrica',
 	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -427,7 +427,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:PowerSource' => 'Fuente de Poder',
-	'Class:PowerSource+' => '',
+	'Class:PowerSource+' => 'Fuente de Poder',
 	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
 	'Class:PowerSource/Attribute:pdus_list+' => 'PDUs',
@@ -439,7 +439,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:PDU' => 'PDU',
-	'Class:PDU+' => '',
+	'Class:PDU+' => 'PDU',
 	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => 'Rack',
@@ -457,7 +457,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Peripheral' => 'Periférico',
-	'Class:Peripheral+' => '',
+	'Class:Peripheral+' => 'Periférico',
 	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -467,7 +467,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Enclosure' => 'Enclosure',
-	'Class:Enclosure+' => '',
+	'Class:Enclosure+' => 'Enclosure',
 	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => 'Rack',
@@ -485,13 +485,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:ApplicationSolution' => 'Solución Aplicativa',
-	'Class:ApplicationSolution+' => '',
+	'Class:ApplicationSolution+' => 'Solución Aplicativa',
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'ECs',
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'ECs',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Procesos de Negocio',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Procesos de Negocio',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Estatus',
 	'Class:ApplicationSolution/Attribute:status+' => 'Estatus',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Activo',
@@ -510,11 +508,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:BusinessProcess' => 'Proceso de Negocio',
-	'Class:BusinessProcess+' => '',
+	'Class:BusinessProcess+' => 'Proceso de Negocio',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Soluciones Aplicativas',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Soluciones Aplicativas',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Estatus',
 	'Class:BusinessProcess/Attribute:status+' => 'Estatus',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Activo',
@@ -529,7 +525,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SoftwareInstance' => 'Instalación de Software',
-	'Class:SoftwareInstance+' => '',
+	'Class:SoftwareInstance+' => 'Instalación de Software',
 	'Class:SoftwareInstance/Attribute:system_id' => 'Sistema',
 	'Class:SoftwareInstance/Attribute:system_id+' => 'Sistema',
 	'Class:SoftwareInstance/Attribute:system_name' => 'Sistema',
@@ -558,7 +554,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Middleware' => 'Middleware',
-	'Class:Middleware+' => '',
+	'Class:Middleware+' => 'Middleware',
 	'Class:Middleware/Attribute:middlewareinstance_list' => 'Instalaciones de Middleware',
 	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Instalaciones de Middleware',
 ]);
@@ -569,7 +565,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:DBServer' => 'Servidor de Base de Datos',
-	'Class:DBServer+' => '',
+	'Class:DBServer+' => 'Servidor de Base de Datos',
 	'Class:DBServer/Attribute:dbschema_list' => 'Esquema de BD',
 	'Class:DBServer/Attribute:dbschema_list+' => 'Esquema de BD',
 ]);
@@ -580,7 +576,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:WebServer' => 'Servidor Web',
-	'Class:WebServer+' => '',
+	'Class:WebServer+' => 'Servidor Web',
 	'Class:WebServer/Attribute:webapp_list' => 'Aplicaciones Web',
 	'Class:WebServer/Attribute:webapp_list+' => 'Aplicaciones Web',
 ]);
@@ -591,7 +587,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:PCSoftware' => 'Software de PC',
-	'Class:PCSoftware+' => '',
+	'Class:PCSoftware+' => 'Software de PC',
 ]);

 //
@@ -600,7 +596,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:OtherSoftware' => 'Otro Software',
-	'Class:OtherSoftware+' => '',
+	'Class:OtherSoftware+' => 'Otro Software',
 ]);

 //
@@ -609,10 +605,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:MiddlewareInstance' => 'Instalación de Middleware',
-	'Class:MiddlewareInstance+' => '',
+	'Class:MiddlewareInstance+' => 'Instalación de Middleware',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware',
@@ -625,7 +619,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:DatabaseSchema' => 'Esquema de Base de Datos',
-	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema+' => 'Esquema de Base de Datos',
 	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Servidor de Base de Datos',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => 'Servidor de Base de Datos',
@@ -639,14 +633,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:WebApplication' => 'Aplicación Web',
-	'Class:WebApplication+' => '',
+	'Class:WebApplication+' => 'Aplicación Web',
 	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s',
 	'Class:WebApplication/Attribute:webserver_id' => 'Servidor Web',
 	'Class:WebApplication/Attribute:webserver_id+' => 'Servidor Web',
 	'Class:WebApplication/Attribute:webserver_name' => 'Servidor Web',
 	'Class:WebApplication/Attribute:webserver_name+' => 'Servidor Web',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => 'URL de Uso',
 ]);
@@ -657,7 +649,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:VirtualDevice' => 'Dispositivo Virtual',
-	'Class:VirtualDevice+' => '',
+	'Class:VirtualDevice+' => 'Dispositivo Virtual',
 	'Class:VirtualDevice/Attribute:status' => 'Estatus',
 	'Class:VirtualDevice/Attribute:status+' => 'Estatus',
 	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'No Productivo',
@@ -678,7 +670,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:VirtualHost' => 'Host Virtual',
-	'Class:VirtualHost+' => '',
+	'Class:VirtualHost+' => 'Host Virtual',
 	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Máquinas Virtuales',
 	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Máquinas Virtuales',
 ]);
@@ -689,7 +681,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Hypervisor' => 'Hypervisor',
-	'Class:Hypervisor+' => '',
+	'Class:Hypervisor+' => 'Hypervisor',
 	'Class:Hypervisor/Attribute:farm_id' => 'Granja',
 	'Class:Hypervisor/Attribute:farm_id+' => 'Granja',
 	'Class:Hypervisor/Attribute:farm_name' => 'Granja',
@@ -706,7 +698,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Farm' => 'Granja',
-	'Class:Farm+' => '',
+	'Class:Farm+' => 'Granja',
 	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisores',
 	'Class:Farm/Attribute:hypervisor_list+' => 'Hypervisores',
 	'Class:Farm/Attribute:redundancy' => 'Alta Disponibilidad',
@@ -721,7 +713,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:VirtualMachine' => 'Máquina Virtual',
-	'Class:VirtualMachine+' => '',
+	'Class:VirtualMachine+' => 'Máquina Virtual',
 	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host Virtual',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => 'Host Virtual',
@@ -755,7 +747,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:LogicalVolume' => 'Volumen Lógico',
-	'Class:LogicalVolume+' => '',
+	'Class:LogicalVolume+' => 'Volumen Lógico',
 	'Class:LogicalVolume/Attribute:name' => 'Nombre',
 	'Class:LogicalVolume/Attribute:name+' => 'Nombre del Volumen Lógico',
 	'Class:LogicalVolume/Attribute:lun_id' => 'LUN',
@@ -782,7 +774,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkServerToVolume' => 'Relación Servidor y Volumen',
-	'Class:lnkServerToVolume+' => '',
+	'Class:lnkServerToVolume+' => 'Relación Servidor y Volumen',
 	'Class:lnkServerToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volumen',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => 'Volumen',
@@ -802,7 +794,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkVirtualDeviceToVolume' => 'Relación Dispositivo Virtual y Volumen',
-	'Class:lnkVirtualDeviceToVolume+' => '',
+	'Class:lnkVirtualDeviceToVolume+' => 'Relación Dispositivo Virtual y Volumen',
 	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volumen',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => 'Volumen',
@@ -822,7 +814,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkSanToDatacenterDevice' => 'Relación SAN y Dispositivo del Centro de Datos',
-	'Class:lnkSanToDatacenterDevice+' => '',
+	'Class:lnkSanToDatacenterDevice+' => 'Relación SAN y Dispositivo del Centro de Datos',
 	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch de SAN',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => 'Switch de SAN',
@@ -844,7 +836,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Tape' => 'Cinta',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => 'Cinta',
 	'Class:Tape/Attribute:name' => 'Nombre',
 	'Class:Tape/Attribute:name+' => 'Nombre de la Cinta',
 	'Class:Tape/Attribute:description' => 'Descripción',
@@ -863,7 +855,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:NASFileSystem' => 'Filesysten en NAS',
-	'Class:NASFileSystem+' => '',
+	'Class:NASFileSystem+' => 'Filesysten en NAS',
 	'Class:NASFileSystem/Attribute:name' => 'Nombre',
 	'Class:NASFileSystem/Attribute:name+' => 'Nombre del Filesystem de Red',
 	'Class:NASFileSystem/Attribute:description' => 'Descripción',
@@ -884,7 +876,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Software' => 'Software',
-	'Class:Software+' => '',
+	'Class:Software+' => 'Software',
 	'Class:Software/ComplementaryName' => '%1$s - %2$s',
 	'Class:Software/Attribute:name' => 'Nombre',
 	'Class:Software/Attribute:name+' => 'Nombre del Software',
@@ -894,8 +886,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Software/Attribute:version+' => 'Versión',
 	'Class:Software/Attribute:documents_list' => 'Documentos',
 	'Class:Software/Attribute:documents_list+' => 'Documentos',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Tipo',
 	'Class:Software/Attribute:type+' => 'Tipo',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Servidor de BD',
@@ -922,7 +912,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Patch' => 'Parche',
-	'Class:Patch+' => '',
+	'Class:Patch+' => 'Parche',
 	'Class:Patch/Attribute:name' => 'Nombre',
 	'Class:Patch/Attribute:name+' => 'Nombre del Parche',
 	'Class:Patch/Attribute:documents_list' => 'Documentos',
@@ -939,7 +929,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:OSPatch' => 'Parche de SO',
-	'Class:OSPatch+' => '',
+	'Class:OSPatch+' => 'Parche de SO',
 	'Class:OSPatch/Attribute:functionalcis_list' => 'Dispositivos',
 	'Class:OSPatch/Attribute:functionalcis_list+' => 'Dispositivos',
 	'Class:OSPatch/Attribute:osversion_id' => 'Versión de SO',
@@ -954,7 +944,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SoftwarePatch' => 'Parche de Software',
-	'Class:SoftwarePatch+' => '',
+	'Class:SoftwarePatch+' => 'Parche de Software',
 	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
 	'Class:SoftwarePatch/Attribute:software_id+' => 'Software',
 	'Class:SoftwarePatch/Attribute:software_name' => 'Software',
@@ -969,7 +959,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Licence' => 'Licencia',
-	'Class:Licence+' => '',
+	'Class:Licence+' => 'Licencia',
 	'Class:Licence/Attribute:name' => 'Nombre',
 	'Class:Licence/Attribute:name+' => 'Nombre de la Licencia',
 	'Class:Licence/Attribute:documents_list' => 'Documentos',
@@ -1004,7 +994,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:OSLicence' => 'Licencia de SO',
-	'Class:OSLicence+' => '',
+	'Class:OSLicence+' => 'Licencia de SO',
 	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:OSLicence/Attribute:osversion_id' => 'Versión de SO',
 	'Class:OSLicence/Attribute:osversion_id+' => 'Versión de SO',
@@ -1022,7 +1012,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SoftwareLicence' => 'Licencia de Software',
-	'Class:SoftwareLicence+' => '',
+	'Class:SoftwareLicence+' => 'Licencia de Software',
 	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => 'Software',
@@ -1038,7 +1028,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkDocumentToLicence' => 'Relación Documento y Licencia',
-	'Class:lnkDocumentToLicence+' => '',
+	'Class:lnkDocumentToLicence+' => 'Relación Documento y Licencia',
 	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licencia',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => 'Licencia',
@@ -1056,13 +1046,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:OSVersion' => 'Versión de SO',
-	'Class:OSVersion+' => '',
+	'Class:OSVersion+' => 'Versión de SO',
 	'Class:OSVersion/Attribute:osfamily_id' => 'Familia de SO',
 	'Class:OSVersion/Attribute:osfamily_id+' => 'Familia de SO',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Familia de SO',
 	'Class:OSVersion/Attribute:osfamily_name+' => 'Familia de SO',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1071,9 +1059,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:OSFamily' => 'Familia de SO',
-	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
+	'Class:OSFamily+' => 'Familia de SO',
 ]);

 //
@@ -1082,7 +1068,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Brand' => 'Marca',
-	'Class:Brand+' => '',
+	'Class:Brand+' => 'Marca',
 	'Class:Brand/Attribute:logo' => 'Logo~~',
 	'Class:Brand/Attribute:logo+' => '~~',
 	'Class:Brand/Attribute:physicaldevices_list' => 'Dispositivo Físico',
@@ -1097,7 +1083,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Model' => 'Modelo',
-	'Class:Model+' => '',
+	'Class:Model+' => 'Modelo',
 	'Class:Model/ComplementaryName' => '%1$s - %2$s',
 	'Class:Model/Attribute:brand_id' => 'Marca',
 	'Class:Model/Attribute:brand_id+' => 'Marca',
@@ -1155,7 +1141,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:NetworkDeviceType' => 'Tipo Dispositivo de Red',
-	'Class:NetworkDeviceType+' => '',
+	'Class:NetworkDeviceType+' => 'Tipo de Dispositivo de Red',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Dispositivos de Red',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Dispositivos de Red',
 ]);
@@ -1166,13 +1152,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:IOSVersion' => 'Versión de IOS',
-	'Class:IOSVersion+' => '',
+	'Class:IOSVersion+' => 'Versión de IOS',
 	'Class:IOSVersion/Attribute:brand_id' => 'Marca',
 	'Class:IOSVersion/Attribute:brand_id+' => 'Marca',
 	'Class:IOSVersion/Attribute:brand_name' => 'Marca',
 	'Class:IOSVersion/Attribute:brand_name+' => 'Marca',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1181,7 +1165,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkDocumentToPatch' => 'Relación Documentos y Parche',
-	'Class:lnkDocumentToPatch+' => '',
+	'Class:lnkDocumentToPatch+' => 'Relación Documentos y Parche',
 	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Parche',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => 'Parche',
@@ -1199,7 +1183,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Relación Instalación de Software y Parche de Software',
-	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => 'Relación Instalación de Software y Parche de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Parche de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => 'Parche de Software',
@@ -1217,7 +1201,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkFunctionalCIToOSPatch' => 'Relación EC Funcional y Parche de SO',
-	'Class:lnkFunctionalCIToOSPatch+' => '',
+	'Class:lnkFunctionalCIToOSPatch+' => 'Relación EC Funcional y Parche de SO',
 	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Parche de SO',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => 'Parche de SO',
@@ -1235,7 +1219,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkDocumentToSoftware' => 'Relación Documento y Software',
-	'Class:lnkDocumentToSoftware+' => '',
+	'Class:lnkDocumentToSoftware+' => 'Relación Documento y Software',
 	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => 'Software',
@@ -1253,7 +1237,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Subnet' => 'SubRed',
-	'Class:Subnet+' => '',
+	'Class:Subnet+' => 'SubRed',
 	'Class:Subnet/Name' => '%1$s/%2$s',
 	'Class:Subnet/ComplementaryName' => '%1$s - %2$s',
 	'Class:Subnet/Attribute:description' => 'Descripción',
@@ -1299,7 +1283,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkSubnetToVLAN' => 'Relación Subred / vLAN',
-	'Class:lnkSubnetToVLAN+' => '',
+	'Class:lnkSubnetToVLAN+' => 'Relación Subred / vLAN',
 	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subred',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => 'Subred',
@@ -1319,7 +1303,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:NetworkInterface' => 'Interfaz de Red',
-	'Class:NetworkInterface+' => '',
+	'Class:NetworkInterface+' => 'Interfaz de Red',
 	'Class:NetworkInterface/Attribute:name' => 'Nombre',
 	'Class:NetworkInterface/Attribute:name+' => 'Nombre de la Interfaz de Red',
 	'Class:NetworkInterface/Attribute:finalclass' => 'Clase',
@@ -1332,7 +1316,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:IPInterface' => 'Interfaz IP',
-	'Class:IPInterface+' => '',
+	'Class:IPInterface+' => 'Interfaz IP',
 	'Class:IPInterface/Attribute:ipaddress' => 'Dirección IP',
 	'Class:IPInterface/Attribute:ipaddress+' => 'Dirección IP',
 	'Class:IPInterface/Attribute:macaddress' => 'Dirección MAC',
@@ -1353,7 +1337,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:PhysicalInterface' => 'Interfaz Física',
-	'Class:PhysicalInterface+' => '',
+	'Class:PhysicalInterface+' => 'Interfaz Física',
 	'Class:PhysicalInterface/Name' => '%2$s %1$s',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Dispositivo',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => 'Dispositivo',
@@ -1391,7 +1375,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:LogicalInterface' => 'Interfaz Lógica',
-	'Class:LogicalInterface+' => '',
+	'Class:LogicalInterface+' => 'Interfaz Lógica',
 	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Máquina Virtual',
 	'Class:LogicalInterface/Attribute:virtualmachine_id+' => 'Máquina Virtual',
 	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Máquina Virtual',
@@ -1404,7 +1388,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:FiberChannelInterface' => 'Intefaz de Fibra Óptica',
-	'Class:FiberChannelInterface+' => '',
+	'Class:FiberChannelInterface+' => 'Intefaz de Fibra Óptica',
 	'Class:FiberChannelInterface/Attribute:speed' => 'Velocidad',
 	'Class:FiberChannelInterface/Attribute:speed+' => 'Velocidad',
 	'Class:FiberChannelInterface/Attribute:topology' => 'Topología',
@@ -1487,7 +1471,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Group' => 'Grupo',
-	'Class:Group+' => '',
+	'Class:Group+' => 'Grupo',
 	'Class:Group/ComplementaryName' => '%1$s - %2$s',
 	'Class:Group/Attribute:name' => 'Nombre',
 	'Class:Group/Attribute:name+' => 'Nombre del Grupo',
@@ -1540,12 +1524,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 // Add translation for Fieldsets

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Información General',
 	'Server:Date' => 'Fecha',
 	'Server:moreinfo' => 'Más Información',
@@ -1634,8 +1612,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 //

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/fr.dict.itop-config-mgmt.php
@@ -36,6 +36,23 @@ Dict::Add('FR FR', 'French', 'Français', [
 // Class:<class_name>/UniquenessRule:<rule_code>
 // Class:<class_name>/UniquenessRule:<rule_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:<class_name>/UniquenessRule:<rule_code>
+// Class:<class_name>/UniquenessRule:<rule_code>+
+
 //////////////////////////////////////////////////////////////////////
 // Note: The classes have been grouped by categories: bizmodel
 //////////////////////////////////////////////////////////////////////
@@ -49,8 +66,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI fonctionnel',
-	'Class:lnkContactToFunctionalCI+' => 'Gère les Contacts liés à des CI Fonctionnels. Ca peut être une équipe responsable de l\'équipment, de façon à lui affecter les Tickets liés à cet équipment ou la personne à laquelle un équipment individuel comme un PC ou un téléphone est affecté, de façon à gérer le parc.',
+	'Class:lnkContactToFunctionalCI' => 'Lien Contact / CI Fonctionnel',
+	'Class:lnkContactToFunctionalCI+' => '',
 	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '',
@@ -67,8 +84,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:FunctionalCI' => 'CI fonctionnel',
-	'Class:FunctionalCI+' => 'Classe abstraite regroupant la plupart des types d’éléments de configuration de la CMDB.',
+	'Class:FunctionalCI' => 'CI Fonctionnel',
+	'Class:FunctionalCI+' => '',
 	'Class:FunctionalCI/Attribute:name' => 'Nom',
 	'Class:FunctionalCI/Attribute:name+' => '',
 	'Class:FunctionalCI/Attribute:description' => 'Description',
@@ -117,7 +134,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:PhysicalDevice' => 'Matériel physique',
-	'Class:PhysicalDevice+' => 'Classe abstraite regroupant les types physiques d’éléments de configuration. Un Matériel physique peut être localisé. Il possède généralement une Marque et un Modèle.',
+	'Class:PhysicalDevice+' => '',
 	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Numéro de série',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
@@ -156,8 +173,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Rack' => 'Baie',
-	'Class:Rack+' => 'Conteneur physique pour Matériel de datacenter et Châssis.',
+	'Class:Rack' => 'Rack',
+	'Class:Rack+' => '',
 	'Class:Rack/ComplementaryName' => '%1$s - %2$s',
 	'Class:Rack/Attribute:nb_u' => 'NB Unité',
 	'Class:Rack/Attribute:nb_u+' => '',
@@ -184,8 +201,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:TelephonyCI' => 'Équipement de téléphonie',
-	'Class:TelephonyCI+' => 'Classe abstraite regroupant les équipements de téléphonie.',
+	'Class:TelephonyCI' => 'CI Téléphonie',
+	'Class:TelephonyCI+' => '',
 	'Class:TelephonyCI/Attribute:phonenumber' => 'Numéro',
 	'Class:TelephonyCI/Attribute:phonenumber+' => '',
 ]);
@@ -196,7 +213,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Phone' => 'Téléphone',
-	'Class:Phone+' => 'Équipement individuel. Téléphone filaire classique.',
+	'Class:Phone+' => '',
 ]);

 //
@@ -205,7 +222,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:MobilePhone' => 'Téléphone mobile',
-	'Class:MobilePhone+' => 'Équipement individuel. Téléphone portable.',
+	'Class:MobilePhone+' => '',
 	'Class:MobilePhone/Attribute:imei' => 'IMEI',
 	'Class:MobilePhone/Attribute:imei+' => '',
 	'Class:MobilePhone/Attribute:hw_pin' => 'PIN',
@@ -218,7 +235,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:IPPhone' => 'Téléphone IP',
-	'Class:IPPhone+' => 'Équipement individuel. Équipement physique dédié aux appels téléphoniques, connecté à un réseau.',
+	'Class:IPPhone+' => '',
 ]);

 //
@@ -227,7 +244,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Tablet' => 'Tablette',
-	'Class:Tablet+' => 'Équipement individuel. Par exemple iPad, Galaxy Note/Tab Nexus, Kindle...',
+	'Class:Tablet+' => '',
 ]);

 //
@@ -235,8 +252,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:ConnectableCI' => 'Matériel connecté',
-	'Class:ConnectableCI+' => 'Matériel physique pouvant être connecté à un réseau.',
+	'Class:ConnectableCI' => 'CI connecté',
+	'Class:ConnectableCI+' => '',
 	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Equipements réseaux',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Tous les équipements réseaux connectés à ce matériel',
@@ -255,8 +272,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:DatacenterDevice' => 'Matériel de datacenter',
-	'Class:DatacenterDevice+' => 'Un équipement physique, connecté au réseau et installé dans un datacenter, généralement dans une Baie ou un Châssis. Il peut s’agir de Serveurs, d\'Équipement réseau, de Systèmes de Stockage, de Switchs SAN, de Bandothèques, de NAS…',
+	'Class:DatacenterDevice' => 'Matériel Datacenter',
+	'Class:DatacenterDevice+' => '',
 	'Class:DatacenterDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
 	'Class:DatacenterDevice/Attribute:rack_id+' => '',
@@ -299,8 +316,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:NetworkDevice' => 'Équipement réseau',
-	'Class:NetworkDevice+' => 'Tout type d’équipement réseau : routeur, switch, hub, load balancer, firewall…',
+	'Class:NetworkDevice' => 'Equipement réseau',
+	'Class:NetworkDevice+' => '',
 	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Type',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
@@ -322,7 +339,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Server' => 'Serveur',
-	'Class:Server+' => 'Matériel de Datacenter qui fournit des ressources de calcul, de stockage ou de connectivité. Il tourne sous une Version d\'OS et héberge des Applications Logicielles.',
+	'Class:Server+' => '',
 	'Class:Server/ComplementaryName' => '%1$s - %2$s',
 	'Class:Server/Attribute:osfamily_id' => 'Famille OS',
 	'Class:Server/Attribute:osfamily_id+' => '',
@@ -350,7 +367,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:StorageSystem' => 'Système de stockage',
-	'Class:StorageSystem+' => 'Système de stockage pouvant être connecté à un SAN ou à un réseau Ethernet. L\'unité logique de stockage gérée par un Système de stockage est un Volume logique.',
+	'Class:StorageSystem+' => '',
 	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumes logiques',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Tous les volumes logiques dans ce système de stockage',
@@ -368,7 +385,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:SANSwitch' => 'Switch SAN',
-	'Class:SANSwitch+' => 'Matériel de Datacenter. C\'est un switch utilisé par les réseaux de stockage (Storage Area Network). Il supporte le protocole Fibre Channel.',
+	'Class:SANSwitch+' => '',
 	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Matériels connectés',
 	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Tous les matériels connectés à ce switch SAN',
@@ -380,7 +397,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:TapeLibrary' => 'Bandothèque',
-	'Class:TapeLibrary+' => 'Matériel connecté et rackable hébergeant plusieurs bandes magnétiques (ou cartouches). Utilisé pour la sauvegarde ou l’archivage.',
+	'Class:TapeLibrary+' => '',
 	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Bandes',
 	'Class:TapeLibrary/Attribute:tapes_list+' => 'Toutes les bandes dans cette bandothèque',
@@ -398,7 +415,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:NAS' => 'NAS',
-	'Class:NAS+' => 'Matériel connecté et rackable fournissant un stockage de haute capacité. Dans '.ITOP_APPLICATION_SHORT.', un NAS (Network-attached storage) contient des Systèmes de fichiers NAS.',
+	'Class:NAS+' => '',
 	'Class:NAS/ComplementaryName' => '%1$s - %2$s',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Systèmes de fichier NAS',
 	'Class:NAS/Attribute:nasfilesystem_list+' => 'Tous les systèmes de fichier dans ce NAS',
@@ -416,7 +433,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:PC' => 'PC',
-	'Class:PC+' => 'Elément de configuration (CI), un ordinateur personnel (PC) est un matériel physique, de bureau ou portable, tournant avec une version d\'OS et conçu pour exécuter des instances logicielles.',
+	'Class:PC+' => '',
 	'Class:PC/ComplementaryName' => '%1$s - %2$s',
 	'Class:PC/Attribute:osfamily_id' => 'Famille OS',
 	'Class:PC/Attribute:osfamily_id+' => '',
@@ -444,7 +461,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Printer' => 'Imprimante',
-	'Class:Printer+' => 'Elément de configuration (CI) connectable. Matériel physique connecté au réseau ou à un PC.',
+	'Class:Printer+' => '',
 	'Class:Printer/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -454,7 +471,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:PowerConnection' => 'Connexion électrique',
-	'Class:PowerConnection+' => 'Classe abstraite regroupant les équipements physiques utilisés pour l\'alimentation électrique.',
+	'Class:PowerConnection+' => '',
 	'Class:PowerConnection/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -464,7 +481,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:PowerSource' => 'Arrivée électrique',
-	'Class:PowerSource+' => 'Connexion électrique physique. Utilisée dans un datacenter pour documenter toute source d\'alimentation (arrivée principale, disjoncteur…) qui n\'est pas une PDU.',
+	'Class:PowerSource+' => '',
 	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
 	'Class:PowerSource/Attribute:pdus_list+' => 'Toutes les PDUs de cette arrivée électrique',
@@ -482,7 +499,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:PDU' => 'PDU',
-	'Class:PDU+' => 'Connexion électrique. Une PDU (Power Distribution Unit) est un équipement doté de multiples sorties conçu pour distribuer l\'alimentation électrique, notamment vers les racks d\'ordinateurs et équipements réseau d\'un datacenter.',
+	'Class:PDU+' => '',
 	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
 	'Class:PDU/Attribute:rack_id+' => '',
@@ -500,8 +517,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Peripheral' => 'Périphérique',
-	'Class:Peripheral+' => 'Périphérique physique, utilisé pour documenter tout type de périphérique informatique.
-Par exemple : disques durs externes, scanners, dispositifs d\'entrée (trackballs, lecteurs de codes-barres), etc…',
+	'Class:Peripheral+' => '',
 	'Class:Peripheral/ComplementaryName' => '%1$s - %2$s',
 ]);

@@ -510,8 +526,8 @@ Par exemple : disques durs externes, scanners, dispositifs d\'entrée (trackball
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Enclosure' => 'Châssis',
-	'Class:Enclosure+' => 'Une armoire permettant d\'installer des équipements informatiques garantissant un flux d\'air optimisé et une alimentaion sécurisée. Dans '.ITOP_APPLICATION_SHORT.', un châssis peut être montée à l\'intérieur d\'une Baie ou fixée directement au mur d\'un centre de données.',
+	'Class:Enclosure' => 'Chassis',
+	'Class:Enclosure+' => '',
 	'Class:Enclosure/ComplementaryName' => '%1$s - %2$s - %3$s',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
 	'Class:Enclosure/Attribute:rack_id+' => '',
@@ -535,13 +551,11 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ApplicationSolution' => 'Solution applicative',
-	'Class:ApplicationSolution+' => 'Les solutions applicatives décrivent des applications complexes composées de plusieurs composants de base. L’information principale est la liste de ses relations. Elle peut aussi être utilisée pour modéliser la relation entre un ou plusieurs controlleurs et les équipements qu\'il(s) gérent (par exemple des applicatifs de supervision, de gestion de configuration ou d\'analyse de performance).',
+	'Class:ApplicationSolution+' => '',
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'CIs',
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Tous les éléments de configuration qui composent cette solution applicative',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Processus métiers',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Tous les processus métiers dépendants de cette solution applicative',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Utilisé comme icône de l\'objet dans les graphes d\'analyse d\'impact',
 	'Class:ApplicationSolution/Attribute:status' => 'Etat',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Actif',
@@ -549,7 +563,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inactif',
 	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => '',
 	'Class:ApplicationSolution/Attribute:redundancy' => 'Analyse d\'impact : configuration de la redondance',
-	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'La solution est opérationnelle si tous les CIs qui la composent sont opérationnels',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'La solution est opérationelle si tous les CIs qui la composent sont opérationnels',
 	'Class:ApplicationSolution/Attribute:redundancy/count' => 'Nombre minimal de CIs pour que la solution soit opérationnelle : %1$s',
 	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'Pourcentage minimal de CIs pour que la solution soit opérationnelle : %1$s %%',
 ]);
@@ -560,15 +574,13 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:BusinessProcess' => 'Processus métier',
-	'Class:BusinessProcess+' => 'Un processus métier sert à documenter un processus de haut niveau ou une application importante pour les opérations. Similaire à une solution applicative mais pour des applications ou processus d’organisation de plus haut niveau.',
+	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Solutions applicatives',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Toutes les solutions applicatives qui impactent ce processus métier',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Add:Button+' => 'Ajouter une %4$s',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Add:Modal:Title' => 'Ajouter une %4$s à %2$s',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list/UI:Links:Remove:Modal:Title' => 'Retirer une %4$s',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo',
-	'Class:BusinessProcess/Attribute:logo+' => 'Utilisé comme icône de l\'objet dans les graphes d\'analyse d\'impact',
 	'Class:BusinessProcess/Attribute:status' => 'Etat',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Actif',
@@ -583,7 +595,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:SoftwareInstance' => 'Instance logiciel',
-	'Class:SoftwareInstance+' => 'Classe abstraite représentant le déploiement d’un Logiciel sur un équipement (Serveur, PC, Machine virtuelle). Dans '.ITOP_APPLICATION_SHORT.', il existe différents types d’instances logicielles : Serveur de base de données, Middleware, Logiciel PC, Serveur web ou Autre logiciel.',
+	'Class:SoftwareInstance+' => '',
 	'Class:SoftwareInstance/Attribute:system_id' => 'Système',
 	'Class:SoftwareInstance/Attribute:system_id+' => '',
 	'Class:SoftwareInstance/Attribute:system_name' => 'Nom du système',
@@ -612,7 +624,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Middleware' => 'Middleware',
-	'Class:Middleware+' => 'Instance logicielle offrant des services à d\'autres logiciels (ex : Tomcat, JBoss, Talend, Microsoft BizTalk, IBM Websphere ou Lotus Domino) installée sur un système spécifique (PC, Serveur ou Machine virtuelle).',
+	'Class:Middleware+' => '',
 	'Class:Middleware/Attribute:middlewareinstance_list' => 'Instance Middleware',
 	'Class:Middleware/Attribute:middlewareinstance_list+' => 'Toutes les instances de middleware fournies par ce middleware',
 	'Class:Middleware/Attribute:middlewareinstance_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -629,7 +641,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:DBServer' => 'Serveur de base de données',
-	'Class:DBServer+' => 'Instance logicielle offrant des services de base de données (comme MySQL 8.0, Oracle, SQL Server, DB2…) installée sur un système spécifique (PC, Serveur ou Machine virtuelle).',
+	'Class:DBServer+' => '',
 	'Class:DBServer/Attribute:dbschema_list' => 'Instances de base de données',
 	'Class:DBServer/Attribute:dbschema_list+' => 'Toutes les instances de base de données pour ce serveur',
 	'Class:DBServer/Attribute:dbschema_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -645,8 +657,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:WebServer' => 'Serveur web',
-	'Class:WebServer+' => 'Instance logicielle offrant des services Web (comme Apache 2.4, Nginx 1.29.4, IIS 7.0) installée sur un système spécifique (PC, Serveur ou Machine virtuelle).',
+	'Class:WebServer' => 'Serveur Web',
+	'Class:WebServer+' => '',
 	'Class:WebServer/Attribute:webapp_list' => 'Application Web',
 	'Class:WebServer/Attribute:webapp_list+' => 'Toutes les applications Web disponibles sur ce serveur',
 	'Class:WebServer/Attribute:webapp_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -663,7 +675,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:PCSoftware' => 'Logiciel PC',
-	'Class:PCSoftware+' => 'Instance logicielle pour des logiciels (ex : MS Office, Photoshop, Filezilla) installés sur un PC.',
+	'Class:PCSoftware+' => 'Application logicielle sur PC',
 ]);

 //
@@ -672,7 +684,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:OtherSoftware' => 'Autre logiciel',
-	'Class:OtherSoftware+' => 'Tout type d\'instance logicielle qui ne rentre pas dans les autres catégories : Logiciel PC, Middleware, Serveur de base de données ou Serveur Web.',
+	'Class:OtherSoftware+' => '',
 ]);

 //
@@ -680,11 +692,9 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:MiddlewareInstance' => 'Instance de middleware',
-	'Class:MiddlewareInstance+' => 'CI fonctionnel représentant un service délivré par un Middleware.',
+	'Class:MiddlewareInstance' => 'Instance Middleware',
+	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Utilisé comme icône de l\'objet dans les graphes d\'analyse d\'impact',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nom Middleware',
@@ -697,7 +707,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:DatabaseSchema' => 'Instance de base de données',
-	'Class:DatabaseSchema+' => 'Instance de base de données géré par un Serveur de base de données.',
+	'Class:DatabaseSchema+' => '',
 	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Serveur de base de données',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
@@ -710,15 +720,13 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:WebApplication' => 'Application web',
-	'Class:WebApplication+' => 'Instance d’une application accessible via un navigateur web et s’exécutant sur un Serveur web donné. Par exemple cet iTop.',
+	'Class:WebApplication' => 'Application Web',
+	'Class:WebApplication+' => '',
 	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s',
 	'Class:WebApplication/Attribute:webserver_id' => 'Serveur Web',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Nom Serveur Web',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo',
-	'Class:WebApplication/Attribute:logo+' => 'Utilisé comme icône de l\'objet dans les graphes d\'analyse d\'impact',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -728,8 +736,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:VirtualDevice' => 'Équipement virtuel',
-	'Class:VirtualDevice+' => 'Classe abstraite utilisée pour la virtualisation de serveurs (Hôte virtuel et Machine virtuelle).',
+	'Class:VirtualDevice' => 'Equipement Virtuel',
+	'Class:VirtualDevice+' => '',
 	'Class:VirtualDevice/Attribute:status' => 'Etat',
 	'Class:VirtualDevice/Attribute:status+' => '',
 	'Class:VirtualDevice/Attribute:status/Value:implementation' => 'Implémentation',
@@ -749,8 +757,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:VirtualHost' => 'Hôte virtuel',
-	'Class:VirtualHost+' => 'Classe abstraite pour les Équipements virtuels (Hyperviseur, vCluster,...) hébergeant des Machines virtuelles.',
+	'Class:VirtualHost' => 'Hôte Virtuel',
+	'Class:VirtualHost+' => '',
 	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Machines virtuelles',
 	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Toutes les machiens virtuelles hébergées par cet hôte',
 	'Class:VirtualHost/Attribute:virtualmachine_list/UI:Links:Create:Button+' => 'Créer une %4$s',
@@ -767,7 +775,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Hypervisor' => 'Hyperviseur',
-	'Class:Hypervisor+' => 'Hôte virtuel. Logiciel de virtualisation (MS Hyper-V, VMWare ESX, Xen, etc.) s\'exécutant sur un serveur physique et permettant la création de machines virtuelles.',
+	'Class:Hypervisor+' => '',
 	'Class:Hypervisor/Attribute:farm_id' => 'vCluster',
 	'Class:Hypervisor/Attribute:farm_id+' => '',
 	'Class:Hypervisor/Attribute:farm_name' => 'Nom vCluster',
@@ -784,7 +792,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Farm' => 'vCluster',
-	'Class:Farm+' => 'Hôte virtuel. Une ferme (ou vCluster) est un groupe d\'hyperviseurs mutualisés partageant des ressources de stockage afin de fournir un système tolérant aux pannes pour héberger des Machines virtuelles.',
+	'Class:Farm+' => '',
 	'Class:Farm/Attribute:hypervisor_list' => 'Hyperviseurs',
 	'Class:Farm/Attribute:hypervisor_list+' => 'Tous les hyperviseurs qui composent ce vCluster',
 	'Class:Farm/Attribute:hypervisor_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -805,7 +813,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:VirtualMachine' => 'Machine virtuelle',
-	'Class:VirtualMachine+' => 'Équivalent virtuel d\'un serveur, hébergé soit sur un Hyperviseur soit sur une ferme (ou vCluster).',
+	'Class:VirtualMachine+' => '',
 	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'vCluster / Hyperviseur',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
@@ -845,7 +853,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:LogicalVolume' => 'Volume logique',
-	'Class:LogicalVolume+' => 'Unité de stockage gérée à l’intérieur d’un Système de stockage. Elle peut être utilisée par plusieurs Serveurs et Équipement virtuels.',
+	'Class:LogicalVolume+' => '',
 	'Class:LogicalVolume/Attribute:name' => 'Nom',
 	'Class:LogicalVolume/Attribute:name+' => '',
 	'Class:LogicalVolume/Attribute:lun_id' => 'LUN ID',
@@ -871,8 +879,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkServerToVolume' => 'Lien Serveur / Volume  logique',
-	'Class:lnkServerToVolume+' => 'Ce lien n:n indique qu\'un Serveur utilise un Volume logique (une unité de stockage gérée à l’intérieur d’un Système de stockage). Plusieurs Serveurs peuvent utiliser le même Volume logique.',
+	'Class:lnkServerToVolume' => 'Lien Serveur / Volume',
+	'Class:lnkServerToVolume+' => '',
 	'Class:lnkServerToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume logique',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
@@ -891,8 +899,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkVirtualDeviceToVolume' => 'Lien Équipement virtuel / Volume logique',
-	'Class:lnkVirtualDeviceToVolume+' => 'Ce lien n:n indique qu\'un Équipement virtuel utilise un Volume logique (une unité de stockage gérée à l’intérieur d’un Système de stockage). Plusieurs Équipements virtuels peuvent utiliser le même Volume logique.',
+	'Class:lnkVirtualDeviceToVolume' => 'Lien Device virtuel / Volume',
+	'Class:lnkVirtualDeviceToVolume+' => '',
 	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume logique',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
@@ -911,8 +919,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkSanToDatacenterDevice' => 'Lien Switch SAN / Matériel de datacenter',
-	'Class:lnkSanToDatacenterDevice+' => 'Ce lien n:n modélise la connection réseau entre un Switch SAN et un Matériel de datacenter (un Serveur, un Équipement réseau, etc..).',
+	'Class:lnkSanToDatacenterDevice' => 'Lien San / Device',
+	'Class:lnkSanToDatacenterDevice+' => '',
 	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch SAN',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
@@ -934,7 +942,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Tape' => 'Bande',
-	'Class:Tape+' => 'Une Bande (ou cartouche) dans '.ITOP_APPLICATION_SHORT.' est un élément de stockage amovible au sein d\'une Bandothèque.',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Nom',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Description',
@@ -953,7 +961,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:NASFileSystem' => 'Système de fichier NAS',
-	'Class:NASFileSystem+' => 'Représente un système de fichiers partagé hébergé dans un NAS donné (Network Attached Storage).',
+	'Class:NASFileSystem+' => '',
 	'Class:NASFileSystem/Attribute:name' => 'Nom',
 	'Class:NASFileSystem/Attribute:name+' => '',
 	'Class:NASFileSystem/Attribute:description' => 'Description',
@@ -974,7 +982,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Software' => 'Logiciel',
-	'Class:Software+' => 'Un logiciel est un élément générique du catalogue logiciel. Il possède une version particulière. Dans '.ITOP_APPLICATION_SHORT.', un logiciel appartient à une catégorie : Serveur de BDD, Middleware, Logiciel PC, Serveur web ou autre.',
+	'Class:Software+' => '',
 	'Class:Software/ComplementaryName' => '%1$s - %2$s',
 	'Class:Software/Attribute:name' => 'Nom',
 	'Class:Software/Attribute:name+' => '',
@@ -984,8 +992,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Documents',
 	'Class:Software/Attribute:documents_list+' => 'Tous les documents liés à ce logiciel',
-	'Class:Software/Attribute:logo' => 'Logo',
-	'Class:Software/Attribute:logo+' => 'Utilisé comme icône des Instances qui utilisent ce Logiciel, lors de leur affichage dans les graphes d\'analyse d\'impact',
 	'Class:Software/Attribute:type' => 'Type',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Serveur de base de données',
@@ -1030,7 +1036,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Patch' => 'Patch',
-	'Class:Patch+' => 'Classe abstraite pour les patchs, hotfixes, correctifs de sécurité ou service packs pour un OS ou un logiciel.',
+	'Class:Patch+' => '',
 	'Class:Patch/Attribute:name' => 'Nom',
 	'Class:Patch/Attribute:name+' => '',
 	'Class:Patch/Attribute:documents_list' => 'Documents',
@@ -1047,7 +1053,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:OSPatch' => 'Patch OS',
-	'Class:OSPatch+' => 'Patch, hotfix, correctif de sécurité ou pack de services pour un système d\'exploitation donné.',
+	'Class:OSPatch+' => '',
 	'Class:OSPatch/Attribute:functionalcis_list' => 'Systèmes',
 	'Class:OSPatch/Attribute:functionalcis_list+' => 'Tous les systèmes où ce patch est installé',
 	'Class:OSPatch/Attribute:osversion_id' => 'Version OS',
@@ -1061,8 +1067,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:SoftwarePatch' => 'Patch logiciel',
-	'Class:SoftwarePatch+' => 'Patch, hotfix, correctif de sécurité ou pack de services pour un logiciel donné.',
+	'Class:SoftwarePatch' => 'Patch Logiciel',
+	'Class:SoftwarePatch+' => '',
 	'Class:SoftwarePatch/Attribute:software_id' => 'Logiciel',
 	'Class:SoftwarePatch/Attribute:software_id+' => '',
 	'Class:SoftwarePatch/Attribute:software_name' => 'Nom logiciel',
@@ -1080,8 +1086,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Licence' => 'Licence',
-	'Class:Licence+' => 'Classe abstraite. Contrat de licence pour une version d\'OS ou un logiciel particulier.',
+	'Class:Licence' => 'License',
+	'Class:Licence+' => '',
 	'Class:Licence/Attribute:name' => 'Nom',
 	'Class:Licence/Attribute:name+' => '',
 	'Class:Licence/Attribute:documents_list' => 'Documents',
@@ -1112,7 +1118,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Licence/Attribute:perpetual/Value:no+' => 'non',
 	'Class:Licence/Attribute:perpetual/Value:yes' => 'oui',
 	'Class:Licence/Attribute:perpetual/Value:yes+' => 'oui',
-	'Class:Licence/Attribute:finalclass' => 'Sous-classe de Licence',
+	'Class:Licence/Attribute:finalclass' => 'Sous-classe de License',
 	'Class:Licence/Attribute:finalclass+' => 'Nom de la classe instanciable',
 ]);

@@ -1122,7 +1128,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:OSLicence' => 'Licence OS',
-	'Class:OSLicence+' => 'Contrat de licence pour un système d’exploitation particulier. Le contrat peut couvrir le système d\'exploitation de plusieurs serveurs et machines virtuelles.',
+	'Class:OSLicence+' => '',
 	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:OSLicence/Attribute:osversion_id' => 'Version OS',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
@@ -1151,8 +1157,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:SoftwareLicence' => 'Licence logiciel',
-	'Class:SoftwareLicence+' => 'Contrat de licence pour un logiciel particulier. La licence est liée à un logiciel (par exemple MS Office 2010) et peut être associée à plusieurs instances de ce logiciel.',
+	'Class:SoftwareLicence' => 'Licence Logiciel',
+	'Class:SoftwareLicence+' => '',
 	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Logiciel',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
@@ -1174,7 +1180,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDocumentToLicence' => 'Lien Document / Licence',
-	'Class:lnkDocumentToLicence+' => 'Lien utilisé lorsqu\'un Document est applicable à une Licence.',
+	'Class:lnkDocumentToLicence+' => '',
 	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licence',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
@@ -1191,14 +1197,12 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:OSVersion' => 'Version d\'OS',
-	'Class:OSVersion+' => 'Typologie. Liste des valeurs possibles pour la « Version d\'OS » d\'un ordinateur (serveur, machine virtuelle ou PC). Les versions d\'OS sont organisées par famille d\'OS.',
+	'Class:OSVersion' => 'Version OS',
+	'Class:OSVersion+' => '',
 	'Class:OSVersion/Attribute:osfamily_id' => 'Famille OS',
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Nom Famille OS',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Le nom doit être unique au sein de cette famille d\'OS',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'cette version d\'OS existe déjà dans cette famille',
 	'Class:OSVersion/Attribute:ospatches_list' => 'Patchs OS',
 	'Class:OSVersion/Attribute:ospatches_list+' => 'Tous les patchs de cette version OS',
 ]);
@@ -1208,12 +1212,10 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:OSFamily' => 'Famille d\'OS',
-	'Class:OSFamily+' => 'Typologie. Liste des valeurs possibles pour l\'attribut "Famille d\'OS" des serveurs, machines virtuelles et PC.',
+	'Class:OSFamily' => 'Famille OS',
+	'Class:OSFamily+' => '',
 	'Class:OSFamily/Attribute:osversions_list' => 'Versions OS',
 	'Class:OSFamily/Attribute:osversions_list+' => 'Toutes les versions OS pour cette famille',
-	'Class:OSFamily/UniquenessRule:name+' => 'Le nom doit être unique',
-	'Class:OSFamily/UniquenessRule:name' => 'cette famille d\'OS existe déjà',
 ]);

 //
@@ -1222,7 +1224,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Brand' => 'Marque',
-	'Class:Brand+' => 'Typologie. Liste des valeurs possibles pour l\'attribut « Marque » d\'un matériel physique.',
+	'Class:Brand+' => '',
 	'Class:Brand/Attribute:iosversions_list' => 'Versions IOS',
 	'Class:Brand/Attribute:iosversions_list+' => 'Toutes les versions IOS pour cette marque',
 	'Class:Brand/Attribute:logo' => 'Logo',
@@ -1247,7 +1249,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Model' => 'Modèle de matériel',
-	'Class:Model+' => 'Typologie. Liste des valeurs possibles pour le modèle d\'un matériel physique. Chaque Modèle appartient à une seule Marque et s\'applique généralement à un seul type de Matériel physique.',
+	'Class:Model+' => '',
 	'Class:Model/ComplementaryName' => '%1$s - %2$s',
 	'Class:Model/Attribute:brand_id' => 'Marque',
 	'Class:Model/Attribute:brand_id+' => '',
@@ -1311,7 +1313,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:NetworkDeviceType' => 'Type d\'équipement réseau',
-	'Class:NetworkDeviceType+' => 'Typologie. Valeurs possibles pour le type d’un équipement réseau (ex : Routeur, Switch, Firewall, etc.).',
+	'Class:NetworkDeviceType+' => '',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Equipements réseaux',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Tous les équipements réseaux correspondant à ce type',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list/UI:Links:Create:Button+' => 'Créer un %4$s',
@@ -1327,14 +1329,12 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:IOSVersion' => 'Version d\'IOS',
-	'Class:IOSVersion+' => 'Typologie. Valeurs possibles des versions de systèmes d’exploitation pour équipements réseau.',
+	'Class:IOSVersion' => 'Version IOS',
+	'Class:IOSVersion+' => '',
 	'Class:IOSVersion/Attribute:brand_id' => 'Marque',
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Nom Marque',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Le nom doit être unique pour cette marque',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'cette version d\'IOS existe déja sur cette marque',
 	'Class:IOSVersion/Attribute:networkdevices_list' => 'Equipements réseaux',
 	'Class:IOSVersion/Attribute:networkdevices_list+' => 'Tous les équipements réseaux utilisant cette version IOS',
 ]);
@@ -1345,7 +1345,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDocumentToPatch' => 'Lien Document / Patch',
-	'Class:lnkDocumentToPatch+' => 'Lien utilisé lorsqu\'un Document est applicable à un Patch',
+	'Class:lnkDocumentToPatch+' => '',
 	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Patch',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
@@ -1363,7 +1363,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Lien Instance logiciel / Patch logiciel',
-	'Class:lnkSoftwareInstanceToSoftwarePatch+' => 'Ce lien indique qu\'un Patch logiciel a été appliqué sur une Instance logiciel',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Patch logiciel',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
@@ -1380,8 +1380,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkFunctionalCIToOSPatch' => 'Lien CI fonctionnel / Patch OS',
-	'Class:lnkFunctionalCIToOSPatch+' => 'Modélise le déploiement d\'un Patch d\'OS sur un équipment',
+	'Class:lnkFunctionalCIToOSPatch' => 'Lien CI Fonctionnel / Patch OS',
+	'Class:lnkFunctionalCIToOSPatch+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Patch OS',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
@@ -1399,7 +1399,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDocumentToSoftware' => 'Lien Document / Logiciel',
-	'Class:lnkDocumentToSoftware+' => 'Lien utilisé lorsqu\'un Document est applicable à un Logiciel.',
+	'Class:lnkDocumentToSoftware+' => '',
 	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Logiciel',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
@@ -1417,7 +1417,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Subnet' => 'Subnet',
-	'Class:Subnet+' => 'Segment d\'un réseau IP, défini par une adresse IP et un masque.',
+	'Class:Subnet+' => '',
 	'Class:Subnet/Name' => '%1$s/%2$s',
 	'Class:Subnet/ComplementaryName' => '%1$s - %2$s',
 	'Class:Subnet/Attribute:description' => 'Description',
@@ -1442,7 +1442,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:VLAN' => 'VLAN',
-	'Class:VLAN+' => 'Un VLAN est utilisé pour regrouper de manière logique des réseaux, sous-réseaux et interfaces physiques participant au même VLAN.',
+	'Class:VLAN+' => '',
 	'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag',
 	'Class:VLAN/Attribute:vlan_tag+' => '',
 	'Class:VLAN/Attribute:description' => 'Description',
@@ -1467,7 +1467,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkSubnetToVLAN' => 'Lien Subnet / VLAN',
-	'Class:lnkSubnetToVLAN+' => 'Ce lien n:n indique qu\'un VLAN est présent sur un Subnet. Plusieurs VLAN peuvent être présents sur le même Subnet et un VLAN peut s\'étendre sur plusieurs Subnets.',
+	'Class:lnkSubnetToVLAN+' => '',
 	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subnet',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '',
@@ -1486,8 +1486,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:NetworkInterface' => 'Interface réseau',
-	'Class:NetworkInterface+' => 'Classe abstraite pour tous les types d\'interfaces réseau.',
+	'Class:NetworkInterface' => 'Interface Réseau',
+	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => 'Nom',
 	'Class:NetworkInterface/Attribute:name+' => '',
 	'Class:NetworkInterface/Attribute:finalclass' => 'Sous-classe d\'Interface Réseau',
@@ -1500,7 +1500,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:IPInterface' => 'Interface IP',
-	'Class:IPInterface+' => 'Classe abstraite. Type d’interface réseau avec une adresse IP.',
+	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'Adresse IP',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
 	'Class:IPInterface/Attribute:macaddress' => 'Adresse MAC',
@@ -1521,16 +1521,12 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:PhysicalInterface' => 'Interface physique',
-	'Class:PhysicalInterface+' => 'Type d’interface IP représentant une interface réseau physique (ex : carte Ethernet).',
+	'Class:PhysicalInterface+' => '',
 	'Class:PhysicalInterface/Name' => '%2$s %1$s',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Matériel',
 	'Class:PhysicalInterface/Attribute:connectableci_id+' => '',
 	'Class:PhysicalInterface/Attribute:connectableci_name' => 'Nom matériel',
 	'Class:PhysicalInterface/Attribute:connectableci_name+' => '',
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organisation',
-	'Class:PhysicalInterface/Attribute:org_id+' => '',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Site',
-	'Class:PhysicalInterface/Attribute:location_id+' => '',
 	'Class:PhysicalInterface/Attribute:vlans_list' => 'VLANs',
 	'Class:PhysicalInterface/Attribute:vlans_list+' => '',
 ]);
@@ -1540,8 +1536,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkPhysicalInterfaceToVLAN' => 'Lien Interface physique / VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN+' => 'Ce lien indique lorsqu\'une Interface réseau fait partie d\'un VLAN (Virtual Local Area Network).',
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Lien Interface réseau / VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interface réseau',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
@@ -1563,7 +1559,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:LogicalInterface' => 'Interface logique',
-	'Class:LogicalInterface+' => 'Interface IP qui n\'est pas associée de façon permanente à un port physique, l\'association est dynamique. Elle peut être utilisée pour une machine virtuelle.',
+	'Class:LogicalInterface+' => '',
 	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Machine virtuelle',
 	'Class:LogicalInterface/Attribute:virtualmachine_id+' => '',
 	'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Nom Machine virtuelle',
@@ -1575,8 +1571,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:FiberChannelInterface' => 'Interface fibre',
-	'Class:FiberChannelInterface+' => 'Interface réseau vers une technologie haut débit principalement utilisée pour connecter des systèmes de stockage.',
+	'Class:FiberChannelInterface' => 'Interface Fibre',
+	'Class:FiberChannelInterface+' => '',
 	'Class:FiberChannelInterface/Attribute:speed' => 'Vitesse',
 	'Class:FiberChannelInterface/Attribute:speed+' => '',
 	'Class:FiberChannelInterface/Attribute:topology' => 'Topologie',
@@ -1594,8 +1590,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkConnectableCIToNetworkDevice' => 'Lien Device / Équipement réseau',
-	'Class:lnkConnectableCIToNetworkDevice+' => 'Définit sur quel équipment réseau un matériel est connecté. ',
+	'Class:lnkConnectableCIToNetworkDevice' => 'Lien Device / Equipement réseau',
+	'Class:lnkConnectableCIToNetworkDevice+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Equipement réseau',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
@@ -1622,8 +1618,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkApplicationSolutionToFunctionalCI' => 'Lien Solution applicative / CI fonctionnel',
-	'Class:lnkApplicationSolutionToFunctionalCI+' => 'Modélise l\'appartenance d\'un équipment à une Solution Applicative. La signification de cette relation varie suivant les types de Solution applicative.',
+	'Class:lnkApplicationSolutionToFunctionalCI' => 'Lien Solution Applicative / CI Fonctionnel',
+	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solution applicative',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '',
@@ -1640,8 +1636,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Lien Solution applicative / Processus métier',
-	'Class:lnkApplicationSolutionToBusinessProcess+' => 'Modélise la relation entre une Solution applicative et un Processus Métier.',
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Lien Solution Applicative / Processus métier',
+	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Processus métier',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '',
@@ -1659,7 +1655,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Group' => 'Groupe',
-	'Class:Group+' => 'Le groupe est conçu pour définir des ensembles explicites d\'éléments de configuration pour tout projet. Contrairement à une solution applicative, un groupe n\'est impacté par aucun de ses composants et ne les impacte pas. Par exemple, lors d\'une migration d\'OS, un groupe peut être pratique pour rassembler les « serveurs à migrer ». Les serveurs migrés sont retirés du groupe au fur et à mesure de la migration.',
+	'Class:Group+' => '',
 	'Class:Group/ComplementaryName' => '%1$s - %2$s',
 	'Class:Group/Attribute:name' => 'Nom',
 	'Class:Group/Attribute:name+' => '',
@@ -1694,8 +1690,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkGroupToCI' => 'Lien Groupe / CI fonctionnel',
-	'Class:lnkGroupToCI+' => 'Ce lien indique lorsqu\'un équipment (CI fonctionnel) fait partie d\'un Groupe.',
+	'Class:lnkGroupToCI' => 'Lien Groupe / CI',
+	'Class:lnkGroupToCI+' => '',
 	'Class:lnkGroupToCI/Name' => '%1$s / %2$s',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Groupe',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
@@ -1709,13 +1705,30 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
 ]);

+// Add translation for Fieldsets
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Server:baseinfo' => 'Informations générales',
+	'Server:Date' => 'Dates',
+	'Server:moreinfo' => 'Informations complémentaires',
+	'Server:otherinfo' => 'Autres informations',
+	'Server:power' => 'Alimentation électrique',
+	'Class:Subnet/Tab:IPUsage' => 'IP utilisées',
+	'Class:Subnet/Tab:IPUsage+' => 'Utilisation des IPs de ce subnet',
+	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces ayant une IP dans la plage: <em>%1$s</em> à <em>%2$s</em>',
+	'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',
+]);
+
 //
 // Class: lnkDocumentToFunctionalCI
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkDocumentToFunctionalCI' => 'Lien Document / CI fonctionnel',
-	'Class:lnkDocumentToFunctionalCI+' => 'Lien utilisé lorsqu\'un Document est applicable à un CI fonctionnel.',
+	'Class:lnkDocumentToFunctionalCI' => 'Lien Document / CI Fonctionnel',
+	'Class:lnkDocumentToFunctionalCI+' => '',
 	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'CI',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
@@ -1727,29 +1740,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '',
 ]);

-// Add translation for Fieldsets
-
-Dict::Add('FR FR', 'French', 'Français', [
-	'ConfigMgmt:baseinfo' => 'Informations générales',
-	'Server:baseinfo' => 'Informations générales',
-	'ConfigMgmt:moreinfo' => 'Item spécifique',
-	'Server:moreinfo' => 'Matériel spécifique',
-	'Storage:moreinfo' => 'Stockage spécifique',
-	'Software:moreinfo' => 'Logiciel spécifique',
-	'Phone:moreinfo' => 'Téléphone spécifique',
-	'ConfigMgmt:otherinfo' => 'Dates et description',
-	'Server:Date' => 'Dates',
-	'Server:otherinfo' => 'Description',
-	'Server:power' => 'Alimentation électrique',
-	'Class:Subnet/Tab:IPUsage' => 'IP utilisées',
-	'Class:Subnet/Tab:IPUsage+' => 'Utilisation des IPs de ce subnet',
-	'Class:Subnet/Tab:IPUsage-explain' => 'Interfaces ayant une IP dans la plage: <em>%1$s</em> à <em>%2$s</em>',
-	'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',
-]);
-
 //
 // Application Menu
 //
@@ -1800,3 +1790,14 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Menu:Software' => 'Catalogue des logiciels de références',
 	'Menu:Software+' => 'Catalogue des logiciels de références',
 ]);
+
+//
+// Class: PhysicalInterface
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:PhysicalInterface/Attribute:org_id' => 'Organisation',
+	'Class:PhysicalInterface/Attribute:org_id+' => '',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Site',
+	'Class:PhysicalInterface/Attribute:location_id+' => '',
+]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/hu.dict.itop-config-mgmt.php
@@ -492,8 +492,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Konfigurációs elemek, melyek ezt az alkalmazásmegoldást alkotják',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Üzleti folyamatok',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Üzleti folyamatok, melyek ettől az alkalmazásmegoldástól függenek',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Állapot',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktív',
@@ -515,8 +513,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:BusinessProcess+' => 'Személyek, szolgáltatások és CI-k értékteremtő kombinációja',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Alkalmazásmegoldások',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Alkalmazásmegoldások melyek hatással vannak erre az üzleti folyamatra',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Állapot',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktív',
@@ -613,8 +609,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:MiddlewareInstance' => 'Middleware Példány',
 	'Class:MiddlewareInstance+' => '~~',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '~~',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Middleware név',
@@ -647,8 +641,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:WebApplication/Attribute:webserver_id+' => '~~',
 	'Class:WebApplication/Attribute:webserver_name' => 'Webszerver név',
 	'Class:WebApplication/Attribute:webserver_name+' => '~~',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL~~',
 	'Class:WebApplication/Attribute:url+' => '~~',
 ]);
@@ -846,7 +838,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [

 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:Tape' => 'Szalag',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '~~',
 	'Class:Tape/Attribute:name' => 'Szalag név',
 	'Class:Tape/Attribute:name+' => '~~',
 	'Class:Tape/Attribute:description' => 'Leírás',
@@ -896,8 +888,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:Software/Attribute:version+' => '~~',
 	'Class:Software/Attribute:documents_list' => 'Dokumentumok',
 	'Class:Software/Attribute:documents_list+' => 'A szoftver dokumentumai',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Típus',
 	'Class:Software/Attribute:type+' => '~~',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DB Szerver',
@@ -1062,9 +1052,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:OSVersion/Attribute:osfamily_id' => 'OS család',
 	'Class:OSVersion/Attribute:osfamily_id+' => '~~',
 	'Class:OSVersion/Attribute:osfamily_name' => 'OS család név',
-	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
+	'Class:OSVersion/Attribute:osfamily_name+' => '~~',
 ]);

 //
@@ -1073,9 +1061,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [

 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:OSFamily' => 'OS család',
-	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
+	'Class:OSFamily+' => '~~',
 ]);

 //
@@ -1173,8 +1159,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:IOSVersion/Attribute:brand_id+' => '~~',
 	'Class:IOSVersion/Attribute:brand_name' => 'Gyártó név',
 	'Class:IOSVersion/Attribute:brand_name+' => '~~',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1542,16 +1526,10 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 // Add translation for Fieldsets

 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Általános információ',
 	'Server:Date' => 'Dátumok',
 	'Server:moreinfo' => 'További információ',
-	'Server:otherinfo' => 'Description~~',
+	'Server:otherinfo' => 'Other information~~',
 	'Server:power' => 'Áramforrás',
 	'Class:Subnet/Tab:IPUsage' => 'IP felhasználás',
 	'Class:Subnet/Tab:IPUsage+' => 'Which IP within this Subnet is used or not~~',
@@ -1636,8 +1614,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 //

 Dict::Add('HU HU', 'Hungarian', 'Magyar', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
@@ -492,8 +492,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Tutti gli elementi di configurazione che compongono questa soluzione applicativa',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Processi aziendali',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Tutti i processi aziendali dipendenti da questa soluzione applicativa',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Stato',
 	'Class:ApplicationSolution/Attribute:status+' => '~~',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'attivo',
@@ -515,8 +513,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Soluzioni applicative',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Tutte le soluzioni applicative che influenzano questo processo aziendale',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Stato',
 	'Class:BusinessProcess/Attribute:status+' => '~~',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'attivo',
@@ -581,7 +577,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 //

 Dict::Add('IT IT', 'Italian', 'Italiano', [
-	'Class:WebServer' => 'Web Server',
+	'Class:WebServer' => 'Web server',
 	'Class:WebServer+' => '~~',
 	'Class:WebServer/Attribute:webapp_list' => 'Applicazioni web',
 	'Class:WebServer/Attribute:webapp_list+' => 'Tutte le applicazioni web disponibili su questo server web',
@@ -613,8 +609,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:MiddlewareInstance' => 'Istanza Middleware',
 	'Class:MiddlewareInstance+' => '~~',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '~~',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nome Middleware',
@@ -647,8 +641,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:WebApplication/Attribute:webserver_id+' => '~~',
 	'Class:WebApplication/Attribute:webserver_name' => 'Nome del web server',
 	'Class:WebApplication/Attribute:webserver_name+' => '~~',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '~~',
 ]);
@@ -846,7 +838,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [

 Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:Tape' => 'Nastro',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '~~',
 	'Class:Tape/Attribute:name' => 'Nome',
 	'Class:Tape/Attribute:name+' => '~~',
 	'Class:Tape/Attribute:description' => 'Descrizione',
@@ -896,8 +888,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:Software/Attribute:version+' => '~~',
 	'Class:Software/Attribute:documents_list' => 'Documenti',
 	'Class:Software/Attribute:documents_list+' => 'Tutti i documenti collegati a questo software',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Tipo',
 	'Class:Software/Attribute:type+' => '~~',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
@@ -1062,9 +1052,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:OSVersion/Attribute:osfamily_id' => 'Famiglia del Sistema Operativo',
 	'Class:OSVersion/Attribute:osfamily_id+' => '~~',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Nome della Famiglia del Sistema Operativo',
-	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
+	'Class:OSVersion/Attribute:osfamily_name+' => '~~',
 ]);

 //
@@ -1073,9 +1061,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [

 Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:OSFamily' => 'Famiglia del Sistema Operativo',
-	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
+	'Class:OSFamily+' => '~~',
 ]);

 //
@@ -1194,8 +1180,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:IOSVersion/Attribute:brand_id+' => '~~',
 	'Class:IOSVersion/Attribute:brand_name' => 'Nome della marca',
 	'Class:IOSVersion/Attribute:brand_name+' => '~~',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1563,12 +1547,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 // Add translation for Fieldsets

 Dict::Add('IT IT', 'Italian', 'Italiano', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Informazioni generali',
 	'Server:Date' => 'Date',
 	'Server:moreinfo' => 'Ulteriori informazioni',
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ja.dict.itop-config-mgmt.php
@@ -492,8 +492,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'ビジネスプロセス',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => '状態',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'アクティブ',
@@ -515,8 +513,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'アプリケーションソリューション',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => '状態',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'アクティブ',
@@ -613,8 +609,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:MiddlewareInstance' => 'ミドルウエアインスタンス',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'ミドルウエア',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'ミドルウエア名',
@@ -647,8 +641,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Webサーバ名',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -846,7 +838,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', [

 Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:Tape' => 'テープ',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => '名前',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => '説明',
@@ -896,8 +888,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => '文書',
 	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'タイプ',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DBサーバ',
@@ -1063,8 +1053,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'OSファミリ名',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1074,8 +1062,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:OSFamily' => 'OSファミリ',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1173,8 +1159,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'ブランド名',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1542,12 +1526,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 // Add translation for Fieldsets

 Dict::Add('JA JP', 'Japanese', '日本語', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => '基本情報',
 	'Server:Date' => '日付',
 	'Server:moreinfo' => '追加情報',
@@ -1636,8 +1614,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 //

 Dict::Add('JA JP', 'Japanese', '日本語', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php
@@ -494,8 +494,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Alle configuratie-items die deze applicatie-oplossing tot stand brengen',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Bedrijfsprocessen',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Alle bedrijfsprocessen die afhankelijk zijn van deze applicatie-oplossing',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Actief',
@@ -517,8 +515,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Applicatie-oplossing',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Alle applicatie-oplossingen die impact hebben op dit bedrijfsproces',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Actief',
@@ -615,8 +611,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:MiddlewareInstance' => 'Middleware-instantie',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Naam middleware',
@@ -649,8 +643,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Naam webserver',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'Link (URL)',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -848,7 +840,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [

 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Tape' => 'Tape',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Naam',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Omschrijving',
@@ -898,8 +890,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Documenten',
 	'Class:Software/Attribute:documents_list+' => 'Alle documenten gelinkt aan deze software',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Type',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Databaseserver',
@@ -1065,8 +1055,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Naam soort besturingssysteem',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1076,8 +1064,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:OSFamily' => 'Soort Besturingssysteem',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1175,8 +1161,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Naam merk',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1544,12 +1528,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 // Add translation for Fieldsets

 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Globale informatie',
 	'Server:Date' => 'Datum',
 	'Server:moreinfo' => 'Meer informatie',
@@ -1638,8 +1616,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 //

 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pl.dict.itop-config-mgmt.php
@@ -492,8 +492,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Wszystkie elementy konfiguracji, które składają się na to rozwiązanie',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Procesy biznesowe',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Wszystkie procesy biznesowe w zależności od tego rozwiązania',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'aktywne',
@@ -515,8 +513,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Rozwiązania aplikacyjne',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Wszystkie rozwiązania aplikacyjne, które mają wpływ na ten proces biznesowy',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'aktywny',
@@ -613,8 +609,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:MiddlewareInstance' => 'Instancja oprogramowania pośredniczącego',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Oprogramowanie pośredniczące',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nazwa oprogramowania pośredniczącego',
@@ -647,8 +641,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Nazwa serwera WWW',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -846,7 +838,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', [

 Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:Tape' => 'Taśma',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Nazwa',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Opis',
@@ -896,8 +888,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Dokumenty',
 	'Class:Software/Attribute:documents_list+' => 'Wszystkie dokumenty powiązane z tym oprogramowaniem',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Typ',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Serwer bazy danych',
@@ -1063,8 +1053,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Nazwa rodziny OS',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1074,8 +1062,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:OSFamily' => 'Rodzina OS',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1173,8 +1159,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Nazwa marki',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1542,12 +1526,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 // Add translation for Fieldsets

 Dict::Add('PL PL', 'Polish', 'Polski', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Informacje ogólne',
 	'Server:Date' => 'Daty',
 	'Server:moreinfo' => 'Więcej informacji',
@@ -1636,8 +1614,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 //

 Dict::Add('PL PL', 'Polish', 'Polski', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
@@ -492,8 +492,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Todos os Itens de configuração (IC) que compõem esta Solução de aplicação',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Processos de negócio',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Todos os Processos de negócio dependentes desta Solução de aplicação',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Ativo',
@@ -515,8 +513,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Soluções de aplicação',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Todas as soluções de aplicação que impactam este processo de negócio',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Ativo',
@@ -613,8 +609,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:MiddlewareInstance' => 'Instância Middleware',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Nome do middleware',
@@ -647,8 +641,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Nome do servidor Web',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -846,7 +838,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:Tape' => 'Fita',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => 'Nome',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Descrição',
@@ -896,8 +888,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Documentos',
 	'Class:Software/Attribute:documents_list+' => 'Todos os Documentos associados a este Software',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Tipo',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Servidor de DB',
@@ -1063,8 +1053,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Nome da família do SO',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1074,8 +1062,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:OSFamily' => 'Família do OS',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1173,8 +1159,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Nome do fabricante',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1542,12 +1526,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 // Add translation for Fieldsets

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Informações gerais',
 	'Server:Date' => 'Data',
 	'Server:moreinfo' => 'Mais informações',
@@ -1636,8 +1614,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/ru.dict.itop-config-mgmt.php
@@ -493,8 +493,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Конфигурационные единицы в составе прикладного решения',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Бизнес-процессы',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Бизнес-процессы, зависящие от прикладного решения',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Статус',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Активный',
@@ -516,8 +514,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Прикладные решения',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Прикладные решения, влияющие на бизнес-процесс',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Статус',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Активный',
@@ -614,8 +610,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:MiddlewareInstance' => 'Экземпляр промежуточного ПО',
 	'Class:MiddlewareInstance+' => 'Экземпляр промежуточного ПО',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Промежуточное ПО',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Промежуточное ПО',
@@ -648,8 +642,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Веб-сервер',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -847,7 +839,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [

 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:Tape' => 'Лента',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => 'Лента',
 	'Class:Tape/Attribute:name' => 'Название',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Описание',
@@ -897,8 +889,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Документы',
 	'Class:Software/Attribute:documents_list+' => 'Все документы, связанные с этим ПО',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Тип',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Сервер БД',
@@ -1064,8 +1054,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Семейство ОС',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1075,8 +1063,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:OSFamily' => 'Семейство ОС',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1174,8 +1160,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Бренд',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1543,12 +1527,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 // Add translation for Fieldsets

 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Основное',
 	'Server:Date' => 'Даты',
 	'Server:moreinfo' => 'Спецификация',
@@ -1637,8 +1615,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 //

 Dict::Add('RU RU', 'Russian', 'Русский', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/sk.dict.itop-config-mgmt.php
@@ -231,7 +231,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:ConnectableCI' => 'Pripojiteľné zariadenie',
-	'Class:ConnectableCI+' => 'Physical Device which can be connected to a network.~~',
+	'Class:ConnectableCI+' => 'Physical CI~~',
 	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Sieťové zariadenia',
 	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'All network devices connected to this device~~',
@@ -492,8 +492,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'All the configuration items that compose this application solution~~',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Biznis procesy',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'All the business processes depending on this application solution~~',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Stav',
 	'Class:ApplicationSolution/Attribute:status+' => '~~',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktívne',
@@ -515,8 +513,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:BusinessProcess+' => '~~',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Aplikačné riešenia',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'All the application solutions that impact this business process~~',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Stav',
 	'Class:BusinessProcess/Attribute:status+' => '~~',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktívny',
@@ -581,7 +577,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 //

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
-	'Class:WebServer' => 'Web Server',
+	'Class:WebServer' => 'Web server',
 	'Class:WebServer+' => '~~',
 	'Class:WebServer/Attribute:webapp_list' => 'Webové aplikácie',
 	'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server~~',
@@ -613,8 +609,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:MiddlewareInstance' => 'Middleware inštancia',
 	'Class:MiddlewareInstance+' => '~~',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '~~',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Názov Middleware-u',
@@ -647,8 +641,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:WebApplication/Attribute:webserver_id+' => '~~',
 	'Class:WebApplication/Attribute:webserver_name' => 'Názov Web serveru',
 	'Class:WebApplication/Attribute:webserver_name+' => '~~',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '~~',
 ]);
@@ -846,7 +838,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:Tape' => 'Páska',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '~~',
 	'Class:Tape/Attribute:name' => 'Názov',
 	'Class:Tape/Attribute:name+' => '~~',
 	'Class:Tape/Attribute:description' => 'Popis',
@@ -896,8 +888,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:Software/Attribute:version+' => '~~',
 	'Class:Software/Attribute:documents_list' => 'Dokumenty',
 	'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software~~',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Typ',
 	'Class:Software/Attribute:type+' => '~~',
 	'Class:Software/Attribute:type/Value:DBServer' => 'DB Server',
@@ -1063,8 +1053,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '~~',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Názov kategórie OS',
 	'Class:OSVersion/Attribute:osfamily_name+' => '~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1074,8 +1062,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:OSFamily' => 'Kategória OS',
 	'Class:OSFamily+' => '~~',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1173,8 +1159,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:IOSVersion/Attribute:brand_id+' => '~~',
 	'Class:IOSVersion/Attribute:brand_name' => 'Názov značky',
 	'Class:IOSVersion/Attribute:brand_name+' => '~~',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1542,12 +1526,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 // Add translation for Fieldsets

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Všeobecné informácie',
 	'Server:Date' => 'Dátum',
 	'Server:moreinfo' => 'Viac informácií',
@@ -1636,8 +1614,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 //

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
@@ -493,8 +493,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Bu uygulama sistemü oluşturan tüm yapılandırma öğeleri',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'İş Süreçleri',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Bu uygulama sistemüne bağlı tüm iş süreçleri',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Durum',
 	'Class:ApplicationSolution/Attribute:status+' => '~~',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Aktif',
@@ -516,8 +514,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Uygulama sistemleri',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Bu iş sürecini etkileyen tüm uygulama çözümleri',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Durum',
 	'Class:BusinessProcess/Attribute:status+' => '~~',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Aktif',
@@ -614,8 +610,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:MiddlewareInstance' => 'Ara katman yazılımı olayı',
 	'Class:MiddlewareInstance+' => '~~',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Ara katman yazılımı',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '~~',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Ara katman yazılımı adı',
@@ -648,8 +642,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:WebApplication/Attribute:webserver_id+' => '~~',
 	'Class:WebApplication/Attribute:webserver_name' => 'Web Sunucusu Adı',
 	'Class:WebApplication/Attribute:webserver_name+' => '~~',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '~~',
 ]);
@@ -847,7 +839,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [

 Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:Tape' => 'Teyp',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '~~',
 	'Class:Tape/Attribute:name' => 'İsim',
 	'Class:Tape/Attribute:name+' => '~~',
 	'Class:Tape/Attribute:description' => 'Açıklama',
@@ -897,8 +889,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:Software/Attribute:version+' => '~~',
 	'Class:Software/Attribute:documents_list' => 'Belgeler',
 	'Class:Software/Attribute:documents_list+' => 'Bu yazılımla bağlantılı tüm belgeler',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Tip',
 	'Class:Software/Attribute:type+' => '~~',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Veritabanı Sunucusu',
@@ -1064,8 +1054,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '~~',
 	'Class:OSVersion/Attribute:osfamily_name' => 'OS Aile Adı',
 	'Class:OSVersion/Attribute:osfamily_name+' => '~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1075,8 +1063,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:OSFamily' => 'OS ailesi',
 	'Class:OSFamily+' => '~~',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1174,8 +1160,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:IOSVersion/Attribute:brand_id+' => '~~',
 	'Class:IOSVersion/Attribute:brand_name' => 'Marka Adı',
 	'Class:IOSVersion/Attribute:brand_name+' => '~~',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1543,12 +1527,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 // Add translation for Fieldsets

 Dict::Add('TR TR', 'Turkish', 'Türkçe', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Genel Bilgi',
 	'Server:Date' => 'Tarihler',
 	'Server:moreinfo' => 'Daha fazla bilgi',
@@ -1637,8 +1615,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 //

 Dict::Add('TR TR', 'Turkish', 'Türkçe', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
@@ -509,8 +509,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => '此应用方案包含的所有配置项',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => '业务流程',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => '所有依赖此应用方案的业务流程',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => '状态',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => '启用',
@@ -532,8 +530,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => '应用方案',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => '所有影响此业务流程的应用方案',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
-	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => '状态',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => '启用',
@@ -630,8 +626,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:MiddlewareInstance' => '中间件实例',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => '中间件',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => '名称',
@@ -664,8 +658,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => '名称',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo~~',
-	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -863,7 +855,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Tape' => '磁带',
-	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
+	'Class:Tape+' => '',
 	'Class:Tape/Attribute:name' => '名称',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => '描述',
@@ -913,8 +905,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => '文档',
 	'Class:Software/Attribute:documents_list+' => '此软件的所有文档',
-	'Class:Software/Attribute:logo' => 'Logo~~',
-	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => '类型',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => '数据库服务器',
@@ -1080,8 +1070,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => '名称',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);

 //
@@ -1091,8 +1079,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:OSFamily' => '操作系统家族',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
-	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);

 //
@@ -1190,8 +1176,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => '名称',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);

 //
@@ -1559,12 +1543,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 // Add translation for Fieldsets

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'ConfigMgmt:baseinfo' => 'General~~',
-	'ConfigMgmt:moreinfo' => 'CI specifics~~',
-	'Storage:moreinfo' => 'Storage specifics~~',
-	'ConfigMgmt:otherinfo' => 'Dates and description~~',
-	'Software:moreinfo' => 'Software specifics~~',
-	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => '基本信息',
 	'Server:Date' => '日期',
 	'Server:moreinfo' => '更多信息',
@@ -1653,8 +1631,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
 	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
 	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);
--- a/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml
+++ b/datamodels/2.x/itop-container-mgmt/datamodel.itop-container-mgmt.xml
@@ -92,40 +92,7 @@
          <duplicates/>
        </field>
      </fields>
-      <methods>
-        <method id="GetIcon">
-          <comment>	/**
-            * Overrides the GetIcon method to return the logo of the associated Software if any, otherwise the default icon of the class will be returned
-            *
-            */</comment>
-          <static>false</static>
-          <access>public</access>
-          <type>Custom</type>
-          <code><![CDATA[	public function GetIcon($bImgTag = true)
-    {
-        // If there is an image defined on the associated Software, we use it
-        $sIconClass = 'Software'; // the class storing the image which will be used as icon for the current object
-        $sExtKeyCode = 'software_id'; // the attribute code pointing to the class having the image to display
-        $sIconAttCode = 'logo'; // the attribute code of the image to display on the IconClass
-
-        $iObj = $this->Get($sExtKeyCode);
-        if ($iObj > 0) {
-            $oObj = MetaModel::GetObject($sIconClass, $iObj, true, true);
-            $oImage = $oObj->Get($sIconAttCode);
-            $sIconUrl = $oImage->IsEmpty() ? '' : $oImage->GetDisplayURL($sIconClass, $iObj, $sIconAttCode);
-            if (strlen($sIconUrl) > 0) {
-                if ($bImgTag) {
-                    return "<img src=\"$sIconUrl\" alt=''/>";
-                } else {
-                    return $sIconUrl;
-                }
-            }
-        }
-        // Return the default image
-        return parent::GetIcon($bImgTag);
-    }]]></code>
-        </method>
-      </methods>
+      <methods/>
      <presentation>
        <list>
          <items>
@@ -162,22 +129,6 @@
            </item>
          </items>
        </search>
-        <summary>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-            <item id="version">
-              <rank>20</rank>
-            </item>
-            <item id="publisher">
-              <rank>30</rank>
-            </item>
-            <item id="type_id">
-              <rank>40</rank>
-            </item>
-          </items>
-        </summary>
        <details>
          <items>
            <item id="col:col1">
@@ -277,10 +228,6 @@
            <attribute id="containervirtualhost_id_friendlyname"/>
          </complementary_attributes>
        </naming>
-        <fields_semantic>
-          <state_attribute>status</state_attribute>
-          <image_attribute>logo</image_attribute>
-        </fields_semantic>
        <reconciliation>
          <attributes>
            <attribute id="name"/>
@@ -288,6 +235,9 @@
             <attribute id="finalclass"/>
          </attributes>
        </reconciliation>
+        <fields_semantic>
+          <state_attribute>status</state_attribute>
+        </fields_semantic>
        <style>
          <icon>images/icons8-application-container.svg</icon>
        </style>
@@ -305,13 +255,6 @@
          <on_target_delete>DEL_AUTO</on_target_delete>
          <tracking_level>all</tracking_level>
        </field>
-        <field id="logo" xsi:type="AttributeImage">
-          <display_max_width>96</display_max_width>
-          <display_max_height>96</display_max_height>
-          <storage_max_width>128</storage_max_width>
-          <storage_max_height>128</storage_max_height>
-          <is_null_allowed>true</is_null_allowed>
-        </field>
        <field id="containerimages_list" xsi:type="AttributeLinkedSetIndirect">
          <linked_class>lnkContainerApplicationToImage</linked_class>
          <ext_key_to_me>containerapplication_id</ext_key_to_me>
@@ -372,22 +315,6 @@
            </item>
          </items>
        </search>
-        <summary>
-          <items>
-            <item id="org_id">
-              <rank>10</rank>
-            </item>
-            <item id="containervirtualhost_id">
-              <rank>20</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>30</rank>
-            </item>
-            <item id="description">
-              <rank>40</rank>
-            </item>
-          </items>
-        </summary>
        <details>
          <items>
            <item id="col:col1">
@@ -430,11 +357,8 @@
                    <item id="move2production">
                      <rank>50</rank>
                    </item>
-                    <item id="logo">
-                      <rank>60</rank>
-                    </item>
                    <item id="description">
-                      <rank>70</rank>
+                      <rank>60</rank>
                    </item>
                  </items>
                  <rank>10</rank>
@@ -816,9 +740,6 @@
          <target_class>ContainerCluster</target_class>
          <on_target_delete>DEL_MANUAL</on_target_delete>
          <tracking_level>all</tracking_level>
-          <dependencies>
-            <attribute id="org_id"/>
-          </dependencies>
        </field>
        <field id="role" xsi:type="AttributeEnum">
          <sql>role</sql>
@@ -840,6 +761,9 @@
          <default_value>standalone</default_value>
          <is_null_allowed>false</is_null_allowed>
          <display_style>radio_horizontal</display_style>
+          <dependencies>
+            <attribute id="containercluster_id"/>
+          </dependencies>
          <tracking_level>all</tracking_level>
        </field>
        <field id="system_id" xsi:type="AttributeExternalKey">
@@ -910,28 +834,6 @@
            </item>
          </items>
        </search>
-        <summary>
-          <items>
-            <item id="org_id">
-              <rank>10</rank>
-            </item>
-            <item id="system_id">
-              <rank>20</rank>
-            </item>
-            <item id="containertype_id">
-              <rank>30</rank>
-            </item>
-            <item id="containercluster_id">
-              <rank>40</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>50</rank>
-            </item>
-            <item id="description">
-              <rank>60</rank>
-            </item>
-          </items>
-        </summary>
        <details>
          <items>
            <item id="col:col1">
@@ -1123,22 +1025,6 @@
            </item>
          </items>
        </search>
-        <summary>
-          <items>
-            <item id="org_id">
-              <rank>10</rank>
-            </item>
-            <item id="containertype_id">
-              <rank>20</rank>
-            </item>
-            <item id="business_criticity">
-              <rank>30</rank>
-            </item>
-            <item id="description">
-              <rank>40</rank>
-            </item>
-          </items>
-        </summary>
        <details>
          <items>
            <item id="col:col1">
@@ -1342,92 +1228,6 @@
        </relation>
      </relations>
    </class>
-    <class id="Server" _delta="must_exist">
-      <fields>
-        <field id="containerhosts_list" xsi:type="AttributeLinkedSet" _delta="define">
-          <linked_class>ContainerHost</linked_class>
-          <ext_key_to_me>system_id</ext_key_to_me>
-          <tracking_level>list</tracking_level>
-          <edit_mode/>
-          <with_php_constraint>false</with_php_constraint>
-          <with_php_computation>false</with_php_computation>
-          <edit_when/>
-        </field>
-      </fields>
-      <presentation>
-        <details>
-          <items>
-            <item id="containerhosts_list" _delta="define">
-              <rank>140</rank>
-            </item>
-          </items>
-        </details>
-      </presentation>
-      <relations>
-        <relation id="impacts" _delta="merge">
-          <neighbours>
-            <neighbour id="containerhosts" _delta="define">
-              <attribute>containerhosts_list</attribute>
-              <direction>both</direction>
-            </neighbour>
-          </neighbours>
-        </relation>
-      </relations>
-    </class>
-    <class id="Software" _delta="must_exist">
-      <fields>
-        <field id="containerimages_list" xsi:type="AttributeLinkedSet" _delta="define">
-          <linked_class>ContainerImage</linked_class>
-          <ext_key_to_me>software_id</ext_key_to_me>
-          <tracking_level>list</tracking_level>
-          <edit_mode>add_only</edit_mode>
-          <with_php_constraint>false</with_php_constraint>
-          <with_php_computation>false</with_php_computation>
-          <edit_when/>
-        </field>
-      </fields>
-      <presentation>
-        <details>
-          <items>
-            <item id="containerimages_list" _delta="define">
-              <rank>150</rank>
-            </item>
-          </items>
-        </details>
-      </presentation>
-    </class>
-    <class id="VirtualMachine" _delta="must_exist">
-      <fields>
-        <field id="containerhosts_list" xsi:type="AttributeLinkedSet" _delta="define">
-          <linked_class>ContainerHost</linked_class>
-          <ext_key_to_me>system_id</ext_key_to_me>
-          <tracking_level>list</tracking_level>
-          <edit_mode/>
-          <with_php_constraint>false</with_php_constraint>
-          <with_php_computation>false</with_php_computation>
-          <edit_when/>
-        </field>
-      </fields>
-      <presentation>
-        <details>
-          <items>
-            <item id="containerhosts_list" _delta="define">
-              <rank>140</rank>
-            </item>
-          </items>
-        </details>
-      </presentation>
-      <relations>
-        <relation id="impacts" _delta="merge">
-          <neighbours>
-            <neighbour id="containerhosts" _delta="define">
-              <attribute>containerhosts_list</attribute>
-              <direction>both</direction>
-            </neighbour>
-          </neighbours>
-        </relation>
-      </relations>
-    </class>
  </classes>
  <menus>
    <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="must_exist">
--- a/datamodels/2.x/itop-container-mgmt/dictionaries/en.dict.itop-container-mgmt.php
+++ b/datamodels/2.x/itop-container-mgmt/dictionaries/en.dict.itop-container-mgmt.php
@@ -57,8 +57,6 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:ContainerApplication/Attribute:descriptor+' => 'File describing how to deploy the application on the container platform (e.g., Docker Compose, Helm Chart, etc.)',
 	'Class:ContainerApplication/Attribute:containervirtualhost_id' => 'Container Host',
 	'Class:ContainerApplication/Attribute:containervirtualhost_id+' => 'Container Platform on which the application is running',
-	'Class:ContainerApplication/Attribute:logo' => 'Logo',
-	'Class:ContainerApplication/Attribute:logo+' => 'Used as object icon when this ContainerApplication is displayed within impact analysis graphs',
 	'Class:ContainerApplication/Attribute:containertype_id' => 'Container type',
 	'Class:ContainerApplication/Attribute:containertype_id+' => 'Technology used for containerization',
 	'Class:ContainerApplication/Attribute:containerimages_list' => 'Container images',
@@ -156,18 +154,3 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:ContainerImageType' => 'Container Image Type',
 	'Class:ContainerImageType+' => 'Typology of container images',
 ]);
-
-//
-// Class Cloud, Server and Virtual Machine
-//
-
-Dict::Add('EN US', 'English', 'English', [
-	'Class:Cloud/Attribute:containerhosts_list' => 'Container Hosts',
-	'Class:Cloud/Attribute:containerhosts_list+' => 'List of container hosts running in this cloud',
-	'Class:Server/Attribute:containerhosts_list' => 'Container Hosts',
-	'Class:Server/Attribute:containerhosts_list+' => 'List of container hosts running on this server',
-	'Class:VirtualMachine/Attribute:containerhosts_list' => 'Container Hosts',
-	'Class:VirtualMachine/Attribute:containerhosts_list+' => 'List of container hosts running on this virtual machine',
-	'Class:Software/Attribute:containerimages_list' => 'Container Images',
-	'Class:Software/Attribute:containerimages_list+' => 'List of container images running this Software',
-]);
--- a/datamodels/2.x/itop-container-mgmt/dictionaries/fr.dict.itop-container-mgmt.php
+++ b/datamodels/2.x/itop-container-mgmt/dictionaries/fr.dict.itop-container-mgmt.php
@@ -24,8 +24,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerImage/Name' => '%1$s %2$s',
 	'Class:ContainerImage/ComplementaryName' => '%1$s - %2$s',
-	'Class:ContainerImage' => 'Image pour conteneur',
-	'Class:ContainerImage+' => 'L\'image d\'un logiciel, constituant d\'une Application conteneurisée',
+	'Class:ContainerImage' => 'Image pour Conteneur',
+	'Class:ContainerImage+' => 'L\'image d\'un logiciel, constituant d\'une Application Conteneurisée',
 	'Class:ContainerImage/Attribute:name' => 'Nom',
 	'Class:ContainerImage/Attribute:name+' => '',
 	'Class:ContainerImage/Attribute:version' => 'Version',
@@ -33,21 +33,15 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerImage/Attribute:description' => 'Description',
 	'Class:ContainerImage/Attribute:description+' => '',
 	'Class:ContainerImage/Attribute:publisher' => 'Editeur',
-	'Class:ContainerImage/Attribute:publisher+' => 'Fournisseur de l\'image',
+	'Class:ContainerImage/Attribute:publisher+' => 'Fournisseur de l\image',
 	'Class:ContainerImage/Attribute:image' => 'Image',
 	'Class:ContainerImage/Attribute:image+' => 'Détail permettant de récupérer l\'image sur la plateforme d\'hébergement appropriée',
 	'Class:ContainerImage/Attribute:type_id' => 'Type',
-	'Class:ContainerImage/Attribute:type_id+' => 'Type d\'image',
+	'Class:ContainerImage/Attribute:type_id+' => 'Type d\image',
 	'Class:ContainerImage/Attribute:software_id' => 'Logiciel',
 	'Class:ContainerImage/Attribute:software_id+' => '',
 	'Class:ContainerImage/Attribute:containerapplications_list' => 'Applications conteneurisées',
 	'Class:ContainerImage/Attribute:containerapplications_list+' => 'Les applications qui utilisent cette image',
-	'Class:ContainerImage/Attribute:containerapplications_list/UI:Links:Create:Button+' => 'Créer une %4$s',
-	'Class:ContainerImage/Attribute:containerapplications_list/UI:Links:Create:Modal:Title' => 'Ajouter %2$s à une nouvelle %4$s',
-	'Class:ContainerImage/Attribute:containerapplications_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:ContainerImage/Attribute:containerapplications_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
-	'Class:ContainerImage/Attribute:containerapplications_list/UI:Links:Remove:Button+' => 'Retirer %2$s de cette %4$s',
-	'Class:ContainerImage/Attribute:containerapplications_list/UI:Links:Remove:Modal:Title' => 'Retirer %1$s de cette %4$s',
 ]);

 //
@@ -57,24 +51,16 @@ Dict::Add('FR FR', 'French', 'Français', [
 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerApplication/Name' => '%1$s',
 	'Class:ContainerApplication/ComplementaryName' => '%1$s',
-	'Class:ContainerApplication' => 'Application conteneurisée',
-	'Class:ContainerApplication+' => 'Une application déployée sur une Plateforme de conteneurisation',
+	'Class:ContainerApplication' => 'Application Conteneurisée',
+	'Class:ContainerApplication+' => 'Une application déployée sur une Plateforme de Conteneurisation',
 	'Class:ContainerApplication/Attribute:descriptor' => 'Fichier de déploiement',
 	'Class:ContainerApplication/Attribute:descriptor+' => 'Fichier décrivant la manière de déployer l\'application sur la plateforme de conteneurisation (par exemple, Docker Compose, Helm Chart, etc.)',
 	'Class:ContainerApplication/Attribute:containervirtualhost_id' => 'Hôte',
 	'Class:ContainerApplication/Attribute:containervirtualhost_id+' => 'Plateforme de conteneurisation sur laquelle cette application est déployée',
-	'Class:ContainerApplication/Attribute:logo' => 'Logo',
-	'Class:ContainerApplication/Attribute:logo+' => 'Utilisé comme icône de l\'objet dans les graphes d\'analyse d\'impact',
 	'Class:ContainerApplication/Attribute:containertype_id' => 'Type de conteneur',
 	'Class:ContainerApplication/Attribute:containertype_id+' => 'Typologie de plateforme de conteneurisation',
 	'Class:ContainerApplication/Attribute:containerimages_list' => 'Images',
 	'Class:ContainerApplication/Attribute:containerimages_list+' => 'Images des conteneurs constitutifs de cette application',
-	'Class:ContainerApplication/Attribute:containerimages_list/UI:Links:Create:Button+' => 'Créer une %4$s',
-	'Class:ContainerApplication/Attribute:containerimages_list/UI:Links:Create:Modal:Title' => 'Ajouter une %4$s à %2$s',
-	'Class:ContainerApplication/Attribute:containerimages_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:ContainerApplication/Attribute:containerimages_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
-	'Class:ContainerApplication/Attribute:containerimages_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
-	'Class:ContainerApplication/Attribute:containerimages_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
 ]);

 //
@@ -82,7 +68,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkContainerApplicationToImage' => 'Lien Application conteneurisée / Image pour conteneur',
+	'Class:lnkContainerApplicationToImage' => 'Lien Application / Image pour Conteneur',
 	'Class:lnkContainerApplicationToImage+' => '',
 	'Class:lnkContainerApplicationToImage/Name' => '%1$s / %2$s',
 	'Class:lnkContainerApplicationToImage/Name+' => '',
@@ -99,7 +85,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerVirtualHost/Name' => '%1$s',
 	'Class:ContainerVirtualHost/ComplementaryName' => '',
-	'Class:ContainerVirtualHost' => 'Plateforme de conteneurisation',
+	'Class:ContainerVirtualHost' => 'Plateforme de Conteneurisation',
 	'Class:ContainerVirtualHost+' => 'Plateforme sur laquelle des applications s\'exécutent dans des conteneurs',
 	'Class:ContainerVirtualHost/Attribute:containertype_id' => 'Type de plateforme',
 	'Class:ContainerVirtualHost/Attribute:containertype_id+' => 'Technologie de conteneurisation utilisée',
@@ -107,13 +93,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerVirtualHost/Attribute:status+' => 'État de la plateforme de conteneurisation',
 	'Class:ContainerVirtualHost/Attribute:containerapplications_list' => 'Applications',
 	'Class:ContainerVirtualHost/Attribute:containerapplications_list+' => 'Applications qui sont déployées sur cette plateforme',
-	'Class:ContainerVirtualHost/Attribute:containerapplications_list/UI:Links:Create:Button+' => 'Créer une %4$s',
-	'Class:ContainerVirtualHost/Attribute:containerapplications_list/UI:Links:Create:Modal:Title' => 'Ajouter une %4$s à %2$s',
-	'Class:ContainerVirtualHost/Attribute:containerapplications_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:ContainerVirtualHost/Attribute:containerapplications_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
-	'Class:ContainerVirtualHost/Attribute:containerapplications_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
-	'Class:ContainerVirtualHost/Attribute:containerapplications_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de sa %1$s',
-
 	'ContainerVirtualHost:baseinfo' => 'Informations générales',
 	'ContainerVirtualHost:moreinfo' => 'Spécificités de la conteneurisation',
 ]);
@@ -125,8 +104,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerHost/Name' => '%1$s',
 	'Class:ContainerHost/ComplementaryName' => '%1$s-%2$s',
-	'Class:ContainerHost' => 'Hôte pour conteneurs',
-	'Class:ContainerHost+' => 'Logiciel hôte dédié à l\'exécution de conteneurs. C\'est l\'élément de base d\'une Plateforme de conteneurisation',
+	'Class:ContainerHost' => 'Hôte pour Conteneurs',
+	'Class:ContainerHost+' => 'Logiciel hôte dédié à l\'exécution de conteneurs. C\'est l\'élément de base d\'une Plateforme de Conteneurisation',
 	'Class:ContainerHost/Attribute:containercluster_id' => 'Grappe pour conteneurs',
 	'Class:ContainerHost/Attribute:containercluster_id+' => 'Grappe d\'hôtes pour conteneurs',
 	'Class:ContainerHost/Attribute:role' => 'Rôle',
@@ -135,7 +114,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerHost/Attribute:role/Value:worker' => 'Esclave',
 	'Class:ContainerHost/Attribute:role/Value:standalone' => 'Autonome',
 	'Class:ContainerHost/Attribute:system_id' => 'Système',
-	'Class:ContainerHost/Attribute:system_id+' => 'Le système sur lequel cet hôte tourne. Cela peut être un Serveur, une Machine virtuelle ou un Nuage',
+	'Class:ContainerHost/Attribute:system_id+' => 'Le système sur lequel cet hôte tourne. Cela peut être un Serveur, une Machine Virtuelle ou un Nuage',
 ]);

 //
@@ -145,8 +124,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerCluster/Name' => '%1$s',
 	'Class:ContainerCluster/ComplementaryName' => '',
-	'Class:ContainerCluster' => 'Grappe pour conteneurs',
-	'Class:ContainerCluster+' => 'Plateforme de conteneurisation constituée d\'une grappe d\'Hôtes pour conteneurs',
+	'Class:ContainerCluster' => 'Grappe pour Conteneurs',
+	'Class:ContainerCluster+' => 'Plateforme de Conteneurisation constitué d\'une grappe d\'Hôtes pour Conteneurs',
 	'Class:ContainerCluster/Attribute:redundancy' => 'Configuration de la redondance',
 	'Class:ContainerCluster/Attribute:redundancy/disabled' => 'La grappe est opérationnelle si tous les hôtes qui la composent sont opérationnels',
 	'Class:ContainerCluster/Attribute:redundancy/count' => 'Nombre minimal d\'hôtes pour que la grappe soit opérationnelle : %1$s',
@@ -176,44 +155,3 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContainerImageType' => 'Type d\'image',
 	'Class:ContainerImageType+' => 'Typologie d\'images pour container',
 ]);
-
-//
-// Class Cloud, Server and Virtual Machine
-//
-
-Dict::Add('FR FR', 'French', 'Français', [
-	'Class:Cloud/Attribute:containerhosts_list' => 'Hôtes pour conteneurs',
-	'Class:Cloud/Attribute:containerhosts_list+' => 'Liste des hôtes hébergés dans ce nuage',
-	'Class:Cloud/Attribute:containerhosts_list/UI:Links:Create:Button+' => 'Créer un %4$s',
-	'Class:Cloud/Attribute:containerhosts_list/UI:Links:Create:Modal:Title' => 'Ajouter un %4$s à %2$s',
-	'Class:Cloud/Attribute:containerhosts_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s',
-	'Class:Cloud/Attribute:containerhosts_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s',
-	'Class:Cloud/Attribute:containerhosts_list/UI:Links:Remove:Button+' => 'Retirer ce %4$s',
-	'Class:Cloud/Attribute:containerhosts_list/UI:Links:Remove:Modal:Title' => 'Retirer ce %4$s de son %1$s',
-
-	'Class:Server/Attribute:containerhosts_list' => 'Hôtes pour conteneurs',
-	'Class:Server/Attribute:containerhosts_list+' => 'Liste des hôtes pour conteneurs hébergés sur ce serveur',
-	'Class:Server/Attribute:containerhosts_list/UI:Links:Create:Button+' => 'Créer un %4$s',
-	'Class:Server/Attribute:containerhosts_list/UI:Links:Create:Modal:Title' => 'Ajouter un %4$s à %2$s',
-	'Class:Server/Attribute:containerhosts_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s',
-	'Class:Server/Attribute:containerhosts_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s',
-	'Class:Server/Attribute:containerhosts_list/UI:Links:Remove:Button+' => 'Retirer ce %4$s',
-	'Class:Server/Attribute:containerhosts_list/UI:Links:Remove:Modal:Title' => 'Retirer ce %4$s de son %1$s',
-
-	'Class:VirtualMachine/Attribute:containerhosts_list' => 'Hôtes pour conteneurs',
-	'Class:VirtualMachine/Attribute:containerhosts_list+' => 'Liste des hôtes pour conteneurs hébergés sur cette machine virtuelle',
-	'Class:VirtualMachine/Attribute:containerhosts_list/UI:Links:Create:Button+' => 'Créer un %4$s',
-	'Class:VirtualMachine/Attribute:containerhosts_list/UI:Links:Create:Modal:Title' => 'Ajouter un %4$s à %2$s',
-	'Class:VirtualMachine/Attribute:containerhosts_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s',
-	'Class:VirtualMachine/Attribute:containerhosts_list/UI:Links:Delete:Modal:Title' => 'Supprimer un %4$s',
-	'Class:VirtualMachine/Attribute:containerhosts_list/UI:Links:Remove:Button+' => 'Retirer ce %4$s',
-	'Class:VirtualMachine/Attribute:containerhosts_list/UI:Links:Remove:Modal:Title' => 'Retirer ce %4$s de sa %1$s',
-
-	'Class:Software/Attribute:containerimages_list' => 'Images pour conteneurs',
-	'Class:Software/Attribute:containerimages_list+' => 'Liste des images pour conteneurs qui tournent ce Logiciel',
-	'Class:Software/Attribute:containerimages_list/UI:Links:Create:Modal:Title' => 'Ajouter une %4$s à %2$s',
-	'Class:Software/Attribute:containerimages_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
-	'Class:Software/Attribute:containerimages_list/UI:Links:Delete:Modal:Title' => 'Supprimer une %4$s',
-	'Class:Software/Attribute:containerimages_list/UI:Links:Remove:Button+' => 'Retirer cette %4$s',
-	'Class:Software/Attribute:containerimages_list/UI:Links:Remove:Modal:Title' => 'Retirer cette %4$s de son %1$s',
-]);
--- a/datamodels/2.x/itop-container-mgmt/images/icons8-cloud.svg
+++ b/datamodels/2.x/itop-container-mgmt/images/icons8-cloud.svg
--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -57,77 +57,47 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>60</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="nb_u">
-                      <rank>80</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>90</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>100</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
-                      <rank>110</rank>
-                    </item>
-                    <item id="purchase_date">
-                      <rank>120</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                      <rank>130</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>140</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="nb_u">
+              <rank>80</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>90</rank>
+            </item>
+            <item id="asset_number">
+              <rank>100</rank>
+            </item>
+            <item id="move2production">
+              <rank>110</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>120</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>130</rank>
+            </item>
+            <item id="description">
+              <rank>140</rank>
            </item>
            <item id="contacts_list">
              <rank>150</rank>
@@ -287,80 +257,50 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                    <item id="rack_id">
-                      <rank>60</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>80</rank>
-                    </item>
-                    <item id="nb_u">
-                      <rank>90</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>100</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>110</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
-                      <rank>120</rank>
-                    </item>
-                    <item id="purchase_date">
-                      <rank>130</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                      <rank>140</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>150</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="rack_id">
+              <rank>60</rank>
+            </item>
+            <item id="brand_id">
+              <rank>70</rank>
+            </item>
+            <item id="model_id">
+              <rank>80</rank>
+            </item>
+            <item id="nb_u">
+              <rank>90</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>100</rank>
+            </item>
+            <item id="asset_number">
+              <rank>110</rank>
+            </item>
+            <item id="move2production">
+              <rank>120</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>130</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>140</rank>
+            </item>
+            <item id="description">
+              <rank>150</rank>
            </item>
            <item id="contacts_list">
              <rank>160</rank>
@@ -500,74 +440,44 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>60</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>80</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>90</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
-                      <rank>100</rank>
-                    </item>
-                    <item id="purchase_date">
-                      <rank>110</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                      <rank>120</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>130</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="move2production">
+              <rank>100</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>110</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>120</rank>
+            </item>
+            <item id="description">
+              <rank>130</rank>
            </item>
            <item id="contacts_list">
              <rank>140</rank>
@@ -703,74 +613,44 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>60</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>80</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>90</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
-                      <rank>100</rank>
-                    </item>
-                    <item id="purchase_date">
-                        <rank>110</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                        <rank>120</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>130</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="move2production">
+              <rank>100</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>110</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>120</rank>
+            </item>
+            <item id="description">
+              <rank>130</rank>
            </item>
            <item id="pdus_list">
              <rank>140</rank>
@@ -926,80 +806,50 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                    <item id="rack_id">
-                      <rank>60</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="powerstart_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="brand_id">
-                      <rank>80</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>90</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>100</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>110</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
-                        <rank>120</rank>
-                    </item>
-                    <item id="purchase_date">
-                      <rank>130</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                        <rank>140</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>150</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="rack_id">
+              <rank>60</rank>
+            </item>
+            <item id="powerstart_id">
+              <rank>70</rank>
+            </item>
+            <item id="brand_id">
+              <rank>80</rank>
+            </item>
+            <item id="model_id">
+              <rank>90</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>100</rank>
+            </item>
+            <item id="asset_number">
+              <rank>110</rank>
+            </item>
+            <item id="move2production">
+              <rank>120</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>130</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>140</rank>
+            </item>
+            <item id="description">
+              <rank>150</rank>
            </item>
            <item id="contacts_list">
              <rank>160</rank>
--- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml
+++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-endusers-devices.xml
@@ -193,77 +193,47 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Phone:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>60</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="phonenumber">
-                      <rank>80</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>90</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>100</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
-                      <rank>110</rank>
-                    </item>
-                    <item id="purchase_date">
-                      <rank>120</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                      <rank>130</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>140</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="phonenumber">
+              <rank>80</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>90</rank>
+            </item>
+            <item id="asset_number">
+              <rank>100</rank>
+            </item>
+            <item id="move2production">
+              <rank>110</rank>
+            </item>
+            <item id="purchase_date">
+              <rank>120</rank>
+            </item>
+            <item id="end_of_warranty">
+              <rank>130</rank>
+            </item>
+            <item id="description">
+              <rank>140</rank>
            </item>
            <item id="contacts_list">
              <rank>150</rank>
@@ -404,83 +374,53 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Phone:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>60</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="phonenumber">
-                      <rank>80</rank>
-                    </item>
-                    <item id="imei">
-                      <rank>90</rank>
-                    </item>
-                    <item id="hw_pin">
-                      <rank>100</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>110</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>120</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="phonenumber">
+              <rank>80</rank>
+            </item>
+            <item id="imei">
+              <rank>90</rank>
+            </item>
+            <item id="hw_pin">
+              <rank>100</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>110</rank>
+            </item>
+            <item id="asset_number">
+              <rank>120</rank>
+            </item>
+            <item id="move2production">
              <rank>130</rank>
-                    </item>
-                    <item id="purchase_date">
+            </item>
+            <item id="purchase_date">
              <rank>140</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                      <rank>150</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>160</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="end_of_warranty">
+              <rank>150</rank>
+            </item>
+            <item id="description">
+              <rank>160</rank>
            </item>
            <item id="contacts_list">
              <rank>170</rank>
@@ -613,77 +553,47 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Phone:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>60</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="phonenumber">
-                      <rank>80</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>90</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>100</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="phonenumber">
+              <rank>80</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>90</rank>
+            </item>
+            <item id="asset_number">
+              <rank>100</rank>
+            </item>
+            <item id="move2production">
              <rank>110</rank>
-                    </item>
-                    <item id="purchase_date">
+            </item>
+            <item id="purchase_date">
              <rank>120</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                      <rank>130</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>140</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="end_of_warranty">
+              <rank>130</rank>
+            </item>
+            <item id="description">
+              <rank>140</rank>
            </item>
            <item id="contacts_list">
              <rank>150</rank>
@@ -812,74 +722,44 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>60</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>80</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>90</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="move2production">
              <rank>100</rank>
-                    </item>
-                    <item id="purchase_date">
+            </item>
+            <item id="purchase_date">
              <rank>110</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                      <rank>120</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>130</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="end_of_warranty">
+              <rank>120</rank>
+            </item>
+            <item id="description">
+              <rank>130</rank>
            </item>
            <item id="contacts_list">
              <rank>140</rank>
@@ -1058,8 +938,23 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="softwares_list">
+              <rank>5</rank>
+            </item>
+            <item id="contacts_list">
              <rank>10</rank>
+            </item>
+            <item id="documents_list">
+              <rank>20</rank>
+            </item>
+            <item id="physicalinterface_list">
+              <rank>40</rank>
+            </item>
+            <item id="networkdevice_list">
+              <rank>50</rank>
+            </item>
+            <item id="col:col1">
+              <rank>80</rank>
              <items>
                <item id="fieldset:Server:baseinfo">
                  <rank>10</rank>
@@ -1116,7 +1011,7 @@
              </items>
            </item>
            <item id="col:col2">
-              <rank>20</rank>
+              <rank>90</rank>
              <items>
                <item id="fieldset:Server:Date">
                  <rank>10</rank>
@@ -1142,21 +1037,6 @@
                </item>
              </items>
            </item>
-            <item id="softwares_list">
-              <rank>50</rank>
-            </item>
-            <item id="contacts_list">
-              <rank>80</rank>
-            </item>
-            <item id="documents_list">
-              <rank>90</rank>
-            </item>
-            <item id="physicalinterface_list">
-              <rank>100</rank>
-            </item>
-            <item id="networkdevice_list">
-              <rank>110</rank>
-            </item>
          </items>
        </details>
        <search>
@@ -1279,8 +1159,20 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="contacts_list">
              <rank>10</rank>
+            </item>
+            <item id="documents_list">
+              <rank>20</rank>
+            </item>
+            <item id="physicalinterface_list">
+              <rank>40</rank>
+            </item>
+            <item id="networkdevice_list">
+              <rank>50</rank>
+            </item>
+            <item id="col:col1">
+              <rank>80</rank>
              <items>
                <item id="fieldset:Server:baseinfo">
                  <rank>10</rank>
@@ -1322,7 +1214,7 @@
              </items>
            </item>
            <item id="col:col2">
-              <rank>20</rank>
+              <rank>90</rank>
              <items>
                <item id="fieldset:Server:Date">
                  <rank>10</rank>
@@ -1348,18 +1240,6 @@
                </item>
              </items>
            </item>
-            <item id="contacts_list">
-              <rank>80</rank>
-            </item>
-            <item id="documents_list">
-              <rank>90</rank>
-            </item>
-            <item id="physicalinterface_list">
-              <rank>100</rank>
-            </item>
-            <item id="networkdevice_list">
-              <rank>110</rank>
-            </item>
          </items>
        </details>
        <search>
@@ -1479,74 +1359,44 @@
      <presentation>
        <details>
          <items>
-            <item id="col:col1">
+            <item id="name">
              <rank>10</rank>
-              <items>
-                <item id="fieldset:Server:baseinfo">
-                  <rank>10</rank>
-                  <items>
-                    <item id="name">
-                      <rank>10</rank>
-                    </item>
-                    <item id="org_id">
-                      <rank>20</rank>
-                    </item>
-                    <item id="status">
-                      <rank>30</rank>
-                    </item>
-                    <item id="business_criticity">
-                      <rank>40</rank>
-                    </item>
-                    <item id="location_id">
-                      <rank>50</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:moreinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="brand_id">
-                      <rank>60</rank>
-                    </item>
-                    <item id="model_id">
-                      <rank>70</rank>
-                    </item>
-                    <item id="serialnumber">
-                      <rank>80</rank>
-                    </item>
-                    <item id="asset_number">
-                      <rank>90</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
            </item>
-            <item id="col:col2">
+            <item id="org_id">
              <rank>20</rank>
-              <items>
-                <item id="fieldset:Server:Date">
-                  <rank>10</rank>
-                  <items>
-                    <item id="move2production">
+            </item>
+            <item id="status">
+              <rank>30</rank>
+            </item>
+            <item id="business_criticity">
+              <rank>40</rank>
+            </item>
+            <item id="location_id">
+              <rank>50</rank>
+            </item>
+            <item id="brand_id">
+              <rank>60</rank>
+            </item>
+            <item id="model_id">
+              <rank>70</rank>
+            </item>
+            <item id="serialnumber">
+              <rank>80</rank>
+            </item>
+            <item id="asset_number">
+              <rank>90</rank>
+            </item>
+            <item id="move2production">
              <rank>100</rank>
-                    </item>
-                    <item id="purchase_date">
+            </item>
+            <item id="purchase_date">
              <rank>110</rank>
-                    </item>
-                    <item id="end_of_warranty">
-                      <rank>120</rank>
-                    </item>
-                  </items>
-                </item>
-                <item id="fieldset:Server:otherinfo">
-                  <rank>20</rank>
-                  <items>
-                    <item id="description">
-                      <rank>130</rank>
-                    </item>
-                  </items>
-                </item>
-              </items>
+            </item>
+            <item id="end_of_warranty">
+              <rank>120</rank>
+            </item>
+            <item id="description">
+              <rank>130</rank>
            </item>
            <item id="contacts_list">
              <rank>140</rank>
--- a/datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/en.dict.itop-faq-light.php
@@ -77,7 +77,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:FAQCategory' => 'FAQ Category',
-	'Class:FAQCategory+' => 'Typology for Frequently Asked Questions (FAQ)',
+	'Class:FAQCategory+' => 'Category for FAQ',
 	'Class:FAQCategory/Attribute:name' => 'Name',
 	'Class:FAQCategory/Attribute:name+' => '',
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
--- a/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/fr.dict.itop-faq-light.php
@@ -36,7 +36,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:FAQCategory' => 'Catégorie de FAQ',
-	'Class:FAQCategory+' => 'Typologie. Segmentation des Questions fréquement posées (FAQ)',
+	'Class:FAQCategory+' => 'Catégorie de FAQ',
 	'Class:FAQCategory/Attribute:name' => 'Nom',
 	'Class:FAQCategory/Attribute:name+' => '',
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
--- a/datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/sk.dict.itop-faq-light.php
@@ -36,7 +36,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:FAQCategory' => 'FAQ Category~~',
-	'Class:FAQCategory+' => 'Typology for Frequently Asked Questions (FAQ)~~',
+	'Class:FAQCategory+' => 'Category for FAQ~~',
 	'Class:FAQCategory/Attribute:name' => 'Name~~',
 	'Class:FAQCategory/Attribute:name+' => '~~',
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs~~',
--- a/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
+++ b/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml
@@ -64,7 +64,7 @@
        <class id="ServiceSubcategory">
          <scopes>
            <scope id="all">
-              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status = 'production']]></oql_view>
+              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete']]></oql_view>
            </scope>
          </scopes>
        </class>
--- a/datamodels/2.x/itop-hub-connector/ajax.php
+++ b/datamodels/2.x/itop-hub-connector/ajax.php
@@ -242,8 +242,8 @@ try {
 				throw new SecurityException(Dict::S('iTopHub:FailAuthent'));
 			}
 			// First step: prepare the datamodel, if it fails, roll-back
-			$aSelectedExtensionCodes = utils::ReadParam('extension_codes', [], false, utils::ENUM_SANITIZATION_FILTER_MODULE_CODE);
-			$aSelectedExtensionDirs = utils::ReadParam('extension_dirs', [], false, utils::ENUM_SANITIZATION_FILTER_MODULE_CODE);
+			$aSelectedExtensionCodes = utils::ReadParam('extension_codes', []);
+			$aSelectedExtensionDirs = utils::ReadParam('extension_dirs', []);

 			$oRuntimeEnv = new HubRunTimeEnvironment('production', false); // use a temp environment: production-build
 			$oRuntimeEnv->MoveSelectedExtensions(APPROOT.'/data/downloaded-extensions/', $aSelectedExtensionDirs);
--- a/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
@@ -37,10 +37,6 @@ SetupWebPage::AddModule(
 			// add your sample data XML files here,
 		],

-		'delegated_authentication_endpoints' => [
-			'ajax.php',
-		],
-
 		// Documentation
 		//
 		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
--- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
+++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml
@@ -698,29 +698,6 @@
                  </action>
                </actions>
              </transition>
-              <transition id="ev_autoresolve">
-                <target>resolved</target>
-                <actions>
-                  <action>
-                    <verb>SetCurrentDate</verb>
-                    <params>
-                      <param xsi:type="attcode">resolution_date</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>SetElapsedTime</verb>
-                    <params>
-                      <param xsi:type="attcode">time_spent</param>
-                      <param xsi:type="attcode">start_date</param>
-                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>ResolveChildTickets</verb>
-                    <params/>
-                  </action>
-                </actions>
-              </transition>
            </transitions>
          </state>
          <state id="assigned">
@@ -1052,6 +1029,29 @@
                <actions>
 								</actions>
              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
            </transitions>
          </state>
          <state id="closed">
@@ -1862,7 +1862,7 @@
        <class id="ServiceSubcategory">
          <scopes>
            <scope id="all">
-              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status = 'production' AND request_type = 'incident']]></oql_view>
+              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete' AND request_type = 'incident']]></oql_view>
            </scope>
          </scopes>
        </class>
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/en.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/en.dict.itop-incident-mgmt-itil.php
@@ -62,7 +62,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Incident' => 'Incident',
-	'Class:Incident+' => 'Ticket type for managing malfunctions of a service or configuration elements',
+	'Class:Incident+' => '',
 	'Class:Incident/Attribute:status' => 'Status',
 	'Class:Incident/Attribute:status+' => '',
 	'Class:Incident/Attribute:status/Value:new' => 'New',
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/fr.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/fr.dict.itop-incident-mgmt-itil.php
@@ -21,11 +21,11 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Menu:SearchIncidents+' => 'Rechercher parmi les tickets d\'incidents',
 	'Menu:Incident:Shortcuts' => 'Raccourcis',
 	'Menu:Incident:Shortcuts+' => '',
-	'Menu:Incident:MyIncidents' => 'Mes incidents',
+	'Menu:Incident:MyIncidents' => 'Incident qui me sont assignés',
 	'Menu:Incident:MyIncidents+' => 'Tickets d\'incident qui me sont assignés',
-	'Menu:Incident:EscalatedIncidents' => 'Incidents en cours d\'escalade',
+	'Menu:Incident:EscalatedIncidents' => 'Incidents en escalade',
 	'Menu:Incident:EscalatedIncidents+' => 'Ticket d\'incident en cours d\'escalade',
-	'Menu:Incident:OpenIncidents' => 'Incidents ouverts',
+	'Menu:Incident:OpenIncidents' => 'Incidents en cours',
 	'Menu:Incident:OpenIncidents+' => 'Tous les tickets d\'incident ouverts',
 	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => 'Incidents des 14 derniers jours par priorité',
 	'UI-IncidentManagementOverview-Last-14-days' => 'Incidents des 14 derniers jours',
@@ -50,7 +50,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Incident' => 'Incident',
-	'Class:Incident+' => 'Type de Ticket pour gérer les dysfonctionnements d\'un service ou d\'éléments de configuration',
+	'Class:Incident+' => '',
 	'Class:Incident/Attribute:status' => 'Etat',
 	'Class:Incident/Attribute:status+' => '',
 	'Class:Incident/Attribute:status/Value:new' => 'Nouveau',
@@ -115,9 +115,9 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Incident/Attribute:service_id+' => '',
 	'Class:Incident/Attribute:service_name' => 'Nom du service',
 	'Class:Incident/Attribute:service_name+' => '',
-	'Class:Incident/Attribute:servicesubcategory_id' => 'Sous-catégorie de service',
+	'Class:Incident/Attribute:servicesubcategory_id' => 'Sous catégorie de service',
 	'Class:Incident/Attribute:servicesubcategory_id+' => '',
-	'Class:Incident/Attribute:servicesubcategory_name' => 'Nom Sous-catégorie de service',
+	'Class:Incident/Attribute:servicesubcategory_name' => 'Nom Sous catégorie de service',
 	'Class:Incident/Attribute:servicesubcategory_name+' => '',
 	'Class:Incident/Attribute:escalation_flag' => 'Ticket à surveiller',
 	'Class:Incident/Attribute:escalation_flag+' => '',
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/en.dict.itop-knownerror-mgmt.php
@@ -53,7 +53,7 @@

 Dict::Add('EN US', 'English', 'English', [
 	'Class:KnownError' => 'Known Error',
-	'Class:KnownError+' => 'Error with multiple occurrences, documented during a Problem management, to ease troubleshooting.',
+	'Class:KnownError+' => 'Error documented for a known issue',
 	'Class:KnownError/Attribute:name' => 'Name',
 	'Class:KnownError/Attribute:name+' => 'This is expected to be a unique identifier within the Known Errors of this organization',
 	'Class:KnownError/Attribute:org_id' => 'Organization',
@@ -101,7 +101,7 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:lnkErrorToFunctionalCI' => 'Link KnownError / FunctionalCI',
+	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI',
 	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error',
 	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
@@ -121,8 +121,8 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:lnkDocumentToError' => 'Link Document / Known Error',
-	'Class:lnkDocumentToError+' => 'Used when a Document is pertinent for a Known Error',
+	'Class:lnkDocumentToError' => 'Link Documents / Errors',
+	'Class:lnkDocumentToError+' => 'A link between a document and a known error',
 	'Class:lnkDocumentToError/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/fr.dict.itop-knownerror-mgmt.php
@@ -11,8 +11,8 @@
 *
 */
 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:KnownError' => 'Erreur connue',
-	'Class:KnownError+' => 'Erreur aux multiples occurrences, documentée suite à un Problème, pour faciliter le support.',
+	'Class:KnownError' => 'Erreur Connue',
+	'Class:KnownError+' => 'Erreur documenté pour un problème connu',
 	'Class:KnownError/Attribute:name' => 'Nom',
 	'Class:KnownError/Attribute:name+' => 'Ce nom devrait être unique parmi les erreurs connues de cette organisation',
 	'Class:KnownError/Attribute:org_id' => 'Organisation',
@@ -60,7 +60,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkErrorToFunctionalCI' => 'Lien Erreur connue / CI fonctionnel',
+	'Class:lnkErrorToFunctionalCI' => 'Lien Erreur / CI',
 	'Class:lnkErrorToFunctionalCI+' => 'Lien entre une erreur et un ci',
 	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
@@ -80,8 +80,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkDocumentToError' => 'Lien Document / Erreur connue',
-	'Class:lnkDocumentToError+' => 'Lien utilisé lorsqu\'un Document est applicable à une Erreur connue',
+	'Class:lnkDocumentToError' => 'Lien Documents / Errors',
+	'Class:lnkDocumentToError+' => 'Lien entre un document et une erreur',
 	'Class:lnkDocumentToError/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Document',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '',
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/sk.dict.itop-knownerror-mgmt.php
@@ -12,7 +12,7 @@
 */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:KnownError' => 'Known Error~~',
-	'Class:KnownError+' => 'Error with multiple occurrences, documented during a Problem management, to ease troubleshooting.~~',
+	'Class:KnownError+' => 'Error documented for a known issue~~',
 	'Class:KnownError/Attribute:name' => 'Name~~',
 	'Class:KnownError/Attribute:name+' => 'This is expected to be a unique identifier within the Known Errors of this organization~~',
 	'Class:KnownError/Attribute:org_id' => 'Organization~~',
@@ -60,7 +60,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 //

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
-	'Class:lnkErrorToFunctionalCI' => 'Link KnownError / FunctionalCI~~',
+	'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
 	'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
 	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
@@ -80,8 +80,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 //

 Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
-	'Class:lnkDocumentToError' => 'Link Document / Known Error~~',
-	'Class:lnkDocumentToError+' => 'Used when a Document is pertinent for a Known Error~~',
+	'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
+	'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
 	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
 	'Class:lnkDocumentToError/Attribute:document_id+' => '~~',
--- a/datamodels/2.x/itop-oauth-client/dictionaries/fr.dict.itop-oauth-client.php
+++ b/datamodels/2.x/itop-oauth-client/dictionaries/fr.dict.itop-oauth-client.php
@@ -35,7 +35,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:OAuthClient' => 'Client OAuth pour l\'accès mail',
+	'Class:OAuthClient' => 'Client OAuth pour l\'Accès Mail',
 	'Class:OAuthClient/Attribute:provider' => 'Fournisseur',
 	'Class:OAuthClient/Attribute:provider+' => '',
 	'Class:OAuthClient/Attribute:name' => 'Login',
--- a/datamodels/2.x/itop-portal-base/portal/src/Helper/BrowseBrickHelper.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/BrowseBrickHelper.php
@@ -317,7 +317,7 @@ class BrowseBrickHelper
 			$aRow[$key] = [
 				'level_alias' => $key,
 				'id' => $sCurrentObjectId,
-				'name' => $value->Get($sNameAttCode),
+				'name' => utils::EscapeHtml($value->Get($sNameAttCode)),
 				'class' => $sCurrentObjectClass,
 				'action_rules_token' => $this->PrepareActionRulesForItems($aItems, $key, $aLevelsProperties),
 				'metadata' => [
@@ -476,7 +476,7 @@ class BrowseBrickHelper
 			$aItems[$sCurrentIndex] = [
 				'level_alias' => $aCurrentRowKeys[0],
 				'id' => $aCurrentRowValues[0]->GetKey(),
-				'name' => $aCurrentRowValues[0]->Get($aLevelsProperties[$aCurrentRowKeys[0]]['name_att']),
+				'name' => utils::EscapeHtml($aCurrentRowValues[0]->Get($aLevelsProperties[$aCurrentRowKeys[0]]['name_att'])),
 				'class' => get_class($aCurrentRowValues[0]),
 				'subitems' => [],
 				'filter_data' => $this->GetFilterData($aLevelsProperties[$aCurrentRowKeys[0]], $aCurrentRowKeys[0], $aCurrentRowValues[0]),
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_list.html.twig
@@ -83,11 +83,11 @@
                            // N°4662 - Surround tooltip with div to ensure text retrival
 							if( (data.tooltip !== undefined) && ($('<div>'+data.tooltip+'</div>').text() !== ''))
 							{
-								cellElem.html( $('<span></span>').attr('data-tooltip-content', data.tooltip).attr('data-tooltip-html-enabled', true).text(data.name).prop('outerHTML') );
+								cellElem.html( $('<span></span>').attr('data-tooltip-content', data.tooltip).attr('data-tooltip-html-enabled', true).html(data.name).prop('outerHTML') );
 							}
 							else
 							{
-								cellElem.text(data.name);
+								cellElem.html(data.name);
 							}

 							// Building actions
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig
@@ -206,7 +206,7 @@
                if( (item.name !== undefined) && (item.name !== '') )
                {
                    iItemFlags += 1;
-					textWrapperElem.append( $('<div></div>').addClass('mosaic-item-name').text(item.name) );
+					textWrapperElem.append( $('<div></div>').addClass('mosaic-item-name').html(item.name) );
                }
                // - Adding description
                if( (item.description !== undefined) && (item.description !== '') )
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_tree.html.twig
@@ -238,9 +238,7 @@
 				{
 					case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_DRILLDOWN') }}':
                        spanElem.addClass('tree-toggle');
-                        var drilldownIconElem = $('<span></span>').addClass('glyphicon '+sNodeCollapsedClass).attr('aria-hidden', 'true');
-                        var drilldownTextElem = $('<span></span>').addClass('list-group-item-text').text(nameElem.text());
-                        nameElem.empty().append(drilldownIconElem).append(drilldownTextElem);
+                        nameElem.html('<span class="glyphicon '+sNodeCollapsedClass+'" aria-hidden="true"></span><span class="list-group-item-text">'+item.name+'</span>');
                        break;
 					case '{{ constant('Combodo\\iTop\\Portal\\Brick\\BrowseBrick::ENUM_ACTION_VIEW') }}':
 						url = '{{ app.url_generator.generate('p_object_view', {'sObjectClass': '-objectClass-', 'sObjectId': '-objectId-'})|raw }}'.replace(/-objectClass-/, item.class).replace(/-objectId-/, item.id);
@@ -282,7 +280,7 @@
                {
                    nameElem.append($('<span class="list-group-item-description">'+item.description+'</span>'));
                }
-
+				
 				if(levelActionsKeys.length > 1)
 				{
 					// Retrieving secondary action (Now we also display primary action)
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/en.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/en.dict.itop-problem-mgmt.php
@@ -77,7 +77,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Problem' => 'Problem',
-	'Class:Problem+' => 'An incident becomes a Problem when it is not resolved in a timely manner or when it recurs frequently',
+	'Class:Problem+' => '',
 	'Class:Problem/Attribute:status' => 'Status',
 	'Class:Problem/Attribute:status+' => '',
 	'Class:Problem/Attribute:status/Value:new' => 'New',
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/fr.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/fr.dict.itop-problem-mgmt.php
@@ -40,7 +40,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Problem' => 'Problème',
-	'Class:Problem+' => 'Un incident devient un problème lorsqu\'il n\'est pas résolu dans un délai raisonnable ou lorsqu\'il se répète fréquemment.',
+	'Class:Problem+' => '',
 	'Class:Problem/Attribute:status' => 'Etat',
 	'Class:Problem/Attribute:status+' => '',
 	'Class:Problem/Attribute:status/Value:new' => 'Nouveau',
@@ -55,9 +55,9 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Problem/Attribute:service_id+' => '',
 	'Class:Problem/Attribute:service_name' => 'Nom du service',
 	'Class:Problem/Attribute:service_name+' => '',
-	'Class:Problem/Attribute:servicesubcategory_id' => 'Sous-catégorie de service',
+	'Class:Problem/Attribute:servicesubcategory_id' => 'Sous catégorie de service',
 	'Class:Problem/Attribute:servicesubcategory_id+' => '',
-	'Class:Problem/Attribute:servicesubcategory_name' => 'Nom sous-catégorie de service',
+	'Class:Problem/Attribute:servicesubcategory_name' => 'Nom sous catégorie de service',
 	'Class:Problem/Attribute:servicesubcategory_name+' => '',
 	'Class:Problem/Attribute:product' => 'Produit',
 	'Class:Problem/Attribute:product+' => '',
--- a/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml
+++ b/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml
@@ -30,8 +30,6 @@
          <class id="TagSetFieldData"/>
          <class id="Tape"/>
          <class id="VLAN"/>
-          <class id="DataFlow"/>
-          <class id="ContainerImage"/>
        </classes>
      </group>
      <group id="Incident" _delta="define">
--- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
+++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml
@@ -764,29 +764,6 @@
                  </action>
                </actions>
              </transition>
-              <transition id="ev_autoresolve">
-                <target>resolved</target>
-                <actions>
-                  <action>
-                    <verb>SetCurrentDate</verb>
-                    <params>
-                      <param xsi:type="attcode">resolution_date</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>SetElapsedTime</verb>
-                    <params>
-                      <param xsi:type="attcode">time_spent</param>
-                      <param xsi:type="attcode">start_date</param>
-                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>ResolveChildTickets</verb>
-                    <params/>
-                  </action>
-                </actions>
-              </transition>
            </transitions>
          </state>
          <state id="assigned">
@@ -987,29 +964,6 @@
                <target>rejected</target>
                <actions/>
              </transition>
-              <transition id="ev_autoresolve">
-                <target>resolved</target>
-                <actions>
-                  <action>
-                    <verb>SetCurrentDate</verb>
-                    <params>
-                      <param xsi:type="attcode">resolution_date</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>SetElapsedTime</verb>
-                    <params>
-                      <param xsi:type="attcode">time_spent</param>
-                      <param xsi:type="attcode">start_date</param>
-                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>ResolveChildTickets</verb>
-                    <params/>
-                  </action>
-                </actions>
-              </transition>
            </transitions>
          </state>
          <state id="approved">
@@ -1219,6 +1173,29 @@
                <actions>
 								</actions>
              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
            </transitions>
          </state>
          <state id="closed">
@@ -2045,7 +2022,7 @@
        <class id="ServiceSubcategory">
          <scopes>
            <scope id="all">
-              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status = 'production' AND request_type = 'service_request']]></oql_view>
+              <oql_view _delta="redefine"><![CDATA[SELECT ServiceSubcategory WHERE status != 'obsolete' AND request_type = 'service_request']]></oql_view>
            </scope>
          </scopes>
        </class>
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/en.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/en.dict.itop-request-mgmt-itil.php
@@ -55,7 +55,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:UserRequest' => 'User Request',
-	'Class:UserRequest+' => 'Ticket type to handle only service requests and not Incidents.',
+	'Class:UserRequest+' => '',
 	'Class:UserRequest/Attribute:status' => 'Status',
 	'Class:UserRequest/Attribute:status+' => '',
 	'Class:UserRequest/Attribute:status/Value:new' => 'New',
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/fr.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/fr.dict.itop-request-mgmt-itil.php
@@ -59,8 +59,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:UserRequest' => 'Demande utilisateur',
-	'Class:UserRequest+' => 'Type de Ticket pour gérer uniquement les requêtes de type demande de service et pas les Incidents.',
+	'Class:UserRequest' => 'Demande Utilisateur',
+	'Class:UserRequest+' => '',
 	'Class:UserRequest/Attribute:status' => 'Etat',
 	'Class:UserRequest/Attribute:status+' => '',
 	'Class:UserRequest/Attribute:status/Value:new' => 'Nouveau',
@@ -137,9 +137,9 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:UserRequest/Attribute:service_id+' => '',
 	'Class:UserRequest/Attribute:service_name' => 'Nom du service',
 	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Sous-catégorie de service',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Sous catégorie de service',
 	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Nom Sous-catégorie de service',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Nom Sous catégorie de service',
 	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
 	'Class:UserRequest/Attribute:escalation_flag' => 'Ticket à surveiller',
 	'Class:UserRequest/Attribute:escalation_flag+' => '',
--- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
+++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml
@@ -767,29 +767,6 @@
                  </action>
                </actions>
              </transition>
-              <transition id="ev_autoresolve">
-                <target>resolved</target>
-                <actions>
-                  <action>
-                    <verb>SetCurrentDate</verb>
-                    <params>
-                      <param xsi:type="attcode">resolution_date</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>SetElapsedTime</verb>
-                    <params>
-                      <param xsi:type="attcode">time_spent</param>
-                      <param xsi:type="attcode">start_date</param>
-                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>ResolveChildTickets</verb>
-                    <params/>
-                  </action>
-                </actions>
-              </transition>
            </transitions>
          </state>
          <state id="assigned">
@@ -993,29 +970,6 @@
                <target>rejected</target>
                <actions/>
              </transition>
-              <transition id="ev_autoresolve">
-                <target>resolved</target>
-                <actions>
-                  <action>
-                    <verb>SetCurrentDate</verb>
-                    <params>
-                      <param xsi:type="attcode">resolution_date</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>SetElapsedTime</verb>
-                    <params>
-                      <param xsi:type="attcode">time_spent</param>
-                      <param xsi:type="attcode">start_date</param>
-                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
-                    </params>
-                  </action>
-                  <action>
-                    <verb>ResolveChildTickets</verb>
-                    <params/>
-                  </action>
-                </actions>
-              </transition>
            </transitions>
          </state>
          <state id="approved">
@@ -1041,6 +995,29 @@
                  </action>
                </actions>
              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
            </transitions>
          </state>
          <state id="rejected">
@@ -1205,6 +1182,29 @@
                <actions>
                                </actions>
              </transition>
+              <transition id="ev_autoresolve">
+                <target>resolved</target>
+                <actions>
+                  <action>
+                    <verb>SetCurrentDate</verb>
+                    <params>
+                      <param xsi:type="attcode">resolution_date</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>SetElapsedTime</verb>
+                    <params>
+                      <param xsi:type="attcode">time_spent</param>
+                      <param xsi:type="attcode">start_date</param>
+                      <param xsi:type="string">DefaultWorkingTimeComputer</param>
+                    </params>
+                  </action>
+                  <action>
+                    <verb>ResolveChildTickets</verb>
+                    <params/>
+                  </action>
+                </actions>
+              </transition>
            </transitions>
          </state>
          <state id="closed">
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/en.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/en.dict.itop-request-mgmt.php
@@ -59,7 +59,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:UserRequest' => 'User Request',
-	'Class:UserRequest+' => 'Ticket type that covers incidents and service requests.',
+	'Class:UserRequest+' => '',
 	'Class:UserRequest/Attribute:status' => 'Status',
 	'Class:UserRequest/Attribute:status+' => '',
 	'Class:UserRequest/Attribute:status/Value:new' => 'New',
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/fr.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/fr.dict.itop-request-mgmt.php
@@ -63,8 +63,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:UserRequest' => 'Demande utilisateur',
-	'Class:UserRequest+' => 'Type de Ticket qui couvre les incidents et les demandes de service.',
+	'Class:UserRequest' => 'Demande Utilisateur',
+	'Class:UserRequest+' => '',
 	'Class:UserRequest/Attribute:status' => 'Etat',
 	'Class:UserRequest/Attribute:status+' => '',
 	'Class:UserRequest/Attribute:status/Value:new' => 'Nouveau',
@@ -143,9 +143,9 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:UserRequest/Attribute:service_id+' => '',
 	'Class:UserRequest/Attribute:service_name' => 'Nom du service',
 	'Class:UserRequest/Attribute:service_name+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Sous-catégorie de service',
+	'Class:UserRequest/Attribute:servicesubcategory_id' => 'Sous catégorie de service',
 	'Class:UserRequest/Attribute:servicesubcategory_id+' => '',
-	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Nom Sous-catégorie de service',
+	'Class:UserRequest/Attribute:servicesubcategory_name' => 'Nom Sous catégorie de service',
 	'Class:UserRequest/Attribute:servicesubcategory_name+' => '',
 	'Class:UserRequest/Attribute:escalation_flag' => 'Ticket à surveiller',
 	'Class:UserRequest/Attribute:escalation_flag+' => '',
--- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
+++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml
@@ -1234,8 +1234,8 @@ public function PrefillSearchForm(&$aContextParam)
            </value>
          </values>
          <sql>status</sql>
-          <default_value>implementation</default_value>
-          <is_null_allowed>false</is_null_allowed>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
          <display_style>list</display_style>
        </field>
        <field id="icon" xsi:type="AttributeImage">
@@ -1653,8 +1653,8 @@ public function PrefillSearchForm(&$aContextParam)
            </value>
          </values>
          <sql>status</sql>
-          <default_value>implementation</default_value>
-          <is_null_allowed>false</is_null_allowed>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
          <display_style>list</display_style>
        </field>
      </fields>
@@ -1980,22 +1980,6 @@ public function PrefillSearchForm(&$aContextParam)
            </item>
          </items>
        </details>
-        <default_search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-            <item id="priority">
-              <rank>20</rank>
-            </item>
-            <item id="request_type">
-              <rank>30</rank>
-            </item>
-            <item id="metric">
-              <rank>40</rank>
-            </item>
-          </items>
-        </default_search>
        <search>
          <items>
            <item id="name">
@@ -2775,196 +2759,49 @@ public function PrefillSearchForm(&$aContextParam)
    </menu>
    <menu id="CustomerContract" xsi:type="OQLMenuNode" _delta="define">
      <rank>1</rank>
-      <parent>Service:Overview</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT CustomerContract</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="ProviderContract" xsi:type="OQLMenuNode" _delta="define">
      <rank>2</rank>
-      <parent>Service:Overview</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT ProviderContract</oql>
      <do_search>1</do_search>
    </menu>
-    <menu id="ServiceCatalog" xsi:type="DashboardMenuNode" _delta="define">
-      <rank>10</rank>
-      <parent>ServiceManagement</parent>
-      <definition>
-        <layout>DashboardLayoutTwoCols</layout>
-        <title>UI-ServiceCatalogMenu-Title</title>
-        <auto_reload>
-          <enabled>false</enabled>
-          <interval>300</interval>
-        </auto_reload>
-        <cells>
-          <cell id="0">
-            <rank>0</rank>
-            <dashlets>
-              <dashlet id="CatalogBadgesHeader" xsi:type="DashletHeaderStatic">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-Title</title>
-                <icon></icon>
-              </dashlet>
-              <dashlet id="ServiceFamily" xsi:type="DashletBadge">
-                <rank>1</rank>
-                <class>ServiceFamily</class>
-              </dashlet>
-              <dashlet id="Service" xsi:type="DashletBadge">
-                <rank>2</rank>
-                <class>Service</class>
-              </dashlet>
-              <dashlet id="ServiceSubcategory" xsi:type="DashletBadge">
-                <rank>3</rank>
-                <class>ServiceSubcategory</class>
-              </dashlet>
-              <dashlet id="SLA" xsi:type="DashletBadge">
-                <rank>4</rank>
-                <class>SLA</class>
-              </dashlet>
-              <dashlet id="SLT" xsi:type="DashletBadge">
-                <rank>5</rank>
-                <class>SLT</class>
-              </dashlet>
-              <dashlet id="DeliveryModel" xsi:type="DashletObjectList">
-                <rank>6</rank>
-                <title>Class:DeliveryModel</title>
-                <query>SELECT DeliveryModel</query>
-                <menu>true</menu>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="1">
-            <rank>1</rank>
-            <dashlets>
-              <dashlet id="NotInPortalHeader" xsi:type="DashletHeaderStatic">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-NotInPortal</title>
-                <icon></icon>
-              </dashlet>
-              <dashlet id="ServiceByStatus" xsi:type="DashletHeaderDynamic">
-                <rank>1</rank>
-                <title>Class:Service</title>
-                <icon>../images/icons/icons8-service.svg</icon>
-                <subtitle>UI-ServiceCatalogMenu-OnlyProductionInPortal</subtitle>
-                <query>SELECT Service</query>
-                <group_by>status</group_by>
-                <values>implementation,obsolete,production</values>
-              </dashlet>
-              <dashlet id="ServiceSubcategoryByStatus" xsi:type="DashletHeaderDynamic">
-                <rank>2</rank>
-                <title>Class:ServiceSubcategory</title>
-                <icon>../images/icons/icons8-services.svg</icon>
-                <subtitle>UI-ServiceCatalogMenu-OnlyProductionInPortal</subtitle>
-                <query>SELECT ServiceSubcategory</query>
-                <group_by>status</group_by>
-                <values>implementation,obsolete,production</values>
-              </dashlet>
-              <dashlet id="ServiceWithoutFamily" xsi:type="DashletObjectList">
-                <rank>3</rank>
-                <title>UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal</title>
-                <query>SELECT Service WHERE servicefamily_id=0</query>
-                <menu>false</menu>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="2">
-            <rank>2</rank>
-            <dashlets>
-              <dashlet id="SLTBySLA" xsi:type="DashletGroupByTable">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-SLTBySLA</title>
-                <query>SELECT lnkSLAToSLT</query>
-                <group_by>sla_id</group_by>
-                <style>table</style>
-                <aggregation_function>count</aggregation_function>
-                <aggregation_attribute></aggregation_attribute>
-                <limit></limit>
-                <order_by>attribute</order_by>
-                <order_direction>desc</order_direction>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="3">
-            <rank>3</rank>
-            <dashlets>
-              <dashlet id="ContractByService" xsi:type="DashletGroupByTable">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-ContractByService</title>
-                <query>SELECT lnkCustomerContractToService AS lnk JOIN CustomerContract AS cc ON lnk.customercontract_id=cc.id WHERE cc.status != 'obsolete'</query>
-                <group_by>service_id</group_by>
-                <style>table</style>
-                <aggregation_function>count</aggregation_function>
-                <aggregation_attribute></aggregation_attribute>
-                <limit></limit>
-                <order_by>attribute</order_by>
-                <order_direction>desc</order_direction>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="4">
-            <rank>4</rank>
-            <dashlets>
-              <dashlet id="ContractBySLA" xsi:type="DashletGroupByTable">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-ContractBySLA</title>
-                <query>SELECT lnkCustomerContractToService AS lnk JOIN CustomerContract AS cc ON lnk.customercontract_id=cc.id WHERE cc.status != 'obsolete'</query>
-                <group_by>sla_id</group_by>
-                <style>table</style>
-                <aggregation_function>count</aggregation_function>
-                <aggregation_attribute></aggregation_attribute>
-                <limit></limit>
-                <order_by>attribute</order_by>
-                <order_direction>desc</order_direction>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="5">
-            <rank>5</rank>
-            <dashlets>
-              <dashlet id="UnusedService" xsi:type="DashletObjectList">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-UnusedService</title>
-                <query>SELECT Service WHERE status='production' AND id NOT IN (SELECT Service AS s JOIN lnkCustomerContractToService AS lnk ON lnk.service_id= s.id JOIN CustomerContract AS cc ON lnk.customercontract_id = cc.id WHERE cc.status != 'obsolete')
-                </query>
-                <menu>false</menu>
-              </dashlet>
-            </dashlets>
-          </cell>
-        </cells>
-      </definition>
-    </menu>
    <menu id="ServiceFamily" xsi:type="OQLMenuNode" _delta="define">
      <rank>2.5</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT ServiceFamily</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="Service" xsi:type="OQLMenuNode" _delta="define">
      <rank>3</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT Service</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="ServiceSubcategory" xsi:type="OQLMenuNode" _delta="define">
      <rank>4</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT ServiceSubcategory</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="SLA" xsi:type="OQLMenuNode" _delta="define">
      <rank>5</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT SLA</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="SLT" xsi:type="OQLMenuNode" _delta="define">
      <rank>6</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT SLT</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="DeliveryModel" xsi:type="OQLMenuNode" _delta="define">
      <rank>7</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT DeliveryModel</oql>
      <do_search>1</do_search>
    </menu>
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/cs.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/cs.dict.itop-service-mgmt-provider.php
@@ -28,6 +28,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Menu:ServiceSubcategory+' => 'Podkategorie služeb',
 	'Menu:Service' => 'Služby',
 	'Menu:Service+' => 'Služby',
+	'Menu:ServiceElement' => 'Prvky služby',
+	'Menu:ServiceElement+' => 'Prvky služby',
 	'Menu:SLA' => 'SLA - dohody o úrovních služeb',
 	'Menu:SLA+' => 'Dohody o úrovních služeb',
 	'Menu:SLT' => 'SLT - cíle úrovní služeb',
@@ -36,22 +38,20 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Menu:DeliveryModel+' => 'Modely poskytování služeb',
 	'Menu:ServiceFamily' => 'Balíčky (kategorie) služeb',
 	'Menu:ServiceFamily+' => 'Balíčky (kategorie) služeb',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Contract:baseinfo' => 'Obecné informace',
 	'Contract:moreinfo' => 'Smluvní informace',
 	'Contract:cost' => 'Informace o nákladech',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -251,7 +251,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:Service/Attribute:contacts_list' => 'Kontakty',
 	'Class:Service/Attribute:contacts_list+' => 'Všechny kontakty pro tuto službu',
 	'Class:Service/Attribute:status' => 'Stav',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'implementace',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'zastaralá',
@@ -327,7 +327,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'v produkci',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Typ požadavku',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'požadavek na službu',
@@ -447,8 +447,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Název SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -551,3 +549,12 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('CS CZ', 'Czech', 'Čeština', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/da.dict.itop-service-mgmt-provider.php
@@ -20,37 +20,37 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Kontrakter efter Status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Kontrakter som udløber om mindre end 30 dage',
 	'Menu:ProviderContract' => 'Leverandørkontrakter',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Kundekontrakter',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => '',
 	'Menu:ServiceSubcategory' => 'Ydelses underkategori',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => '',
 	'Menu:Service' => 'Ydelser',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => '',
+	'Menu:ServiceElement' => 'Ydelses elementer',
+	'Menu:ServiceElement+' => '',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => '',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => '',
 	'Menu:DeliveryModel' => 'Leveringsmodel',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => '',
 	'Menu:ServiceFamily' => 'Ydelses familie(r)',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => '',
 	'Contract:baseinfo' => 'General information~~',
 	'Contract:moreinfo' => 'Contractual information~~',
 	'Contract:cost' => 'Cost information~~',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -250,7 +250,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:Service/Attribute:contacts_list' => 'Kontakt',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implementering',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Forældet',
@@ -326,7 +326,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produktion',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Anmodnings type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Service Anmodning',
@@ -446,8 +446,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA-Navn',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -550,3 +548,12 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('DA DA', 'Danish', 'Dansk', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
@@ -20,37 +20,37 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Verträge nach Status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen auslaufen',
 	'Menu:ProviderContract' => 'Provider-Verträge',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => 'Provider-Verträge',
 	'Menu:CustomerContract' => 'Kundenverträge',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => 'Kundenverträge',
 	'Menu:ServiceSubcategory' => 'Service-Unterkategorien',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => 'Service-Unterkategorien',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Service-Elemente',
+	'Menu:ServiceElement+' => 'Service-Elemente',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Service Level Agreements (SLAs)',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Service Level Targets (SLTs)',
 	'Menu:DeliveryModel' => 'Delivery-Modelle',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => 'Delivery-Modelle',
 	'Menu:ServiceFamily' => 'Service-Familien',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => 'Service-Familien',
 	'Contract:baseinfo' => 'Allgemeine Informationen',
 	'Contract:moreinfo' => 'Vertragliche Informationen',
 	'Contract:cost' => 'Kosteninformation',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -250,7 +250,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:Service/Attribute:contacts_list' => 'Kontakte',
 	'Class:Service/Attribute:contacts_list+' => 'Alle mit dem Service verknüpften Kontakte',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implementierung',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsolet (Veraltet)',
@@ -326,7 +326,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produktion',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Request-Typ',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Service-Request',
@@ -446,8 +446,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA-Name',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -550,3 +548,12 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('DE DE', 'German', 'Deutsch', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en.dict.itop-service-mgmt-provider.php
@@ -45,37 +45,38 @@ Dict::Add('EN US', 'English', 'English', [
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less than 30 days',

 	'Menu:ProviderContract' => 'Provider contracts',
-	'Menu:ProviderContract+' => 'What is bought to external companies',
+	'Menu:ProviderContract+' => 'Provider contracts',
 	'Menu:CustomerContract' => 'Customer contracts',
-	'Menu:CustomerContract+' => 'Who is buying the services',
+	'Menu:CustomerContract+' => 'Customer contracts',
 	'Menu:ServiceSubcategory' => 'Service subcategories',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy',
+	'Menu:ServiceSubcategory+' => 'Service subcategories',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second level in service hierarchy',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Sevice elements',
+	'Menu:ServiceElement+' => 'Sevice elements',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Service Level Agreements',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Service Level Targets',
 	'Menu:DeliveryModel' => 'Delivery models',
-	'Menu:DeliveryModel+' => 'Teams handling tickets',
+	'Menu:DeliveryModel+' => 'Delivery models',
 	'Menu:ServiceFamily' => 'Service families',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy',
-	'Menu:ServiceCatalog' => 'Service catalog',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA',
+	'Menu:ServiceFamily+' => 'Service families',

 	'Contract:baseinfo' => 'General information',
 	'Contract:moreinfo' => 'Contractual information',
 	'Contract:cost'     => 'Cost information',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -93,7 +94,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ContractType' => 'Contract Type',
-	'Class:ContractType+' => 'Typology for categorizing Customer and Provider Contracts.',
+	'Class:ContractType+' => '',
 ]);

 //
@@ -102,7 +103,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Contract' => 'Contract',
-	'Class:Contract+' => 'Abstract class to handle fields common to the different contract types.',
+	'Class:Contract+' => '',
 	'Class:Contract/Attribute:name' => 'Name',
 	'Class:Contract/Attribute:name+' => '',
 	'Class:Contract/Attribute:org_id' => 'Organization',
@@ -136,11 +137,11 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Contract/Attribute:cost_unit' => 'Cost unit',
 	'Class:Contract/Attribute:cost_unit+' => '',
 	'Class:Contract/Attribute:provider_id' => 'Provider',
-	'Class:Contract/Attribute:provider_id+' => 'Provider organization for this contract. Can be different from the provider of the associated services.',
+	'Class:Contract/Attribute:provider_id+' => '',
 	'Class:Contract/Attribute:provider_name' => 'Provider Name',
 	'Class:Contract/Attribute:provider_name+' => '',
 	'Class:Contract/Attribute:status' => 'Status',
-	'Class:Contract/Attribute:status+' => 'The status is not computed based on start and end dates. It must be set manually.',
+	'Class:Contract/Attribute:status+' => '',
 	'Class:Contract/Attribute:status/Value:implementation' => 'implementation',
 	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete',
@@ -157,7 +158,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:CustomerContract' => 'Customer Contract',
-	'Class:CustomerContract+' => 'Agreement between a client and a provider for the delivery of services with an optional level of commitment (SLA, Coverage Window).',
+	'Class:CustomerContract+' => '',
 	'Class:CustomerContract/Attribute:services_list' => 'Services',
 	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract',
 	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs',
@@ -172,13 +173,13 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ProviderContract' => 'Provider Contract',
-	'Class:ProviderContract+' => 'Agreement between an external provider and an internal organization.',
+	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
 	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this contract',
 	'Class:ProviderContract/Attribute:sla' => 'SLA',
 	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
 	'Class:ProviderContract/Attribute:coverage' => 'Service hours',
-	'Class:ProviderContract/Attribute:coverage+' => 'Temporal coverage of the contract, e.g. 24x7, 9x5, etc.',
+	'Class:ProviderContract/Attribute:coverage+' => '',
 ]);

 //
@@ -187,7 +188,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContactToContract' => 'Link Contact / Contract',
-	'Class:lnkContactToContract+' => 'Manages key contacts on each Customer or Provider Contract.',
+	'Class:lnkContactToContract+' => '',
 	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
@@ -205,7 +206,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContractToDocument' => 'Link Contract / Document',
-	'Class:lnkContractToDocument+' => 'Link used when a Document is applicable to a Contract.',
+	'Class:lnkContractToDocument+' => '',
 	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
@@ -223,7 +224,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkFunctionalCIToProviderContract' => 'Link FunctionalCI / ProviderContract',
-	'Class:lnkFunctionalCIToProviderContract+' => 'This link models the Functional CIs that are supported by an external company through a Provider Contract.',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Provider contract',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
@@ -241,7 +242,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ServiceFamily' => 'Service Family',
-	'Class:ServiceFamily+' => 'Top level of Service hierarchy. Required for Services to be proposed in User Portal',
+	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => 'Name',
 	'Class:ServiceFamily/Attribute:name+' => '',
 	'Class:ServiceFamily/Attribute:icon' => 'Icon',
@@ -256,7 +257,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Service' => 'Service',
-	'Class:Service+' => 'A Service is delivered by an organization and subscribed to through a Contract Client. It must contain at least one Service Subcategory.',
+	'Class:Service+' => '',
 	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Name',
 	'Class:Service/Attribute:name+' => '',
@@ -275,7 +276,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Service/Attribute:contacts_list' => 'Contacts',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'implementation',
 	'Class:Service/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:Service/Attribute:status/Value:obsolete' => 'obsolete',
@@ -296,7 +297,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDocumentToService' => 'Link Document / Service',
-	'Class:lnkDocumentToService+' => 'Link used when a Document is applicable to a Service.',
+	'Class:lnkDocumentToService+' => '',
 	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
@@ -314,7 +315,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContactToService' => 'Link Contact / Service',
-	'Class:lnkContactToService+' => 'Ideal for defining the Team to which Tickets created on the related Service will be assigned (automatically or manually).',
+	'Class:lnkContactToService+' => '',
 	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
@@ -332,7 +333,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ServiceSubcategory' => 'Service Subcategory',
-	'Class:ServiceSubcategory+' => 'Lowest level in Service hierarchy. User Request are usually associated to one Service Subcategory.',
+	'Class:ServiceSubcategory+' => '',
 	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
 	'Class:ServiceSubcategory/Attribute:name' => 'Name',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
@@ -343,7 +344,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Service Name',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:status' => 'Status',
-	'Class:ServiceSubcategory/Attribute:status+' => 'Service subcategory status has usually an impact on User Portal visibility.',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete',
@@ -351,7 +352,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
@@ -366,7 +367,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:SLA' => 'SLA',
-	'Class:SLA+' => 'Service Level Agreement (SLA) applicable to a Service subscribed by a customer and measured using SLTs.',
+	'Class:SLA+' => '',
 	'Class:SLA/Attribute:name' => 'Name',
 	'Class:SLA/Attribute:name+' => '',
 	'Class:SLA/Attribute:description' => 'description',
@@ -388,11 +389,11 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:SLT' => 'SLT',
-	'Class:SLT+' => 'Service Level Target under a Service Level Agreement (SLA). Defines a maximum time for a metric (TTO or TTR), a request type (Incident or Request) and a priority.',
+	'Class:SLT+' => '',
 	'Class:SLT/Attribute:name' => 'Name',
 	'Class:SLT/Attribute:name+' => '',
 	'Class:SLT/Attribute:priority' => 'Priority',
-	'Class:SLT/Attribute:priority+' => 'Ticket priority to which this SLT applies. Only tickets with this priority must comply with this SLT.',
+	'Class:SLT/Attribute:priority+' => '',
 	'Class:SLT/Attribute:priority/Value:1' => 'critical',
 	'Class:SLT/Attribute:priority/Value:1+' => 'critical',
 	'Class:SLT/Attribute:priority/Value:2' => 'high',
@@ -402,21 +403,21 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:SLT/Attribute:priority/Value:4' => 'low',
 	'Class:SLT/Attribute:priority/Value:4+' => 'low',
 	'Class:SLT/Attribute:request_type' => 'Request type',
-	'Class:SLT/Attribute:request_type+' => 'Request type to which this SLT applies. Only tickets with this request type must comply with this SLT.',
+	'Class:SLT/Attribute:request_type+' => '',
 	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
 	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request',
 	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request',
 	'Class:SLT/Attribute:metric' => 'Metric',
-	'Class:SLT/Attribute:metric+' => 'Delay type to which this SLT applies. TTO (Time To Own) or TTR (Time To Resolve).',
+	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
 	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
 	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
 	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
 	'Class:SLT/Attribute:value' => 'Value',
-	'Class:SLT/Attribute:value+' => 'Delay value which must not be exceeded to be compliant with the target. The unit is defined in the "unit" attribute.',
+	'Class:SLT/Attribute:value+' => '',
 	'Class:SLT/Attribute:unit' => 'Unit',
-	'Class:SLT/Attribute:unit+' => 'Unit for the delay value.',
+	'Class:SLT/Attribute:unit+' => '',
 	'Class:SLT/Attribute:unit/Value:hours' => 'hours',
 	'Class:SLT/Attribute:unit/Value:hours+' => 'hours',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes',
@@ -429,7 +430,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
-	'Class:lnkSLAToSLT+' => 'This link indicates that an SLT is included in the Service Level Agreement (SLA). An SLA usually contains several SLTs. An SLT can be reused as is by several SLAs (seldom).',
+	'Class:lnkSLAToSLT+' => '',
 	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
@@ -457,22 +458,20 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service',
-	'Class:lnkCustomerContractToService+' => 'A single line of a Customer Contract, specifying the Service provided and, for this service, the subscribed commitment levels (Service Level Agreement and Coverage Window).',
+	'Class:lnkCustomerContractToService+' => '',
 	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => 'All service subcategories linked to this service are also included by the contract.',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name',
 	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => 'Service Level Agreement applicable to this service for this customer contract.',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
 ]);

 //
@@ -481,7 +480,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkCustomerContractToProviderContract' => 'Link Customer Contract / Provider Contract',
-	'Class:lnkCustomerContractToProviderContract+' => 'This link models when a Provider Contract contributes to the delivery of a Customer Contract.',
+	'Class:lnkCustomerContractToProviderContract+' => '',
 	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Customer contract',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
@@ -499,7 +498,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkCustomerContractToFunctionalCI' => 'Link Customer Contract / FunctionalCI',
-	'Class:lnkCustomerContractToFunctionalCI+' => 'This link models the equipment (Functional CI) covered by a Customer Contract.',
+	'Class:lnkCustomerContractToFunctionalCI+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Customer contract',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
@@ -517,8 +516,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:DeliveryModel' => 'Delivery Model',
-	'Class:DeliveryModel+' => 'The Delivery Model specifies the Teams that can be assigned to Tickets; it must contain at least one Team in the Contacts tab.
-Each client Organization must have a defined Delivery Model.',
+	'Class:DeliveryModel+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Name',
 	'Class:DeliveryModel/Attribute:name+' => '',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organization',
@@ -539,7 +537,7 @@ Each client Organization must have a defined Delivery Model.',

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDeliveryModelToContact' => 'Link DeliveryModel / Contact',
-	'Class:lnkDeliveryModelToContact+' => 'This link specifies the role of a Team (more rarely a Person) within a Delivery Model.',
+	'Class:lnkDeliveryModelToContact+' => '',
 	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
@@ -576,3 +574,12 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en_gb.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/en_gb.dict.itop-service-mgmt-provider.php
@@ -45,37 +45,38 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less than 30 days',

 	'Menu:ProviderContract' => 'Provider contracts',
-	'Menu:ProviderContract+' => 'What is bought to external companies',
+	'Menu:ProviderContract+' => 'Provider contracts',
 	'Menu:CustomerContract' => 'Customer contracts',
-	'Menu:CustomerContract+' => 'Who is buying the services',
+	'Menu:CustomerContract+' => 'Customer contracts',
 	'Menu:ServiceSubcategory' => 'Service subcategories',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy',
+	'Menu:ServiceSubcategory+' => 'Service subcategories',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Sevice elements',
+	'Menu:ServiceElement+' => 'Sevice elements',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Service Level Agreements',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Service Level Targets',
 	'Menu:DeliveryModel' => 'Delivery models',
-	'Menu:DeliveryModel+' => 'Teams handling tickets',
+	'Menu:DeliveryModel+' => 'Delivery models',
 	'Menu:ServiceFamily' => 'Service families',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
+	'Menu:ServiceFamily+' => 'Service families',

 	'Contract:baseinfo' => 'General information',
 	'Contract:moreinfo' => 'Contractual information',
 	'Contract:cost' => 'Cost information',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -275,7 +276,7 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:Service/Attribute:contacts_list' => 'Contacts',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'implementation',
 	'Class:Service/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:Service/Attribute:status/Value:obsolete' => 'obsolete',
@@ -351,7 +352,7 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
@@ -471,8 +472,6 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php
@@ -17,37 +17,37 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por Estatus',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos Finalizando en menos de 30 días',
 	'Menu:ProviderContract' => 'Contratos con Proveedores',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => 'Contratos con Proveedores',
 	'Menu:CustomerContract' => 'Acuerdos con Clientes',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => 'Acuerdos con Clientes',
 	'Menu:ServiceSubcategory' => 'Subcategorías de Servicio',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => 'Subcategorías de Servicio',
 	'Menu:Service' => 'Servicios',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Servicios',
+	'Menu:ServiceElement' => 'Elementos del Servicio',
+	'Menu:ServiceElement+' => 'Elementos del Servicio',
 	'Menu:SLA' => 'SLAs - Acuerdos de Nivel de Servicio',
 	'Menu:SLA+' => 'Acuerdos de Nivel de Servicio',
 	'Menu:SLT' => 'SLTs - Objetivos de Nivel de Servicio',
 	'Menu:SLT+' => 'Objetivos de Nivel de Servicio',
 	'Menu:DeliveryModel' => 'Modelos de Entrega',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => 'Modelos de Entrega',
 	'Menu:ServiceFamily' => 'Familias de Servicio',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => 'Familias de Servicio',
 	'Contract:baseinfo' => 'Información General',
 	'Contract:moreinfo' => 'Información Contractual',
 	'Contract:cost' => 'Información de Costos',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -213,13 +213,13 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:ServiceFamily' => 'Familia de Servicios',
-	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily+' => 'Familia de Servicios',
 	'Class:ServiceFamily/Attribute:name' => 'Nombre',
 	'Class:ServiceFamily/Attribute:name+' => 'Nombre de la Familia de Servicios',
 	'Class:ServiceFamily/Attribute:icon' => 'Icono',
 	'Class:ServiceFamily/Attribute:icon+' => '',
 	'Class:ServiceFamily/Attribute:services_list' => 'Servicios',
-	'Class:ServiceFamily/Attribute:services_list+' => '',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Servicios',
 ]);

 //
@@ -228,16 +228,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Service' => 'Servicio',
-	'Class:Service+' => '',
+	'Class:Service+' => 'Servicio',
 	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Nombre',
 	'Class:Service/Attribute:name+' => 'Nombre del Servicio',
 	'Class:Service/Attribute:org_id' => 'Proveedor',
-	'Class:Service/Attribute:org_id+' => '',
+	'Class:Service/Attribute:org_id+' => 'Proveedor',
 	'Class:Service/Attribute:organization_name' => 'Proveedor',
 	'Class:Service/Attribute:organization_name+' => 'Proveedor',
 	'Class:Service/Attribute:description' => 'Descripción',
-	'Class:Service/Attribute:description+' => '',
+	'Class:Service/Attribute:description+' => 'Descripción',
 	'Class:Service/Attribute:servicefamily_id' => 'Familia de Servicios',
 	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => 'Familia de Servicios',
@@ -247,7 +247,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Service/Attribute:contacts_list' => 'Contactos',
 	'Class:Service/Attribute:contacts_list+' => 'Contactos',
 	'Class:Service/Attribute:status' => 'Estatus',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => 'Estatus',
 	'Class:Service/Attribute:status/Value:implementation' => 'No Productivo',
 	'Class:Service/Attribute:status/Value:implementation+' => 'No Productivo',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
@@ -255,11 +255,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Service/Attribute:status/Value:production' => 'Productivo',
 	'Class:Service/Attribute:status/Value:production+' => 'Productivo',
 	'Class:Service/Attribute:icon' => 'Icono',
-	'Class:Service/Attribute:icon+' => '',
+	'Class:Service/Attribute:icon+' => 'Icono',
 	'Class:Service/Attribute:customercontracts_list' => 'Acuerdos con Clientes',
 	'Class:Service/Attribute:customercontracts_list+' => 'Acuerdos con Clientes',
 	'Class:Service/Attribute:servicesubcategories_list' => 'Subcategorias de Servicio',
-	'Class:Service/Attribute:servicesubcategories_list+' => '',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Subcategorias de Servicio',
 ]);

 //
@@ -309,13 +309,13 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:ServiceSubcategory/Attribute:name' => 'Nombre',
 	'Class:ServiceSubcategory/Attribute:name+' => 'Nombre de Subcategoría',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descripción',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:description+' => 'Descripción',
 	'Class:ServiceSubcategory/Attribute:service_id' => 'Servicio',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id+' => 'Servicio',
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Servicio',
 	'Class:ServiceSubcategory/Attribute:service_name+' => 'Servicio',
 	'Class:ServiceSubcategory/Attribute:status' => 'Estatus',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status+' => 'Estatus',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'No Productivo',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'No Productivo',
 	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Obsoleto',
@@ -323,7 +323,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Productivo',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'Productivo',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo de Reporte',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => 'Tipo de Reporte',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidente',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'Incidente',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Requerimiento de Servicio',
@@ -338,19 +338,19 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SLA' => 'SLA - Acuerdo de Nivel de Servicio',
-	'Class:SLA+' => '',
+	'Class:SLA+' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA/Attribute:name' => 'Nombre',
 	'Class:SLA/Attribute:name+' => 'Nombre de SLA',
 	'Class:SLA/Attribute:description' => 'Descripción',
-	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:description+' => 'Descripción',
 	'Class:SLA/Attribute:org_id' => 'Proveedor',
-	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:org_id+' => 'Proveedor',
 	'Class:SLA/Attribute:organization_name' => 'Proveedor',
 	'Class:SLA/Attribute:organization_name+' => 'Proveedor',
 	'Class:SLA/Attribute:slts_list' => 'SLTs - Objetivos de Nivel de Servicio',
-	'Class:SLA/Attribute:slts_list+' => '',
+	'Class:SLA/Attribute:slts_list+' => 'Objetivos de Nivel de Servicio',
 	'Class:SLA/Attribute:customercontracts_list' => 'Acuerdos con Clientes',
-	'Class:SLA/Attribute:customercontracts_list+' => '',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Acuerdos con Clientes',
 	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'No se puede guardar la relación entre Acuerdo con Cliente %1$s y Servicio %2$s : El SLA ya existe',
 ]);

@@ -360,11 +360,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SLT' => 'SLT - Objetivos de Nivel de Servicio',
-	'Class:SLT+' => '',
+	'Class:SLT+' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT/Attribute:name' => 'Nombre',
 	'Class:SLT/Attribute:name+' => 'Nombre de SLT',
 	'Class:SLT/Attribute:priority' => 'Prioridad',
-	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority+' => 'Prioridad',
 	'Class:SLT/Attribute:priority/Value:1' => 'Crítico',
 	'Class:SLT/Attribute:priority/Value:1+' => 'Crítico',
 	'Class:SLT/Attribute:priority/Value:2' => 'Alto',
@@ -374,21 +374,21 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SLT/Attribute:priority/Value:4' => 'Bajo',
 	'Class:SLT/Attribute:priority/Value:4+' => 'Bajo',
 	'Class:SLT/Attribute:request_type' => 'Tipo de Reporte',
-	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type+' => 'Tipo de Reporte',
 	'Class:SLT/Attribute:request_type/Value:incident' => 'Incidente',
 	'Class:SLT/Attribute:request_type/Value:incident+' => 'Incidente',
 	'Class:SLT/Attribute:request_type/Value:service_request' => 'Requerimiento de Servicio',
 	'Class:SLT/Attribute:request_type/Value:service_request+' => 'Requerimiento de Servicio',
 	'Class:SLT/Attribute:metric' => 'Métrica',
-	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric+' => 'Métrica',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TDA - Tiempo de Asignación',
 	'Class:SLT/Attribute:metric/Value:tto+' => 'Tiempo de Asignación',
 	'Class:SLT/Attribute:metric/Value:ttr' => 'TDS - Tiempo de Solución',
 	'Class:SLT/Attribute:metric/Value:ttr+' => 'Tiempo de Solución',
 	'Class:SLT/Attribute:value' => 'Valor',
-	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:value+' => 'Valor',
 	'Class:SLT/Attribute:unit' => 'Unidad',
-	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit+' => 'Unidad',
 	'Class:SLT/Attribute:unit/Value:hours' => 'Horas',
 	'Class:SLT/Attribute:unit/Value:hours+' => 'Horas',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutos',
@@ -443,8 +443,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => 'SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -547,3 +545,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/fr.dict.itop-service-mgmt-provider.php
@@ -19,37 +19,37 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats, par état',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins d\'un mois',
 	'Menu:ProviderContract' => 'Contrats fournisseurs',
-	'Menu:ProviderContract+' => 'Ce que votre société achète',
+	'Menu:ProviderContract+' => 'Contrats fournisseurs',
 	'Menu:CustomerContract' => 'Contrats clients',
-	'Menu:CustomerContract+' => 'Souscriptions à des services',
-	'Menu:ServiceSubcategory' => 'Sous-catégories de service',
-	'Menu:ServiceSubcategory+' => 'Dernier niveau dans la hiérarchie des services',
+	'Menu:CustomerContract+' => 'Contrats clients',
+	'Menu:ServiceSubcategory' => 'Sous catégories de service',
+	'Menu:ServiceSubcategory+' => 'Sous catégories de service',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second niveau dans la hiérarchie des services',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Eléments de service',
+	'Menu:ServiceElement+' => 'Eléments de service',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Accords de niveau de service (SLA)',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Objectifs de niveau de service (SLT)',
 	'Menu:DeliveryModel' => 'Modèles de support',
-	'Menu:DeliveryModel+' => 'Les équipes gérant les tickets',
+	'Menu:DeliveryModel+' => 'Modèles de support',
 	'Menu:ServiceFamily' => 'Familles de service',
-	'Menu:ServiceFamily+' => 'Plus haut niveau dans la hiérarchie des services',
-	'Menu:ServiceCatalog' => 'Catalogue de services',
-	'Menu:ServiceCatalog+' => 'Définir les éléments des offres de service',
-	'UI-ServiceCatalogMenu-Title' => 'Catalogue de services',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Seuls les Services et Sous-catégories en production sont affichés dans le portail utilisateur',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services en production sans contrat client',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Non affichés dans le portail utilisateur',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Les services sans famille de service sont invisibles dans le portail utilisateur',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Nombre de SLTs par SLA',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Nombre de contrats clients utilisant ce service',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Nombre de contrats clients utilisant ce SLA',
-
+	'Menu:ServiceFamily+' => 'Familles de service',
 	'Contract:baseinfo' => 'Information générale',
 	'Contract:moreinfo' => 'Aspects contractuels',
 	'Contract:cost' => 'Coûts',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -67,7 +67,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContractType' => 'Type de contrat',
-	'Class:ContractType+' => 'Typologie pour catégoriser les Contrats Client et Fournisseur.',
+	'Class:ContractType+' => '',
 ]);

 //
@@ -76,7 +76,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Contract' => 'Contrat',
-	'Class:Contract+' => 'Classe abstraite qui gére les caractéristiques communes aux différents types de contrat.',
+	'Class:Contract+' => '',
 	'Class:Contract/Attribute:name' => 'Nom',
 	'Class:Contract/Attribute:name+' => '',
 	'Class:Contract/Attribute:org_id' => 'Client',
@@ -110,11 +110,11 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Contract/Attribute:cost_unit' => 'Unité de coût',
 	'Class:Contract/Attribute:cost_unit+' => '',
 	'Class:Contract/Attribute:provider_id' => 'Fournisseur',
-	'Class:Contract/Attribute:provider_id+' => 'Fournisseur du contrat. Parfois différent du fournisseur des services liés à ce contrat',
+	'Class:Contract/Attribute:provider_id+' => '',
 	'Class:Contract/Attribute:provider_name' => 'Nom Fournisseur',
 	'Class:Contract/Attribute:provider_name+' => '',
 	'Class:Contract/Attribute:status' => 'Etat',
-	'Class:Contract/Attribute:status+' => 'L\'état du contrat n\'est pas calculé en fonction des dates de début et de fin. Il doit être mis à jour indépendamment.',
+	'Class:Contract/Attribute:status+' => '',
 	'Class:Contract/Attribute:status/Value:implementation' => 'Implémentation',
 	'Class:Contract/Attribute:status/Value:implementation+' => '',
 	'Class:Contract/Attribute:status/Value:obsolete' => 'Obsolète',
@@ -131,7 +131,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:CustomerContract' => 'Contrat client',
-	'Class:CustomerContract+' => 'Accord entre un client et un fournisseur pour la délivrance de Services associés éventuellement à des niveaux d\'engagement (Niveau de service, Fenêtre de couverture).',
+	'Class:CustomerContract+' => '',
 	'Class:CustomerContract/Attribute:services_list' => 'Services',
 	'Class:CustomerContract/Attribute:services_list+' => 'Tous les services achetés pour ce contrat',
 	'Class:CustomerContract/Attribute:functionalcis_list' => 'CIs',
@@ -146,13 +146,13 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ProviderContract' => 'Contrat fournisseur',
-	'Class:ProviderContract+' => 'Accord entre un fournisseur externe et une organisation interne.',
+	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
 	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Tous les éléments de configuration couverts par ce contrat fournisseur',
 	'Class:ProviderContract/Attribute:sla' => 'Niveau de service',
 	'Class:ProviderContract/Attribute:sla+' => 'Accord de niveau de service (SLA)',
 	'Class:ProviderContract/Attribute:coverage' => 'Couverture',
-	'Class:ProviderContract/Attribute:coverage+' => 'Fenêtre de couverture temporelle pour ce contrat fournisseur',
+	'Class:ProviderContract/Attribute:coverage+' => '',
 ]);

 //
@@ -161,7 +161,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkContactToContract' => 'Lien Contact / Contrat',
-	'Class:lnkContactToContract+' => 'Gère les contacts clés sur chaque contract client ou fournisseur.',
+	'Class:lnkContactToContract+' => '',
 	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrat',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
@@ -179,7 +179,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkContractToDocument' => 'Lien Contract / Document',
-	'Class:lnkContractToDocument+' => 'Lien utilisé lorsqu\'un Document est applicable à un Contract.',
+	'Class:lnkContractToDocument+' => '',
 	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrat',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
@@ -196,8 +196,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI fonctionnel / Contrat fournisseur',
-	'Class:lnkFunctionalCIToProviderContract+' => 'Ce lien modélise les équipments (CI fonctionnel) qui sont supportés par une société externe à travers un Contrat fournisseur.',
+	'Class:lnkFunctionalCIToProviderContract' => 'Lien CI / Contrat fournisseur',
+	'Class:lnkFunctionalCIToProviderContract+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrat fournisseur',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id+' => '',
@@ -214,8 +214,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:ServiceFamily' => 'Famille de services',
-	'Class:ServiceFamily+' => 'Premier niveau dans la hiérarchie des Services. Obligatoire pour qu\'un Service soit proposé dans le Portail Utilisateur.',
+	'Class:ServiceFamily' => 'Famille de service',
+	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => 'Nom',
 	'Class:ServiceFamily/Attribute:name+' => '',
 	'Class:ServiceFamily/Attribute:icon' => 'Icône',
@@ -236,7 +236,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Service' => 'Service',
-	'Class:Service+' => 'Un Service est délivré par une organisation et souscrit par le biais de Contract Client. Il doit au moins contenir une Sous catégorie de Service.',
+	'Class:Service+' => '',
 	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Nom',
 	'Class:Service/Attribute:name+' => '',
@@ -255,7 +255,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Service/Attribute:contacts_list' => 'Contacts',
 	'Class:Service/Attribute:contacts_list+' => 'Tous les contacts pour ce service',
 	'Class:Service/Attribute:status' => 'Etat',
-	'Class:Service/Attribute:status+' => 'Seuls les services en production sont visibles des utilisateurs du portail.',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implémentation',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsolète',
@@ -266,8 +266,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Service/Attribute:icon+' => '',
 	'Class:Service/Attribute:customercontracts_list' => 'Contrats client',
 	'Class:Service/Attribute:customercontracts_list+' => 'Tous les contrats clients qui ont acquis ce service',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Sous-catégories de service',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'Toutes les sous-catégories de service pour ce service',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Sous catégories de service',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Toutes les sous catégories de service pour ce service',
 	'Class:Service/Attribute:servicesubcategories_list/UI:Links:Create:Button+' => 'Créer un %4$s',
 	'Class:Service/Attribute:servicesubcategories_list/UI:Links:Create:Modal:Title' => 'Ajouter un %4$s à %2$s',
 	'Class:Service/Attribute:servicesubcategories_list/UI:Links:Delete:Button+' => 'Supprimer ce %4$s',
@@ -282,7 +282,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDocumentToService' => 'Lien Document / Service',
-	'Class:lnkDocumentToService+' => 'Lien utilisé lorsqu\'un Document est applicable à un Service.',
+	'Class:lnkDocumentToService+' => '',
 	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
@@ -300,7 +300,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkContactToService' => 'Lien Contact / Service',
-	'Class:lnkContactToService+' => 'Idéal pour définir l\'équipe à laquelle on affectera (automatiquement ou manuellement) les Tickets créés sur le Service lié.',
+	'Class:lnkContactToService+' => '',
 	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
@@ -317,8 +317,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:ServiceSubcategory' => 'Sous-catégorie de service',
-	'Class:ServiceSubcategory+' => 'Dernier niveau dans la hiérarchie des Services. Chaque Demande utilisateur se réfère à une Sous-catégorie de service.',
+	'Class:ServiceSubcategory' => 'Sous catégorie de service',
+	'Class:ServiceSubcategory+' => '',
 	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nom',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
@@ -329,7 +329,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Nom Service',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:status' => 'Etat',
-	'Class:ServiceSubcategory/Attribute:status+' => 'L\'état d\'une sous-catégorie de service conditionne sa visibilité dans le portail utilisateur.',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implémentation',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '',
 	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Obsolète',
@@ -337,7 +337,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Production',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Type de requête',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Définit le type de Ticket (Incident ou Demande de service) qui sera créé lorsqu\'un utilisateur du Portail sélectionne cette sous-catégorie de service',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'demande de service',
@@ -352,7 +352,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:SLA' => 'Niveau de service',
-	'Class:SLA+' => 'Accord de niveau de service (SLA) applicable à un Service souscrit par un client et mesuré à l\'aide de SLTs.',
+	'Class:SLA+' => '',
 	'Class:SLA/Attribute:name' => 'Nom',
 	'Class:SLA/Attribute:name+' => '',
 	'Class:SLA/Attribute:description' => 'Description',
@@ -374,39 +374,39 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:SLT' => 'SLT',
-	'Class:SLT+' => 'Objectif mesurable au sein d\'un Niveau de service (SLA). Défini un délai maximum pour une métrique (TTO ou TTR), un type de requête (Incident ou Demande) et une priorité.',
+	'Class:SLT+' => 'Objectif de niveau de service (SLT)',
 	'Class:SLT/Attribute:name' => 'Nom',
 	'Class:SLT/Attribute:name+' => '',
 	'Class:SLT/Attribute:priority' => 'Priorité',
-	'Class:SLT/Attribute:priority+' => 'Priorité du ticket pour laquelle cet objectif est applicable',
+	'Class:SLT/Attribute:priority+' => '',
 	'Class:SLT/Attribute:priority/Value:1' => 'critique',
-	'Class:SLT/Attribute:priority/Value:1+' => '',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critique',
 	'Class:SLT/Attribute:priority/Value:2' => 'haute',
-	'Class:SLT/Attribute:priority/Value:2+' => '',
+	'Class:SLT/Attribute:priority/Value:2+' => 'haute',
 	'Class:SLT/Attribute:priority/Value:3' => 'moyenne',
-	'Class:SLT/Attribute:priority/Value:3+' => '',
+	'Class:SLT/Attribute:priority/Value:3+' => 'moyenne',
 	'Class:SLT/Attribute:priority/Value:4' => 'basse',
-	'Class:SLT/Attribute:priority/Value:4+' => '',
+	'Class:SLT/Attribute:priority/Value:4+' => 'basse',
 	'Class:SLT/Attribute:request_type' => 'Type de requête',
-	'Class:SLT/Attribute:request_type+' => 'Type de requête pour laquelle cet objectif est applicable',
+	'Class:SLT/Attribute:request_type+' => '',
 	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
-	'Class:SLT/Attribute:request_type/Value:incident+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:SLT/Attribute:request_type/Value:service_request' => 'demande de service',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'demande de service',
 	'Class:SLT/Attribute:metric' => 'Métrique',
-	'Class:SLT/Attribute:metric+' => 'Délai contrôlé par cet objectif (temps de prise en charge ou temps de résolution)',
+	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'Délai de prise en charge',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
 	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'Délai de résolution',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
 	'Class:SLT/Attribute:value' => 'Valeur',
-	'Class:SLT/Attribute:value+' => 'Valeur à ne pas dépasser pour la métrique et le type de requête définis dans cet objectif',
+	'Class:SLT/Attribute:value+' => '',
 	'Class:SLT/Attribute:unit' => 'Unité',
-	'Class:SLT/Attribute:unit+' => 'Unité à appliquer à la valeur',
+	'Class:SLT/Attribute:unit+' => '',
 	'Class:SLT/Attribute:unit/Value:hours' => 'heures',
-	'Class:SLT/Attribute:unit/Value:hours+' => '',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'heures',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes',
-	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes',
 ]);

 //
@@ -415,7 +415,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkSLAToSLT' => 'Lien SLA / SLT',
-	'Class:lnkSLAToSLT+' => 'Ce lien indique qu\'un SLT est inclus dans le Niveau de service (SLA). Un SLA contient le plus souvent plusieurs SLTs. Un SLT peut être réutilisé à l\'identique par plusieurs Niveau de service (rare).',
+	'Class:lnkSLAToSLT+' => '',
 	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
@@ -443,22 +443,20 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkCustomerContractToService' => 'Lien Contrat client / Service',
-	'Class:lnkCustomerContractToService+' => 'Un ligne unitaire d\'un Contract client, qui spécifie le Service fourni et pour ce service les niveaux d\'engagement souscrits (Niveau de service et fenêtre de couverture).',
+	'Class:lnkCustomerContractToService+' => '',
 	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrat client',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nom contrat client',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => 'Toutes les sous-catégories de service liées à ce service sont aussi incluses dans ce contrat client',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Nom service',
 	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => 'Niveau d\'engagement pour ce service dans le cadre de ce contrat client',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nom SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Fournisseur',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
 ]);

 //
@@ -467,7 +465,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkCustomerContractToProviderContract' => 'Lien Contrat client / Contrat fournisseur',
-	'Class:lnkCustomerContractToProviderContract+' => 'Ce lien permet de modéliser lorsqu\'un Contrat fournisseur contribue à la délivrance d\'un Contrat client.',
+	'Class:lnkCustomerContractToProviderContract+' => '',
 	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Contrat client',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id+' => '',
@@ -484,8 +482,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:lnkCustomerContractToFunctionalCI' => 'Lien Contrat client / CI fonctionnel',
-	'Class:lnkCustomerContractToFunctionalCI+' => 'Ce lien permet de modéliser les équipments (CI fonctionnel) qui sont couverts par un Contrat client.',
+	'Class:lnkCustomerContractToFunctionalCI' => 'Lien Contrat client / CI',
+	'Class:lnkCustomerContractToFunctionalCI+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Contrat client',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id+' => '',
@@ -503,8 +501,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:DeliveryModel' => 'Modèle de support',
-	'Class:DeliveryModel+' => 'Le Modèle de support spécifie les équipes pouvant être affectées aux Tickets, il doit contenir au minimum une Équipe dans l\'onglet Contacts.
-	Chaque Organisation cliente doit avoir un Modèle de support défini.',
+	'Class:DeliveryModel+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Nom Modèle de support',
 	'Class:DeliveryModel/Attribute:name+' => '',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
@@ -531,7 +528,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDeliveryModelToContact' => 'Lien Modèle de support / Contact',
-	'Class:lnkDeliveryModelToContact+' => 'Ce lien spécifie le rôle d\'une équipe (plus rarement d\'une Personne) dans le cadre d\'un Modèle de support.',
+	'Class:lnkDeliveryModelToContact+' => '',
 	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modèle de support',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
@@ -568,3 +565,12 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Fournisseur',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Fournisseur',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/hu.dict.itop-service-mgmt-provider.php
@@ -19,13 +19,15 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Szerződések állapotuk szerint',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30 napon belül lejáró szerződések',
 	'Menu:ProviderContract' => 'Szolgáltatói szerződések',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => 'Provider contracts~~',
 	'Menu:CustomerContract' => 'Ügyfélszerződések',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => 'Customer contracts~~',
 	'Menu:ServiceSubcategory' => 'Szolgáltatás alkategóriák',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => 'Service subcategories~~',
 	'Menu:Service' => 'Szolgáltatások',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Services~~',
+	'Menu:ServiceElement' => 'Szolgáltatáselemek',
+	'Menu:ServiceElement+' => 'A szolgáltatás összetevői',
 	'Menu:SLA' => 'SLA-k',
 	'Menu:SLA+' => 'Szolgáltatásszint megállapodások',
 	'Menu:SLT' => 'SLT-k',
@@ -34,22 +36,20 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Menu:DeliveryModel+' => 'Ki kinek szolgáltat',
 	'Menu:ServiceFamily' => 'Szolgáltatáscsaládok',
 	'Menu:ServiceFamily+' => 'Hasonló célú szolgáltatások',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Contract:baseinfo' => 'General information~~',
 	'Contract:moreinfo' => 'Contractual information~~',
 	'Contract:cost' => 'Cost information~~',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -325,7 +325,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Bevezetve',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Kérelem típus',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidens',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Szolgáltatáskérés',
@@ -445,8 +445,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '~~',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA név',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -549,3 +547,12 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('HU HU', 'Hungarian', 'Magyar', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/it.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/it.dict.itop-service-mgmt-provider.php
@@ -19,37 +19,37 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratti per stato',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratti che terminano in meno di 30 giorni',
 	'Menu:ProviderContract' => 'Contratti con Provider',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => 'Contratti con Provider',
 	'Menu:CustomerContract' => 'Contratti con Clienti',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => 'Contratti con Clienti',
 	'Menu:ServiceSubcategory' => 'Sottocategorie di Servizio',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => 'Sottocategorie di Servizio',
 	'Menu:Service' => 'Servizi',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Servizi',
+	'Menu:ServiceElement' => 'Elementi di Servizio',
+	'Menu:ServiceElement+' => 'Elementi di Servizio',
 	'Menu:SLA' => 'SLA',
 	'Menu:SLA+' => 'Accordi di Livello di Servizio',
 	'Menu:SLT' => 'SLT',
 	'Menu:SLT+' => 'Target di Livello di Servizio',
 	'Menu:DeliveryModel' => 'Modelli di Delivery',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => 'Modelli di Delivery',
 	'Menu:ServiceFamily' => 'Famiglie di Servizi',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => 'Famiglie di Servizi',
 	'Contract:baseinfo' => 'Informazioni Generali',
 	'Contract:moreinfo' => 'Informazioni Contrattuali',
 	'Contract:cost' => 'Informazioni sui Costi',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -249,7 +249,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:Service/Attribute:contacts_list' => 'Contatti',
 	'Class:Service/Attribute:contacts_list+' => 'Tutti i contatti per questo servizio',
 	'Class:Service/Attribute:status' => 'Stato',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'implementazione',
 	'Class:Service/Attribute:status/Value:implementation+' => 'implementazione',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
@@ -325,7 +325,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produzione',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo di Richiesta',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidente',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Richiesta di Servizio',
@@ -445,8 +445,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '~~',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nome SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -549,3 +547,12 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('IT IT', 'Italian', 'Italiano', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ja.dict.itop-service-mgmt-provider.php
@@ -19,37 +19,37 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => '状態別の契約',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '30日以内に終わる契約',
 	'Menu:ProviderContract' => 'プロバイダー契約',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => '顧客契約',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => '',
 	'Menu:ServiceSubcategory' => 'サービスサブカテゴリ',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => '',
 	'Menu:Service' => 'サービス',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => '',
+	'Menu:ServiceElement' => 'サービス要素',
+	'Menu:ServiceElement+' => '',
 	'Menu:SLA' => 'SLA',
 	'Menu:SLA+' => '',
 	'Menu:SLT' => 'SLT',
 	'Menu:SLT+' => '',
 	'Menu:DeliveryModel' => '提供モデル',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => '',
 	'Menu:ServiceFamily' => 'サービスファミリ',
 	'Menu:ServiceFamily+' => 'サービスファミリ',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Contract:baseinfo' => 'General information~~',
 	'Contract:moreinfo' => 'Contractual information~~',
 	'Contract:cost' => 'Cost information~~',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -249,7 +249,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:Service/Attribute:contacts_list' => '連絡先',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
 	'Class:Service/Attribute:status' => '状態',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => '実装',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => '廃止',
@@ -325,7 +325,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => '稼働',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => '要求タイプ',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'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' => 'サービス要求',
@@ -445,8 +445,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA名',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -549,3 +547,12 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('JA JP', 'Japanese', '日本語', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/nl.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/nl.dict.itop-service-mgmt-provider.php
@@ -27,7 +27,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Menu:ServiceSubcategory' => 'Subcategorieën services',
 	'Menu:ServiceSubcategory+' => 'Subcategorieën services',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Service-elementen',
+	'Menu:ServiceElement+' => 'Service-elementen',
 	'Menu:SLA' => 'SLA\'s',
 	'Menu:SLA+' => 'Service Level Agreements',
 	'Menu:SLT' => 'SLT\'s',
@@ -36,22 +38,20 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Menu:DeliveryModel+' => 'Leveringsmodellen',
 	'Menu:ServiceFamily' => 'Servicecategorieën',
 	'Menu:ServiceFamily+' => 'Servicecategorieën',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Contract:baseinfo' => 'Algemene informatie',
 	'Contract:moreinfo' => 'Contractuele informatie',
 	'Contract:cost' => 'Financiële informatie',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -251,7 +251,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Service/Attribute:contacts_list' => 'Contacten',
 	'Class:Service/Attribute:contacts_list+' => 'Alle contacten voor deze service',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implementatie',
 	'Class:Service/Attribute:status/Value:implementation+' => 'Implementatie',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Buiten gebruik',
@@ -327,7 +327,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Productie',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'Productie',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Soort verzoek',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Serviceverzoek',
@@ -447,8 +447,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Naam SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -551,3 +549,12 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('NL NL', 'Dutch', 'Nederlands', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pl.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pl.dict.itop-service-mgmt-provider.php
@@ -26,6 +26,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Menu:ServiceSubcategory+' => 'Podkategorie usług',
 	'Menu:Service' => 'Usługi',
 	'Menu:Service+' => 'Usługi',
+	'Menu:ServiceElement' => 'Elementy usługi',
+	'Menu:ServiceElement+' => 'Elementy usługi',
 	'Menu:SLA' => 'Umowy SLA',
 	'Menu:SLA+' => 'Umowy gwarantowanych poziomów usług',
 	'Menu:SLT' => 'Poziomy usług SLT',
@@ -34,22 +36,20 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Menu:DeliveryModel+' => 'Modele obsługi',
 	'Menu:ServiceFamily' => 'Rodziny usług',
 	'Menu:ServiceFamily+' => 'Rodziny usług',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Contract:baseinfo' => 'Informacje ogólne',
 	'Contract:moreinfo' => 'Informacje o umowach',
 	'Contract:cost' => 'Informacje o kosztach',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -249,7 +249,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:Service/Attribute:contacts_list' => 'Kontakty',
 	'Class:Service/Attribute:contacts_list+' => 'Wszystkie kontakty do tej usługi',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'wdrażane',
 	'Class:Service/Attribute:status/Value:implementation+' => 'wdrażane',
 	'Class:Service/Attribute:status/Value:obsolete' => 'wycofane',
@@ -325,7 +325,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'użytkowane',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'użytkowane',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Typ zgłoszenia',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incydent',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incydent',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'zgłoszenie serwisowe',
@@ -445,8 +445,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nazwa umowy SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -549,3 +547,12 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('PL PL', 'Polish', 'Polski', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
@@ -19,37 +19,37 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos terminando em menos de 30 dias',
 	'Menu:ProviderContract' => 'Contratos de provedores(as)',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Contratos de clientes',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => '',
 	'Menu:ServiceSubcategory' => 'Subcategorias de serviços',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => '',
 	'Menu:Service' => 'Serviços',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => '',
+	'Menu:ServiceElement' => 'Elementos de seviços',
+	'Menu:ServiceElement+' => '',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Lista de Acordos de Nível de Serviço (ANSs)',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Lista de Níveis Mínimos de Serviço (NMSs)',
 	'Menu:DeliveryModel' => 'Modelos de entrega',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => '',
 	'Menu:ServiceFamily' => 'Família de serviços',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => '',
 	'Contract:baseinfo' => 'General information~~',
 	'Contract:moreinfo' => 'Contractual information~~',
 	'Contract:cost' => 'Cost information~~',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -249,7 +249,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:Service/Attribute:contacts_list' => 'Contatos',
 	'Class:Service/Attribute:contacts_list+' => 'Todos os Contatos associados à este Serviço',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Em homologação',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
@@ -325,7 +325,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Em produção',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo de solicitação',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidente',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Solicitação de serviço',
@@ -445,8 +445,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nome do SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -549,3 +547,12 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ru.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/ru.dict.itop-service-mgmt-provider.php
@@ -27,6 +27,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Menu:ServiceSubcategory+' => 'Подкатегории услуг',
 	'Menu:Service' => 'Услуги',
 	'Menu:Service+' => 'Услуги',
+	'Menu:ServiceElement' => 'Элементы услуг',
+	'Menu:ServiceElement+' => 'Элементы услуг',
 	'Menu:SLA' => 'SLA',
 	'Menu:SLA+' => 'Соглашения об уровне услуг',
 	'Menu:SLT' => 'SLT',
@@ -35,22 +37,20 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Menu:DeliveryModel+' => 'Модели предоставления услуг (Delivery Models)',
 	'Menu:ServiceFamily' => 'Пакеты услуг',
 	'Menu:ServiceFamily+' => 'Пакеты услуг',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Contract:baseinfo' => 'General information~~',
 	'Contract:moreinfo' => 'Contractual information~~',
 	'Contract:cost' => 'Cost information~~',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -250,7 +250,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:Service/Attribute:contacts_list' => 'Контакты',
 	'Class:Service/Attribute:contacts_list+' => 'Связанные контакты',
 	'Class:Service/Attribute:status' => 'Статус',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Внедрение',
 	'Class:Service/Attribute:status/Value:implementation+' => 'Внедрение',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Устаревший',
@@ -326,7 +326,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Эксплуатация',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'Эксплуатация',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Тип запроса',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'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' => 'Запрос на обслуживание',
@@ -446,8 +446,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -550,3 +548,12 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('RU RU', 'Russian', 'Русский', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/sk.dict.itop-service-mgmt-provider.php
@@ -19,37 +19,37 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'zmluvy podla stavu',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'zmluvy končiace za menej ako 30 dní',
 	'Menu:ProviderContract' => 'Poskytovateľské zmluvy',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => 'Provider contracts~~',
 	'Menu:CustomerContract' => 'Zákaznícke zmluvy',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => 'Customer contracts~~',
 	'Menu:ServiceSubcategory' => 'Subkategórie služieb',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => 'Service subcategories~~',
 	'Menu:Service' => 'Služby',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Services~~',
+	'Menu:ServiceElement' => 'Prvky služby',
+	'Menu:ServiceElement+' => 'Sevice elements~~',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Service Level Agreements~~',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Service Level Targets~~',
 	'Menu:DeliveryModel' => 'Typy dodávky',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => 'Delivery models~~',
 	'Menu:ServiceFamily' => 'Rodiny služieb',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => 'Service families~~',
 	'Contract:baseinfo' => 'General information~~',
 	'Contract:moreinfo' => 'Contractual information~~',
 	'Contract:cost' => 'Cost information~~',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -325,7 +325,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'Produkcia',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Typ požiadavky',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Požiadavka',
@@ -445,8 +445,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '~~',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Názov',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -549,3 +547,12 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php
@@ -26,30 +26,30 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Menu:ServiceSubcategory+' => 'Hizmet alt kategorileri',
 	'Menu:Service' => 'Hizmetler',
 	'Menu:Service+' => 'Hizmetler',
+	'Menu:ServiceElement' => 'Sevice elements~~',
+	'Menu:ServiceElement+' => 'Sevice elements~~',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Hizmet Seviyesi Anlaşmaları',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Hizmet Seviyesi Taahütleri',
 	'Menu:DeliveryModel' => 'Delivery models~~',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => 'Delivery models~~',
 	'Menu:ServiceFamily' => 'Service families~~',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => 'Service families~~',
 	'Contract:baseinfo' => 'General information~~',
 	'Contract:moreinfo' => 'Contractual information~~',
 	'Contract:cost' => 'Cost information~~',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -249,7 +249,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:Service/Attribute:contacts_list' => 'Contacts~~',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
 	'Class:Service/Attribute:status' => 'Durum',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'implementation~~',
 	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Üretimden Kalkan',
@@ -325,7 +325,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => 'production~~',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => 'production~~',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type~~',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request~~',
@@ -445,8 +445,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '~~',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name~~',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -549,3 +547,12 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('TR TR', 'Turkish', 'Türkçe', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/zh_cn.dict.itop-service-mgmt-provider.php
@@ -49,6 +49,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:ServiceSubcategory+' => '子服务',
 	'Menu:Service' => '服务',
 	'Menu:Service+' => '服务',
+	'Menu:ServiceElement' => '服务元素',
+	'Menu:ServiceElement+' => '服务元素',
 	'Menu:SLA' => 'SLA',
 	'Menu:SLA+' => '服务等级协议',
 	'Menu:SLT' => 'SLT',
@@ -57,22 +59,20 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:DeliveryModel+' => '交付模式',
 	'Menu:ServiceFamily' => '服务系列',
 	'Menu:ServiceFamily+' => '服务系列',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Contract:baseinfo' => '常规信息',
 	'Contract:moreinfo' => '合同信息',
 	'Contract:cost' => '费用信息',
 ]);

+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
+
 //
 // Class: Organization
 //
@@ -272,7 +272,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Service/Attribute:contacts_list' => '联系人',
 	'Class:Service/Attribute:contacts_list+' => '此服务相关的所有联系人',
 	'Class:Service/Attribute:status' => '状态',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => '启用',
 	'Class:Service/Attribute:status/Value:implementation+' => '启用',
 	'Class:Service/Attribute:status/Value:obsolete' => '废弃',
@@ -348,7 +348,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => '生产',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '生产',
 	'Class:ServiceSubcategory/Attribute:request_type' => '需求类型',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'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' => '服务需求',
@@ -468,8 +468,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA名称',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);

 //
@@ -572,3 +570,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
+]);
--- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
+++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml
@@ -1223,8 +1223,8 @@ public function PrefillSearchForm(&$aContextParam)
            </value>
          </values>
          <sql>status</sql>
-          <default_value>implementation</default_value>
-          <is_null_allowed>false</is_null_allowed>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
          <display_style>list</display_style>
        </field>
        <field id="icon" xsi:type="AttributeImage">
@@ -1664,8 +1664,8 @@ public function PrefillSearchForm(&$aContextParam)
            </value>
          </values>
          <sql>status</sql>
-          <default_value>implementation</default_value>
-          <is_null_allowed>false</is_null_allowed>
+          <default_value/>
+          <is_null_allowed>true</is_null_allowed>
          <display_style>list</display_style>
        </field>
      </fields>
@@ -2693,9 +2693,14 @@ public function PrefillSearchForm(&$aContextParam)
      </style>
    </menu>
    <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="must_exist">
+      <rank>10</rank>
+      <parent>WelcomeMenu</parent>
      <definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
        <cells>
          <cell id="0">
+            <rank>0</rank>
            <dashlets>
              <dashlet id="6" xsi:type="DashletBadge" _delta="define">
                <rank>5</rank>
@@ -2738,196 +2743,49 @@ public function PrefillSearchForm(&$aContextParam)
    </menu>
    <menu id="CustomerContract" xsi:type="OQLMenuNode" _delta="define">
      <rank>1</rank>
-      <parent>Service:Overview</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT CustomerContract</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="ProviderContract" xsi:type="OQLMenuNode" _delta="define">
      <rank>2</rank>
-      <parent>Service:Overview</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT ProviderContract</oql>
      <do_search>1</do_search>
    </menu>
-    <menu id="ServiceCatalog" xsi:type="DashboardMenuNode" _delta="define">
-      <rank>10</rank>
-      <parent>ServiceManagement</parent>
-      <definition>
-        <layout>DashboardLayoutTwoCols</layout>
-        <title>UI-ServiceCatalogMenu-Title</title>
-        <auto_reload>
-          <enabled>false</enabled>
-          <interval>300</interval>
-        </auto_reload>
-        <cells>
-          <cell id="0">
-            <rank>0</rank>
-            <dashlets>
-              <dashlet id="CatalogBadgesHeader" xsi:type="DashletHeaderStatic">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-Title</title>
-                <icon></icon>
-              </dashlet>
-              <dashlet id="ServiceFamily" xsi:type="DashletBadge">
-                <rank>1</rank>
-                <class>ServiceFamily</class>
-              </dashlet>
-              <dashlet id="Service" xsi:type="DashletBadge">
-                <rank>2</rank>
-                <class>Service</class>
-              </dashlet>
-              <dashlet id="ServiceSubcategory" xsi:type="DashletBadge">
-                <rank>3</rank>
-                <class>ServiceSubcategory</class>
-              </dashlet>
-              <dashlet id="SLA" xsi:type="DashletBadge">
-                <rank>4</rank>
-                <class>SLA</class>
-              </dashlet>
-              <dashlet id="SLT" xsi:type="DashletBadge">
-                <rank>5</rank>
-                <class>SLT</class>
-              </dashlet>
-              <dashlet id="DeliveryModel" xsi:type="DashletObjectList">
-                <rank>6</rank>
-                <title>Class:DeliveryModel</title>
-                <query>SELECT DeliveryModel</query>
-                <menu>true</menu>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="1">
-            <rank>1</rank>
-            <dashlets>
-              <dashlet id="NotInPortalHeader" xsi:type="DashletHeaderStatic">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-NotInPortal</title>
-                <icon></icon>
-              </dashlet>
-              <dashlet id="ServiceByStatus" xsi:type="DashletHeaderDynamic">
-                <rank>1</rank>
-                <title>Class:Service</title>
-                <icon>../images/icons/icons8-service.svg</icon>
-                <subtitle>UI-ServiceCatalogMenu-OnlyProductionInPortal</subtitle>
-                <query>SELECT Service</query>
-                <group_by>status</group_by>
-                <values>implementation,obsolete,production</values>
-              </dashlet>
-              <dashlet id="ServiceSubcategoryByStatus" xsi:type="DashletHeaderDynamic">
-                <rank>2</rank>
-                <title>Class:ServiceSubcategory</title>
-                <icon>../images/icons/icons8-services.svg</icon>
-                <subtitle>UI-ServiceCatalogMenu-OnlyProductionInPortal</subtitle>
-                <query>SELECT ServiceSubcategory</query>
-                <group_by>status</group_by>
-                <values>implementation,obsolete,production</values>
-              </dashlet>
-              <dashlet id="ServiceWithoutFamily" xsi:type="DashletObjectList">
-                <rank>3</rank>
-                <title>UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal</title>
-                <query>SELECT Service WHERE servicefamily_id=0</query>
-                <menu>false</menu>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="2">
-            <rank>2</rank>
-            <dashlets>
-              <dashlet id="SLTBySLA" xsi:type="DashletGroupByTable">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-SLTBySLA</title>
-                <query>SELECT lnkSLAToSLT</query>
-                <group_by>sla_id</group_by>
-                <style>table</style>
-                <aggregation_function>count</aggregation_function>
-                <aggregation_attribute></aggregation_attribute>
-                <limit></limit>
-                <order_by>attribute</order_by>
-                <order_direction>desc</order_direction>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="3">
-            <rank>3</rank>
-            <dashlets>
-              <dashlet id="ContractByService" xsi:type="DashletGroupByTable">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-ContractByService</title>
-                <query>SELECT lnkCustomerContractToService AS lnk JOIN CustomerContract AS cc ON lnk.customercontract_id=cc.id WHERE cc.status != 'obsolete'</query>
-                <group_by>service_id</group_by>
-                <style>table</style>
-                <aggregation_function>count</aggregation_function>
-                <aggregation_attribute></aggregation_attribute>
-                <limit></limit>
-                <order_by>attribute</order_by>
-                <order_direction>desc</order_direction>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="4">
-            <rank>4</rank>
-            <dashlets>
-              <dashlet id="ContractBySLA" xsi:type="DashletGroupByTable">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-ContractBySLA</title>
-                <query>SELECT lnkCustomerContractToService AS lnk JOIN CustomerContract AS cc ON lnk.customercontract_id=cc.id WHERE cc.status != 'obsolete'</query>
-                <group_by>sla_id</group_by>
-                <style>table</style>
-                <aggregation_function>count</aggregation_function>
-                <aggregation_attribute></aggregation_attribute>
-                <limit></limit>
-                <order_by>attribute</order_by>
-                <order_direction>desc</order_direction>
-              </dashlet>
-            </dashlets>
-          </cell>
-          <cell id="5">
-            <rank>5</rank>
-            <dashlets>
-              <dashlet id="UnusedService" xsi:type="DashletObjectList">
-                <rank>0</rank>
-                <title>UI-ServiceCatalogMenu-UnusedService</title>
-                <query>SELECT Service WHERE status='production' AND id NOT IN (SELECT Service AS s JOIN lnkCustomerContractToService AS lnk ON lnk.service_id= s.id JOIN CustomerContract AS cc ON lnk.customercontract_id = cc.id WHERE cc.status != 'obsolete')
-                </query>
-                <menu>false</menu>
-              </dashlet>
-            </dashlets>
-          </cell>
-        </cells>
-      </definition>
-    </menu>
    <menu id="ServiceFamily" xsi:type="OQLMenuNode" _delta="define">
      <rank>3</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT ServiceFamily</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="Service" xsi:type="OQLMenuNode" _delta="define">
      <rank>4</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT Service</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="ServiceSubcategory" xsi:type="OQLMenuNode" _delta="define">
      <rank>5</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT ServiceSubcategory</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="SLA" xsi:type="OQLMenuNode" _delta="define">
      <rank>6</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT SLA</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="SLT" xsi:type="OQLMenuNode" _delta="define">
      <rank>7</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT SLT</oql>
      <do_search>1</do_search>
    </menu>
    <menu id="DeliveryModel" xsi:type="OQLMenuNode" _delta="define">
      <rank>8</rank>
-      <parent>ServiceCatalog</parent>
+      <parent>ServiceManagement</parent>
      <oql>SELECT DeliveryModel</oql>
      <do_search>1</do_search>
    </menu>
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/cs.dict.itop-service-mgmt.php
@@ -28,6 +28,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Menu:ServiceSubcategory+' => 'Podkategorie služeb',
 	'Menu:Service' => 'Služby',
 	'Menu:Service+' => 'Služby',
+	'Menu:ServiceElement' => 'Prvky služby',
+	'Menu:ServiceElement+' => 'Prvky služby',
 	'Menu:SLA' => 'SLA - dohody o úrovních služeb',
 	'Menu:SLA+' => 'Dohody o úrovních služeb',
 	'Menu:SLT' => 'SLT - cíle úrovní služeb',
@@ -38,17 +40,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Menu:ServiceFamily+' => 'Balíčky (kategorie) služeb',
 	'Menu:Procedure' => 'Katalog postupů',
 	'Menu:Procedure+' => 'Katalog všech postupů',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Contract:baseinfo' => 'Obecné informace',
 	'Contract:moreinfo' => 'Smluvní informace',
 	'Contract:cost' => 'Informace o nákladech',
@@ -237,7 +228,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:Service/Attribute:contacts_list' => 'Kontakty',
 	'Class:Service/Attribute:contacts_list+' => 'Všechny kontakty pro tuto službu',
 	'Class:Service/Attribute:status' => 'Stav',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'implementace',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'zastaralá',
@@ -309,7 +300,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Název služby',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Typ požadavku',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'požadavek na službu',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
@@ -27,25 +27,16 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Menu:ServiceSubcategory+' => 'Ydelses underkategorier',
 	'Menu:Service' => 'Ydelser',
 	'Menu:Service+' => 'Ydelser',
+	'Menu:ServiceElement' => 'Ydelses elementer',
+	'Menu:ServiceElement+' => '',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Service Level Agreements',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Service Level Targets',
 	'Menu:DeliveryModel' => 'Leverings model(ler)',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => '',
 	'Menu:ServiceFamily' => 'Ydelses familie(r)',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => '',
 	'Menu:Procedure' => 'Procedure katalog',
 	'Menu:Procedure+' => '',
 	'Contract:baseinfo' => 'General information~~',
@@ -236,7 +227,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:Service/Attribute:contacts_list' => 'Kontakter',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implementering',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Forældet',
@@ -308,7 +299,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Ydelse',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Anmodnings type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Service Anmodning',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/de.dict.itop-service-mgmt.php
@@ -20,32 +20,23 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Verträge nach Status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Verträge, die in weniger als 30 Tagen auslaufen',
 	'Menu:ProviderContract' => 'Provider-Verträge',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => 'Provider-Verträge',
 	'Menu:CustomerContract' => 'Kundenverträge',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => 'Kundenverträge',
 	'Menu:ServiceSubcategory' => 'Service-Unterkategorien',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => 'Service-Unterkategorien',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Service-Elemente',
+	'Menu:ServiceElement+' => 'Service-Elemente',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Service Level Agreements (SLAs)',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Service Level Targets (SLTs)',
 	'Menu:DeliveryModel' => 'Delivery-Modelle',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => 'Delivery-Modelle',
 	'Menu:ServiceFamily' => 'Service-Familien',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => 'Service-Familien',
 	'Menu:Procedure' => 'Verfahrens-Katalog',
 	'Menu:Procedure+' => '',
 	'Contract:baseinfo' => 'Allgemeine Informationen',
@@ -236,7 +227,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:Service/Attribute:contacts_list' => 'Kontakte',
 	'Class:Service/Attribute:contacts_list+' => 'Alle mit dem Service verknüpften Kontakte',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implementation',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsolet (Veraltet)',
@@ -308,7 +299,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Service',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Request-Typ',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Service-Request',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/en.dict.itop-service-mgmt.php
@@ -32,9 +32,8 @@
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+

-//
 // Menu, fieldsets, UI, messages translations
-//
+
 Dict::Add('EN US', 'English', 'English', [
 	'Menu:ServiceManagement' => 'Service management',
 	'Menu:ServiceManagement+' => 'Service management overview',
@@ -43,36 +42,27 @@ Dict::Add('EN US', 'English', 'English', [
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less than 30 days',
-
 	'Menu:ProviderContract' => 'Provider contracts',
-	'Menu:ProviderContract+' => 'What is bought to external companies',
+	'Menu:ProviderContract+' => 'Provider contracts',
 	'Menu:CustomerContract' => 'Customer contracts',
-	'Menu:CustomerContract+' => 'Who is buying the services',
+	'Menu:CustomerContract+' => 'Customer contracts',
 	'Menu:ServiceSubcategory' => 'Service subcategories',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy',
+	'Menu:ServiceSubcategory+' => 'Service subcategories',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second level in service hierarchy',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Sevice elements',
+	'Menu:ServiceElement+' => 'Sevice elements',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Service Level Agreements',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Service Level Targets',
 	'Menu:DeliveryModel' => 'Delivery models',
-	'Menu:DeliveryModel+' => 'Teams handling tickets',
+	'Menu:DeliveryModel+' => 'Delivery models',
 	'Menu:ServiceFamily' => 'Service families',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy',
-	'Menu:ServiceCatalog' => 'Service catalog',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA',
-
+	'Menu:ServiceFamily+' => 'Service families',
 	'Menu:Procedure' => 'Procedures catalog',
 	'Menu:Procedure+' => 'All procedures catalog',
+
 	'Contract:baseinfo' => 'General information',
 	'Contract:moreinfo' => 'Contractual information',
 	'Contract:cost'     => 'Cost information',
@@ -95,7 +85,7 @@ The delivery model specifies the teams to which tickets can be assigned.',

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ContractType' => 'Contract Type',
-	'Class:ContractType+' => 'Typology for categorizing Customer and Provider Contracts.',
+	'Class:ContractType+' => '',
 ]);

 //
@@ -104,7 +94,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Contract' => 'Contract',
-	'Class:Contract+' => 'Abstract class to handle fields common to the different contract sub-classes.',
+	'Class:Contract+' => '',
 	'Class:Contract/Attribute:name' => 'Name',
 	'Class:Contract/Attribute:name+' => '',
 	'Class:Contract/Attribute:org_id' => 'Customer',
@@ -138,11 +128,11 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Contract/Attribute:cost_unit' => 'Cost unit',
 	'Class:Contract/Attribute:cost_unit+' => '',
 	'Class:Contract/Attribute:provider_id' => 'Provider',
-	'Class:Contract/Attribute:provider_id+' => 'Provider organization for this contract. Can be different from the provider of the associated services.',
+	'Class:Contract/Attribute:provider_id+' => '',
 	'Class:Contract/Attribute:provider_name' => 'Provider Name',
 	'Class:Contract/Attribute:provider_name+' => 'Common name',
 	'Class:Contract/Attribute:status' => 'Status',
-	'Class:Contract/Attribute:status+' => 'The status is not computed based on start and end dates. It must be set manually.',
+	'Class:Contract/Attribute:status+' => '',
 	'Class:Contract/Attribute:status/Value:implementation' => 'implementation',
 	'Class:Contract/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:Contract/Attribute:status/Value:obsolete' => 'obsolete',
@@ -158,7 +148,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:CustomerContract' => 'Customer Contract',
-	'Class:CustomerContract+' => 'Agreement between a client and a provider for the delivery of services with an optional level of commitment (SLA, Coverage Window).',
+	'Class:CustomerContract+' => '',
 	'Class:CustomerContract/Attribute:services_list' => 'Services',
 	'Class:CustomerContract/Attribute:services_list+' => 'All the services purchased for this contract',
 ]);
@@ -169,13 +159,13 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ProviderContract' => 'Provider Contract',
-	'Class:ProviderContract+' => 'Agreement between an external provider and an internal organization.',
+	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
 	'Class:ProviderContract/Attribute:functionalcis_list+' => 'All the configuration items covered by this provider contract',
 	'Class:ProviderContract/Attribute:sla' => 'SLA',
 	'Class:ProviderContract/Attribute:sla+' => 'Service Level Agreement',
 	'Class:ProviderContract/Attribute:coverage' => 'Service hours',
-	'Class:ProviderContract/Attribute:coverage+' => 'Temporal coverage of the contract, e.g. 24x7, 9x5, etc.',
+	'Class:ProviderContract/Attribute:coverage+' => '',
 	'Class:ProviderContract/Attribute:contracttype_id' => 'Contract type',
 	'Class:ProviderContract/Attribute:contracttype_id+' => '',
 	'Class:ProviderContract/Attribute:contracttype_name' => 'Contract type name',
@@ -190,7 +180,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContactToContract' => 'Link Contact / Contract',
-	'Class:lnkContactToContract+' => 'Manages key contacts on each customer or provider contract.',
+	'Class:lnkContactToContract+' => '',
 	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contract',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
@@ -208,7 +198,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContractToDocument' => 'Link Contract / Document',
-	'Class:lnkContractToDocument+' => 'Link used when a Document is applicable to a Contract.',
+	'Class:lnkContractToDocument+' => '',
 	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contract',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
@@ -226,7 +216,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ServiceFamily' => 'Service Family',
-	'Class:ServiceFamily+' => 'Top level of Service hierarchy. Required for Services to be proposed in User Portal.',
+	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => 'Name',
 	'Class:ServiceFamily/Attribute:name+' => '',
 	'Class:ServiceFamily/Attribute:icon' => 'Icon',
@@ -241,7 +231,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:Service' => 'Service',
-	'Class:Service+' => 'A Service is delivered by an organization and subscribed to through a Contract Client. It must contain at least one Service Subcategory.',
+	'Class:Service+' => '',
 	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Name',
 	'Class:Service/Attribute:name+' => '',
@@ -260,7 +250,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:Service/Attribute:contacts_list' => 'Contacts',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'implementation',
 	'Class:Service/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:Service/Attribute:status/Value:obsolete' => 'obsolete',
@@ -285,7 +275,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkDocumentToService' => 'Link Document / Service',
-	'Class:lnkDocumentToService+' => 'Link used when a Document is applicable to a Service.',
+	'Class:lnkDocumentToService+' => '',
 	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
@@ -303,7 +293,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContactToService' => 'Link Contact / Service',
-	'Class:lnkContactToService+' => 'Ideal for defining the team to which Tickets created on the related Service will be assigned (automatically or manually).',
+	'Class:lnkContactToService+' => '',
 	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
@@ -321,7 +311,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:ServiceSubcategory' => 'Service Subcategory',
-	'Class:ServiceSubcategory+' => 'Lowest level in Service hierarchy. User Request are usually associated to one Service Subcategory.',
+	'Class:ServiceSubcategory+' => '',
 	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
 	'Class:ServiceSubcategory/Attribute:name' => 'Name',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
@@ -332,13 +322,13 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Service name',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'service request',
 	'Class:ServiceSubcategory/Attribute:status' => 'Status',
-	'Class:ServiceSubcategory/Attribute:status+' => 'Service subcategory status has usually an impact on User Portal visibility.',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'implementation',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'obsolete',
@@ -353,7 +343,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:SLA' => 'SLA',
-	'Class:SLA+' => 'Service Level Agreement (SLA) applicable to a Service subscribed by a customer and measured using SLTs.',
+	'Class:SLA+' => '',
 	'Class:SLA/Attribute:name' => 'Name',
 	'Class:SLA/Attribute:name+' => '',
 	'Class:SLA/Attribute:description' => 'description',
@@ -375,11 +365,11 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:SLT' => 'SLT',
-	'Class:SLT+' => 'Service Level Target under a Service Level Agreement (SLA). Defines a maximum time for a metric (TTO or TTR), a request type (Incident or Request) and a priority.',
+	'Class:SLT+' => '',
 	'Class:SLT/Attribute:name' => 'Name',
 	'Class:SLT/Attribute:name+' => '',
 	'Class:SLT/Attribute:priority' => 'Priority',
-	'Class:SLT/Attribute:priority+' => 'Ticket priority to which this SLT applies. Only tickets with this priority must comply with this SLT.',
+	'Class:SLT/Attribute:priority+' => '',
 	'Class:SLT/Attribute:priority/Value:1' => 'critical',
 	'Class:SLT/Attribute:priority/Value:1+' => 'critical',
 	'Class:SLT/Attribute:priority/Value:2' => 'high',
@@ -389,21 +379,21 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:SLT/Attribute:priority/Value:4' => 'low',
 	'Class:SLT/Attribute:priority/Value:4+' => 'low',
 	'Class:SLT/Attribute:request_type' => 'Request type',
-	'Class:SLT/Attribute:request_type+' => 'Request type to which this SLT applies. Only tickets with this request type must comply with this SLT.',
+	'Class:SLT/Attribute:request_type+' => '',
 	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
 	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:SLT/Attribute:request_type/Value:service_request' => 'service request',
 	'Class:SLT/Attribute:request_type/Value:service_request+' => 'service request',
 	'Class:SLT/Attribute:metric' => 'Metric',
-	'Class:SLT/Attribute:metric+' => 'Delay type to which this SLT applies. TTO (Time To Own) or TTR (Time To Resolve).',
+	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
 	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
 	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
 	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
 	'Class:SLT/Attribute:value' => 'Value',
-	'Class:SLT/Attribute:value+' => 'Delay value which must not be exceeded to be compliant with the target. The unit is defined in the "unit" attribute.',
+	'Class:SLT/Attribute:value+' => '',
 	'Class:SLT/Attribute:unit' => 'Unit',
-	'Class:SLT/Attribute:unit+' => 'Unit for the delay value.',
+	'Class:SLT/Attribute:unit+' => '',
 	'Class:SLT/Attribute:unit/Value:hours' => 'hours',
 	'Class:SLT/Attribute:unit/Value:hours+' => 'hours',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes',
@@ -418,7 +408,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
-	'Class:lnkSLAToSLT+' => 'This link indicates that an SLT is included in the Service Level Agreement (SLA). An SLA usually contains several SLTs. An SLT can be reused as is by several SLAs (seldom).',
+	'Class:lnkSLAToSLT+' => '',
 	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
@@ -446,22 +436,20 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkCustomerContractToService' => 'Link Customer Contract / Service',
-	'Class:lnkCustomerContractToService+' => 'A single line of a customer contract, specifying the Service provided and, for this service, the subscribed commitment levels (Service Level Aggrement and Coverage Window).',
+	'Class:lnkCustomerContractToService+' => '',
 	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Customer contract',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Customer contract Name',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => 'All service subcategories linked to this service are also included by the contract.',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Service Name',
 	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => 'Service Level Agreement applicable to this service for this customer contract.',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA Name',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
 ]);

 //
@@ -469,8 +457,8 @@ Dict::Add('EN US', 'English', 'English', [
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:lnkProviderContractToService' => 'Link ProviderContract / Service',
-	'Class:lnkProviderContractToService+' => 'This link can model that a provider contract enables the delivery of a Service.',
+	'Class:lnkProviderContractToService' => 'Link Provider Contract / Service',
+	'Class:lnkProviderContractToService+' => '',
 	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
@@ -480,8 +468,6 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Provider contract Name',
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:provider_id' => 'Provider id',
-	'Class:lnkProviderContractToService/Attribute:provider_id+' => '',
 ]);

 //
@@ -490,8 +476,7 @@ Dict::Add('EN US', 'English', 'English', [

 Dict::Add('EN US', 'English', 'English', [
 	'Class:DeliveryModel' => 'Delivery Model',
-	'Class:DeliveryModel+' => 'The Delivery Model specifies the Teams that can be assigned to Tickets; it must contain at least one Team in the Contacts tab.
-Each client Organization must have a defined Delivery Model.',
+	'Class:DeliveryModel+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Name',
 	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organization',
@@ -511,8 +496,8 @@ Each client Organization must have a defined Delivery Model.',
 //

 Dict::Add('EN US', 'English', 'English', [
-	'Class:lnkDeliveryModelToContact' => 'Link DeliveryModel / Contact',
-	'Class:lnkDeliveryModelToContact+' => 'This link specifies the role of a Team (more rarely a Person) within a Delivery Model.',
+	'Class:lnkDeliveryModelToContact' => 'Link Delivery Model / Contact',
+	'Class:lnkDeliveryModelToContact+' => '',
 	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Delivery model',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
@@ -549,3 +534,21 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
+]);
+
+//
+// Class: lnkProviderContractToService
+//
+
+Dict::Add('EN US', 'English', 'English', [
+	'Class:lnkProviderContractToService/Attribute:provider_id' => 'Provider id',
+	'Class:lnkProviderContractToService/Attribute:provider_id+' => '',
+]);
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/en_gb.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/en_gb.dict.itop-service-mgmt.php
@@ -43,34 +43,26 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less than 30 days',
 	'Menu:ProviderContract' => 'Provider contracts',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
+	'Menu:ProviderContract+' => 'Provider contracts',
 	'Menu:CustomerContract' => 'Customer contracts',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
+	'Menu:CustomerContract+' => 'Customer contracts',
 	'Menu:ServiceSubcategory' => 'Service subcategories',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => 'Service subcategories',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Sevice elements',
+	'Menu:ServiceElement+' => 'Sevice elements',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Service Level Agreements',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Service Level Targets',
 	'Menu:DeliveryModel' => 'Delivery models',
-	'Menu:DeliveryModel+' => 'Teams handling tickets',
+	'Menu:DeliveryModel+' => 'Delivery models',
 	'Menu:ServiceFamily' => 'Service families',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => 'Service families',
 	'Menu:Procedure' => 'Procedures catalogue',
 	'Menu:Procedure+' => 'All procedures catalogue',
+
 	'Contract:baseinfo' => 'General information',
 	'Contract:moreinfo' => 'Contractual information',
 	'Contract:cost' => 'Cost information',
@@ -258,7 +250,7 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:Service/Attribute:contacts_list' => 'Contacts',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'implementation',
 	'Class:Service/Attribute:status/Value:implementation+' => 'implementation',
 	'Class:Service/Attribute:status/Value:obsolete' => 'obsolete',
@@ -330,7 +322,7 @@ Dict::Add('EN GB', 'British English', 'British English', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Service name',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Request type',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'service request',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
@@ -24,6 +24,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Menu:ServiceSubcategory+' => 'Subcategorías de servicio',
 	'Menu:Service' => 'Servicios',
 	'Menu:Service+' => 'Servicios',
+	'Menu:ServiceElement' => 'Elementos del servicio',
+	'Menu:ServiceElement+' => 'Elementos del servicio',
 	'Menu:SLA' => 'SLAs - Acuerdos de Nivel de Servicio',
 	'Menu:SLA+' => 'Acuerdos de Nivel de Servicio',
 	'Menu:SLT' => 'SLTs - Objetivos de Nivel de Servicio',
@@ -32,17 +34,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Menu:DeliveryModel+' => 'Modelos de entrega',
 	'Menu:ServiceFamily' => 'Familias de servicio',
 	'Menu:ServiceFamily+' => 'Familias de servicio',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Menu:Procedure' => 'Catálogo de procedimientos',
 	'Menu:Procedure+' => 'Catálogo de procedimientos',
 	'Contract:baseinfo' => 'Información General',
@@ -199,13 +190,13 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:ServiceFamily' => 'Familia de Servicios',
-	'Class:ServiceFamily+' => '',
+	'Class:ServiceFamily+' => 'Familia de Servicios',
 	'Class:ServiceFamily/Attribute:name' => 'Nombre',
 	'Class:ServiceFamily/Attribute:name+' => 'Nombre de la Familia de Servicios',
 	'Class:ServiceFamily/Attribute:icon' => 'Icono',
 	'Class:ServiceFamily/Attribute:icon+' => '',
 	'Class:ServiceFamily/Attribute:services_list' => 'Servicios',
-	'Class:ServiceFamily/Attribute:services_list+' => '',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Servicios',
 ]);

 //
@@ -214,7 +205,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Service' => 'Servicio',
-	'Class:Service+' => '',
+	'Class:Service+' => 'Servicio',
 	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Nombre',
 	'Class:Service/Attribute:name+' => 'Nombre del Servicio',
@@ -233,7 +224,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Service/Attribute:contacts_list' => 'Contactos',
 	'Class:Service/Attribute:contacts_list+' => 'Contactos',
 	'Class:Service/Attribute:status' => 'Estatus',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => 'Estatus',
 	'Class:Service/Attribute:status/Value:implementation' => 'No Productivo',
 	'Class:Service/Attribute:status/Value:implementation+' => 'No Productivo',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
@@ -241,7 +232,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:Service/Attribute:status/Value:production' => 'Productivo',
 	'Class:Service/Attribute:status/Value:production+' => 'Productivo',
 	'Class:Service/Attribute:icon' => 'Icono',
-	'Class:Service/Attribute:icon+' => '',
+	'Class:Service/Attribute:icon+' => 'Icono',
 	'Class:Service/Attribute:customercontracts_list' => 'Acuerdos con Clientes',
 	'Class:Service/Attribute:customercontracts_list+' => 'Acuerdos con Clientes',
 	'Class:Service/Attribute:providercontracts_list' => 'Contratos con Proveedores',
@@ -299,19 +290,19 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:ServiceSubcategory/Attribute:name' => 'Nombre',
 	'Class:ServiceSubcategory/Attribute:name+' => 'Nombre de la Subcategoria',
 	'Class:ServiceSubcategory/Attribute:description' => 'Descripción',
-	'Class:ServiceSubcategory/Attribute:description+' => '',
+	'Class:ServiceSubcategory/Attribute:description+' => 'Descripción',
 	'Class:ServiceSubcategory/Attribute:service_id' => 'Servicio',
-	'Class:ServiceSubcategory/Attribute:service_id+' => '',
+	'Class:ServiceSubcategory/Attribute:service_id+' => 'Servicio',
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Servicio',
 	'Class:ServiceSubcategory/Attribute:service_name+' => 'Servicio',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo de Reporte',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => 'Tipo de Reporte',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidente',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'Incidente',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Requerimiento de Servicio',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'Requerimiento de Servicio',
 	'Class:ServiceSubcategory/Attribute:status' => 'Estatus',
-	'Class:ServiceSubcategory/Attribute:status+' => '',
+	'Class:ServiceSubcategory/Attribute:status+' => 'Estatus',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'No Productivo',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => 'No Productivo',
 	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Obsoleto',
@@ -326,19 +317,19 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SLA' => 'SLA - Acuerdo de Nivel de Servicio',
-	'Class:SLA+' => '',
+	'Class:SLA+' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA/Attribute:name' => 'Nombre',
 	'Class:SLA/Attribute:name+' => 'Nombre del SLA',
 	'Class:SLA/Attribute:description' => 'Descripción',
-	'Class:SLA/Attribute:description+' => '',
+	'Class:SLA/Attribute:description+' => 'Descripción',
 	'Class:SLA/Attribute:org_id' => 'Proveedor',
-	'Class:SLA/Attribute:org_id+' => '',
+	'Class:SLA/Attribute:org_id+' => 'Proveedor',
 	'Class:SLA/Attribute:organization_name' => 'Proveedor',
 	'Class:SLA/Attribute:organization_name+' => 'Proveedor',
 	'Class:SLA/Attribute:slts_list' => 'SLTs - Objetivos de Nivel de Servicio',
 	'Class:SLA/Attribute:slts_list+' => 'Objetivos de Nivel de Servicio',
 	'Class:SLA/Attribute:customercontracts_list' => 'Acuerdos con Clientes',
-	'Class:SLA/Attribute:customercontracts_list+' => '',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Acuerdos con Clientes',
 	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'No se puede guardar relación de Acuerco con Cliente %1$s con Servicio %2$s : El SLA ya existe',
 ]);

@@ -348,11 +339,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SLT' => 'SLT - Objetivos de Nivel de Servicio',
-	'Class:SLT+' => '',
+	'Class:SLT+' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT/Attribute:name' => 'Nombre',
 	'Class:SLT/Attribute:name+' => 'Nombre del SLT',
 	'Class:SLT/Attribute:priority' => 'Prioridad',
-	'Class:SLT/Attribute:priority+' => '',
+	'Class:SLT/Attribute:priority+' => 'Prioridad',
 	'Class:SLT/Attribute:priority/Value:1' => 'Crítico',
 	'Class:SLT/Attribute:priority/Value:1+' => 'Crítico',
 	'Class:SLT/Attribute:priority/Value:2' => 'Alto',
@@ -362,21 +353,21 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SLT/Attribute:priority/Value:4' => 'Bajo',
 	'Class:SLT/Attribute:priority/Value:4+' => 'Bajo',
 	'Class:SLT/Attribute:request_type' => 'Tipo de Reporte',
-	'Class:SLT/Attribute:request_type+' => '',
+	'Class:SLT/Attribute:request_type+' => 'Tipo de Reporte',
 	'Class:SLT/Attribute:request_type/Value:incident' => 'Incidente',
 	'Class:SLT/Attribute:request_type/Value:incident+' => 'Incidente',
 	'Class:SLT/Attribute:request_type/Value:service_request' => 'Requerimiento de Servicio',
 	'Class:SLT/Attribute:request_type/Value:service_request+' => 'Requerimiento de Servicio',
 	'Class:SLT/Attribute:metric' => 'Métrica',
-	'Class:SLT/Attribute:metric+' => '',
+	'Class:SLT/Attribute:metric+' => 'Métrica',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TDA - Tiempo de Asignación',
 	'Class:SLT/Attribute:metric/Value:tto+' => 'Tiempo de Asignación',
 	'Class:SLT/Attribute:metric/Value:ttr' => 'TDS - Tiempo de Solución',
 	'Class:SLT/Attribute:metric/Value:ttr+' => 'Tiempo de Solución',
 	'Class:SLT/Attribute:value' => 'Valor',
-	'Class:SLT/Attribute:value+' => '',
+	'Class:SLT/Attribute:value+' => 'Valor',
 	'Class:SLT/Attribute:unit' => 'Unidad',
-	'Class:SLT/Attribute:unit+' => '',
+	'Class:SLT/Attribute:unit+' => 'Unidad',
 	'Class:SLT/Attribute:unit/Value:hours' => 'Horas',
 	'Class:SLT/Attribute:unit/Value:hours+' => 'Horas',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'Minutos',
@@ -459,19 +450,19 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [

 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:DeliveryModel' => 'Modelo de Entrega',
-	'Class:DeliveryModel+' => '',
+	'Class:DeliveryModel+' => 'Modelo de Entrega',
 	'Class:DeliveryModel/Attribute:name' => 'Nombre',
 	'Class:DeliveryModel/Attribute:name+' => 'Nombre del Modelo de Entrega',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organización',
-	'Class:DeliveryModel/Attribute:org_id+' => '',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Organización',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Organización',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Organización',
 	'Class:DeliveryModel/Attribute:description' => 'Descripción',
-	'Class:DeliveryModel/Attribute:description+' => '',
+	'Class:DeliveryModel/Attribute:description+' => 'Descripción',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Contactos',
-	'Class:DeliveryModel/Attribute:contacts_list+' => '',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Contactos',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Clientes',
-	'Class:DeliveryModel/Attribute:customers_list+' => '',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Clientes',
 ]);

 //
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/fr.dict.itop-service-mgmt.php
@@ -19,34 +19,25 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats, par état',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins d\'un mois',
 	'Menu:ProviderContract' => 'Contrats fournisseurs',
-	'Menu:ProviderContract+' => 'Ce qui est acheté à des sociétés externes',
+	'Menu:ProviderContract+' => 'Contrats fournisseurs',
 	'Menu:CustomerContract' => 'Contrats clients',
-	'Menu:CustomerContract+' => 'Qui achète quels services',
-	'Menu:ServiceSubcategory' => 'Sous-catégories de service',
-	'Menu:ServiceSubcategory+' => 'Dernier niveau dans la hiérarchie des services',
+	'Menu:CustomerContract+' => 'Contrats clients',
+	'Menu:ServiceSubcategory' => 'Sous catégories de service',
+	'Menu:ServiceSubcategory+' => 'Sous catégories de service',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second niveau dans la hiérarchie des services',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Eléments de service',
+	'Menu:ServiceElement+' => 'Eléments de service',
 	'Menu:SLA' => 'SLAs',
 	'Menu:SLA+' => 'Accords de niveau de service (SLA)',
 	'Menu:SLT' => 'SLTs',
 	'Menu:SLT+' => 'Objectifs de niveau de service (SLT)',
 	'Menu:DeliveryModel' => 'Modèles de support',
-	'Menu:DeliveryModel+' => 'Les équipes gérant les tickets',
+	'Menu:DeliveryModel+' => 'Modèles de support',
 	'Menu:ServiceFamily' => 'Familles de service',
-	'Menu:ServiceFamily+' => 'Plus haut niveau dans la hiérarchie des services',
-	'Menu:ServiceCatalog' => 'Catalogue de services',
-	'Menu:ServiceCatalog+' => 'Définir les éléments des offres de service',
-	'UI-ServiceCatalogMenu-Title' => 'Catalogue de services',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Seuls les Services et Sous-catégories en production sont affichés dans le portail utilisateur',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services en production sans contrat client',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Non affichés dans le portail utilisateur',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Les services sans famille de service sont invisibles dans le portail utilisateur',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Nombre de SLTs par SLA',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Nombre de contrats clients utilisant ce service',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Nombre de contrats clients utilisant ce SLA',
-
+	'Menu:ServiceFamily+' => 'Familles de service',
 	'Menu:Procedure' => 'Catalogue des procédures',
-	'Menu:Procedure+' => '',
+	'Menu:Procedure+' => 'Catalogue des procédures',
 	'Contract:baseinfo' => 'Information générale',
 	'Contract:moreinfo' => 'Aspects contractuels',
 	'Contract:cost' => 'Coûts',
@@ -68,7 +59,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ContractType' => 'Type de contrat',
-	'Class:ContractType+' => 'Typologie pour catégoriser les Contrats Client et Fournisseur.',
+	'Class:ContractType+' => '',
 ]);

 //
@@ -77,7 +68,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Contract' => 'Contrat',
-	'Class:Contract+' => 'Classe abstraite qui gére les caractéristiques communes aux différents types de contrat.',
+	'Class:Contract+' => '',
 	'Class:Contract/Attribute:name' => 'Nom',
 	'Class:Contract/Attribute:name+' => '',
 	'Class:Contract/Attribute:org_id' => 'Client',
@@ -111,11 +102,11 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Contract/Attribute:cost_unit' => 'Unité de coût',
 	'Class:Contract/Attribute:cost_unit+' => '',
 	'Class:Contract/Attribute:provider_id' => 'Fournisseur',
-	'Class:Contract/Attribute:provider_id+' => 'Fournisseur du contrat. Parfois différent du fournisseur des services liés à ce contrat.',
+	'Class:Contract/Attribute:provider_id+' => '',
 	'Class:Contract/Attribute:provider_name' => 'Nom Fournisseur',
 	'Class:Contract/Attribute:provider_name+' => '',
 	'Class:Contract/Attribute:status' => 'Etat',
-	'Class:Contract/Attribute:status+' => 'L\'état du contrat n\'est pas calculé en fonction des dates de début et de fin. Il doit être mis à jour indépendamment.',
+	'Class:Contract/Attribute:status+' => '',
 	'Class:Contract/Attribute:status/Value:implementation' => 'Implémentation',
 	'Class:Contract/Attribute:status/Value:implementation+' => '',
 	'Class:Contract/Attribute:status/Value:obsolete' => 'Obsolète',
@@ -131,7 +122,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:CustomerContract' => 'Contrat client',
-	'Class:CustomerContract+' => 'Accord entre un client et un fournisseur pour la délivrance de Services associés éventuellement à des niveaux d\'engagement (Niveau de service, Fenêtre de couverture).',
+	'Class:CustomerContract+' => '',
 	'Class:CustomerContract/Attribute:services_list' => 'Services',
 	'Class:CustomerContract/Attribute:services_list+' => 'Tous les services achetés pour ce contrat',
 ]);
@@ -142,13 +133,13 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ProviderContract' => 'Contrat fournisseur',
-	'Class:ProviderContract+' => 'Accord entre un fournisseur externe et une organisation interne.',
+	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'CIs',
 	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Tous les éléments de configuration couverts par ce contrat fournisseur',
 	'Class:ProviderContract/Attribute:sla' => 'Niveau de service',
 	'Class:ProviderContract/Attribute:sla+' => 'Accord de niveau de service (SLA)',
 	'Class:ProviderContract/Attribute:coverage' => 'Couverture',
-	'Class:ProviderContract/Attribute:coverage+' => 'Fenêtre de couverture temporelle pour ce contrat fournisseur',
+	'Class:ProviderContract/Attribute:coverage+' => '',
 	'Class:ProviderContract/Attribute:contracttype_id' => 'Type de contrat',
 	'Class:ProviderContract/Attribute:contracttype_id+' => '',
 	'Class:ProviderContract/Attribute:contracttype_name' => 'Nom Type de contrat',
@@ -163,7 +154,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkContactToContract' => 'Lien Contact / Contrat',
-	'Class:lnkContactToContract+' => 'Gère les contacts clés sur chaque contract client ou fournisseur.',
+	'Class:lnkContactToContract+' => '',
 	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrat',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
@@ -181,7 +172,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkContractToDocument' => 'Lien Contrat / Document',
-	'Class:lnkContractToDocument+' => 'Lien utilisé lorsqu\'un Document est applicable à un Contract.',
+	'Class:lnkContractToDocument+' => '',
 	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrat',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
@@ -198,8 +189,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:ServiceFamily' => 'Famille de services',
-	'Class:ServiceFamily+' => 'Premier niveau dans la hiérarchie des Services. Obligatoire pour qu\'un Service soit proposé dans le Portail Utilisateur.',
+	'Class:ServiceFamily' => 'Famille de service',
+	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => 'Nom',
 	'Class:ServiceFamily/Attribute:name+' => '',
 	'Class:ServiceFamily/Attribute:icon' => 'Icône',
@@ -214,7 +205,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Service' => 'Service',
-	'Class:Service+' => 'Un Service est délivré par une organisation et souscrit par le biais de Contract Client. Il doit au moins contenir une Sous catégorie de Service.',
+	'Class:Service+' => '',
 	'Class:Service/ComplementaryName' => '%1$s - %2$s',
 	'Class:Service/Attribute:name' => 'Nom',
 	'Class:Service/Attribute:name+' => '',
@@ -239,7 +230,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Service/Attribute:contacts_list' => 'Contacts',
 	'Class:Service/Attribute:contacts_list+' => 'Tous les contacts liés à ce service',
 	'Class:Service/Attribute:status' => 'Etat',
-	'Class:Service/Attribute:status+' => 'Seuls les services en production sont visibles des utilisateurs du portail.',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implémentation',
 	'Class:Service/Attribute:status/Value:implementation+' => '',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsolète',
@@ -253,9 +244,9 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:Service/Attribute:providercontracts_list' => 'Contrats fournisseur',
 	'Class:Service/Attribute:providercontracts_list+' => 'Tous les contrats fournisseurs qui offrent du support pour ce service',
 	'Class:Service/Attribute:functionalcis_list' => 'CIs',
-	'Class:Service/Attribute:functionalcis_list+' => 'Tous les éléments de configuration utilisés pour fournir ce service',
-	'Class:Service/Attribute:servicesubcategories_list' => 'Sous-catégories de service',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'Toutes les sous-catégories de service pour ce service',
+	'Class:Service/Attribute:functionalcis_list+' => 'Tous les éléments de configuration utilsiés pour fournir ce service',
+	'Class:Service/Attribute:servicesubcategories_list' => 'Sous catégories de service',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Toutes les sous catégories de service pour ce service',
 	'Class:Service/Attribute:servicesubcategories_list/UI:Links:Create:Button+' => 'Créer une %4$s',
 	'Class:Service/Attribute:servicesubcategories_list/UI:Links:Create:Modal:Title' => 'Ajouter une %4$s à %2$s',
 	'Class:Service/Attribute:servicesubcategories_list/UI:Links:Delete:Button+' => 'Supprimer cette %4$s',
@@ -270,7 +261,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDocumentToService' => 'Lien Document / Service',
-	'Class:lnkDocumentToService+' => 'Lien utilisé lorsqu\'un Document est applicable à un Service.',
+	'Class:lnkDocumentToService+' => '',
 	'Class:lnkDocumentToService/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Service',
 	'Class:lnkDocumentToService/Attribute:service_id+' => '',
@@ -288,7 +279,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkContactToService' => 'Lien Contact / Service',
-	'Class:lnkContactToService+' => 'Idéal pour définir l\'équipe à laquelle on affectera (automatiquement ou manuellement) les Tickets créés sur le Service lié.',
+	'Class:lnkContactToService+' => '',
 	'Class:lnkContactToService/Name' => '%1$s / %2$s',
 	'Class:lnkContactToService/Attribute:service_id' => 'Service',
 	'Class:lnkContactToService/Attribute:service_id+' => '',
@@ -305,8 +296,8 @@ Dict::Add('FR FR', 'French', 'Français', [
 //

 Dict::Add('FR FR', 'French', 'Français', [
-	'Class:ServiceSubcategory' => 'Sous-catégorie de service',
-	'Class:ServiceSubcategory+' => 'Dernier niveau dans la hiérarchie des Services. Chaque Demande utilisateur se réfère à une Sous-catégorie de service.',
+	'Class:ServiceSubcategory' => 'Sous catégorie de service',
+	'Class:ServiceSubcategory+' => '',
 	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nom',
 	'Class:ServiceSubcategory/Attribute:name+' => '',
@@ -317,13 +308,13 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Nom Service',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Type de requête',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Définit le type de Ticket (Incident ou Demande de service) qui sera créé lorsqu\'un utilisateur du Portail sélectionne cette sous-catégorie de service',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incident',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'demande de service',
-	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => '',
+	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => 'demande de service',
 	'Class:ServiceSubcategory/Attribute:status' => 'Etat',
-	'Class:ServiceSubcategory/Attribute:status+' => 'L\'état d\'une sous-catégorie de service conditionne sa visibilité dans le portail utilisateur.',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => 'Implémentation',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '',
 	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => 'Obsolète',
@@ -338,7 +329,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:SLA' => 'Niveau de service',
-	'Class:SLA+' => 'Accord de niveau de service (SLA) applicable à un Service souscrit par un client et mesuré à l\'aide de SLTs.',
+	'Class:SLA+' => '',
 	'Class:SLA/Attribute:name' => 'Nom',
 	'Class:SLA/Attribute:name+' => '',
 	'Class:SLA/Attribute:description' => 'Description',
@@ -366,39 +357,39 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:SLT' => 'SLT',
-	'Class:SLT+' => 'Objectif mesurable au sein d\'un Niveau de service (SLA). Défini un délai maximum pour une métrique (TTO ou TTR), un type de requête (Incident ou Demande) et une priorité.',
+	'Class:SLT+' => 'Objectif de niveau de service (SLT)',
 	'Class:SLT/Attribute:name' => 'Nom',
 	'Class:SLT/Attribute:name+' => '',
 	'Class:SLT/Attribute:priority' => 'Priorité',
-	'Class:SLT/Attribute:priority+' => 'Priorité du ticket pour laquelle cet objectif est applicable',
+	'Class:SLT/Attribute:priority+' => '',
 	'Class:SLT/Attribute:priority/Value:1' => 'critique',
-	'Class:SLT/Attribute:priority/Value:1+' => '',
+	'Class:SLT/Attribute:priority/Value:1+' => 'critique',
 	'Class:SLT/Attribute:priority/Value:2' => 'haute',
-	'Class:SLT/Attribute:priority/Value:2+' => '',
+	'Class:SLT/Attribute:priority/Value:2+' => 'haute',
 	'Class:SLT/Attribute:priority/Value:3' => 'moyenne',
-	'Class:SLT/Attribute:priority/Value:3+' => '',
+	'Class:SLT/Attribute:priority/Value:3+' => 'moyenne',
 	'Class:SLT/Attribute:priority/Value:4' => 'basse',
-	'Class:SLT/Attribute:priority/Value:4+' => '',
+	'Class:SLT/Attribute:priority/Value:4+' => 'basse',
 	'Class:SLT/Attribute:request_type' => 'Type de requête',
-	'Class:SLT/Attribute:request_type+' => 'Type de requête pour laquelle cet objectif est applicable',
+	'Class:SLT/Attribute:request_type+' => '',
 	'Class:SLT/Attribute:request_type/Value:incident' => 'incident',
-	'Class:SLT/Attribute:request_type/Value:incident+' => '',
+	'Class:SLT/Attribute:request_type/Value:incident+' => 'incident',
 	'Class:SLT/Attribute:request_type/Value:service_request' => 'demande de service',
-	'Class:SLT/Attribute:request_type/Value:service_request+' => '',
+	'Class:SLT/Attribute:request_type/Value:service_request+' => 'demande de service',
 	'Class:SLT/Attribute:metric' => 'Métrique',
-	'Class:SLT/Attribute:metric+' => 'Délai contrôlé par cet objectif (temps de prise en charge ou temps de résolution)',
+	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
-	'Class:SLT/Attribute:metric/Value:tto+' => 'Délai de prise en charge',
+	'Class:SLT/Attribute:metric/Value:tto+' => 'TTO',
 	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
-	'Class:SLT/Attribute:metric/Value:ttr+' => 'Délai de résolution',
+	'Class:SLT/Attribute:metric/Value:ttr+' => 'TTR',
 	'Class:SLT/Attribute:value' => 'Valeur',
-	'Class:SLT/Attribute:value+' => 'Valeur à ne pas dépasser pour la métrique et le type de requête définis',
+	'Class:SLT/Attribute:value+' => '',
 	'Class:SLT/Attribute:unit' => 'Unité',
-	'Class:SLT/Attribute:unit+' => 'Unité à appliquer à la valeur',
+	'Class:SLT/Attribute:unit+' => '',
 	'Class:SLT/Attribute:unit/Value:hours' => 'heures',
-	'Class:SLT/Attribute:unit/Value:hours+' => '',
+	'Class:SLT/Attribute:unit/Value:hours+' => 'heures',
 	'Class:SLT/Attribute:unit/Value:minutes' => 'minutes',
-	'Class:SLT/Attribute:unit/Value:minutes+' => '',
+	'Class:SLT/Attribute:unit/Value:minutes+' => 'minutes',
 	'Class:SLT/Attribute:slas_list' => 'SLAs',
 	'Class:SLT/Attribute:slas_list+' => 'Tous les niveaux de service utilisant cet objectif',
 ]);
@@ -409,7 +400,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkSLAToSLT' => 'Lien SLA / SLT',
-	'Class:lnkSLAToSLT+' => 'Ce lien indique qu\'un SLT est inclus dans le Niveau de service (SLA). Un SLA contient le plus souvent plusieurs SLTs. Un SLT peut être réutilisé à l\'identique par plusieurs Niveau de service (rare).',
+	'Class:lnkSLAToSLT+' => '',
 	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
 	'Class:lnkSLAToSLT/Attribute:sla_id+' => '',
@@ -437,22 +428,20 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkCustomerContractToService' => 'Lien Contrat client / Service',
-	'Class:lnkCustomerContractToService+' => 'Un ligne unitaire d\'un Contract client, qui spécifie le Service fourni et pour ce service les niveaux d\'engagement souscrits (Niveau de service et fenêtre de couverture).',
+	'Class:lnkCustomerContractToService+' => '',
 	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrat client',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => 'Nom contrat client',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_id' => 'Service',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => 'Toutes les sous-catégories de service liées à ce service sont aussi incluses dans ce contrat client',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_name' => 'Nom service',
 	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => 'Niveau d\'engagement pour ce service dans le cadre de ce contrat client',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'Nom SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Fournisseur',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
 ]);

 //
@@ -461,7 +450,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkProviderContractToService' => 'Lien Contrat fournisseur / Service',
-	'Class:lnkProviderContractToService+' => 'Ce lien peut modéliser qu\'un Contrat fournisseur permet la délivrance d\'un Service.',
+	'Class:lnkProviderContractToService+' => '',
 	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Service',
 	'Class:lnkProviderContractToService/Attribute:service_id+' => '',
@@ -471,8 +460,6 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:providercontract_name' => 'Nom contrat fournisseur',
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:provider_id' => 'Fournisseur',
-	'Class:lnkProviderContractToService/Attribute:provider_id+' => '',
 ]);

 //
@@ -481,8 +468,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:DeliveryModel' => 'Modèle de support',
-	'Class:DeliveryModel+' => 'Le Modèle de support spécifie les équipes pouvant être affectées aux Tickets, il doit contenir au minimum une Équipe dans l\'onglet Contacts.
-	Chaque Organisation cliente doit avoir un Modèle de support défini.',
+	'Class:DeliveryModel+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Nom du modèle de support',
 	'Class:DeliveryModel/Attribute:name+' => 'Attachez à ce modèle les équipes qui géreront les tickets',
 	'Class:DeliveryModel/Attribute:org_id' => 'Organisation',
@@ -509,7 +495,7 @@ Dict::Add('FR FR', 'French', 'Français', [

 Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkDeliveryModelToContact' => 'Lien Modèle de support / Contact',
-	'Class:lnkDeliveryModelToContact+' => 'Ce lien spécifie le rôle d\'une équipe (plus rarement d\'une Personne) dans le cadre d\'un Modèle de support.',
+	'Class:lnkDeliveryModelToContact+' => '',
 	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modèle de support',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
@@ -546,3 +532,21 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:lnkContractToDocument/Attribute:provider_id' => 'Fournisseur',
 	'Class:lnkContractToDocument/Attribute:provider_id+' => '',
 ]);
+
+//
+// Class: lnkCustomerContractToService
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Fournisseur',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
+]);
+
+//
+// Class: lnkProviderContractToService
+//
+
+Dict::Add('FR FR', 'French', 'Français', [
+	'Class:lnkProviderContractToService/Attribute:provider_id' => 'Fournisseur',
+	'Class:lnkProviderContractToService/Attribute:provider_id+' => '',
+]);
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/hu.dict.itop-service-mgmt.php
@@ -23,9 +23,11 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Menu:CustomerContract' => 'Ügyfélszerződések',
 	'Menu:CustomerContract+' => 'Aki a szolgáltatást igénybe veszi',
 	'Menu:ServiceSubcategory' => 'Szolgáltatás alkategóriák',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ServiceSubcategory+' => '',
 	'Menu:Service' => 'Szolgáltatások',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => '',
+	'Menu:ServiceElement' => 'Szolgáltatáselemek',
+	'Menu:ServiceElement+' => 'Szolgáltatás összetevői',
 	'Menu:SLA' => 'SLA-k',
 	'Menu:SLA+' => 'Szolgáltatásszint megállapodás',
 	'Menu:SLT' => 'SLT-k',
@@ -34,17 +36,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Menu:DeliveryModel+' => 'Ki kinek szolgáltat',
 	'Menu:ServiceFamily' => 'Szolgáltatáscsaládok',
 	'Menu:ServiceFamily+' => 'Hasonló célú szolgáltatások csoportosítása',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Menu:Procedure' => 'Eljáráskatalógus',
 	'Menu:Procedure+' => 'Eljárások gyűjteménye',
 	'Contract:baseinfo' => 'General information~~',
@@ -235,7 +226,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:Service/Attribute:contacts_list' => 'Kapcsolattartók',
 	'Class:Service/Attribute:contacts_list+' => 'A szolgáltatás kapcsolattartói',
 	'Class:Service/Attribute:status' => 'Állapot',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Megvalósítás alatt',
 	'Class:Service/Attribute:status/Value:implementation+' => 'implementation~~',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Elavult',
@@ -307,7 +298,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Szolgáltatás',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Kérelem típus',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incidens',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Szolgáltatáskérelem',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
@@ -18,33 +18,24 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratti per livello di servizio',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratti per stato',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratti che terminano in meno di 30 giorni',
-	'Menu:ProviderContract' => 'Contratti con Provider',
-	'Menu:ProviderContract+' => 'What is bought to external companies~~',
-	'Menu:CustomerContract' => 'Contratti con Clienti',
-	'Menu:CustomerContract+' => 'Who is buying the services~~',
-	'Menu:ServiceSubcategory' => 'Sottocategorie di Servizio',
-	'Menu:ServiceSubcategory+' => 'Lowest level in service hierarchy~~',
+	'Menu:ProviderContract' => 'Contratti con provider',
+	'Menu:ProviderContract+' => 'Contratti con provider',
+	'Menu:CustomerContract' => 'Contratti con clienti',
+	'Menu:CustomerContract+' => 'Contratti con clienti',
+	'Menu:ServiceSubcategory' => 'Sottocategorie di servizio',
+	'Menu:ServiceSubcategory+' => 'Sottocategorie di servizio',
 	'Menu:Service' => 'Servizi',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Servizi',
+	'Menu:ServiceElement' => 'Elementi del Servizio',
+	'Menu:ServiceElement+' => 'Elementi del Servizio',
 	'Menu:SLA' => 'SLA',
 	'Menu:SLA+' => 'Accordi di Livello di Servizio',
 	'Menu:SLT' => 'SLT',
 	'Menu:SLT+' => 'Obiettivi di Livello di Servizio',
 	'Menu:DeliveryModel' => 'Modelli di Consegna',
-	'Menu:DeliveryModel+' => 'Teams handling tickets~~',
+	'Menu:DeliveryModel+' => 'Modelli di Consegna',
 	'Menu:ServiceFamily' => 'Famiglie di Servizi',
-	'Menu:ServiceFamily+' => 'Top level in service hierarchy~~',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
+	'Menu:ServiceFamily+' => 'Famiglie di Servizi',
 	'Menu:Procedure' => 'Catalogo delle Procedure',
 	'Menu:Procedure+' => 'Tutti i cataloghi delle procedure',
 	'Contract:baseinfo' => 'Informazioni Generali',
@@ -306,7 +297,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Servizio',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '~~',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Tipo di Richiesta',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incidente',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incident~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'richiesta di servizio',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
@@ -26,6 +26,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Menu:ServiceSubcategory+' => 'サービスサブカテゴリ',
 	'Menu:Service' => 'サービス',
 	'Menu:Service+' => 'サービス',
+	'Menu:ServiceElement' => 'サービス要素',
+	'Menu:ServiceElement+' => 'サービス要素',
 	'Menu:SLA' => 'SLA',
 	'Menu:SLA+' => 'サービスレベルアグリーメント',
 	'Menu:SLT' => 'SLT',
@@ -34,17 +36,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Menu:DeliveryModel+' => '提供モデル',
 	'Menu:ServiceFamily' => 'サービスファミリ',
 	'Menu:ServiceFamily+' => 'サービスファミリ',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Menu:Procedure' => '手順カタログ',
 	'Menu:Procedure+' => '全ての手順カタログ',
 	'Contract:baseinfo' => 'General information~~',
@@ -234,7 +225,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:Service/Attribute:contacts_list' => '連絡先',
 	'Class:Service/Attribute:contacts_list+' => 'All the contacts for this service~~',
 	'Class:Service/Attribute:status' => '状態',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => '実装中',
 	'Class:Service/Attribute:status/Value:implementation+' => '実装中',
 	'Class:Service/Attribute:status/Value:obsolete' => '廃止済み',
@@ -306,7 +297,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'サービス名',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => '要求タイプ',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'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' => 'サービス要求',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/nl.dict.itop-service-mgmt.php
@@ -27,7 +27,9 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Menu:ServiceSubcategory' => 'Subcategorieën services',
 	'Menu:ServiceSubcategory+' => 'Subcategorieën services',
 	'Menu:Service' => 'Services',
-	'Menu:Service+' => 'Second level in service hierarchy~~',
+	'Menu:Service+' => 'Services',
+	'Menu:ServiceElement' => 'Service-elementen',
+	'Menu:ServiceElement+' => 'Service-elementen',
 	'Menu:SLA' => 'SLA\'s',
 	'Menu:SLA+' => 'Service Level Agreements',
 	'Menu:SLT' => 'SLT\'s',
@@ -36,17 +38,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Menu:DeliveryModel+' => 'Leveringsmodellen',
 	'Menu:ServiceFamily' => 'Servicecategorieën',
 	'Menu:ServiceFamily+' => 'Servicecategorieën',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Menu:Procedure' => 'Procedurecatalogus',
 	'Menu:Procedure+' => 'Alle procedures in een catalogus',
 	'Contract:baseinfo' => 'Algemene informatie',
@@ -236,7 +227,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Service/Attribute:contacts_list' => 'Contacten',
 	'Class:Service/Attribute:contacts_list+' => 'Alle contacten voor deze service',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Implementatie',
 	'Class:Service/Attribute:status/Value:implementation+' => 'Implementatie',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Buiten gebruik',
@@ -308,7 +299,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Naam service',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Soort verzoek',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'Incident',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'Serviceverzoek',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/pl.dict.itop-service-mgmt.php
@@ -26,6 +26,8 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Menu:ServiceSubcategory+' => 'Podkategorie usług',
 	'Menu:Service' => 'Usługi',
 	'Menu:Service+' => 'Usługi',
+	'Menu:ServiceElement' => 'Elementy usługi',
+	'Menu:ServiceElement+' => 'Elementy usługi',
 	'Menu:SLA' => 'Umowy SLA',
 	'Menu:SLA+' => 'Umowy gwarantowanych poziomów usług',
 	'Menu:SLT' => 'SLTs',
@@ -34,17 +36,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Menu:DeliveryModel+' => 'Modele obsługi',
 	'Menu:ServiceFamily' => 'Rodziny usług',
 	'Menu:ServiceFamily+' => 'Rodziny usług',
-	'Menu:ServiceCatalog' => 'Service catalog~~',
-	'Menu:ServiceCatalog+' => 'Define the service elements of your offering~~',
-	'UI-ServiceCatalogMenu-Title' => 'Service catalog~~',
-	'UI-ServiceCatalogMenu-NotInPortal' => 'Not displayed in User Portal~~',
-	'UI-ServiceCatalogMenu-OnlyProductionInPortal' => 'Only Service and Subcategory on production are visible in User Portal~~',
-	'UI-ServiceCatalogMenu-UnusedService' => 'Services not used by any Customers~~',
-	'UI-ServiceCatalogMenu-ServiceWithoutFamilyNotInPortal' => 'Services without Service Family are not visible in User Portal~~',
-	'UI-ServiceCatalogMenu-SLTBySLA' => 'Count SLTs on each SLA~~',
-	'UI-ServiceCatalogMenu-ContractByService' => 'Count Contracts using a Service~~',
-	'UI-ServiceCatalogMenu-ContractBySLA' => 'Count Contracts using an SLA~~',
-
 	'Menu:Procedure' => 'Katalog procedur',
 	'Menu:Procedure+' => 'Katalog wszystkich procedur',
 	'Contract:baseinfo' => 'Informacje ogólne',
@@ -234,7 +225,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:Service/Attribute:contacts_list' => 'Kontakty',
 	'Class:Service/Attribute:contacts_list+' => 'Wszystkie kontakty do tej usługi',
 	'Class:Service/Attribute:status' => 'Status',
-	'Class:Service/Attribute:status+' => 'By default only Service in production are visible by Portal users~~',
+	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'wdrażane',
 	'Class:Service/Attribute:status/Value:implementation+' => 'wdrażane',
 	'Class:Service/Attribute:status/Value:obsolete' => 'wycofane',
@@ -306,7 +297,7 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:ServiceSubcategory/Attribute:service_name' => 'Nazwa usługi',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => 'Typ zgłoszenia',
-	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
+	'Class:ServiceSubcategory/Attribute:request_type+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => 'incydent',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => 'incydent',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => 'zgłoszenie serwisowe',
--- a/Show More
+++ b/Show More