N°4465 - Polishing iTop 3.0 beta6 - fix "configure this list"

N°4465 Fix tagset and enumset dropdown overflowing out of the screen and not autoplacing themselves
N°4465 Fix transition button not grouping/ungrouping in some cases
2026-04-09 11:48:44 +02:00 · 2021-11-23 15:34:53 +01:00 · 2021-11-23 13:33:08 +01:00 · 2021-11-23 11:51:31 +01:00 · 2021-11-23 11:40:52 +01:00 · 2021-11-23 11:32:26 +01:00
133 changed files with 5389 additions and 1938 deletions
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -2193,7 +2193,11 @@ HTML;
 						$sStyle = 'style="'.implode('; ', $aStyles).'"';
 					}

+					$aTextareaCssClasses = [];
+
 					if ($oAttDef->GetEditClass() == 'OQLExpression') {
+						$aTextareaCssClasses[] = 'ibo-query-oql';
+						$aTextareaCssClasses[] = 'ibo-is-code';
 						// N°3227 button to open predefined queries dialog
 						$sPredefinedBtnId = 'predef_btn_'.$sFieldPrefix.$sAttCode.$sNameSuffix;
 						$sSearchQueryLbl = Dict::S('UI:Edit:SearchQuery');
@@ -2263,14 +2267,16 @@ JS
 					} else {
 						$sAdditionalStuff = '';
 					}
+
 					// Ok, the text area is drawn here
+					$sTextareCssClassesAsString = implode(' ', $aTextareaCssClasses);
 					$sHTMLValue = <<<HTML
 {$sAdditionalStuff}
 <div class="field_input_zone field_input_text ibo-input-wrapper ibo-input-text-wrapper" data-validation="untouched">
 	<div class="f_i_text_header">
 		<span class="fullscreen_button" title="{$sFullscreenLabelForHtml}"></span>
 	</div>
-	<textarea class="ibo-input ibo-input-text" title="{$sHelpText}" name="attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}" rows="8" cols="40" id="{$iId}" {$sStyle} >{$sEditValueForHtml}</textarea>
+	<textarea class="ibo-input ibo-input-text {$sTextareCssClassesAsString}" title="{$sHelpText}" name="attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}" rows="8" cols="40" id="{$iId}" {$sStyle} >{$sEditValueForHtml}</textarea>
 </div>
 {$sValidationSpan}{$sReloadSpan}
 HTML;
@@ -2414,7 +2420,6 @@ EOF
 		<span class="fas fa-trash"></span>
 	</button>
 </div>
-<br/>
 <input title="{$sHelpText}" name="attr_{$sFieldPrefix}{$sAttCode}{$sNameSuffix}[fcontents]" type="file" id="file_{$iId}" onChange="UpdateFileName('{$iId}', this.value)"/>
 {$sValidationSpan}{$sReloadSpan}
 HTML;
@@ -3638,7 +3643,7 @@ HTML;
 					$sDownloadUrl = $oDocument->GetDownloadURL(get_class($this), $this->GetKey(), $sAttCode);

 					$sDisplayValue = <<<HTML
