removed symfonycasts

✅ Make unit tests working
🔊 Forms exceptions log
2026-03-02 23:54:12 +01:00 · 2025-10-03 11:39:05 +02:00 · 2025-10-02 09:48:22 +02:00 · 2025-10-01 16:21:11 +02:00 · 2025-09-30 13:55:20 +02:00 · 2025-09-26 10:01:21 +02:00
408 changed files with 5253 additions and 14247 deletions
--- a/.doc/contributing-guide/2025.contributing-stickers-side-by-side.png
+++ b/.doc/contributing-guide/2025.contributing-stickers-side-by-side.png
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,17 +7,6 @@ Here are some guidelines that will help us integrate your work!

 ## Contributions

-
-```
-  _   _            _    _        _                __           _   
- | | | | __ _  ___| | _| |_ ___ | |__   ___ _ __ / _| ___  ___| |_ 
- | |_| |/ _` |/ __| |/ / __/ _ \| '_ \ / _ \ '__| |_ / _ \/ __| __|
- |  _  | (_| | (__|   <| || (_) | |_) |  __/ |  |  _|  __/\__ \ |_ 
- |_| |_|\__,_|\___|_|\_\\__\___/|_.__/ \___|_|  |_|  \___||___/\__|                                              
-```                                                                     
-This repository is part of Hacktoberfest. Contributions are welcome! Feel free to suggest improvements, add translation, fix bugs, or propose new features. Thank you for contributing !
-
-
 ### Subjects
 You are welcome to create pull requests on any of those subjects:

@@ -172,4 +161,4 @@ We have one sticker per contribution type. You might get multiple stickers with

 Here is the design of each stickers for year 2024:

-![iTop stickers 2025](.doc/contributing-guide/2025.contributing-stickers-side-by-side.png)
+![iTop stickers 2024](.doc/contributing-guide/2024.contributing-stickers-side-by-side.png)
--- a/README.md
+++ b/README.md
@@ -99,7 +99,6 @@ We would like to give a special thank you 🤗 to the people from the community
 - Goethals, Stefan
 - Giuva, Vincenzo Katriel (a.k.a [@DarkNight97boss](https://github.com/DarkNight97boss))
 - Gumble, David
- Håkon, Harnes (a.k.a [@hakonharnes](https://github.com/hakonharnes))
 - Heloir, Arthur 
 - Janssens, Jelle (a.k.a [@janssensjelle](https://github.com/janssensjelle))
 - Ji, Leeb (冀利斌) (a.k.a [@chileeb](https://github.com/chileeb))
--- a/addons/userrights/userrightsprofile.class.inc.php
+++ b/addons/userrights/userrightsprofile.class.inc.php
@@ -94,15 +94,15 @@ class URP_Profiles extends UserRightsBaseClassGUI
 		$bGrant = $oUserRights->GetProfileActionGrant($this->GetKey(), $sClass, $sAction);
 		if (is_null($bGrant))
 		{
-			return '<span class="ibo-user-rights ibo-is-failure">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
 		}
 		elseif ($bGrant)
 		{
-			return '<span class="ibo-user-rights ibo-is-success">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
+			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
 		}
 		else
 		{
-			return '<span class="ibo-user-rights ibo-is-failure">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
 		}
 	}

--- a/app.php
+++ b/app.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Copyright (C) 2013-2024 Combodo SAS
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ */
+
+use Combodo\iTop\Kernel;
+
+require_once __DIR__.'/lib/autoload_runtime.php';
+
+require_once('approot.inc.php');
+require_once('application/startup.inc.php');
+
+return function (array $context) {
+    return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
+};
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -14,6 +14,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\ButtonGroup\ButtonGroupUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\CollapsibleSection\CollapsibleSection;
+use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableSettings;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\DataTableUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\DataTable\StaticTable\StaticTable;
 use Combodo\iTop\Application\UI\Base\Component\Field\Field;
@@ -3446,15 +3447,7 @@ EOF
 			} catch (Exception $oException) {
 				// Catch any exception happening during the stimulus
 				$sExceptionMessage =   ($oException instanceof CoreCannotSaveObjectException) ? $oException->getHtmlMessage() : $oException->getMessage();
-				\IssueLog::Error(__METHOD__, null, [$oException->getTraceAsString(), $oException->getMessage()]);
-			}
-			catch (\Throwable $e) {
-				//N°4720 : with deprecation removals: ease maintenance via additional logs
-				// Catch any Throwable happening during the stimulus
-				$sExceptionMessage = $e->getMessage();
-				\IssueLog::Error(__METHOD__, null, [$e->getTraceAsString(), $e->getMessage()]);
-			}
-			finally {
+			} finally {
 				if ($sOwnershipToken !== null) {
 					// Release the concurrent lock, if any
 					iTopOwnershipLock::ReleaseLock($sClass, $iKey, $sOwnershipToken);
--- a/application/datamodel.application.xml
+++ b/application/datamodel.application.xml
@@ -562,7 +562,70 @@ Call $this->AddInitialAttributeFlags($sAttCode, $iFlags) for all the initial att
      </event_data>
    </event>
  </events>
+  <forms>
+    <form id="DashletHeaderDynamicProperties" xsi:type="FormType">
+      <form_types>
+        <form_type id="title" xsi:type="TextType">
+          <options>
+            <label>UI:DashletHeaderDynamic:Prop-Title</label>
+            <default>UI:DashletHeaderDynamic:Prop-Title:Default</default>
+          </options>
+        </form_type>
+        <form_type id="icon" xsi:type="IconType">
+          <options>
+            <label>UI:DashletHeaderDynamic:Prop-Icon</label>
+            <default>images/icons/icons8-customer.svg</default>
+          </options>
+        </form_type>
+        <form_type id="subtitle" xsi:type="TextType">
+          <options>
+            <label>UI:DashletHeaderDynamic:Prop-Subtitle</label>
+            <default>UI:DashletHeaderDynamic:Prop-Subtitle:Default</default>
+          </options>
+        </form_type>
+        <form_type id="query" xsi:type="QueryType">
+          <options>
+            <label>UI:DashletHeaderDynamic:Prop-Query</label>
+            <default>SELECT Contact</default>
+          </options>
+        </form_type>
+        <form_type id="group_by" xsi:type="GroupByAttcodeType">
+          <options>
+            <label>UI:DashletHeaderDynamic:Prop-GroupBy</label>
+            <default>status</default>
+            <class_source>query</class_source>
+          </options>
+        </form_type>
+        <form_type id="values" xsi:type="ValuesFromAttcodeType">
+          <options>
+            <label>UI:DashletHeaderDynamic:Prop-Values</label>
+            <default>
+              <values>
+                <value id="active"/>
+                <value id="inactive"/>
+              </values>
+            </default>
+            <attcode_source>group_by</attcode_source>
+          </options>
+        </form_type>
+      </form_types>
+    </form>
+  </forms>
  <meta>
+    <form_type_definitions>
+      <form_type_definition id="IconType">
+        <options>
+          <option id="label">
+            <mandatory>true</mandatory>
+            <type>string</type>
+          </option>
+          <option id="default">
+            <mandatory>true</mandatory>
+            <type>string</type>
+          </option>
+        </options>
+      </form_type_definition>
+    </form_type_definitions>
    <classes>
      <class id="cmdbAbstractObject" _delta="define">
        <methods>
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -903,13 +903,7 @@ class TemplateMenuNode extends MenuNode
 	{
 		parent::__construct($sMenuId, $iParentIndex, $fRank, $sEnableClass, $iActionCode, $iAllowedResults, $sEnableStimulus);
 	}
-	/**
-	 * @inheritDoc
-	 */
-	public function GetHyperlink($aExtraParams)
-	{
-		return '';
-	}
+
 	/**
 	 * @inheritDoc
 	 * @throws \Exception
--- a/application/startup.inc.php
+++ b/application/startup.inc.php
@@ -42,6 +42,7 @@ register_shutdown_function(function()
 	$sReservedMemory = null;
 	if (!is_null($err = error_get_last()) && ($err['type'] == E_ERROR))
 	{
+		var_export($err);
 		// Remove stack trace from MySQLException (since 2.7.2 see N°3174)
 		$sMessage = $err['message'];
 		if (strpos($sMessage, 'MySQLException') !== false) {
--- a/composer.json
+++ b/composer.json
@@ -29,13 +29,15 @@
    "symfony/http-foundation": "~6.4.0",
    "symfony/http-kernel": "~6.4.0",
    "symfony/mailer": "^6.4",
-    "symfony/security-csrf": "^6.4",
+    "symfony/runtime": "~6.4.0",
    "symfony/twig-bundle": "~6.4.0",
+    "symfony/var-dumper": "~6.4.0",
    "symfony/yaml": "~6.4.0",
    "tecnickcom/tcpdf": "^6.6.0",
    "thenetworg/oauth2-azure": "^2.0"
  },
  "require-dev": {
+    "symfony/debug-bundle": "~6.4.0",
    "symfony/stopwatch": "~6.4.0",
    "symfony/web-profiler-bundle": "~6.4.0"
  },
@@ -62,7 +64,10 @@
    },
    "sort-packages": true,
    "classmap-authoritative": true,
-    "platform-check": true
+    "platform-check": true,
+    "allow-plugins": {
+      "symfony/runtime": true
+    }
  },
  "autoload": {
    "classmap": [
@@ -90,7 +95,7 @@
  "extra": {
    "symfony": {
      "allow-contrib": false,
-      "require": "6.4.*"
+      "require": "3.4.*"
    },
    "runtime": {
      "dotenv_path": "resources/symfony/.env"
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "26fa7aa920057d080bcc0948bf052fda",
+    "content-hash": "a8ec6335b5ece43315f493dc1bf72b51",
    "packages": [
        {
            "name": "apereo/phpcas",
@@ -3445,82 +3445,6 @@
            ],
            "time": "2025-08-04T17:06:28+00:00"
        },
-        {
-            "name": "symfony/password-hasher",
-            "version": "v6.4.24",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/password-hasher.git",
-                "reference": "dcab5ac87450aaed26483ba49c2ce86808da7557"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/password-hasher/zipball/dcab5ac87450aaed26483ba49c2ce86808da7557",
-                "reference": "dcab5ac87450aaed26483ba49c2ce86808da7557",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1"
-            },
-            "conflict": {
-                "symfony/security-core": "<5.4"
-            },
-            "require-dev": {
-                "symfony/console": "^5.4|^6.0|^7.0",
-                "symfony/security-core": "^5.4|^6.0|^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\PasswordHasher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Robin Chalas",
-                    "email": "robin.chalas@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Provides password hashing utilities",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "hashing",
-                "password"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/password-hasher/tree/v6.4.24"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-07-10T08:14:14+00:00"
-        },
        {
            "name": "symfony/polyfill-ctype",
            "version": "v1.33.0",
@@ -4370,123 +4294,41 @@
            "time": "2025-07-15T08:46:37+00:00"
        },
        {
-            "name": "symfony/security-core",
-            "version": "v6.4.26",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/security-core.git",
-                "reference": "8b7c95bf04d82fcd0c06a918b2d849bfb2ab9cc0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/security-core/zipball/8b7c95bf04d82fcd0c06a918b2d849bfb2ab9cc0",
-                "reference": "8b7c95bf04d82fcd0c06a918b2d849bfb2ab9cc0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=8.1",
-                "symfony/deprecation-contracts": "^2.5|^3",
-                "symfony/event-dispatcher-contracts": "^2.5|^3",
-                "symfony/password-hasher": "^5.4|^6.0|^7.0",
-                "symfony/service-contracts": "^2.5|^3"
-            },
-            "conflict": {
-                "symfony/event-dispatcher": "<5.4",
-                "symfony/http-foundation": "<5.4",
-                "symfony/ldap": "<5.4",
-                "symfony/security-guard": "<5.4",
-                "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3",
-                "symfony/validator": "<5.4"
-            },
-            "require-dev": {
-                "psr/cache": "^1.0|^2.0|^3.0",
-                "psr/container": "^1.1|^2.0",
-                "psr/log": "^1|^2|^3",
-                "symfony/cache": "^5.4|^6.0|^7.0",
-                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
-                "symfony/expression-language": "^5.4|^6.0|^7.0",
-                "symfony/http-foundation": "^5.4|^6.0|^7.0",
-                "symfony/ldap": "^5.4|^6.0|^7.0",
-                "symfony/string": "^5.4|^6.0|^7.0",
-                "symfony/translation": "^5.4.35|~6.3.12|^6.4.3|^7.0.3",
-                "symfony/validator": "^6.4|^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Security\\Core\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Security Component - Core Library",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/security-core/tree/v6.4.26"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://github.com/nicolas-grekas",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2025-09-02T19:15:26+00:00"
-        },
-        {
-            "name": "symfony/security-csrf",
+            "name": "symfony/runtime",
            "version": "v6.4.24",
            "source": {
                "type": "git",
-                "url": "https://github.com/symfony/security-csrf.git",
-                "reference": "9a1efc8c10b86bcedc9233affd10c716b54ca1b7"
+                "url": "https://github.com/symfony/runtime.git",
+                "reference": "c1cc6721646f546627236c57f835272806087337"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/security-csrf/zipball/9a1efc8c10b86bcedc9233affd10c716b54ca1b7",
-                "reference": "9a1efc8c10b86bcedc9233affd10c716b54ca1b7",
+                "url": "https://api.github.com/repos/symfony/runtime/zipball/c1cc6721646f546627236c57f835272806087337",
+                "reference": "c1cc6721646f546627236c57f835272806087337",
                "shasum": ""
            },
            "require": {
-                "php": ">=8.1",
-                "symfony/security-core": "^5.4|^6.0|^7.0"
+                "composer-plugin-api": "^1.0|^2.0",
+                "php": ">=8.1"
            },
            "conflict": {
-                "symfony/http-foundation": "<5.4"
+                "symfony/dotenv": "<5.4"
            },
            "require-dev": {
-                "symfony/http-foundation": "^5.4|^6.0|^7.0"
+                "composer/composer": "^1.0.2|^2.0",
+                "symfony/console": "^5.4.9|^6.0.9|^7.0",
+                "symfony/dotenv": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Symfony\\Component\\Runtime\\Internal\\ComposerPlugin"
            },
-            "type": "library",
            "autoload": {
                "psr-4": {
-                    "Symfony\\Component\\Security\\Csrf\\": ""
+                    "Symfony\\Component\\Runtime\\": "",
+                    "Symfony\\Runtime\\Symfony\\Component\\": "Internal/"
                },
                "exclude-from-classmap": [
                    "/Tests/"
@@ -4498,18 +4340,21 @@
            ],
            "authors": [
                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
                },
                {
                    "name": "Symfony Community",
                    "homepage": "https://symfony.com/contributors"
                }
            ],
-            "description": "Symfony Security Component - CSRF Library",
+            "description": "Enables decoupling PHP applications from global state",
            "homepage": "https://symfony.com",
+            "keywords": [
+                "runtime"
+            ],
            "support": {
-                "source": "https://github.com/symfony/security-csrf/tree/v6.4.24"
+                "source": "https://github.com/symfony/runtime/tree/v6.4.24"
            },
            "funding": [
                {
@@ -4985,16 +4830,16 @@
        },
        {
            "name": "symfony/var-dumper",
-            "version": "v6.4.26",
+            "version": "v6.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a"
+                "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/cfae1497a2f1eaad78dbc0590311c599c7178d4a",
-                "reference": "cfae1497a2f1eaad78dbc0590311c599c7178d4a",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6cd92486e9fc32506370822c57bc02353a5a92c",
+                "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c",
                "shasum": ""
            },
            "require": {
@@ -5049,7 +4894,7 @@
                "dump"
            ],
            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v6.4.26"
+                "source": "https://github.com/symfony/var-dumper/tree/v6.4.25"
            },
            "funding": [
                {
@@ -5069,7 +4914,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-09-25T15:37:27+00:00"
+            "time": "2025-08-13T09:41:44+00:00"
        },
        {
            "name": "symfony/var-exporter",
@@ -5228,6 +5073,60 @@
            ],
            "time": "2025-08-26T16:59:00+00:00"
        },
+        {
+            "name": "symfonycasts/dynamic-forms",
+            "version": "v0.1.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SymfonyCasts/dynamic-forms.git",
+                "reference": "4c86c48f18a707e451c4dfffe87f3710b2052be6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SymfonyCasts/dynamic-forms/zipball/4c86c48f18a707e451c4dfffe87f3710b2052be6",
+                "reference": "4c86c48f18a707e451c4dfffe87f3710b2052be6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "symfony/form": "^5.4|^6.3|^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6",
+                "symfony/framework-bundle": "^6.3|^7.0",
+                "symfony/options-resolver": "^5.4|^6.3|^7.0",
+                "symfony/phpunit-bridge": "^5.4.32|^6.3.9|^7.0",
+                "symfony/twig-bundle": "^5.4|^6.3|^7.0",
+                "twig/twig": "^2.15|^3.0",
+                "zenstruck/browser": "^1.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfonycasts\\DynamicForms\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ryan Weaver",
+                    "homepage": "https://symfonycasts.com"
+                }
+            ],
+            "description": "Add dynamic/dependent fields to Symfony forms",
+            "keywords": [
+                "Forms",
+                "symfony"
+            ],
+            "support": {
+                "issues": "https://github.com/SymfonyCasts/dynamic-forms/issues",
+                "source": "https://github.com/SymfonyCasts/dynamic-forms/tree/v0.1.3"
+            },
+            "time": "2024-10-22T16:59:02+00:00"
+        },
        {
            "name": "tecnickcom/tcpdf",
            "version": "6.10.0",
@@ -5440,6 +5339,80 @@
        }
    ],
    "packages-dev": [
+        {
+            "name": "symfony/debug-bundle",
+            "version": "v6.4.13",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/debug-bundle.git",
+                "reference": "7bcfaff39e094cc09455201916d016d9b2ae08ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/7bcfaff39e094cc09455201916d016d9b2ae08ff",
+                "reference": "7bcfaff39e094cc09455201916d016d9b2ae08ff",
+                "shasum": ""
+            },
+            "require": {
+                "ext-xml": "*",
+                "php": ">=8.1",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/http-kernel": "^5.4|^6.0|^7.0",
+                "symfony/twig-bridge": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
+            },
+            "conflict": {
+                "symfony/config": "<5.4",
+                "symfony/dependency-injection": "<5.4"
+            },
+            "require-dev": {
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/web-profiler-bundle": "^5.4|^6.0|^7.0"
+            },
+            "type": "symfony-bundle",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Bundle\\DebugBundle\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/debug-bundle/tree/v6.4.13"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:18:03+00:00"
+        },
        {
            "name": "symfony/stopwatch",
            "version": "v6.4.24",
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -1797,6 +1797,14 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
+		'application.secret' => [
+			'type'                => 'string',
+			'description'         => 'Application secret, uses this value for encrypting the cookies used in the remember me functionality and for creating signed URIs when using ESI (Edge Side Includes).',
+			'default'             => '',
+			'value'               => '',
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 		'http.request.user_agent' => [
 			'type'                => 'string',
 			'description'         => 'HTTP request user agent, use this to set a custom agent on external requests.',
@@ -2190,6 +2198,7 @@ class Config
 		$this->m_sEncryptionLibrary = isset($MySettings['encryption_library']) ? trim($MySettings['encryption_library']) : $this->m_sEncryptionLibrary;
 		$this->m_aCharsets = isset($MySettings['csv_import_charsets']) ? $MySettings['csv_import_charsets'] : array();
 		$this->m_iPasswordHashAlgo = isset($MySettings['password_hash_algo']) ? $MySettings['password_hash_algo'] : $this->m_iPasswordHashAlgo;
+		$this->m_sAppSecret = isset($MySettings['application.secret']) ? trim($MySettings['application.secret']) : $this->m_sAppSecret;
 	}

 	protected function Verify()
@@ -2513,6 +2522,7 @@ class Config
 		$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
 		$aSettings['csv_import_charsets'] = $this->m_aCharsets;
 		$aSettings['password_hash_algo'] = $this->m_iPasswordHashAlgo;
+		$aSettings['application.secret'] = $this->m_sAppSecret;

 		foreach ($this->m_aModuleSettings as $sModule => $aProperties)
 		{
@@ -2626,6 +2636,7 @@ class Config
 				'encryption_library' => $this->m_sEncryptionLibrary,
 				'csv_import_charsets' => $this->m_aCharsets,
 				'password_hash_algo' => $this->m_iPasswordHashAlgo,
+				'application.secret' => $this->m_sAppSecret,
 			);
 			foreach ($aOtherValues as $sKey => $value)
 			{
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -4927,7 +4927,7 @@ abstract class DBObject implements iDisplay
 	{
 		if (is_null($sWorkingTimeComputer))
 		{
-			$sWorkingTimeComputer = MetaModel::GetWorkingTime(get_class($this));
+			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
 		}
 		$oComputer = new $sWorkingTimeComputer();
 		$aCallSpec = array($oComputer, 'GetOpenDuration');
--- a/core/metamodel.class.php
+++ b/core/metamodel.class.php
@@ -399,32 +399,6 @@ abstract class MetaModel
 		return null;
 	}

-	final public static function GetDefaultWorkingTime()
-	{
-		return 'DefaultWorkingTimeComputer';
-	}
-
-	/**
-	 * @param string $sClass
-	 *
-	 * @return string the working time class
-	 * @throws \CoreException
-	 * @since 3.3.0
-	 */
-	final public static function GetWorkingTime($sClass)
-	{
-		self::_check_subclass($sClass);
-
-		if (array_key_exists('working_time', self::$m_aClassParams[$sClass])) {
-			return self::$m_aClassParams[$sClass]['working_time'];
-		} else {
-			$sParentClass = self::GetParentPersistentClass($sClass);
-			if (strlen($sParentClass) > 0) {
-				return self::GetWorkingTime($sParentClass);
-			}
-		}
-		return self::GetDefaultWorkingTime();
-	}
 	/**
 	 * @param string $sClass
 	 *
--- a/core/ormstopwatch.class.inc.php
+++ b/core/ormstopwatch.class.inc.php
@@ -289,7 +289,7 @@ class ormStopWatch
 		$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
 		if ($sWorkingTimeComputer == '')
 		{
-			$sWorkingTimeComputer = MetaModel::GetWorkingTime(get_class($oObject));
+			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
 		}
 		$oComputer = new $sWorkingTimeComputer();
 		$aCallSpec = array($oComputer, 'GetDeadline');
@@ -318,7 +318,7 @@ class ormStopWatch
 		$sWorkingTimeComputer = $oAttDef->Get('working_time_computing');
 		if ($sWorkingTimeComputer == '')
 		{
-			$sWorkingTimeComputer = MetaModel::GetWorkingTime(get_class($oObject));
+			$sWorkingTimeComputer = class_exists('SLAComputation') ? 'SLAComputation' : 'DefaultWorkingTimeComputer';
 		}
 		$oComputer = new $sWorkingTimeComputer();
 		$aCallSpec = array($oComputer, 'GetOpenDuration');
--- a/core/simplecrypt.class.inc.php
+++ b/core/simplecrypt.class.inc.php
@@ -130,13 +130,7 @@ class SimpleCrypt
     */
    function Decrypt($key, $string)
    {
-	    if (is_null($string) || strlen($string) == 0) {
-		    IssueLog::Warning("Cannot decrypt empty/null value");
-
-		    return $string;
-	    }
-
-	    return $this->oEngine->Decrypt($key, $string);
+        return $this->oEngine->Decrypt($key,$string);
    }

    /**
@@ -428,4 +422,4 @@ class SimpleCryptOpenSSLMcryptCompatibilityEngine implements CryptEngine
 		return trim($plaintext);
 	}

-}
+}
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -142,9 +142,7 @@ abstract class UserRightsAddOnAPI
 		$oFilter  = new DBObjectSearch($sClass);
 		$oListExpr = ListExpression::FromScalars($aAllowedOrgs);

-		$oNullCondition = new FunctionExpression('ISNULL', [$oExpression]);
-		$oInCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
-		$oCondition = $oNullCondition->LogOr($oInCondition);
+		$oCondition = new BinaryExpression($oExpression, 'IN', $oListExpr);
 		$oFilter->AddConditionExpression($oCondition);

 		if ($this->HasSharing())
@@ -542,9 +540,9 @@ abstract class User extends cmdbAbstractObject
 	function GetGrantAsHtml($sClass, $iAction)
 	{
 		if (UserRights::IsActionAllowed($sClass, $iAction, null, $this)) {
-			return '<span class="ibo-user-rights ibo-is-success">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
+			return '<span style="background-color: #ddffdd;">'.Dict::S('UI:UserManagement:ActionAllowed:Yes').'</span>';
 		} else {
-			return '<span class="ibo-user-rights ibo-is-failure">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
+			return '<span style="background-color: #ffdddd;">'.Dict::S('UI:UserManagement:ActionAllowed:No').'</span>';
 		}
 	}

--- a/css/backoffice/application/_all.scss
+++ b/css/backoffice/application/_all.scss
@@ -7,5 +7,4 @@
@import "display-block/all";
@import "linked-set/all";
@import "tabular-fields/all";
-@import "welcome-popup/all";
-@import "user-rights";
+@import "welcome-popup/all";
--- a/css/backoffice/application/_user-rights.scss
+++ b/css/backoffice/application/_user-rights.scss
@@ -1,33 +0,0 @@
-/*
- * @copyright   Copyright (C) 2010-2025 Combodo SAS
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-$ibo-user-rights--padding-x: $ibo-spacing-400 !default;
-$ibo-user-rights--padding-y: $ibo-spacing-200 !default;
-$ibo-user-rights--border-radius: $ibo-border-radius-400 !default;
-
-$ibo-user-rights--is-success--background-color: $ibo-color-success-100 !default;
-$ibo-user-rights--is-success--color: $ibo-color-success-950 !default;
-$ibo-user-rights--is-success--border-color: $ibo-color-success-500 !default;
-$ibo-user-rights--is-success--border: 1px solid $ibo-user-rights--is-success--border-color !default;
-
-$ibo-user-rights--is-failure--background-color: $ibo-color-danger-100 !default;
-$ibo-user-rights--is-failure--color: $ibo-color-danger-950 !default;
-$ibo-user-rights--is-failure--border-color: $ibo-color-danger-500 !default;
-$ibo-user-rights--is-failure--border: 1px solid $ibo-user-rights--is-failure--border-color !default;
-
-.ibo-user-rights {
-  padding: $ibo-user-rights--padding-y $ibo-user-rights--padding-x;
-  border-radius: $ibo-user-rights--border-radius;
-  &.ibo-is-success {
-    background-color: $ibo-user-rights--is-success--background-color;
-    color: $ibo-user-rights--is-success--color;
-    border: $ibo-user-rights--is-success--border;
-  }
-  &.ibo-is-failure {
-    background-color: $ibo-user-rights--is-failure--background-color;
-    color: $ibo-user-rights--is-failure--color;
-    border: $ibo-user-rights--is-failure--border;
-  }
-}
--- a/css/backoffice/vendors/_selectize.scss
+++ b/css/backoffice/vendors/_selectize.scss
@@ -34,10 +34,6 @@ $ibo-vendors-selectize--dropdown--color:  $ibo-vendors-selectize-input--color!de
 $ibo-vendors-selectize--header--padding-x: 8px !default;
 $ibo-vendors-selectize--header--padding-y: 5px !default;

-.selectize-dropdown, .selectize-input, .selectize-input input {
-  color: $ibo-vendors-selectize-input--color;
-}
-
 .selectize-control.single .selectize-input {
  box-shadow: unset;
  background-color: $ibo-vendors-selectize-input--background-color;
@@ -70,7 +66,6 @@ $ibo-vendors-selectize--header--padding-y: 5px !default;
  display: inline-flex;
 }

-
 .selectize-control.single .selectize-input, .selectize-dropdown.single {
  border-color: $ibo-vendors-selectize--input--border-color;
 }
--- a/data/.compilation-symlinks
+++ b/data/.compilation-symlinks
--- a/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/pt_br.dict.authent-local.php
@@ -26,7 +26,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => 'Senha não pode ser alterada pelo usuário',
 	'Class:UserLocal/Attribute:password_renewed_date' => 'Data da última alteração de senha',
 	'Class:UserLocal/Attribute:password_renewed_date+' => 'Quando a senha foi alterada anteriormente',
-	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'A senha deve conter no mínimo 8 caracteres e incluir letras maiúsculas, minúsculas, números e símbolos',
+	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => 'A senha deve ter no mínimo 8 caracteres e incluir letras maiúsculas, minúsculas, números e símbolos',
 	'UserLocal:password:expiration' => 'O campo abaixo requer uma extensão',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => 'Definir a expiração da senha para One-Time Password (OTP) não é permitido para o seu próprio usuário',
 ));
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss
@@ -1,73 +1,73 @@
-$ibo-color-grey-950: darken($nord0, 15%) !default;
-$ibo-color-grey-900: darken($nord0, 10%) !default;
-$ibo-color-grey-850: darken($nord0, 5%) !default;
-$ibo-color-grey-800: $nord0 !default;
-$ibo-color-grey-700: $nord1 !default;
-$ibo-color-grey-600: $nord2 !default;
-$ibo-color-grey-500: $nord3 !default;
-$ibo-color-grey-400: lighten($ibo-color-grey-500, 10%) !default;
-$ibo-color-grey-300: lighten($ibo-color-grey-400, 10%) !default;
-$ibo-color-grey-250: lighten($ibo-color-grey-300, 15%) !default;
-$ibo-color-grey-200: $nord4 !default;
-$ibo-color-grey-100: $nord5 !default;
-$ibo-color-grey-50: $nord6 !default;
+$ibo-color-grey-950: darken($nord0, 15%);
+$ibo-color-grey-900: darken($nord0, 10%);
+$ibo-color-grey-850: darken($nord0, 5%);
+$ibo-color-grey-800: $nord0 ;
+$ibo-color-grey-700: $nord1;
+$ibo-color-grey-600: $nord2;
+$ibo-color-grey-500: $nord3;
+$ibo-color-grey-400: lighten($ibo-color-grey-500, 10%);
+$ibo-color-grey-300: lighten($ibo-color-grey-400, 10%);
+$ibo-color-grey-250: lighten($ibo-color-grey-300, 15%);
+$ibo-color-grey-200: $nord4;
+$ibo-color-grey-100: $nord5;
+$ibo-color-grey-50: $nord6;

-$ibo-color-red-100: lighten($nord11, 40%) !default;
-$ibo-color-red-200: lighten($nord11, 35%) !default;
-$ibo-color-red-300: lighten($nord11, 22%) !default;
-$ibo-color-red-400: lighten($nord11, 15%) !default;
-$ibo-color-red-500: lighten($nord11, 7%) !default;
-$ibo-color-red-600: $nord11 !default;
-$ibo-color-red-700: darken($nord11, 7%) !default;
-$ibo-color-red-800: darken($nord11, 15%) !default;
-$ibo-color-red-900: darken($nord11, 22%) !default;
-$ibo-color-red-950: darken($nord11, 25%) !default;
+$ibo-color-red-100: lighten($nord11, 40%);
+$ibo-color-red-200: lighten($nord11, 35%);
+$ibo-color-red-300: lighten($nord11, 22%);
+$ibo-color-red-400: lighten($nord11, 15%);
+$ibo-color-red-500: lighten($nord11, 7%);
+$ibo-color-red-600: $nord11;
+$ibo-color-red-700: darken($nord11, 7%);
+$ibo-color-red-800: darken($nord11, 15%);
+$ibo-color-red-900: darken($nord11, 22%);
+$ibo-color-red-950: darken($nord11, 25%);

-$ibo-color-error-100: $ibo-color-red-100 !default;
-$ibo-color-error-200: $ibo-color-red-200 !default;
-$ibo-color-error-300: $ibo-color-red-300 !default;
-$ibo-color-error-400: $ibo-color-red-400 !default;
-$ibo-color-error-500: $ibo-color-red-500 !default;
-$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;
+$ibo-color-error-100: $ibo-color-red-100;
+$ibo-color-error-200: $ibo-color-red-200;
+$ibo-color-error-300: $ibo-color-red-300;
+$ibo-color-error-400: $ibo-color-red-400;
+$ibo-color-error-500: $ibo-color-red-500;
+$ibo-color-error-600: $ibo-color-red-600;
+$ibo-color-error-700: $ibo-color-red-700;
+$ibo-color-error-800: $ibo-color-red-800;
+$ibo-color-error-900: $ibo-color-red-900;
+$ibo-color-error-950: $ibo-color-red-950;

-$ibo-color-danger-100: $ibo-color-red-100 !default;
-$ibo-color-danger-200: $ibo-color-red-200 !default;
-$ibo-color-danger-300: $ibo-color-red-300 !default;
-$ibo-color-danger-400: $ibo-color-red-400 !default;
-$ibo-color-danger-500: $ibo-color-red-500 !default;
-$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-color-danger-100: $ibo-color-red-100;
+$ibo-color-danger-200: $ibo-color-red-200;
+$ibo-color-danger-300: $ibo-color-red-300;
+$ibo-color-danger-400: $ibo-color-red-400;
+$ibo-color-danger-500: $ibo-color-red-500;
+$ibo-color-danger-600: $ibo-color-red-600;
+$ibo-color-danger-700: $ibo-color-red-700;
+$ibo-color-danger-800: $ibo-color-red-800;
+$ibo-color-danger-900: $ibo-color-red-900;
+$ibo-color-danger-950: $ibo-color-red-950;

-$ibo-color-primary-100: lighten($nord8, 15%) !default;
-$ibo-color-primary-200: darken($ibo-color-primary-100, 7%) !default;
-$ibo-color-primary-300: $nord8 !default;
-$ibo-color-primary-400: darken($ibo-color-primary-300, 7%) !default;
-$ibo-color-primary-500: $nord9 !default;
-$ibo-color-primary-600: darken($ibo-color-primary-500, 7%) !default;
-$ibo-color-primary-700: lighten($nord10, 7%) !default;
-$ibo-color-primary-800: $nord10 !default;
-$ibo-color-primary-900: darken($ibo-color-primary-800, 20%) !default;
-$ibo-color-primary-950: darken($ibo-color-primary-900, 10%) !default;
+$ibo-color-primary-100: lighten($nord8, 15%);
+$ibo-color-primary-200: darken($ibo-color-primary-100, 7%);
+$ibo-color-primary-300: $nord8;
+$ibo-color-primary-400: darken($ibo-color-primary-300, 7%);
+$ibo-color-primary-500: $nord9;
+$ibo-color-primary-600: darken($ibo-color-primary-500, 7%);
+$ibo-color-primary-700: lighten($nord10, 7%);
+$ibo-color-primary-800: $nord10;
+$ibo-color-primary-900: darken($ibo-color-primary-800, 20%);
+$ibo-color-primary-950: darken($ibo-color-primary-900, 10%);

 /* - Secondary color of the brand */
-$ibo-color-secondary-100: $ibo-color-grey-100 !default;
-$ibo-color-secondary-200: $ibo-color-grey-200 !default;
-$ibo-color-secondary-300: $ibo-color-grey-300 !default;
-$ibo-color-secondary-400: $ibo-color-grey-400 !default;
-$ibo-color-secondary-500: $ibo-color-grey-500 !default;
-$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-850: $ibo-color-grey-850 !default;
-$ibo-color-secondary-900: $ibo-color-grey-900 !default;
-$ibo-color-secondary-950: $ibo-color-grey-950 !default;
+$ibo-color-secondary-100: $ibo-color-grey-100;
+$ibo-color-secondary-200: $ibo-color-grey-200;
+$ibo-color-secondary-300: $ibo-color-grey-300;
+$ibo-color-secondary-400: $ibo-color-grey-400;
+$ibo-color-secondary-500: $ibo-color-grey-500;
+$ibo-color-secondary-600: $ibo-color-grey-600;
+$ibo-color-secondary-700: $ibo-color-grey-700;
+$ibo-color-secondary-800: $ibo-color-grey-800;
+$ibo-color-secondary-850: $ibo-color-grey-850;
+$ibo-color-secondary-900: $ibo-color-grey-900;
+$ibo-color-secondary-950: $ibo-color-grey-950;

 $text    : $ibo-color-grey-100;
 $text-invert: $ibo-color-grey-800;
@@ -112,7 +112,7 @@ $ibo-field--fullscreen-toggler--background-color--on-hover: $ibo-color-grey-500;

 $ibo-input-wrapper--is-error--background-color: $ibo-color-red-800;
 $ibo-input-wrapper--is-error--border-color: $ibo-color-red-700;
-$ibo-field-validation: $ibo-color-red-300;
+$ibo-field-validation: $ibo-color-red-200;
 $ibo-field--background-color--is-fullscreen: $ibo-color-grey-700;
 $ibo-field--label--background-color--is-fullscreen: $ibo-color-grey-800;

@@ -198,13 +198,11 @@ $ibo-input-select-wrapper--after--color: $ibo-color-secondary-300;
 $ibo-input-select--action-button--color: $ibo-input-select-wrapper--after--color;
 $ibo-input-select-selectize--item--active--text-color: $ibo-color-grey-100;
 $ibo-input-select-selectize--item--active--background-color: $ibo-color-grey-500;
-$ibo-input-select--autocomplete-item-image--background-color: $ibo-color-grey-800;
 $ibo-vendors-selectize-input--color: $ibo-body-text-color;
 $ibo-vendors-selectize-input--background-color: $ibo-input--background-color;
 $ibo-vendors-selectize--input--border-color: $ibo-input--border-color;
 $ibo-vendors-selectize--element--active--background: $ibo-color-grey-400;
 $ibo-vendors-selectize--element--active--color: $ibo-body-text-color;
-$ibo-vendors-selectize-control--plugin-add-button--add-option--color: $ibo-input-select--action-button--color;

 $ibo-popover-menu--item-separator--background-color: $ibo-color-grey-500;
 $ibo-popover-menu--item--text-color: $ibo-color-grey-200;
@@ -312,12 +310,4 @@ $ibo-welcome-popup--stack-item--background-color: $ibo-color-grey-600;
 $ibo-welcome-popup--stack-item--border-color: $ibo-color-grey-800;
 $ibo-welcome-popup--stack-item--is-active--border-color: $ibo-color-grey-900;

-$ibo-vendors-ckeditor--ck-content--text-color: $ibo-color-grey-900;
-
-$ibo-user-rights--is-success--background-color: $ibo-color-success-950 !default;
-$ibo-user-rights--is-success--color: $ibo-color-success-100 !default;
-$ibo-user-rights--is-success--border-color: $ibo-color-success-950 !default;
-
-$ibo-user-rights--is-failure--background-color: $ibo-color-danger-950 !default;
-$ibo-user-rights--is-failure--color: $ibo-color-danger-100 !default;
-$ibo-user-rights--is-failure--border-color: $ibo-color-danger-950 !default;
+$ibo-vendors-ckeditor--ck-content--text-color: $ibo-color-grey-900;
--- a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/scss-variables.scss
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/scss-variables.scss
@@ -1,8 +1,3 @@
-$ibo-color-success-50: common-adjust-lightness($ibo-color-success-100, $ibo-color-base-lightness-100) !default;
-$ibo-color-danger-50: common-adjust-lightness($ibo-color-success-100, $ibo-color-danger-100) !default;
-$ibo-color-information-50: common-adjust-lightness($ibo-color-success-100, $ibo-color-information-100) !default;
-$ibo-color-warning-50: common-adjust-lightness($ibo-color-success-100, $ibo-color-warning-100) !default;
-
 $ibo-navigation-menu--menu-group-title--text-color--is-active: $ibo-color-blue-grey-900;
 $ibo-navigation-menu--menu-group--background-color--is-active: $ibo-color-white-100;
 $ibo-navigation-menu--menu-node--background-color: $ibo-color-grey-100;
@@ -69,12 +64,4 @@ $ibo-button-colors: (        'regular': (                /* Semantics */
 $ibo-panel-colors: ('primary': $ibo-color-primary-800,'secondary': $ibo-color-secondary-800,'neutral': $ibo-color-grey-800,'information': $ibo-color-information-800,'success': $ibo-color-success-800,'failure': $ibo-color-danger-800,'warning': $ibo-color-warning-800,'danger': $ibo-color-danger-800,'grey' : $ibo-color-grey-800,'blue-grey': $ibo-color-blue-grey-800,'blue': $ibo-color-blue-800,'cyan': $ibo-color-cyan-800,'green': $ibo-color-green-800,'orange' : $ibo-color-orange-800,'red': $ibo-color-red-800,'pink': $ibo-color-pink-800,);

 $ibo-welcome-popup--stack-item--border-color: $ibo-color-grey-950;
-$ibo-welcome-popup--stack-item--is-active--border-color: $ibo-color-grey-900;
-
-$ibo-user-rights--is-success--background-color: $ibo-color-success-50 !default;
-$ibo-user-rights--is-success--color: $ibo-color-success-950 !default;
-$ibo-user-rights--is-success--border-color: $ibo-color-success-950 !default;
-
-$ibo-user-rights--is-failure--background-color: $ibo-color-danger-100 !default;
-$ibo-user-rights--is-failure--color: $ibo-color-danger-950 !default;
-$ibo-user-rights--is-failure--border-color: $ibo-color-danger-950 !default;
+$ibo-welcome-popup--stack-item--is-active--border-color: $ibo-color-grey-900;
--- a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/stylesheet.scss
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/scss/stylesheet.scss
@@ -18,10 +18,6 @@ $ibo-toast--icon--font-size: 2rem !default;
 $ibo-toast--icon--top: calc(50% - #{$ibo-toast--icon--font-size} / 2) !default;
 $ibo-toast--icon--left: $ibo-spacing-400 !default;

-$ibo-user-rights--icon--margin-right: $ibo-spacing-200 !default;
-$ibo-user-rights--is-success--icon: '\f00c' !default;
-$ibo-user-rights--is-failure--icon: '\f00d' !default;
-

@each $sName, $sIcon in $ibo-alert--icons {
  %ibo-alert-#{$sName}, .ibo-alert.ibo-is-#{$sName} {
@@ -150,17 +146,4 @@ $ibo-user-rights--is-failure--icon: '\f00d' !default;

 .ibo-welcome-popup--stack-item.ibo-is-active {
  border-width: 2px;
-}
-
-.ibo-user-rights {
-  &.ibo-is-success::before {
-    content: $ibo-user-rights--is-success--icon;
-    @extend %fa-solid-base;
-    margin-right: $ibo-user-rights--icon--margin-right;
-  }
-  &.ibo-is-failure::before {
-    content: $ibo-user-rights--is-failure--icon;
-    @extend %fa-solid-base;
-    margin-right: $ibo-user-rights--icon--margin-right;
-  }
 }
--- a/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/scss/scss-variables.scss
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/scss/scss-variables.scss
@@ -1,71 +1,71 @@
-$ibo-color-primary-100: $ibo-color-blue-100 !default;
-$ibo-color-primary-200: $ibo-color-blue-200 !default;
-$ibo-color-primary-300: $ibo-color-blue-300 !default;
-$ibo-color-primary-400: $ibo-color-blue-400 !default;
-$ibo-color-primary-500: $ibo-color-blue-500 !default;
-$ibo-color-primary-600: $ibo-color-blue-600 !default;
-$ibo-color-primary-700: $ibo-color-blue-700 !default;
-$ibo-color-primary-800: $ibo-color-blue-800 !default;
-$ibo-color-primary-900: $ibo-color-blue-900 !default;
-$ibo-color-primary-950: $ibo-color-blue-950 !default;
+$ibo-color-primary-100: $ibo-color-blue-100;
+$ibo-color-primary-200: $ibo-color-blue-200;
+$ibo-color-primary-300: $ibo-color-blue-300;
+$ibo-color-primary-400: $ibo-color-blue-400;
+$ibo-color-primary-500: $ibo-color-blue-500;
+$ibo-color-primary-600: $ibo-color-blue-600;
+$ibo-color-primary-700: $ibo-color-blue-700;
+$ibo-color-primary-800: $ibo-color-blue-800;
+$ibo-color-primary-900: $ibo-color-blue-900;
+$ibo-color-primary-950: $ibo-color-blue-950;


-$ibo-color-danger-100: $ibo-color-orange-100 !default;
-$ibo-color-danger-200: $ibo-color-orange-200 !default;
-$ibo-color-danger-300: $ibo-color-orange-300 !default;
-$ibo-color-danger-400: $ibo-color-orange-400 !default;
-$ibo-color-danger-500: $ibo-color-orange-500 !default;
-$ibo-color-danger-600: $ibo-color-orange-600 !default;
-$ibo-color-danger-700: $ibo-color-orange-700 !default;
-$ibo-color-danger-800: $ibo-color-orange-800 !default;
-$ibo-color-danger-900: $ibo-color-orange-900 !default;
-$ibo-color-danger-950: $ibo-color-orange-950 !default;
+$ibo-color-danger-100: $ibo-color-orange-100;
+$ibo-color-danger-200: $ibo-color-orange-200;
+$ibo-color-danger-300: $ibo-color-orange-300;
+$ibo-color-danger-400: $ibo-color-orange-400;
+$ibo-color-danger-500: $ibo-color-orange-500;
+$ibo-color-danger-600: $ibo-color-orange-600;
+$ibo-color-danger-700: $ibo-color-orange-700;
+$ibo-color-danger-800: $ibo-color-orange-800;
+$ibo-color-danger-900: $ibo-color-orange-900;
+$ibo-color-danger-950: $ibo-color-orange-950;


-$ibo-color-yellow-100: #fefce8 !default;
-$ibo-color-yellow-200: #fef9c3 !default;
-$ibo-color-yellow-300: #fef08a !default;
-$ibo-color-yellow-400: #fde047 !default;
-$ibo-color-yellow-500: #facc15 !default;
-$ibo-color-yellow-600: #eab308 !default;
-$ibo-color-yellow-700: #ca8a04 !default;
-$ibo-color-yellow-800: #a16207 !default;
-$ibo-color-yellow-900: #854d0e !default;
-$ibo-color-yellow-950: #713f12 !default;
+$ibo-color-yellow-100: #fefce8;
+$ibo-color-yellow-200: #fef9c3;
+$ibo-color-yellow-300: #fef08a;
+$ibo-color-yellow-400: #fde047;
+$ibo-color-yellow-500: #facc15;
+$ibo-color-yellow-600: #eab308;
+$ibo-color-yellow-700: #ca8a04;
+$ibo-color-yellow-800: #a16207;
+$ibo-color-yellow-900: #854d0e;
+$ibo-color-yellow-950: #713f12;

-$ibo-color-warning-100: $ibo-color-yellow-100 !default;
-$ibo-color-warning-200: $ibo-color-yellow-200 !default;
-$ibo-color-warning-300: $ibo-color-yellow-300 !default;
-$ibo-color-warning-400: $ibo-color-yellow-400 !default;
-$ibo-color-warning-500: $ibo-color-yellow-500 !default;
-$ibo-color-warning-600: $ibo-color-yellow-600 !default;
-$ibo-color-warning-700: $ibo-color-yellow-700 !default;
-$ibo-color-warning-800: $ibo-color-yellow-800 !default;
-$ibo-color-warning-900: $ibo-color-yellow-900 !default;
-$ibo-color-warning-950: $ibo-color-yellow-950 !default;
+$ibo-color-warning-100: $ibo-color-yellow-100;
+$ibo-color-warning-200: $ibo-color-yellow-200;
+$ibo-color-warning-300: $ibo-color-yellow-300;
+$ibo-color-warning-400: $ibo-color-yellow-400;
+$ibo-color-warning-500: $ibo-color-yellow-500;
+$ibo-color-warning-600: $ibo-color-yellow-600;
+$ibo-color-warning-700: $ibo-color-yellow-700;
+$ibo-color-warning-800: $ibo-color-yellow-800;
+$ibo-color-warning-900: $ibo-color-yellow-900;
+$ibo-color-warning-950: $ibo-color-yellow-950;


-$ibo-color-success-100: $ibo-color-blue-100 !default;
-$ibo-color-success-200: $ibo-color-blue-200 !default;
-$ibo-color-success-300: $ibo-color-blue-300 !default;
-$ibo-color-success-400: $ibo-color-blue-400 !default;
-$ibo-color-success-500: $ibo-color-blue-500 !default;
-$ibo-color-success-600: $ibo-color-blue-600 !default;
-$ibo-color-success-700: $ibo-color-blue-700 !default;
-$ibo-color-success-800: $ibo-color-blue-800 !default;
-$ibo-color-success-900: $ibo-color-blue-900 !default;
-$ibo-color-success-950: $ibo-color-blue-950 !default;
+$ibo-color-success-100: $ibo-color-blue-100;
+$ibo-color-success-200: $ibo-color-blue-200;
+$ibo-color-success-300: $ibo-color-blue-300;
+$ibo-color-success-400: $ibo-color-blue-400;
+$ibo-color-success-500: $ibo-color-blue-500;
+$ibo-color-success-600: $ibo-color-blue-600;
+$ibo-color-success-700: $ibo-color-blue-700;
+$ibo-color-success-800: $ibo-color-blue-800;
+$ibo-color-success-900: $ibo-color-blue-900;
+$ibo-color-success-950: $ibo-color-blue-950;

-$ibo-color-information-100: #f1f5f9 !default;
-$ibo-color-information-200: #e2e8f0 !default;
-$ibo-color-information-300: #cbd5e1 !default;
-$ibo-color-information-400: #94a3b8 !default;
-$ibo-color-information-500: #64748b !default;
-$ibo-color-information-600: #475569 !default;
-$ibo-color-information-700: #334155 !default;
-$ibo-color-information-800: #1e293b !default;
-$ibo-color-information-900: #0f172a !default;
-$ibo-color-information-950: #020617 !default;
+$ibo-color-information-100: #f1f5f9;
+$ibo-color-information-200: #e2e8f0;
+$ibo-color-information-300: #cbd5e1;
+$ibo-color-information-400: #94a3b8;
+$ibo-color-information-500: #64748b;
+$ibo-color-information-600: #475569;
+$ibo-color-information-700: #334155;
+$ibo-color-information-800: #1e293b;
+$ibo-color-information-900: #0f172a;
+$ibo-color-information-950: #020617;


 $ibo-lifecycle-new-state-primary-color: $ibo-color-information-600;
--- a/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/scss/stylesheet.scss
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/scss/stylesheet.scss
@@ -15,10 +15,6 @@ $ibo-toast--icon--font-size: 2rem !default;
 $ibo-toast--icon--top: calc(50% - #{$ibo-toast--icon--font-size} / 2) !default;
 $ibo-toast--icon--left: $ibo-spacing-400 !default;

-$ibo-user-rights--icon--margin-right: $ibo-spacing-200 !default;
-$ibo-user-rights--is-success--icon: '\f00c' !default;
-$ibo-user-rights--is-failure--icon: '\f00d' !default;
-

@each $sName, $sIcon in $ibo-alert--icons {
  %ibo-alert-#{$sName}, .ibo-alert.ibo-is-#{$sName} {
@@ -75,16 +71,3 @@ $ibo-user-rights--is-failure--icon: '\f00d' !default;
  }
 }

-.ibo-user-rights {
-  &.ibo-is-success::before {
-    content: $ibo-user-rights--is-success--icon;
-    @extend %fa-solid-base;
-    margin-right: $ibo-user-rights--icon--margin-right;
-  }
-  &.ibo-is-failure::before {
-    content: $ibo-user-rights--is-failure--icon;
-    @extend %fa-solid-base;
-    margin-right: $ibo-user-rights--icon--margin-right;
-  }
-}
-
--- a/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/scss/scss-variables.scss
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/scss/scss-variables.scss
@@ -1,35 +1,35 @@
-$ibo-color-yellow-100: #fefce8 !default;
-$ibo-color-yellow-200: #fef9c3 !default;
-$ibo-color-yellow-300: #fef08a !default;
-$ibo-color-yellow-400: #fde047 !default;
-$ibo-color-yellow-500: #facc15 !default;
-$ibo-color-yellow-600: #eab308 !default;
-$ibo-color-yellow-700: #ca8a04 !default;
-$ibo-color-yellow-800: #a16207 !default;
-$ibo-color-yellow-900: #854d0e !default;
-$ibo-color-yellow-950: #713f12 !default;
+$ibo-color-yellow-100: #fefce8;
+$ibo-color-yellow-200: #fef9c3;
+$ibo-color-yellow-300: #fef08a;
+$ibo-color-yellow-400: #fde047;
+$ibo-color-yellow-500: #facc15;
+$ibo-color-yellow-600: #eab308;
+$ibo-color-yellow-700: #ca8a04;
+$ibo-color-yellow-800: #a16207;
+$ibo-color-yellow-900: #854d0e;
+$ibo-color-yellow-950: #713f12;

-$ibo-color-success-100: $ibo-color-blue-100 !default;
-$ibo-color-success-200: $ibo-color-blue-200 !default;
-$ibo-color-success-300: $ibo-color-blue-300 !default;
-$ibo-color-success-400: $ibo-color-blue-400 !default;
-$ibo-color-success-500: $ibo-color-blue-500 !default;
-$ibo-color-success-600: $ibo-color-blue-600 !default;
-$ibo-color-success-700: $ibo-color-blue-700 !default;
-$ibo-color-success-800: $ibo-color-blue-800 !default;
-$ibo-color-success-900: $ibo-color-blue-900 !default;
-$ibo-color-success-950: $ibo-color-blue-950 !default;
+$ibo-color-success-100: $ibo-color-blue-100;
+$ibo-color-success-200: $ibo-color-blue-200;
+$ibo-color-success-300: $ibo-color-blue-300;
+$ibo-color-success-400: $ibo-color-blue-400;
+$ibo-color-success-500: $ibo-color-blue-500;
+$ibo-color-success-600: $ibo-color-blue-600;
+$ibo-color-success-700: $ibo-color-blue-700;
+$ibo-color-success-800: $ibo-color-blue-800;
+$ibo-color-success-900: $ibo-color-blue-900;
+$ibo-color-success-950: $ibo-color-blue-950;

-$ibo-color-information-100: #f1f5f9 !default;
-$ibo-color-information-200: #e2e8f0 !default;
-$ibo-color-information-300: #cbd5e1 !default;
-$ibo-color-information-400: #94a3b8 !default;
-$ibo-color-information-500: #64748b !default;
-$ibo-color-information-600: #475569 !default;
-$ibo-color-information-700: #334155 !default;
-$ibo-color-information-800: #1e293b !default;
-$ibo-color-information-900: #0f172a !default;
-$ibo-color-information-950: #020617 !default;
+$ibo-color-information-100: #f1f5f9;
+$ibo-color-information-200: #e2e8f0;
+$ibo-color-information-300: #cbd5e1;
+$ibo-color-information-400: #94a3b8;
+$ibo-color-information-500: #64748b;
+$ibo-color-information-600: #475569;
+$ibo-color-information-700: #334155;
+$ibo-color-information-800: #1e293b;
+$ibo-color-information-900: #0f172a;
+$ibo-color-information-950: #020617;


 $ibo-lifecycle-new-state-primary-color: $ibo-color-information-600;
--- a/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/scss/stylesheet.scss
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/scss/stylesheet.scss
@@ -15,10 +15,6 @@ $ibo-toast--icon--font-size: 2rem !default;
 $ibo-toast--icon--top: calc(50% - #{$ibo-toast--icon--font-size} / 2) !default;
 $ibo-toast--icon--left: $ibo-spacing-400 !default;

-$ibo-user-rights--icon--margin-right: $ibo-spacing-200 !default;
-$ibo-user-rights--is-success--icon: '\f00c' !default;
-$ibo-user-rights--is-failure--icon: '\f00d' !default;
-

@each $sName, $sIcon in $ibo-alert--icons {
  %ibo-alert-#{$sName}, .ibo-alert.ibo-is-#{$sName} {
@@ -75,15 +71,3 @@ $ibo-user-rights--is-failure--icon: '\f00d' !default;
  }
 }

-.ibo-user-rights {
-  &.ibo-is-success::before {
-    content: $ibo-user-rights--is-success--icon;
-    @extend %fa-solid-base;
-    margin-right: $ibo-user-rights--icon--margin-right;
-  }
-  &.ibo-is-failure::before {
-    content: $ibo-user-rights--is-failure--icon;
-    @extend %fa-solid-base;
-    margin-right: $ibo-user-rights--icon--margin-right;
-  }
-}
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pt_br.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/pt_br.dict.itop-bridge-cmdb-ticket.php
@@ -11,7 +11,7 @@
 *
 */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToTicket' => 'Relação entre IC / Solicitação',
+	'Class:lnkFunctionalCIToTicket' => 'Link IC / Solicitação',
 	'Class:lnkFunctionalCIToTicket+' => '',
 	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => 'Solicitação',
@@ -37,5 +37,5 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:FunctionalCI/Attribute:tickets_list' => 'Solicitações',
-	'Class:FunctionalCI/Attribute:tickets_list+' => 'Todas as Solicitações associadas à este Item de Configuração (IC)',
+	'Class:FunctionalCI/Attribute:tickets_list+' => 'Todos as solicitações para este item de configuração',
 ));
--- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
+++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml
@@ -193,7 +193,8 @@

 		$sTicketListAttCode = 'tickets_list';

-		if (MetaModel::HasChildrenClasses('Ticket') && MetaModel::IsValidAttCode(get_class($this), $sTicketListAttCode))	{
+		if (MetaModel::IsValidAttCode(get_class($this), $sTicketListAttCode))
+		{
 			// Display one list per leaf class (the only way to display the status as of now)

 			$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sTicketListAttCode);
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/pt_br.dict.itop-config-mgmt.php
@@ -18,8 +18,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Relation:depends on/Description' => 'Elementos estes, que dependem deste elemento',
 	'Relation:depends on/DownStream' => 'Depende de...',
 	'Relation:depends on/UpStream' => 'Impactos...',
-	'Relation:impacts/LoadData' => 'Carregando dados',
-	'Relation:impacts/NoFilteredData' => 'Por favor, selecione os objetos na tag de visualização Gráfica',
+	'Relation:impacts/LoadData' => 'Load data~~',
+	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
 	'Relation:impacts/FilteredData' => 'Filtered data~~',
 ));

@@ -66,7 +66,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToFunctionalCI' => 'Relação entre Contato / IC',
+	'Class:lnkContactToFunctionalCI' => 'Link Contato / IC',
 	'Class:lnkContactToFunctionalCI+' => '',
 	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'ICs',
@@ -105,16 +105,16 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:FunctionalCI/Attribute:move2production' => 'Data de migração para produção',
 	'Class:FunctionalCI/Attribute:move2production+' => '',
 	'Class:FunctionalCI/Attribute:contacts_list' => 'Contatos',
-	'Class:FunctionalCI/Attribute:contacts_list+' => 'Todos os Contatos associados à este Item de Configuração (IC)',
+	'Class:FunctionalCI/Attribute:contacts_list+' => 'Todos os contatos associados a este item de configuração',
 	'Class:FunctionalCI/Attribute:documents_list' => 'Documentos',
-	'Class:FunctionalCI/Attribute:documents_list+' => 'Todos os Documentos associados à este Item de Configuração (IC)',
+	'Class:FunctionalCI/Attribute:documents_list+' => 'Todos os documentos associados a este item de configuração',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => 'Soluções de aplicação',
-	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Todas as Soluções de Aplicação dependentes deste Item de Configuração (IC)',
+	'Class:FunctionalCI/Attribute:applicationsolution_list+' => 'Todas as soluções de aplicação dependentes desse item de configuração',
 	'Class:FunctionalCI/Attribute:softwares_list' => 'Softwares',
-	'Class:FunctionalCI/Attribute:softwares_list+' => 'Todos os Softwares instalados neste Item de Configuração (IC)',
+	'Class:FunctionalCI/Attribute:softwares_list+' => 'Todos os softwares instalados neste item de configuração',
 	'Class:FunctionalCI/Attribute:finalclass' => 'Tipo de IC',
 	'Class:FunctionalCI/Attribute:finalclass+' => '',
-	'Class:FunctionalCI/Tab:OpenedTickets' => 'Solicitações ativas',
+	'Class:FunctionalCI/Tab:OpenedTickets' => 'Solicitações Ativas',
 	'Class:FunctionalCI/Tab:OpenedTickets+' => 'Active Tickets which are impacting this functional CI~~',
 ));

@@ -123,7 +123,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:PhysicalDevice' => 'Dispositivo físico',
+	'Class:PhysicalDevice' => 'Dispositivo Físico',
 	'Class:PhysicalDevice+' => 'Lista de Dispositivos Físicos',
 	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PhysicalDevice/Attribute:serialnumber' => 'Número serial',
@@ -169,9 +169,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Rack/Attribute:nb_u' => 'Unidades',
 	'Class:Rack/Attribute:nb_u+' => '',
 	'Class:Rack/Attribute:device_list' => 'Dispositivos',
-	'Class:Rack/Attribute:device_list+' => 'Todos os Dispositivos físicos empilhados neste Rack',
+	'Class:Rack/Attribute:device_list+' => 'Todos os dispositivos físicos empilhados neste rack',
 	'Class:Rack/Attribute:enclosure_list' => 'Gavetas',
-	'Class:Rack/Attribute:enclosure_list+' => 'Todas as Gavetas neste Rack',
+	'Class:Rack/Attribute:enclosure_list+' => 'Todas as gavetas neste rack',
 ));

 //
@@ -234,9 +234,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ConnectableCI+' => 'Físico',
 	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => 'Dispositivo de rede',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Todos os Dispositivos de rede conectados neste dispositivo',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => 'Todos os dispositivos de rede conectados neste dispositivo',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => 'Interface de rede',
-	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'Todas as Interfaces de rede presentes neste dispositivo',
+	'Class:ConnectableCI/Attribute:physicalinterface_list+' => 'Todas as interfaces de rede',
 ));

 //
@@ -268,9 +268,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:DatacenterDevice/Attribute:powerB_name' => 'Nome da fonte energia B',
 	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
 	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => 'Portas FC',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Todas as portas Fiber Channel (FC) para este Dispositivo de datacenter',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => 'Todas as portas Fiber Channel para esse dispositivo',
 	'Class:DatacenterDevice/Attribute:san_list' => 'SANs',
-	'Class:DatacenterDevice/Attribute:san_list+' => 'Todos os Switches SAN associados à este Dispositivo de datacenter',
+	'Class:DatacenterDevice/Attribute:san_list+' => 'Todos os switches SAN associados a este dispositivo',
 	'Class:DatacenterDevice/Attribute:redundancy' => 'Redundância',
 	'Class:DatacenterDevice/Attribute:redundancy/count' => 'O dispositivo está ativo se pelo menos uma conexão de energia (A ou B) estiver ativa',
 	'Class:DatacenterDevice/Attribute:redundancy/disabled' => 'O dispositivo está ativo se todas as conexões de energia estiverem ativadas',
@@ -285,15 +285,15 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:NetworkDevice' => 'Dispositivo de Rede',
 	'Class:NetworkDevice+' => '',
 	'Class:NetworkDevice/ComplementaryName' => '%1$s - %2$s~~',
-	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Tipo de dispositivo de rede',
+	'Class:NetworkDevice/Attribute:networkdevicetype_id' => 'Tipo de rede',
 	'Class:NetworkDevice/Attribute:networkdevicetype_id+' => '',
-	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Nome do tipo de dispositivo de rede',
+	'Class:NetworkDevice/Attribute:networkdevicetype_name' => 'Nome do tipo de rede',
 	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
-	'Class:NetworkDevice/Attribute:connectablecis_list' => 'ICs',
-	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Todos os Itens de configuração (ICs) associados à este Dispositivo de rede',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'Versão do SO',
+	'Class:NetworkDevice/Attribute:connectablecis_list' => 'Dispositivos',
+	'Class:NetworkDevice/Attribute:connectablecis_list+' => 'Todos os dispositivos associados a este dispositivo de rede',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'Versão do IOS',
 	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'Nome da versão do SO',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'Nome da versão do IOS',
 	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
 	'Class:NetworkDevice/Attribute:ram' => 'RAM',
 	'Class:NetworkDevice/Attribute:ram+' => '',
@@ -324,7 +324,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Server/Attribute:ram' => 'RAM',
 	'Class:Server/Attribute:ram+' => '',
 	'Class:Server/Attribute:logicalvolumes_list' => 'Volumes lógicos',
-	'Class:Server/Attribute:logicalvolumes_list+' => 'Todos os Volumes lógicos associados à este Servidor',
+	'Class:Server/Attribute:logicalvolumes_list+' => 'Todos os volumoes lógicos associados a este servidor',
 ));

 //
@@ -336,7 +336,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:StorageSystem+' => '',
 	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => 'Volumes lógicos',
-	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Todos os Volumes lógicos neste Sistema de storage',
+	'Class:StorageSystem/Attribute:logicalvolume_list+' => 'Todos os volumes lógicos neste sistema storage',
 ));

 //
@@ -348,7 +348,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SANSwitch+' => '',
 	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => 'Dispositivos',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Todos os Dispositivos associados à este Switch SAN',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => 'Todos os dispositivos associados a este switch SAN',
 ));

 //
@@ -360,7 +360,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:TapeLibrary+' => '',
 	'Class:TapeLibrary/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:TapeLibrary/Attribute:tapes_list' => 'Fitas',
-	'Class:TapeLibrary/Attribute:tapes_list+' => 'Todas as Fitas associadas à esta Biblioteca de fitas',
+	'Class:TapeLibrary/Attribute:tapes_list+' => 'Todas as fitas associadas à esta biblioteca de fitas',
 ));

 //
@@ -372,7 +372,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:NAS+' => '',
 	'Class:NAS/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:NAS/Attribute:nasfilesystem_list' => 'Sistemas de arquivos',
-	'Class:NAS/Attribute:nasfilesystem_list+' => 'Todos os Sistemas de arquivos para este NAS',
+	'Class:NAS/Attribute:nasfilesystem_list+' => 'Todos os sistemas de arquivos para esse NAS',
 ));

 //
@@ -432,7 +432,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:PowerSource+' => '',
 	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDUs',
-	'Class:PowerSource/Attribute:pdus_list+' => 'Todos os PDUs utilizando esta Fonte de energia',
+	'Class:PowerSource/Attribute:pdus_list+' => 'Todos os PDUs utilizando essa fonte de energia',
 ));

 //
@@ -478,7 +478,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Enclosure/Attribute:nb_u' => 'Unidades',
 	'Class:Enclosure/Attribute:nb_u+' => '',
 	'Class:Enclosure/Attribute:device_list' => 'Dispositivos',
-	'Class:Enclosure/Attribute:device_list+' => 'Todos os Dispositivos presentes nesta Gaveta',
+	'Class:Enclosure/Attribute:device_list+' => 'Todos os dispositivos para essa gaveta',
 ));

 //
@@ -489,9 +489,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ApplicationSolution' => 'Solução de Aplicação',
 	'Class:ApplicationSolution+' => '',
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => 'ICs',
-	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Todos os Itens de configuração (IC) que compõem esta Solução de aplicação',
+	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Todos os itens de configuração que compõem essa solução de aplicação',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Processos de negócio',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Todos os Processos de negócio dependentes desta Solução de aplicação',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Todos os processos do negócio dependente para essa solução de aplicação',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Ativo',
@@ -499,9 +499,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ApplicationSolution/Attribute:status/Value:inactive' => 'Inativo',
 	'Class:ApplicationSolution/Attribute:status/Value:inactive+' => '',
 	'Class:ApplicationSolution/Attribute:redundancy' => 'Análise de impacto: configuração de redundância',
-	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'A Solução de aplicação está funcionando se todos os Itens de configuração (ICs) estiverem funcionando',
-	'Class:ApplicationSolution/Attribute:redundancy/count' => 'A Solução de aplicação está funcionando se no mínimo %1$s Item(ns) de configuração (IC(s)) estiver(em) funcionando',
-	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'A Solução de aplicação está funcionando se no mínimo %1$s %% dos Itens de configuração (ICs) estiverem funcionando',
+	'Class:ApplicationSolution/Attribute:redundancy/disabled' => 'A solução está funcionando se todos os ICs estiverem funcionando',
+	'Class:ApplicationSolution/Attribute:redundancy/count' => 'A solução está funcionando se no mínimo %1$s IC(s) estiver(em) funcionando',
+	'Class:ApplicationSolution/Attribute:redundancy/percent' => 'A solução está funcionando se no mínimo %1$s %% dos ICs estiverem funcionando',
 ));

 //
@@ -568,8 +568,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:DBServer' => 'Servidor de DB',
 	'Class:DBServer+' => '',
-	'Class:DBServer/Attribute:dbschema_list' => 'Esquemas de BD',
-	'Class:DBServer/Attribute:dbschema_list+' => 'Todos os Esquemas de BD para este Servidor de Banco de Dados (BD)',
+	'Class:DBServer/Attribute:dbschema_list' => 'Esquemas de DB',
+	'Class:DBServer/Attribute:dbschema_list+' => 'Todos os esquemas para esse servidor de banco de dados',
 ));

 //
@@ -580,7 +580,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:WebServer' => 'Servidor Web',
 	'Class:WebServer+' => '',
 	'Class:WebServer/Attribute:webapp_list' => 'Aplicações Web',
-	'Class:WebServer/Attribute:webapp_list+' => 'Todas as Aplicações Web disponíveis para este Servidor Web',
+	'Class:WebServer/Attribute:webapp_list+' => 'Todas as aplicações web disponíveis para esse servidor web',
 ));

 //
@@ -620,7 +620,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DatabaseSchema' => 'Esquema de Banco de Dados (BD)',
+	'Class:DatabaseSchema' => 'Esquema de DB',
 	'Class:DatabaseSchema+' => '',
 	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'Servidor de DB',
@@ -664,7 +664,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:VirtualDevice/Attribute:status/Value:stock' => 'Suporte',
 	'Class:VirtualDevice/Attribute:status/Value:stock+' => 'Suporte',
 	'Class:VirtualDevice/Attribute:logicalvolumes_list' => 'Volume lógico',
-	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'Todos os Volumes lógicos associados à este Dispositivo virtual',
+	'Class:VirtualDevice/Attribute:logicalvolumes_list+' => 'Todos os volumes lógicos associados a este dispositivo',
 ));

 //
@@ -674,8 +674,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:VirtualHost' => 'Host Virtual',
 	'Class:VirtualHost+' => '',
-	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Máquinas virtuais (VMs)',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Todas as Máquinas virtuais (VMs) hospedadas neste Host virtual',
+	'Class:VirtualHost/Attribute:virtualmachine_list' => 'Máquinas Virtuais',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => 'Todas as máquinas virtuais hospedadas neste Host',
 ));

 //
@@ -703,11 +703,11 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Farm' => 'Cluster/HA',
 	'Class:Farm+' => '',
 	'Class:Farm/Attribute:hypervisor_list' => 'Hypervisors',
-	'Class:Farm/Attribute:hypervisor_list+' => 'Todos os Hypervisors que compõem este Cluster/HA',
+	'Class:Farm/Attribute:hypervisor_list+' => 'Todos os hypervisors que compõem esse Cluster/HA',
 	'Class:Farm/Attribute:redundancy' => 'Alta disponibilidade',
-	'Class:Farm/Attribute:redundancy/disabled' => 'O farm está ativo se todos os hypervisors estiverem disponíveis',
-	'Class:Farm/Attribute:redundancy/count' => 'O farm está ativo se pelo menos %1$s hypervisor(s) estiver(em) disponíveis',
-	'Class:Farm/Attribute:redundancy/percent' => 'O farm está ativo se pelo menos %1$s %% dos hypervisors estiverem disponíveis',
+	'Class:Farm/Attribute:redundancy/disabled' => 'O farm está ativo se todos os hipervisores estiverem em alta',
+	'Class:Farm/Attribute:redundancy/count' => 'O farm está ativo se pelo menos %1$s hypervisor(es) estiver (ão) para cima',
+	'Class:Farm/Attribute:redundancy/percent' => 'O farm está ativo se pelo menos %1$s %% dos hipervisores estiverem em alta',
 ));

 //
@@ -740,8 +740,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:VirtualMachine/Attribute:ram+' => '',
 	'Class:VirtualMachine/Attribute:managementip' => 'IP',
 	'Class:VirtualMachine/Attribute:managementip+' => '',
-	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Interfaces de rede',
-	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'Todas as interfaces de rede',
+	'Class:VirtualMachine/Attribute:logicalinterface_list' => 'Placas de rede',
+	'Class:VirtualMachine/Attribute:logicalinterface_list+' => 'Todas as placas de rede',
 ));

 //
@@ -749,7 +749,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:LogicalVolume' => 'Volume Lógico',
+	'Class:LogicalVolume' => 'Volume lógico',
 	'Class:LogicalVolume+' => '',
 	'Class:LogicalVolume/Attribute:name' => 'Nome',
 	'Class:LogicalVolume/Attribute:name+' => '',
@@ -757,7 +757,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:LogicalVolume/Attribute:lun_id+' => '',
 	'Class:LogicalVolume/Attribute:description' => 'Descrição',
 	'Class:LogicalVolume/Attribute:description+' => '',
-	'Class:LogicalVolume/Attribute:raid_level' => 'Nível de RAID',
+	'Class:LogicalVolume/Attribute:raid_level' => 'Nível RAID',
 	'Class:LogicalVolume/Attribute:raid_level+' => '',
 	'Class:LogicalVolume/Attribute:size' => 'Tamanho',
 	'Class:LogicalVolume/Attribute:size+' => '',
@@ -766,9 +766,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:LogicalVolume/Attribute:storagesystem_name' => 'Nome do sistema de arquivos',
 	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
 	'Class:LogicalVolume/Attribute:servers_list' => 'Servidores',
-	'Class:LogicalVolume/Attribute:servers_list+' => 'Todos os Servidores usando este Volume lógico',
+	'Class:LogicalVolume/Attribute:servers_list+' => 'Todos os servidores usando esse volume',
 	'Class:LogicalVolume/Attribute:virtualdevices_list' => 'Dispositivos virtuais',
-	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Todos os Dispositivos virtuais usando este Volume lógico',
+	'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'Todos os dispositivos virtuais usando esse volume',
 ));

 //
@@ -776,7 +776,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkServerToVolume' => 'Relação entre Servidor / Volume',
+	'Class:lnkServerToVolume' => 'Link Servidor / Volume',
 	'Class:lnkServerToVolume+' => '',
 	'Class:lnkServerToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkServerToVolume/Attribute:volume_id' => 'Volume',
@@ -796,7 +796,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkVirtualDeviceToVolume' => 'Relação entre Dispositivo virtual / Volume',
+	'Class:lnkVirtualDeviceToVolume' => 'Link Dispositivo Virtual / Volume',
 	'Class:lnkVirtualDeviceToVolume+' => '',
 	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s~~',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => 'Volume',
@@ -816,7 +816,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSanToDatacenterDevice' => 'Relação entre Switch SAN / Dispositivo de datacenter',
+	'Class:lnkSanToDatacenterDevice' => 'Link SAN / Dispositivo Datacenter',
 	'Class:lnkSanToDatacenterDevice+' => '',
 	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'Switch SAN',
@@ -827,9 +827,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => 'Nome do dispositivo',
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'FC do SAN',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'FC SAN',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'FC do dispositivo',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => 'Dispositivo de FC',
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
 ));

@@ -888,7 +888,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Software/Attribute:version' => 'Versão',
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Documentos',
-	'Class:Software/Attribute:documents_list+' => 'Todos os Documentos associados a este Software',
+	'Class:Software/Attribute:documents_list+' => 'Todos os documentos associados a este software',
 	'Class:Software/Attribute:type' => 'Tipo',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Servidor de DB',
@@ -902,11 +902,11 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Software/Attribute:type/Value:WebServer' => 'Servidor Web',
 	'Class:Software/Attribute:type/Value:WebServer+' => 'Servidor Web',
 	'Class:Software/Attribute:softwareinstance_list' => 'Instâncias de Software',
-	'Class:Software/Attribute:softwareinstance_list+' => 'Todas as Instâncias de software para este Software',
+	'Class:Software/Attribute:softwareinstance_list+' => 'Todas as instâncias software para esse software',
 	'Class:Software/Attribute:softwarepatch_list' => 'Atualizações de software',
-	'Class:Software/Attribute:softwarepatch_list+' => 'Todas as Atualizações para este Software',
-	'Class:Software/Attribute:softwarelicence_list' => 'Licenças de software',
-	'Class:Software/Attribute:softwarelicence_list+' => 'Todas as Licenças de software para este Software',
+	'Class:Software/Attribute:softwarepatch_list+' => 'Todas as atualizações para esse software',
+	'Class:Software/Attribute:softwarelicence_list' => 'Licenças de Software',
+	'Class:Software/Attribute:softwarelicence_list+' => 'Todas as licenças software para esse software',
 ));

 //
@@ -919,7 +919,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Patch/Attribute:name' => 'Nome',
 	'Class:Patch/Attribute:name+' => '',
 	'Class:Patch/Attribute:documents_list' => 'Documentos',
-	'Class:Patch/Attribute:documents_list+' => 'Todos os Documentos associados à esta Atualização',
+	'Class:Patch/Attribute:documents_list+' => 'Todos os documentos associados à esta atualização',
 	'Class:Patch/Attribute:description' => 'Descrição',
 	'Class:Patch/Attribute:description+' => '',
 	'Class:Patch/Attribute:finalclass' => 'Tipo',
@@ -934,7 +934,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:OSPatch' => 'Atualização de SO',
 	'Class:OSPatch+' => '',
 	'Class:OSPatch/Attribute:functionalcis_list' => 'Dispositivos',
-	'Class:OSPatch/Attribute:functionalcis_list+' => 'Todos os sistemas onde essa Atualização de SO está instalada',
+	'Class:OSPatch/Attribute:functionalcis_list+' => 'Todos os sistemas onde essa atualização está instalada',
 	'Class:OSPatch/Attribute:osversion_id' => 'Versão do SO',
 	'Class:OSPatch/Attribute:osversion_id+' => '',
 	'Class:OSPatch/Attribute:osversion_name' => 'Nome da versão do SO',
@@ -952,8 +952,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SoftwarePatch/Attribute:software_id+' => '',
 	'Class:SoftwarePatch/Attribute:software_name' => 'Nome do software',
 	'Class:SoftwarePatch/Attribute:software_name+' => '',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Instâncias de software',
-	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Todos os sistemas onde essa Atualização de software está instalada',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list' => 'Instâncias do Software',
+	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'Todos os sistemas onde essa atualização de software está instalada',
 ));

 //
@@ -966,7 +966,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Licence/Attribute:name' => 'Nome',
 	'Class:Licence/Attribute:name+' => '',
 	'Class:Licence/Attribute:documents_list' => 'Documentos',
-	'Class:Licence/Attribute:documents_list+' => 'Todos os Documentos associados à esta Licença',
+	'Class:Licence/Attribute:documents_list+' => 'Todos os documentos associados à esta licença',
 	'Class:Licence/Attribute:org_id' => 'Organização',
 	'Class:Licence/Attribute:org_id+' => '',
 	'Class:Licence/Attribute:organization_name' => 'Nome da organização',
@@ -1003,10 +1003,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osversion_name' => 'Nome da versão do SO',
 	'Class:OSLicence/Attribute:osversion_name+' => '',
-	'Class:OSLicence/Attribute:virtualmachines_list' => 'Máquinas virtuais (VMs)',
-	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Todas as Máquinas virtuais (VMs) onde essa Licença é utilizada',
-	'Class:OSLicence/Attribute:servers_list' => 'Servidores',
-	'Class:OSLicence/Attribute:servers_list+' => 'Todos os Servidores onde essa Licença é utilizada',
+	'Class:OSLicence/Attribute:virtualmachines_list' => 'Máquinas virtuais',
+	'Class:OSLicence/Attribute:virtualmachines_list+' => 'Todas as máquinas virtuais onde essa licença é utilizada',
+	'Class:OSLicence/Attribute:servers_list' => 'servidores',
+	'Class:OSLicence/Attribute:servers_list+' => 'Todos os servidores onde essa licença é utilizada',
 ));

 //
@@ -1014,15 +1014,15 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:SoftwareLicence' => 'Licença de Software',
+	'Class:SoftwareLicence' => 'Licença de software',
 	'Class:SoftwareLicence+' => '',
 	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:SoftwareLicence/Attribute:software_id' => 'Software',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
 	'Class:SoftwareLicence/Attribute:software_name' => 'Nome do software',
 	'Class:SoftwareLicence/Attribute:software_name+' => '',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Instâncias de software',
-	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Todos os sistemas onde esta Licença é utilizada',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list' => 'Instâncias do software',
+	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'Todos os sistemas onde essa licença é utilizada',
 ));

 //
@@ -1030,7 +1030,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToLicence' => 'Relação entre Documento / Licença',
+	'Class:lnkDocumentToLicence' => 'Link Documento / Licença',
 	'Class:lnkDocumentToLicence+' => '',
 	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => 'Licença',
@@ -1075,7 +1075,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Brand/Attribute:logo' => 'Logo~~',
 	'Class:Brand/Attribute:logo+' => '~~',
 	'Class:Brand/Attribute:physicaldevices_list' => 'Dispositivos físicos',
-	'Class:Brand/Attribute:physicaldevices_list+' => 'Todos os Dispositivos físicos correspondentes a esse(a) Fabricante',
+	'Class:Brand/Attribute:physicaldevices_list+' => 'Todos os dispositivos físicos correspondentes a esse(a) fabricante',
 	'Class:Brand/UniquenessRule:name+' => 'O nome do(a) fabricante deve ser único',
 	'Class:Brand/UniquenessRule:name' => 'Esse(a) fabricante já existe',
 ));
@@ -1133,7 +1133,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Model/Attribute:type/Value:Phone' => 'Telefone',
 	'Class:Model/Attribute:type/Value:Phone+' => '',
 	'Class:Model/Attribute:physicaldevices_list' => 'Dispositivo físico',
-	'Class:Model/Attribute:physicaldevices_list+' => 'Todos os Dispositivos físicos correspondentes à este Modelo',
+	'Class:Model/Attribute:physicaldevices_list+' => 'Todos os dispositivos físicos correspondentes a este modelo',
 	'Class:Model/UniquenessRule:name_brand+' => 'O nome do modelo deve ser único',
 	'Class:Model/UniquenessRule:name_brand' => 'Este modelo já existe',
 ));
@@ -1145,8 +1145,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:NetworkDeviceType' => 'Tipo de dispositivo de rede',
 	'Class:NetworkDeviceType+' => '',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Dispositivos de rede',
-	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Todos os Dispositivos de rede correspondentes a este Tipo',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Dispositivo de rede',
+	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Todos os dispositivo de rede correspondentes a este tipo',
 ));

 //
@@ -1154,7 +1154,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:IOSVersion' => 'Versão do SO',
+	'Class:IOSVersion' => 'Versão do IOS',
 	'Class:IOSVersion+' => '',
 	'Class:IOSVersion/Attribute:brand_id' => 'Fabricante',
 	'Class:IOSVersion/Attribute:brand_id+' => '',
@@ -1167,7 +1167,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToPatch' => 'Relação entre Documento / Atualização',
+	'Class:lnkDocumentToPatch' => 'Link Documento / Atualização',
 	'Class:lnkDocumentToPatch+' => '',
 	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => 'Atualização',
@@ -1185,7 +1185,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Relação entre Instância de software / Atualização de software',
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => 'Link Instância de Software / Atualização de Software',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Atualização de software',
@@ -1203,7 +1203,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToOSPatch' => 'Relação entre IC / Atualização de SO',
+	'Class:lnkFunctionalCIToOSPatch' => 'Link IC / Atualização de SO',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'Atualização de SO',
@@ -1221,7 +1221,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToSoftware' => 'Relação entre Documento / Software',
+	'Class:lnkDocumentToSoftware' => 'Link Documento / Software',
 	'Class:lnkDocumentToSoftware+' => '',
 	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => 'Software',
@@ -1285,7 +1285,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSubnetToVLAN' => 'Relação entre Sub-rede / VLAN',
+	'Class:lnkSubnetToVLAN' => 'Link Sub-rede / VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
 	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s~~',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => 'Sub-rede',
@@ -1305,7 +1305,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:NetworkInterface' => 'Adaptador de Rede',
+	'Class:NetworkInterface' => 'Placa de Rede',
 	'Class:NetworkInterface+' => '',
 	'Class:NetworkInterface/Attribute:name' => 'Nome',
 	'Class:NetworkInterface/Attribute:name+' => '',
@@ -1355,7 +1355,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkPhysicalInterfaceToVLAN' => 'Relação entre Interface física / VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN' => 'Link Interfaces físicas / VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s~~',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => 'Interface física',
@@ -1410,7 +1410,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkConnectableCIToNetworkDevice' => 'Relação entre Dispositivo conectado / Dispositivo de rede',
+	'Class:lnkConnectableCIToNetworkDevice' => 'Link ConnectableCI / NetworkDevice',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s~~',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => 'Dispositivo de rede',
@@ -1438,7 +1438,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkApplicationSolutionToFunctionalCI' => 'Relação entre Solução de aplicação / IC',
+	'Class:lnkApplicationSolutionToFunctionalCI' => 'Link Solução de Aplicação / IC',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Solução de aplicação',
@@ -1456,7 +1456,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkApplicationSolutionToBusinessProcess' => 'Relação entre Solução de aplicação / Processo de negócio',
+	'Class:lnkApplicationSolutionToBusinessProcess' => 'Link ApplicationSolution / BusinessProcess',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s~~',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => 'Processo de negócio',
@@ -1500,7 +1500,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Group/Attribute:parent_name' => 'Nome',
 	'Class:Group/Attribute:parent_name+' => '',
 	'Class:Group/Attribute:ci_list' => 'ICs relacionados',
-	'Class:Group/Attribute:ci_list+' => 'Todos os Itens de configuração (IC) associados à este Grupo',
+	'Class:Group/Attribute:ci_list+' => 'Todos os itens de configuração associados a este grupo',
 	'Class:Group/Attribute:parent_id_friendlyname' => 'Grupo pai',
 	'Class:Group/Attribute:parent_id_friendlyname+' => '',
 ));
@@ -1510,7 +1510,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkGroupToCI' => 'Relação entre Grupo / IC',
+	'Class:lnkGroupToCI' => 'Link Grupo / IC',
 	'Class:lnkGroupToCI+' => '',
 	'Class:lnkGroupToCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkGroupToCI/Attribute:group_id' => 'Grupo',
@@ -1548,10 +1548,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToFunctionalCI' => 'Relação entre Documento / IC',
+	'Class:lnkDocumentToFunctionalCI' => 'Link de Documento / IC',
 	'Class:lnkDocumentToFunctionalCI+' => '',
 	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s~~',
-	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'IC',
+	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'ICs',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Nome do IC',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '',
@@ -1579,7 +1579,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:Licence+' => 'Lista de Licenças',
 	'Menu:Patch' => 'Atualizações',
 	'Menu:Patch+' => 'Lista de Atualizações',
-	'Menu:ApplicationInstance' => 'Softwares instalados',
+	'Menu:ApplicationInstance' => 'Softwares Instalados',
 	'Menu:ApplicationInstance+' => 'Serviços de aplicações e servidores de banco de dados',
 	'Menu:ConfigManagementHardware' => 'Gerenciamento de Infraestrutura',
 	'Menu:Subnet' => 'Sub-redes',
@@ -1595,9 +1595,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:PC' => 'Estação de Trabalho',
 	'Menu:PC+' => 'Lista de Estações de Trabalho',
 	'Menu:NewCI' => 'Novo IC',
-	'Menu:NewCI+' => 'Novo Item de Configuração (IC)',
+	'Menu:NewCI+' => '',
 	'Menu:SearchCIs' => 'Pesquisar por ICs',
-	'Menu:SearchCIs+' => 'Pesquisar por Itens de Configuração (ICs)',
+	'Menu:SearchCIs+' => '',
 	'Menu:ConfigManagement:Devices' => 'Dispositivos',
 	'Menu:ConfigManagement:AllDevices' => 'Infraestrutura',
 	'Menu:ConfigManagement:virtualization' => 'Virtualização',
@@ -1605,7 +1605,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:ConfigManagement:SWAndApps' => 'Softwares e aplicações',
 	'Menu:ConfigManagement:Misc' => 'Diversos',
 	'Menu:Group' => 'Grupos de ICs',
-	'Menu:Group+' => 'Lista de Grupos de Itens de Configuração (ICs)',
+	'Menu:Group+' => 'Lista de Grupos de ICs',
 	'Menu:OSVersion' => 'Versão do SO',
 	'Menu:OSVersion+' => 'Lista de Versões do SO',
 	'Menu:Software' => 'Catálogo de Software',
--- a/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/cs.dict.itop-config.php
@@ -13,7 +13,7 @@
 */
 Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Editor konfiguračního souboru',
+	'config-edit-title' => 'Editor konfiguračního souboru',
 	'config-edit-intro' => 'Při úpravách konfiguračního souboru buďte velice opatrní. Nesprávné nastavení může vést k nedostupnosti '.ITOP_APPLICATION_SHORT, 'Menu:ConfigEditor' => 'Konfigurace',
 	'config-apply' => 'Použít',
 	'config-apply-title' => 'Použít (Ctrl+S)',
--- a/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
@@ -11,7 +11,7 @@
 */
 Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Configuration File Editor~~',
+	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-apply' => 'Apply~~',
--- a/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/de.dict.itop-config.php
@@ -12,7 +12,7 @@
 */
 Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Konfigurations-Editor',
+	'config-edit-title' => 'Konfigurations-Editor',
 	'config-edit-intro' => 'Achtung: Eine falsche Konfiguration kann dazu führen, dass '.ITOP_APPLICATION_SHORT.' für alle Benutzer unbenutzbar ist!',
 	'Menu:ConfigEditor' => 'Konfiguration',
 	'config-apply' => 'Anwenden (Ctrl+S)',
--- a/datamodels/2.x/itop-config/dictionaries/en.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/en.dict.itop-config.php
@@ -24,7 +24,7 @@
 Dict::Add('EN US', 'English', 'English', array(

 	'Menu:ConfigFileEditor' => 'Plain text editor',
-	'itop-config/Operation:Edit/Title' => 'Configuration File Editor',
+	'config-edit-title' => 'Configuration File Editor',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.',
 	'config-apply' => 'Apply',
 	'config-apply-title' => 'Apply (Ctrl+S)',
--- a/datamodels/2.x/itop-config/dictionaries/en_gb.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/en_gb.dict.itop-config.php
@@ -24,7 +24,7 @@
 Dict::Add('EN GB', 'British English', 'British English', array(

 	'Menu:ConfigFileEditor' => 'Plain text editor',
-	'itop-config/Operation:Edit/Title' => 'Configuration File Editor',
+	'config-edit-title' => 'Configuration File Editor',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.',
 	'config-apply' => 'Apply',
 	'config-apply-title' => 'Apply (Ctrl+S)',
--- 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
@@ -9,7 +9,7 @@
 */
 Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Editor de Archivo de Configuración',
+	'config-edit-title' => 'Editor de Archivo de Configuración',
 	'config-edit-intro' => 'Sea muy cuidadoso cuando edite el archivo de configuración. En particular, sólo los elementos superiores (ejem.: the global configuration y modules settings) deberian ser editados.',
 	'Menu:ConfigEditor' => 'Configuración',
 	'config-apply' => 'Aplicar',
--- a/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/fr.dict.itop-config.php
@@ -11,7 +11,7 @@
 */
 Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:ConfigFileEditor' => 'Éditeur de texte brut',
-	'itop-config/Operation:Edit/Title' => 'Éditeur du Fichier de Configuration',
+	'config-edit-title' => 'Éditeur du Fichier de Configuration',
 	'config-edit-intro' => 'Attention: une configuration incorrecte peut rendre '.ITOP_APPLICATION_SHORT.' inopérant pour tous les utilisateurs!',
 	'config-apply' => 'Enregistrer',
 	'config-apply-title' => 'Enregistrer (Ctrl+S)',
--- a/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/hu.dict.itop-config.php
@@ -11,7 +11,7 @@
 */
 Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Konfigurációs fájl szerkesztő',
+	'config-edit-title' => 'Konfigurációs fájl szerkesztő',
 	'config-edit-intro' => 'Legyen nagyon óvatos a konfiguráció szerkesztésénél!',
 	'Menu:ConfigEditor' => 'Konfiguráció szerkesztő',
 	'config-apply' => 'Alkalmaz',
--- a/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
@@ -10,7 +10,7 @@
 *
 */
 Dict::Add('IT IT', 'Italian', 'Italiano', array(
-	'itop-config/Operation:Edit/Title' => 'Modifica file di configurazione',
+	'config-edit-title' => 'Modifica file di configurazione',
 	'config-edit-intro' => 'Prestare molta attenzione durante la modifica del file di configurazione.',
 	'Menu:ConfigEditor' => 'Configurazione',
 	'config-apply' => 'Applica',
--- a/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
@@ -11,7 +11,7 @@
 */
 Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Configuration File Editor~~',
+	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-apply' => 'Apply~~',
--- a/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/nl.dict.itop-config.php
@@ -12,7 +12,7 @@
 */
 Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Aanpassen configuratie',
+	'config-edit-title' => 'Aanpassen configuratie',
 	'config-edit-intro' => 'Wees uiterst voorzichtig bij het aanpassen van de configuratie.',
 	'Menu:ConfigEditor' => 'Configuratie',
 	'config-apply' => 'Opslaan',
--- a/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/pl.dict.itop-config.php
@@ -11,7 +11,7 @@
 */
 Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Edycja pliku konfiguracyjnego',
+	'config-edit-title' => 'Edycja pliku konfiguracyjnego',
 	'config-edit-intro' => 'Zachowaj ostrożność podczas edycji pliku konfiguracyjnego.',
 	'Menu:ConfigEditor' => 'Konfiguracja ogólna',
 	'config-apply' => 'Zastosuj',
--- a/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/pt_br.dict.itop-config.php
@@ -10,8 +10,8 @@
 *
 */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Menu:ConfigFileEditor' => 'Configurações',
-	'itop-config/Operation:Edit/Title' => 'Editor do arquivo de configuração',
+	'Menu:ConfigFileEditor' => 'Plain text editor~~',
+	'config-edit-title' => 'Editor do arquivo de configuração',
 	'config-edit-intro' => 'Tenha cuidado ao editar o arquivo de configuração',
 	'Menu:ConfigEditor' => 'Configurações',
 	'config-apply' => 'Aplicar',
--- a/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/ru.dict.itop-config.php
@@ -12,7 +12,7 @@
 */
 Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Редактор файла конфигурации',
+	'config-edit-title' => 'Редактор файла конфигурации',
 	'config-edit-intro' => 'Будьте очень осторожны при редактировании файла конфигурации. В частности, отредактированы могут быть только глобальная конфигурация и настройки модулей.',
 	'Menu:ConfigEditor' => 'Основные настройки',
 	'config-apply' => 'Применить',
--- a/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
@@ -11,7 +11,7 @@
 */
 Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Configuration File Editor~~',
+	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-apply' => 'Apply~~',
--- a/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
@@ -11,7 +11,7 @@
 */
 Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'itop-config/Operation:Edit/Title' => 'Configuration File Editor~~',
+	'config-edit-title' => 'Configuration File Editor~~',
 	'config-edit-intro' => 'Be very cautious when editing the configuration file.~~',
 	'Menu:ConfigEditor' => 'General configuration~~',
 	'config-apply' => 'Apply~~',
--- a/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php
+++ b/datamodels/2.x/itop-config/dictionaries/zh_cn.dict.itop-config.php
@@ -23,7 +23,7 @@
 Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Menu:ConfigFileEditor' => 'Plain text editor~~',
 	'Menu:ConfigEditor' => '编辑配置文件',
-	'itop-config/Operation:Edit/Title' => '配置文件编辑器',
+	'config-edit-title' => '配置文件编辑器',
 	'config-edit-intro' => '编辑配置文件时请务必格外小心.',
 	'config-apply' => '应用',
 	'config-apply-title' => '应用 (Ctrl+S)',
--- a/datamodels/2.x/itop-config/templates/Edit.html.twig
+++ b/datamodels/2.x/itop-config/templates/Edit.html.twig
@@ -11,7 +11,7 @@
 	{% UIAlert ForSuccess{sContent: sSuccess} %}{% EndUIAlert %}
 {% endfor %}

-{% UITitle ForPage {'sTitle':'itop-config/Operation:Edit/Title'|dict_s} %}{% EndUITitle %}
+{% UITitle ForPage {'sTitle':'config-edit-title'|dict_s} %}{% EndUITitle %}

 {% if bShowEditor %}
 	<p>{{ 'config-edit-intro'|dict_s }}</p>
--- a/datamodels/2.x/itop-config/templates/Edit.ready.js.twig
+++ b/datamodels/2.x/itop-config/templates/Edit.ready.js.twig
@@ -91,10 +91,11 @@ editor.commands.addCommand({
    name: 'save',
    bindKey: {win: "Ctrl-S", "mac": "Cmd-S"},
    exec: function(editor) {
-        let submitButton = document.getElementById('submit_button');
+        var editorForm = EditorUtils.getEditorForm(editor);
+        var submitButton = document.getElementById('submit_button');

-        if (!submitButton.disabled) {
-                submitButton.click();
+        if (submitButton.is(":enabled")) {
+           editorForm.trigger('submit');
        }
    }
 });
--- a/datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/pt_br.dict.itop-core-update.php
@@ -10,16 +10,8 @@
 *
 */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'iTopUpdate:UI:PageTitle' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-	'itop-core-update:UI:SelectUpdateFile' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-	'itop-core-update:UI:ConfirmUpdate' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-	'itop-core-update:UI:UpdateCoreFiles' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-	'iTopUpdate:UI:MaintenanceModeActive' => 'O '.ITOP_APPLICATION_SHORT.' encontra-se em manutenção, nenhum usuário pode acessar a aplicação. Você precisa rodar o Setup ou restaurar os arquivos da aplicação para voltar ao modo normal',
-	'itop-core-update:UI:UpdateDone' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-
-	'itop-core-update/Operation:SelectUpdateFile/Title' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-	'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirmar Atualização do '.ITOP_APPLICATION_SHORT,
-	'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Aplicação em Atualização',
+	'iTopUpdate:UI:PageTitle' => 'Atualização do '.ITOP_APPLICATION_SHORT, 'itop-core-update:UI:SelectUpdateFile' => 'Atualização do '.ITOP_APPLICATION_SHORT, 'itop-core-update:UI:ConfirmUpdate' => 'Atualização do '.ITOP_APPLICATION_SHORT, 'itop-core-update:UI:UpdateCoreFiles' => 'Atualização do '.ITOP_APPLICATION_SHORT, 'iTopUpdate:UI:MaintenanceModeActive' => 'O '.ITOP_APPLICATION_SHORT.' encontra-se em manutenção, nenhum usuário pode acessar a aplicação. Você precisa rodar o Setup ou restaurar os arquivos da aplicação para voltar ao modo normal',
+	'itop-core-update:UI:UpdateDone' => 'Atualização do '.ITOP_APPLICATION_SHORT, 'itop-core-update/Operation:SelectUpdateFile/Title' => 'Atualização do '.ITOP_APPLICATION_SHORT, 'itop-core-update/Operation:ConfirmUpdate/Title' => 'Confirmar Atualização do '.ITOP_APPLICATION_SHORT, 'itop-core-update/Operation:UpdateCoreFiles/Title' => 'Aplicação em Atualização',
 	'itop-core-update/Operation:UpdateDone/Title' => 'Atualização do '.ITOP_APPLICATION_SHORT.' finalizada',
 	'iTopUpdate:UI:SelectUpdateFile' => 'Escolha o arquivo de atualização para enviar',
 	'iTopUpdate:UI:CheckUpdate' => 'Verificando arquivo de atualização',
@@ -31,7 +23,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopUpdate:UI:Cancel' => 'Cancelar',
 	'iTopUpdate:UI:CannotUpdateNewModules' => '<b>Alguns módulos novos foram detectados</b>, uma atualização parcial não pode ser executada.</br>Siga o <a target="_blank" href="%2$s"> procedimento</a> para atualizar manualmente seu iTop. Você deve usar o <a href="%1$s">Setup</a> para atualizar a aplicação.',
 	'iTopUpdate:UI:Continue' => 'Continuar',
-	'iTopUpdate:UI:RunSetup' => 'Executar Setup',
+	'iTopUpdate:UI:RunSetup' => 'Rodar Setup',
 	'iTopUpdate:UI:WithDBBackup' => 'Backup do banco de dados',
 	'iTopUpdate:UI:WithFilesBackup' => 'Backup dos arquivos da aplicação',
 	'iTopUpdate:UI:WithoutBackup' => 'Backup não planejado',
@@ -48,8 +40,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopUpdate:UI:DoBackup:Label' => 'Backup de arquivos e banco de dados',
 	'iTopUpdate:UI:DoBackup:Warning' => 'Backup não recomendado devido ao espaço em disco limitado',
 	'iTopUpdate:UI:DiskFreeSpace' => 'Espaço em disco disponível',
-	'iTopUpdate:UI:ItopDiskSpace' => 'Espaço em disco do '.ITOP_APPLICATION_SHORT,
-	'iTopUpdate:UI:DBDiskSpace' => 'Espaço em disco do banco de dados',
+	'iTopUpdate:UI:ItopDiskSpace' => 'Espaço em disco do '.ITOP_APPLICATION_SHORT, 'iTopUpdate:UI:DBDiskSpace' => 'Espaço em disco do banco de dados',
 	'iTopUpdate:UI:FileUploadMaxSize' => 'Tamanho máximo de envio de arquivos',
 	'iTopUpdate:UI:PostMaxSize' => 'PHP ini post_max_size: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini upload_max_filesize: %1$s',
@@ -90,9 +81,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopUpdate:UI:RestoreArchive' => 'Você pode restaurar sua aplicação com o arquivo \'%1$s\'',
 	'iTopUpdate:UI:RestoreBackup' => 'Você pode restaurar seu banco de dados com \'%1$s\'',
 	'iTopUpdate:UI:UpdateDone' => 'Atualizado com sucesso',
-	'Menu:iTopUpdate' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-	'Menu:iTopUpdate+' => 'Atualização do '.ITOP_APPLICATION_SHORT,
-	'Class:ModuleInstallation/Attribute:installed' => 'Instalado em',
+	'Menu:iTopUpdate' => 'Atualização do '.ITOP_APPLICATION_SHORT, 'Menu:iTopUpdate+' => 'Atualização do '.ITOP_APPLICATION_SHORT, 'Class:ModuleInstallation/Attribute:installed' => 'Instalado em',
 	'Class:ModuleInstallation/Attribute:name' => 'Nome',
 	'Class:ModuleInstallation/Attribute:version' => 'Versão',
 	'Class:ModuleInstallation/Attribute:comment' => 'Comentário'
--- a/datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/pt_br.dict.itop-files-information.php
@@ -12,7 +12,7 @@
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'FilesInformation:Error:MissingFile' => 'Arquivo ausente: %1$s',
 	'FilesInformation:Error:CorruptedFile' => 'Arquivo %1$s está corrompido',
-	'FilesInformation:Error:ListCorruptedFile' => 'Arquivo(s) corrompido(s): %1$s ',
+	'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ~~',
 	'FilesInformation:Error:CantWriteToFile' => 'Sem permissão de escrita no arquivo %1$s',
 ));

--- a/datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
@@ -14,8 +14,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:iTopHub:Register' => 'Conectar ao iTop Hub',
 	'Menu:iTopHub:Register+' => 'Vá para o iTop Hub para atualizar sua instância '.ITOP_APPLICATION_SHORT,
 	'Menu:iTopHub:Register:Description' => '<p>Obtenha acesso à sua plataforma da comunidade iTop Hub!</br>Encontre todos os conteúdos e informações necessárias, gerencie suas instâncias '.ITOP_APPLICATION_SHORT.' por meio de ferramentas personalizadas & instale mais extensões.</br><br/>Ao conectar-se ao iTop hub a partir desta página, você enviará informações da sua instância '.ITOP_APPLICATION_SHORT.' ao iTop Hub.</p>',
-	'Menu:iTopHub:MyExtensions' => 'Extensões Instaladas',
-	'Menu:iTopHub:MyExtensions+' => 'Veja a lista de extensões instaladas nesta instância do '.ITOP_APPLICATION_SHORT,
+	'Menu:iTopHub:MyExtensions' => 'Extensões Implantadas',
+	'Menu:iTopHub:MyExtensions+' => 'Veja a lista de extensões implantadas nesta instância do '.ITOP_APPLICATION_SHORT,
 	'Menu:iTopHub:BrowseExtensions' => 'Obter Extensões do iTop Hub',
 	'Menu:iTopHub:BrowseExtensions+' => 'Navegue por mais extensões no iTop Hub',
 	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Visite a loja do iTop Hub, seu único lugar para encontrar extensões maravilhosas do '.ITOP_APPLICATION_SHORT.' !</br>Encontre as extensões que irão ajudá-lo a personalizar e adaptar o '.ITOP_APPLICATION_SHORT.' aos seus processos.</br><br/>Ao conectar-se ao iTop hub a partir desta página, você enviará informações da sua instância '.ITOP_APPLICATION_SHORT.' ao iTop Hub.</p>',
@@ -65,3 +65,5 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'iTopHub:InstallationStatus:Installed' => 'Instalado',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => 'Versão %1$s <b>NÃO</b> instalada',
 ));
+
+
--- a/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pt_br.dict.itop-incident-mgmt-itil.php
+++ b/datamodels/2.x/itop-incident-mgmt-itil/dictionaries/pt_br.dict.itop-incident-mgmt-itil.php
@@ -188,7 +188,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Incident/Attribute:related_request_list' => 'Solicitações filhas',
 	'Class:Incident/Attribute:related_request_list+' => '',
 	'Class:Incident/Attribute:child_incidents_list' => 'Incidentes filhos',
-	'Class:Incident/Attribute:child_incidents_list+' => 'Todos os Subincidentes associados à este Incidente',
+	'Class:Incident/Attribute:child_incidents_list+' => 'Todos os subincidentes associados a este incidente',
 	'Class:Incident/Attribute:public_log' => 'Log público',
 	'Class:Incident/Attribute:public_log+' => '',
 	'Class:Incident/Attribute:user_satisfaction' => 'Satisfação do usuário',
--- a/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
+++ b/datamodels/2.x/itop-knownerror-mgmt/dictionaries/pt_br.dict.itop-knownerror-mgmt.php
@@ -20,7 +20,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:KnownError/Attribute:cust_name+' => '',
 	'Class:KnownError/Attribute:problem_id' => 'Problema relacionado',
 	'Class:KnownError/Attribute:problem_id+' => '',
-	'Class:KnownError/Attribute:problem_ref' => 'Ref. problema relacionado',
+	'Class:KnownError/Attribute:problem_ref' => 'Ref. Problema relacionado',
 	'Class:KnownError/Attribute:problem_ref+' => '',
 	'Class:KnownError/Attribute:symptom' => 'Sintoma do erro',
 	'Class:KnownError/Attribute:symptom+' => '',
@@ -49,9 +49,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:KnownError/Attribute:version' => 'Versão',
 	'Class:KnownError/Attribute:version+' => '',
 	'Class:KnownError/Attribute:ci_list' => 'ICs',
-	'Class:KnownError/Attribute:ci_list+' => 'Todos os Itens de Configuração (ICs) associados à este Erro conhecido',
+	'Class:KnownError/Attribute:ci_list+' => 'Todos os itens de configuração associados a este erro conhecido',
 	'Class:KnownError/Attribute:document_list' => 'Documentos',
-	'Class:KnownError/Attribute:document_list+' => 'Todos os Documentos associados à este Erro conhecido',
+	'Class:KnownError/Attribute:document_list+' => 'Todos os documentos associados a este erro conhecido',
 ));

 //
@@ -59,8 +59,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkErrorToFunctionalCI' => 'Relação entre Erro conhecido / IC',
-	'Class:lnkErrorToFunctionalCI+' => 'Itens de configuração (IC) associados à este Erro conhecido',
+	'Class:lnkErrorToFunctionalCI' => 'Link Erro Conhecido / IC',
+	'Class:lnkErrorToFunctionalCI+' => 'Infraestrutura associada a este erro conhecido',
 	'Class:lnkErrorToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'ICs',
 	'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '',
@@ -79,7 +79,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToError' => 'Relação entre Documento / Erro',
+	'Class:lnkDocumentToError' => 'Link Documentos / Erros',
 	'Class:lnkDocumentToError+' => 'Uma ligação entre um documento e um erro conhecido',
 	'Class:lnkDocumentToError/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToError/Attribute:document_id' => 'Documento',
--- a/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Portal:Form:Close:Warning' => 'Opravdu chcete opustit tento formulář? Data vložená do formuláře budou ztracena ',
 	'Portal:Error:ObjectCannotBeCreated' => 'Chyba: objekt nelze vytvořit. Před opětovným odesláním tohoto formuláře zkontrolujte související objekty a přílohy.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Chyba: objekt nelze vytvořit. Před opětovným odesláním tohoto formuláře zkontrolujte související objekty a přílohy.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Portal:Form:Close:Warning' => 'Do you want to leave this form? Data entered may be lost~~',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting this form again.~~',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting this form again.~~',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/de.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/de.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'Portal:Form:Close:Warning' => 'Soll diese Eingabemaske verlassen werden? Eingegebene Daten werden nicht gespeichert.',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: Objekt kann nicht erzeugt werden. Prüfen Sie verknüpfte Objekte und Anhänge bevor Sie dieses Formular erneut abschicken.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: Objekt kann nicht geupdated werden. Prüfen Sie verknüpfte Objekte und Anhänge bevor Sie dieses Formular erneut abschicken.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/en.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/en.dict.itop-portal-base.php
@@ -70,7 +70,6 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Portal:Form:Close:Warning' => 'Do you want to leave this form? Data entered may be lost',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting this form again.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting this form again.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/en_gb.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/en_gb.dict.itop-portal-base.php
@@ -57,7 +57,6 @@ Dict::Add('EN GB', 'British English', 'British English', array(
 	'Portal:Form:Close:Warning' => 'Do you want to leave this form? Data entered may be lost',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting this form again.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting this form again.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s',
 ));

 // UserProfile brick
--- 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
@@ -59,7 +59,6 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 	'Portal:Form:Close:Warning' => '¿Desea abandorar este formulario? Datos modificados se perderan',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: no se puede crear el objeto. Verifique los objetos asociados y archivos adjuntos antes de enviar nuevamente este formulario.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: no se puede actualizar el objeto. Verifique los objetos asociados y archivos adjuntos antes de enviar nuevamente este formulario.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/fr.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/fr.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Portal:Form:Close:Warning' => 'Voulez-vous quitter ce formulaire ? Les données saisies seront perdues',
 	'Portal:Error:ObjectCannotBeCreated' => 'Erreur: L\'objet n\'a pas été créé. Vérifiez les objets liés et les attachements avant de soumettre à nouveau le formulaire.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Erreur: L\'objet n\'a pas été modifié. Vérifiez les objets liés et les attachements avant de soumettre à nouveau le formulaire.',
-    'Portal:Error:CheckToWriteFailed' => 'Erreur durant la validation du champ \'%1$s\' : %2$s',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/hu.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'Portal:Form:Close:Warning' => 'Szeretné elhagyni ezt az űrlapot? A megadott adatok elveszhetnek',
 	'Portal:Error:ObjectCannotBeCreated' => 'Hiba: az objektum nem hozható létre. Ellenőrizze a kapcsolódó objektumokat és mellékleteket, mielőtt újra elküldi ezt az űrlapot.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Hiba: az objektum nem frissíthető. Ellenőrizze a kapcsolódó objektumokat és mellékleteket, mielőtt újra elküldi ezt az űrlapot.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Portal:Form:Close:Warning' => 'Do you want to leave this form? Data entered may be lost~~',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting this form again.~~',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting this form again.~~',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Portal:Form:Close:Warning' => 'Do you want to leave this form? Data entered may be lost~~',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting this form again.~~',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting this form again.~~',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/nl.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/nl.dict.itop-portal-base.php
@@ -62,7 +62,6 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'Portal:Form:Close:Warning' => 'Ben je zeker dat je dit venster wil sluiten? Ingevoerde gegevens kunnen verloren gaan.',
 	'Portal:Error:ObjectCannotBeCreated' => 'Fout: object kan niet worden aangemaakt. Kijk verwante objecten en bijlagen na vooraleer dit formulier opnieuw te versturen.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Fout: object kan niet worden aangepast. Kijk verwante objecten en bijlagen na vooraleer dit formulier opnieuw te versturen.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/pl.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/pl.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
 	'Portal:Form:Close:Warning' => 'Chcesz opuścić ten formularz? Wprowadzone dane mogą zostać utracone',
 	'Portal:Error:ObjectCannotBeCreated' => 'Błąd: nie można utworzyć obiektu. Sprawdź powiązane obiekty i załączniki przed ponownym przesłaniem tego formularza.',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Błąd: nie można zaktualizować obiektu. Sprawdź powiązane obiekty i załączniki przed ponownym przesłaniem tego formularza.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/pt_br.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/pt_br.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Portal:Form:Close:Warning' => 'Você deseja abandonar esta página? Os dados digitados podem ser perdidos',
 	'Portal:Error:ObjectCannotBeCreated' => 'Erro: objeto não pode ser criado. Verifique os objetos e anexos associados antes de enviar novamente este formulário',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Erro: objeto não pode ser atualizado. Verifique os objetos e anexos associados antes de enviar novamente este formulário',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/ru.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/ru.dict.itop-portal-base.php
@@ -62,7 +62,6 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Portal:Form:Close:Warning' => 'Вы действительно хотите закрыть эту форму? Введённые данные могут быть утеряны.',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting this form again.~~',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting this form again.~~',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Portal:Form:Close:Warning' => 'Do you want to leave this form? Data entered may be lost~~',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting this form again.~~',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting this form again.~~',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php
@@ -61,7 +61,6 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Portal:Form:Close:Warning' => 'Do you want to leave this form? Data entered may be lost~~',
 	'Portal:Error:ObjectCannotBeCreated' => 'Error: object cannot be created. Check associated objects and attachments before submitting this form again.~~',
 	'Portal:Error:ObjectCannotBeUpdated' => 'Error: object cannot be updated. Check associated objects and attachments before submitting this form again.~~',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
+++ b/datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
@@ -70,7 +70,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Portal:Form:Close:Warning' => '确定要离开表单吗? 已输入数据会丢失',
 	'Portal:Error:ObjectCannotBeCreated' => '错误: 无法创建对象. 请在再次提交表单前检查相关对象和附件.',
 	'Portal:Error:ObjectCannotBeUpdated' => '错误: 无法更新对象. 请在再次提交表单前检查相关对象和附件.',
-    'Portal:Error:CheckToWriteFailed' => 'Error during validation of field \'%1$s\': %2$s~~',
 ));

 // UserProfile brick
--- a/datamodels/2.x/itop-portal-base/portal/config/bridge.php
+++ b/datamodels/2.x/itop-portal-base/portal/config/bridge.php
@@ -0,0 +1,10 @@
+<?php
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return static function (ContainerConfigurator $container) {
+
+	// kernel.secret
+	$container->parameters()->set('kernel.secret', MetaModel::GetConfig()->Get('application.secret'));
+
+};
--- a/datamodels/2.x/itop-portal-base/portal/config/packages/framework.yaml
+++ b/datamodels/2.x/itop-portal-base/portal/config/packages/framework.yaml
@@ -1,5 +1,5 @@
 framework:
-  secret: '%env(APP_SECRET)%'
+  #secret: (part of iTop general configuration, will be set dynamically via bridge.php)
  #default_locale: en
  #csrf_protection: true
  #http_method_override: true
--- a/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Helper/ObjectFormHandlerHelper.php
@@ -337,18 +337,7 @@ class ObjectFormHandlerHelper
 							);
 						}
 					} else {
-                        $sErrorMessages = '';
-                        foreach ($aFormData['validation']['messages']['error'] as $sFieldId => $aMessages) {
-                            if ($sFieldId == '_main') {
-                                $sErrorMessages .= implode(' - ', $aFormData['validation']['messages']['error']['_main']);
-                            } else {
-                                $oObj = $oFormManager->GetObject();
-                                $sLabel = $oObj->GetLabel($sFieldId);
-                                $sErrorMessages .= Dict::Format('Portal:Error:CheckToWriteFailed', $sLabel, (is_array($aMessages) ? implode(' - ', $aMessages) : $aMessages));
-                            }
-                        }
-
-                        throw new HttpException(Response::HTTP_INTERNAL_SERVER_ERROR, $sErrorMessages);
+						throw new HttpException(Response::HTTP_INTERNAL_SERVER_ERROR, implode('<br/>', $aFormData['validation']['messages']['error']['_main']));
 					}
 					break;

--- a/datamodels/2.x/itop-portal-base/portal/src/Kernel.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/Kernel.php
@@ -83,6 +83,7 @@ class Kernel extends BaseKernel
 		$confDir = '../config';

 		$container->import(new FileResource($this->getProjectDir().'/config/bundles.php'));
+		$container->import($confDir.'/bridge.php');
 		$container->parameters()->set('container.dumper.inline_class_loader', true);

 		$container->import($confDir.'/{packages}/*'.self::CONFIG_EXTS);
--- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/tile-default.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/tile-default.html.twig
@@ -5,7 +5,7 @@
 {% block pTileTitle %}
    <div class="ipb-tile--title">
        <span>{{ oBrick.GetTitle()|dict_s }}</span><span><span>{{ iCount }}</span>
-            {% if sIconURL is defined and sIconURL is not empty %}
+            {% if sIconURL is defined %}
                <img id="img{{ id }}" src="{{ sIconURL }}" class="ipb-tile--decoration--icon class-icon" alt="Class Icon">
            {% endif %}
        </span>
--- a/datamodels/2.x/itop-problem-mgmt/dictionaries/pt_br.dict.itop-problem-mgmt.php
+++ b/datamodels/2.x/itop-problem-mgmt/dictionaries/pt_br.dict.itop-problem-mgmt.php
@@ -97,11 +97,11 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Problem/Attribute:resolution_date' => 'Data de solução',
 	'Class:Problem/Attribute:resolution_date+' => '',
 	'Class:Problem/Attribute:knownerrors_list' => 'Erros conhecidos',
-	'Class:Problem/Attribute:knownerrors_list+' => 'Todos os Erros conhecidos associados à este Problema',
+	'Class:Problem/Attribute:knownerrors_list+' => 'Todos os erros conhecidos associados a este problema',
 	'Class:Problem/Attribute:related_request_list' => 'Solicitações relacionadas',
-	'Class:Problem/Attribute:related_request_list+' => 'Todas as Solicitações associados à este Problema',
+	'Class:Problem/Attribute:related_request_list+' => 'Todas as solicitações associadas a este problema',
 	'Class:Problem/Attribute:related_incident_list' => 'Incidentes relacionados',
-	'Class:Problem/Attribute:related_incident_list+' => 'Todos os Incidentes associados à este Problema',
+	'Class:Problem/Attribute:related_incident_list+' => 'Todos os incidentes associados a este problema',
 	'Class:Problem/Stimulus:ev_assign' => 'Atribuir',
 	'Class:Problem/Stimulus:ev_assign+' => '',
 	'Class:Problem/Stimulus:ev_reassign' => 'Reatribuir',
--- a/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pt_br.dict.itop-request-mgmt-itil.php
+++ b/datamodels/2.x/itop-request-mgmt-itil/dictionaries/pt_br.dict.itop-request-mgmt-itil.php
@@ -11,11 +11,11 @@
 */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:RequestManagement' => 'Gerenciamento de Solicitações',
-	'Menu:RequestManagement+' => '',
-	'Menu:RequestManagementProvider' => 'Solicitações a provedores(as)',
-	'Menu:RequestManagementProvider+' => '',
+	'Menu:RequestManagement+' => 'Gerenciamento de Solicitações',
+	'Menu:RequestManagementProvider' => 'Solicitações a provedores',
+	'Menu:RequestManagementProvider+' => 'Solicitações a provedores',
 	'Menu:UserRequest:Provider' => 'Solicitações abertas transferidas a provedores',
-	'Menu:UserRequest:Provider+' => '',
+	'Menu:UserRequest:Provider+' => 'Solicitações abertas transferidas a provedores',
 	'Menu:UserRequest:Overview' => 'Visão geral',
 	'Menu:UserRequest:Overview+' => 'Visão geral',
 	'Menu:NewUserRequest' => 'Nova solicitação',
@@ -24,8 +24,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:SearchUserRequests+' => 'Pesquisar por solicitações',
 	'Menu:UserRequest:Shortcuts' => 'Atalhos',
 	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Solicitações atribuídas a mim',
-	'Menu:UserRequest:MyRequests+' => 'Solicitações atribuídas a mim (como Agente)',
+	'Menu:UserRequest:MyRequests' => 'Solicitações abertas por mim',
+	'Menu:UserRequest:MyRequests+' => 'Solicitações abertas por mim (como Agente)',
 	'Menu:UserRequest:MySupportRequests' => 'Minhas solicitações de suporte',
 	'Menu:UserRequest:MySupportRequests+' => 'Minhas solicitações de suporte',
 	'Menu:UserRequest:EscalatedRequests' => 'Solicitações escalonados',
@@ -159,7 +159,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Attribute:tto' => 'TTO',
 	'Class:UserRequest/Attribute:tto+' => 'Tempo para atribuição (TTO)',
 	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => 'Tempo para resolução (TTR)',
+	'Class:UserRequest/Attribute:ttr+' => 'Tempo para solução (TTR)',
 	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'Prazo determinado de atribuição (TTO)',
 	'Class:UserRequest/Attribute:tto_escalation_deadline+' => 'Prazo determinado de Tempo para atribuição (TTO)',
 	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO superado',
@@ -172,7 +172,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Attribute:sla_ttr_passed+' => 'Tempo para solução (TTR) do Acordo de Nível de Serviço (ANS) superado',
 	'Class:UserRequest/Attribute:sla_ttr_over' => 'SLA TTR ultrapassado',
 	'Class:UserRequest/Attribute:sla_ttr_over+' => 'Tempo para solução (TTR) do Acordo de Nível de Serviço (ANS) ultrapassado',
-	'Class:UserRequest/Attribute:time_spent' => 'Tempo de resolução',
+	'Class:UserRequest/Attribute:time_spent' => 'Tempo de solução',
 	'Class:UserRequest/Attribute:time_spent+' => '',
 	'Class:UserRequest/Attribute:resolution_code' => 'Código da solução',
 	'Class:UserRequest/Attribute:resolution_code+' => '',
@@ -198,17 +198,17 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Attribute:parent_request_id+' => '',
 	'Class:UserRequest/Attribute:parent_incident_id' => 'Incidente pai',
 	'Class:UserRequest/Attribute:parent_incident_id+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref. solitação pai',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref. Solitação pai',
 	'Class:UserRequest/Attribute:parent_request_ref+' => '',
 	'Class:UserRequest/Attribute:parent_problem_id' => 'Problema pai',
 	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref. problema pai',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref. Problema pai',
 	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
 	'Class:UserRequest/Attribute:parent_change_id' => 'Mudança pai',
 	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. mudança pai',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. Mudança pai',
 	'Class:UserRequest/Attribute:parent_change_ref+' => '',
-	'Class:UserRequest/Attribute:parent_incident_ref' => 'Ref. incidente pai',
+	'Class:UserRequest/Attribute:parent_incident_ref' => 'Ref. Incidente pai',
 	'Class:UserRequest/Attribute:parent_incident_ref+' => '',
 	'Class:UserRequest/Attribute:related_request_list' => 'Subsolicitações',
 	'Class:UserRequest/Attribute:related_request_list+' => 'Todas as solicitações associadas à esta solicitação pai',
@@ -253,8 +253,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Stimulus:ev_wait_for_approval' => 'Aguardar por aprovação',
 	'Class:UserRequest/Stimulus:ev_wait_for_approval+' => '',
 	'Class:UserRequest/Error:CannotAssignParentRequestIdToSelf' => 'Não é possível atribuir a solicitação pai a própria solicitação',
-	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets (resolver solicitações filhas)',
-	'Class:UserRequest/Method:ResolveChildTickets+' => 'Conecte a solução a solicitações filhas (ev_autoresolve) e alinhe as seguintes características da requisição: serviço, equipe, agente, info de solução',
+	'Class:UserRequest/Method:ResolveChildTickets' => 'ResolveChildTickets',
+	'Class:UserRequest/Method:ResolveChildTickets+' => 'Conecte a solução a pedidos filhos (ev_autoresolve) e alinhe as seguintes características da requisição: serviço, equipe, agente, info de solução',
 ));


--- a/datamodels/2.x/itop-request-mgmt/dictionaries/pt_br.dict.itop-request-mgmt.php
+++ b/datamodels/2.x/itop-request-mgmt/dictionaries/pt_br.dict.itop-request-mgmt.php
@@ -11,9 +11,9 @@
 */
 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:RequestManagement' => 'Gerenciamento de Solicitações',
-	'Menu:RequestManagement+' => '',
-	'Menu:RequestManagementProvider' => 'Solicitações a provedores(as)',
-	'Menu:RequestManagementProvider+' => '',
+	'Menu:RequestManagement+' => 'Gerenciamento de Solicitações',
+	'Menu:RequestManagementProvider' => 'Solicitações a provedores',
+	'Menu:RequestManagementProvider+' => 'Solicitações a provedores',
 	'Menu:UserRequest:Provider' => 'Solicitações abertas transferidas a provedores',
 	'Menu:UserRequest:Provider+' => 'Solicitações abertas transferidas a provedores',
 	'Menu:UserRequest:Overview' => 'Visão geral',
@@ -24,8 +24,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Menu:SearchUserRequests+' => 'Pesquisar por solicitações',
 	'Menu:UserRequest:Shortcuts' => 'Atalhos',
 	'Menu:UserRequest:Shortcuts+' => '',
-	'Menu:UserRequest:MyRequests' => 'Solicitações atribuídas a mim',
-	'Menu:UserRequest:MyRequests+' => 'Solicitações atribuídas a mim (como Agente)',
+	'Menu:UserRequest:MyRequests' => 'Solicitações abertas por mim',
+	'Menu:UserRequest:MyRequests+' => 'Solicitações abertas por mim (como Agente)',
 	'Menu:UserRequest:MySupportRequests' => 'Minhas solicitações de suporte',
 	'Menu:UserRequest:MySupportRequests+' => 'Minhas solicitações de suporte',
 	'Menu:UserRequest:EscalatedRequests' => 'Solicitações escalonadas',
@@ -165,7 +165,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Attribute:tto' => 'TTO',
 	'Class:UserRequest/Attribute:tto+' => 'Tempo para atribuição (Time To Own)',
 	'Class:UserRequest/Attribute:ttr' => 'TTR',
-	'Class:UserRequest/Attribute:ttr+' => 'Tempo para resolução (Time To Resolution)',
+	'Class:UserRequest/Attribute:ttr+' => 'Tempo para solução (Time To Resolution)',
 	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'Prazo determinado de atribuição (TTO)',
 	'Class:UserRequest/Attribute:tto_escalation_deadline+' => 'Prazo determinado de Tempo para atribuição (TTO)',
 	'Class:UserRequest/Attribute:sla_tto_passed' => 'SLA TTO superado',
@@ -202,15 +202,15 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:UserRequest/Attribute:pending_reason+' => '',
 	'Class:UserRequest/Attribute:parent_request_id' => 'Solicitação pai',
 	'Class:UserRequest/Attribute:parent_request_id+' => '',
-	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref. solicitação pai',
+	'Class:UserRequest/Attribute:parent_request_ref' => 'Ref. Solicitação pai',
 	'Class:UserRequest/Attribute:parent_request_ref+' => '',
 	'Class:UserRequest/Attribute:parent_problem_id' => 'Problema pai',
 	'Class:UserRequest/Attribute:parent_problem_id+' => '',
-	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref. problema pai',
+	'Class:UserRequest/Attribute:parent_problem_ref' => 'Ref. Problema pai',
 	'Class:UserRequest/Attribute:parent_problem_ref+' => '',
 	'Class:UserRequest/Attribute:parent_change_id' => 'Mudança pai',
 	'Class:UserRequest/Attribute:parent_change_id+' => '',
-	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. mudança',
+	'Class:UserRequest/Attribute:parent_change_ref' => 'Ref. Mudança pai',
 	'Class:UserRequest/Attribute:parent_change_ref+' => '',
 	'Class:UserRequest/Attribute:related_request_list' => 'Subsolicitações',
 	'Class:UserRequest/Attribute:related_request_list+' => 'Todas as solicitações associadas à esta solicitação pai',
--- a/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
+++ b/datamodels/2.x/itop-service-mgmt-provider/dictionaries/pt_br.dict.itop-service-mgmt-provider.php
@@ -17,7 +17,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível serviço',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos terminando em menos de 30 dias',
-	'Menu:ProviderContract' => 'Contratos de provedores(as)',
+	'Menu:ProviderContract' => 'Contratos de provedores',
 	'Menu:ProviderContract+' => '',
 	'Menu:CustomerContract' => 'Contratos de clientes',
 	'Menu:CustomerContract+' => '',
@@ -86,9 +86,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Contract/Attribute:organization_name' => 'Nome da organização',
 	'Class:Contract/Attribute:organization_name+' => 'Nome comum',
 	'Class:Contract/Attribute:contacts_list' => 'Contatos',
-	'Class:Contract/Attribute:contacts_list+' => 'Todos os Contatos associados à este Contrato',
+	'Class:Contract/Attribute:contacts_list+' => 'Todos os contatos para este contrato de cliente',
 	'Class:Contract/Attribute:documents_list' => 'Documentos',
-	'Class:Contract/Attribute:documents_list+' => 'Todos os Documentos associados à este Contrato',
+	'Class:Contract/Attribute:documents_list+' => 'Todos os documentos para este contrato de cliente',
 	'Class:Contract/Attribute:description' => 'Descrição',
 	'Class:Contract/Attribute:description+' => '',
 	'Class:Contract/Attribute:start_date' => 'Data de início',
@@ -135,11 +135,11 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:CustomerContract' => 'Contrato de cliente',
 	'Class:CustomerContract+' => '',
 	'Class:CustomerContract/Attribute:services_list' => 'Serviços',
-	'Class:CustomerContract/Attribute:services_list+' => 'Todos os Serviços contratados para este Contrato de cliente',
+	'Class:CustomerContract/Attribute:services_list+' => 'Todos os serviços contratados para este contrato',
 	'Class:CustomerContract/Attribute:functionalcis_list' => 'ICs',
-	'Class:CustomerContract/Attribute:functionalcis_list+' => 'Todos os Itens de Configuração (IC) que são utilizados para a prestação deste Contrato de cliente',
+	'Class:CustomerContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração que são utilizados para a prestação deste contrato',
 	'Class:CustomerContract/Attribute:providercontracts_list' => 'Contratos de provedores',
-	'Class:CustomerContract/Attribute:providercontracts_list+' => 'Todos os Contratos de provedores para suportar este Contrato de cliente',
+	'Class:CustomerContract/Attribute:providercontracts_list+' => 'Todos os contratos de provedores para suportar este contrato de cliente',
 ));

 //
@@ -147,10 +147,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ProviderContract' => 'Contrato de provedor',
+	'Class:ProviderContract' => 'Contrato de Provedor',
 	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'ICs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Todos os Itens de Configuração (IC) abrangidos por este Contrato',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração abrangidos por esse contrato',
 	'Class:ProviderContract/Attribute:sla' => 'SLA',
 	'Class:ProviderContract/Attribute:sla+' => 'Acordo de Nível de Serviço (ANS)',
 	'Class:ProviderContract/Attribute:coverage' => 'Horário de serviço',
@@ -162,7 +162,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToContract' => 'Relação entre Contato / Contrato',
+	'Class:lnkContactToContract' => 'Link Contato / Contrato',
 	'Class:lnkContactToContract+' => '',
 	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
@@ -180,7 +180,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContractToDocument' => 'Relação entre Contrato / Documento',
+	'Class:lnkContractToDocument' => 'Link Contrato / Documento',
 	'Class:lnkContractToDocument+' => '',
 	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
@@ -198,7 +198,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkFunctionalCIToProviderContract' => 'Relação entre IC / Contrato de provedor',
+	'Class:lnkFunctionalCIToProviderContract' => 'Link IC / Contrato de provedor',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => 'Contrato de provedor',
@@ -223,7 +223,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ServiceFamily/Attribute:icon' => 'Ícone',
 	'Class:ServiceFamily/Attribute:icon+' => '',
 	'Class:ServiceFamily/Attribute:services_list' => 'Serviços',
-	'Class:ServiceFamily/Attribute:services_list+' => 'Todos os Serviços associados à esta Família de serviços',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Todos os serviços para essa categoria',
 ));

 //
@@ -236,10 +236,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Service/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:Service/Attribute:name' => 'Nome',
 	'Class:Service/Attribute:name+' => '',
-	'Class:Service/Attribute:org_id' => 'Provedor',
+	'Class:Service/Attribute:org_id' => 'Organização',
 	'Class:Service/Attribute:org_id+' => '',
-	'Class:Service/Attribute:organization_name' => 'Nome do provedor',
-	'Class:Service/Attribute:organization_name+' => '',
+	'Class:Service/Attribute:organization_name' => 'Nome',
+	'Class:Service/Attribute:organization_name+' => 'Nome comum',
 	'Class:Service/Attribute:description' => 'Descrição',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => 'Família de serviços',
@@ -247,23 +247,23 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Service/Attribute:servicefamily_name' => 'Nome da família de serviços',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => 'Documentos',
-	'Class:Service/Attribute:documents_list+' => 'Todos os Documentos associados à este Serviço',
+	'Class:Service/Attribute:documents_list+' => 'Todos os documentos associados a este serviço',
 	'Class:Service/Attribute:contacts_list' => 'Contatos',
-	'Class:Service/Attribute:contacts_list+' => 'Todos os Contatos associados à este Serviço',
+	'Class:Service/Attribute:contacts_list+' => 'Todos os contatos associados a este serviço',
 	'Class:Service/Attribute:status' => 'Status',
 	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Em homologação',
-	'Class:Service/Attribute:status/Value:implementation+' => '',
+	'Class:Service/Attribute:status/Value:implementation+' => 'Em homologação',
 	'Class:Service/Attribute:status/Value:obsolete' => 'Obsoleto',
 	'Class:Service/Attribute:status/Value:obsolete+' => '',
 	'Class:Service/Attribute:status/Value:production' => 'Em produção',
 	'Class:Service/Attribute:status/Value:production+' => '',
-	'Class:Service/Attribute:icon' => 'Ícone',
+	'Class:Service/Attribute:icon' => 'Icon',
 	'Class:Service/Attribute:icon+' => '',
 	'Class:Service/Attribute:customercontracts_list' => 'Contratos de clientes',
-	'Class:Service/Attribute:customercontracts_list+' => 'Todos os Contratos de clientes que contrataram este Serviço',
+	'Class:Service/Attribute:customercontracts_list+' => 'Todos os contratos de clientes que contrataram esse serviço',
 	'Class:Service/Attribute:servicesubcategories_list' => 'Subcategorias de serviço',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'Todas as Subcategorias de serviço associadas à este Serviço',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Todas as subcategorias associadas a esse serviço',
 ));

 //
@@ -271,7 +271,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToService' => 'Relação entre Documento / Serviço',
+	'Class:lnkDocumentToService' => 'Link Documento / Serviço',
 	'Class:lnkDocumentToService+' => '',
 	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Serviço',
@@ -289,7 +289,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToService' => 'Relação entre Contato / Serviço',
+	'Class:lnkContactToService' => 'Link Contato / Serviço',
 	'Class:lnkContactToService+' => '',
 	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Serviço',
@@ -352,10 +352,10 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SLA/Attribute:organization_name' => 'Nome da organização',
 	'Class:SLA/Attribute:organization_name+' => '',
 	'Class:SLA/Attribute:slts_list' => 'SLTs',
-	'Class:SLA/Attribute:slts_list+' => 'Todos os Níveis Mínimos de Serviço (SLTs) para este Acordo de Nível de Serviço (SLA)',
+	'Class:SLA/Attribute:slts_list+' => 'Todos os Níveis Mínimos de Serviço (SLTs) para esse Acordo de Nível de Serviço (SLA)',
 	'Class:SLA/Attribute:customercontracts_list' => 'Contratos de clientes',
-	'Class:SLA/Attribute:customercontracts_list+' => 'Todos os Contratos de clientes utilizando este Acordo de Nível de Serviço (SLA)',
-	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Não foi possível salvar o vínculo entre o Contrato de cliente %1$s e o Serviço %2$s : SLA já existe',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Todos os contratos de clientes utilizando esse Acordo de Nível de Serviço (SLA)',
+	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Não foi possível salvar o vínculo entre o Contrato do Cliente %1$s e Serviço %2$s : SLA já existe',
 ));

 //
@@ -404,7 +404,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSLAToSLT' => 'Relação entre SLA / SLT',
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
 	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
@@ -432,7 +432,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkCustomerContractToService' => 'Relação entre Contrato de cliente / Serviço',
+	'Class:lnkCustomerContractToService' => 'Link Contrato de cliente / Serviço',
 	'Class:lnkCustomerContractToService+' => '',
 	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrato de cliente',
@@ -454,7 +454,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkCustomerContractToProviderContract' => 'Relação entre Contrato de cliente / Contrato de provedor',
+	'Class:lnkCustomerContractToProviderContract' => 'Link Contrato de cliente / Contrato de provedor',
 	'Class:lnkCustomerContractToProviderContract+' => '',
 	'Class:lnkCustomerContractToProviderContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToProviderContract/Attribute:customercontract_id' => 'Contrato de cliente',
@@ -472,7 +472,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkCustomerContractToFunctionalCI' => 'Relação entre Contrato de cliente / IC',
+	'Class:lnkCustomerContractToFunctionalCI' => 'Link Contrato de cliente / IC',
 	'Class:lnkCustomerContractToFunctionalCI+' => '',
 	'Class:lnkCustomerContractToFunctionalCI/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToFunctionalCI/Attribute:customercontract_id' => 'Contrato de cliente',
@@ -494,16 +494,16 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:DeliveryModel+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Nome',
 	'Class:DeliveryModel/Attribute:name+' => '',
-	'Class:DeliveryModel/Attribute:org_id' => 'Provedor',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organização',
 	'Class:DeliveryModel/Attribute:org_id+' => '',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Nome da organização',
 	'Class:DeliveryModel/Attribute:organization_name+' => '',
 	'Class:DeliveryModel/Attribute:description' => 'Descrição',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Contatos',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'Todos os Contatos (Equipes e Pessoas) associados à este Modelo de entrega',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Todos os contatos (Equipe e Pessoa) para esse Modelo de entrega',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Clientes',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'Todos os clientes atendidos por este Modelo de entrega',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Todos os clientes com esse Modelo de entrega',
 ));

 //
@@ -511,7 +511,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDeliveryModelToContact' => 'Relação entre Modelo de entrega / Contato',
+	'Class:lnkDeliveryModelToContact' => 'Link Modelo de entrega / Contato',
 	'Class:lnkDeliveryModelToContact+' => '',
 	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo de entrega',
--- a/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
+++ b/datamodels/2.x/itop-service-mgmt/dictionaries/pt_br.dict.itop-service-mgmt.php
@@ -17,8 +17,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contratos por nível de serviço',
 	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contratos por status',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contratos finalizando em menos de 30 dias',
-	'Menu:ProviderContract' => 'Contratos de provedores(as)',
-	'Menu:ProviderContract+' => 'Lista de contratos de provedores(as)',
+	'Menu:ProviderContract' => 'Contratos de provedores',
+	'Menu:ProviderContract+' => 'Lista de contratos de provedores',
 	'Menu:CustomerContract' => 'Contratos de clientes',
 	'Menu:CustomerContract+' => 'Lista de contratos de clientes',
 	'Menu:ServiceSubcategory' => 'Subcategorias de serviços',
@@ -77,9 +77,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Contract/Attribute:organization_name' => 'Nome da organização',
 	'Class:Contract/Attribute:organization_name+' => '',
 	'Class:Contract/Attribute:contacts_list' => 'Contatos',
-	'Class:Contract/Attribute:contacts_list+' => 'Todos os contatos associados à este contrato',
+	'Class:Contract/Attribute:contacts_list+' => 'Todos os contatos para este contrato com o cliente',
 	'Class:Contract/Attribute:documents_list' => 'Documentos',
-	'Class:Contract/Attribute:documents_list+' => 'Todos os documentos associados à este contrato',
+	'Class:Contract/Attribute:documents_list+' => 'Todos os documentos para este contrato com o cliente',
 	'Class:Contract/Attribute:description' => 'Descrição',
 	'Class:Contract/Attribute:description+' => '',
 	'Class:Contract/Attribute:start_date' => 'Data de início',
@@ -125,7 +125,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:CustomerContract' => 'Contrato de Cliente',
 	'Class:CustomerContract+' => '',
 	'Class:CustomerContract/Attribute:services_list' => 'Serviços',
-	'Class:CustomerContract/Attribute:services_list+' => 'Todos os serviços contratados para este contrato de cliente',
+	'Class:CustomerContract/Attribute:services_list+' => 'Todos os serviços contratados para o presente contrato',
 ));

 //
@@ -136,7 +136,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:ProviderContract' => 'Contrato de provedor',
 	'Class:ProviderContract+' => '',
 	'Class:ProviderContract/Attribute:functionalcis_list' => 'ICs',
-	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração (ICs) associados a este contrato',
+	'Class:ProviderContract/Attribute:functionalcis_list+' => 'Todos os itens de configuração associados a este contrato',
 	'Class:ProviderContract/Attribute:sla' => 'SLA',
 	'Class:ProviderContract/Attribute:sla+' => '',
 	'Class:ProviderContract/Attribute:coverage' => 'Horário de serviço',
@@ -154,7 +154,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToContract' => 'Relação entre Contato / Contrato',
+	'Class:lnkContactToContract' => 'Link Contato / Contrato',
 	'Class:lnkContactToContract+' => '',
 	'Class:lnkContactToContract/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToContract/Attribute:contract_id' => 'Contrato',
@@ -172,7 +172,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContractToDocument' => 'Relação entre Contrato / Documento',
+	'Class:lnkContractToDocument' => 'Link Contrato / Documento',
 	'Class:lnkContractToDocument+' => '',
 	'Class:lnkContractToDocument/Name' => '%1$s / %2$s~~',
 	'Class:lnkContractToDocument/Attribute:contract_id' => 'Contrato',
@@ -190,14 +190,14 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ServiceFamily' => 'Família de serviços',
+	'Class:ServiceFamily' => 'Família de Serviços',
 	'Class:ServiceFamily+' => '',
 	'Class:ServiceFamily/Attribute:name' => 'Nome',
 	'Class:ServiceFamily/Attribute:name+' => '',
 	'Class:ServiceFamily/Attribute:icon' => 'Ícone',
 	'Class:ServiceFamily/Attribute:icon+' => '',
 	'Class:ServiceFamily/Attribute:services_list' => 'Serviços',
-	'Class:ServiceFamily/Attribute:services_list+' => 'Todos os serviços associados à esta família de serviços',
+	'Class:ServiceFamily/Attribute:services_list+' => 'Todos os serviços para essa categoria',
 ));

 //
@@ -221,9 +221,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Service/Attribute:description' => 'Descrição',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:documents_list' => 'Documentos',
-	'Class:Service/Attribute:documents_list+' => 'Todos os documentos associados à este serviço',
+	'Class:Service/Attribute:documents_list+' => 'Todos os documentos associados a este serviço',
 	'Class:Service/Attribute:contacts_list' => 'Contatos',
-	'Class:Service/Attribute:contacts_list+' => 'Todos os contatos associados à este serviço',
+	'Class:Service/Attribute:contacts_list+' => 'Todos os contatos associados a este serviço',
 	'Class:Service/Attribute:status' => 'Status',
 	'Class:Service/Attribute:status+' => '',
 	'Class:Service/Attribute:status/Value:implementation' => 'Em homologação',
@@ -239,9 +239,9 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:Service/Attribute:providercontracts_list' => 'Contratos de provedores',
 	'Class:Service/Attribute:providercontracts_list+' => 'Todos os contratos de provedores para suportar esse serviço',
 	'Class:Service/Attribute:functionalcis_list' => 'Dependências de ICs',
-	'Class:Service/Attribute:functionalcis_list+' => 'Todos os itens de configuração (ICs) que são utilizados para a prestação deste serviço',
+	'Class:Service/Attribute:functionalcis_list+' => 'Todos os itens de configuração que são utilizados para a prestação deste serviço',
 	'Class:Service/Attribute:servicesubcategories_list' => 'Subcategorias de serviço',
-	'Class:Service/Attribute:servicesubcategories_list+' => 'Todas as subcategorias de serviço para esse serviço',
+	'Class:Service/Attribute:servicesubcategories_list+' => 'Todas as subcategorias para esse serviço',
 ));

 //
@@ -249,7 +249,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDocumentToService' => 'Relação entre Documento / Serviço',
+	'Class:lnkDocumentToService' => 'Link Documento / Serviço',
 	'Class:lnkDocumentToService+' => '',
 	'Class:lnkDocumentToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkDocumentToService/Attribute:service_id' => 'Serviço',
@@ -267,7 +267,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkContactToService' => 'Relação entre Contato / Serviço',
+	'Class:lnkContactToService' => 'Link Contato / Serviço',
 	'Class:lnkContactToService+' => '',
 	'Class:lnkContactToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkContactToService/Attribute:service_id' => 'Serviço',
@@ -285,7 +285,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:ServiceSubcategory' => 'Subcategoria de serviço',
+	'Class:ServiceSubcategory' => 'Subcategorias de serviço',
 	'Class:ServiceSubcategory+' => '',
 	'Class:ServiceSubcategory/ComplementaryName' => '%1$s - %2$s~~',
 	'Class:ServiceSubcategory/Attribute:name' => 'Nome',
@@ -323,15 +323,15 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'Class:SLA/Attribute:name+' => '',
 	'Class:SLA/Attribute:description' => 'Descrição',
 	'Class:SLA/Attribute:description+' => '',
-	'Class:SLA/Attribute:org_id' => 'Provedor',
+	'Class:SLA/Attribute:org_id' => 'Organização',
 	'Class:SLA/Attribute:org_id+' => '',
 	'Class:SLA/Attribute:organization_name' => 'Nome da organização',
 	'Class:SLA/Attribute:organization_name+' => '',
 	'Class:SLA/Attribute:slts_list' => 'SLTs',
 	'Class:SLA/Attribute:slts_list+' => 'Todos os Níveis Mínimos de Serviço (SLTs) para esse Acordo de Nível de Serviço (SLA)',
 	'Class:SLA/Attribute:customercontracts_list' => 'Contratos de clientes',
-	'Class:SLA/Attribute:customercontracts_list+' => 'Todos os Contratos de clientes utilizando esse Acordo de Nível de Serviço (SLA)',
-	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Não foi possível salvar o vínculo entre o Contrato de cliente "%1$s" e o Serviço "%2$s": SLA já existe',
+	'Class:SLA/Attribute:customercontracts_list+' => 'Todos os contratos de clientes utilizando esse Acordo de Nível de Serviço (SLA)',
+	'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Não foi possível salvar o vínculo entre o Contrato do Cliente "%1$s" e Serviço "%2$s": SLA já existe',
 ));

 //
@@ -382,7 +382,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkSLAToSLT' => 'Relação entre SLA / SLT',
+	'Class:lnkSLAToSLT' => 'Link SLA / SLT',
 	'Class:lnkSLAToSLT+' => '',
 	'Class:lnkSLAToSLT/Name' => '%1$s / %2$s~~',
 	'Class:lnkSLAToSLT/Attribute:sla_id' => 'SLA',
@@ -410,7 +410,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkCustomerContractToService' => 'Relação entre Contrato de cliente / Serviço',
+	'Class:lnkCustomerContractToService' => 'Link Contrato de cliente / Serviço',
 	'Class:lnkCustomerContractToService+' => '',
 	'Class:lnkCustomerContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_id' => 'Contrato de cliente',
@@ -432,7 +432,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkProviderContractToService' => 'Relação entre Contrato de provedor / Serviço',
+	'Class:lnkProviderContractToService' => 'Link Contrato de provedor / Serviço',
 	'Class:lnkProviderContractToService+' => '',
 	'Class:lnkProviderContractToService/Name' => '%1$s / %2$s~~',
 	'Class:lnkProviderContractToService/Attribute:service_id' => 'Serviço',
@@ -450,20 +450,20 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:DeliveryModel' => 'Modelo de entrega',
+	'Class:DeliveryModel' => 'Modelo de Entrega',
 	'Class:DeliveryModel+' => '',
 	'Class:DeliveryModel/Attribute:name' => 'Nome',
 	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
-	'Class:DeliveryModel/Attribute:org_id' => 'Provedor',
+	'Class:DeliveryModel/Attribute:org_id' => 'Organização',
 	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => 'Nome da organização',
 	'Class:DeliveryModel/Attribute:organization_name+' => 'Nome comum',
 	'Class:DeliveryModel/Attribute:description' => 'Descrição',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => 'Contatos',
-	'Class:DeliveryModel/Attribute:contacts_list+' => 'Todos os Contatos (Equipes e Pessoas) associados à este Modelo de entrega',
+	'Class:DeliveryModel/Attribute:contacts_list+' => 'Todos os Contatos (Equipe e Pessoa) para esse Modelo de entrega',
 	'Class:DeliveryModel/Attribute:customers_list' => 'Clientes',
-	'Class:DeliveryModel/Attribute:customers_list+' => 'Todos os clientes atendidos por este Modelo de entrega',
+	'Class:DeliveryModel/Attribute:customers_list+' => 'Todos os Clientes com esse Modelo de entrega',
 ));

 //
@@ -471,7 +471,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 //

 Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
-	'Class:lnkDeliveryModelToContact' => 'Relação entre Modelo de entrega / Contato',
+	'Class:lnkDeliveryModelToContact' => 'Link Modelo de entrega / Contato',
 	'Class:lnkDeliveryModelToContact+' => '',
 	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s~~',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => 'Modelo de entrega',
--- a/datamodels/2.x/itop-sla-computation/datamodel.itop-sla-computation.xml
+++ b/datamodels/2.x/itop-sla-computation/datamodel.itop-sla-computation.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.3">
+  <meta>
+    <classes>
+      <class id="SLAComputation" _delta="define">
+        <interfaces>
+          <interface id="iWorkingTimeComputer"/>
+        </interfaces>
+      </class>
+    </classes>
+  </meta>
+</itop_design>
--- a/datamodels/2.x/itop-sla-computation/dictionaries/cs.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/cs.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('CS CZ', 'Czech', 'Čeština', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/da.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/da.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('DA DA', 'Danish', 'Dansk', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/de.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/de.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('DE DE', 'German', 'Deutsch', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/en.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/en.dict.itop-sla-computation.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('EN US', 'English', 'English', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/en_gb.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/en_gb.dict.itop-sla-computation.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('EN GB', 'British English', 'British English', array(
+	// Dictionary entries go here
+));
--- 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
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Spanish Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license    https://opensource.org/licenses/AGPL-3.0
+ * @author 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, Castellano', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/fr.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/fr.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('FR FR', 'French', 'Français', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/hu.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/hu.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('HU HU', 'Hungarian', 'Magyar', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/it.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/it.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('IT IT', 'Italian', 'Italiano', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/ja.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/ja.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('JA JP', 'Japanese', '日本語', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/nl.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/nl.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('NL NL', 'Dutch', 'Nederlands', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/pl.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/pl.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('PL PL', 'Polish', 'Polski', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/pt_br.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/pt_br.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('PT BR', 'Brazilian', 'Brazilian', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/ru.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/ru.dict.itop-sla-computation.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license    https://opensource.org/licenses/AGPL-3.0
+ * 
+ */
+/**
+ * @author Vladimir Kunin <v.b.kunin@gmail.com>
+ *
+ */
+Dict::Add('RU RU', 'Russian', 'Русский', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/sk.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/sk.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('SK SK', 'Slovak', 'Slovenčina', array(
+	// Dictionary entries go here
+));
--- a/datamodels/2.x/itop-sla-computation/dictionaries/tr.dict.itop-sla-computation.php
+++ b/datamodels/2.x/itop-sla-computation/dictionaries/tr.dict.itop-sla-computation.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Localized data
+ *
+ * @copyright Copyright (C) 2010-2024 Combodo SAS
+ * @license	http://opensource.org/licenses/AGPL-3.0
+ *
+ * This file is part of iTop.
+ *
+ * iTop is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * iTop is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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('TR TR', 'Turkish', 'Türkçe', array(
+	// Dictionary entries go here
+));
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eric Espie	4d9be0cfe4	removed symfonycasts	2025-10-03 11:39:05 +02:00
Eric Espie	39fd879ca9	✅ Make unit tests working	2025-10-02 09:48:22 +02:00
Eric Espie	0ea0da525e	🔊 Forms exceptions log	2025-10-01 16:21:11 +02:00
Eric Espie	42e25bf395	autoload	2025-09-30 13:55:20 +02:00
Eric Espie	c20221a683	SDK Form demonstrator dynamic field without dependency	2025-09-26 10:01:21 +02:00
Eric Espie	6c54ee0666	SDK Form demonstrator wip sub-forms	2025-09-26 10:01:15 +02:00
Eric Espie	f0775c4333	SDK Form demonstrator wip	2025-09-26 10:01:12 +02:00
Eric Espie	7558b7af08	✅ Remove test dirs in lib	2025-09-26 10:01:12 +02:00
Eric Espie	bc4d4431d8	SDK Form demonstrator cleanup	2025-09-26 10:01:10 +02:00
Eric Espie	3d72800755	SDK Form demonstrator Use iTop FormBuilder in the controller to allow transparent use of dynamic forms	2025-09-26 10:01:03 +02:00
Eric Espie	2873570677	✅ Fix CI	2025-09-26 10:00:59 +02:00
Eric Espie	a4da05efee	SDK Form demonstrator fix recursive field hiding	2025-09-26 10:00:59 +02:00
Eric Espie	c522763412	SDK Form demonstrator refactor	2025-09-26 10:00:59 +02:00
Eric Espie	a44b7b13f0	SDK Form demonstrator implement field dependency graph	2025-09-26 10:00:59 +02:00
Eric Espie	81a256aa0e	SDK Form demonstrator introduce field dependency graph	2025-09-26 10:00:56 +02:00
Eric Espie	c91efa53bc	SDK Form demonstrator refactor	2025-09-26 10:00:49 +02:00
Eric Espie	3c879759be	SDK Form demonstrator delegate ... to the iTop Form Builder	2025-09-26 10:00:44 +02:00
Eric Espie	f737ad72a0	SDK Form demonstrator delegate ... to the iTop Form Builder	2025-09-26 10:00:44 +02:00
Eric Espie	e9aaa96aef	SDK Form demonstrator delegate creation of hidden dynamic fields to the iTop Form Builder	2025-09-26 10:00:44 +02:00
Eric Espie	782cff655b	SDK Form demonstrator refactor AbstractType for dynamic behaviour	2025-09-26 10:00:44 +02:00
Eric Espie	5466b506ee	SDK Form demonstrator improve delegation and hide fields when not needed	2025-09-26 10:00:44 +02:00
Eric Espie	4603fcaa4f	SDK Form demonstrator	2025-09-26 10:00:44 +02:00
Eric Espie	305e43687d	SDK Form demonstrator limit events callbacks	2025-09-26 10:00:44 +02:00
Eric Espie	1be84ced61	SDK Form demonstrator basic events callbacks for dynamic fields	2025-09-26 10:00:44 +02:00
Eric Espie	1a1fb26425	SDK Form demonstrator basic events	2025-09-26 10:00:44 +02:00
Eric Espie	2d13aa76d0	SDK Form demonstrator use symfonycast/dynamic_forms	2025-09-26 10:00:44 +02:00
Eric Espie	6acd687e05	SDK Form demonstrator	2025-09-26 10:00:41 +02:00
Eric Espie	c4a9e980da	SDK Form demonstrator	2025-09-26 09:59:49 +02:00
Eric Espie	c0b39a6ecb	SDK Form demonstrator	2025-09-26 09:59:49 +02:00
Eric Espie	13c6c6fb24	SDK Form demonstrator	2025-09-26 09:59:49 +02:00
Eric Espie	0edb8e872f	SDK Form demonstrator	2025-09-26 09:59:44 +02:00