-{$sFieldAsHtml}<br>
+{$sFieldAsHtml}
 <a href="{$sDisplayUrl}" target="_blank">{$sDisplayLabel}</a> / <a href="{$sDownloadUrl}">{$sDownloadLabel}</a>
 HTML;
 				} else {
--- a/application/dashboard.class.inc.php
+++ b/application/dashboard.class.inc.php
@@ -860,28 +860,29 @@ class RuntimeDashboard extends Dashboard
 	{
 		$bCustomized = false;

-		if (!appUserPreferences::GetPref('display_original_dashboard_'.$sDashBoardId, false))
-		{
+		$sDashboardFileSanitized = utils::RealPath($sDashboardFile, APPROOT);
+		if (false === $sDashboardFileSanitized) {
+			throw new SecurityException('Invalid dashboard file !');
+		}
+
+		if (!appUserPreferences::GetPref('display_original_dashboard_'.$sDashBoardId, false)) {
 			// Search for an eventual user defined dashboard
 			$oUDSearch = new DBObjectSearch('UserDashboard');
 			$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
 			$oUDSearch->AddCondition('menu_code', $sDashBoardId, '=');
 			$oUDSet = new DBObjectSet($oUDSearch);
-			if ($oUDSet->Count() > 0)
-			{
+			if ($oUDSet->Count() > 0) {
 				// Assuming there is at most one couple {user, menu}!
 				$oUserDashboard = $oUDSet->Fetch();
 				$sDashboardDefinition = $oUserDashboard->Get('contents');
 				$bCustomized = true;
-			}
-			else
-			{
-				$sDashboardDefinition = @file_get_contents($sDashboardFile);
+			} else {
+				$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
 			}
 		}
 		else
 		{
-			$sDashboardDefinition = @file_get_contents($sDashboardFile);
+			$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
 		}

 		if ($sDashboardDefinition !== false)
@@ -889,7 +890,7 @@ class RuntimeDashboard extends Dashboard
 			$oDashboard = new RuntimeDashboard($sDashBoardId);
 			$oDashboard->FromXml($sDashboardDefinition);
 			$oDashboard->SetCustomFlag($bCustomized);
-			$oDashboard->SetDefinitionFile($sDashboardFile);
+			$oDashboard->SetDefinitionFile($sDashboardFileSanitized);
 		} else {
 			$oDashboard = null;
 		}
--- a/application/dashlet.class.inc.php
+++ b/application/dashlet.class.inc.php
@@ -1008,7 +1008,8 @@ HTML;

 		$oField = new DesignerLongTextField('query', Dict::S('UI:DashletObjectList:Prop-Query'), $this->aProperties['query']);
 		$oField->SetMandatory();
-		$oField->AddCSSClass("ibo-queryoql");
+		$oField->AddCSSClass("ibo-query-oql");
+		$oField->AddCSSClass("ibo-is-code");
 		$oForm->AddField($oField);

 		$oField = new DesignerBooleanField('menu', Dict::S('UI:DashletObjectList:Prop-Menu'), $this->aProperties['menu']);
@@ -1045,7 +1046,8 @@ HTML;

 		$oField = new DesignerHiddenField('query', Dict::S('UI:DashletObjectList:Prop-Query'), $sOQL);
 		$oField->SetMandatory();
-		$oField->AddCSSClass("ibo-queryoql");
+		$oField->AddCSSClass("ibo-query-oql");
+		$oField->AddCSSClass("ibo-is-code");
 		$oForm->AddField($oField);

 		$oField = new DesignerBooleanField('menu', Dict::S('UI:DashletObjectList:Prop-Menu'), $this->aProperties['menu']);
@@ -1395,7 +1397,8 @@ abstract class DashletGroupBy extends Dashlet

 		$oField = new DesignerLongTextField('query', Dict::S('UI:DashletGroupBy:Prop-Query'), $this->aProperties['query']);
 		$oField->SetMandatory();
-		$oField->AddCSSClass("ibo-queryoql");
+		$oField->AddCSSClass("ibo-query-oql");
+		$oField->AddCSSClass("ibo-is-code");
 		$oForm->AddField($oField);

 		try {
@@ -1652,7 +1655,8 @@ abstract class DashletGroupBy extends Dashlet

 		$oField = new DesignerHiddenField('query', Dict::S('UI:DashletGroupBy:Prop-Query'), $sOQL);
 		$oField->SetMandatory();
-		$oField->AddCSSClass("ibo-queryoql");
+		$oField->AddCSSClass("ibo-query-oql");
+		$oField->AddCSSClass("ibo-is-code");
 		$oForm->AddField($oField);

 		if (!is_null($sOQL)) {
@@ -2225,7 +2229,8 @@ class DashletHeaderDynamic extends Dashlet

 		$oField = new DesignerLongTextField('query', Dict::S('UI:DashletHeaderDynamic:Prop-Query'), $this->aProperties['query']);
 		$oField->SetMandatory();
-		$oField->AddCSSClass("ibo-queryoql");
+		$oField->AddCSSClass("ibo-query-oql");
+		$oField->AddCSSClass("ibo-is-code");
 		$oForm->AddField($oField);

 		try
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -2332,6 +2332,8 @@ class MenuBlock extends DisplayBlock

 				$sTarget = isset($aAction['target']) ? $aAction['target'] : '';
 				$oActionButton = ButtonUIBlockFactory::MakeLinkNeutral($sUrl, $sLabel, $sIconClass, $sTarget, utils::Sanitize($sActionId, '', utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER));
+				// ResourceId should not be sanitized
+				$oActionButton->AddDataAttribute('resource-id', $sActionId);
 				$oActionButton->AddCSSClasses(['ibo-action-button', 'ibo-regular-action-button']);
 				if (empty($sLabel)) {
 					if (empty($aAction['tooltip'])) {
--- a/application/query.class.inc.php
+++ b/application/query.class.inc.php
@@ -126,7 +126,7 @@ class QueryOQL extends Query
 	function DisplayBareProperties(WebPage $oPage, $bEditMode = false, $sPrefix = '', $aExtraParams = array())
 	{
 		$aFieldsMap = parent::DisplayBareProperties($oPage, $bEditMode, $sPrefix, $aExtraParams);
-		$oPage->add_script("$('[name=\"attr_oql\"]').addClass('ibo-queryoql'); $('[data-attribute-code=\"oql\"]').addClass('ibo-queryoql');");
+		$oPage->add_script("$('[name=\"attr_oql\"]').addClass('ibo-query-oql ibo-is-code'); $('[data-attribute-code=\"oql\"]').addClass('ibo-query-oql ibo-is-code');");

 		if (!$bEditMode) {
 			$sFields = trim($this->Get('fields'));
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -41,29 +41,25 @@ register_shutdown_function(function()
 	$sReservedMemory = null;
 	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
 	{
-		// Remove stack trace from MySQLException
+		// Remove stack trace from MySQLException (since 2.7.2 see N°3174)
 		$sMessage = $err['message'];
-		if (strpos($sMessage, 'MySQLException') !== false)
-		{
+		if (strpos($sMessage, 'MySQLException') !== false) {
 			$iStackTracePos = strpos($sMessage, 'Stack trace:');
-			if ($iStackTracePos !== false)
-			{
+			if ($iStackTracePos !== false) {
 				$sMessage = substr($sMessage, 0, $iStackTracePos);
 			}
 		}
-		IssueLog::error($sMessage, null, $err);
-		if (strpos($err['message'], 'Allowed memory size of') !== false)
-		{
+		// Log additional info but message from $err (since 2.7.6 N°4174)
+		$aErrToLog = $err;
+		unset($aErrToLog['message']);
+		IssueLog::error($sMessage, null, $aErrToLog);
+		if (strpos($err['message'], 'Allowed memory size of') !== false) {
 			$sLimit = ini_get('memory_limit');
 			echo "<p>iTop: Allowed memory size of $sLimit exhausted, contact your administrator to increase 'memory_limit' in php.ini</p>\n";
-		}
-		elseif (strpos($err['message'], 'Maximum execution time') !== false)
-		{
+		} elseif (strpos($err['message'], 'Maximum execution time') !== false) {
 			$sLimit = ini_get('max_execution_time');
 			echo "<p>iTop: Maximum execution time of $sLimit exceeded, contact your administrator to increase 'max_execution_time' in php.ini</p>\n";
-		}
-		else
-		{
+		} else {
 			echo "<p>iTop: An error occurred, check server error log for more information.</p>\n";
 		}
 	}
--- a/application/ui.extkeywidget.class.inc.php
+++ b/application/ui.extkeywidget.class.inc.php
@@ -196,7 +196,7 @@ class UIExtKeyWidget

 		$bIsAutocomplete = $oAllowedValues->CountExceeds($iMaxComboLength);
 		$sWrapperCssClass = $bIsAutocomplete ? 'ibo-input-select-autocomplete-wrapper' : 'ibo-input-select-wrapper';
-		$sHTMLValue = "<div class=\"field_input_zone field_input_extkey ibo-input-wrapper ibo-input-select-wrapper--with-buttons $sWrapperCssClass\" data-attcode=\"".$this->sAttCode."\"  data-validation=\"untouched\">";
+		$sHTMLValue = "<div class=\"field_input_zone field_input_extkey ibo-input-wrapper ibo-input-select-wrapper--with-buttons $sWrapperCssClass\" data-attcode=\"".$this->sAttCode."\"  data-validation=\"untouched\"  data-accessibility-selectize-label=\"$sTitle\">";
 		
 		// We just need to compare the number of entries with MaxComboLength, so no need to get the real count.
 		if (!$bIsAutocomplete) {
--- a/application/ui.passwordwidget.class.inc.php
+++ b/application/ui.passwordwidget.class.inc.php
@@ -59,7 +59,7 @@ class UIPasswordWidget
 		$sConfirmPasswordValue = $aPasswordValues ? $aPasswordValues['confirm'] : '*****';
 		$sChangedValue = (($sPasswordValue != '*****') || ($sConfirmPasswordValue != '*****')) ? 1 : 0;
 		$sHtmlValue = '';
-		$sHtmlValue .= '<div class="field_input_zone field_input_onewaypassword ibo-input-wrapper">';
+		$sHtmlValue .= '<div class="field_input_zone field_input_onewaypassword ibo-input-wrapper ibo-input-one-way-password-wrapper">';
 		$sHtmlValue .= '<input class="ibo-input" type="password" maxlength="255" name="attr_'.$sCode.'[value]" id="'.$this->iId.'" value="'.htmlentities($sPasswordValue, ENT_QUOTES, 'UTF-8').'"/>';
 		$sHtmlValue .= '<div class="ibo-input-wrapper ibo-input-wrapper--with-buttons"><input class="ibo-input" type="password" maxlength="255" id="'.$this->iId.'_confirm" value="'.htmlentities($sConfirmPasswordValue, ENT_QUOTES, 'UTF-8').'" name="attr_'.$sCode.'[confirm]"/>';
 		$sHtmlValue .= '<div class="ibo-input-select--action-buttons"><div class="ibo-input-select--action-button ibo-input-select--action-button--create" data-tooltip-content="'.Dict::S('UI:PasswordConfirm').'"><i class="fas fa-question-circle"></i></div></div></div>';
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -367,8 +367,7 @@ class ActionEmail extends ActionNotification
 		{
 			$this->m_iRecipients = 0;
 			$this->m_aMailErrors = array();
-			$bRes = false; // until we do succeed in sending the email
-	
+
 			// Determine recipients
 			//
 			$sTo = $this->FindRecipients('to', $aContextArgs);
@@ -382,29 +381,42 @@ class ActionEmail extends ActionNotification

 			$sSubject = MetaModel::ApplyParams($this->Get('subject'), $aContextArgs);
 			$sBody = MetaModel::ApplyParams($this->Get('body'), $aContextArgs);
-			
+
 			$oObj = $aContextArgs['this->object()'];
-			$sMessageId = sprintf('iTop_%s_%d_%f@%s.openitop.org', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/), MetaModel::GetEnvironmentId());
+			$sMessageId = sprintf('iTop_%s_%d_%f@%s.openitop.org', get_class($oObj), $oObj->GetKey(), microtime(true /* get as float*/),
+				MetaModel::GetEnvironmentId());
 			$sReference = '<'.$sMessageId.'>';
 		}
-		catch(Exception $e)
-		{
-  			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-  			throw $e;
-  		}
-		ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
-		
-		if (!is_null($oLog))
-		{
+		catch (Exception $e) {
+			/** @noinspection PhpUnhandledExceptionInspection */
+			throw $e;
+		}
+		finally {
+			ApplicationContext::SetUrlMakerClass($sPreviousUrlMaker);
+		}
+
+		if (!is_null($oLog)) {
 			// Note: we have to secure this because those values are calculated
 			// inside the try statement, and we would like to keep track of as
 			// many data as we could while some variables may still be undefined
-			if (isset($sTo))       $oLog->Set('to', $sTo);
-			if (isset($sCC))       $oLog->Set('cc', $sCC);
-			if (isset($sBCC))      $oLog->Set('bcc', $sBCC);
-			if (isset($sFrom))     $oLog->Set('from', empty($sFromLabel) ? $sFrom : "$sFromLabel <$sFrom>");
-			if (isset($sSubject))  $oLog->Set('subject', $sSubject);
-			if (isset($sBody))     $oLog->Set('body', $sBody);
+			if (isset($sTo)) {
+				$oLog->Set('to', $sTo);
+			}
+			if (isset($sCC)) {
+				$oLog->Set('cc', $sCC);
+			}
+			if (isset($sBCC)) {
+				$oLog->Set('bcc', $sBCC);
+			}
+			if (isset($sFrom)) {
+				$oLog->Set('from', $sFrom);
+			}
+			if (isset($sSubject)) {
+				$oLog->Set('subject', $sSubject);
+			}
+			if (isset($sBody)) {
+				$oLog->Set('body', $sBody);
+			}
 		}
 		$sStyles = file_get_contents(APPROOT.'css/email.css');
 		$sStyles .= MetaModel::GetConfig()->Get('email_css');
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -4159,6 +4159,7 @@ class AttributeText extends AttributeString
 		{
 			$sValue = parent::GetAsHTML($sValue, $oHostObject, $bLocalize);
 			$sValue = self::RenderWikiHtml($sValue);
+			$sValue = nl2br($sValue);

 			return "<div $sStyle>$sValue</div>";
 		}
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -5970,7 +5970,8 @@ abstract class MetaModel


 	/**
-	 * @deprecated 2.7.0 N°2369 will be removed in 2.8
+	 * @deprecated 2.7.0 N°2369 Method will not be removed any time soon as we still need to drop view if the instance is migrating from an iTop 2.x to an iTop 3.0 or newer, even if they skip iTop 3.0.
+	 * @since 3.0.0 Does not recreate SQL views, only drops them. Method has not been renamed to avoid regressions
 	 *
 	 * @return array
 	 * @throws \CoreException
@@ -7463,9 +7464,11 @@ abstract class MetaModel
 	 * @param string $sInput
 	 * @param array $aParams
 	 *
-	 * @return mixed
+	 * @return string
+	 *
+	 * @throws \Exception
 	 */
-	static public function ApplyParams($sInput, $aParams)
+	public static function ApplyParams($sInput, $aParams)
 	{
 		$aParams = static::AddMagicPlaceholders($aParams);

@@ -7475,7 +7478,7 @@ abstract class MetaModel

 		$aSearches = array();
 		$aReplacements = array();
-		foreach($aParams as $sSearch => $replace)
+		foreach ($aParams as $sSearch => $replace)
 		{
 			// Some environment parameters are objects, we just need scalars
 			if (is_object($replace))
--- a/core/trigger.class.inc.php
+++ b/core/trigger.class.inc.php
@@ -254,6 +254,7 @@ abstract class TriggerOnObject extends Trigger
 		{
 			$oSearch = DBObjectSearch::FromOQL($sFilter);
 			$oSearch->AddCondition('id', $iObjectId, '=');
+			$oSearch->AllowAllData();
 			$oSet = new DBObjectSet($oSearch);
 			$bRet = ($oSet->Count() > 0);
 		}
--- a/css/backoffice/_fallback.scss
+++ b/css/backoffice/_fallback.scss
@@ -22,4 +22,8 @@ fieldset {

 legend {
  @extend .ibo-fieldset-legend;
+}
+
+textarea {
+  @extend .ibo-input-text;
 }
--- a/css/backoffice/base/_base.scss
+++ b/css/backoffice/base/_base.scss
@@ -11,9 +11,9 @@ $ibo-scrollbar--scrollbar-thumb-background-color: $ibo-color-grey-300 !default;
 $ibo-scrollbar--scrollbar-thumb-border: none !default;
 $ibo-scrollbar--scrollbar-thumb-border-radius: $ibo-border-radius-500 !default;

-$ibo-hyperlink-color: $ibo-color-primary-500 !default;
-$ibo-hyperlink-color--on-hover: $ibo-color-primary-600 !default;
-$ibo-hyperlink-color--on-active: $ibo-color-primary-700 !default;
+$ibo-hyperlink-color: $ibo-color-primary-700 !default;
+$ibo-hyperlink-color--on-hover: $ibo-color-primary-800 !default;
+$ibo-hyperlink-color--on-active: $ibo-color-primary-900 !default;

 $ibo-svg-illustration--fill: $ibo-color-primary-500 !default;

@@ -86,4 +86,11 @@ a{
 	&:active{
 		color: var(--ibo-hyperlink-color--on-active);
 	}
+}
+
+/* Input reset */
+/* - Standard spacing between label and input */
+select + label, label + select, label > select,
+input + label, label + input, label > input {
+  margin-left: 0.5rem;
 }
--- a/css/backoffice/blocks-integrations/_all.scss
+++ b/css/backoffice/blocks-integrations/_all.scss
@@ -6,8 +6,8 @@
@import "dashlet-within-dashboard";
@import "add-to-dashboard";
@import "caselog-entry-form-within-activity-panel";
-@import "panel-with-datatable";
-@import "panel-with-tab-container";
+@import "datatable-within-panel";
+@import "tab-container-within-panel";
@import "panel-within-main-content";
@import "panel-within-modal";
@import "object-details-with-tab-container";
--- a/css/backoffice/blocks-integrations/_datatable-within-panel.scss
+++ b/css/backoffice/blocks-integrations/_datatable-within-panel.scss
--- a/css/backoffice/blocks-integrations/_tab-container-within-panel.scss
+++ b/css/backoffice/blocks-integrations/_tab-container-within-panel.scss
--- a/css/backoffice/components/_alert.scss
+++ b/css/backoffice/components/_alert.scss
@@ -49,7 +49,10 @@ $ibo-alert-colors: (
 	.ibo-alert.ibo-is-#{$sColor} {
 		background-color: $bg-color;
 		color: $text-color;
-
+    a {
+      color: $text-color;
+      @extend %ibo-font-ral-bol-150;
+    }
 		&::before {
 			background-color: $highlight-color;
 		}
--- a/css/backoffice/components/_button.scss
+++ b/css/backoffice/components/_button.scss
@@ -54,22 +54,22 @@ $ibo-button-colors: (
                /* Primary action does not have the colors from the primary brand color, at least not for now */
                'primary': (
                        '': (
-                                $ibo-color-cyan-700,
-                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-cyan-900,
                                $ibo-color-cyan-800,
+                                $ibo-color-white-100,
+                                $ibo-button--box-shadow-bottom $ibo-color-cyan-950,
+                                $ibo-color-cyan-900,
                        ),
                        ':hover': (
-                                $ibo-color-cyan-800,
+                                $ibo-color-cyan-900,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-cyan-900,
-                                $ibo-color-cyan-800,
+                                $ibo-button--box-shadow-bottom $ibo-color-cyan-950,
+                                $ibo-color-cyan-900,
                        ),
                        ':active': (
-                                $ibo-color-cyan-800,
+                                $ibo-color-cyan-900,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-top $ibo-color-cyan-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-cyan-800,
-                                $ibo-color-cyan-800,
+                                $ibo-button--box-shadow-top $ibo-color-cyan-950 #{','} $ibo-button--box-shadow-bottom $ibo-color-cyan-900,
+                                $ibo-color-cyan-900,
                        ),
                        ':disabled': (
                                $ibo-color-grey-300,
@@ -106,22 +106,22 @@ $ibo-button-colors: (
                ),
                'danger': (
                        '': (
-                                $ibo-color-danger-600,
-                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-danger-800,
                                $ibo-color-danger-700,
+                                $ibo-color-white-100,
+                                $ibo-button--box-shadow-bottom $ibo-color-danger-900,
+                                $ibo-color-danger-800,
                        ),
                        ':hover': (
-                                $ibo-color-danger-700,
+                                $ibo-color-danger-800,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-danger-800,
-                                $ibo-color-danger-700,
+                                $ibo-button--box-shadow-bottom $ibo-color-danger-900,
+                                $ibo-color-danger-800,
                        ),
                        ':active': (
-                                $ibo-color-danger-700,
+                                $ibo-color-danger-800,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-top $ibo-color-danger-800 #{','} $ibo-button--box-shadow-bottom $ibo-color-danger-700,
-                                $ibo-color-danger-700,
+                                $ibo-button--box-shadow-top $ibo-color-danger-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-danger-800,
+                                $ibo-color-danger-800,
                        ),
                        ':disabled': (
                                $ibo-color-grey-300,
@@ -132,22 +132,22 @@ $ibo-button-colors: (
                ),
                'success': (
                        '': (
-                                $ibo-color-success-700,
-                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-success-900,
                                $ibo-color-success-800,
+                                $ibo-color-white-100,
+                                $ibo-button--box-shadow-bottom $ibo-color-success-950,
+                                $ibo-color-success-900,
                        ),
                        ':hover': (
-                                $ibo-color-success-800,
+                                $ibo-color-success-900,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-success-900,
-                                $ibo-color-success-800,
+                                $ibo-button--box-shadow-bottom $ibo-color-success-950,
+                                $ibo-color-success-900,
                        ),
                        ':active': (
-                                $ibo-color-success-800,
+                                $ibo-color-success-900,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-top $ibo-color-success-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-success-800,
-                                $ibo-color-success-800,
+                                $ibo-button--box-shadow-top $ibo-color-success-950 #{','} $ibo-button--box-shadow-bottom $ibo-color-success-900,
+                                $ibo-color-success-900,
                        ),
                        ':disabled': (
                                $ibo-color-grey-300,
@@ -159,22 +159,22 @@ $ibo-button-colors: (
                /* Colors */
                'red': (
                        '': (
-                                $ibo-color-red-600,
-                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-red-800,
                                $ibo-color-red-700,
+                                $ibo-color-white-100,
+                                $ibo-button--box-shadow-bottom $ibo-color-red-900,
+                                $ibo-color-red-800,
                        ),
                        ':hover': (
-                                $ibo-color-red-700,
+                                $ibo-color-red-800,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-red-800,
-                                $ibo-color-red-700,
+                                $ibo-button--box-shadow-bottom $ibo-color-red-900,
+                                $ibo-color-red-800,
                        ),
                        ':active': (
-                                $ibo-color-red-700,
+                                $ibo-color-red-800,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-top $ibo-color-red-800 #{','} $ibo-button--box-shadow-bottom $ibo-color-red-700,
-                                $ibo-color-red-700,
+                                $ibo-button--box-shadow-top $ibo-color-red-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-red-800,
+                                $ibo-color-red-800,
                        ),
                        ':disabled': (
                                $ibo-color-grey-300,
@@ -185,22 +185,22 @@ $ibo-button-colors: (
                ),
                'green': (
                        '': (
-                                $ibo-color-green-700,
-                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-green-900,
                                $ibo-color-green-800,
+                                $ibo-color-white-100,
+                                $ibo-button--box-shadow-bottom $ibo-color-green-950,
+                                $ibo-color-green-900,
                        ),
                        ':hover': (
-                                $ibo-color-green-800,
+                                $ibo-color-green-900,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-green-900,
-                                $ibo-color-green-800,
+                                $ibo-button--box-shadow-bottom $ibo-color-green-950,
+                                $ibo-color-green-900,
                        ),
                        ':active': (
-                                $ibo-color-green-800,
+                                $ibo-color-green-900,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-top $ibo-color-green-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-green-800,
-                                $ibo-color-green-800,
+                                $ibo-button--box-shadow-top $ibo-color-green-950 #{','} $ibo-button--box-shadow-bottom $ibo-color-green-900,
+                                $ibo-color-green-900,
                        ),
                        ':disabled': (
                                $ibo-color-grey-300,
@@ -211,22 +211,22 @@ $ibo-button-colors: (
                ),
                'cyan': (
                        '': (
-                                $ibo-color-cyan-500,
+                                $ibo-color-cyan-800,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-cyan-900,
+                                $ibo-button--box-shadow-bottom $ibo-color-cyan-950,
                                $ibo-color-cyan-900,
                        ),
                        ':hover': (
-                                $ibo-color-cyan-700,
+                                $ibo-color-cyan-900,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-bottom $ibo-color-cyan-900,
+                                $ibo-button--box-shadow-bottom $ibo-color-cyan-950,
                                $ibo-color-cyan-900,
                        ),
                        ':active': (
-                                $ibo-color-cyan-700,
+                                $ibo-color-cyan-900,
                                $ibo-color-white-100,
-                                $ibo-button--box-shadow-top $ibo-color-cyan-900 #{','} $ibo-button--box-shadow-bottom $ibo-color-cyan-700,
-                                $ibo-color-cyan-700,
+                                $ibo-button--box-shadow-top $ibo-color-cyan-950 #{','} $ibo-button--box-shadow-bottom $ibo-color-cyan-900,
+                                $ibo-color-cyan-900,
                        ),
                        ':disabled': (
                                $ibo-color-grey-300,
@@ -268,9 +268,9 @@ $ibo-button-colors: (
                'primary': (
                        '': (
                                transparent,
-                                $ibo-color-cyan-800,
+                                $ibo-color-cyan-900,
                                $ibo-button--box-shadow-bottom transparent,
-                                $ibo-color-cyan-700,
+                                $ibo-color-cyan-800,
                        ),
                        ':hover': (
                                $ibo-color-white-100,
--- a/css/backoffice/components/_datatable.scss
+++ b/css/backoffice/components/_datatable.scss
@@ -5,7 +5,7 @@

 $ibo-datatable--toolbar--padding-x: 6px !default;
 $ibo-datatable--toolbar--padding-y: 0 !default;
-$ibo-datatable--toolbar--text-color: $ibo-color-grey-700 !default;
+$ibo-datatable--toolbar--text-color: $ibo-color-grey-800 !default;
 $ibo-datatable--toolbar--elements-spacing: 1rem !default;
 $ibo-datatable--toolbar--table-spacing: 18px !default;

--- a/css/backoffice/components/_field.scss
+++ b/css/backoffice/components/_field.scss
@@ -5,7 +5,7 @@

 /* SCSS variables */
 $ibo-field--sibling-spacing: 16px !default;
-$ibo-field--value--color: $ibo-color-grey-700 !default;
+$ibo-field--value--color: $ibo-color-grey-800 !default;

 $ibo-field--label--description--content: "?" !default;
 $ibo-field--label--description--padding-left: 4px !default;
@@ -48,27 +48,24 @@ $ibo-field--enable-bulk--checkbox--margin-left: 8px !default;

  /* Avoid value to overflow from its container with very long strings (typically URLs) */
  /* Note: Some types of attribute must be excluding as it can alter their rendering    */
-  &:not([data-attribute-type="AttributeBlob"])
-  &:not([data-attribute-type="AttributeFile"])
-  &:not([data-attribute-type="AttributeImage"])
-  &:not([data-attribute-type="AttributeCustomFields"])
-  &:not([data-attribute-type="AttributeTagSet"])
-  &:not([data-attribute-type="AttributeEnumSet"])
-  &:not([data-attribute-type="AttributeClassAttCodeSet"])
-  &:not([data-attribute-type="AttributeQueryAttCodeSet"])
-  &:not(.ibo-input-file-select--container) {
-    /* We need the rule to apply for the class and all its descendants, hence the "&, & *" */
+  &:not(
+    [data-attribute-type="AttributeBlob"],
+    [data-attribute-type="AttributeFile"],
+    [data-attribute-type="AttributeImage"],
+    [data-attribute-type="AttributeCustomFields"],
+    [data-attribute-type="AttributeTagSet"],
+    [data-attribute-type="AttributeEnumSet"],
+    [data-attribute-type="AttributeClassAttCodeSet"],
+    [data-attribute-type="AttributeQueryAttCodeSet"],
+    .ibo-input-file-select--container
+  ) {
+    /* We need the rule to apply for the class and all its descendants, hence the "& *" */
    .ibo-field--value {
-      &, & * {
+      word-break: break-word;
+      white-space: inherit; /* Here we don't put break-spaces as it would put ".ibo-field-small .ibo-field-value" on a new line due to the spaces/indentation of the HTML templates. For now we rather have this rule than diminish the templates readability/maintenability */
+      & * {
        word-break: break-word;
-        white-space: inherit; /* Here we don't put break-spaces as it would put ".ibo-field-small .ibo-field-value" on a new line due to the spaces/indentation of the HTML templates. For now we rather have this rule than diminish the templates readability/maintenability */
-      }
-    }
-    &.ibo-field-large {
-      .ibo-field--value {
-        &, & * {
-          white-space: break-spaces; /* For large fields we don't have the issue stated above */
-        }
+        white-space: inherit;
      }
    }
  }
@@ -165,6 +162,7 @@ $ibo-field--enable-bulk--checkbox--margin-left: 8px !default;
  min-width: 100px;
  max-width: 145px;
  width: 30%;
+  word-break: break-word; /* We want labels to wrap if it is very long if it has no spaces */
  @extend %ibo-font-weight-600;

  > .ibo-has-description {
@@ -190,17 +188,10 @@ $ibo-field--enable-bulk--checkbox--margin-left: 8px !default;
  /* Note that along with with, we now display a "expand" icon on large fields so we can have a better view of its content */
  .HTML {
    @extend .ibo-vendors-ckeditor--display-content;
-    display: grid;

    table {
      table-layout: fixed;
      width: 100%;
-
-      /* N°2788 - Force table containing <pre> to wrap as much as they can in the object details, otherwise it overflows on the other columns. We do this terrible hack only here as this is due to how the columns / fieldsets works. We might have the opportunity to improve it one day. */
-      pre {
-        white-space: unset;
-        word-break: break-all;
-      }
    }
  }
 }
@@ -211,7 +202,6 @@ $ibo-field--enable-bulk--checkbox--margin-left: 8px !default;

 /* For log fields in the bulk operation screens */
 .ibo-fieldset-legend > .ibo-field--comments {
-//  display: contents;
  padding-bottom: $ibo-field--value--margin-top--for-large;
  font-size: $ibo-field--comments--font-size;
 }
--- a/css/backoffice/components/_global-search.scss
+++ b/css/backoffice/components/_global-search.scss
@@ -8,6 +8,10 @@ $ibo-global-search--head--background-color: $ibo-color-white-100 !default;

 $ibo-global-search--icon-padding-x: 16px !default;
 $ibo-global-search--icon-padding-y: 0 !default;
+$ibo-global-search--icon--color: $ibo-color-primary-600 !default;
+$ibo-global-search--icon--color--on-hover: $ibo-color-primary-700 !default;
+$ibo-global-search--icon--color--on-active: $ibo-color-primary-800 !default;
+

 $ibo-global-search--input--padding: 0 !default;
 $ibo-global-search--input--padding-x--is-opened: 8px !default;
@@ -26,7 +30,7 @@ $ibo-global-search--drawer--background-color: $ibo-color-white-100 !default;

 $ibo-global-search--compartment-title--margin-bottom: 8px !default;
 $ibo-global-search--compartment-title--padding-left: 32px !default;
-$ibo-global-search--compartment-title--text-color: $ibo-color-grey-600 !default;
+$ibo-global-search--compartment-title--text-color: $ibo-color-grey-800 !default;
 $ibo-global-search--compartment-title--line-spacing: 8px !default;

 $ibo-global-search--compartment-content--text-color: $ibo-color-grey-900 !default;
@@ -81,9 +85,17 @@ $ibo-global-search--compartment--placeholder-hint--text-color: $ibo-color-grey-7
 	background-color: $ibo-global-search--head--background-color;
 }
 .ibo-global-search--icon{
+  color: $ibo-global-search--icon--color;
 	align-self: center;
 	padding: $ibo-global-search--icon-padding-y $ibo-global-search--icon-padding-x;
 	@extend %ibo-font-ral-nor-400;
+
+  &:hover{
+    color: $ibo-global-search--icon--color--on-hover;
+  }
+  &:active{
+    color: $ibo-global-search--icon--color--on-active;
+  }
 }
 .ibo-global-search--input{
 	padding: $ibo-global-search--input--padding;
--- a/css/backoffice/components/_quick-create.scss
+++ b/css/backoffice/components/_quick-create.scss
@@ -8,6 +8,9 @@ $ibo-quick-create--head--background-color: $ibo-color-white-100 !default;

 $ibo-quick-create--icon-padding-x: 16px !default;
 $ibo-quick-create--icon-padding-y: 0 !default;
+$ibo-quick-create--icon--color: $ibo-color-primary-600 !default;
+$ibo-quick-create--icon--color--on-hover: $ibo-color-primary-700 !default;
+$ibo-quick-create--icon--color--on-active: $ibo-color-primary-800 !default;

 $ibo-quick-create--input--padding: 0 default;
 $ibo-quick-create--input--padding-x--is-opened: 8px !default;
@@ -31,7 +34,7 @@ $ibo-quick-create--drawer--background-color: $ibo-color-white-100 !default;
 $ibo-quick-create--compartment-title--margin-top: 8px !default;
 $ibo-quick-create--compartment-title--margin-bottom: $ibo-quick-create--compartment-title--margin-top !default;
 $ibo-quick-create--compartment-title--padding-left: 32px !default;
-$ibo-quick-create--compartment-title--text-color: $ibo-color-grey-600 !default;
+$ibo-quick-create--compartment-title--text-color: $ibo-color-grey-800 !default;
 $ibo-quick-create--compartment-title--line-spacing: 8px !default;

 $ibo-quick-create--compartment-content--text-color: $ibo-color-grey-900 !default;
@@ -91,9 +94,17 @@ $ibo-quick-create--compartment--placeholder-hint--text-color: $ibo-color-grey-70
 	background-color: $ibo-quick-create--head--background-color;
 }
 .ibo-quick-create--icon{
+  color: $ibo-quick-create--icon--color;
 	align-self: center;
 	padding: $ibo-quick-create--icon-padding-y $ibo-quick-create--icon-padding-x;
 	@extend %ibo-font-ral-nor-400;
+  
+  &:hover{
+    color: $ibo-quick-create--icon--color--on-hover;
+  }
+  &:active{
+    color: $ibo-quick-create--icon--color--on-active;
+  }
 }
 .ibo-quick-create--input{
 	width: $ibo-quick-create--input--width;
--- a/css/backoffice/components/_search-form.scss
+++ b/css/backoffice/components/_search-form.scss
@@ -20,6 +20,10 @@ $ibo-search-form-panel--more-criteria--background-color: $ibo-color-white-100 !d
 $ibo-search-form-panel--more-criteria--icon--color: $ibo-color-primary-600 !default;
 $ibo-search-form-panel--more-criteria--border-color: $ibo-search-form-panel--criteria--border-color !default;

+$ibo-search-form-panel--items--hover--color: $ibo-color-grey-200 !default;
+
+$ibo-search-form-panel--multiple-choice--hover--color: $ibo-color-grey-200 !default;
+
 $ibo-search-form-panel--misc-button--background-color: $ibo-search-form-panel--more-criteria--background-color !default;
 $ibo-search-form-panel--misc-button--icon--color: $ibo-search-form-panel--more-criteria--icon--color !default;

@@ -425,7 +429,7 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 											padding: 4px 8px; /* Putting back the padding remove by .sfc_opc_mc_items */

 											&:hover {
-												background-color: $ibo-color-grey-200;
+												background-color: $ibo-search-form-panel--multiple-choice--hover--color;
 											}

 											label {
@@ -689,7 +693,7 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 					.sfl_items {
 						> li {
 							&:hover {
-								background-color: $ibo-color-grey-200;
+								background-color: $ibo-search-form-panel--items--hover--color;
 							}
 						}
 					}
@@ -748,7 +752,7 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 				white-space: nowrap;

 				&:hover {
-					background-color: $ibo-color-white-100;
+					background-color: $ibo-search-form-panel--items--hover--color;
 				}

 				&.sfl_i_placeholder {
--- a/css/backoffice/components/input/_all.scss
+++ b/css/backoffice/components/input/_all.scss
@@ -13,5 +13,6 @@
@import "input-select";
@import "input-select-icon";
@import "input-string";
+@import "input-one-way-password";
@import "input-set";
@import "input-text";
--- a/css/backoffice/components/input/_input-one-way-password.scss
+++ b/css/backoffice/components/input/_input-one-way-password.scss
@@ -0,0 +1,12 @@
+/*!
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+$ibo-input-one-way-password--elements-spacing-y: 6px !default;
+
+.ibo-input-one-way-password-wrapper {
+  > *:not(first-child) {
+    margin-top: $ibo-input-one-way-password--elements-spacing-y;
+  }
+}
--- a/css/backoffice/components/input/_input-select.scss
+++ b/css/backoffice/components/input/_input-select.scss
@@ -15,6 +15,8 @@ $ibo-input-select-selectize--value--height: 100% !default;
 $ibo-input-select-selectize--value--line-height: $ibo-input--height !default;
 $ibo-input-select-selectize--dropdown--max-height: 50vh !default;
 $ibo-input-select-selectize--dropdown--max-width: 50em !default;
+$ibo-input-select-selectize--item--active--text-color: $ibo-color-grey-800 !default;
+$ibo-input-select-selectize--item--active--background-color: $ibo-color-blue-100 !default;

 $ibo-input-select-wrapper--width: 100% !default;

@@ -180,6 +182,7 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60

 /*2 types of selectize to manage (select + autocomplete)*/
 .selectize-dropdown.ui-autocomplete,
+.selectize-dropdown.set-dropdown,
 .selectize-dropdown.plugin-custom_itop {
  z-index: 2000; /* Note: This is not great as it does not take into account other elements z-index, but as selectize puts its dropdown under the <body> tag, we cannot have a z-index relative to input container. */
  max-height: $ibo-input-select-selectize--dropdown--max-height;
@@ -189,8 +192,8 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60

 .selectize-dropdown.ui-menu .ui-state-active {
  margin: unset;
-  background-color: #f5fafd;
-  color: #495c68;
+  background-color: $ibo-input-select-selectize--item--active--background-color;
+  color: $ibo-input-select-selectize--item--active--text-color;
 }

 .ibo-input-select--autocomplete-item {
--- a/css/backoffice/components/input/_input-text.scss
+++ b/css/backoffice/components/input/_input-text.scss
@@ -3,20 +3,26 @@
 * @license     http://opensource.org/licenses/AGPL-3.0
 */

+$ibo-input-text--width: 100% !default;
 $ibo-input-text--min-height: 12rem !default;
 $ibo-input-text--padding-x: 12px !default;
 $ibo-input-text--padding-y: 10px !default;

 .ibo-input-text {
+  width: $ibo-input-text--width;
  min-height: $ibo-input-text--min-height;
  padding: $ibo-input-text--padding-y $ibo-input-text--padding-x;
+
+  &.ibo-is-code {
+    @extend %ibo-font-code-150;
+    /* Note: There is a mic-mac in the inputs SCSS partials / PHP classes / TWIG templates. All base style should be defined in a common ancestor (AbstractInput) which should have its own BLOCK_CODE and SCSS partial; which is not the case right now.
+     * We should correct this later as now is too close to the RC to make such changes.
+     */
+    background-color: $ibo-input--background-color;
+  }
 }

 .ibo-input-text--export {
  width: 100%;
  min-height: 15em;
-}
-
-textarea.ibo-queryoql, .ibo-queryoql:not(:nth-child(n)), .ibo-queryoql > :not(.ibo-field--label) {
-  @extend %ibo-font-code-150;
 }
--- a/css/backoffice/layout/_navigation-menu.scss
+++ b/css/backoffice/layout/_navigation-menu.scss
@@ -105,7 +105,7 @@ $ibo-navigation-menu--drawer--border-right: 1px solid $ibo-color-grey-300 !defau
 $ibo-navigation-menu--menu-filter-input--padding-x: 10px !default;
 $ibo-navigation-menu--menu-filter-input--padding-y: 8px !default;
 $ibo-navigation-menu--menu-filter-input--width: 100% !default;
-$ibo-navigation-menu--menu-filter-input--placeholder-color: $ibo-color-grey-500 !default;
+$ibo-navigation-menu--menu-filter-input--placeholder-color: $ibo-color-grey-700 !default;
 $ibo-navigation-menu--menu-filter-input--text-color: $ibo-color-grey-900 !default;
 $ibo-navigation-menu--menu-filter-input--background-color: $ibo-color-white-100 !default;
 $ibo-navigation-menu--menu-filter-input--border: 1px solid $ibo-color-grey-300 !default;
--- a/css/backoffice/layout/tab-container/_tab-container.scss
+++ b/css/backoffice/layout/tab-container/_tab-container.scss
@@ -9,7 +9,7 @@ $ibo-tab-container--tabs-list--padding-x: 24px !default;
 $ibo-tab-container--tabs-list--background-color: $ibo-color-grey-100 !default;

 $ibo-tab-container--tab-header--max-width: 110px !default;
-$ibo-tab-container--tab-header--text-color: $ibo-color-grey-700 !default;
+$ibo-tab-container--tab-header--text-color: $ibo-color-grey-800 !default;
 $ibo-tab-container--tab-header--text-color--is-active: $ibo-color-blue-800 !default;
 $ibo-tab-container--tab-header--text-color--on-hover: $ibo-color-blue-800 !default;
 $ibo-tab-container--tab-header--background-color--on-hover: $ibo-color-grey-200 !default;
--- a/css/backoffice/utils/variables/colors/_base-palette.scss
+++ b/css/backoffice/utils/variables/colors/_base-palette.scss
@@ -18,6 +18,7 @@ $ibo-color-grey-600: hsla(215, 16.6%, 63.3%, 1) !default;
 $ibo-color-grey-700: hsla(214, 11.3%, 48.6%, 1) !default;
 $ibo-color-grey-800: hsla(215, 16.9%, 30.2%, 1) !default;
 $ibo-color-grey-900: hsla(215, 22.4%, 16.7%, 1) !default;
+$ibo-color-grey-950: hsla(215, 26.4%, 10.7%, 1) !default;

 $ibo-color-blue-grey-50: hsla(210, 36%, 96%, 1) !default;
 $ibo-color-blue-grey-100: hsla(198, 15.7%, 83.7%, 1) !default;
@@ -29,6 +30,7 @@ $ibo-color-blue-grey-600: hsla(199, 18.4%, 40.4%, 1) !default;
 $ibo-color-blue-grey-700: hsla(199, 18.3%, 33.1%, 1) !default;
 $ibo-color-blue-grey-800: hsla(200, 17.9%, 26.3%, 1) !default;
 $ibo-color-blue-grey-900: hsla(200, 19.1%, 18.4%, 1) !default;
+$ibo-color-blue-grey-950: hsla(200, 20.2%, 13.1%, 1) !default;

 $ibo-color-blue-100: hsla(201, 100%, 96.1%, 1) !default;
 $ibo-color-blue-200: hsla(202, 80.6%, 85.9%, 1) !default;
@@ -39,6 +41,7 @@ $ibo-color-blue-600: hsla(209, 61.6%, 50%, 1) !default;
 $ibo-color-blue-700: hsla(211, 60.7%, 42.9%, 1) !default;
 $ibo-color-blue-800: hsla(213, 49.4%, 34.1%, 1) !default;
 $ibo-color-blue-900: hsla(215, 41.3%, 28%, 1) !default;
+$ibo-color-blue-950: hsla(215, 36.8%, 23%, 1) !default;

 $ibo-color-cyan-100: hsla(186, 61.2%, 86.9%, 1) !default;
 $ibo-color-cyan-200: hsla(187, 71.6%, 71%, 1) !default;
@@ -49,6 +52,7 @@ $ibo-color-cyan-600: hsla(187, 100%, 37.8%, 1) !default;
 $ibo-color-cyan-700: hsla(186, 100%, 32.7%, 1) !default;
 $ibo-color-cyan-800: hsla(185, 100%, 28%, 1) !default;
 $ibo-color-cyan-900: hsla(182, 100%, 19.6%, 1) !default;
+$ibo-color-cyan-950: hsla(180, 100%, 10.6%, 1) !default;

 $ibo-color-green-100: hsla(88, 50.7%, 85.7%, 1) !default;
 $ibo-color-green-200: hsla(88, 50%, 76.5%, 1) !default;
@@ -59,6 +63,8 @@ $ibo-color-green-600: hsla(89, 46.1%, 48%, 1) !default;
 $ibo-color-green-700: hsla(92, 47.9%, 42.2%, 1) !default;
 $ibo-color-green-800: hsla(95, 49.5%, 36.5%, 1) !default;
 $ibo-color-green-900: hsla(103, 55.6%, 26.5%, 1) !default;
+$ibo-color-green-950: hsla(108, 59.6%, 21.5%, 1) !default;
+

 $ibo-color-orange-100: hsla(40, 100%, 97.1%, 1) !default;
 $ibo-color-orange-200: hsla(39, 96.4%, 89%, 1) !default;
@@ -69,6 +75,7 @@ $ibo-color-orange-600: hsla(24, 74.7%, 49.6%, 1) !default;
 $ibo-color-orange-700: hsla(20, 70.7%, 44.1%, 1) !default;
 $ibo-color-orange-800: hsla(16, 65.1%, 37.1%, 1) !default;
 $ibo-color-orange-900: hsla(14, 60.8%, 30%, 1) !default;
+$ibo-color-orange-950: hsla(14, 55.1%, 22%, 1) !default;

 $ibo-color-red-100: hsla(0, 76.9%, 94.9%, 1) !default;
 $ibo-color-red-200: hsla(0, 95.1%, 92%, 1) !default;
@@ -79,6 +86,7 @@ $ibo-color-red-600: hsla(0, 76.3%, 57.1%, 1) !default;
 $ibo-color-red-700: hsla(0, 60.8%, 48%, 1) !default;
 $ibo-color-red-800: hsla(0, 55.8%, 39%, 1) !default;
 $ibo-color-red-900: hsla(0, 46.8%, 31%, 1) !default;
+$ibo-color-red-950: hsla(0, 42.9%, 20%, 1) !default;

 $ibo-color-pink-100: hsla(348, 100%, 98%, 1) !default;
 $ibo-color-pink-200: hsla(343, 95%, 92%, 1) !default;
@@ -89,6 +97,7 @@ $ibo-color-pink-600: hsla(329, 64%, 54%, 1) !default;
 $ibo-color-pink-700: hsla(325, 57%, 46%, 1) !default;
 $ibo-color-pink-800: hsla(322, 60%, 37%, 1) !default;
 $ibo-color-pink-900: hsla(318, 51%, 29%, 1) !default;
+$ibo-color-pink-950: hsla(318, 51%, 21%, 1) !default;

 $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pink', 'primary', 'secondary', 'information', 'success', 'warning', 'danger');

@@ -108,6 +117,7 @@ $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pi
 	--ibo-color-grey-700: #{$ibo-color-grey-700};
 	--ibo-color-grey-800: #{$ibo-color-grey-800};
 	--ibo-color-grey-900: #{$ibo-color-grey-900};
+	--ibo-color-grey-950: #{$ibo-color-grey-950};

 	--ibo-color-blue-grey-50: #{$ibo-color-blue-grey-50};
 	--ibo-color-blue-grey-100: #{$ibo-color-blue-grey-100};
@@ -119,6 +129,7 @@ $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pi
 	--ibo-color-blue-grey-700: #{$ibo-color-blue-grey-700};
 	--ibo-color-blue-grey-800: #{$ibo-color-blue-grey-800};
 	--ibo-color-blue-grey-900: #{$ibo-color-blue-grey-900};
+	--ibo-color-blue-grey-950: #{$ibo-color-blue-grey-950};

 	--ibo-color-blue-100: #{$ibo-color-blue-100};
 	--ibo-color-blue-200: #{$ibo-color-blue-200};
@@ -129,6 +140,7 @@ $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pi
 	--ibo-color-blue-700: #{$ibo-color-blue-700};
 	--ibo-color-blue-800: #{$ibo-color-blue-800};
 	--ibo-color-blue-900: #{$ibo-color-blue-900};
+	--ibo-color-blue-950: #{$ibo-color-blue-950};

 	--ibo-color-cyan-100: #{$ibo-color-cyan-100};
 	--ibo-color-cyan-200: #{$ibo-color-cyan-200};
@@ -139,6 +151,7 @@ $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pi
 	--ibo-color-cyan-700: #{$ibo-color-cyan-700};
 	--ibo-color-cyan-800: #{$ibo-color-cyan-800};
 	--ibo-color-cyan-900: #{$ibo-color-cyan-900};
+	--ibo-color-cyan-950: #{$ibo-color-cyan-950};

 	--ibo-color-green-100: #{$ibo-color-green-100};
 	--ibo-color-green-200: #{$ibo-color-green-200};
@@ -149,6 +162,7 @@ $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pi
 	--ibo-color-green-700: #{$ibo-color-green-700};
 	--ibo-color-green-800: #{$ibo-color-green-800};
 	--ibo-color-green-900: #{$ibo-color-green-900};
+	--ibo-color-green-950: #{$ibo-color-green-950};

 	--ibo-color-orange-100: #{$ibo-color-orange-100};
 	--ibo-color-orange-200: #{$ibo-color-orange-200};
@@ -159,6 +173,7 @@ $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pi
 	--ibo-color-orange-700: #{$ibo-color-orange-700};
 	--ibo-color-orange-800: #{$ibo-color-orange-800};
 	--ibo-color-orange-900: #{$ibo-color-orange-900};
+	--ibo-color-orange-950: #{$ibo-color-orange-950};

 	--ibo-color-red-100: #{$ibo-color-red-100};
 	--ibo-color-red-200: #{$ibo-color-red-200};
@@ -169,6 +184,7 @@ $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pi
 	--ibo-color-red-700: #{$ibo-color-red-700};
 	--ibo-color-red-800: #{$ibo-color-red-800};
 	--ibo-color-red-900: #{$ibo-color-red-900};
+	--ibo-color-red-950: #{$ibo-color-red-950};

 	--ibo-color-pink-100: #{$ibo-color-pink-100};
 	--ibo-color-pink-200: #{$ibo-color-pink-200};
@@ -179,4 +195,5 @@ $ibo-colors: ('grey', 'blue-grey', 'blue', 'cyan', 'green', 'orange', 'red', 'pi
 	--ibo-color-pink-700: #{$ibo-color-pink-700};
 	--ibo-color-pink-800: #{$ibo-color-pink-800};
 	--ibo-color-pink-900: #{$ibo-color-pink-900};
+	--ibo-color-pink-950: #{$ibo-color-pink-950};
 }
--- a/css/backoffice/utils/variables/colors/_semantic-palette.scss
+++ b/css/backoffice/utils/variables/colors/_semantic-palette.scss
@@ -14,6 +14,7 @@ $ibo-color-primary-600: $ibo-color-orange-600 !default;
 $ibo-color-primary-700: $ibo-color-orange-700 !default;
 $ibo-color-primary-800: $ibo-color-orange-800 !default;
 $ibo-color-primary-900: $ibo-color-orange-900 !default;
+$ibo-color-primary-950: $ibo-color-orange-950 !default;

 /* - Secondary color of the brand */
 $ibo-color-secondary-100: $ibo-color-grey-100 !default;
@@ -25,6 +26,7 @@ $ibo-color-secondary-600: $ibo-color-grey-600 !default;
 $ibo-color-secondary-700: $ibo-color-grey-700 !default;
 $ibo-color-secondary-800: $ibo-color-grey-800 !default;
 $ibo-color-secondary-900: $ibo-color-grey-900 !default;
+$ibo-color-secondary-950: $ibo-color-grey-950 !default;

 /* - Information: messages / actions that should neither seem as success, warning or failure  */
 $ibo-color-information-100: $ibo-color-blue-100 !default;
@@ -36,6 +38,7 @@ $ibo-color-information-600: $ibo-color-blue-600 !default;
 $ibo-color-information-700: $ibo-color-blue-700 !default;
 $ibo-color-information-800: $ibo-color-blue-800 !default;
 $ibo-color-information-900: $ibo-color-blue-900 !default;
+$ibo-color-information-950: $ibo-color-blue-950 !default;

 /* Success: messages of success, safe actions, ... */
 $ibo-color-success-100: $ibo-color-green-100 !default;
@@ -47,6 +50,7 @@ $ibo-color-success-600: $ibo-color-green-600 !default;
 $ibo-color-success-700: $ibo-color-green-700 !default;
 $ibo-color-success-800: $ibo-color-green-800 !default;
 $ibo-color-success-900: $ibo-color-green-900 !default;
+$ibo-color-success-950: $ibo-color-green-950 !default;

 /* Warning: messages of warning, actions that would be done carefully, ... */
 $ibo-color-warning-100: $ibo-color-orange-100 !default;
@@ -58,6 +62,7 @@ $ibo-color-warning-600: $ibo-color-orange-600 !default;
 $ibo-color-warning-700: $ibo-color-orange-700 !default;
 $ibo-color-warning-800: $ibo-color-orange-800 !default;
 $ibo-color-warning-900: $ibo-color-orange-900 !default;
+$ibo-color-warning-950: $ibo-color-orange-950 !default;

 /* Danger: messages of failure, error, ... */
 $ibo-color-error-100: $ibo-color-red-100 !default;
@@ -69,6 +74,7 @@ $ibo-color-error-600: $ibo-color-red-600 !default;
 $ibo-color-error-700: $ibo-color-red-700 !default;
 $ibo-color-error-800: $ibo-color-red-800 !default;
 $ibo-color-error-900: $ibo-color-red-900 !default;
+$ibo-color-error-950: $ibo-color-red-950 !default;

 /* Danger: messages of danger, actions that cannot be undone, ... */
 $ibo-color-danger-100: $ibo-color-red-100 !default;
@@ -80,6 +86,7 @@ $ibo-color-danger-600: $ibo-color-red-600 !default;
 $ibo-color-danger-700: $ibo-color-red-700 !default;
 $ibo-color-danger-800: $ibo-color-red-800 !default;
 $ibo-color-danger-900: $ibo-color-red-900 !default;
+$ibo-color-danger-950: $ibo-color-red-950 !default;

 $ibo-semantic-colors: ('primary', 'secondary', 'information', 'success', 'warning', 'danger');

@@ -103,6 +110,7 @@ $ibo-caselog-highlight-colors: ($ibo-caselog-highlight-color-1, $ibo-caselog-hig
  --ibo-color-primary-700: #{$ibo-color-primary-700};
  --ibo-color-primary-800: #{$ibo-color-primary-800};
  --ibo-color-primary-900: #{$ibo-color-primary-900};
+  --ibo-color-primary-950: #{$ibo-color-primary-950};

  --ibo-color-secondary-100: #{$ibo-color-secondary-100};
  --ibo-color-secondary-200: #{$ibo-color-secondary-200};
@@ -113,6 +121,7 @@ $ibo-caselog-highlight-colors: ($ibo-caselog-highlight-color-1, $ibo-caselog-hig
 	--ibo-color-secondary-700: #{$ibo-color-secondary-700};
 	--ibo-color-secondary-800: #{$ibo-color-secondary-800};
 	--ibo-color-secondary-900: #{$ibo-color-secondary-900};
+	--ibo-color-secondary-950: #{$ibo-color-secondary-950};

 	--ibo-color-information-100: #{$ibo-color-information-100};
 	--ibo-color-information-200: #{$ibo-color-information-200};
@@ -123,6 +132,7 @@ $ibo-caselog-highlight-colors: ($ibo-caselog-highlight-color-1, $ibo-caselog-hig
 	--ibo-color-information-700: #{$ibo-color-information-700};
 	--ibo-color-information-800: #{$ibo-color-information-800};
 	--ibo-color-information-900: #{$ibo-color-information-900};
+	--ibo-color-information-950: #{$ibo-color-information-950};

 	--ibo-color-success-100: #{$ibo-color-success-100};
 	--ibo-color-success-200: #{$ibo-color-success-200};
@@ -133,6 +143,7 @@ $ibo-caselog-highlight-colors: ($ibo-caselog-highlight-color-1, $ibo-caselog-hig
 	--ibo-color-success-700: #{$ibo-color-success-700};
 	--ibo-color-success-800: #{$ibo-color-success-800};
 	--ibo-color-success-900: #{$ibo-color-success-900};
+	--ibo-color-success-950: #{$ibo-color-success-950};

 	--ibo-color-warning-100: #{$ibo-color-warning-100};
 	--ibo-color-warning-200: #{$ibo-color-warning-200};
@@ -143,6 +154,7 @@ $ibo-caselog-highlight-colors: ($ibo-caselog-highlight-color-1, $ibo-caselog-hig
 	--ibo-color-warning-700: #{$ibo-color-warning-700};
 	--ibo-color-warning-800: #{$ibo-color-warning-800};
 	--ibo-color-warning-900: #{$ibo-color-warning-900};
+	--ibo-color-warning-950: #{$ibo-color-warning-950};

 	--ibo-color-danger-100: #{$ibo-color-danger-100};
 	--ibo-color-danger-200: #{$ibo-color-danger-200};
@@ -153,6 +165,7 @@ $ibo-caselog-highlight-colors: ($ibo-caselog-highlight-color-1, $ibo-caselog-hig
 	--ibo-color-danger-700: #{$ibo-color-danger-700};
 	--ibo-color-danger-800: #{$ibo-color-danger-800};
 	--ibo-color-danger-900: #{$ibo-color-danger-900};
+	--ibo-color-danger-950: #{$ibo-color-danger-950};

 	--ibo-color-error-100: #{$ibo-color-error-100};
 	--ibo-color-error-200: #{$ibo-color-error-200};
@@ -163,6 +176,7 @@ $ibo-caselog-highlight-colors: ($ibo-caselog-highlight-color-1, $ibo-caselog-hig
 	--ibo-color-error-700: #{$ibo-color-error-700};
 	--ibo-color-error-800: #{$ibo-color-error-800};
 	--ibo-color-error-900: #{$ibo-color-error-900};
+	--ibo-color-error-950: #{$ibo-color-error-950};

 	--ibo-caselog-color-highlight-1: #{$ibo-caselog-highlight-color-1};
 	--ibo-caselog-color-highlight-2: #{$ibo-caselog-highlight-color-2};
--- a/css/backoffice/vendors/_jquery-blockui.scss
+++ b/css/backoffice/vendors/_jquery-blockui.scss
@@ -4,15 +4,15 @@
 */

 $ibo-vendors-blockui--blockoverlay--background-color: $ibo-color-white-200 !default;
-$ibo-vendors-blockui--blockomsg--color: $ibo-color-grey-700 !default;
+$ibo-vendors-blockui--blockmsg--color: $ibo-color-grey-700 !default;

 .blockUI.blockOverlay{
-  background-color: $ibo-color-white-200;
+  background-color: $ibo-vendors-blockui--blockoverlay--background-color;
 }
 .blockUI.blockMsg{
  font-size: 6em;
  text-align: center;
-  color: $ibo-color-grey-700;
+  color: $ibo-vendors-blockui--blockmsg--color;
  border: none;
  background-color: transparent;
 }
--- a/css/backoffice/vendors/_jqueryui.scss
+++ b/css/backoffice/vendors/_jqueryui.scss
@@ -187,7 +187,7 @@ $ibo-vendors-jqueryui--ui-slider--ui-slider-handle--hover--border-color: $ibo-co
 		}
 		&.ui-dialog-titlebar-close{
 			@extend .ibo-is-alternative;
-			@extend .ibo-is-grey;
+			@extend .ibo-is-neutral;
 			
 		}
 	}
--- a/css/setup.css
+++ b/css/setup.css
--- a/css/setup.scss
+++ b/css/setup.scss
@@ -391,10 +391,6 @@ body {
      height: 100%;
      .ibo-setup--wizard--content{
        overflow: auto;
-
-        input#db_backup {
-          margin-right: 0.4rem;
-        }
      }
      .ibo-setup--wizard--buttons-container{
        margin-top: auto;
@@ -565,9 +561,6 @@ body {
 }
 .setup-accept-licenses{
  margin-top: 18px;
-  input{
-    margin-right: 8px;
-  }
 }
 .module-selection-banner{
  display: flex;
--- a/datamodels/2.x/authent-cas/dictionaries/es_cr.dict.authent-cas.php
+++ b/datamodels/2.x/authent-cas/dictionaries/es_cr.dict.authent-cas.php
@@ -1,12 +1,15 @@
 <?php
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
- * @copyright   Copyright (C) 2013 XXXXX
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
+ * @notas       Utilizar codificación UTF-8 para mostrar acentos y otros caracteres especiales 
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'CAS:Error:UserNotAllowed' => 'User not allowed~~',
-	'CAS:Login:SignIn' => 'Sign in with CAS~~',
-	'CAS:Login:SignInTooltip' => 'Click here to authenticate yourself with the CAS server~~',
+
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'CAS:Error:UserNotAllowed' => 'Usuario no permitido',
+	'CAS:Login:SignIn' => 'Iniciar sesión con CAS',
+	'CAS:Login:SignInTooltip' => 'Click para autenticarse con servidor CAS',
 ));
--- a/datamodels/2.x/authent-external/dictionaries/es_cr.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/dictionaries/es_cr.dict.authent-external.php
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -34,7 +34,7 @@
 //
 // Class: UserExternal
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserExternal' => 'Usuario Externo',
 	'Class:UserExternal+' => 'Usuario Autenticado fuera de '.ITOP_APPLICATION_SHORT,
 ));
--- a/datamodels/2.x/authent-ldap/dictionaries/es_cr.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/es_cr.dict.authent-ldap.php
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -34,7 +34,7 @@
 //
 // Class: UserLDAP
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserLDAP' => 'Usuario LDAP',
 	'Class:UserLDAP+' => 'Usuario Autenticado vía LDAP',
 ));
--- a/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -34,24 +34,24 @@
 //
 // Class: UserLocal
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserLocal' => 'Usuario de '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal+' => 'Usuario Autenticado vía '.ITOP_APPLICATION_SHORT,
 	'Class:UserLocal/Attribute:password' => 'Contraseña',
 	'Class:UserLocal/Attribute:password+' => 'Contraseña',

-	'Class:UserLocal/Attribute:expiration' => 'Password expiration~~',
-	'Class:UserLocal/Attribute:expiration+' => 'Password expiration status (requires an extension to have an effect)~~',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Can expire~~',
-	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '~~',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Never expire~~',
-	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '~~',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expired~~',
-	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '~~',
-	'Class:UserLocal/Attribute:password_renewed_date' => 'Password renewal~~',
-	'Class:UserLocal/Attribute:password_renewed_date+' => 'When the password was last changed~~',
+	'Class:UserLocal/Attribute:expiration' => 'Expiración de contraseña',
+	'Class:UserLocal/Attribute:expiration+' => 'Estatus de expiración de contraseña (requiere de una extensión para que tenga efecto)',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire' => 'Puede expirar',
+	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire' => 'Nunca expirar',
+	'Class:UserLocal/Attribute:expiration/Value:never_expire+' => '',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire' => 'Expirado',
+	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
+	'Class:UserLocal/Attribute:password_renewed_date' => 'Renovación de contraseña',
+	'Class:UserLocal/Attribute:password_renewed_date+' => 'Cuando fue el último cambio de contraseña',

-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'Password must be at least 8 characters and include uppercase, lowercase, numeric and special characters.~~',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'La contraseña debe ser de al menos 8 caracteres e incluír mayúsculas, minúsculas, números y caracteres especiales.',

-	'UserLocal:password:expiration' => 'The fields below require an extension~~'
+	'UserLocal:password:expiration' => 'El siguiente campo requiere una extensión'
 ));
--- a/datamodels/2.x/combodo-db-tools/bin/rebuildhk.php
+++ b/datamodels/2.x/combodo-db-tools/bin/rebuildhk.php
@@ -10,7 +10,7 @@

 use Combodo\iTop\Core\MetaModel\HierarchicalKey;

-require_once('../approot.inc.php');
+require_once ('../../../approot.inc.php');
 require_once APPROOT.'application/startup.inc.php';

 foreach(MetaModel::GetClasses() as $sClass)
--- a/datamodels/2.x/combodo-db-tools/bin/report.php
+++ b/datamodels/2.x/combodo-db-tools/bin/report.php
@@ -6,10 +6,7 @@

 use Combodo\iTop\DBTools\Service\DBAnalyzerUtils;

-@include_once('../approot.inc.php');
-@include_once('../../approot.inc.php');
-@include_once('../../../approot.inc.php');
-
+require_once ('../../../approot.inc.php');
 require_once(APPROOT.'application/startup.inc.php');

 require_once('../db_analyzer.class.inc.php');
--- a/datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php
@@ -1,9 +1,10 @@
 <?php
 /**
- * Localized data
+ * Spanish localized data
 *
- * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
 *
 * This file is part of iTop.
 *
@@ -21,11 +22,11 @@
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
 // Database inconsistencies
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Dictionary entries go here
-	'Menu:DBToolsMenu' => 'Herramientas de bases de datos',
+	'Menu:DBToolsMenu' => 'Integridad de Base de Datos',
 	'DBTools:Class' => 'Clase',
-	'DBTools:Title' => 'Herramientas de mantenimiento de base de datos~~',
+	'DBTools:Title' => 'Herramientas de Mantenimiento de Base de Datos',
 	'DBTools:ErrorsFound' => 'Errores encontrados',
 	'DBTools:Indication' => 'Important: after fixing errors in the database you\'ll have to run the analysis again as new inconsistencies will be generated~~',
 	'DBTools:Disclaimer' => 'DISCLAIMER: BACKUP YOUR DATABASE BEFORE RUNNING THE FIXES~~',
@@ -39,14 +40,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'DBTools:ShowIds' => 'Vista detallada',
 	'DBTools:ShowReport' => 'Reporte',
 	'DBTools:IntegrityCheck' => 'Verificación de integridad',
-	'DBTools:FetchCheck' => 'Fetch Check (long)~~',
+	'DBTools:FetchCheck' => 'Verificación de búsqueda (larga)',
 	'DBTools:SelectAnalysisType' => 'Select analysis type~~',

 	'DBTools:Analyze' => 'Analizar',
 	'DBTools:Details' => 'Mostrar detalles',
 	'DBTools:ShowAll' => 'Mostrar todos los errores',

-	'DBTools:Inconsistencies' => 'Inconsistencias de base de datos',
+	'DBTools:Inconsistencies' => 'Inconsistencias de Base de Datos',
 	'DBTools:DetailedErrorTitle' => '%2$s error(s) in class %1$s: %3$s~~',

 	'DBAnalyzer-Integrity-OrphanRecord' => 'Registro huérfano en `%1$s`, debería tener su contraparte en la tabla `%2$s`',
@@ -54,32 +55,32 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'DBAnalyzer-Integrity-MissingExtKey' => 'Llave externa perdida %1$s (columna: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-InvalidValue' => 'Valor inválido para %1$s (columna: `%2$s.%3$s`)',
 	'DBAnalyzer-Integrity-UsersWithoutProfile' => 'Algunas cuentas de usuario no tienen perfil asignado',
-	'DBAnalyzer-Fetch-Count-Error' => 'Fetch count error in `%1$s`, %2$d entries fetched / %3$d counted~~',
-	'DBAnalyzer-Integrity-FinalClass' => 'Field `%2$s`.`%1$s` must have the same value as `%3$s`.`%1$s`~~',
-	'DBAnalyzer-Integrity-RootFinalClass' => 'Field `%2$s`.`%1$s` must contains a valid class~~',
+	'DBAnalyzer-Fetch-Count-Error' => 'Obtener cuenta de errores en `%1$s`, %2$d entradas recuperadas / %3$d contadas',
+	'DBAnalyzer-Integrity-FinalClass' => 'Campo `%2$s`.`%1$s` debe tener los mismos valores que `%3$s`.`%1$s`',
+	'DBAnalyzer-Integrity-RootFinalClass' => 'Campo `%2$s`.`%1$s` debe contener un caracter válido',
 ));

 // Database Info
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'DBTools:DatabaseInfo' => 'Información de base de datos',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'DBTools:DatabaseInfo' => 'Información de Base de Datos',
 	'DBTools:Base' => 'Base',
 	'DBTools:Size' => 'Tamaño',
 ));

 // Lost attachments
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'DBTools:LostAttachments' => 'Adjuntos perdidos',
-	'DBTools:LostAttachments:Disclaimer' => 'Aquí usted puede buscar adjuntos perdidos o desplazados. Esta NO es una herramienta de recuperación de datos, no obtiene datos borrados.',
+	'DBTools:LostAttachments:Disclaimer' => 'Aquí usted puede buscar anexos perdidos o fuera de lugar. Esta NO es una herramienta de recuperación de datos, no obtiene datos borrados.',

 	'DBTools:LostAttachments:Button:Analyze' => 'Analizar',
 	'DBTools:LostAttachments:Button:Restore' => 'Restaurar',
 	'DBTools:LostAttachments:Button:Restore:Confirm' => 'Esta acción no se puede deshacer, por favor confirme que quiere restaurar los archivos seleccionados.',
 	'DBTools:LostAttachments:Button:Busy' => 'Por favor espere...',

-	'DBTools:LostAttachments:Step:Analyze' => 'Primero, buscaremos adjuntos perdidos/desplazados analizando la base de datos.',
+	'DBTools:LostAttachments:Step:Analyze' => 'Primero, buscar anexos perdidos o fuera de lugar analizando la base de datos.',

 	'DBTools:LostAttachments:Step:AnalyzeResults' => 'Analizar resultados:',
-	'DBTools:LostAttachments:Step:AnalyzeResults:None' => 'Genial! Todo parece estar en el lugar correcto.',
+	'DBTools:LostAttachments:Step:AnalyzeResults:None' => '¡Genial! Todo parece estar en el lugar correcto.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Some' => 'Algunos adjuntos (%1$d) parecen estar desplazados. Mire la siguiente lista y verifique los que quiera mover.',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:Filename' => 'Nombre de archivo',
 	'DBTools:LostAttachments:Step:AnalyzeResults:Item:CurrentLocation' => 'Ubicación actual',
--- a/datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php
@@ -15,14 +15,14 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Attachments:TabTitle_Count' => 'Anexos (%1$d)',
 	'Attachments:EmptyTabTitle' => 'Anexos',
 	'Attachments:FieldsetTitle' => 'Anexos',
@@ -36,12 +36,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Attachment:Max_Ko' => '(Tamaño Máximo de Archivo: %1$s Kb)',
 	'Attachments:NoAttachment' => 'No hay Anexo. ',
 	'Attachments:PreviewNotAvailable' => 'Vista preliminar no disponible para este tipo de Anexo.',
-	'Attachments:Error:FileTooLarge' => 'File is too large to be uploaded. %1$s~~',
-	'Attachments:Error:UploadedFileEmpty' => 'The received file is empty and cannot be attached.
-Either you have pushed an empty file,
-or ask your iTop administrator if the iTop server disk is full.~~',
-	'Attachments:Render:Icons' => 'Display as icons~~',
-	'Attachments:Render:Table' => 'Display as list~~',
+	'Attachments:Error:FileTooLarge' => 'El archivo es demasiado grande para ser cargado. %1$s',
+	'Attachments:Error:UploadedFileEmpty' => 'El archivo recibido está vacío y no puede ser anexado.
+Puede ser que haya enviado un archivo vació,
+o pregunte al administador de iTop si el servidor que ha quedado sin espacio en disco.',
+	'Attachments:Render:Icons' => 'Desplegar como icono',
+	'Attachments:Render:Table' => 'Desplegar como lista',
 	'UI:Attachments:DropYourFileHint' => 'Drop files anywhere in this area~~',
 ));

@@ -49,41 +49,41 @@ or ask your iTop administrator if the iTop server disk is full.~~',
 // Class: Attachment
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Attachment' => 'Attachment~~',
-	'Class:Attachment+' => '~~',
-	'Class:Attachment/Attribute:expire' => 'Expire~~',
-	'Class:Attachment/Attribute:expire+' => '~~',
-	'Class:Attachment/Attribute:temp_id' => 'Temporary id~~',
-	'Class:Attachment/Attribute:temp_id+' => '~~',
-	'Class:Attachment/Attribute:item_class' => 'Item class~~',
-	'Class:Attachment/Attribute:item_class+' => '~~',
-	'Class:Attachment/Attribute:item_id' => 'Item~~',
-	'Class:Attachment/Attribute:item_id+' => '~~',
-	'Class:Attachment/Attribute:item_org_id' => 'Item organization~~',
-	'Class:Attachment/Attribute:item_org_id+' => '~~',
-	'Class:Attachment/Attribute:contents' => 'Contents~~',
-	'Class:Attachment/Attribute:contents+' => '~~',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:Attachment' => 'Anexo',
+	'Class:Attachment+' => 'Anexo',
+	'Class:Attachment/Attribute:expire' => 'Expira',
+	'Class:Attachment/Attribute:expire+' => '',
+	'Class:Attachment/Attribute:temp_id' => 'Id Temporal',
+	'Class:Attachment/Attribute:temp_id+' => '',
+	'Class:Attachment/Attribute:item_class' => 'Clase de Elemento',
+	'Class:Attachment/Attribute:item_class+' => '',
+	'Class:Attachment/Attribute:item_id' => 'Elemento',
+	'Class:Attachment/Attribute:item_id+' => '',
+	'Class:Attachment/Attribute:item_org_id' => 'Organización de Elemento',
+	'Class:Attachment/Attribute:item_org_id+' => '',
+	'Class:Attachment/Attribute:contents' => 'Contenido',
+	'Class:Attachment/Attribute:contents+' => '',
 ));


-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Attachments:File:Thumbnail' => 'Icon~~',
-	'Attachments:File:Name' => 'File name~~',
-	'Attachments:File:Date' => 'Upload date~~',
-	'Attachments:File:Uploader' => 'Uploaded by~~',
-	'Attachments:File:Size' => 'Size~~',
-	'Attachments:File:MimeType' => 'Type~~',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Attachments:File:Thumbnail' => 'Ícono',
+	'Attachments:File:Name' => 'Nombre de Archivo',
+	'Attachments:File:Date' => 'Fecha de Carga',
+	'Attachments:File:Uploader' => 'Cargado por',
+	'Attachments:File:Size' => 'Tamaño',
+	'Attachments:File:MimeType' => 'Tipo',
 ));
 //
 // Class: Attachment
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Attachment/Attribute:creation_date' => 'Creation date~~',
-	'Class:Attachment/Attribute:creation_date+' => '~~',
-	'Class:Attachment/Attribute:user_id' => 'User id~~',
-	'Class:Attachment/Attribute:user_id+' => '~~',
-	'Class:Attachment/Attribute:contact_id' => 'Contact id~~',
-	'Class:Attachment/Attribute:contact_id+' => '~~',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:Attachment/Attribute:creation_date' => 'Fecha de Creación',
+	'Class:Attachment/Attribute:creation_date+' => '',
+	'Class:Attachment/Attribute:user_id' => 'Id del Usuario',
+	'Class:Attachment/Attribute:user_id+' => '',
+	'Class:Attachment/Attribute:contact_id' => 'Id del Contacto',
+	'Class:Attachment/Attribute:contact_id+' => '',
 ));
--- a/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/renderers.itop-attachments.php
@@ -28,6 +28,7 @@ use Combodo\iTop\Application\UI\Base\Component\Button\Button;
 use Combodo\iTop\Application\UI\Base\Component\Button\ButtonUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Input\FileSelect\FileSelectUIBlockFactory;
+use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Renderer\BlockRenderer;

 define('ATTACHMENT_DOWNLOAD_URL', 'pages/ajax.document.php?operation=download_document&class=Attachment&field=contents&id=');
@@ -448,10 +449,13 @@ class TableDetailsAttachmentsRenderer extends AbstractAttachmentsRenderer
 		if ($bWithDeleteButton) {
 			$aAttribs['delete'] = array('label' => '', 'description' => '');
 		}
-
+		$oPanel = PanelUIBlockFactory::MakeNeutral('');
+		$oPanel->AddCSSClass('ibo-datatable-panel');
 		$oAttachmentTableBlock = DataTableUIBlockFactory::MakeForStaticData('', $aAttribs, $aData);
 		$oAttachmentTableBlock->AddCSSClass('ibo-attachment--datatable');
-		$this->oPage->AddUiBlock($oAttachmentTableBlock);
+		$oPanel->AddSubBlock($oAttachmentTableBlock);
+
+		$this->oPage->AddUiBlock($oPanel);

 		$sTableId = $oAttachmentTableBlock->GetId();

--- a/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/es_cr.dict.itop-backup.php
@@ -4,6 +4,7 @@
 *
 * @copyright Copyright (C) 2010-2021 Combodo SARL
 * @license	http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,7 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(

 	'bkp-backup-running' => 'Un respaldo está en ejecuión.  Por favor espere...',
 	'bkp-restore-running' => 'Una restauración está en ejecución. Por favor espere...',
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/es_cr.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/es_cr.dict.itop-bridge-cmdb-ticket.php
@@ -30,15 +30,15 @@
 //
 // Class: lnkFunctionalCIToTicket
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToTicket' => 'Relación EC Funcional y Ticket',
 	'Class:lnkFunctionalCIToTicket+' => 'Relación EC Funcional y Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id+' => 'Ticket',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => 'Ref.',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => 'Ref.',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Ticket title~~',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => 'Título del Ticket',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => 'EC',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => 'Elemanto de Configuración',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => 'Elemanto de Configuración',
@@ -55,7 +55,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkFunctionalCIToProviderContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
@@ -72,7 +72,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkFunctionalCIToService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToService' => 'Relación EC Funcional y Servicio',
 	'Class:lnkFunctionalCIToService+' => 'Relación EC Funcional y Servicio',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => 'Servicio',
@@ -89,7 +89,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: FunctionalCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:FunctionalCI/Attribute:providercontracts_list' => 'Contratos',
 	'Class:FunctionalCI/Attribute:providercontracts_list+' => 'Contratos',
 	'Class:FunctionalCI/Attribute:services_list' => 'Servicios',
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/es_cr.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/es_cr.dict.itop-change-mgmt-itil.php
@@ -15,14 +15,14 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ChangeManagement' => 'Administración de Cambios',
 	'Menu:Change:Overview' => 'Resumen de Cambios',
 	'Menu:Change:Overview+' => 'Resumen de Cambios',
@@ -63,7 +63,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Change
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Change' => 'Cambio',
 	'Class:Change+' => 'Cambio',
 	'Class:Change/Attribute:status' => 'Estatus',
@@ -166,7 +166,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: RoutineChange
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:RoutineChange' => 'Cambio Rutinario',
 	'Class:RoutineChange+' => 'Cambio Rutinario',
 	'Class:RoutineChange/Stimulus:ev_validate' => 'Validar',
@@ -197,7 +197,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ApprovedChange
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ApprovedChange' => 'Cambios Aprobados',
 	'Class:ApprovedChange+' => 'Cambios Aprobados',
 	'Class:ApprovedChange/Attribute:approval_date' => 'Fecha de Aprobación',
@@ -232,7 +232,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: NormalChange
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NormalChange' => 'Cambio Normal',
 	'Class:NormalChange+' => 'Cambio Normal',
 	'Class:NormalChange/Attribute:acceptance_date' => 'Fecha de Aceptación',
@@ -267,7 +267,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: EmergencyChange
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:EmergencyChange' => 'Cambio de Emergencia',
 	'Class:EmergencyChange+' => 'Cambio de Emergencia',
 	'Class:EmergencyChange/Stimulus:ev_validate' => 'Validar',
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/es_cr.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/es_cr.dict.itop-change-mgmt.php
@@ -15,14 +15,14 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ChangeManagement' => 'Administración de Cambios',
 	'Menu:Change:Overview' => 'Resumen de Cambios',
 	'Menu:Change:Overview+' => 'Resumen de Cambios',
@@ -63,7 +63,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Change
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Change' => 'Cambio',
 	'Class:Change+' => 'Cambio',
 	'Class:Change/Attribute:status' => 'Estatus',
--- 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
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -26,7 +26,7 @@
 // Relations
 //////////////////////////////////////////////////////////////////////
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Relation:impacts/Description' => 'Elementos Impactados por',
 	'Relation:impacts/DownStream' => 'Impacto...',
 	'Relation:impacts/DownStream+' => 'Elementos Impactados por',
@@ -80,7 +80,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkContactToFunctionalCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToFunctionalCI' => 'Relación Contacto y  EC Funcional',
 	'Class:lnkContactToFunctionalCI+' => 'Relación Contacto y  EC Funcional',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
@@ -97,7 +97,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: FunctionalCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:FunctionalCI' => 'EC Funcional',
 	'Class:FunctionalCI+' => 'Elemento de Configuración Funcional',
 	'Class:FunctionalCI/Attribute:name' => 'Nombre',
@@ -135,7 +135,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: PhysicalDevice
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PhysicalDevice' => 'Dispositivo Físico',
 	'Class:PhysicalDevice+' => 'Dispositivo Físico',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Número de Serie',
@@ -174,7 +174,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Rack
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Rack' => 'Rack',
 	'Class:Rack+' => '',
 	'Class:Rack/Attribute:nb_u' => 'Unidades de Rack',
@@ -189,7 +189,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TelephonyCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TelephonyCI' => 'EC Telefónico',
 	'Class:TelephonyCI+' => 'EC Telefónico',
 	'Class:TelephonyCI/Attribute:phonenumber' => 'Número Telefónico',
@@ -200,7 +200,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Phone
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Phone' => 'Teléfono',
 	'Class:Phone+' => 'Teléfono',
 ));
@@ -209,7 +209,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: MobilePhone
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:MobilePhone' => 'Teléfono Móvil',
 	'Class:MobilePhone+' => 'Teléfono Móvil',
 	'Class:MobilePhone/Attribute:imei' => 'IMEI',
@@ -222,7 +222,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: IPPhone
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:IPPhone' => 'Teléfono IP',
 	'Class:IPPhone+' => 'Teléfono IP',
 ));
@@ -231,7 +231,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Tablet
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Tablet' => 'Tableta',
 	'Class:Tablet+' => 'Tableta',
 ));
@@ -240,7 +240,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ConnectableCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ConnectableCI' => 'EC Conectable',
 	'Class:ConnectableCI+' => 'EC Físico',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Dispositivos de Red',
@@ -253,7 +253,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: DatacenterDevice
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DatacenterDevice' => 'Dispositivos de Centro de Datos',
 	'Class:DatacenterDevice+' => 'Dispositivos de Centro de Datos',
 	'Class:DatacenterDevice/Attribute:rack_id' => 'Rack',
@@ -291,7 +291,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: NetworkDevice
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NetworkDevice' => 'Dispositivo de Red',
 	'Class:NetworkDevice+' => 'Dispositivo de Red',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Tipo de Red',
@@ -312,7 +312,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Server
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Server' => 'Servidor',
 	'Class:Server+' => 'Servidor',
 	'Class:Server/Attribute:osfamily_id' => 'Familia de SO',
@@ -339,7 +339,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: StorageSystem
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:StorageSystem' => 'Sistema de Almacenamiento',
 	'Class:StorageSystem+' => 'Sistema de Almacenamiento',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumenes Lógicos',
@@ -350,7 +350,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: SANSwitch
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SANSwitch' => 'Switch de SAN',
 	'Class:SANSwitch+' => 'Switch de SAN',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Dispositivos',
@@ -361,7 +361,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TapeLibrary
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TapeLibrary' => 'Libreria de Cintas',
 	'Class:TapeLibrary+' => 'Libreria de Cintas',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Cintas',
@@ -372,7 +372,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: NAS
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NAS' => 'NAS',
 	'Class:NAS+' => 'NAS',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Filesystems',
@@ -383,7 +383,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: PC
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PC' => 'PC/Laptop',
 	'Class:PC+' => 'PC/Laptop',
 	'Class:PC/Attribute:osfamily_id' => 'Familia de SO',
@@ -410,7 +410,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Printer
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Printer' => 'Impresora',
 	'Class:Printer+' => 'Impresora',
 ));
@@ -419,7 +419,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: PowerConnection
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PowerConnection' => 'Conexión Eléctrica',
 	'Class:PowerConnection+' => 'Conexión Eléctrica',
 ));
@@ -428,7 +428,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: PowerSource
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PowerSource' => 'Fuente de Poder',
 	'Class:PowerSource+' => 'Fuente de Poder',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
@@ -439,7 +439,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: PDU
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PDU' => 'PDU',
 	'Class:PDU+' => 'PDU',
 	'Class:PDU/Attribute:rack_id' => 'Rack',
@@ -456,7 +456,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Peripheral
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Peripheral' => 'Periférico',
 	'Class:Peripheral+' => 'Periférico',
 ));
@@ -465,7 +465,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Enclosure
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Enclosure' => 'Enclosure',
 	'Class:Enclosure+' => 'Enclosure',
 	'Class:Enclosure/Attribute:rack_id' => 'Rack',
@@ -482,7 +482,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ApplicationSolution
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ApplicationSolution' => 'Solución Aplicativa',
 	'Class:ApplicationSolution+' => 'Solución Aplicativa',
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'ECs',
@@ -505,7 +505,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: BusinessProcess
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:BusinessProcess' => 'Proceso de Negocio',
 	'Class:BusinessProcess+' => 'Proceso de Negocio',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Soluciones Aplicativas',
@@ -522,7 +522,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: SoftwareInstance
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SoftwareInstance' => 'Instalación de Software',
 	'Class:SoftwareInstance+' => 'Instalación de Software',
 	'Class:SoftwareInstance/Attribute:system_id' => 'Sistema',
@@ -551,7 +551,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Middleware
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Middleware' => 'Middleware',
 	'Class:Middleware+' => 'Middleware',
 	'Class:Middleware/Attribute:middlewareinstance_list' => 'Instalaciones de Middleware',
@@ -562,7 +562,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: DBServer
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DBServer' => 'Servidor de Base de Datos',
 	'Class:DBServer+' => 'Servidor de Base de Datos',
 	'Class:DBServer/Attribute:dbschema_list' => 'Esquema de BD',
@@ -573,7 +573,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: WebServer
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:WebServer' => 'Servidor Web',
 	'Class:WebServer+' => 'Servidor Web',
 	'Class:WebServer/Attribute:webapp_list' => 'Aplicaciones Web',
@@ -584,7 +584,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: PCSoftware
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PCSoftware' => 'Software de PC',
 	'Class:PCSoftware+' => 'Software de PC',
 ));
@@ -593,7 +593,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: OtherSoftware
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:OtherSoftware' => 'Otro Software',
 	'Class:OtherSoftware+' => 'Otro Software',
 ));
@@ -602,7 +602,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: MiddlewareInstance
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:MiddlewareInstance' => 'Instalación de Middleware',
 	'Class:MiddlewareInstance+' => 'Instalación de Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
@@ -615,7 +615,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: DatabaseSchema
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DatabaseSchema' => 'Esquema de Base de Datos',
 	'Class:DatabaseSchema+' => 'Esquema de Base de Datos',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Servidor de Base de Datos',
@@ -628,7 +628,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: WebApplication
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:WebApplication' => 'Aplicación Web',
 	'Class:WebApplication+' => 'Aplicación Web',
 	'Class:WebApplication/Attribute:webserver_id' => 'Servidor Web',
@@ -644,7 +644,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: VirtualDevice
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:VirtualDevice' => 'Dispositivo Virtual',
 	'Class:VirtualDevice+' => 'Dispositivo Virtual',
 	'Class:VirtualDevice/Attribute:status' => 'Estatus',
@@ -665,7 +665,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: VirtualHost
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:VirtualHost' => 'Host Virtual',
 	'Class:VirtualHost+' => 'Host Virtual',
 	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Máquinas Virtuales',
@@ -676,7 +676,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Hypervisor
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Hypervisor' => 'Hypervisor',
 	'Class:Hypervisor+' => 'Hypervisor',
 	'Class:Hypervisor/Attribute:farm_id' => 'Granja',
@@ -693,7 +693,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Farm
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Farm' => 'Granja',
 	'Class:Farm+' => 'Granja',
 	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisores',
@@ -708,7 +708,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: VirtualMachine
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:VirtualMachine' => 'Máquina Virtual',
 	'Class:VirtualMachine+' => 'Máquina Virtual',
 	'Class:VirtualMachine/Attribute:virtualhost_id' => 'Host Virtual',
@@ -741,7 +741,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: LogicalVolume
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:LogicalVolume' => 'Volumen Lógico',
 	'Class:LogicalVolume+' => 'Volumen Lógico',
 	'Class:LogicalVolume/Attribute:name' => 'Nombre',
@@ -768,7 +768,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkServerToVolume
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkServerToVolume' => 'Relación Servidor y Volumen',
 	'Class:lnkServerToVolume+' => 'Relación Servidor y Volumen',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volumen',
@@ -787,7 +787,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkVirtualDeviceToVolume
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkVirtualDeviceToVolume' => 'Relación Dispositivo Virtual y Volumen',
 	'Class:lnkVirtualDeviceToVolume+' => 'Relación Dispositivo Virtual y Volumen',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volumen',
@@ -806,7 +806,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkSanToDatacenterDevice
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSanToDatacenterDevice' => 'Relación SAN y Dispositivo del Centro de Datos',
 	'Class:lnkSanToDatacenterDevice+' => 'Relación SAN y Dispositivo del Centro de Datos',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch de SAN',
@@ -827,7 +827,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Tape
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Tape' => 'Cinta',
 	'Class:Tape+' => 'Cinta',
 	'Class:Tape/Attribute:name' => 'Nombre',
@@ -846,7 +846,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: NASFileSystem
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NASFileSystem' => 'Filesysten en NAS',
 	'Class:NASFileSystem+' => 'Filesysten en NAS',
 	'Class:NASFileSystem/Attribute:name' => 'Nombre',
@@ -867,7 +867,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Software
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Software' => 'Software',
 	'Class:Software+' => 'Software',
 	'Class:Software/Attribute:name' => 'Nombre',
@@ -902,7 +902,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Patch
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Patch' => 'Parche',
 	'Class:Patch+' => 'Parche',
 	'Class:Patch/Attribute:name' => 'Nombre',
@@ -919,7 +919,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: OSPatch
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:OSPatch' => 'Parche de SO',
 	'Class:OSPatch+' => 'Parche de SO',
 	'Class:OSPatch/Attribute:functionalcis_list' => 'Dispositivos',
@@ -934,7 +934,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: SoftwarePatch
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SoftwarePatch' => 'Parche de Software',
 	'Class:SoftwarePatch+' => 'Parche de Software',
 	'Class:SoftwarePatch/Attribute:software_id' => 'Software',
@@ -949,7 +949,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Licence
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Licence' => 'Licencia',
 	'Class:Licence+' => 'Licencia',
 	'Class:Licence/Attribute:name' => 'Nombre',
@@ -984,7 +984,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: OSLicence
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:OSLicence' => 'Licencia de SO',
 	'Class:OSLicence+' => 'Licencia de SO',
 	'Class:OSLicence/Attribute:osversion_id' => 'Versión de SO',
@@ -1001,7 +1001,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: SoftwareLicence
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SoftwareLicence' => 'Licencia de Software',
 	'Class:SoftwareLicence+' => 'Licencia de Software',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
@@ -1016,7 +1016,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDocumentToLicence
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToLicence' => 'Relación Documento y Licencia',
 	'Class:lnkDocumentToLicence+' => 'Relación Documento y Licencia',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licencia',
@@ -1033,7 +1033,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: OSVersion
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:OSVersion' => 'Versión de SO',
 	'Class:OSVersion+' => 'Versión de SO',
 	'Class:OSVersion/Attribute:osfamily_id' => 'Familia de SO',
@@ -1046,7 +1046,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: OSFamily
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:OSFamily' => 'Familia de SO',
 	'Class:OSFamily+' => 'Familia de SO',
 ));
@@ -1055,20 +1055,20 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Brand
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Brand' => 'Marca',
 	'Class:Brand+' => 'Marca',
 	'Class:Brand/Attribute:physicaldevices_list' => 'Dispositivo Físico',
 	'Class:Brand/Attribute:physicaldevices_list+' => 'Dispositivo Físico',
-	'Class:Brand/UniquenessRule:name+' => 'The name must be unique~~',
-	'Class:Brand/UniquenessRule:name' => 'This brand already exists~~',
+	'Class:Brand/UniquenessRule:name+' => 'El nombre debe ser único',
+	'Class:Brand/UniquenessRule:name' => 'Esta Marca ya existe',
 ));

 //
 // Class: Model
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Model' => 'Modelo',
 	'Class:Model+' => 'Modelo',
 	'Class:Model/Attribute:brand_id' => 'Marca',
@@ -1115,15 +1115,15 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:Model/Attribute:type/Value:Phone+' => 'Teléfono',
 	'Class:Model/Attribute:physicaldevices_list' => 'Dispositivo Físico',
 	'Class:Model/Attribute:physicaldevices_list+' => 'Dispositivo Físico',
-	'Class:Model/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
-	'Class:Model/UniquenessRule:name_brand' => 'this model already exists for this brand~~',
+	'Class:Model/UniquenessRule:name_brand+' => 'El nombre debe ser único dentro de la Marca',
+	'Class:Model/UniquenessRule:name_brand' => 'este modelo ya existe para esta Marca',
 ));

 //
 // Class: NetworkDeviceType
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NetworkDeviceType' => 'Tipo Dispositivo de Red',
 	'Class:NetworkDeviceType+' => 'Tipo de Dispositivo de Red',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Dispositivos de Red',
@@ -1134,7 +1134,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: IOSVersion
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:IOSVersion' => 'Versión de IOS',
 	'Class:IOSVersion+' => 'Versión de IOS',
 	'Class:IOSVersion/Attribute:brand_id' => 'Marca',
@@ -1147,7 +1147,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDocumentToPatch
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToPatch' => 'Relación Documentos y Parche',
 	'Class:lnkDocumentToPatch+' => 'Relación Documentos y Parche',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Parche',
@@ -1164,7 +1164,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkSoftwareInstanceToSoftwarePatch
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Relación Instalación de Software y Parche de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => 'Relación Instalación de Software y Parche de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Parche de Software',
@@ -1181,7 +1181,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkFunctionalCIToOSPatch
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToOSPatch' => 'Relación EC Funcional y Parche de SO',
 	'Class:lnkFunctionalCIToOSPatch+' => 'Relación EC Funcional y Parche de SO',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Parche de SO',
@@ -1198,7 +1198,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDocumentToSoftware
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToSoftware' => 'Relación Documento y Software',
 	'Class:lnkDocumentToSoftware+' => 'Relación Documento y Software',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
@@ -1215,21 +1215,21 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Subnet
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Subnet' => 'SubRed',
 	'Class:Subnet+' => 'SubRed',
 	'Class:Subnet/Attribute:description' => 'Descripción',
-	'Class:Subnet/Attribute:description+' => 'Descripción',
-	'Class:Subnet/Attribute:subnet_name' => 'Subnet name~~',
-	'Class:Subnet/Attribute:subnet_name+' => '~~',
+	'Class:Subnet/Attribute:description+' => '',
+	'Class:Subnet/Attribute:subnet_name' => 'Nombre de Subred',
+	'Class:Subnet/Attribute:subnet_name+' => '',
 	'Class:Subnet/Attribute:org_id' => 'Organización',
-	'Class:Subnet/Attribute:org_id+' => 'Organización',
+	'Class:Subnet/Attribute:org_id+' => '',
 	'Class:Subnet/Attribute:org_name' => 'Organización',
-	'Class:Subnet/Attribute:org_name+' => 'Organización',
+	'Class:Subnet/Attribute:org_name+' => '',
 	'Class:Subnet/Attribute:ip' => 'IP',
-	'Class:Subnet/Attribute:ip+' => 'IP',
+	'Class:Subnet/Attribute:ip+' => '',
 	'Class:Subnet/Attribute:ip_mask' => 'Máscara de Red',
-	'Class:Subnet/Attribute:ip_mask+' => 'Máscara de Red',
+	'Class:Subnet/Attribute:ip_mask+' => '',
 	'Class:Subnet/Attribute:vlans_list' => 'vLANs',
 	'Class:Subnet/Attribute:vlans_list+' => 'Virtual LANs',
 ));
@@ -1238,7 +1238,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: VLAN
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:VLAN' => 'vLAN',
 	'Class:VLAN+' => 'Red Virtual de Área Local',
 	'Class:VLAN/Attribute:vlan_tag' => 'Etiqueta vLAN',
@@ -1259,7 +1259,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkSubnetToVLAN
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSubnetToVLAN' => 'Relación Subred / vLAN',
 	'Class:lnkSubnetToVLAN+' => 'Relación Subred / vLAN',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Subred',
@@ -1278,7 +1278,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: NetworkInterface
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:NetworkInterface' => 'Interfaz de Red',
 	'Class:NetworkInterface+' => 'Interfaz de Red',
 	'Class:NetworkInterface/Attribute:name' => 'Nombre',
@@ -1291,7 +1291,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: IPInterface
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:IPInterface' => 'Interfaz IP',
 	'Class:IPInterface+' => 'Interfaz IP',
 	'Class:IPInterface/Attribute:ipaddress' => 'Dirección IP',
@@ -1314,7 +1314,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: PhysicalInterface
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:PhysicalInterface' => 'Interfaz Física',
 	'Class:PhysicalInterface+' => 'Interfaz Física',
 	'Class:PhysicalInterface/Attribute:connectableci_id' => 'Dispositivo',
@@ -1329,7 +1329,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkPhysicalInterfaceToVLAN
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkPhysicalInterfaceToVLAN' => 'Relación Interfaz Física / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => 'Relación Interfaz Física / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interfaz Física',
@@ -1351,7 +1351,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: LogicalInterface
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:LogicalInterface' => 'Interfaz Lógica',
 	'Class:LogicalInterface+' => 'Interfaz Lógica',
 	'Class:LogicalInterface/Attribute:virtualmachine_id' => 'Máquina Virtual',
@@ -1364,7 +1364,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: FiberChannelInterface
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:FiberChannelInterface' => 'Intefaz de Fibra Óptica',
 	'Class:FiberChannelInterface+' => 'Intefaz de Fibra Óptica',
 	'Class:FiberChannelInterface/Attribute:speed' => 'Velocidad',
@@ -1383,7 +1383,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkConnectableCIToNetworkDevice
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkConnectableCIToNetworkDevice' => 'Relación EC Conectable y Dispositivo de Red',
 	'Class:lnkConnectableCIToNetworkDevice+' => 'Relación EC Conectable y Dispositivo de Red',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Dispositivo de Red',
@@ -1410,7 +1410,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkApplicationSolutionToFunctionalCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkApplicationSolutionToFunctionalCI' => 'Relación Solución Aplicativa y EC Funcional',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => 'Relación Solución Aplicativa y EC Funcional',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solución Aplicativa',
@@ -1427,7 +1427,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkApplicationSolutionToBusinessProcess
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkApplicationSolutionToBusinessProcess' => 'Relación Solución Aplicativa y Proceso de Negocio',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => 'Relación Solución Aplicativa y Proceso de Negocio',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Proceso de Negocio',
@@ -1444,7 +1444,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Group
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Group' => 'Grupo',
 	'Class:Group+' => 'Grupo',
 	'Class:Group/Attribute:name' => 'Nombre',
@@ -1480,7 +1480,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkGroupToCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkGroupToCI' => 'Relación Grupo y EC',
 	'Class:lnkGroupToCI+' => 'Relación Grupo y EC',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Grupo',
@@ -1497,7 +1497,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(

 // Add translation for Fieldsets

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Server:baseinfo' => 'Información General',
 	'Server:Date' => 'Fecha',
 	'Server:moreinfo' => 'Más Información',
@@ -1516,7 +1516,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDocumentToFunctionalCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToFunctionalCI' => 'Relación Documento y EC Funcional',
 	'Class:lnkDocumentToFunctionalCI+' => 'Relación Documento y EC Funcional',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'EC Funcional',
@@ -1533,39 +1533,39 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Application Menu
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:Application' => 'Aplicaciones',
 	'Menu:Application+' => 'Aplicaciones/Programas',
 	'Menu:DBServer' => 'Servidores de Base de Datos',
 	'Menu:DBServer+' => 'Servidores de Base de Datos',
 	'Menu:BusinessProcess' => 'Proceso de Negocio',
-	'Menu:BusinessProcess+' => 'Proceso de Negocios',
+	'Menu:BusinessProcess+' => '',
 	'Menu:ApplicationSolution' => 'Solución Aplicativa',
-	'Menu:ApplicationSolution+' => 'Solución Aplicativa',
+	'Menu:ApplicationSolution+' => '',
 	'Menu:ConfigManagementSoftware' => 'Administración de Aplicaciones',
 	'Menu:Licence' => 'Licencias',
-	'Menu:Licence+' => 'Licencias',
+	'Menu:Licence+' => '',
 	'Menu:Patch' => 'Parches',
-	'Menu:Patch+' => 'Parches',
+	'Menu:Patch+' => '',
 	'Menu:ApplicationInstance' => 'Software Instalado',
 	'Menu:ApplicationInstance+' => 'Aplicaciones y Servidores de Base de Datos',
 	'Menu:ConfigManagementHardware' => 'Administración de Infraestructura',
 	'Menu:Subnet' => 'SubRedes',
-	'Menu:Subnet+' => 'SubRedes',
+	'Menu:Subnet+' => '',
 	'Menu:NetworkDevice' => 'Dispositivos de Red',
-	'Menu:NetworkDevice+' => 'Dispositivos de Red',
+	'Menu:NetworkDevice+' => '',
 	'Menu:Server' => 'Servidores',
-	'Menu:Server+' => 'Servidores',
+	'Menu:Server+' => '',
 	'Menu:Printer' => 'Impresoras',
-	'Menu:Printer+' => 'Impresoras',
+	'Menu:Printer+' => '',
 	'Menu:MobilePhone' => 'Teléfonos Móviles',
-	'Menu:MobilePhone+' => 'Teléfonos Móviles',
+	'Menu:MobilePhone+' => '',
 	'Menu:PC' => 'PCs y Laptops',
-	'Menu:PC+' => 'PCs y Laptops',
+	'Menu:PC+' => '',
 	'Menu:NewCI' => 'Nuevo EC',
-	'Menu:NewCI+' => 'Nuevo EC',
+	'Menu:NewCI+' => '',
 	'Menu:SearchCIs' => 'Búsqueda de ECs',
-	'Menu:SearchCIs+' => 'Búsqueda de ECs',
+	'Menu:SearchCIs+' => '',
 	'Menu:ConfigManagement:Devices' => 'Dispositivos',
 	'Menu:ConfigManagement:AllDevices' => 'Infraestructura',
 	'Menu:ConfigManagement:virtualization' => 'Virtualización',
@@ -1573,10 +1573,10 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Menu:ConfigManagement:SWAndApps' => 'Software y Aplicaciones',
 	'Menu:ConfigManagement:Misc' => 'Misceláneo',
 	'Menu:Group' => 'Grupos de ECs',
-	'Menu:Group+' => 'Grupos de ECs',
-	'Menu:OSVersion' => 'OS versions~~',
-	'Menu:OSVersion+' => '~~',
+	'Menu:Group+' => '',
+	'Menu:OSVersion' => 'Versión de Sistema Operativo',
+	'Menu:OSVersion+' => '',
 	'Menu:Software' => 'Catálogo de Software',
-	'Menu:Software+' => 'Catálogo de Software',
+	'Menu:Software+' => '',
 ));
 ?>
--- a/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/es_cr.dict.itop-config.php
@@ -4,6 +4,7 @@
 *
 * @copyright Copyright (C) 2010-2021 Combodo SARL
 * @license	http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,7 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(

 	'Menu:ConfigEditor' => 'Configuración',
 	'config-edit-title' => 'Editor de Archivo de Configuración',
@@ -34,5 +35,5 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'config-reverted' => 'La configuración ha sido revertida.',
 	'config-parse-error' => 'Línea %2$d: %1$s.<br/>El archivo NO ha sido actualizado.',
 	'config-current-line' => 'Editando línea: %1$s',
-	'config-saved-warning-db-password' => 'Successfully recorded, but the backup won\'t work due to unsupported characters in the database password.~~',
+	'config-saved-warning-db-password' => 'Registrado correctamente, pero el respaldo NO funcionará debido a caracteres no admitidos en la contraseña de la base de datos.',
 ));
--- a/datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php
@@ -4,6 +4,7 @@
 *
 * @copyright Copyright (C) 2010-2021 Combodo SARL
 * @license	http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,15 +21,15 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'iTopUpdate:UI:PageTitle' => 'Actualización de aplicación',
-    'itop-core-update:UI:SelectUpdateFile' => 'Application Upgrade~~',
-    'itop-core-update:UI:ConfirmUpdate' => 'Application Upgrade~~',
-    'itop-core-update:UI:UpdateCoreFiles' => 'Application Upgrade~~',
+    'itop-core-update:UI:SelectUpdateFile' => 'Seleccionar archivo',
+    'itop-core-update:UI:ConfirmUpdate' => 'Confirmar actualización',
+    'itop-core-update:UI:UpdateCoreFiles' => 'Actualizar aplicación',
 	'iTopUpdate:UI:MaintenanceModeActive' => 'La aplicación está actualmente en mantenimiento, ningún usuario puede acceder. UStede debe ejecutar la instalación o restaturar la aplicación para regresar al modo normal.',
-	'itop-core-update:UI:UpdateDone' => 'Application Upgrade~~',
+	'itop-core-update:UI:UpdateDone' => 'Actualización realizada',

-	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Application Upgrade~~',
+	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Seleccionar archivo',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirmar actualización de la aplicación',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Actualizando aplicación',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Actualización de aplicación terminada',
@@ -63,18 +64,18 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
    'iTopUpdate:UI:DiskFreeSpace' => 'Espaciolibre en el dispositivo',
    'iTopUpdate:UI:ItopDiskSpace' => 'Espacio en diso de '.ITOP_APPLICATION_SHORT,
    'iTopUpdate:UI:DBDiskSpace' => 'Espacio en diso de base de datos',
-	'iTopUpdate:UI:FileUploadMaxSize' => 'Máximo tamaño de subida de archivos',
+	'iTopUpdate:UI:FileUploadMaxSize' => 'Máximo tamaño de carga de archivos',

-	'iTopUpdate:UI:PostMaxSize' => 'Valor post_max_size en PHP ini: %1$s~~',
-	'iTopUpdate:UI:UploadMaxFileSize' => 'Valor upload_max_filesize en PHP ini: %1$s~~',
+	'iTopUpdate:UI:PostMaxSize' => 'Valor post_max_size en PHP ini: %1$s',
+	'iTopUpdate:UI:UploadMaxFileSize' => 'Valor upload_max_filesize en PHP ini: %1$s',

    'iTopUpdate:UI:CanCoreUpdate:Loading' => 'Revisando sistema de archivos',
    'iTopUpdate:UI:CanCoreUpdate:Error' => 'La revisión del sistema de archivos falló (%1$s)',
-    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'La revisión del sistema de archivos falló (Archivo no existe %1$s)~~',
+    'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => 'La revisión del sistema de archivos falló (Archivo no existe %1$s)',
    'iTopUpdate:UI:CanCoreUpdate:Failed' => 'La revisión del sistema de archivos falló',
    'iTopUpdate:UI:CanCoreUpdate:Yes' => 'La aplicación puede ser actualizada',
 	'iTopUpdate:UI:CanCoreUpdate:No' => 'La aplicación no puede ser actualizada: %1$s',
-	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~',
+	'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Advertencia: la actualización de la aplicación puede fallar: %1$s',
 	'iTopUpdate:UI:CannotUpdateUseSetup' => 'You must use the <a href="%1$s">setup</a> to update the application.<br />Some modified files were detected, a partial update cannot be executed.~~',

 	// Setup Messages
@@ -91,12 +92,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(

 	// Errors
 	'iTopUpdate:Error:MissingFunction' => 'Imposible comenzar actualización, función no disponible',
-	'iTopUpdate:Error:MissingFile' => 'Archivo no encontrado: %1$s~~',
+	'iTopUpdate:Error:MissingFile' => 'Archivo no encontrado: %1$s',
 	'iTopUpdate:Error:CorruptedFile' => 'El archivo %1$s está corrupto',
    'iTopUpdate:Error:BadFileFormat' => 'El archivo de actualización no es un archivo zip',
    'iTopUpdate:Error:BadFileContent' => 'El archivo de actualización no es correcto',
    'iTopUpdate:Error:BadItopProduct' => 'El archivo de actualización no es compatible con su producto',
-	'iTopUpdate:Error:Copy' => 'Error, no puedo copiar \'%1$s\' a \'%2$s\'~~',
+	'iTopUpdate:Error:Copy' => 'Error, no puedo copiar \'%1$s\' a \'%2$s\'',
    'iTopUpdate:Error:FileNotFound' => 'Archivo no encontrado',
    'iTopUpdate:Error:NoFile' => 'Archivo no seleccionado',
 	'iTopUpdate:Error:InvalidToken' => 'Token inválido',
@@ -105,7 +106,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(

 	'iTopUpdate:UI:RestoreArchive' => 'Usted puede restaurar su aplicación desde el archivo \'%1$s\'',
 	'iTopUpdate:UI:RestoreBackup' => 'Usted puede restaurar la base de datos desde \'%1$s\'',
-	'iTopUpdate:UI:UpdateDone' => 'Actualización exitosa',
+	'iTopUpdate:UI:UpdateDone' => 'Actualización éxitosa',
 	'Menu:iTopUpdate' => 'Actualización de aplicación',
 	'Menu:iTopUpdate+' => 'Actualización de aplicación',

@@ -113,7 +114,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
    'Class:ModuleInstallation/Attribute:installed' => 'Instalado en',
    'Class:ModuleInstallation/Attribute:name' => 'Nombre',
    'Class:ModuleInstallation/Attribute:version' => 'Versión',
-    'Class:ModuleInstallation/Attribute:comment' => 'Commentario',
+    'Class:ModuleInstallation/Attribute:comment' => 'Comentario',
 ));


--- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
+++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml
@@ -200,7 +200,7 @@
          </attributes>
        </naming>
        <style>
-          <icon>../../images/icons/icons8-stack.svg</icon>
+          <icon>../../images/icons/icons8-enclosure-for-servers.svg</icon>
        </style>
        <reconciliation>
          <attributes>
--- a/datamodels/2.x/itop-datacenter-mgmt/dictionaries/es_cr.dict.itop-datacenter-mgmt.php
+++ b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/es_cr.dict.itop-datacenter-mgmt.php
@@ -4,6 +4,7 @@
 *
 * @copyright Copyright (C) 2010-2021 Combodo SARL
 * @license	http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,6 +21,6 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Dictionary entries go here
 ));
--- a/datamodels/2.x/itop-endusers-devices/dictionaries/es_cr.dict.itop-endusers-devices.php
+++ b/datamodels/2.x/itop-endusers-devices/dictionaries/es_cr.dict.itop-endusers-devices.php
@@ -4,6 +4,7 @@
 *
 * @copyright Copyright (C) 2010-2021 Combodo SARL
 * @license	http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,6 +21,6 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Dictionary entries go here
 ));
--- a/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/es_cr.dict.itop-faq-light.php
@@ -47,7 +47,10 @@
 //
 // Class: FAQ
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+//
+// Class: FAQ
+//
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:FAQ' => 'Preguntas y Respuestas Frecuentes',
 	'Class:FAQ+' => 'Preguntas y Respuestas Frecuentes',
 	'Class:FAQ/Attribute:title' => 'Asunto',
@@ -64,14 +67,13 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:FAQ/Attribute:error_code+' => 'Código de Error',
 	'Class:FAQ/Attribute:key_words' => 'Palabras Clave',
 	'Class:FAQ/Attribute:key_words+' => 'Palabras Clave',
-	'Class:FAQ/Attribute:domains' => 'Domains~~',
+	'Class:FAQ/Attribute:domains' => 'Ámbito',
 ));

 //
 // Class: FAQCategory
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:FAQCategory' => 'Categoría de Preguntas y Respuesta Frecuentes',
 	'Class:FAQCategory+' => 'Categoría de Preguntas y Respuesta Frecuentes',
 	'Class:FAQCategory/Attribute:name' => 'Nombre',
@@ -79,7 +81,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:FAQCategory/Attribute:faq_list' => 'FAQs',
 	'Class:FAQCategory/Attribute:faq_list+' => 'FAQs',
 ));
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ProblemManagement' => 'Gestión de problemas',
 	'Menu:ProblemManagement+' => 'Gestión de problemas',
 	'Menu:Problem:Shortcuts' => 'Acceso Rápido',
--- a/datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/es_cr.dict.itop-files-information.php
@@ -4,6 +4,7 @@
 *
 * @copyright Copyright (C) 2010-2021 Combodo SARL
 * @license	http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,11 +21,11 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Errors
-	'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~',
-	'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~',
-	'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~',
+	'FilesInformation:Error:MissingFile' => 'Archivo faltante: %1$s',
+	'FilesInformation:Error:CorruptedFile' => 'El archivo %1$s está corrupto',
+	'FilesInformation:Error:CantWriteToFile' => 'No se puede escribir al archivo %1$s',
 ));


--- a/datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php
@@ -4,6 +4,7 @@
 *
 * @copyright Copyright (C) 2010-2021 Combodo SARL
 * @license	http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,7 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Dictionary entries go here
 	'Menu:iTopHub' => 'iTop Hub',
 	'Menu:iTopHub:Register' => 'Conectar a iTop Hub',
@@ -47,7 +48,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'iTopHub:Landing:Install' => 'Instalando extensiones...',
 	'iTopHub:CompiledOK' => 'Compilación éxitosa.',
 	'iTopHub:ConfigurationSafelyReverted' => 'Error detectado durante la instalación!<br/>La configuración de '.ITOP_APPLICATION_SHORT.' NO fue modificada.',
-	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
+	'iTopHub:FailAuthent' => 'Autenticación fallida para esta acciónn.',

 	'iTopHub:InstalledExtensions' => 'Extensiones instaladas en esta instancia',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensiones instaladas manualmente',
@@ -76,11 +77,11 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'iTopHub:InstallationProgress:ExtensionsInstallation' => 'Instalación de extensiones',
 	'iTopHub:InstallationEffect:MissingDependencies' => 'Esta extensión no puede ser instalad porque no cumple con las dependencias.',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => 'La extensión require el/los módulo(s): %1$s',
-	'iTopHub:InstallationProgress:InstallationSuccessful' => 'Instalación éxitosa!',
+	'iTopHub:InstallationProgress:InstallationSuccessful' => '¡Instalación éxitosa!',

-	'iTopHub:InstallationStatus:Installed_Version' => '%1$s version: %2$s.',
+	'iTopHub:InstallationStatus:Installed_Version' => '%1$s versión: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => 'Instalada',
-	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Version %1$s <b>NO</b> está instalada.',
+	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Versión %1$s <b>NO</b> está instalada.',
 ));


--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/es_cr.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/es_cr.dict.itop-incident-mgmt-itil.php
@@ -15,14 +15,14 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
 * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:IncidentManagement' => 'Administración de Incidentes',
 	'Menu:IncidentManagement+' => 'Administración de Incidentes',
 	'Menu:Incident:Overview' => 'Resumen de Incidentes',
@@ -61,7 +61,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Incident
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Incident' => 'Incidente',
 	'Class:Incident+' => 'Incidente',
 	'Class:Incident/Attribute:status' => 'Estatus',
@@ -192,8 +192,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:Incident/Attribute:parent_change_ref+' => 'Ref. Cambio Padre',
 	'Class:Incident/Attribute:parent_problem_id' => 'Problema Padre',
 	'Class:Incident/Attribute:parent_problem_id+' => 'Problema Padre',
-	'Class:Incident/Attribute:parent_problem_ref' => 'Parent problem ref~~',
-	'Class:Incident/Attribute:parent_problem_ref+' => '~~',
+	'Class:Incident/Attribute:parent_problem_ref' => 'Ref. Problema Padre',
+	'Class:Incident/Attribute:parent_problem_ref+' => '',
 	'Class:Incident/Attribute:related_request_list' => 'Requerimientos Relacionados',
 	'Class:Incident/Attribute:related_request_list+' => 'Requerimientos Relacionados',
 	'Class:Incident/Attribute:child_incidents_list' => 'Incidentes Hijos',
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -47,7 +47,7 @@
 //
 // Class: KnownError
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:KnownError' => 'Error Conocido',
 	'Class:KnownError+' => 'Documentación para un error conocido',
 	'Class:KnownError/Attribute:name' => 'Nombre',
@@ -96,7 +96,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkErrorToFunctionalCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkErrorToFunctionalCI' => 'Relación Error Conocido y EC Funcional',
 	'Class:lnkErrorToFunctionalCI+' => 'Relación Error Conocido y EC Funcional',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'EC',
@@ -115,7 +115,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDocumentToError
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToError' => 'Relación Documento y Error Conocido',
 	'Class:lnkDocumentToError+' => 'Relación Documento y Error Conocido',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Documento',
@@ -130,7 +130,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkDocumentToError/Attribute:link_type+' => 'Tipo',
 ));

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ProblemManagement' => 'Gestión de problemas',
 	'Menu:ProblemManagement+' => 'Gestión de problemas',
 	'Menu:Problem:Shortcuts' => 'Acceso Rápido',
--- a/datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php
@@ -1,6 +1,10 @@
 <?php
 /**
- * Copyright (C) 2013-2021 Combodo SARL
+ * Spanish Localized data
+ *
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -17,7 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 */
 // Portal
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Page:DefaultTitle' => '%1$s - Portal de Usuario',
 	'Page:PleaseWait' => 'Por favor espere...',
 	'Page:Home' => 'Inicio',
@@ -33,7 +37,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Portal:Button:Delete' => 'Borrar',
 	'Portal:EnvironmentBanner:Title' => 'Se encuentra en modo <strong>%1$s</strong>',
 	'Portal:EnvironmentBanner:GoToProduction' => 'Regresar a modo PRODUCTION',
-	'Error:HTTP:400' => 'Bad request~~',
+	'Error:HTTP:400' => 'Solicitud Incorrecta',
 	'Error:HTTP:401' => 'Autenticación',
 	'Error:HTTP:404' => 'Página no encontrada',
 	'Error:HTTP:500' => '¡Vaya! Ha ocurrido un error.',
@@ -59,20 +63,20 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Portal:Attachments:DropZone:Message' => 'Agrega tus archivos para agregarlos como documentos adjuntos',
 	'Portal:File:None' => 'No hay archivo',
 	'Portal:File:DisplayInfo' => '<a href="%2$s" class="file_download_link">%1$s</a>',
-	'Portal:File:DisplayInfo+' => '%1$s (%2$s) <a href="%3$s" class="file_open_link" target="_blank">Abierto</a> / <a href="%4$s" class="file_download_link">Download</a>',
+	'Portal:File:DisplayInfo+' => '%1$s (%2$s) <a href="%3$s" class="file_open_link" target="_blank">Abierto</a> / <a href="%4$s" class="file_download_link">Descarga</a>',
 	'Portal:Calendar-FirstDayOfWeek' => 'es', //work with moment.js locales
 ));

 // Object form
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Portal:Form:Caselog:Entry:Close:Tooltip' => 'Close this entry~~',
-	'Portal:Form:Close:Warning' => 'Do you want to leave this form ? Data entered may be lost~~',
+	'Portal:Form:Close:Warning' => '¿Desea abandorar esta forma? Datos modificados se perderan',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting again this form.~~',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting again this form.~~',
 ));

 // UserProfile brick
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:UserProfile:Name' => 'Perfil del usuario',
 	'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil' => 'Mi perfil',
 	'Brick:Portal:UserProfile:Navigation:Dropdown:Logout' => 'Cerrar Sesión',
@@ -86,12 +90,12 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 ));

 // AggregatePageBrick
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:AggregatePage:DefaultTitle' => 'Tablero de Control',
 ));

 // BrowseBrick brick
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:Browse:Name' => 'Buscar en todos los elementos',
 	'Brick:Portal:Browse:Mode:List' => 'Lista',
 	'Brick:Portal:Browse:Mode:Tree' => 'Árbol',
@@ -107,7 +111,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 ));

 // ManageBrick brick
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:Manage:Name' => 'Administrar elementos',
 	'Brick:Portal:Manage:Table:NoData' => 'Sin elementos',
 	'Brick:Portal:Manage:Table:ItemActions' => 'Acciones',
@@ -125,29 +129,29 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 ));

 // ObjectBrick brick
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:Object:Name' => 'Objecto',
 	'Brick:Portal:Object:Form:Create:Title' => 'Nuevo %1$s',
 	'Brick:Portal:Object:Form:Edit:Title' => 'Actualizando %2$s (%1$s)',
 	'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
 	'Brick:Portal:Object:Form:Stimulus:Title' => 'Por favor, proporcione la siguiente información:',
 	'Brick:Portal:Object:Form:Message:Saved' => 'Guardado',
-	'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s guardado~~',
+	'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s guardado',
 	'Brick:Portal:Object:Search:Regular:Title' => 'Selección %1$s (%2$s)',
 	'Brick:Portal:Object:Search:Hierarchy:Title' => 'Selección %1$s (%2$s)',
-	'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s~~',
-	'Brick:Portal:Object:Copy:Tooltip' => 'Copy object link~~',
-	'Brick:Portal:Object:Copy:CopiedTooltip' => 'Copied~~'
+	'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',
+	'Brick:Portal:Object:Copy:Tooltip' => 'Copiar liga al objeto',
+	'Brick:Portal:Object:Copy:CopiedTooltip' => 'Copiado'
 ));

 // CreateBrick brick
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:Create:Name' => 'Creación rápida',
 	'Brick:Portal:Create:ChooseType' => 'Por favor, seleccione un tipo',
 ));

 // Filter brick
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Brick:Portal:Filter:Name' => 'Prefiltre un bloquek',
 	'Brick:Portal:Filter:SearchInput:Placeholder' => 'Ej.:. Conectar a WiFi',
 	'Brick:Portal:Filter:SearchInput:Submit' => 'Buscar',
--- a/datamodels/2.x/itop-portal-base/portal/src/EventListener/ExceptionListener.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/EventListener/ExceptionListener.php
@@ -58,11 +58,17 @@ class ExceptionListener implements ContainerAwareInterface
 		$oException = $oEvent->getException();

 		// Prepare / format exception data
-		$sErrorMessage = $oException->getMessage();
+		if ($oException instanceof \MySQLException) {
+			// Those exceptions should be caught before (in the metamodel startup, before event starting Symfony !)
+			// They could contain far too much info :/
+			// So as an extra precaution we are filtering here anyway !
+			$sErrorMessage = 'DB Server error, check error log !';
+		} else {
+			$sErrorMessage = $oException->getMessage();
+		}
 		// - For none HTTP exception, status code will be a generic 500
 		$iStatusCode = ($oException instanceof HttpExceptionInterface) ? $oException->getStatusCode() : Response::HTTP_INTERNAL_SERVER_ERROR;
-		switch ($iStatusCode)
-		{
+		switch ($iStatusCode) {
 			case 404:
 				$sErrorTitle = Dict::S('Error:HTTP:404');
 				break;
@@ -93,10 +99,10 @@ class ExceptionListener implements ContainerAwareInterface

 		// Prepare data for template
 		$aData = array(
-			'exception' => $oFlattenException,
-			'code' => $iStatusCode,
-			'error_title' => $sErrorTitle,
-			'error_message' => '',
+			'exception'     => $oFlattenException,
+			'code'          => $iStatusCode,
+			'error_title'   => $sErrorTitle,
+			'error_message' => $sErrorMessage,
 		);

 		// Generate the response
--- a/datamodels/2.x/itop-portal/dictionaries/es_cr.dict.itop-portal.php
+++ b/datamodels/2.x/itop-portal/dictionaries/es_cr.dict.itop-portal.php
@@ -27,7 +27,7 @@
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'portal:itop-portal' => 'Portal de Usuario', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
 	'Page:DefaultTitle' => 'ITop - Portal de Usuario',
 	'Brick:Portal:UserProfile:Title' => 'Mi perfil',
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/es_cr.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/es_cr.dict.itop-problem-mgmt.php
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -44,7 +44,7 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ProblemManagement' => 'Administración de Problemas',
 	'Menu:ProblemManagement+' => 'Administración de Problemas',
 	'Menu:Problem:Overview' => 'Resumen de Problemas',
@@ -72,7 +72,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Problem
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Problem' => 'Problema',
 	'Class:Problem+' => 'Problema',
 	'Class:Problem/Attribute:status' => 'Estatus',
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php
@@ -2,11 +2,9 @@
 /*
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com> 
 */
-/*
- * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
- */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:RequestManagement' => 'Administración de Requerimientos',
 	'Menu:RequestManagement+' => 'Administración de Requerimientos',
 	'Menu:RequestManagementProvider' => 'Proveedor de Mesa de Ayuda',
@@ -53,7 +51,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: UserRequest
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserRequest' => 'Requerimiento',
 	'Class:UserRequest+' => 'Requerimiento',
 	'Class:UserRequest/Attribute:status' => 'Estatus',
@@ -200,8 +198,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:UserRequest/Attribute:parent_change_id+' => 'Cambio Padre',
 	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. Cambio',
 	'Class:UserRequest/Attribute:parent_change_ref+' => 'Ref. Cambio',
-	'Class:UserRequest/Attribute:parent_incident_ref' => 'Parent incident ref~~',
-	'Class:UserRequest/Attribute:parent_incident_ref+' => '~~',
+	'Class:UserRequest/Attribute:parent_incident_ref' => 'Ref. Inciente Padre',
+	'Class:UserRequest/Attribute:parent_incident_ref+' => '',
 	'Class:UserRequest/Attribute:related_request_list' => 'Requerimientos Hijo',
 	'Class:UserRequest/Attribute:related_request_list+' => 'Requerimientos Hijo',
 	'Class:UserRequest/Attribute:public_log' => 'Bitácora Pública',
@@ -251,8 +249,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 ));


-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Organization:Overview:UserRequests' => 'User Requests from this organization~~',
-	'Organization:Overview:MyUserRequests' => 'My User Requests for this organization~~',
-	'Organization:Overview:Tickets' => 'Tickets for this organization~~',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Organization:Overview:UserRequests' => 'Requerimientos para esta Organización',
+	'Organization:Overview:MyUserRequests' => 'Mis Requerimientos para esta Organización',
+	'Organization:Overview:Tickets' => 'Tickets para esta Organización',
 ));
--- a/datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php
@@ -2,11 +2,9 @@
 /*
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 */
-/*
- *  @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
- */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:RequestManagement' => 'Administración de Requerimientos',
 	'Menu:RequestManagement+' => 'Administración de Requerimientos',
 	'Menu:RequestManagementProvider' => 'Proveedor de Mesa de Ayuda',
@@ -57,7 +55,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: UserRequest
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:UserRequest' => 'Requerimiento',
 	'Class:UserRequest+' => 'Requerimiento',
 	'Class:UserRequest/Attribute:status' => 'Estatus',
@@ -250,7 +248,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 ));


-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Portal:TitleDetailsFor_Request' => 'Detalles del Requerimiento',
 	'Portal:ButtonUpdate' => 'Actualizar',
 	'Portal:ButtonClose' => 'Cerrar',
@@ -265,7 +263,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Portal:UserRequest:MoreInfo' => 'Más Información',
 	'Portal:Details-Service-Element' => 'Elementos del Servicio',
 	'Portal:NoClosedTicket' => 'Requerimiento No Cerrado',
-	'Portal:NoService' => '',
+	'Portal:NoService' => 'Requerimiento Sin Servicio',
 	'Portal:ListOpenProblems' => 'Problemas Abiertos',
 	'Portal:ShowProblem' => 'Problemas',
 	'Portal:ShowFaqs' => 'Preguntas Frecuentes',
@@ -279,8 +277,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 ));


-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Organization:Overview:UserRequests' => 'User Requests from this organization~~',
-	'Organization:Overview:MyUserRequests' => 'My User Requests for this organization~~',
-	'Organization:Overview:Tickets' => 'Tickets for this organization~~',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Organization:Overview:UserRequests' => 'Requerimientos para esta Organización',
+	'Organization:Overview:MyUserRequests' => 'Mis Requerimientos para esta Organización',
+	'Organization:Overview:Tickets' => 'Tickets para esta Organización',
 ));
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/es_cr.dict.itop-service-mgmt-provider.php
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -31,7 +31,7 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ServiceManagement' => 'Administración de Servicios',
 	'Menu:ServiceManagement+' => 'Administración de Servicios',
 	'Menu:Service:Overview' => 'Resumen de Servicios',
@@ -74,7 +74,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Organization
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de Entrega',
 	'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
@@ -87,7 +87,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ContractType
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ContractType' => 'Tipo de Contrato',
 	'Class:ContractType+' => 'Tipo de Contrato',
 ));
@@ -97,7 +97,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Contract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contract' => 'Contrato',
 	'Class:Contract+' => 'Contrato',
 	'Class:Contract/Attribute:name' => 'Nombre',
@@ -123,7 +123,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:Contract/Attribute:cost_currency/Value:dollars' => 'Dólares',
 	'Class:Contract/Attribute:cost_currency/Value:dollars+' => 'Dólares de E.U.A',
 	'Class:Contract/Attribute:cost_currency/Value:euros' => 'Euros',
-	'Class:Contract/Attribute:cost_currency/Value:euros+' => '~~',
+	'Class:Contract/Attribute:cost_currency/Value:euros+' => '',
 	'Class:Contract/Attribute:contracttype_id' => 'Tipo de Contrato',
 	'Class:Contract/Attribute:contracttype_id+' => 'Tipo de Contrato',
 	'Class:Contract/Attribute:contracttype_name' => 'Tipo de Contrato',
@@ -152,7 +152,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CustomerContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CustomerContract' => 'Acuerdo con Cliente',
 	'Class:CustomerContract+' => 'Acuerdo con Cliente',
 	'Class:CustomerContract/Attribute:services_list' => 'Servicios',
@@ -167,7 +167,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ProviderContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ProviderContract' => 'Contrato con Proveedor',
 	'Class:ProviderContract+' => 'Contrato con Proveedor',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'ECs',
@@ -182,7 +182,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkContactToContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToContract' => 'Relación Contacto y Contrato',
 	'Class:lnkContactToContract+' => 'Relación Contacto y Contrato',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
@@ -199,7 +199,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkContractToDocument
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContractToDocument' => 'Relación Contrato y Documento',
 	'Class:lnkContractToDocument+' => 'Relación Contrato y Documento',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
@@ -216,7 +216,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkFunctionalCIToProviderContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkFunctionalCIToProviderContract' => 'Relación EC Funcional y Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract+' => 'Relación EC Funcional y Contrato con Proveedor',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato con Proveedor',
@@ -233,7 +233,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ServiceFamily
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceFamily' => 'Familia de Servicios',
 	'Class:ServiceFamily+' => 'Familia de Servicios',
 	'Class:ServiceFamily/Attribute:name' => 'Nombre',
@@ -248,7 +248,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Service
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Service' => 'Servicio',
 	'Class:Service+' => 'Servicio',
 	'Class:Service/Attribute:name' => 'Nombre',
@@ -287,7 +287,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDocumentToService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToService' => 'Relación Documento y Servicio',
 	'Class:lnkDocumentToService+' => 'Relación Documento y Servicio',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Servicio',
@@ -304,7 +304,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkContactToService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToService' => 'Relación Contacto y Servicio',
 	'Class:lnkContactToService+' => 'Relación Contacto y Servicio',
 	'Class:lnkContactToService/Attribute:service_id' => 'Servicio',
@@ -321,7 +321,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ServiceSubcategory
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceSubcategory' => 'Subcategoría',
 	'Class:ServiceSubcategory+' => 'Subcategoría',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nombre',
@@ -354,7 +354,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: SLA
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLA' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA+' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA/Attribute:name' => 'Nombre',
@@ -369,14 +369,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:SLA/Attribute:slts_list+' => 'Objetivos de Nivel de Servicio',
 	'Class:SLA/Attribute:customercontracts_list' => 'Acuerdos con Clientes',
 	'Class:SLA/Attribute:customercontracts_list+' => 'Acuerdos con Clientes',
-	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
+	'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',
 ));

 //
 // Class: SLT
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLT' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT+' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT/Attribute:name' => 'Nombre',
@@ -417,7 +417,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkSLAToSLT
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSLAToSLT' => 'Relación SLA y SLT',
 	'Class:lnkSLAToSLT+' => 'Relación SLA y SLT',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
@@ -428,15 +428,15 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkSLAToSLT/Attribute:slt_id+' => 'SLT',
 	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT',
 	'Class:lnkSLAToSLT/Attribute:slt_name+' => 'SLT',
-	'Class:lnkSLAToSLT/Attribute:slt_metric' => 'Slt metric~~',
+	'Class:lnkSLAToSLT/Attribute:slt_metric' => 'Métrica de SLT',
 	'Class:lnkSLAToSLT/Attribute:slt_metric+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'Slt request type~~',
+	'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'Tipo de Requerimiento de SLT',
 	'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'Slt ticket priority~~',
+	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'SLT prioridad de ticket',
 	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_value' => 'Slt value~~',
+	'Class:lnkSLAToSLT/Attribute:slt_value' => 'Valor de SLT',
 	'Class:lnkSLAToSLT/Attribute:slt_value+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'Slt value unit~~',
+	'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'Unidad de valor de SLT',
 	'Class:lnkSLAToSLT/Attribute:slt_value_unit+' => '',
 ));

@@ -444,7 +444,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkCustomerContractToService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkCustomerContractToService' => 'Relación Acuerdo con Cliente y Servicio',
 	'Class:lnkCustomerContractToService+' => 'Relación Acuerdo con Cliente y Servicio',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Acuerdo con Cliente',
@@ -465,7 +465,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkCustomerContractToProviderContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkCustomerContractToProviderContract' => 'Relación Acuerdo con Cliente y Contrato con Proveedor',
 	'Class:lnkCustomerContractToProviderContract+' => 'Relación Acuerdo con Cliente y Contrato con Proveedor',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Acuerdo con Cliente',
@@ -482,7 +482,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkCustomerContractToFunctionalCI
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkCustomerContractToFunctionalCI' => 'Relación Acuerdo con Cliente y EC Funcional',
 	'Class:lnkCustomerContractToFunctionalCI+' => 'Relación Acuerdo con Cliente y EC Funcional',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Acuerdo con Cliente',
@@ -499,7 +499,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: DeliveryModel
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DeliveryModel' => 'Modelo de Entrega',
 	'Class:DeliveryModel+' => 'Modelo de Entrega',
 	'Class:DeliveryModel/Attribute:name' => 'Nombre',
@@ -520,7 +520,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDeliveryModelToContact
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDeliveryModelToContact' => 'Relación Modelo de Entrega y Contacto',
 	'Class:lnkDeliveryModelToContact+' => 'Relación Modelo de Entrega y Contacto',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo de Entrega',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -31,7 +31,7 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ServiceManagement' => 'Administración de Servicios',
 	'Menu:ServiceManagement+' => 'Administración de Servicios',
 	'Menu:Service:Overview' => 'Resumen de Servicios',
@@ -65,7 +65,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Organization
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Organization/Attribute:deliverymodel_id' => 'Modelo de Entrega',
 	'Class:Organization/Attribute:deliverymodel_id+' => 'Modelo de Entrega',
 	'Class:Organization/Attribute:deliverymodel_name' => 'Nombre del Modelo de Entrega',
@@ -76,7 +76,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ContractType
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ContractType' => 'Tipo de Contrato',
 	'Class:ContractType+' => 'Tipo de Contrato',
 ));
@@ -85,7 +85,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Contract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contract' => 'Contrato',
 	'Class:Contract+' => 'Contrato',
 	'Class:Contract/Attribute:name' => 'Nombre',
@@ -139,7 +139,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CustomerContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CustomerContract' => 'Acuerdo con Cliente',
 	'Class:CustomerContract+' => 'Acuerdo con Cliente',
 	'Class:CustomerContract/Attribute:services_list' => 'Servicios',
@@ -150,7 +150,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ProviderContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ProviderContract' => 'Contrato con Proveedor',
 	'Class:ProviderContract+' => 'Contrato con Proveedor',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'ECs',
@@ -169,7 +169,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkContactToContract
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToContract' => 'Relación Contacto y Contrato',
 	'Class:lnkContactToContract+' => 'Relación Contacto y Contrato',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
@@ -186,7 +186,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkContractToDocument
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContractToDocument' => 'Relación Contrato y Documento',
 	'Class:lnkContractToDocument+' => 'Relación Contrato y Documento',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
@@ -203,7 +203,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ServiceFamily
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceFamily' => 'Familia de Servicios',
 	'Class:ServiceFamily+' => 'Familia de Servicios',
 	'Class:ServiceFamily/Attribute:name' => 'Nombre',
@@ -218,7 +218,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Service
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Service' => 'Servicio',
 	'Class:Service+' => 'Servicio',
 	'Class:Service/Attribute:name' => 'Nombre',
@@ -261,7 +261,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDocumentToService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDocumentToService' => 'Relación Documento y Servicio',
 	'Class:lnkDocumentToService+' => 'Relación Documento y Servicio',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Servicio',
@@ -278,7 +278,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkContactToService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToService' => 'Relación Contacto y Servicio',
 	'Class:lnkContactToService+' => 'Relación Contacto y Servicio',
 	'Class:lnkContactToService/Attribute:service_id' => 'Servicio',
@@ -295,7 +295,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ServiceSubcategory
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ServiceSubcategory' => 'Subcategoría',
 	'Class:ServiceSubcategory+' => 'Subcategoría',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nombre',
@@ -326,7 +326,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: SLA
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLA' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA+' => 'SLA - Acuerdo de Nivel de Servicio',
 	'Class:SLA/Attribute:name' => 'Nombre',
@@ -341,14 +341,14 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:SLA/Attribute:slts_list+' => 'Objetivos de Nivel de Servicio',
 	'Class:SLA/Attribute:customercontracts_list' => 'Acuerdos con Clientes',
 	'Class:SLA/Attribute:customercontracts_list+' => 'Acuerdos con Clientes',
-	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
+	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'No se puede guardar relación de Acuerco con Cliente %1$s con Servicio %2$s : El SLA ya existe',
 ));

 //
 // Class: SLT
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SLT' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT+' => 'SLT - Objetivos de Nivel de Servicio',
 	'Class:SLT/Attribute:name' => 'Nombre',
@@ -389,7 +389,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkSLAToSLT
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkSLAToSLT' => 'Relación SLA y SLT',
 	'Class:lnkSLAToSLT+' => 'Relación SLA y SLT',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
@@ -402,7 +402,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:lnkSLAToSLT/Attribute:slt_name+' => 'SLT',
 	'Class:lnkSLAToSLT/Attribute:slt_metric' => 'Métrica',
 	'Class:lnkSLAToSLT/Attribute:slt_metric+' => '',
-	'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'Tipo de reporte',
+	'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'Tipo de Requerimiento',
 	'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '',
 	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'Prioridad',
 	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '',
@@ -416,7 +416,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkCustomerContractToService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkCustomerContractToService' => 'Relación Acuerdo con Cliente y Servicio',
 	'Class:lnkCustomerContractToService+' => 'Relación Acuerdo con Cliente y Servicio',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Acuerdo con Cliente',
@@ -437,7 +437,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkProviderContractToService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkProviderContractToService' => 'Relación Contrato con Proveedor y Servicio',
 	'Class:lnkProviderContractToService+' => 'Relación Contrato con Proveedor y Servicio',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Servicio',
@@ -454,7 +454,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: DeliveryModel
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DeliveryModel' => 'Modelo de Entrega',
 	'Class:DeliveryModel+' => 'Modelo de Entrega',
 	'Class:DeliveryModel/Attribute:name' => 'Nombre',
@@ -475,7 +475,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkDeliveryModelToContact
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkDeliveryModelToContact' => 'Relación Modelo de Entrega y Contacto',
 	'Class:lnkDeliveryModelToContact+' => 'Relación Modelo de Entrega y Contacto',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo de Entrega',
--- a/datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php
@@ -2,8 +2,9 @@
 /**
 * Localized data
 *
- * @copyright Copyright (C) 2010-2021 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,6 +21,6 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Dictionary entries go here
 ));
--- a/datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
+++ b/datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php
@@ -2,8 +2,9 @@
 /**
 * Localized data
 *
- * @copyright Copyright (C) 2010-2021 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,6 +21,6 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Dictionary entries go here
 ));
--- a/datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php
+++ b/datamodels/2.x/itop-structure/dictionaries/es_cr.dict.itop-structure.php
@@ -32,7 +32,7 @@
 //
 // Class: Organization
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Organization' => 'Organización',
 	'Class:Organization+' => 'Organización',
 	'Class:Organization/Attribute:name' => 'Nombre',
@@ -55,17 +55,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:Organization/Attribute:deliverymodel_name+' => 'Nombre del Modelo de Entrega',
 	'Class:Organization/Attribute:parent_id_friendlyname' => 'Organización Padre',
 	'Class:Organization/Attribute:parent_id_friendlyname+' => 'Organización Padre',
-	'Class:Organization/Attribute:overview' => 'Overview~~',
-	'Organization:Overview:FunctionalCIs' => 'Configuration items of this organization~~',
-	'Organization:Overview:FunctionalCIs:subtitle' => 'by type~~',
-	'Organization:Overview:Users' => ITOP_APPLICATION_SHORT.' Users within this organization~~',
+	'Class:Organization/Attribute:overview' => 'Resumen',
+	'Organization:Overview:FunctionalCIs' => 'Elementos de configuración en esta Organización',
+	'Organization:Overview:FunctionalCIs:subtitle' => 'por tipo',
+	'Organization:Overview:Users' => 'Usuarios de iTop en la Organización',
 ));

 //
 // Class: Location
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Location' => 'Localidad',
 	'Class:Location+' => 'Cualquier Tipo de Localidad: Región, País, Ciudad, Sitio, Edificio, Piso, Cuarto, Rack,...',
 	'Class:Location/Attribute:name' => 'Nombre',
@@ -97,8 +96,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: Contact
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Contact' => 'Contacto',
 	'Class:Contact+' => 'Contacto',
 	'Class:Contact/Attribute:name' => 'Nombre',
@@ -134,8 +132,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: Person
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Person' => 'Persona',
 	'Class:Person+' => 'Persona',
 	'Class:Person/Attribute:name' => 'Apellidos',
@@ -162,17 +159,16 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:Person/Attribute:manager_id_friendlyname+' => 'Nombre del Jefe',
 	'Class:Person/Attribute:picture' => 'Fotografía',
 	'Class:Person/Attribute:picture+' => 'Fotografía',
-	'Class:Person/UniquenessRule:employee_number+' => 'The employee number must be unique in the organization~~',
-	'Class:Person/UniquenessRule:employee_number' => 'there is already a person in \'$this->org_name$\' organization with the same employee number~~',
-	'Class:Person/UniquenessRule:name+' => 'The employee name should be unique inside its organization~~',
-	'Class:Person/UniquenessRule:name' => 'There is already a person in \'$this->org_name$\' organization with the same name~~',
+	'Class:Person/UniquenessRule:employee_number+' => 'El número de empleado debe ser único en la Organización',
+	'Class:Person/UniquenessRule:employee_number' => 'Ya existe una persona en la organiación \'$this->org_name$\', con el mismo número de empleado',
+	'Class:Person/UniquenessRule:name+' => 'El nombre del empleado debe ser único dentro de su Organización',
+	'Class:Person/UniquenessRule:name' => 'Ya existe una persona en la organiación \'$this->org_name$\', con el mismo nombre',
 ));

 //
 // Class: Team
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Team' => 'Grupo de Trabajo',
 	'Class:Team+' => 'Grupo de Trabajo',
 	'Class:Team/Attribute:persons_list' => 'Miembros',
@@ -184,8 +180,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: Document
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Document' => 'Documento',
 	'Class:Document+' => 'Documento',
 	'Class:Document/Attribute:name' => 'Nombre',
@@ -219,10 +214,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: DocumentFile
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DocumentFile' => 'Documento de Archivo',
-	'Class:DocumentFile+' => '~~',
+	'Class:DocumentFile+' => '',
 	'Class:DocumentFile/Attribute:file' => 'Archivo',
 	'Class:DocumentFile/Attribute:file+' => 'Archivo',
 ));
@@ -230,8 +224,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: DocumentNote
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DocumentNote' => 'Nota',
 	'Class:DocumentNote+' => 'Nota',
 	'Class:DocumentNote/Attribute:text' => 'Texto',
@@ -241,8 +234,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: DocumentWeb
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DocumentWeb' => 'Documento Web',
 	'Class:DocumentWeb+' => 'Documento disponible en otro servidor Web',
 	'Class:DocumentWeb/Attribute:url' => 'URL',
@@ -253,7 +245,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Typology
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Typology' => 'Tipología',
 	'Class:Typology+' => 'Tipología',
 	'Class:Typology/Attribute:name' => 'Nombre',
@@ -266,7 +258,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: DocumentType
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DocumentType' => 'Tipo de Documento',
 	'Class:DocumentType+' => 'Tipo de Documento',
 ));
@@ -275,7 +267,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ContactType
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ContactType' => 'Tipo de Contacto',
 	'Class:ContactType+' => 'Tipo de Contacto',
 ));
@@ -284,7 +276,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkPersonToTeam
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkPersonToTeam' => 'Relación Persona y Grupo',
 	'Class:lnkPersonToTeam+' => 'Relación Persona y Grupo',
 	'Class:lnkPersonToTeam/Attribute:team_id' => 'Grupo',
@@ -305,7 +297,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Application Menu
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:DataAdministration' => 'Administración de Datos',
 	'Menu:DataAdministration+' => 'Administración de Datos',
 	'Menu:Catalogs' => 'Catálogos',
@@ -347,7 +339,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(

 // Add translation for Fieldsets

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Person:info' => 'Información General',
 	'UserLocal:info' => 'Información General',
 	'Person:personal_info' => 'Información Personal',
@@ -355,7 +347,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 ));

 // Themes
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'theme:fullmoon' => 'Full moon~~',
 	'theme:test-red' => 'Test instance (Red)~~',
 ));
--- a/datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
+++ b/datamodels/2.x/itop-structure/precompiled-themes/fullmoon/main.css
--- a/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
+++ b/datamodels/2.x/itop-structure/precompiled-themes/test-red/main.css
--- a/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
+++ b/datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php
@@ -15,8 +15,8 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-/**
- * Localized data
+ /**
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -34,7 +34,7 @@
 //
 // Class: Ticket
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Ticket' => 'Ticket',
 	'Class:Ticket+' => 'Ticket',
 	'Class:Ticket/Attribute:ref' => 'Ref',
@@ -93,7 +93,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkContactToTicket
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkContactToTicket' => 'Relación Contacto y Ticket',
 	'Class:lnkContactToTicket+' => 'Relación Contacto y Ticket',
 	'Class:lnkContactToTicket/Attribute:ticket_id' => 'Ticket',
@@ -116,7 +116,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: WorkOrder
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:WorkOrder' => 'Orden de Trabajo',
 	'Class:WorkOrder+' => 'Orden de Trabajo',
 	'Class:WorkOrder/Attribute:name' => 'Nombre',
@@ -153,7 +153,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(


 // Fieldset translation
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Ticket:baseinfo' => 'Información General',
 	'Ticket:date' => 'Fechas',
 	'Ticket:contact' => 'Contactos',
@@ -180,17 +180,17 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:cmdbAbstractObject/Method:SetCurrentUser' => 'Asignar Usuario actual',
 	'Class:cmdbAbstractObject/Method:SetCurrentUser+' => 'Asignar Usuario actual',
 	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1' => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'If the field is a string then the friendly name will be used, otherwise the identifier will be used. That friendly name is the name of the person if any is attached to the user, otherwise it is the login.',
+	'Class:cmdbAbstractObject/Method:SetCurrentUser/Param:1+' => 'Si el campo es una cadena de caracteres, entonces el nombre completo será usado, de otra manera el identificador será usado. El nombre completo es el nombre de una persona que está ligado a un usurio, si no será su clave de acceso.',
 	'Class:cmdbAbstractObject/Method:SetCurrentPerson' => 'Asignar Persona actual',
 	'Class:cmdbAbstractObject/Method:SetCurrentPerson+' => 'Asignar Persona actual',
 	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1' => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'If the field is a string then the friendly name will be used, otherwise the identifier will be used.',
+	'Class:cmdbAbstractObject/Method:SetCurrentPerson/Param:1+' => 'Si el campo es una cadena de caracteres, entonces el nombre completo será usado, de otra manera el identificador será usado.',
 	'Class:cmdbAbstractObject/Method:SetElapsedTime' => 'Asignar tiempo transcurrido',
 	'Class:cmdbAbstractObject/Method:SetElapsedTime+' => 'Asignar tiempo transcurrido (segundos)',
 	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1' => 'Campo Destino',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'The field to set, in the current object',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:1+' => 'El campo a configurar, en el objeto actual',
 	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2' => 'Campo de Referencia',
-	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'The field from which to get the reference date',
+	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:2+' => 'El campo desde el que se obtienen los datos referenciados',
 	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3' => 'Horas Trabajadas',
 	'Class:cmdbAbstractObject/Method:SetElapsedTime/Param:3+' => 'Dejar vacio para utilizar el horario de trabajo estandar, o dejar por omisión para usar esquema 7x24',
 	'Class:cmdbAbstractObject/Method:Reset' => 'Restablecer',
@@ -204,9 +204,9 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:cmdbAbstractObject/Method:Copy/Param:2' => 'Campo Origen',
 	'Class:cmdbAbstractObject/Method:Copy/Param:2+' => 'Campo de donde se obtendrá valor',
 	'Class:cmdbAbstractObject/Method:ApplyStimulus' => 'Aplicar Stimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Apply the specified stimulus to the current object',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus+' => 'Aplicar stimulus específico a objeto actual',
 	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1' => 'Código Stimulus',
-	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'A valid stimulus code for the current class',
+	'Class:cmdbAbstractObject/Method:ApplyStimulus/Param:1+' => 'Un código de stimulus válido para la clase actual',
 	'Class:ResponseTicketTTO/Interface:iMetricComputer' => 'Tiempo a Pertenencia',
 	'Class:ResponseTicketTTO/Interface:iMetricComputer+' => 'Objetivo basado en SLT de tipo TTO',
 	'Class:ResponseTicketTTR/Interface:iMetricComputer' => 'Tiempo a Resolución',
@@ -217,7 +217,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Document
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Document/Attribute:contracts_list' => 'Contratos',
 	'Class:Document/Attribute:contracts_list+' => 'Contratos Referenciados con este Documento',
 	'Class:Document/Attribute:services_list' => 'Servicios',
--- a/datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
+++ b/datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php
@@ -2,8 +2,9 @@
 /**
 * Localized data
 *
- * @copyright Copyright (C) 2010-2021 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 *
 * This file is part of iTop.
 *
@@ -20,6 +21,6 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	// Dictionary entries go here
 ));
--- a/dictionaries/es_cr.dictionary.itop.core.php
+++ b/dictionaries/es_cr.dictionary.itop.core.php
@@ -16,69 +16,70 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 /**
- * Localized data
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 */
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Core:DeletedObjectLabel' => '%1s (eliminado)',
-	'Core:DeletedObjectTip' => 'Elemento ha sido Eliminado en %1$s (%2$s)',
+	'Core:DeletedObjectTip'   => 'Elemento ha sido Eliminado en %1$s (%2$s)',

 	'Core:UnknownObjectLabel' => 'Elemento No Encontrado (Clase: %1$s, Identificador: %2$d)',
 	'Core:UnknownObjectTip' => 'El Elemento no pudo ser encontrado.  Pudo haber sido eliminado hace tiempo y purgado de la Bitácora.',

 	'Core:UniquenessDefaultError' => 'Regla de unicidad \'%1$s\' en error',

-	'Core:AttributeLinkedSet' => 'Arreglo de objetos',
+	'Core:AttributeLinkedSet'  => 'Arreglo de objetos',
 	'Core:AttributeLinkedSet+' => 'Cualquier tipo de objetos [subclass] de la misma clase',

 	'Core:AttributeLinkedSetDuplicatesFound' => 'Duplicates in the \'%1$s\' field : %2$s~~',

-	'Core:AttributeDashboard' => 'Panel de Control',
+	'Core:AttributeDashboard'  => 'Panel de Control',
 	'Core:AttributeDashboard+' => 'Panel de control y supervisión',

-	'Core:AttributePhoneNumber' => 'Número telefónico',
-	'Core:AttributePhoneNumber+' => '~~',
+	'Core:AttributePhoneNumber'  => 'Número telefónico',
+	'Core:AttributePhoneNumber+' => '',

-	'Core:AttributeObsolescenceDate' => 'Fecha de Obsolescencia',
-	'Core:AttributeObsolescenceDate+' => '~~',
+	'Core:AttributeObsolescenceDate'  => 'Fecha de Obsolescencia',
+	'Core:AttributeObsolescenceDate+' => '',

-	'Core:AttributeTagSet' => 'Lista de etiquetas',
-	'Core:AttributeTagSet+' => '~~',
-	'Core:AttributeSet:placeholder' => 'click to add~~',
-	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass' => '%1$s (%2$s)~~',
-	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass' => '%1$s (%2$s from %3$s)~~',
-	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s from child classes)~~',
+	'Core:AttributeTagSet'                                                     => 'Lista de etiquetas',
+	'Core:AttributeTagSet+'                                                    => '',
+	'Core:AttributeSet:placeholder'                                            => 'Click to agregar',
+	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromClass'               => '%1$s (%2$s)',
+	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromOneChildClass'       => '%1$s (%2$s de %3$s)',
+	'Core:AttributeClassAttCodeSet:ItemLabel:AttributeFromSeveralChildClasses' => '%1$s (%2$s de clases hijas)',

-	'Core:AttributeCaseLog' => 'Bitácora',
-	'Core:AttributeCaseLog+' => '~~',
+	'Core:AttributeCaseLog'  => 'Bitácora',
+	'Core:AttributeCaseLog+' => '',

-	'Core:AttributeMetaEnum' => 'Computed enum~~',
-	'Core:AttributeMetaEnum+' => '~~',
+	'Core:AttributeMetaEnum'  => 'Enumeración Calculada',
+	'Core:AttributeMetaEnum+' => '',

-	'Core:AttributeLinkedSetIndirect' => 'Arreglo de objetos (N-N)',
+	'Core:AttributeLinkedSetIndirect'  => 'Arreglo de objetos (N-N)',
 	'Core:AttributeLinkedSetIndirect+' => 'Cualquier tipo de objetos [subclass] de la misma clase',

-	'Core:AttributeInteger' => 'Entero',
+	'Core:AttributeInteger'  => 'Entero',
 	'Core:AttributeInteger+' => 'Valor numérico (puede ser negativo)',

-	'Core:AttributeDecimal' => 'Decimal',
+	'Core:AttributeDecimal'  => 'Decimal',
 	'Core:AttributeDecimal+' => 'Valor decimal (puede ser negativo)',

-	'Core:AttributeBoolean' => 'Booleano',
-	'Core:AttributeBoolean+' => 'Booleano',
-	'Core:AttributeBoolean/Value:null' => '',
-	'Core:AttributeBoolean/Value:yes' => 'Si',
-	'Core:AttributeBoolean/Value:no' => 'No',
+	'Core:AttributeBoolean'            => 'Booleano',
+	'Core:AttributeBoolean+'           => 'Booleano',
+	'Core:AttributeBoolean/Value:null' => 'Nulo',
+	'Core:AttributeBoolean/Value:yes'  => 'Si',
+	'Core:AttributeBoolean/Value:no'   => 'No',

-	'Core:AttributeArchiveFlag' => 'Bandera de Archivado',
-	'Core:AttributeArchiveFlag/Value:yes' => 'Si',
+	'Core:AttributeArchiveFlag'            => 'Bandera de Archivado',
+	'Core:AttributeArchiveFlag/Value:yes'  => 'Si',
 	'Core:AttributeArchiveFlag/Value:yes+' => 'Este objeto es solo visible en modo Archivado',
-	'Core:AttributeArchiveFlag/Value:no' => 'No',
-	'Core:AttributeArchiveFlag/Label' => 'Archivado',
-	'Core:AttributeArchiveFlag/Label+' => '',
-	'Core:AttributeArchiveDate/Label' => 'Fecha de Archivado',
+	'Core:AttributeArchiveFlag/Value:no'   => 'No',
+	'Core:AttributeArchiveFlag/Label'      => 'Archivado',
+	'Core:AttributeArchiveFlag/Label+'     => '',
+	'Core:AttributeArchiveDate/Label'      => 'Fecha de Archivado',
 	'Core:AttributeArchiveDate/Label+' => '',

 	'Core:AttributeObsolescenceFlag' => 'Bandera de Obsolescencia',
@@ -194,24 +195,24 @@ Operadores:<br/>
 	'Core:AttributeTable' => 'Tabla',
 	'Core:AttributeTable+' => 'Arreglo indexado con dos dimensiones',

-	'Core:AttributePropertySet' => 'Propiedades',
+	'Core:AttributePropertySet'  => 'Propiedades',
 	'Core:AttributePropertySet+' => 'Lista de propiedades sin tipo (nombre y valor)',

-	'Core:AttributeFriendlyName' => 'Nombre común',
+	'Core:AttributeFriendlyName'  => 'Nombre común',
 	'Core:AttributeFriendlyName+' => 'Atributo creado automáticamente; el nombre común es obtenido de varios atributos',

-	'Core:FriendlyName-Label' => 'Nombre común',
+	'Core:FriendlyName-Label'       => 'Nombre común',
 	'Core:FriendlyName-Description' => 'Nombre común',

-	'Core:AttributeTag' => 'Etiquetas',
-	'Core:AttributeTag+' => 'Tags~~',
-	
-	'Core:Context=REST/JSON' => 'REST~~',
-	'Core:Context=Synchro' => 'Synchro~~',
-	'Core:Context=Setup' => 'Setup~~',
-	'Core:Context=GUI:Console' => 'Console~~',
-	'Core:Context=CRON' => 'cron~~',
-	'Core:Context=GUI:Portal' => 'Portal~~',
+	'Core:AttributeTag'  => 'Etiquetas',
+	'Core:AttributeTag+' => '',
+
+	'Core:Context=REST/JSON'   => 'REST',
+	'Core:Context=Synchro'     => 'Synchro',
+	'Core:Context=Setup'       => 'Configuración',
+	'Core:Context=GUI:Console' => 'Consola',
+	'Core:Context=CRON'        => 'cron',
+	'Core:Context=GUI:Portal'  => 'Portal',
 ));


@@ -224,7 +225,7 @@ Operadores:<br/>
 // Class: CMDBChange
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChange' => 'Cambio',
 	'Class:CMDBChange+' => 'Cambios',
 	'Class:CMDBChange/Attribute:date' => 'Fecha',
@@ -245,7 +246,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CMDBChangeOp
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChangeOp' => 'Operación de Cambios',
 	'Class:CMDBChangeOp+' => 'Operación de Cambios',
 	'Class:CMDBChangeOp/Attribute:change' => 'Cambio',
@@ -266,7 +267,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CMDBChangeOpCreate
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChangeOpCreate' => 'Creación de Objeto',
 	'Class:CMDBChangeOpCreate+' => 'Creación de Objeto',
 ));
@@ -275,7 +276,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CMDBChangeOpDelete
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChangeOpDelete' => 'Borrado de Objeto',
 	'Class:CMDBChangeOpDelete+' => 'Borrado de Objeto',
 ));
@@ -284,7 +285,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CMDBChangeOpSetAttribute
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChangeOpSetAttribute' => 'Cambio en Objeto',
 	'Class:CMDBChangeOpSetAttribute+' => 'Cambio en Objeto',
 	'Class:CMDBChangeOpSetAttribute/Attribute:attcode' => 'Atributo',
@@ -295,7 +296,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CMDBChangeOpSetAttributeScalar
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChangeOpSetAttributeScalar' => 'Cambio de Propiedad',
 	'Class:CMDBChangeOpSetAttributeScalar+' => 'Cambio de Propiedades escalares del Objeto',
 	'Class:CMDBChangeOpSetAttributeScalar/Attribute:oldvalue' => 'Valor Anterior',
@@ -304,7 +305,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:CMDBChangeOpSetAttributeScalar/Attribute:newvalue+' => 'Nuevo Valor del Atributo',
 ));
 // Used by CMDBChangeOp... & derived classes
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Change:ObjectCreated' => 'Objeto Creado',
 	'Change:ObjectDeleted' => 'Objeto Eliminado',
 	'Change:ObjectModified' => 'Objeto Modificado',
@@ -327,7 +328,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CMDBChangeOpSetAttributeBlob
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChangeOpSetAttributeBlob' => 'Cambio de Datos',
 	'Class:CMDBChangeOpSetAttributeBlob+' => 'Cambio de Datos',
 	'Class:CMDBChangeOpSetAttributeBlob/Attribute:prevdata' => 'Valor Anterior',
@@ -338,7 +339,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: CMDBChangeOpSetAttributeText
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:CMDBChangeOpSetAttributeText' => 'Cambio de Texto',
 	'Class:CMDBChangeOpSetAttributeText+' => 'Cambio de Texto',
 	'Class:CMDBChangeOpSetAttributeText/Attribute:prevdata' => 'Valor Anterior',
@@ -349,7 +350,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Event
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Event' => 'Bitácora de Eventos',
 	'Class:Event+' => 'Evento interno de aplicación',
 	'Class:Event/Attribute:message' => 'Mensaje',
@@ -366,7 +367,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: EventNotification
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:EventNotification' => 'Notificación de Evento',
 	'Class:EventNotification+' => 'Notificación de Evento',
 	'Class:EventNotification/Attribute:trigger_id' => 'Disparador',
@@ -381,7 +382,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: EventNotificationEmail
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:EventNotificationEmail' => 'Correo Electrónico de Notificación de Evento',
 	'Class:EventNotificationEmail+' => 'Correo Electrónico de Notificación de Evento',
 	'Class:EventNotificationEmail/Attribute:to' => 'Para',
@@ -404,7 +405,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: EventIssue
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:EventIssue' => 'Registro de Evento',
 	'Class:EventIssue+' => 'Evidencia de un evento (warning, error, etc.)',
 	'Class:EventIssue/Attribute:issue' => 'Evento',
@@ -427,7 +428,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: EventWebService
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:EventWebService' => 'Evento de WebService',
 	'Class:EventWebService+' => 'Evidencia de una llamada de servicio Web',
 	'Class:EventWebService/Attribute:verb' => 'Verbo',
@@ -444,7 +445,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Class:EventWebService/Attribute:data+' => 'Datos de Resultado',
 ));

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:EventRestService' => 'Llamada REST/JSON',
 	'Class:EventRestService+' => 'Traza de llamada a servicio REST/JSON',
 	'Class:EventRestService/Attribute:operation' => 'Operación',
@@ -465,7 +466,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: EventLoginUsage
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:EventLoginUsage' => 'Uso de la Cuenta',
 	'Class:EventLoginUsage+' => 'Uso de la Cuenta',
 	'Class:EventLoginUsage/Attribute:user_id' => 'Usuario',
@@ -480,7 +481,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Action
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:Action' => 'Acción Personalizada',
 	'Class:Action+' => 'Acción definida por el usuario',
 	'Class:Action/Attribute:name' => 'Nombre',
@@ -505,7 +506,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ActionNotification
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ActionNotification' => 'Notificación',
 	'Class:ActionNotification+' => 'Notificación (resúmen)',
 ));
@@ -514,7 +515,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: ActionEmail
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ActionEmail' => 'Notificación por Correo Electrónico',
 	'Class:ActionEmail+' => 'Notificación por Correo Electrónico',
 	'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one~~',
@@ -555,24 +556,24 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: Trigger
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:Trigger' => 'Disparador',
-	'Class:Trigger+' => 'Disparador',
-	'Class:Trigger/Attribute:description' => 'Descripción',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:Trigger'                        => 'Disparador',
+	'Class:Trigger+'                       => 'Disparador',
+	'Class:Trigger/Attribute:description'  => 'Descripción',
 	'Class:Trigger/Attribute:description+' => 'Descripción',
-	'Class:Trigger/Attribute:action_list' => 'Acciones',
+	'Class:Trigger/Attribute:action_list'  => 'Acciones',
 	'Class:Trigger/Attribute:action_list+' => 'Acciones realizadas cuando se activó el disparador',
-	'Class:Trigger/Attribute:finalclass' => 'Clase',
-	'Class:Trigger/Attribute:finalclass+' => 'Clase',
-	'Class:Trigger/Attribute:context' => 'Context~~',
-	'Class:Trigger/Attribute:context+' => 'Context to allow the trigger to start~~',
+	'Class:Trigger/Attribute:finalclass'   => 'Clase',
+	'Class:Trigger/Attribute:finalclass+'  => 'Clase',
+	'Class:Trigger/Attribute:context'      => 'Contexto',
+	'Class:Trigger/Attribute:context+'     => 'Contexto para permitir el inicio del disparador',
 ));

 //
 // Class: TriggerOnObject
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnObject' => 'Disparador (Depende de la clase)',
 	'Class:TriggerOnObject+' => 'Disparador en una clase de objeto dada',
 	'Class:TriggerOnObject/Attribute:target_class' => 'Clase destino',
@@ -587,7 +588,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnPortalUpdate
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnPortalUpdate' => 'Disparador (cuando se actualiza desde el portal)',
 	'Class:TriggerOnPortalUpdate+' => 'Disparador cuando un usuario actualiza desde el portal',
 ));
@@ -596,7 +597,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnStateChange
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnStateChange' => 'Disparador (en cambio de estado)',
 	'Class:TriggerOnStateChange+' => 'Disparador en cambio de estado de objeto',
 	'Class:TriggerOnStateChange/Attribute:state' => 'Estado',
@@ -607,7 +608,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnStateEnter
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnStateEnter' => 'Disparador (entrando a un estado)',
 	'Class:TriggerOnStateEnter+' => 'Disparador en cambio de estado de objeto - entrando',
 ));
@@ -616,7 +617,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnStateLeave
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnStateLeave' => 'Disparador (saliendo de un estado)',
 	'Class:TriggerOnStateLeave+' => 'Disparador en cambio de estado de objeto - saliendo',
 ));
@@ -625,7 +626,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnObjectCreate
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnObjectCreate' => 'Disparador (creación de objeto)',
 	'Class:TriggerOnObjectCreate+' => 'Disparador en la creación de objeto (hija de clase) de una clase dada',
 ));
@@ -634,7 +635,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnObjectDelete
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnObjectDelete' => 'Disparador (eliminando un objecto)',
 	'Class:TriggerOnObjectDelete+' => 'Disparador al eliminar un objecto de la clase dada [o una clase hija] ',
 ));
@@ -643,7 +644,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnObjectUpdate
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnObjectUpdate' => 'Disparador (actualizando un objecto)',
 	'Class:TriggerOnObjectUpdate+' => 'Disparador al actualizar un objeto de la clase dada [o una clase hija]',
 	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes' => 'Campos objetivo',
@@ -654,7 +655,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnObjectMention
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnObjectMention' => 'Trigger (on object mention)~~',
 	'Class:TriggerOnObjectMention+' => 'Trigger on mention (@xxx) of an object of [a child class of] the given class in a log attribute~~',
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter' => 'Mentioned filter~~',
@@ -665,7 +666,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: TriggerOnThresholdReached
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:TriggerOnThresholdReached' => 'Disparador (en umbral)',
 	'Class:TriggerOnThresholdReached+' => 'Disparador en umbral Stop-Watch alcanzado',
 	'Class:TriggerOnThresholdReached/Attribute:stop_watch_code' => 'Detener watch',
@@ -678,7 +679,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 // Class: lnkTriggerAction
 //

-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:lnkTriggerAction' => 'Relación Acción y Disparador',
 	'Class:lnkTriggerAction+' => 'Relación Acción y Disparador',
 	'Class:lnkTriggerAction/Attribute:action_id' => 'Acción',
@@ -696,7 +697,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Synchro Data Source
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:SynchroDataSource/Attribute:name' => 'Nombre',
 	'Class:SynchroDataSource/Attribute:name+' => 'Nombre de la Fuente de Datos',
 	'Class:SynchroDataSource/Attribute:description' => 'Descripción',
@@ -944,80 +945,80 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'Core:BulkExport:PDFPageOrientation' => 'Orientación de la Página:',
 	'Core:BulkExport:PageOrientation-L' => 'Horizontal',
 	'Core:BulkExport:PageOrientation-P' => 'Vertical',
-	'Core:BulkExport:XMLFormat' => 'Archivo XML (*.xml)',
-	'Core:BulkExport:XMLOptions' => 'Opciones XML',
-	'Core:BulkExport:SpreadsheetFormat' => 'Formato Tabla HTML (*.html)',
-	'Core:BulkExport:SpreadsheetOptions' => 'Opciones de Tabla',
-	'Core:BulkExport:OptionNoLocalize' => 'Código de exportación en lugar de etiqueta',
-	'Core:BulkExport:OptionLinkSets' => 'Incluir objetos ligados',
-	'Core:BulkExport:OptionFormattedText' => 'Conservar formato de texto',
-	'Core:BulkExport:ScopeDefinition' => 'Definición de los objetos a exportar',
-	'Core:BulkExportLabelOQLExpression' => 'Consulta OQL:',
-	'Core:BulkExportLabelPhrasebookEntry' => 'Entrada Consulta de Libreta de Consultas:',
-	'Core:BulkExportMessageEmptyOQL' => 'Por favor ingrese una consulta OQL válida.',
-	'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Por favor seleccione un entrada válida de la libreta de consultas.',
-	'Core:BulkExportQueryPlaceholder' => 'Escriba una consulta OQL aquí...',
-	'Core:BulkExportCanRunNonInteractive' => 'Click aquí para ejecutar la exportación en modo no interactivo.',
-	'Core:BulkExportLegacyExport' => 'Click aquí para acceder a la exportación tradicional.',
-	'Core:BulkExport:XLSXOptions' => 'Opciones Excel',
-	'Core:BulkExport:TextFormat' => 'Compos texto conteniendo algunas marcas HTML',
-	'Core:BulkExport:DateTimeFormat' => 'Formato de fecha y hora',
+	'Core:BulkExport:XMLFormat'                     => 'Archivo XML (*.xml)',
+	'Core:BulkExport:XMLOptions'                    => 'Opciones XML',
+	'Core:BulkExport:SpreadsheetFormat'             => 'Formato Tabla HTML (*.html)',
+	'Core:BulkExport:SpreadsheetOptions'            => 'Opciones de Tabla',
+	'Core:BulkExport:OptionNoLocalize'              => 'Código de exportación en lugar de etiqueta',
+	'Core:BulkExport:OptionLinkSets'                => 'Incluir objetos ligados',
+	'Core:BulkExport:OptionFormattedText'           => 'Conservar formato de texto',
+	'Core:BulkExport:ScopeDefinition'               => 'Definición de los objetos a exportar',
+	'Core:BulkExportLabelOQLExpression'             => 'Consulta OQL:',
+	'Core:BulkExportLabelPhrasebookEntry'           => 'Entrada Consulta de Libreta de Consultas:',
+	'Core:BulkExportMessageEmptyOQL'                => 'Por favor ingrese una consulta OQL válida.',
+	'Core:BulkExportMessageEmptyPhrasebookEntry'    => 'Por favor seleccione un entrada válida de la libreta de consultas.',
+	'Core:BulkExportQueryPlaceholder'               => 'Escriba una consulta OQL aquí...',
+	'Core:BulkExportCanRunNonInteractive'           => 'Click aquí para ejecutar la exportación en modo no interactivo.',
+	'Core:BulkExportLegacyExport'                   => 'Click aquí para acceder a la exportación tradicional.',
+	'Core:BulkExport:XLSXOptions'                   => 'Opciones Excel',
+	'Core:BulkExport:TextFormat'                    => 'Compos texto conteniendo algunas marcas HTML',
+	'Core:BulkExport:DateTimeFormat'                => 'Formato de fecha y hora',
 	'Core:BulkExport:DateTimeFormatDefault_Example' => 'Formato por omisión (%1$s), ej. %2$s',
-	'Core:BulkExport:DateTimeFormatCustom_Format' => 'Formato personalizado: %1$s',
-	'Core:BulkExport:PDF:PageNumber' => 'Page %1$s~~',
-	'Core:DateTime:Placeholder_d' => 'DD', // Day of the month: 2 digits (with leading zero)
-	'Core:DateTime:Placeholder_j' => 'D', // Day of the month: 1 or 2 digits (without leading zero)
-	'Core:DateTime:Placeholder_m' => 'MM', // Month on 2 digits i.e. 01-12
-	'Core:DateTime:Placeholder_n' => 'M', // Month on 1 or 2 digits 1-12
-	'Core:DateTime:Placeholder_Y' => 'AAAA', // Year on 4 digits
-	'Core:DateTime:Placeholder_y' => 'AA', // Year on 2 digits
-	'Core:DateTime:Placeholder_H' => 'hh', // Hour 00..23
-	'Core:DateTime:Placeholder_h' => 'h', // Hour 01..12
-	'Core:DateTime:Placeholder_G' => 'hh', // Hour 0..23
-	'Core:DateTime:Placeholder_g' => 'h', // Hour 1..12
-	'Core:DateTime:Placeholder_a' => 'am/pm', // am/pm (lowercase)
-	'Core:DateTime:Placeholder_A' => 'AM/PM', // AM/PM (uppercase)
-	'Core:DateTime:Placeholder_i' => 'mm', // minutes, 2 digits: 00..59
-	'Core:DateTime:Placeholder_s' => 'ss', // seconds, 2 digits 00..59
-	'Core:Validator:Default' => 'Formato incorrecto',
-	'Core:Validator:Mandatory' => 'Por favor, ingrese este campo',
-	'Core:Validator:MustBeInteger' => 'Debe ser un entero',
-	'Core:Validator:MustSelectOne' => 'Por favor, seleccione uno',
+	'Core:BulkExport:DateTimeFormatCustom_Format'   => 'Formato personalizado: %1$s',
+	'Core:BulkExport:PDF:PageNumber'                => 'Página %1$s',
+	'Core:DateTime:Placeholder_d'                   => 'DD', // Day of the month: 2 digits (with leading zero)
+	'Core:DateTime:Placeholder_j'                   => 'D', // Day of the month: 1 or 2 digits (without leading zero)
+	'Core:DateTime:Placeholder_m'                   => 'MM', // Month on 2 digits i.e. 01-12
+	'Core:DateTime:Placeholder_n'                   => 'M', // Month on 1 or 2 digits 1-12
+	'Core:DateTime:Placeholder_Y'                   => 'AAAA', // Year on 4 digits
+	'Core:DateTime:Placeholder_y'                   => 'AA', // Year on 2 digits
+	'Core:DateTime:Placeholder_H'                   => 'hh', // Hour 00..23
+	'Core:DateTime:Placeholder_h'                   => 'h', // Hour 01..12
+	'Core:DateTime:Placeholder_G'                   => 'hh', // Hour 0..23
+	'Core:DateTime:Placeholder_g'                   => 'h', // Hour 1..12
+	'Core:DateTime:Placeholder_a'                   => 'am/pm', // am/pm (lowercase)
+	'Core:DateTime:Placeholder_A'                   => 'AM/PM', // AM/PM (uppercase)
+	'Core:DateTime:Placeholder_i'                   => 'mm', // minutes, 2 digits: 00..59
+	'Core:DateTime:Placeholder_s'                   => 'ss', // seconds, 2 digits 00..59
+	'Core:Validator:Default'                        => 'Formato incorrecto',
+	'Core:Validator:Mandatory'                      => 'Por favor, ingrese este campo',
+	'Core:Validator:MustBeInteger'                  => 'Debe ser un entero',
+	'Core:Validator:MustSelectOne'                  => 'Por favor, seleccione uno',
 ));

 //
 // Class: TagSetFieldData
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
-	'Class:TagSetFieldData' => '%2$s para la clase %1$s',
-	'Class:TagSetFieldData+' => '~~',
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
+	'Class:TagSetFieldData'  => '%2$s para la clase %1$s',
+	'Class:TagSetFieldData+' => 'Datos de campo',

-	'Class:TagSetFieldData/Attribute:code' => 'Código',
-	'Class:TagSetFieldData/Attribute:code+' => 'Código interno. Debe contener al menos tres caracteres alfanuméricos',
-	'Class:TagSetFieldData/Attribute:label' => 'Etiqueta',
-	'Class:TagSetFieldData/Attribute:label+' => 'Etiqueta mostrada',
-	'Class:TagSetFieldData/Attribute:description' => 'Descripción',
+	'Class:TagSetFieldData/Attribute:code'         => 'Código',
+	'Class:TagSetFieldData/Attribute:code+'        => 'Código interno. Debe contener al menos tres caracteres alfanuméricos',
+	'Class:TagSetFieldData/Attribute:label'        => 'Etiqueta',
+	'Class:TagSetFieldData/Attribute:label+'       => 'Etiqueta mostrada',
+	'Class:TagSetFieldData/Attribute:description'  => 'Descripción',
 	'Class:TagSetFieldData/Attribute:description+' => 'Descripción de la etiqueta',
-	'Class:TagSetFieldData/Attribute:finalclass' => 'Clase',
-	'Class:TagSetFieldData/Attribute:obj_class' => 'Clase de objeto',
-	'Class:TagSetFieldData/Attribute:obj_attcode' => 'Código de campo',
+	'Class:TagSetFieldData/Attribute:finalclass'   => 'Clase',
+	'Class:TagSetFieldData/Attribute:obj_class'    => 'Clase de objeto',
+	'Class:TagSetFieldData/Attribute:obj_attcode'  => 'Código de campo',

-	'Core:TagSetFieldData:ErrorDeleteUsedTag' => 'Etiquetas es uso no pueden ser borradas',
+	'Core:TagSetFieldData:ErrorDeleteUsedTag'           => 'Etiquetas es uso no pueden ser borradas',
 	'Core:TagSetFieldData:ErrorDuplicateTagCodeOrLabel' => 'Los códigos o las etiquetas deben ser únicos',
-	'Core:TagSetFieldData:ErrorTagCodeSyntax' => 'El código de la etiqueta debe contener entre 3 y %1$d caracteres alfanuméricos',
-	'Core:TagSetFieldData:ErrorTagCodeReservedWord' => 'El código elegido es una palabra reservada',
-	'Core:TagSetFieldData:ErrorTagLabelSyntax' => 'La etiqueta no odebe contener \'%1$s\' y no puede estar vacía',
-	'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed' => 'Códigos de etiqueta en uso no pueden ser borrados',
-	'Core:TagSetFieldData:ErrorClassUpdateNotAllowed' => 'Tags "Object Class" cannot be changed~~',
-	'Core:TagSetFieldData:ErrorAttCodeUpdateNotAllowed' => 'Tags "Attribute Code" cannot be changed~~',
-	'Core:TagSetFieldData:WhereIsThisTagTab' => 'Uso de la etiqueta (%1$d)~~',
-	'Core:TagSetFieldData:NoEntryFound' => 'No hay entradas para esta etiqueta',
+	'Core:TagSetFieldData:ErrorTagCodeSyntax'           => 'El código de la etiqueta debe contener entre 3 y %1$d caracteres alfanuméricos',
+	'Core:TagSetFieldData:ErrorTagCodeReservedWord'     => 'El código elegido es una palabra reservada',
+	'Core:TagSetFieldData:ErrorTagLabelSyntax'          => 'La etiqueta no odebe contener \'%1$s\' y no puede estar vacía',
+	'Core:TagSetFieldData:ErrorCodeUpdateNotAllowed'    => 'Códigos de etiqueta en uso no pueden ser borrados',
+	'Core:TagSetFieldData:ErrorClassUpdateNotAllowed'   => 'Etiquetas "Object Class" no pueden ser cambiadas',
+	'Core:TagSetFieldData:ErrorAttCodeUpdateNotAllowed' => 'Etiquetas "Attribute Code" no pueden ser cambiadas',
+	'Core:TagSetFieldData:WhereIsThisTagTab'            => 'Uso de la etiqueta (%1$d)',
+	'Core:TagSetFieldData:NoEntryFound'                 => 'No hay entradas para esta etiqueta',
 ));

 //
 // Class: DBProperty
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:DBProperty' => 'Propiedad BD',
 	'Class:DBProperty+' => 'Propiedad de Base de Datos',
 	'Class:DBProperty/Attribute:name' => 'Nombre',
@@ -1035,7 +1036,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: BackgroundTask
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:BackgroundTask' => 'Tarea en Segundo Plano',
 	'Class:BackgroundTask+' => 'Tarea en Segundo Plano',
 	'Class:BackgroundTask/Attribute:class_name' => 'Nombre de Clase',
@@ -1065,7 +1066,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: AsyncTask
 //
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:AsyncTask' => 'Tarea Asíncrona',
 	'Class:AsyncTask+' => 'Tarea Asíncrona',
 	'Class:AsyncTask/Attribute:created' => 'Creado',
@@ -1093,38 +1094,31 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 //
 // Class: AbstractResource
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:AbstractResource' => 'Recurso abstracto',
-	'Class:AbstractResource+' => '~~',
+	'Class:AbstractResource+' => '',
 ));

 //
 // Class: ResourceAdminMenu
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ResourceAdminMenu' => 'Recursos de Menú de Administración',
-	'Class:ResourceAdminMenu+' => '~~',
+	'Class:ResourceAdminMenu+' => '',
 ));

 //
 // Class: ResourceRunQueriesMenu
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ResourceRunQueriesMenu' => 'Recurso Libreta de Consultas',
-	'Class:ResourceRunQueriesMenu+' => '~~',
+	'Class:ResourceRunQueriesMenu+' => '',
 ));

 //
 // Class: Action
 //
-
-Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
+Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Class:ResourceSystemMenu' => 'Recurso Menú de Sistema',
-	'Class:ResourceSystemMenu+' => '~~',
+	'Class:ResourceSystemMenu+' => '',
 ));
-
-
-
--- a/dictionaries/es_cr.dictionary.itop.model.php
+++ b/dictionaries/es_cr.dictionary.itop.model.php
@@ -15,13 +15,10 @@
 //
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
-
-
 /**
- * Localized data
+ * Spanish Localized data
 *
 * @copyright   Copyright (C) 2010-2021 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
+ * @traductor   Miguel Turrubiates <miguel_tf@yahoo.com>
 */
-
-?>
--- a/dictionaries/es_cr.dictionary.itop.ui.php
+++ b/dictionaries/es_cr.dictionary.itop.ui.php
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -676,7 +676,7 @@ Nous espérons que vous aimerez cette version autant que nous avons eu du plaisi
 	'UI:CSVExport:LostChars' => 'Problème d\'encodage',
 	'UI:CSVExport:LostChars+' => 'Le fichier téléchargé sera encodé en %1$s. iTop a détecté des caractères incompatible avec ce format. Ces caractères seront soit remplacés par des caractères de substitution (par exemple: \'é\' transformé en \'e\'), soit perdus. Vous pouvez utiliser le copier/coller depuis votre navigateur web, ou bien contacter votre administrateur pour que l\'encodage corresponde mieux à votre besoin (Cf. paramètre \'csv_file_default_charset\').',

-	'UI:Audit:Title' => 'ITOP_APPLICATION_SHORT - Audit de la CMDB',
+	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - Audit de la CMDB',
 	'UI:Audit:InteractiveAudit' => 'Audit Interactif',
 	'UI:Audit:HeaderAuditRule' => 'Règle d\'audit',
 	'UI:Audit:HeaderNbObjects' => 'Nb d\'Objets',
--- a/dictionaries/nl.dictionary.itop.ui.php
+++ b/dictionaries/nl.dictionary.itop.ui.php
@@ -676,7 +676,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:CSVExport:LostChars' => 'Tekstcoderingsprobleem',
 	'UI:CSVExport:LostChars+' => 'Het gedownloade bestand zal worden gecodeerd in %1$s. ITOP_APPLICATION_SHORT heeft een aantal karakters gedetecteerd die niet compatibel zijn met dit formaat. Deze karakters zullen worden vervangen door een ander karakter (bijvoorbeeld karakters met accent kunnen het accent verliezen), of ze zullen worden verwijderd. Je kan data kopiëren en plakken van jouw webbrowser. Ook kan je de beheerder contacteren om de codes te veranderen (Zie parameter \'csv_file_default_charset\').',

-	'UI:Audit:Title' => 'ITOP_APPLICATION_SHORT - CMDB Audit',
+	'UI:Audit:Title' => ITOP_APPLICATION_SHORT.' - CMDB Audit',
 	'UI:Audit:InteractiveAudit' => 'Interactieve Audit',
 	'UI:Audit:HeaderAuditRule' => 'Auditregel',
 	'UI:Audit:HeaderNbObjects' => '# objecten',
--- a/dictionaries/ui/layouts/navigation-menu/cs.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/cs.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/da.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/da.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/de.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/de.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Unternehmenslogo',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Ausklappen/Einklappen',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Ausklappen/Einklappen (Gefiltert nach %1$s)',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...',
@@ -27,6 +28,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'Kein Ergebnis für diesen Menü-Filter',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s Profilbild',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filtere Menüeinträge',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/en.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/en.dictionary.itop.navigation-menu.php
@@ -20,6 +20,7 @@
 // Navigation menu
 Dict::Add('EN US', 'English', 'English', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...',
@@ -28,6 +29,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'Seems like there is no matching menu',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/es_cr.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/es_cr.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/fr.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/fr.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Logo entreprise',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Selectionnez l\'organisation sur laquelle filtrer',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Déplier / Replier',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Déplier / Replier (Filtré sur %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filtrer...',
@@ -27,6 +28,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'Aucun menu ne semble correspondre',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Bonjour %1$s !',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => 'Image de contact de %1$s',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Ouvre le menu utilisateur',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filtrer les entrées de menu',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/hu.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/it.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/it.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/ja.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/ja.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/nl.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/nl.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Bedrijfslogo',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Vergroot / Verberg',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Vergroot / Verberg (Gefilterd op %1$s)',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter…',
@@ -27,6 +28,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Welkom %1$s!',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s profielfoto',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu\'s',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/pt_br.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/pt_br.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/ru.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/ru.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Логотип компании',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Развернуть / Свернуть',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Развернуть / Свернуть (фильтр по %1$s)',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Фильтр...',
@@ -27,5 +28,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'Нет совпадений',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Добрый день, %1$s!',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => 'Фотография',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Фильтр пунктов меню',
 ));
--- a/dictionaries/ui/layouts/navigation-menu/sk.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/sk.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/tr.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/tr.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => 'Company logo~~',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => 'Expand / Collapse~~',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => 'Expand / Collapse (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => 'Filter...~~',
@@ -27,6 +28,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!~~',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php
+++ b/dictionaries/ui/layouts/navigation-menu/zh_cn.dictionary.itop.navigation-menu.php
@@ -19,6 +19,7 @@
 // Navigation menu
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Layout:NavigationMenu:CompanyLogo:AltText' => '公司logo',
+	'UI:Layout:NavigationMenu:Silo:Label' => 'Select organization to filter on~~',
 	'UI:Layout:NavigationMenu:Toggler:Tooltip' => '展开 / 折叠',
 	'UI:Layout:NavigationMenu:Toggler:TooltipWithSiloLabel' => '展开 / 折叠 (Filtered on %1$s)~~',
 	'UI:Layout:NavigationMenu:MenuFilter:Input:Placeholder' => '过滤器...',
@@ -27,6 +28,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'UI:Layout:NavigationMenu:MenuFilter:Placeholder:Hint' => 'No result for this menu filter~~',
 	'UI:Layout:NavigationMenu:UserInfo:WelcomeMessage:Text' => 'Hi %1$s!',
 	'UI:Layout:NavigationMenu:UserInfo:Picture:AltText' => '%1$s\'s contact picture~~',
+	'UI:Layout:NavigationMenu:UserMenu:Toggler:Label' => 'Open user menu~~',
 	'UI:Layout:NavigationMenu:KeyboardShortcut:FocusFilter' => 'Filter menu entries~~',

 ));
--- a/images/icons/icons8-enclosure-for-servers.svg
+++ b/images/icons/icons8-enclosure-for-servers.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"  viewBox="0 0 48 48" width="240px" height="240px"><radialGradient id="kMYpY04mz2P2Ir82W-WmNa" cx="16.085" cy="10.234" r="36.479" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fafafb"/><stop offset="1" stop-color="#c8cdd1"/></radialGradient><path fill="url(#kMYpY04mz2P2Ir82W-WmNa)" d="M35,44H13c-0.552,0-1-0.448-1-1V3c0-0.552,0.448-1,1-1h22c0.552,0,1,0.448,1,1v40	C36,43.552,35.552,44,35,44z"/><linearGradient id="kMYpY04mz2P2Ir82W-WmNb" x1="10.615" x2="36.53" y1="-.605" y2="45.097" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#75daff"/><stop offset="1" stop-color="#1ea2e4"/></linearGradient><rect width="18" height="36" x="15" y="5" fill="url(#kMYpY04mz2P2Ir82W-WmNb)"/><linearGradient id="kMYpY04mz2P2Ir82W-WmNc" x1="13.563" x2="13.563" y1="18.489" y2="28.198" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a1aab3"/><stop offset="1" stop-color="#8f979e"/></linearGradient><path fill="url(#kMYpY04mz2P2Ir82W-WmNc)" d="M13.563,26.875L13.563,26.875c-0.311,0-0.563-0.252-0.563-0.563v-6.625	c0-0.311,0.252-0.563,0.562-0.563h0c0.311,0,0.562,0.252,0.562,0.563v6.625C14.125,26.623,13.873,26.875,13.563,26.875z"/><linearGradient id="kMYpY04mz2P2Ir82W-WmNd" x1="16.5" x2="16.5" y1="45.957" y2="44.063" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a1aab3"/><stop offset="1" stop-color="#8f979e"/></linearGradient><path fill="url(#kMYpY04mz2P2Ir82W-WmNd)" d="M17,46h-1c-0.552,0-1-0.448-1-1v-1h3v1C18,45.552,17.552,46,17,46z"/><linearGradient id="kMYpY04mz2P2Ir82W-WmNe" x1="31.5" x2="31.5" y1="45.957" y2="44.063" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a1aab3"/><stop offset="1" stop-color="#8f979e"/></linearGradient><path fill="url(#kMYpY04mz2P2Ir82W-WmNe)" d="M32,46h-1c-0.552,0-1-0.448-1-1v-1h3v1C33,45.552,32.552,46,32,46z"/></svg>
--- a/js/dataTables.settings.js
+++ b/js/dataTables.settings.js
@@ -106,7 +106,9 @@ $(function () {
 					});
 					$.each(aOptions['columns'], function (i, item) {
 						aOptions["columns"][i]["render"]["display"] = new Function("data, type, row", aOptions["columns"][i]["render"]["display"]);
-						aOptions["columns"][i]["createdCell"] = new Function("td, cellData, rowData, row, col", aOptions["columns"][i]["createdCell"]);
+						if(aOptions["columns"][i]["createdCell"] != undefined) {
+							aOptions["columns"][i]["createdCell"] = new Function("td, cellData, rowData, row, col", aOptions["columns"][i]["createdCell"]);
+						}
 					});

 					parentElt.append("<table id=\""+me.options.sListId+"\" width=\"100%\" class=\"ibo-datatable\">"+
--- a/js/extkeywidget.js
+++ b/js/extkeywidget.js
@@ -127,7 +127,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 	}
 	this.AddSelectize = function (options, initValue) {
 		let $select = $('#'+me.id).selectize({
-			plugins:['custom_itop'],
+			plugins:['custom_itop', 'selectize-plugin-a11y'],
 			render: {
 				item: function (item) {
 					if (item.obsolescence_flag == 1) {
@@ -156,7 +156,7 @@ function ExtKeyWidget(id, sTargetClass, sFilter, sTitle, bSelectMode, oWizHelper
 						val = val+'<br><i>'+item.additional_field+'</i>';
 					}
 					val = val+'</span>';
-					return $("<div class=\"option ibo-input-select--autocomplete-item\">").append(val);
+					return $("<div class=\"option ibo-input-select--autocomplete-item\" role=\"option\" id=\"${$item.text.replace(' ', '')}\">g").append(val);
 				}
 			},
 			valueField: 'value',
--- a/js/jquery.itop-set-widget.js
+++ b/js/jquery.itop-set-widget.js
@@ -164,7 +164,11 @@ $.widget('itop.set_widget',
 				onItemRemove: function (value) {
 					var selectizeWidget = this;
 					setWidget._onTagRemove(value, selectizeWidget);
-				}
+				},
+				onDropdownOpen: function (oDropdownElem) {
+					oDropdownElem.addClass('set-dropdown');
+					setWidget._updateDropdownPosition(this.$control, oDropdownElem);
+				},
 			});

 			this.selectizeWidget = $inputWidget[0].selectize; // keeping this for set widget public methods
@@ -348,5 +352,34 @@ $.widget('itop.set_widget',

 		_isCodeInPartialValues: function (setItemCode) {
 			return (this.partialValues.indexOf(setItemCode) >= 0);
+		},
+		/**
+		 * Update the dropdown's position so it always fits in the screen
+		 *
+		 * @param {object} oControlElem jQuery object representing the "control" input (= where the user types) of the external key
+		 * @param {object} oDropdownElem jQuery object representing the results dropdown
+		 * @return {void}
+		 */
+		_updateDropdownPosition: function (oControlElem, oDropdownElem) {
+			const fWindowHeight = window.innerHeight;
+
+			const fControlTopY = oControlElem.offset().top;
+			const fControlHeight = oControlElem.outerHeight();
+
+			const fDropdownTopY = oDropdownElem.offset().top;
+			// This one is "let" as it might be updated if necessary
+			let fDropdownHeight = oDropdownElem.outerHeight();
+			const fDropdownBottomY = fDropdownTopY + fDropdownHeight;
+
+			if (fDropdownBottomY > fWindowHeight) {
+				// Set dropdown max-height to 1/3 of the screen, this way we are sure the dropdown will fit in either the top / bottom half of the screen
+				oDropdownElem.css('max-height', '30vh');
+				fDropdownHeight = oDropdownElem.outerHeight();
+
+				// Position dropdown above input if not enough space on the bottom part of the screen
+				if ((fDropdownTopY / fWindowHeight) > 0.6) {
+					oDropdownElem.css('top', fDropdownTopY - fDropdownHeight - fControlHeight);
+				}
+			}
 		}
 	});
--- a/js/layouts/object/object-details.js
+++ b/js/layouts/object/object-details.js
@@ -94,14 +94,14 @@ $(function()
 					oTransitionButtonsElems.css('visibility', 'hidden');
 					oTransitionButtonsElems.removeClass('ibo-is-hidden');
 					// 2. Measure position
-					let iLastTransitionButtonBorderY = oLastTransitionButton.offset().left + oLastTransitionButton.outerWidth();
+					let iLastTransitionButtonBorderX = parseInt(oLastTransitionButton.offset().left + oLastTransitionButton.outerWidth());
 					// 3. Make transition buttons invisible AND not occuping space again
 					oTransitionButtonsElems.addClass('ibo-is-hidden');
 					oTransitionButtonsElems.css('visibility', '');

-					let iPanelRightBorderY = oHeaderElem.offset().left + oHeaderElem.outerWidth();
+					let iPanelRightBorderX = parseInt(oHeaderElem.offset().left + oHeaderElem.outerWidth());

-					if (iLastTransitionButtonBorderY > iPanelRightBorderY) {
+					if (iLastTransitionButtonBorderX > iPanelRightBorderX) {
 						oButtonsToolbarElem.find('.action[data-role="ibo-button"]:not([name="cancel"])').addClass('ibo-is-hidden');
 						oButtonsToolbarElem.find('[data-role="ibo-button-group"]:last').removeClass('ibo-is-hidden');
 					}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
acognet	e23c41232d	N°4465 - Polishing iTop 3.0 beta6 - fix "configure this list"	2021-11-23 15:34:53 +01:00
Stephen Abello	e25d070a38	N°4465 Fix tagset and enumset dropdown overflowing out of the screen and not autoplacing themselves	2021-11-23 13:33:08 +01:00
Stephen Abello	499c97b914	N°4465 Fix transition button not grouping/ungrouping in some cases	2021-11-23 11:51:31 +01:00
Molkobain	c472b8ad3b	N°4466 - Fix line breaks not displayed correctly	2021-11-23 11:40:52 +01:00
Molkobain	94ceb98b9e	N°4466 - Fix line breaks not displayed correctly	2021-11-23 11:32:26 +01:00
Stephen Abello	b1de8683f0	N°3523 Adjust buttons and links colors to make application more accessible	2021-11-23 11:26:16 +01:00
Stephen Abello	cff2105908	Remove debug line	2021-11-23 11:06:23 +01:00
Stephen Abello	e11d5c142c	N°3523 Adjust buttons and links colors to make application more accessible	2021-11-23 10:39:11 +01:00
Molkobain	f77b3bedaf	N°2370 - Change PHPDoc to reflect reality, method will not be removed	2021-11-23 10:15:28 +01:00
Molkobain	3654df1cae	N°4466 - SCSS: Improve readability	2021-11-23 09:57:53 +01:00
Molkobain	f3d2e89c68	N°4466 - Revert changes that broke contraints for fields to stay in their column (`d0f9868` and `c9aa6938`)	2021-11-23 09:40:33 +01:00
Molkobain	dd46536f7c	N°4477 - Update dataTables lib. to 1.11.3 in iTop 3.0	2021-11-22 17:31:48 +01:00
Molkobain	e249907a9c	N°4475 N°4408 - Fix update on external key not refreshing dependents fields	2021-11-22 16:45:35 +01:00
Eric Espie	4ded943a43	N°2527 - Fix require approot	2021-11-22 16:00:45 +01:00
Molkobain	bd52f4fefb	N°4468 - Add data-resource-id meta-data on all buttons	2021-11-22 15:44:27 +01:00
Pierre Goiffon	f57785e422	Merge remote-tracking branch 'origin/support/2.7' into develop # Conflicts: # datamodels/2.x/authent-local/dictionaries/es_cr.dict.authent-local.php # datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-service-mgmt/dictionaries/es_cr.dict.itop-service-mgmt.php # datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php # datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php # dictionaries/es_cr.dictionary.itop.ui.php # test/integration/DictionariesConsistencyTest.php	2021-11-22 09:08:34 +01:00
Pierre Goiffon	77880c3675	🌐 N°3635 ES dict : change 'Español, Castellaño' to 'Español, Castellano'	2021-11-22 08:55:08 +01:00
Molkobain	bb369e68b5	N°4283 - Rename some SCSS partials to match conventions	2021-11-20 18:52:54 +01:00
Molkobain	2a2d68e204	N°4283 - Textarea: Make sure to use monospace font for code - CSV import is now using monospace font - Simplify SCSS code Note: TextArea and all input UIBlocks need to be reworked as they are not properly organized, see comment in _input-text.scss	2021-11-20 18:42:41 +01:00
Molkobain	b49fbf1a97	N°4283 - Textarea: Make them take all available width	2021-11-20 18:12:41 +01:00
Molkobain	308bff7875	SCSS: Fix typo in variable name	2021-11-20 14:23:13 +01:00
Molkobain	9444e61856	N°4283 - Improve spacing of HTML inputs with their labels	2021-11-19 18:35:50 +01:00
Molkobain	2f114701a1	N°4283 - AttributeOneWayPassword: Fix spacing between the fields / button	2021-11-19 17:40:48 +01:00
Molkobain	5128db05cf	N°4283 - AttributeBlob: Fix extra between the value and the links / input	2021-11-19 17:39:54 +01:00
Molkobain	9675202bb2	N°4283 - Force field labels to wrap even if it is a single giant word	2021-11-19 17:09:23 +01:00
Molkobain	cbe42cd727	N°4283 - Improve textarea and OQL inputs style - All textarea app. wide avec the same padding - OQL fields have the same padding as the other textareas - OQL fields have the monospaced font	2021-11-19 16:34:01 +01:00
Pierre Goiffon	3559425fc1	N°°4463 Trigger : remove user rights check when controlling filter	2021-11-19 15:20:21 +01:00
Molkobain	a246528eec	Update DoPostRequest() in itoprest.examples.php to fix optional headers like in utils::DoPostRequest	2021-11-19 14:47:51 +01:00
Stephen Abello	7fbbf1088a	N°4460 Fix SCSS variable usage	2021-11-19 12:22:08 +01:00
Molkobain	fa4a5e2990	Merge spanish translations and remove duplicated files due to merge	2021-11-19 11:49:48 +01:00
Molkobain	b662a7e3c6	Remove (some) redundant description in spanish translations	2021-11-19 11:49:36 +01:00
Stephen Abello	cdc452282e	Fix dictionnary entries	2021-11-19 11:38:08 +01:00
Molkobain	d8c4251c03	Remove (some) redundant description in spanish translations	2021-11-19 11:27:46 +01:00
Stephen Abello	72d1ab5cbc	N°3523 Add accessibility to silo selection and user menu toggler	2021-11-19 11:16:19 +01:00
Stephen Abello	18b8e7093a	N°3515 Update Enclosure icon (thanks to icons8 quick response ❤️)	2021-11-19 11:16:19 +01:00
Stephen Abello	aedb9ccbba	N°3525 Make colors more accessible	2021-11-19 11:16:18 +01:00
Pierre Goiffon	67fa156c0e	Merge remote-tracking branch 'origin/support/2.7' into develop # Conflicts: # application/dashboard.class.inc.php # core/action.class.inc.php # datamodels/2.x/combodo-db-tools/dictionaries/es_cr.dict.combodo-db-tools.php # datamodels/2.x/itop-attachments/dictionaries/es_cr.dict.itop-attachments.php # datamodels/2.x/itop-config-mgmt/dictionaries/es_cr.dict.itop-config-mgmt.php # datamodels/2.x/itop-core-update/dictionaries/es_cr.dict.itop-core-update.php # datamodels/2.x/itop-hub-connector/dictionaries/es_cr.dict.itop-hub-connector.php # datamodels/2.x/itop-knownerror-mgmt/dictionaries/es_cr.dict.itop-knownerror-mgmt.php # datamodels/2.x/itop-portal-base/dictionaries/es_cr.dict.itop-portal-base.php # datamodels/2.x/itop-request-mgmt-itil/dictionaries/es_cr.dict.itop-request-mgmt-itil.php # datamodels/2.x/itop-request-mgmt/dictionaries/es_cr.dict.itop-request-mgmt.php # datamodels/2.x/itop-sla-computation/dictionaries/es_cr.dict.itop-sla-computation.php # datamodels/2.x/itop-storage-mgmt/dictionaries/es_cr.dict.itop-storage-mgmt.php # datamodels/2.x/itop-tickets/dictionaries/es_cr.dict.itop-tickets.php # datamodels/2.x/itop-virtualization-mgmt/dictionaries/es_cr.dict.itop-virtualization-mgmt.php # datamodels/2.x/itop-welcome-itil/es_cr.dict.itop-welcome-itil.php # dictionaries/es_cr.dictionary.itop.core.php # dictionaries/es_cr.dictionary.itop.ui.php # pages/ajax.render.php # setup/wizardsteps.class.inc.php # synchro/synchro_import.php	2021-11-19 10:28:46 +01:00
Pierre Goiffon	9437e689fd	N°3635 Update ES translations Many thanks to Miguel Turrubiates !	2021-11-18 17:48:43 +01:00
Pierre Goiffon	a79459bc53	N°4162 Portal exception page : restore exception message Was removed with Silex to Symfony migration	2021-11-18 14:56:17 +01:00
Pierre Goiffon	500bd15843	Merge remote-tracking branch 'origin/support/2.6' into support/2.7	2021-11-18 08:54:32 +01:00
Pierre Goiffon	3e8dd2f4a5	N°4286 Setup : fix loop in first steps Setup token wasn't removed at the right place :/	2021-11-18 08:54:10 +01:00
Pierre Goiffon	d0fade9ce1	Merge remote-tracking branch 'origin/support/2.6' into support/2.7 # Conflicts: # pages/ajax.render.php # setup/wizardsteps.class.inc.php	2021-11-17 17:39:36 +01:00
Pierre Goiffon	51a49dfce8	Remove warnings, use finally block, formatting	2021-11-17 16:10:50 +01:00
Molkobain	db8462ccc9	N°2788 - Constraint table to fit as much as possible in its column	2021-11-17 15:55:01 +01:00
Pierre Goiffon	066b71686d	N°4286 Setup : restore backup download on WizStepDone Setup token was put with N°2016 (`6b5cc7c`) But later on we refactored the token handling in SetupUtils methods, and we had token removal in WizStepDone (`43daa2ef`) : so the backup download cannot be done :/	2021-11-17 14:39:44 +01:00
Pierre Goiffon	be633001a5	Revert "N°4360 Security hardening" This reverts commit `8adf743cc7`. We will implement a different solution later (hopefully for 2.6.5 / 2.7.6 / 3.0.0 as well)	2021-11-17 11:13:29 +01:00
Pierre Goiffon	84426c6634	N°4365 Security hardening	2021-11-17 10:15:12 +01:00
Pierre Goiffon	dbaf924171	N°4363 Security hardening	2021-11-16 17:19:19 +01:00
Pierre Goiffon	8adf743cc7	N°4360 Security hardening	2021-11-16 12:01:16 +01:00
Pierre Goiffon	75450ded1d	N°4359 Security hardening	2021-11-15 16:38:11 +01:00
Pierre Goiffon	bcca6ac720	Merge remote-tracking branch 'origin/support/2.6' into support/2.7	2021-11-15 15:07:19 +01:00
Pierre Goiffon	2beb795f9a	N°4304 Security hardening	2021-11-09 11:32:53 +01:00
Pierre Goiffon	6847d8a5c7	N°4414 Startup error handler : fix message logged twice (#243 )	2021-11-09 10:25:29 +01:00
Pierre Goiffon	06985d3cf2	N°4387 synchro_import restore previous set_time_limit call Was changed in `b1761e04` (iTop 2.7.0) by mistake Added noinspection as the IDE warning (https://github.com/kalessil/phpinspectionsea/blob/master/docs/control-flow.md#statement-could-be-decoupled-from-foreach) seems to be a false positive ?	2021-11-08 16:14:19 +01:00
				`@@ -0,0 +1 @@`
				<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" width="240px" height="240px"><radialGradient id="kMYpY04mz2P2Ir82W-WmNa" cx="16.085" cy="10.234" r="36.479" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#fafafb"/><stop offset="1" stop-color="#c8cdd1"/></radialGradient><path fill="url(#kMYpY04mz2P2Ir82W-WmNa)" d="M35,44H13c-0.552,0-1-0.448-1-1V3c0-0.552,0.448-1,1-1h22c0.552,0,1,0.448,1,1v40 C36,43.552,35.552,44,35,44z"/><linearGradient id="kMYpY04mz2P2Ir82W-WmNb" x1="10.615" x2="36.53" y1="-.605" y2="45.097" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#75daff"/><stop offset="1" stop-color="#1ea2e4"/></linearGradient><rect width="18" height="36" x="15" y="5" fill="url(#kMYpY04mz2P2Ir82W-WmNb)"/><linearGradient id="kMYpY04mz2P2Ir82W-WmNc" x1="13.563" x2="13.563" y1="18.489" y2="28.198" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a1aab3"/><stop offset="1" stop-color="#8f979e"/></linearGradient><path fill="url(#kMYpY04mz2P2Ir82W-WmNc)" d="M13.563,26.875L13.563,26.875c-0.311,0-0.563-0.252-0.563-0.563v-6.625 c0-0.311,0.252-0.563,0.562-0.563h0c0.311,0,0.562,0.252,0.562,0.563v6.625C14.125,26.623,13.873,26.875,13.563,26.875z"/><linearGradient id="kMYpY04mz2P2Ir82W-WmNd" x1="16.5" x2="16.5" y1="45.957" y2="44.063" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a1aab3"/><stop offset="1" stop-color="#8f979e"/></linearGradient><path fill="url(#kMYpY04mz2P2Ir82W-WmNd)" d="M17,46h-1c-0.552,0-1-0.448-1-1v-1h3v1C18,45.552,17.552,46,17,46z"/><linearGradient id="kMYpY04mz2P2Ir82W-WmNe" x1="31.5" x2="31.5" y1="45.957" y2="44.063" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#a1aab3"/><stop offset="1" stop-color="#8f979e"/></linearGradient><path fill="url(#kMYpY04mz2P2Ir82W-WmNe)" d="M32,46h-1c-0.552,0-1-0.448-1-1v-1h3v1C33,45.552,32.552,46,32,46z"/></svg>