N°9128 - Add padding to fullscreen CKEditor

✅ Fix PHP code styles for Chinese dictionaries
📝 Add 3.2.3-1 and 3.2.3-2 to version history
2026-08-13 09:18:19 +02:00 · 2026-08-12 16:14:36 +02:00 · 2026-08-06 16:33:31 +02:00 · 2026-08-06 13:37:44 +02:00 · 2026-08-04 15:26:11 +02:00 · 2026-07-28 09:39:58 +02:00
585 changed files with 21801 additions and 4815 deletions
--- a/.doc/itop-version-history.md
+++ b/.doc/itop-version-history.md
@@ -0,0 +1,114 @@
+# iTop version history
+
+```mermaid
+%%{init: { 'logLevel': 'debug', 'theme': 'base', 'themeVariables': {
+              'git0': 'lawngreen',
+              'git3': 'dodgerblue',
+              'git4': 'grey',
+              'git5': 'grey',
+              'git6': 'grey',
+              'git7': 'grey',
+              'git8': 'grey'
+       }, 'gitGraph': {'showBranches': true,'mainBranchName': 'develop','rotateCommitLabel': true}} }%%
+gitGraph
+    commit id: "2016-07-06" tag: "2.3.0" type: HIGHLIGHT
+    branch support/2.3 order: 900
+    commit id: "2016-07-08" tag: "2.3.1"
+    commit id: "2016-12-22" tag: "2.3.3"
+    commit id: "2017-04-14" tag: "2.3.4"
+    checkout develop
+    commit id: "2017-07-12" tag: "2.4.0-beta" type: REVERSE
+    commit id: "2017-11-16" tag: "2.4.0" type: HIGHLIGHT
+    branch support/2.4 order: 890
+    commit id: "2018-02-14" tag: "2.4.1"
+    checkout develop
+    commit id: "2018-04-25" tag: "2.5.0-beta" type: REVERSE
+    checkout support/2.4
+    commit id: "2018-06-14" tag: "2.4.2"
+    checkout develop
+    commit id: "2018-06-27" tag: "2.5.0" type: HIGHLIGHT
+    branch support/2.5 order: 880
+    checkout develop
+    commit id: "2019-01-09" tag: "2.6.0" type: HIGHLIGHT
+    branch support/2.6 order: 870
+    commit id: "2019-03-28" tag: "2.6.1"
+    checkout develop
+    commit id: "2019-12-18" tag: "2.7.0-beta" type: REVERSE
+    checkout support/2.5
+    commit id: "2020-01-22" tag: "2.5.4"
+    checkout support/2.6
+    commit id: "2020-01-23" tag: "2.6.3"
+    checkout develop
+    commit id: "2020-01-29" tag: "2.7.0-beta2" type: REVERSE
+    commit id: "2020-04-01" tag: "2.7.0-1" type: HIGHLIGHT
+    checkout support/2.6
+    commit id: "2020-04-22" tag: "2.6.4"
+    checkout develop
+    branch support/2.7 order: 860
+    commit id: "2020-06-26" tag: "2.7.1"
+    checkout support/2.7
+    commit id: "2020-12-09" tag: "2.7.3"
+    commit id: "2021-03-31" tag: "2.7.4"
+    checkout develop
+    commit id: "2021-04-06" tag: "3.0.0-beta" type: REVERSE
+    checkout support/2.7
+    commit id: "2021-07-05" tag: "2.7.5"
+    checkout develop
+    commit id: "2021-07-05." tag: "3.0.0-beta2" type: REVERSE
+    checkout support/2.7
+    commit id: "2021-12-17" tag: "2.7.6"
+    checkout develop
+    commit id: "2022-01-04" tag: "3.0.0" type: HIGHLIGHT
+    branch support/3.0 order: 850
+    commit id: "2022-04-08" tag: "3.0.1"
+    checkout support/2.7
+    commit id: "2022-07-11" tag: "2.7.7"
+    checkout support/3.0
+    commit id: "2022-09-12" tag: "3.0.2-1"
+    checkout develop
+    checkout support/2.7
+    commit id: "2022-12-28" tag: "2.7.8"
+    checkout support/3.0
+    commit id: "2023-04-12" tag: "3.0.3"
+    checkout develop
+    commit id: "2023-06-19" tag: "3.1.0-beta" type: REVERSE
+    commit id: "2023-07-26" tag: "3.1.0-1" type: HIGHLIGHT
+    branch support/3.1 order: 840
+    checkout support/3.1
+    commit id: "2023-08-09" tag: "3.1.0-2"
+    checkout support/2.7
+    commit id: "2023-08-10" tag: "2.7.9"
+    checkout support/3.1
+    commit id: "2023-12-20" tag: "3.1.1"
+    checkout develop
+    commit id: "2024-01-15" tag: "Start 3.2" type: HIGHLIGHT
+    branch support/3.2 order: 830
+    checkout support/2.7
+    commit id: "2024-01-17a" tag: "2.7.10"
+    checkout support/3.0
+    commit id: "2024-01-17b" tag: "3.0.4"
+    checkout support/2.7
+    commit id: "2024-09-28" tag: "2.7.11"
+    checkout support/3.1
+    commit id: "2024-09-27" tag: "3.1.2"
+    checkout support/3.2
+    commit id: "2024-06-25" tag: "3.2.0-beta1" type: REVERSE
+    commit id: "2024-08-07" tag: "3.2.0"
+    checkout support/2.7
+    commit id: "2025-02-07a" tag: "2.7.12"
+    checkout support/3.1
+    commit id: "2025-02-07b" tag: "3.1.3"
+    checkout support/3.2
+    commit id: "2025-02-07c " tag: "3.2.1"
+    commit id: "2025-03-31 " tag: "3.2.1-1"
+    commit id: "2025-07-28 " tag: "3.2.2"
+    checkout support/2.7
+    commit id: "2025-09-25" tag: "2.7.13"
+    checkout support/3.2
+    commit id: "2026-04-27 " tag: "3.2.3"
+    checkout support/3.2.3
+    commit id: "2026-05-25 " tag: "3.2.3-1"
+    commit id: "2026-07-17 " tag: "3.2.3-2"
+```
+
+To learn more, check the [iTop community versions history on the official wiki](https://www.itophub.io/wiki/page?id=latest:release:start).
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -0,0 +1,59 @@
+name: "Bug report"
+description: "Report a bug that you identified in iTop, with the steps to reproduce it and the expected vs actual behavior. If you have an improvement proposition, please use the 'Enhancement suggestion' template instead."
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please explain why you're creating this issue :
+        - Are you willing to create a PR for the bug fix ? If so, we'll indicate in the issue if we're interested in it.
+        - Then, please describe how to reproduce the issue.
+
+  - type: dropdown
+    id: willing_to_pr
+    attributes:
+      label: Are you willing to create (at a later stage) a PR for that?
+      options:
+        - Yes
+        - No
+    validations:
+      required: true
+
+  - type: input
+    id: itop_version
+    attributes:
+      label: iTop version
+      description: "Complete iTop version (e.g., 3.2.3)"
+    validations:
+      required: false
+
+  - type: input
+    id: php_version
+    attributes:
+      label: PHP version
+      description: "Complete PHP version (e.g., 8.4.20)"
+    validations:
+      required: false
+
+  - type: textarea
+    id: reproduction_steps
+    attributes:
+      label: Reproduction procedure
+      description: |
+        Please explain step by step how to reproduce the issue on a standard iTop Community.
+        If it requires a custom datamodel, provide the minimal XML delta to reproduce it.
+      placeholder: |
+        1. First go there
+        2. Then do that
+        3. ...
+        4. Finally, see that... (what is expected and what is actually happening)
+    validations:
+      required: false
+
+  - type: upload
+    id: additional_info
+    attributes:
+      label: Additional information (if needed)
+      description: "Add/drag and drop screenshots, logs or any files that can be relevant for your issue."
+    validations:
+      required: false
+      accept: ".png, .jpg, .jpeg, .gif, .webp, .log, .txt, .json, .csv, .xml, .zip, .tar.gz"
--- a/.github/ISSUE_TEMPLATE/enhancement.yml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yml
@@ -0,0 +1,54 @@
+name: "Enhancement suggestion"
+description: "Suggest an improvement to iTop, with a clear description of the expected behavior and the benefits it would bring. If you identified a bug and have an improvement proposition, please use the 'Bug report' template instead."
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Please explain why you're creating this issue :
+        - Are you willing to create a PR for this enhancement ? If so, we'll indicate in the issue if we're interested in it.
+        - Then, please describe what's your improvement proposition.
+
+  - type: dropdown
+    id: willing_to_pr
+    attributes:
+      label: Are you willing to create (at a later stage) a PR for that?
+      options:
+        - Yes
+        - No
+    validations:
+      required: true
+
+  - type: input
+    id: itop_version
+    attributes:
+      label: iTop version
+      description: "Complete iTop version (e.g., 3.2.3)"
+    validations:
+      required: false
+
+  - type: input
+    id: php_version
+    attributes:
+      label: PHP version
+      description: "Complete PHP version (e.g., 8.4.20)"
+    validations:
+      required: false
+
+  - type: textarea
+    id: enhancement_details
+    attributes:
+      label: Enhancement details
+      description: |
+        Please explain what you want to improve, and your proposition to make it better.
+        If it requires a custom datamodel, provide the minimal XML delta to reproduce it.
+    validations:
+      required: false
+
+  - type: upload
+    id: additional_info
+    attributes:
+      label: Additional information (if needed)
+      description: "Add/drag and drop screenshots, logs or any files that can be relevant for your issue."
+    validations:
+      required: false
+      accept: ".png, .jpg, .jpeg, .gif, .webp, .log, .txt, .json, .csv, .xml, .zip, .tar.gz"
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,83 +1,76 @@
 <!--
+IMPORTANT: Before creating your PR, please create an issue first to know if Combodo is interested in your contribution (not needed for translations PR).
+Since we may refuse a PR, it's preferable to create an issue first, to avoid spending time coding something that won't be accepted.

-IMPORTANT: Please follow the guidelines within this PR template before submitting it, it will greatly help us process your PR. 🙏
+Once you've done it, and we confirmed we're interested in it, please follow the guidelines within this PR template before submitting it, it will greatly help us process your PR. 🙏

 Any PRs not following the guidelines or with missing information will not be considered.
-
 -->

 ## Base information
-| Question                                                      | Answer 
-|---------------------------------------------------------------|--------
-| Related to a SourceForge thead / Another PR / Combodo ticket? | <!-- Put the URL -->
-| Type of change?                                               | Bug fix / Enhancement / Translations

+| Question                                                                        | Answer                               |
+|---------------------------------------------------------------------------------|--------------------------------------|
+| Related to a SourceForge thread / Another PR / A GitHub Issue / Combodo ticket? | <!-- Put the URL -->                 |
+| Type of change?                                                                 | Bug fix / Enhancement / Translations |

 ## Symptom (bug) / Objective (enhancement)
+
 <!--
 If it's a bug
  - Explain the symptom in details
  - If possible put error messages, logs or screenshots (you can paste image directly in this editor).

 If it's an enhancement
-  - Describe what is blocking you, what is the objective with as much details as possible.
+  - Describe what is blocking you, what is the objective with as many details as possible.
  - Add screenshots if it's related to UI.
 -->

-
 ## Reproduction procedure (bug)
+
 <!--
-Remove this section only if it's NOT a bug.
-
-Otherwise, explain step by step how to reproduce the issue on a standard iTop Community.
-
+Please explain step by step how to reproduce the issue on a standard iTop Community.
 If it requires a custom datamodel, provide the minimal XML delta to reproduce it on a standard iTop Community.
 -->

 1. On iTop x.y.z <!-- Put complete iTop version (eg. 3.1.0-2) -->
 2. With PHP x.y.z <!-- Put complete PHP version (eg. 8.1.24) -->
-2. First go there
-2. Then do that
-3. ...
-4. Finally, see that...
+3. First go there
+4. Then do that
+5. ...
+6. Finally, see that... (what is expected and what is actually happening)

+## Reproduction procedure (enhancement - if needed)
+
+<!--
+Please explain how we can reproduce the feature/behavior you want to improve, and what's your proposition to make it better.
+Add screenshots if it's related to UI.
+If it requires a custom datamodel, provide the minimal XML delta to reproduce it on a standard iTop Community.
+-->

 ## Cause (bug)
+
 <!--
 Remove this section only if it's NOT a bug.

 Otherwise, explain what is the cause of the issue (where in the code and why)
 -->

-
 ## Proposed solution (bug and enhancement)
+
 <!--
 Explain in details how you are proposing to solve this:
  - What did you do in the code and why
  - If you changed something in the UI, put before / after screenshots (you can paste image directly in this editor)
 -->

-
 ## Checklist before requesting a review
+
 <!--
 Don't remove these lines, check them once done.
 -->
+
 - [ ] I have performed a self-review of my code
 - [ ] I have tested all changes I made on an iTop instance
 - [ ] I have added a unit test, otherwise I have explained why I couldn't
- [ ] Is the PR clear and detailed enough so anyone can understand digging in the code?
-
-## Checklist of things to do before PR is ready to merge
-<!--
-Things that needs to be done in the PR before it can be considered as ready to be merged
-
-Examples:
- Changes requested in the review
- Unit test to add
- Dictionary entries to translate
- ...
-->
-
- [ ] ...
- [ ] ...
- [ ] ...
+- [ ] Is the PR clear and detailed enough so anyone can understand without digging in the code?
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -4,30 +4,33 @@ You want to contribute to iTop? Many thanks to you! 🎉 👍

 Here are some guidelines that will help us integrate your work!

-
 ## Contributions

 ### Subjects
+
 You are welcome to create pull requests on any of those subjects:

 * 🐛 bug fix
 * 🌐 translation / i18n / l10n
+* 🚸 enhancement

-If you want to implement a **new feature**, please [create a corresponding ticket](https://sourceforge.net/p/itop/tickets/new/) for review.   
-If you ever want to begin implementation, do so in a fork, and add a link to the corresponding commits in the ticket.
+But before creating a PR, please [create a corresponding issue][itop-issues] for review.
+We should review within two weeks, and get back to you to indicate if we're interested in your proposal or not.
+If you don't create an issue, you won't know if we're interested in your contribution, and you may spend time coding something that won't be accepted.
+If you ever want to begin implementation, do so in a fork, and add a link to the corresponding commits in the issue.

 For all **security related subjects**, please see our [security policy](SECURITY.md).

-All **datamodel modification** should be done in an extension. Beware that such change would 
-impact all existing customers, and could prevent them from 
-upgrading!
-Combodo has a long experience of datamodel changes: they are very disruptive! 
+All **datamodel modification** should be done in an extension. Beware that such change would
+impact all existing customers, and could prevent them from upgrading!
+Combodo has a long experience of datamodel changes: they are very disruptive!
 This is why we avoid them in iTop core, especially the changes on existing objects/fields.   
-If you have an idea you're sure would benefit to all of iTop users, you may 
-[create a corresponding ticket](https://sourceforge.net/p/itop/tickets/new/) to submit it, but be warned that there are lots of good 
+If you have an idea you're sure would benefit to all of iTop users, you may
+[create a corresponding issue][itop-issues] to submit it, but be warned that there are lots of good
 reasons to refuse such changes.

 ### 📄 License and copyright
+
 iTop is distributed under the AGPL-3.0 license (see the [license.txt] file).

 The iTop repository is divided in three parts: iTop (mainly PHP/JS/XML sources and dictionaries), images, and third-party libraries.
@@ -37,48 +40,33 @@ Anyhow, you are encouraged to signal your contribution by the mean of `@author`
 If you want to use another license or keep the code ownership (copyright), you may [create an extension][wiki new ext].

 [license.txt]: https://github.com/Combodo/iTop/blob/develop/license.txt
-[wiki new ext]: https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Astart#by_writing_your_own_extension

+[itop-issues]: https://github.com/Combodo/iTop/issues
+
+[wiki new ext]: https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Astart#by_writing_your_own_extension

 ## 🔀 iTop branch model

 When we first start with Git, we were using the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model. As
- there was some confusions about branches to use for current developed release and previous maintained release, and also because we were
- using just a very few of the GitFlow commands, we decided to add just a little modification to this branch model : since april 2020
-  we don't have a `master` branch anymore.
+there was some confusions about branches to use for current developed release and previous maintained release, and also because we were
+using just a very few of the GitFlow commands, we decided to add just a little modification to this branch model : since April 2020
+we don't have a `master` branch anymore.

-Here are the branches we use and their meaning : 
+Here are the branches we use and their meaning :

 - `develop`: ongoing development version
- `release/*`: if present, that means we are working on a alpha/beta/rc version for shipping
 - `support/*`: maintenance branches for older versions

 For example, if no version is currently prepared for shipping we could have:

- `develop` containing future 3.1.0 version
- `support/3.0`: 3.0.x maintenance version
- `support/2.7`: 2.7.x maintenance version
- `support/2.6`: 2.6.x maintenance version
+- `develop` containing future 3.3.0 version
+- `support/3.2`: 3.2.x maintenance version

-In this example, when 3.1.0-beta is shipped that will become:
-
- `develop`: future 3.2.0 version
- `release/3.1.0`: 3.1.0-beta
- `support/3.0`: 3.0.x maintenance version
- `support/2.7`: 2.7.x maintenance version
- `support/2.6`: 2.6.x maintenance version
-
-And when 3.1.0 final will be out:
-
- `develop`: future 3.2.0 version
- `support/3.1`: 3.1.x maintenance version (will host developments for 3.1.1)
- `support/3.0`: 3.0.x maintenance version
- `support/2.7`: 2.7.x maintenance version
- `support/2.6`: 2.6.x maintenance version
-
-Also note that we have a "micro-version" concept : each of those versions have a very small amount of modifications. They are made from
- `support/*` branches as well. For example 2.6.2-1 and 2.6.2-2 were made from the `support/2.6.2` branch. 
+And when 3.3.0 will be out:

+- `develop`: future 3.4.0 version
+- `support/3.3`: 3.3.x maintenance version (will host developments for 3.3.1)
+- `support/3.2`: 3.2.x maintenance version

 ## Coding

@@ -92,12 +80,11 @@ A [dedicated page](https://www.itophub.io/wiki/page?id=latest%3Acustomization%3A
 2. Create a branch in this fork, based on the develop branch
 3. Code !

-Do create a dedicated branch for each modification you want to propose : if you don't it will be very hard to merge back your work !
+Do create a dedicated branch for each modification you want to propose : if you don't, it will be very hard to merge back your work !

-Most of the time you should based your developments on the develop branch.    
+Most of the time you should base your developments on the develop branch.    
 That may be different if you want to fix a bug, please use develop anyway and ask in your PR if rebase is possible.

-
 ### 🎨 PHP styleguide

 Please follow [our guidelines](https://www.itophub.io/wiki/page?id=latest%3Acustomization%3Acoding_standards).
@@ -106,7 +93,7 @@ Please follow [our guidelines](https://www.itophub.io/wiki/page?id=latest%3Acust

 Please create tests that covers as much as possible the code you're submitting.

-Our tests are located in the `test/` directory, containing a PHPUnit config file : `phpunit.xml.dist`.
+Our tests are located in the `tests/` directory, containing a PHPUnit config file : `phpunit.xml.dist`.

 ### Git Commit Messages

@@ -138,14 +125,14 @@ When your code is working, please:
 * Rebase your branch on our repo last commit,
 * Create a pull request. _Detailed procedure to work on fork and create PR is available [in GitHub help pages](https://help.github.com/articles/creating-a-pull-request-from-a-fork/)_.
 * Pull request description: mind to add all the information useful to understand why you're suggesting this modification and anything necessary to dive into your work. Especially:
-  - Bugfixes: exact steps to reproduce the bug (given/when/then), description of the bug cause and what solution is implemented 
-  - Enhancements: use cases, implementation details if needed
-* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option ! (note that if you are working with an org fork, this option [won't be available](https://github.com/orgs/community/discussions/5634))
-
+    - Bugfixes: exact steps to reproduce the bug (given/when/then), description of the bug cause and what solution is implemented
+    - Enhancements: use cases, implementation details if needed
+* Mind to check the "[Allow edits from maintainers](https://docs.github.com/en/github-ae@latest/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork)" option ! (note that if you are working with an org fork, this
+  option [won't be available](https://github.com/orgs/community/discussions/5634))

 ## 🙏 We are thankful

-We are thankful for all your contributions to the iTop universe! As a thank you gift, we will send stickers to every iTop (& extensions) contributors!
+We are thankful for all your contributions to the iTop universe! As a thank-you gift, we will send stickers to every iTop (& extensions) contributors!

 We have one sticker per contribution type. You might get multiple stickers with one contribution though :)

@@ -157,8 +144,4 @@ We have one sticker per contribution type. You might get multiple stickers with
 * Graduated: Follow a Combodo's iTop training
 * Ambassador: Outstanding community contributors
 * Beta tester: Test and give feedback on beta releases
-* Extension developer: Develop and publish an extension
-
-Here is the design of each stickers for year 2024:
-
-![iTop stickers 2024](.doc/contributing-guide/2024.contributing-stickers-side-by-side.png)
+* Extension developer: Develop and publish an extension
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -810,6 +810,7 @@ HTML
 				foreach ($aNotificationClasses as $sNotifClass) {
 					$aNotifSearches[$sNotifClass] = DBObjectSearch::FromOQL("SELECT $sNotifClass AS Ev JOIN Trigger AS T ON Ev.trigger_id = T.id WHERE T.id IN (:triggers) AND Ev.object_id = :id");
 					$aNotifSearches[$sNotifClass]->SetInternalParams($aParams);
+					$aNotifSearches[$sNotifClass]->AllowAllData();
 					$oNotifSet = new DBObjectSet($aNotifSearches[$sNotifClass], []);
 					$iNotifsCount += $oNotifSet->Count();
 				}
@@ -823,6 +824,7 @@ HTML
 						'menu' => false,
 						'panel_title' => MetaModel::GetName($sNotifClass),
 						'panel_icon' => MetaModel::GetClassIcon($sNotifClass, false),
+						'display_unauthorized_objects' => true,
 					]);
 				}
 			}
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -724,6 +724,10 @@ class DisplayBlock
 				}
 			}

+			if (!$this->m_oFilter->IsAllDataAllowed() && ($aExtraParams['display_unauthorized_objects'] ?? false) === true) {
+				$this->m_oFilter->AllowAllData();
+			}
+
 			$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
 			$this->m_oSet = new CMDBObjectSet($this->m_oFilter, $aOrderBy, $aQueryParams);
 		}
@@ -1381,7 +1385,10 @@ JS

 		// Check the classes that can be read (i.e authorized) by this user...
 		foreach ($aClasses as $sAlias => $sClassName) {
-			if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $this->m_oSet) != UR_ALLOWED_NO) {
+			if (
+				(UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $this->m_oSet) !== UR_ALLOWED_NO)
+				|| ($aExtraParams['display_unauthorized_objects'] ?? false) === true
+			) {
 				$aAuthorizedClasses[$sAlias] = $sClassName;
 			}
 		}
--- a/application/loginexternal.class.inc.php
+++ b/application/loginexternal.class.inc.php
@@ -75,13 +75,10 @@ class LoginExternal extends AbstractLoginFSMExtension
 	}

 	/**
-	 * @return bool
+	 * @return bool|mixed
 	 */
 	private function GetAuthUser()
 	{
-		$sExtAuthVar = MetaModel::GetConfig()->GetExternalAuthenticationVariable(); // In which variable is the info passed ?
-		eval('$sAuthUser = isset('.$sExtAuthVar.') ? '.$sExtAuthVar.' : false;'); // Retrieve the value
-		/** @var string $sAuthUser */
-		return $sAuthUser; // Retrieve the value
+		return MetaModel::GetConfig()->GetExternalAuthenticationVariable();
 	}
 }
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -1546,12 +1546,21 @@ class ShortcutMenuNode extends MenuNode
 	public function GetHyperlink($aExtraParams)
 	{
 		$sContext = $this->oShortcut->Get('context');
-		$aContext = unserialize($sContext);
-		if (isset($aContext['menu'])) {
-			unset($aContext['menu']);
-		}
-		foreach ($aContext as $sArgName => $sArgValue) {
-			$aExtraParams[$sArgName] = $sArgValue;
+		try {
+			$aContext = utils::Unserialize($sContext);
+			if (isset($aContext['menu'])) {
+				unset($aContext['menu']);
+			}
+			foreach ($aContext as $sArgName => $sArgValue) {
+				$aExtraParams[$sArgName] = $sArgValue;
+			}
+		} catch (Exception $e) {
+			IssueLog::Warning("User shortcut corrupted, delete the shortcut", LogChannels::CONSOLE, [
+				'shortcut_name' => $this->oShortcut->GetName(),
+				'root_cause' => $e->getMessage(),
+			]);
+			// delete the shortcut
+			$this->oShortcut->DBDelete();
 		}
 		return parent::GetHyperlink($aExtraParams);
 	}
--- a/application/themehandler.class.inc.php
+++ b/application/themehandler.class.inc.php
@@ -936,11 +936,6 @@ CSS;
 	public static function CloneThemeParameterAndIncludeVersion($aThemeParameters, $bSetupCompilationTimestamp, $aImportsPaths)
 	{
 		$aThemeParametersVariable = [];
-		if (array_key_exists('variables', $aThemeParameters)) {
-			if (is_array($aThemeParameters['variables'])) {
-				$aThemeParametersVariable = array_merge([], $aThemeParameters['variables']);
-			}
-		}

 		if (array_key_exists('variable_imports', $aThemeParameters)) {
 			if (is_array($aThemeParameters['variable_imports'])) {
@@ -948,6 +943,14 @@ CSS;
 			}
 		}

+		// Variables defined in theme XML have the priority over variables defined in XML imports files
+		// They're defined after so they overwrite previous parameters
+		if (array_key_exists('variables', $aThemeParameters)) {
+			if (is_array($aThemeParameters['variables'])) {
+				$aThemeParametersVariable = array_merge($aThemeParametersVariable, $aThemeParameters['variables']);
+			}
+		}
+
 		$aThemeParametersVariable['$version'] = $bSetupCompilationTimestamp;
 		return $aThemeParametersVariable;
 	}
@@ -979,7 +982,9 @@ CSS;
 				}
 			}
 		}
-		array_map(function ($sVariableValue) { return ltrim($sVariableValue); }, $aVariablesResults);
+		array_map(function ($sVariableValue) {
+			return ltrim($sVariableValue);
+		}, $aVariablesResults);
 		return $aVariablesResults;
 	}

--- a/application/ui.linksdirectwidget.class.inc.php
+++ b/application/ui.linksdirectwidget.class.inc.php
@@ -228,7 +228,7 @@ JS
 			<<<HTML
 <form id="ObjectsAddForm_{$this->sInputid}">
    <div id="SearchResultsToAdd_{$this->sInputid}">
-        <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
+        <div style="border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
    </div>
    <input type="hidden" id="count_{$this->sInputid}" value="0"/>
 </form>
--- a/application/ui.searchformforeignkeys.class.inc.php
+++ b/application/ui.searchformforeignkeys.class.inc.php
@@ -27,6 +27,9 @@ require_once(APPROOT.'/application/displayblock.class.inc.php');

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

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

 		$oPage->add(
 			<<<HTML
 <form id="ObjectsAddForm_{$this->m_iInputId}">
    <div id="SearchResultsToAdd_{$this->m_iInputId}" style="vertical-align:top;height:100%;overflow:auto;padding:0;border:0;">
-        <div style="background: #fff; border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
+        <div style="border:0; text-align:center; vertical-align:middle;"><p>{$sEmptyList}</p></div>
    </div>
    <input type="hidden" id="count_{$this->m_iInputId}" value="0"/>
 </form>
 HTML
 		);
-
-		$oPage->add_ready_script(
-			<<<JS
- $('#dlg_{$this->m_iInputId}').dialog({ 
- 			width: $(window).width()*0.8, 
- 			height: $(window).height()*0.8, 
- 			autoOpen: false, 
- 			modal: true, 
- 			resizeStop: oForeignKeysWidget{$this->m_iInputId}.UpdateSizes,
-            buttons: [
-				{
-					text: Dict.S('UI:Button:Cancel'),
-					class: "cancel ibo-is-alternative ibo-is-neutral",
-					click: function() {
-						$('#dlg_{$this->m_iInputId}').dialog('close');
-					}
-				},
-				{
-					text:  Dict.S('UI:Button:Add'),
-					id: 'btn_ok_{$this->m_iInputId}',
-					class: "ok ibo-is-regular ibo-is-primary",
-					click: function() {
-						oForeignKeysWidget{$this->m_iInputId}.DoAddObjects(this.id);							
-					}
-				},
-			],
-
- });
-$('#dlg_{$this->m_iInputId}').dialog('option', {title:'$sTitle'});
-$('#SearchFormToAdd_{$this->m_iInputId} form').on('submit.uilinksWizard', oForeignKeysWidget{$this->m_iInputId}.SearchObjectsToAdd);
-$('#SearchFormToAdd_{$this->m_iInputId}').on('resize', oForeignKeysWidget{$this->m_iInputId}.UpdateSizes);
-JS
-		);
 	}

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

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

+			case static::ENUM_SANITIZATION_FILTER_MODULE_CODE:
+				// Module codes allow all alphabets letters, numbers, dash and dot characters
+				$retValue = filter_var(
+					$value,
+					FILTER_VALIDATE_REGEXP,
+					['options' => ['regexp' => '/^[\p{L}\d.-]+$/u']]
+				);
+				break;
+
 				// For URL
 			case static::ENUM_SANITIZATION_FILTER_URL:
 				$retValue = filter_var($value, FILTER_SANITIZE_URL);
@@ -1440,6 +1455,12 @@ class utils

 			case iPopupMenuExtension::MENU_OBJLIST_TOOLKIT:
 				/** @var \DBObjectSet $param */
+
+				// Check if the user has the right to read the objects of this list, otherwise do not propose any action (eg. configure this list, export, etc.)
+				if (UserRights::IsActionAllowed($param->GetFilter()->GetClass(), UR_ACTION_READ, $param) !== UR_ALLOWED_YES) {
+					break;
+				}
+
 				$oAppContext = new ApplicationContext();
 				$sContext = $oAppContext->GetForLink(true);
 				$sDataTableId = is_null($sDataTableId) ? '' : $sDataTableId;
@@ -1901,7 +1922,9 @@ SQL;
 				$aResponseHeaders[$sName] = $sValue;
 			}
 		}
-		curl_close($ch);
+		if (PHP_VERSION_ID < 80000) {
+			curl_close($ch);
+		}

 		return $response;
 	}
@@ -2081,7 +2104,9 @@ SQL;
 			}

 			// Remove any remaining nulls (for positions that weren't referenced)
-			$aReplacements = array_filter($aReplacements, static function ($val) { return $val !== null; });
+			$aReplacements = array_filter($aReplacements, static function ($val) {
+				return $val !== null;
+			});
 		} else {
 			// For non-positional, we need to map each position
 			$aReplacements = [];
@@ -3229,4 +3254,50 @@ TXT

 		return $aTrace;
 	}
+
+	/**
+	 * PHP unserialize encapsulation, allow throwing exception when not allowed object class is detected (for security hardening)
+	 *
+	 * @param string $data data to unserialize
+	 * @param array $aOptions PHP @unserialise options
+	 * @param bool $bThrowNotAllowedObjectClassException flag to throw exception
+	 *
+	 * @return mixed PHP @unserialise return
+	 * @throws Exception
+	 */
+	public static function Unserialize(string $data, array $aOptions = ['allowed_classes' => false], bool $bThrowNotAllowedObjectClassException = true): mixed
+	{
+		$data = unserialize($data, $aOptions);
+
+		if ($bThrowNotAllowedObjectClassException) {
+			try {
+				self::AssertNoIncompleteClassDetected($data);
+			} catch (Exception $e) {
+				throw new CoreException('Unserialization failed because an incomplete class was detected.', [], '', $e);
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 * Assert that data provided doesn't contain any incomplete class.
+	 *
+	 * @throws Exception
+	 */
+	public static function AssertNoIncompleteClassDetected(mixed $data): void
+	{
+		if (is_object($data)) {
+			if ($data instanceof __PHP_Incomplete_Class) {
+				throw new Exception('__PHP_Incomplete_Class_Name object detected');
+			}
+			foreach (get_object_vars($data) as $property) {
+				self::AssertNoIncompleteClassDetected($property);
+			}
+		} elseif (is_array($data)) {
+			foreach ($data as $value) {
+				self::AssertNoIncompleteClassDetected($value);
+			}
+		}
+	}
 }
--- a/approot.inc.php
+++ b/approot.inc.php
@@ -23,7 +23,7 @@ define('ITOP_DESIGN_LATEST_VERSION', '3.2');
 * @used-by utils::GetItopVersionWikiSyntax()
 * @used-by iTopModulesPhpVersionIntegrationTest
 */
-define('ITOP_CORE_VERSION', '3.2.1');
+define('ITOP_CORE_VERSION', '3.2.3');

 /**
 * @var string
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,7 @@
    "pear/archive_tar": "~1.4.14",
    "pelago/emogrifier": "^7.2.0",
    "psr/log": "^3.0.0",
-    "scssphp/scssphp": "^1.12.1",
+    "scssphp/scssphp": "dev-combodo/1.x",
    "symfony/console": "~6.4.0",
    "symfony/dotenv": "~6.4.0",
    "symfony/framework-bundle": "~6.4.0",
@@ -43,6 +43,10 @@
    {
      "type": "vcs",
      "url": "https://github.com/EsupPortail/phpCAS"
+    },
+    {
+      "type": "vcs",
+      "url": "https://github.com/combodo-itop-libs/scssphp"
    }
  ],
  "suggest": {
--- 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": "ceac38f6033afe07b7ab977fa39fe348",
+    "content-hash": "eebbdc6c10a479b0e62fc18d88496f5c",
    "packages": [
        {
            "name": "apereo/phpcas",
@@ -1588,16 +1588,16 @@
        },
        {
            "name": "scssphp/scssphp",
-            "version": "v1.13.0",
+            "version": "dev-combodo/1.x",
            "source": {
                "type": "git",
-                "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "63d1157457e5554edf00b0c1fabab4c1511d2520"
+                "url": "https://github.com/combodo-itop-libs/scssphp.git",
+                "reference": "6820f035182a956c355cbfa7882d90f1198a208b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/63d1157457e5554edf00b0c1fabab4c1511d2520",
-                "reference": "63d1157457e5554edf00b0c1fabab4c1511d2520",
+                "url": "https://api.github.com/repos/combodo-itop-libs/scssphp/zipball/6820f035182a956c355cbfa7882d90f1198a208b",
+                "reference": "6820f035182a956c355cbfa7882d90f1198a208b",
                "shasum": ""
            },
            "require": {
@@ -1626,8 +1626,8 @@
            "type": "library",
            "extra": {
                "bamarni-bin": {
-                    "bin-links": false,
-                    "forward-command": false
+                    "forward-command": false,
+                    "bin-links": false
                }
            },
            "autoload": {
@@ -1635,7 +1635,11 @@
                    "ScssPhp\\ScssPhp\\": "src/"
                }
            },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "ScssPhp\\ScssPhp\\Tests\\": "tests/"
+                }
+            },
            "license": [
                "MIT"
            ],
@@ -1661,10 +1665,9 @@
                "stylesheet"
            ],
            "support": {
-                "issues": "https://github.com/scssphp/scssphp/issues",
-                "source": "https://github.com/scssphp/scssphp/tree/v1.13.0"
+                "source": "https://github.com/combodo-itop-libs/scssphp/tree/combodo/1.x"
            },
-            "time": "2024-08-17T21:02:11+00:00"
+            "time": "2026-04-23T14:20:24+00:00"
        },
        {
            "name": "soundasleep/html2text",
@@ -4784,16 +4787,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v3.23.0",
+            "version": "v3.28.0",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9"
+                "reference": "597c12ed286fb9d1701a36684ce6e0cbe28ebc8b"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9",
-                "reference": "a64dc5d2cc7d6cafb9347f6cd802d0d06d0351c9",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/597c12ed286fb9d1701a36684ce6e0cbe28ebc8b",
+                "reference": "597c12ed286fb9d1701a36684ce6e0cbe28ebc8b",
                "shasum": ""
            },
            "require": {
@@ -4803,7 +4806,8 @@
                "symfony/polyfill-mbstring": "^1.3"
            },
            "require-dev": {
-                "phpstan/phpstan": "^2.0",
+                "php-cs-fixer/shim": "^3.0@stable",
+                "phpstan/phpstan": "^2.0@stable",
                "psr/container": "^1.0|^2.0",
                "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0"
            },
@@ -4847,7 +4851,7 @@
            ],
            "support": {
                "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v3.23.0"
+                "source": "https://github.com/twigphp/Twig/tree/v3.28.0"
            },
            "funding": [
                {
@@ -4859,7 +4863,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2026-01-23T21:00:41+00:00"
+            "time": "2026-07-03T20:44:34+00:00"
        }
    ],
    "packages-dev": [
@@ -5097,7 +5101,8 @@
    "aliases": [],
    "minimum-stability": "stable",
    "stability-flags": {
-        "apereo/phpcas": 20
+        "apereo/phpcas": 20,
+        "scssphp/scssphp": 20
    },
    "prefer-stable": false,
    "prefer-lowest": false,
--- a/core/action.class.inc.php
+++ b/core/action.class.inc.php
@@ -234,10 +234,11 @@ abstract class Action extends cmdbAbstractObject
 		}

 		$oActionFilter = DBObjectSearch::FromOQL($sActionQueryOql, $aActionQueryParams);
+		$oActionFilter->AllowAllData();
 		$oSet = new DBObjectSet($oActionFilter, ['date' => false]);

 		$sPanelTitle = Dict::Format('Action:last_executions_tab_panel_title', $sActionQueryLimit);
-		$oExecutionsListBlock = DataTableUIBlockFactory::MakeForResult($oPage, 'action_executions_list', $oSet, ['panel_title' => $sPanelTitle]);
+		$oExecutionsListBlock = DataTableUIBlockFactory::MakeForResult($oPage, 'action_executions_list', $oSet, ['panel_title' => $sPanelTitle, 'display_unauthorized_objects' => true]);

 		$oPage->AddUiBlock($oExecutionsListBlock);
 	}
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -897,6 +897,60 @@ abstract class AttributeDefinition
 		return null;
 	}

+	/**
+	 * Return the size of $value, expressed in the same unit as {@see static::GetMaxSize()} for this attribute class.
+	 *
+	 * Default unit is a number of **characters**, matching MySQL VARCHAR(M) semantics for VARCHAR-based attributes.
+	 * Byte-based attributes (e.g. {@see AttributeText}, stored as MySQL TEXT which is limited to 65535 **bytes**,
+	 * not characters) MUST override both this method and {@see TrimValue()} consistently.
+	 *
+	 * @param string|null $sValue
+	 *
+	 * @return int Size of $value in the unit of GetMaxSize() (characters by default)
+	 * @since 3.2.3-2 3.2.4 3.3.0 N°9759
+	 */
+	public function GetSize(?string $sValue)
+	{
+		// If the value is null, we return 0
+		if ($sValue === null) {
+			return 0;
+		}
+
+		return mb_strlen($sValue);
+	}
+
+	/**
+	 * Helper to set a value that fits the attribute max size
+	 *
+	 * Truncation is performed in the same unit as GetMaxSize() / {@see GetSize()}: a number of **characters**
+	 * by default (VARCHAR-based attributes). When truncated, a " -truncated (N chars)" suffix is appended and
+	 * the returned value (suffix included) still fits within GetMaxSize().
+	 *
+	 * Default behavior is what DBObject::SetTrim used to do, now delegated to AttributeDefinition
+	 *
+	 * @param string|null $sValue
+	 *
+	 * @return string $sValue truncated so that it fits within {@see GetMaxSize()}.
+	 * @since 3.2.3-2 3.2.4 3.3.0 N°9759
+	 */
+	public function TrimValue(?string $sValue)
+	{
+		// If the value is null, we return an empty string
+		if ($sValue === null) {
+			return '';
+		}
+
+		$iMaxSize = $this->GetMaxSize();
+		$iLength = mb_strlen($sValue);
+		if ($iMaxSize && ($iLength > $iMaxSize)) {
+			$sMessage = " -truncated ($iLength chars)";
+
+			return mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
+		}
+
+		return $sValue;
+	}
+
 	/**
 	 * @return mixed|null
 	 * @deprecated never used
@@ -4219,6 +4273,51 @@ class AttributeText extends AttributeString
 		return "TEXT".CMDBSource::GetSqlStringColumnDefinition();
 	}

+	/**
+	 * @inheritDoc
+	 *
+	 * Unlike the default implementation, the size is expressed in **bytes**: MySQL TEXT columns are limited
+	 * in bytes (65535), not in characters, and {@see static::GetMaxSize()} for this class returns a number of bytes.
+	 */
+	public function GetSize(?string $sValue)
+	{
+		// If the value is null, we return 0
+		if ($sValue === null) {
+			return 0;
+		}
+
+		return strlen($sValue);
+	}
+	/**
+	 * @inheritDoc
+	 *
+	 * Truncation is performed on a **byte** budget (MySQL TEXT limit) without ever cutting through a multibyte
+	 * UTF-8 sequence: the returned value is always valid UTF-8 and never exceeds GetMaxSize() bytes,
+	 * truncation suffix included.
+	 */
+	public function TrimValue(?string $sValue)
+	{
+		// If the value is null, we return an empty string
+		if ($sValue === null) {
+			return '';
+		}
+
+		$iMaxSize = $this->GetMaxSize();
+		$iLength = strlen($sValue);
+		$iLengthChar = mb_strlen($sValue);
+		if ($iMaxSize && ($iLength > $iMaxSize)) {
+			$sMessage = " -truncated ($iLengthChar chars)";
+			$iTruncatedValueMaxSize = $iMaxSize - strlen($sMessage);
+			// mb_strcut cuts on a byte budget but moves the cut point back to a character boundary,
+			// so it never returns a broken multibyte sequence at the end of the value
+			$sTruncatedValue = mb_strcut($sValue, 0, $iTruncatedValueMaxSize, 'UTF-8');
+
+			return $sTruncatedValue.$sMessage;
+		}
+
+		return $sValue;
+	}
+
 	public function GetSQLColumns($bFullSpec = false)
 	{
 		$aColumns = [];
@@ -4344,7 +4443,9 @@ class AttributeText extends AttributeString
 		} else {
 			$sValue = self::RenderWikiHtml($sValue, true /* wiki only */);

-			return "<div class=\"HTML ibo-is-html-content\" $sStyle>".InlineImage::FixUrls($sValue).'</div>';
+			$sImageHtml = UserRights::IsLoggedIn() ? InlineImage::FixUrls($sValue) : InlineImage::ReplaceInlineImagesWithBase64Representation($sValue);
+
+			return "<div class=\"HTML ibo-is-html-content\" $sStyle>".$sImageHtml.'</div>';
 		}

 	}
@@ -4827,7 +4928,7 @@ class AttributeCaseLog extends AttributeLongText
 		}

 		if (strlen($sIndex) > 0) {
-			$aIndex = unserialize($sIndex);
+			$aIndex = utils::Unserialize($sIndex, ['allowed_classes' => false], false);
 			$value = new ormCaseLog($sLog, $aIndex);
 		} else {
 			$value = new ormCaseLog($sLog);
@@ -8988,7 +9089,10 @@ class AttributeStopWatch extends AttributeDefinition
 						switch ($sThresholdCode) {
 							case 'deadline':
 								if ($value) {
-									if (is_int($value)) {
+									if (is_numeric($value)) {
+										if (!is_int($value)) {
+											$value = intval($value);
+										}
 										$sDate = date(AttributeDateTime::GetInternalFormat(), $value);
 										$sRet = AttributeDeadline::FormatDeadline($sDate);
 									} else {
--- a/core/config.class.inc.php
+++ b/core/config.class.inc.php
@@ -29,7 +29,7 @@ define('ITOP_APPLICATION_SHORT', 'iTop');
 *
 * @see ITOP_CORE_VERSION to get iTop core version
 */
-define('ITOP_VERSION', '3.2.0-dev');
+define('ITOP_VERSION', '3.2.3-dev');

 define('ITOP_VERSION_NAME', 'Fullmoon');
 define('ITOP_REVISION', 'svn');
@@ -75,6 +75,7 @@ define('DEFAULT_EXT_AUTH_VARIABLE', '$_SERVER[\'REMOTE_USER\']');
 define('DEFAULT_ENCRYPTION_KEY', '@iT0pEncr1pti0n!'); // We'll use a random generated key later (if possible)
 define('DEFAULT_ENCRYPTION_LIB', 'Mcrypt'); // We'll define the best encryption available later
 define('DEFAULT_HASH_ALGO', PASSWORD_DEFAULT);
+
 /**
 * Config
 * configuration data (this class cannot not be localized, because it is responsible for loading the dictionaries)
@@ -869,6 +870,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'ext_auth_variable' => [
+			'type' => 'string',
+			'description' => 'External authentication expression (allowed: $_SERVER[\'key\'], $_COOKIE[\'key\'], $_REQUEST[\'key\'], getallheaders()[\'Header-Name\'])',
+			'default' => '$_SERVER[\'REMOTE_USER\']',
+			'value' => '$_SERVER[\'REMOTE_USER\']',
+			'source_of_value' => '',
+			'show_in_conf_sample' => false,
+		],
 		'login_debug' => [
 			'type' => 'bool',
 			'description' => 'Activate the login FSM debug',
@@ -1603,7 +1612,7 @@ class Config
 			'show_in_conf_sample' => false,
 		],
 		'search_manual_submit' => [
-			'type' => 'array',
+			'type' => 'bool',
 			'description' => 'Force manual submit of search all requests',
 			'default' => false,
 			'value' => true,
@@ -1730,6 +1739,14 @@ class Config
 			'source_of_value' => '',
 			'show_in_conf_sample' => false,
 		],
+		'security.disable_joined_classes_filter' => [
+			'type'                => 'bool',
+			'description'         => 'If true, scope filters aren\'t applied to joined classes or union classes not directly listed in the SELECT clause.',
+			'default'             => true,
+			'value'               => true,
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 		'security.hide_administrators' => [
 			'type'                => 'bool',
 			'description'         => 'If true, non-administrator users will not be able to see the administrator accounts, the Administrator profile and the links between the administrator accounts and their profiles.',
@@ -1738,6 +1755,14 @@ class Config
 			'source_of_value'     => '',
 			'show_in_conf_sample' => false,
 		],
+		'security.disable_exec_forced_login_for_all_enpoints' => [
+			'type'                => 'bool',
+			'description'         => 'If true, when no delegated authentication module is defined, no login will be forced on modules exec endpoints',
+			'default'             => true,
+			'value'               => true,
+			'source_of_value'     => '',
+			'show_in_conf_sample' => false,
+		],
 		'behind_reverse_proxy' => [
 			'type' => 'bool',
 			'description' => 'If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)',
@@ -1950,11 +1975,6 @@ class Config
 	 */
 	protected $m_sAllowedLoginTypes;

-	/**
-	 * @var string Name of the PHP variable in which external authentication information is passed by the web server
-	 */
-	protected $m_sExtAuthVariable;
-
 	/**
 	 * @var string Encryption key used for all attributes of type "encrypted string". Can be set to a random value
 	 *             unless you want to import a database from another iTop instance, in which case you must use
@@ -2027,7 +2047,6 @@ class Config
 		$this->m_bSecureConnectionRequired = DEFAULT_SECURE_CONNECTION_REQUIRED;
 		$this->m_sDefaultLanguage = 'EN US';
 		$this->m_sAllowedLoginTypes = DEFAULT_ALLOWED_LOGIN_TYPES;
-		$this->m_sExtAuthVariable = DEFAULT_EXT_AUTH_VARIABLE;
 		$this->m_aCharsets = [];
 		$this->m_bQueryCacheEnabled = DEFAULT_QUERY_CACHE_ENABLED;
 		$this->m_iPasswordHashAlgo = DEFAULT_HASH_ALGO;
@@ -2181,7 +2200,6 @@ class Config

 		$this->m_sDefaultLanguage = isset($MySettings['default_language']) ? trim($MySettings['default_language']) : 'EN US';
 		$this->m_sAllowedLoginTypes = isset($MySettings['allowed_login_types']) ? trim($MySettings['allowed_login_types']) : DEFAULT_ALLOWED_LOGIN_TYPES;
-		$this->m_sExtAuthVariable = isset($MySettings['ext_auth_variable']) ? trim($MySettings['ext_auth_variable']) : DEFAULT_EXT_AUTH_VARIABLE;
 		$this->m_sEncryptionKey = isset($MySettings['encryption_key']) ? trim($MySettings['encryption_key']) : $this->m_sEncryptionKey;
 		$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'] : [];
@@ -2334,9 +2352,73 @@ class Config
 		return explode('|', $this->m_sAllowedLoginTypes);
 	}

+	/**
+	 * @return bool|mixed
+	 * @since 3.2.3 return the parsed value instead of an unsecured variable name
+	 */
 	public function GetExternalAuthenticationVariable()
 	{
-		return $this->m_sExtAuthVariable;
+		$sExpression = $this->Get('ext_auth_variable');
+		$aParsed = $this->ParseExternalAuthVariableExpression($sExpression);
+		if ($aParsed === null) {
+			return false;
+		}
+
+		$sKey = $aParsed['key'];
+		switch ($aParsed['type']) {
+			case 'server':
+				return $_SERVER[$sKey] ?? false;
+			case 'cookie':
+				return $_COOKIE[$sKey] ?? false;
+			case 'request':
+				return $_REQUEST[$sKey] ?? false;
+			case 'header':
+				if (!function_exists('getallheaders')) {
+					return false;
+				}
+				$aHeaders = getallheaders();
+				if (!is_array($aHeaders)) {
+					return false;
+				}
+				return $aHeaders[$sKey] ?? false;
+		}
+		return false;
+	}
+
+	/**
+	 * @param $sExpression
+	 * @return array|null
+	 */
+	private function ParseExternalAuthVariableExpression($sExpression)
+	{
+		// If it's a configuration parameter it's probably already trimmed, but just in case
+		$sExpression = trim((string) $sExpression);
+		if ($sExpression === '') {
+			return null;
+		}
+
+		// Match $_SERVER/$_COOKIE/$_REQUEST['key'] with optional whitespace and single/double quotes.
+		if (preg_match('/^\$_(SERVER|COOKIE|REQUEST)\s*\[\s*(["\'])\s*([^"\']+)\2\s*\]\s*$/', $sExpression, $aMatches) === 1) {
+			$sContext = strtoupper($aMatches[1]);
+			$sKey = $aMatches[3];
+			return [
+				'type' => strtolower($sContext),
+				'key' => $sKey,
+				'normalized' => '$_'.$sContext.'[\''.$sKey.'\']',
+			];
+		}
+
+		// Match getallheaders()['Header-Name'] in a case-insensitive way.
+		if (preg_match('/^getallheaders\(\)\s*\[\s*(["\'])\s*([^"\']+)\1\s*\]\s*$/i', $sExpression, $aMatches) === 1) {
+			$sKey = $aMatches[2];
+			return [
+				'type' => 'header',
+				'key' => $sKey,
+				'normalized' => 'getallheaders()[\''.$sKey.'\']',
+			];
+		}
+
+		return null;
 	}

 	public function GetCSVImportCharsets()
@@ -2432,7 +2514,7 @@ class Config

 	public function SetExternalAuthenticationVariable($sExtAuthVariable)
 	{
-		$this->m_sExtAuthVariable = $sExtAuthVariable;
+		$this->Set('ext_auth_variable', $sExtAuthVariable);
 	}

 	public function SetEncryptionKey($sKey)
@@ -2487,7 +2569,6 @@ class Config
 		$aSettings['secure_connection_required'] = $this->m_bSecureConnectionRequired;
 		$aSettings['default_language'] = $this->m_sDefaultLanguage;
 		$aSettings['allowed_login_types'] = $this->m_sAllowedLoginTypes;
-		$aSettings['ext_auth_variable'] = $this->m_sExtAuthVariable;
 		$aSettings['encryption_key'] = $this->m_sEncryptionKey;
 		$aSettings['encryption_library'] = $this->m_sEncryptionLibrary;
 		$aSettings['csv_import_charsets'] = $this->m_aCharsets;
@@ -2592,7 +2673,6 @@ class Config
 			$aOtherValues = [
 				'default_language' => $this->m_sDefaultLanguage,
 				'allowed_login_types' => $this->m_sAllowedLoginTypes,
-				'ext_auth_variable' => $this->m_sExtAuthVariable,
 				'encryption_key' => $this->m_sEncryptionKey,
 				'encryption_library' => $this->m_sEncryptionLibrary,
 				'csv_import_charsets' => $this->m_aCharsets,
--- a/core/csvbulkexport.class.inc.php
+++ b/core/csvbulkexport.class.inc.php
@@ -5,6 +5,7 @@
 * @license     http://opensource.org/licenses/AGPL-3.0
 */

+use Combodo\iTop\Application\Helper\ExportHelper;
 use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
@@ -13,7 +14,6 @@ use Combodo\iTop\Application\UI\Base\Component\Input\Select\SelectUIBlockFactory
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\Helper\ExportHelper;
 use Combodo\iTop\Application\WebPage\Page;
 use Combodo\iTop\Application\WebPage\WebPage;

@@ -55,6 +55,8 @@ class CSVBulkExport extends TabularBulkExport
 		$this->aStatusInfo['charset'] = strtoupper(utils::ReadParam('charset', 'UTF-8', true, 'raw_data'));
 		$this->aStatusInfo['formatted_text'] = (bool)utils::ReadParam('formatted_text', 0, true);

+		$this->aStatusInfo['ignore_excel_sanitization'] = (bool)utils::ReadParam('ignore_excel_sanitization', 0, true, utils::ENUM_SANITIZATION_FILTER_INTEGER);
+
 		$sDateFormatRadio = utils::ReadParam('csv_date_format_radio', '');
 		switch ($sDateFormatRadio) {
 			case 'default':
@@ -223,6 +225,10 @@ class CSVBulkExport extends TabularBulkExport
 				$oRadioCustom->GetInput()->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetDate->AddSubBlock($oRadioCustom);

+				$oFieldSetSecurity = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:Security'));
+				$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetSecurity));
+				$oFieldSetSecurity->AddSubBlock(ExportHelper::GetInputForSanitizeExcelExport());
+
 				$oP->add_ready_script(
 					<<<EOF
 $('#form_part_csv_options').on('preview_updated', function() { FormatDatesInPreview('csv', 'csv'); });
@@ -264,6 +270,13 @@ EOF
 			default:
 				$sRet = trim($oObj->GetAsCSV($sAttCode), '"');
 		}
+
+		// If the option to ignore Excel sanitization is not set or explicitly set to false, apply sanitization
+		if (!(array_key_exists('ignore_excel_sanitization', $this->aStatusInfo)) || $this->aStatusInfo['ignore_excel_sanitization'] === false) {
+			return ExportHelper::SanitizeField($sRet, $this->aStatusInfo['text_qualifier'] ?? '');
+		}
+
+		// The option to ignore Excel sanitization is explicitly set to true: return the raw value without sanitization
 		return $sRet;
 	}

@@ -337,6 +350,12 @@ EOF
 							$sField = $oObj->GetAsCSV($sAttCode, $this->aStatusInfo['separator'], $this->aStatusInfo['text_qualifier'], $this->bLocalizeOutput, !$this->aStatusInfo['formatted_text']);
 					}
 				}
+
+				// If the option to ignore Excel sanitization is not set or absent, sanitize the field
+				if (!(array_key_exists('ignore_excel_sanitization', $this->aStatusInfo)) || $this->aStatusInfo['ignore_excel_sanitization'] === false) {
+					$sField = ExportHelper::SanitizeField($sField, $this->aStatusInfo['text_qualifier']);
+				}
+
 				if ($this->aStatusInfo['charset'] != 'UTF-8') {
 					// Note: due to bugs in the glibc library it's safer to call iconv on the smallest possible string
 					// and thus to convert field by field and not the whole row or file at once (see ticket N°991)
--- a/core/datamodel.core.xml
+++ b/core/datamodel.core.xml
@@ -409,7 +409,7 @@
      </php_parent>
      <parent>cmdbAbstractObject</parent>
      <properties>
-        <category>core/cmdb,view_in_gui</category>
+        <category>core/cmdb,grant_by_profile,silo</category>
        <abstract>false</abstract>
        <key_type>autoincrement</key_type>
        <db_table>priv_event_newsroom</db_table>
@@ -888,7 +888,7 @@
        <!-- Generated by toolkit/export-class-to-meta.php -->
        <parent>Event</parent>
        <properties>
-          <category>core/cmdb,view_in_gui</category>
+          <category>core/cmdb,grant_by_profile,silo</category>
        </properties>
        <fields>
          <field id="message" xsi:type="AttributeText"/>
--- a/core/dbobject.class.php
+++ b/core/dbobject.class.php
@@ -732,13 +732,8 @@ abstract class DBObject implements iDisplay
 	public function SetTrim($sAttCode, $sValue)
 	{
 		$oAttDef = MetaModel::GetAttributeDef(get_class($this), $sAttCode);
-		$iMaxSize = $oAttDef->GetMaxSize();
-		$sLength = mb_strlen($sValue);
-		if ($iMaxSize && ($sLength > $iMaxSize)) {
-			$sMessage = " -truncated ($sLength chars)";
-			$sValue = mb_substr($sValue, 0, $iMaxSize - mb_strlen($sMessage)).$sMessage;
-		}
-		$this->Set($sAttCode, $sValue);
+
+		$this->Set($sAttCode, $oAttDef->TrimValue($sValue));
 	}

 	/**
@@ -2040,7 +2035,7 @@ abstract class DBObject implements iDisplay
 				}
 			}
 			if (!is_null($iMaxSize = $oAtt->GetMaxSize())) {
-				$iLen = mb_strlen($toCheck);
+				$iLen = $oAtt->GetSize($toCheck);
 				if ($iLen > $iMaxSize) {
 					return "String too long (found $iLen, limited to $iMaxSize)";
 				}
--- a/core/dbobjectsearch.class.php
+++ b/core/dbobjectsearch.class.php
@@ -1925,4 +1925,36 @@ class DBObjectSearch extends DBSearch
 	{
 		return $this->GetCriteria()->ListParameters();
 	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function ApplyDataFilters(): DBSearch
+	{
+		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
+			return $this;
+		}
+
+		$oSearch = $this;
+		$aClassesToFilter = $this->GetSelectedClasses();
+
+		// Opt-in for joined classes filtering, otherwise only filter the selected class(es)
+		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === false) {
+			$aClassesToFilter = $this->GetJoinedClasses();
+		}
+
+		// Apply filter (this is similar to the one in DBSearch but the factorization could make it less readable)
+		foreach ($aClassesToFilter as $sClassAlias => $sClass) {
+			$oVisibleObjects = UserRights::GetSelectFilter($sClass, $this->GetModifierProperties('UserRightsGetSelectFilter'));
+			if ($oVisibleObjects === false) {
+				$oVisibleObjects = DBObjectSearch::FromEmptySet($sClass);
+			}
+			if (is_object($oVisibleObjects)) {
+				$oVisibleObjects->AllowAllData();
+				$oSearch = $oSearch->Filter($sClassAlias, $oVisibleObjects);
+				$oSearch->SetDataFiltered();
+			}
+		}
+		return $oSearch;
+	}
 }
--- a/core/dbsearch.class.php
+++ b/core/dbsearch.class.php
@@ -1122,21 +1122,7 @@ abstract class DBSearch
 	 */
 	protected function GetSQLQuery($aOrderBy, $aArgs, $aAttToLoad, $aExtendedDataSpec, $iLimitCount, $iLimitStart, $bGetCount, $aGroupByExpr = null, $aSelectExpr = null)
 	{
-		$oSearch = $this;
-		if (!$this->IsAllDataAllowed() && !$this->IsDataFiltered()) {
-			foreach ($this->GetSelectedClasses() as $sClassAlias => $sClass) {
-				$oVisibleObjects = UserRights::GetSelectFilter($sClass, $this->GetModifierProperties('UserRightsGetSelectFilter'));
-				if ($oVisibleObjects === false) {
-					// Make sure this is a valid search object, saying NO for all
-					$oVisibleObjects = DBObjectSearch::FromEmptySet($sClass);
-				}
-				if (is_object($oVisibleObjects)) {
-					$oVisibleObjects->AllowAllData();
-					$oSearch = $oSearch->Filter($sClassAlias, $oVisibleObjects);
-					$oSearch->SetDataFiltered();
-				}
-			}
-		}
+		$oSearch = $this->ApplyDataFilters();

 		if (is_array($aGroupByExpr)) {
 			foreach ($aGroupByExpr as $sAlias => $oGroupByExp) {
@@ -1608,4 +1594,33 @@ abstract class DBSearch
 	 * @return array{\VariableExpression}
 	 */
 	abstract public function GetExpectedArguments(): array;
+
+	/**
+	 * Apply data filters to the search, if needed
+	 *
+	 * @return DBSearch
+	 * @throws CoreException
+	 */
+	protected function ApplyDataFilters(): DBSearch
+	{
+		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
+			return $this;
+		}
+
+		$oSearch = $this;
+		$aClassesToFilter = $this->GetSelectedClasses();
+
+		foreach ($aClassesToFilter as $sClassAlias => $sClass) {
+			$oVisibleObjects = UserRights::GetSelectFilter($sClass, $this->GetModifierProperties('UserRightsGetSelectFilter'));
+			if ($oVisibleObjects === false) {
+				$oVisibleObjects = DBObjectSearch::FromEmptySet($sClass);
+			}
+			if (is_object($oVisibleObjects)) {
+				$oVisibleObjects->AllowAllData();
+				$oSearch = $oSearch->Filter($sClassAlias, $oVisibleObjects);
+				$oSearch->SetDataFiltered();
+			}
+		}
+		return $oSearch;
+	}
 }
--- a/core/dbunionsearch.class.php
+++ b/core/dbunionsearch.class.php
@@ -673,4 +673,29 @@ class DBUnionSearch extends DBSearch

 		return $aVariableCriteria;
 	}
+
+	/**
+	 * @inheritDoc
+	 */
+	protected function ApplyDataFilters(): DBSearch
+	{
+		if ($this->IsAllDataAllowed() || $this->IsDataFiltered()) {
+			return $this;
+		}
+
+		// Opt-in for joined classes filtering, otherwise fallback on DBSearch filtering
+		if (MetaModel::GetConfig()->Get('security.disable_joined_classes_filter') === true) {
+			return parent::ApplyDataFilters();
+		}
+
+		// Apply filters per sub-search
+		$aFilteredSearches = [];
+		foreach ($this->GetSearches() as $oSubSearch) {
+			// Recursively call ApplyDataFilters on sub-searches
+			$aFilteredSearches[] = $oSubSearch->ApplyDataFilters();
+		}
+
+		$oSearch = new DBUnionSearch($aFilteredSearches);
+		return $oSearch;
+	}
 }
--- a/core/event.class.inc.php
+++ b/core/event.class.inc.php
@@ -26,7 +26,7 @@ class Event extends DBObject implements iDisplay
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -120,7 +120,7 @@ class EventNotification extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -154,7 +154,7 @@ class EventNotificationEmail extends EventNotification
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -176,7 +176,7 @@ class EventNotificationEmail extends EventNotification

 		// Display lists
 		MetaModel::Init_SetZListItems('details', ['date', 'userinfo', 'message', 'trigger_id', 'action_id', 'object_id', 'to', 'cc', 'bcc', 'from', 'subject', 'body', 'attachments']); // Attributes to be displayed for the complete details
-		MetaModel::Init_SetZListItems('list', ['date', 'message', 'to', 'subject', 'attachments']); // Attributes to be displayed for a list
+		MetaModel::Init_SetZListItems('list', ['date', 'message', 'to', 'cc', 'bcc', 'subject', 'attachments']); // Attributes to be displayed for a list

 		// Search criteria
 		//		MetaModel::Init_SetZListItems('standard_search', array('name')); // Criteria of the std search form
@@ -190,7 +190,7 @@ class EventIssue extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -284,7 +284,7 @@ class EventWebService extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -319,7 +319,7 @@ class EventRestService extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -354,7 +354,7 @@ class EventLoginUsage extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
@@ -392,7 +392,7 @@ class EventOnObject extends Event
 	{
 		$aParams =
 		[
-			"category" => "core/cmdb,view_in_gui",
+			"category" => "core/cmdb,grant_by_profile,silo",
 			"key_type" => "autoincrement",
 			"name_attcode" => "",
 			"state_attcode" => "",
--- a/core/excelbulkexport.class.inc.php
+++ b/core/excelbulkexport.class.inc.php
@@ -5,13 +5,13 @@
 * @license     http://opensource.org/licenses/AGPL-3.0
 */

+use Combodo\iTop\Application\Helper\ExportHelper;
 use Combodo\iTop\Application\UI\Base\Component\FieldSet\FieldSetUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Html\Html;
 use Combodo\iTop\Application\UI\Base\Component\Input\InputUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Component\Panel\PanelUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\Column\ColumnUIBlockFactory;
 use Combodo\iTop\Application\UI\Base\Layout\MultiColumn\MultiColumnUIBlockFactory;
-use Combodo\iTop\Application\Helper\ExportHelper;
 use Combodo\iTop\Application\WebPage\Page;
 use Combodo\iTop\Application\WebPage\WebPage;

@@ -63,6 +63,8 @@ class ExcelBulkExport extends TabularBulkExport
 				// Export from the command line (or scripted) => default format is SQL, as in previous versions of iTop, unless specified otherwise
 				$this->aStatusInfo['date_format'] = utils::ReadParam('date_format', (string)AttributeDateTime::GetSQLFormat(), true, 'raw_data');
 		}
+
+		$this->aStatusInfo['ignore_excel_sanitization'] = (bool)utils::ReadParam('ignore_excel_sanitization', 0, true, utils::ENUM_SANITIZATION_FILTER_INTEGER);
 	}

 	public function EnumFormParts()
@@ -121,6 +123,10 @@ class ExcelBulkExport extends TabularBulkExport
 				$oRadioCustom->GetInput()->AddCSSClass('ibo-input-checkbox');
 				$oFieldSetDate->AddSubBlock($oRadioCustom);

+				$oFieldSetSecurity = FieldSetUIBlockFactory::MakeStandard(Dict::S('Core:BulkExport:Security'));
+				$oMulticolumn->AddColumn(ColumnUIBlockFactory::MakeForBlock($oFieldSetSecurity));
+				$oFieldSetSecurity->AddSubBlock(ExportHelper::GetInputForSanitizeExcelExport());
+
 				$oP->add_ready_script(
 					<<<EOF
 $('#form_part_xlsx_options').on('preview_updated', function() { FormatDatesInPreview('excel', 'xlsx'); });
@@ -216,6 +222,12 @@ EOF
 					}
 				}
 		}
+
+		// If the option to ignore Excel sanitization is not set or absent, sanitize the field
+		if (!(array_key_exists('ignore_excel_sanitization', $this->aStatusInfo)) || $this->aStatusInfo['ignore_excel_sanitization'] === false) {
+			return ExportHelper::SanitizeField($sRet, '');
+		}
+
 		return $sRet;
 	}

--- a/core/inlineimage.class.inc.php
+++ b/core/inlineimage.class.inc.php
@@ -296,6 +296,46 @@ class InlineImage extends DBObject
 		return $sHtml;
 	}

+	/**
+	 * Replace <img> tags with a data-img-id attribute by the actual image in base64 representation
+	 * so that the image can be displayed even if the download URL is not accessible (e.g. in unauthenticated approval templates)
+	 *
+	 * @param string $sHtml The HTML fragment to process
+	 *
+	 * @return String The modified HTML
+	 * @since 3.2.3
+	 */
+	public static function ReplaceInlineImagesWithBase64Representation(string $sHtml): String
+	{
+		return preg_replace_callback(
+			'/<img\s+[^>]*'.static::DOM_ATTR_ID.'="(\d+)"[^>]*>/i',
+			function ($matches) {
+
+				// Extract inline image ID from the tag
+				$id = $matches[1];
+
+				try {
+					// Retrieve inline image
+					$oInline = MetaModel::GetObject(InlineImage::class, $id, true, true);
+					$oOrmDocument = $oInline->Get('contents');
+
+					// Replace src image by the base64 representation
+					$sInlineImageAsBase64 = base64_encode($oOrmDocument->GetData());
+					$sDataUri = 'data:'.$oOrmDocument->GetMimeType().';base64,'.$sInlineImageAsBase64;
+					$sImage = preg_replace('/src=["\'][^"\']+["\']/', 'src="'.$sDataUri.'"', $matches[0]);
+
+					// Remove sensitive information (the image ID and secret) from the tag
+					$sImage = preg_replace('/'.static::DOM_ATTR_ID.'="\d+"\s+'.static::DOM_ATTR_SECRET.'="\w+"/', '', $sImage);
+				} catch (Exception $e) {
+					$sImage = '<img src="" alt="'.Dict::S('UI:MissingInlineImage').'">';
+				}
+
+				return $sImage;
+			},
+			$sHtml
+		);
+	}
+
 	/**
 	 * Add an extra attribute data-img-id for images which are based on an actual InlineImage
 	 * so that we can later reconstruct the full "src" URL when needed
--- a/core/ormdocument.class.inc.php
+++ b/core/ormdocument.class.inc.php
@@ -340,25 +340,29 @@ class ormDocument
 	 * @param string $sContentDisposition Either 'inline' or 'attachment'
 	 * @param string $sSecretField The attcode of the field containing a "secret" to be provided in order to retrieve the file
 	 * @param string $sSecretValue The value of the secret to be compared with the value of the attribute $sSecretField
+	 * @param bool $bAllowAllData If true, no rights filtering is applied
 	 *
 	 * @return void
 	 */
-	public static function DownloadDocument(WebPage $oPage, $sClass, $id, $sAttCode, $sContentDisposition = 'attachment', $sSecretField = null, $sSecretValue = null)
+	public static function DownloadDocument(WebPage $oPage, $sClass, $id, $sAttCode, $sContentDisposition = 'attachment', $sSecretField = null, $sSecretValue = null, $bAllowAllData = false)
 	{
 		try {
-			$oObj = MetaModel::GetObject($sClass, $id, false, false);
+			$oObj = MetaModel::GetObject($sClass, $id, false, $bAllowAllData);
 			if (!is_object($oObj)) {
 				// If access to the document is not granted, check if the access to the host object is allowed
 				$oObj = MetaModel::GetObject($sClass, $id, false, true);
+				$bHasHostRights = false;
 				if ($oObj instanceof Attachment) {
 					$sItemClass = $oObj->Get('item_class');
 					$sItemId = $oObj->Get('item_id');
 					$oHost = MetaModel::GetObject($sItemClass, $sItemId, false, false);
-					if (!is_object($oHost)) {
-						$oObj = null;
+					if (is_object($oHost)) {
+						$bHasHostRights = true;
 					}
 				}
-				if (!is_object($oObj)) {
+
+				// We could neither read the object nor get a host object matching our rights
+				if ($bHasHostRights !== true) {
 					throw new Exception("Invalid id ($id) for class '$sClass' - the object does not exist or you are not allowed to view it");
 				}
 			}
--- a/core/ormlinkset.class.inc.php
+++ b/core/ormlinkset.class.inc.php
@@ -179,7 +179,7 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 		assert($oLink instanceof $this->sClass);

 		$iObjectId = $oLink->GetKey();
-		if (array_key_exists($iObjectId, $this->aPreserved) && !$oLink->Equals(MetaModel::GetObject(get_class($oLink), $iObjectId, true))) {
+		if (array_key_exists($iObjectId, $this->aPreserved)) {
 			unset($this->aPreserved[$iObjectId]);
 			$this->aModified[$iObjectId] = $oLink;
 			$this->bHasDelta = true;
--- a/core/userrights.class.inc.php
+++ b/core/userrights.class.inc.php
@@ -1157,7 +1157,7 @@ class UserRights
 			return self::$m_oUser->GetKey();
 		} else {
 			// find the id out of the login string
-			$oUser = self::FindUser($sLogin);
+			$oUser = self::FindUser($sLogin, bAllowDisabledUsers: true);
 			if (is_null($oUser)) {
 				return null;
 			}
@@ -1350,7 +1350,7 @@ class UserRights
 		if (empty($sLogin)) {
 			$oUser = self::$m_oUser;
 		} else {
-			$oUser = self::FindUser($sLogin);
+			$oUser = self::FindUser($sLogin, bAllowDisabledUsers: true);
 		}
 		if (is_null($oUser)) {
 			return '';
--- a/css/backoffice/_shame.scss
+++ b/css/backoffice/_shame.scss
@@ -39,6 +39,8 @@
 //
 // .site-nav a { color:#BADA55!important; }

+$ibo-blockquote--color: $ibo-body-text-color !default;
+
 // N°2847 - Recolor svg illustrations with iTop's primary color
 .ibo-svg-illustration--container > svg *[fill="#6c63ff"]{
 	fill: $ibo-svg-illustration--fill;
@@ -109,3 +111,11 @@ input:checked + .slider:before {
 .slider.round:before {
  border-radius: 7px;
 }
+
+/*
+  Bulma sets blockquote background color through a variable, it affects ckeditor and html display.
+  This rule is needed harmonize the blockquote text color in both contexts.
+ */
+.ibo-is-html-content blockquote {
+  color: $ibo-blockquote--color;
+}
--- a/css/backoffice/application/_user-rights.scss
+++ b/css/backoffice/application/_user-rights.scss
@@ -4,7 +4,7 @@
 */

 $ibo-user-rights--padding-x: $ibo-spacing-400 !default;
-$ibo-user-rights--padding-y: $ibo-spacing-200 !default;
+$ibo-user-rights--padding-y: $ibo-spacing-100 !default;
 $ibo-user-rights--border-radius: $ibo-border-radius-400 !default;

 $ibo-user-rights--is-success--background-color: $ibo-color-success-100 !default;
@@ -18,6 +18,8 @@ $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 {
+  display: inline-flex;
+  align-items: baseline;
  padding: $ibo-user-rights--padding-y $ibo-user-rights--padding-x;
  border-radius: $ibo-user-rights--border-radius;
  &.ibo-is-success {
--- a/css/backoffice/application/bulk/_all.scss
+++ b/css/backoffice/application/bulk/_all.scss
@@ -4,3 +4,4 @@
 */

@import "bulk-modify";
+@import "bulk-export";
--- a/css/backoffice/application/bulk/_bulk-export.scss
+++ b/css/backoffice/application/bulk/_bulk-export.scss
@@ -0,0 +1,10 @@
+/*
+ * @copyright   Copyright (C) 2010-2026 Combodo SAS
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+#form_part_csv_options:has(#ibo-sanitize-excel-export--input:checked), #form_part_xlsx_options:has(#ibo-sanitize-excel-export--input:checked){
+  #ibo-sanitize-excel-export--alert {
+    display: none;
+  }
+}
--- a/css/backoffice/components/_panel.scss
+++ b/css/backoffice/components/_panel.scss
@@ -185,16 +185,20 @@ $ibo-panel--is-selectable--body--after--font-size: $ibo-font-size-700 !default;
 .ibo-panel--icon-img, .ibo-panel--icon-background { // second class is deprecated, remove it when dealing with N°9317
  width: 100%;
  height: 100%;
+  object-position: center;
+  object-fit: $ibo-panel--icon-img--size--must-contain;
  background-position: center;
  background-repeat: no-repeat;
  background-size: $ibo-panel--icon-img--size--must-contain;
 }

 .ibo-panel--icon-img--must-contain, .ibo-panel--icon-background--must-contain { // second class is deprecated, remove it when dealing with N°9317
+  object-fit: $ibo-panel--icon-img--size--must-contain;
  background-size: $ibo-panel--icon-img--size--must-contain;
 }

 .ibo-panel--icon-img--must-cover, .ibo-panel--icon-background--must-cover { // second class is deprecated, remove it when dealing with N°9317
+  object-fit: $ibo-panel--icon-img--size--must-cover;
  background-size: $ibo-panel--icon-img--size--must-cover;
 }

--- a/css/backoffice/components/_quick-create.scss
+++ b/css/backoffice/components/_quick-create.scss
@@ -247,7 +247,8 @@ $ibo-quick-create--compartment--placeholder-hint--text-color: $ibo-color-grey-70

    &:hover {
      cursor: pointer;
-      @extend a;
+      color: $ibo-hyperlink-color--on-hover;
+      text-decoration: $ibo-hyperlink-text-decoration--on-hover;
    }

    .highlight {
--- a/css/backoffice/components/_search-form.scss
+++ b/css/backoffice/components/_search-form.scss
@@ -21,6 +21,8 @@ $ibo-search-form-panel--more-criteria--color: $ibo-color-blue-grey-800 !default;
 $ibo-search-form-panel--more-criteria--background-color: $ibo-color-white-100 !default;
 $ibo-search-form-panel--more-criteria--icon--color: $ibo-color-primary-600 !default;
 $ibo-search-form-panel--more-criteria--border-color: $ibo-search-form-panel--criteria--border-color !default;
+// calc is redundant but avoid SCSS min() from being used instead of CSS min()
+$ibo-search-form-panel--criteria--max-height: calc(min(#{$ibo-size-750}, 50vh)) !default;

 $ibo-search-form-panel--items--hover--color: $ibo-color-grey-200 !default;

@@ -278,9 +280,10 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 				}

 				.sfc_form_group {
-          display: block;
-          margin-top: -1px;
-          z-index: -1;
+                  display: flex;
+                  flex-direction: column;
+                  margin-top: -1px;
+                  z-index: -1;
        }
 			}

@@ -346,11 +349,15 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
        display: none;
        max-width: 450px;
        width: max-content;
-        max-height: 520px;
+        max-height: $ibo-search-form-panel--criteria--max-height;
        overflow-x: auto;
        overflow-y: hidden;

 				.sfc_fg_operators {
+                    display: flex;
+                    flex-direction: column;
+                    overflow: auto;
+                    min-height: 0;
 					font-size: 12px;

 					.sfc_fg_operator {
@@ -387,6 +394,9 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 						}

 						.sfc_opc_multichoices {
+                            display: flex;
+                            flex-direction: column;
+                            height: 100%;
 							label > input {
 								vertical-align: text-top;
 								margin-left: $ibo-spacing-0;
@@ -398,7 +408,6 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 							}

 							.sfc_opc_mc_items_wrapper {
-								max-height: 415px; /* Must be less than .sfc_form_group:max-height - .sfc_opc_mc_toggler:height - .sfc_opc_mc_filter:height */
 								overflow-y: auto;
 								margin: $ibo-spacing-0 -8px; /* Compensate .sfc_opc_multichoices side padding so the hover style can take the full with */

@@ -560,8 +569,14 @@ $ibo-search-results-area--datatable-scrollhead--border--is-sticking: $ibo-search
 			&.search_form_criteria_enum {
 				.sfc_form_group {
 					.sfc_fg_operator_in {
+                        display: flex;
+                        flex-direction: column;
+                        height: 100%;
+                        min-height: 0;
 						> label {
-							display: inline-block;
+							display: flex;
+                            height: 100%;
+                            min-height: 0;
 							width: 100%;
 							line-height: initial;
 							white-space: nowrap;
--- a/css/backoffice/components/_title.scss
+++ b/css/backoffice/components/_title.scss
@@ -51,19 +51,23 @@ $ibo-title--icon-img--size--must-zoomout: $ibo-title--icon-background--size--mus
  width: 100%;
  height: 100%;
  object-position: center;
+  object-fit: $ibo-title--icon-img--size--must-contain;
  background-size: $ibo-title--icon-img--size--must-contain;
 }

 .ibo-title--icon-img--must-contain, .ibo-title--icon-background--must-contain { // second class is deprecated, remove it when dealing with N°9317
+  object-fit: $ibo-title--icon-img--size--must-contain;
  background-size: $ibo-title--icon-img--size--must-contain;
 }

 .ibo-title--icon-img--must-cover, .ibo-title--icon-background--must-cover { // second class is deprecated, remove it when dealing with N°9317
+  object-fit: $ibo-title--icon-img--size--must-cover;
  background-size: $ibo-title--icon-img--size--must-cover;
 }

 .ibo-title--icon-img--must-zoomout, .ibo-title--icon-background--must-zoomout { // second class is deprecated, remove it when dealing with N°9317
-  background-size: $ibo-title--icon-img--size--must-zoomout;
+  width: $ibo-title--icon-img--size--must-zoomout;
+  height: $ibo-title--icon-img--size--must-zoomout;
 }

 .ibo-title--for-object-details {
--- a/css/backoffice/components/input/_input-select.scss
+++ b/css/backoffice/components/input/_input-select.scss
@@ -201,8 +201,9 @@ $ibo-input-select--autocomplete-item-image--border: 1px solid $ibo-color-grey-60
 }

 // N°7982 Default selectize stylesheet override
+// N°9468 Dropdown content needs to be a few pixel shorter than the dropdown itself to avoid double scrollbar
 .selectize-dropdown-content{
-  max-height: $ibo-input-select-selectize--dropdown--max-height;
+  max-height: calc(#{$ibo-input-select-selectize--dropdown--max-height} - 4px);
 }

 .selectize-dropdown.ui-menu .ui-state-active {
--- a/css/backoffice/vendors/_bulma-variables-overload.scss
+++ b/css/backoffice/vendors/_bulma-variables-overload.scss
@@ -21,6 +21,7 @@ $text-strong: inherit !default;
 * See https://bulma.io/documentation/elements/content/
 */
 $content-block-margin-bottom: 0 !default;
+$content-blockquote-background-color: $ibo-color-grey-200 !default;

 /* Table: Reset style as much as possible to match rich text editor preview, which is the browser's default stylesheet.
 * As there is no way to avoid bulma rules, we simply make them invalid by setting an invalid variable value, the rules will then be ignored by the browser.
--- a/css/backoffice/vendors/ckeditor/_overloads.scss
+++ b/css/backoffice/vendors/ckeditor/_overloads.scss
@@ -28,6 +28,15 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-x: $ibo-spacing-300 !default;
 $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;

 /* CSS3 variables */
+:root {
+  --ck-content-font-family: inherit;
+  --ck-content-font-color: inherit;
+  --ck-content-font-size: inherit;
+  --ck-content-line-height: inherit;
+  --ck-content-word-break: inherit;
+  --ck-content-overflow-wrap: inherit;
+}
+
 .ck {
  --ck-color-list-button-on-background: #{$ibo-vendors-ckeditor--ck-color-list-button-on-background};
  --ck-color-list-button-on-background-focus: #{$ibo-vendors-ckeditor--ck-color-list-button-on-background-focus};
@@ -61,7 +70,7 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
  }
 }

-.ck-editor__editable_inline:not(.ck-comment__input *) {
+.ck-editor__editable_inline:not(.ck-comment__input *), .ck-source-editing-area {
  height: 200px;
 }

@@ -75,11 +84,6 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
  }
 }

-// N°7552 Allow source editing area to be scrollable in full screen
-.ck-maximize_editor_main .ck-source-editing-area textarea{
-  overflow: auto !important;
-}
-
 /* Mentions */
 .ck-mentions {
  .ck-button {
--- a/css/setup.css
+++ b/css/setup.css
--- a/datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php
+++ b/datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php
@@ -6,8 +6,9 @@
 * @copyright Copyright (C) 2010-2024 Combodo SAS
 * @license    https://opensource.org/licenses/AGPL-3.0
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'CAS:Error:UserNotAllowed' => '用户被禁止登录',
-	'CAS:Login:SignIn' => '使用CAS登录',
-	'CAS:Login:SignInTooltip' => '点击这里使用CAS服务器认证',
+	'CAS:Login:SignIn' => '使用 CAS 登录',
+	'CAS:Login:SignInTooltip' => '点击这里使用 CAS 服务器认证',
 ]);
--- a/datamodels/2.x/authent-cas/module.authent-cas.php
+++ b/datamodels/2.x/authent-cas/module.authent-cas.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-cas/3.2.1',
+	'authent-cas/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php
+++ b/datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php
@@ -5,10 +5,8 @@
 *
 * @copyright Copyright (C) 2010-2024 Combodo SAS
 * @license    https://opensource.org/licenses/AGPL-3.0
- *
- */
-/**
 * @author Robert Deng <denglx@gmail.com>
+ * This file is part of iTop.
 *
 * iTop is free software; you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
@@ -23,6 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -32,9 +31,11 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //
 // Class: UserExternal
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserExternal' => '外部用户',
 	'Class:UserExternal+' => '用户在'.ITOP_APPLICATION_SHORT.'外部验证身份',
--- a/datamodels/2.x/authent-external/module.authent-external.php
+++ b/datamodels/2.x/authent-external/module.authent-external.php
@@ -27,7 +27,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-external/3.2.1',
+	'authent-external/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php
@@ -6,7 +6,6 @@
 * @copyright Copyright (C) 2010-2024 Combodo SAS
 * @license    https://opensource.org/licenses/AGPL-3.0
 * @author Robert Deng <denglx@gmail.com>
- *
 * This file is part of iTop.
 *
 * iTop is free software; you can redistribute it and/or modify
@@ -22,6 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,13 +31,15 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //
 // Class: UserLDAP
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:UserLDAP' => 'LDAP用户',
-	'Class:UserLDAP+' => '用户身份由LDAP认证',
-	'UserLDAP:server' => 'LDAP详情',
+	'Class:UserLDAP' => 'LDAP 用户',
+	'Class:UserLDAP+' => '用户身份由 LDAP 认证',
+	'UserLDAP:server' => 'LDAP 详情',
 ]);

 //
@@ -45,6 +47,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
-	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
+	'Class:UserLDAP/Attribute:ldap_server' => 'LDAP 服务器',
+	'Class:UserLDAP/Attribute:ldap_server+' => '',
 ]);
--- a/datamodels/2.x/authent-ldap/module.authent-ldap.php
+++ b/datamodels/2.x/authent-ldap/module.authent-ldap.php
@@ -7,7 +7,7 @@ if (function_exists('ldap_connect')) {

 	SetupWebPage::AddModule(
 		__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-		'authent-ldap/3.2.1',
+		'authent-ldap/3.2.3',
 		[
 			// Identification
 			//
--- a/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php
+++ b/datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php
@@ -6,7 +6,6 @@
 * @copyright Copyright (C) 2010-2024 Combodo SAS
 * @license    https://opensource.org/licenses/AGPL-3.0
 * @author Robert Deng <denglx@gmail.com>
- *
 * This file is part of iTop.
 *
 * iTop is free software; you can redistribute it and/or modify
@@ -22,6 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,16 +31,19 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //
 // Class: UserLocal
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLocal' => ITOP_APPLICATION_SHORT.' 用户',
 	'Class:UserLocal+' => '用户由'.ITOP_APPLICATION_SHORT.'验证身份',
 	'Class:UserLocal/Attribute:password' => '密码',
 	'Class:UserLocal/Attribute:password+' => '用于验证用户身份的字符串',
-	'Class:UserLocal/Attribute:expiration' => '密码过期',
-	'Class:UserLocal/Attribute:expiration+' => '密码过期状态 (需要一个扩展才能生效)',
+
+	'Class:UserLocal/Attribute:expiration' => '密码过期时间',
+	'Class:UserLocal/Attribute:expiration+' => '密码过期状态 (需要扩展才能生效)',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire' => '允许过期',
 	'Class:UserLocal/Attribute:expiration/Value:can_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:never_expire' => '永不过期',
@@ -49,8 +52,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserLocal/Attribute:expiration/Value:force_expire+' => '',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire' => '一次性密码',
 	'Class:UserLocal/Attribute:expiration/Value:otp_expire+' => '用户不允许修改密码.',
-	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新',
+	'Class:UserLocal/Attribute:password_renewed_date' => '密码更新时间',
 	'Class:UserLocal/Attribute:password_renewed_date+' => '上次修改密码的时间',
+
 	'Error:UserLocalPasswordValidator:UserPasswordPolicyRegex:ValidationFailed' => '密码必须至少12个字符, 包含大小写, 数字和特殊字符.',
 	'UserLocal:password:expiration' => '下面的区域需要插件扩展',
 	'Class:UserLocal/Error:OneTimePasswordChangeIsNotAllowed' => '不允许用户为自己设置 "一次性密码" 的失效期限',
--- a/datamodels/2.x/authent-local/module.authent-local.php
+++ b/datamodels/2.x/authent-local/module.authent-local.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'authent-local/3.2.1',
+	'authent-local/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php
@@ -21,6 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'theme:darkmoon' => '暗月',
+	'theme:darkmoon' => 'Dark moon',
 ]);
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/module.combodo-backoffice-darkmoon-theme.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-darkmoon-theme/3.2.1',
+	'combodo-backoffice-darkmoon-theme/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss
+++ b/datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/scss-variables.scss
--- a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-high-contrast-theme.php
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-high-contrast-theme.php
@@ -4,7 +4,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    http://opensource.org/licenses/AGPL-3.0
+ * @license    https://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -23,5 +23,5 @@
 */

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'theme:fullmoon-high-contrast' => 'Fullmoon (High contrast)~~',
+	'theme:fullmoon-high-contrast' => 'Fullmoon (高对比度)',
 ]);
--- a/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/module.combodo-backoffice-fullmoon-high-contrast-theme.php
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-high-contrast-theme/module.combodo-backoffice-fullmoon-high-contrast-theme.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-high-contrast-theme/3.2.1',
+	'combodo-backoffice-fullmoon-high-contrast-theme/3.2.3',
 	[
 		// Identification
 		//
--- 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
--- a/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php
@@ -4,7 +4,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    http://opensource.org/licenses/AGPL-3.0
+ * @license    https://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -23,5 +23,5 @@
 */

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'theme:fullmoon-protanopia-deuteranopia' => 'Fullmoon (Protanopia & Deuteranopia)~~',
+	'theme:fullmoon-protanopia-deuteranopia' => 'Fullmoon (红绿色盲 & 绿色色盲)',
 ]);
--- a/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/module.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/module.combodo-backoffice-fullmoon-protanopia-deuteranopia-theme.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/3.2.1',
+	'combodo-backoffice-fullmoon-protanopia-deuteranopia-theme/3.2.3',
 	[
 		// Identification
 		//
--- 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
@@ -68,47 +68,47 @@ $ibo-color-information-900: #0f172a !default;
 $ibo-color-information-950: #020617 !default;


-$ibo-lifecycle-new-state-primary-color: $ibo-color-information-600;
-$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-neutral-state-primary-color: $ibo-color-information-600;
-$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-waiting-state-primary-color: $ibo-color-yellow-700;
-$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-success-state-primary-color: $ibo-color-blue-700;
-$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-failure-state-primary-color: $ibo-color-orange-800;
-$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-frozen-state-primary-color: $ibo-color-information-200;
-$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-information-700;
+$ibo-lifecycle-new-state-primary-color: $ibo-color-information-600 !default;
+$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-neutral-state-primary-color: $ibo-color-information-600 !default;
+$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-waiting-state-primary-color: $ibo-color-yellow-700 !default;
+$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-success-state-primary-color: $ibo-color-blue-700 !default;
+$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-failure-state-primary-color: $ibo-color-orange-800 !default;
+$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-frozen-state-primary-color: $ibo-color-information-200 !default;
+$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-information-700 !default;

-$ibo-lifecycle-active-state-primary-color: $ibo-color-blue-700;
-$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-inactive-state-primary-color: $ibo-color-yellow-700;
-$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-active-state-primary-color: $ibo-color-blue-700 !default;
+$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-inactive-state-primary-color: $ibo-color-yellow-700 !default;
+$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100 !default;

-$ibo-caselog-highlight-color-1: $ibo-color-blue-700;
-$ibo-caselog-highlight-color-2: $ibo-color-yellow-700;
-$ibo-caselog-highlight-color-3: $ibo-color-information-600;
-$ibo-caselog-highlight-color-4: $ibo-color-yellow-500;
-$ibo-caselog-highlight-color-5: $ibo-color-blue-500;
-$ibo-caselog-highlight-color-6: $ibo-color-yellow-300;
-$ibo-caselog-highlight-color-7: $ibo-color-blue-300;
+$ibo-caselog-highlight-color-1: $ibo-color-blue-700 !default;
+$ibo-caselog-highlight-color-2: $ibo-color-yellow-700 !default;
+$ibo-caselog-highlight-color-3: $ibo-color-information-600 !default;
+$ibo-caselog-highlight-color-4: $ibo-color-yellow-500 !default;
+$ibo-caselog-highlight-color-5: $ibo-color-blue-500 !default;
+$ibo-caselog-highlight-color-6: $ibo-color-yellow-300 !default;
+$ibo-caselog-highlight-color-7: $ibo-color-blue-300 !default;

-$ibo-input-wrapper--is-error--border-color: $ibo-color-warning-700;
-$ibo-field-validation: $ibo-color-warning-800;
+$ibo-input-wrapper--is-error--border-color: $ibo-color-warning-700 !default;
+$ibo-field-validation: $ibo-color-warning-800 !default;

-$ibo-navigation-menu--visual-hint--background-color: $ibo-color-blue-400;
+$ibo-navigation-menu--visual-hint--background-color: $ibo-color-blue-400 !default;

-$ibo-wizard-container--background-color: $ibo-color-information-200;
-$ibo-wizard-container--border-color: $ibo-color-information-600;
+$ibo-wizard-container--background-color: $ibo-color-information-200 !default;
+$ibo-wizard-container--border-color: $ibo-color-information-600 !default;

-$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100;
-$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-danger-100;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-danger-500;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-warning-100;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-warning-500;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-success-100;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-success-500;
+$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-danger-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-danger-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-warning-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-warning-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-success-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-success-500 !default;

-$ibo-notifications--view-all--item--unread--highlight--background-color: $ibo-color-blue-600;
+$ibo-notifications--view-all--item--unread--highlight--background-color: $ibo-color-blue-600 !default;
--- a/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-tritanopia-theme.php
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/dictionaries/zh_cn.dict.combodo-backoffice-fullmoon-tritanopia-theme.php
@@ -4,7 +4,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    http://opensource.org/licenses/AGPL-3.0
+ * @license    https://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -23,5 +23,5 @@
 */

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'theme:fullmoon-tritanopia' => 'Fullmoon (Tritanopia)~~',
+	'theme:fullmoon-tritanopia' => 'Fullmoon (黄蓝色盲)',
 ]);
--- a/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/module.combodo-backoffice-fullmoon-tritanopia-theme.php
+++ b/datamodels/2.x/combodo-backoffice-fullmoon-tritanopia-theme/module.combodo-backoffice-fullmoon-tritanopia-theme.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-backoffice-fullmoon-tritanopia-theme/3.2.1',
+	'combodo-backoffice-fullmoon-tritanopia-theme/3.2.3',
 	[
 		// Identification
 		//
--- 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
@@ -32,47 +32,47 @@ $ibo-color-information-900: #0f172a !default;
 $ibo-color-information-950: #020617 !default;


-$ibo-lifecycle-new-state-primary-color: $ibo-color-information-600;
-$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-neutral-state-primary-color: $ibo-color-information-600;
-$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-waiting-state-primary-color: $ibo-color-red-200;
-$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-red-800;
-$ibo-lifecycle-success-state-primary-color: $ibo-color-blue-700;
-$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-failure-state-primary-color: $ibo-color-red-800;
-$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-frozen-state-primary-color: $ibo-color-information-200;
-$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-information-700;
+$ibo-lifecycle-new-state-primary-color: $ibo-color-information-600 !default;
+$ibo-lifecycle-new-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-neutral-state-primary-color: $ibo-color-information-600 !default;
+$ibo-lifecycle-neutral-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-waiting-state-primary-color: $ibo-color-red-200 !default;
+$ibo-lifecycle-waiting-state-secondary-color: $ibo-color-red-800 !default;
+$ibo-lifecycle-success-state-primary-color: $ibo-color-blue-700 !default;
+$ibo-lifecycle-success-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-failure-state-primary-color: $ibo-color-red-800 !default;
+$ibo-lifecycle-failure-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-frozen-state-primary-color: $ibo-color-information-200 !default;
+$ibo-lifecycle-frozen-state-secondary-color: $ibo-color-information-700 !default;

-$ibo-lifecycle-active-state-primary-color: $ibo-color-blue-700;
-$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100;
-$ibo-lifecycle-inactive-state-primary-color: $ibo-color-red-700;
-$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100;
+$ibo-lifecycle-active-state-primary-color: $ibo-color-blue-700 !default;
+$ibo-lifecycle-active-state-secondary-color: $ibo-color-white-100 !default;
+$ibo-lifecycle-inactive-state-primary-color: $ibo-color-red-700 !default;
+$ibo-lifecycle-inactive-state-secondary-color: $ibo-color-white-100 !default;

-$ibo-caselog-highlight-color-1: $ibo-color-blue-700;
-$ibo-caselog-highlight-color-2: $ibo-color-red-700;
-$ibo-caselog-highlight-color-3: $ibo-color-information-600;
-$ibo-caselog-highlight-color-4: $ibo-color-red-500;
-$ibo-caselog-highlight-color-5: $ibo-color-blue-500;
-$ibo-caselog-highlight-color-6: $ibo-color-red-300;
-$ibo-caselog-highlight-color-7: $ibo-color-blue-300;
+$ibo-caselog-highlight-color-1: $ibo-color-blue-700 !default;
+$ibo-caselog-highlight-color-2: $ibo-color-red-700 !default;
+$ibo-caselog-highlight-color-3: $ibo-color-information-600 !default;
+$ibo-caselog-highlight-color-4: $ibo-color-red-500 !default;
+$ibo-caselog-highlight-color-5: $ibo-color-blue-500 !default;
+$ibo-caselog-highlight-color-6: $ibo-color-red-300 !default;
+$ibo-caselog-highlight-color-7: $ibo-color-blue-300 !default;

-$ibo-input-wrapper--is-error--border-color: $ibo-color-pink-700;
-$ibo-field-validation: $ibo-color-pink-800;
+$ibo-input-wrapper--is-error--border-color: $ibo-color-pink-700 !default;
+$ibo-field-validation: $ibo-color-pink-800 !default;

-$ibo-navigation-menu--visual-hint--background-color: $ibo-color-pink-600;
+$ibo-navigation-menu--visual-hint--background-color: $ibo-color-pink-600 !default;

-$ibo-wizard-container--background-color: $ibo-color-information-200;
-$ibo-wizard-container--border-color: $ibo-color-information-600;
+$ibo-wizard-container--background-color: $ibo-color-information-200 !default;
+$ibo-wizard-container--border-color: $ibo-color-information-600 !default;

-$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100;
-$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-pink-100;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-pink-600;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-warning-100;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-warning-400;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-success-100;
-$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-success-500;
+$ibo-navigation-menu--notifications--item--new-message-indicator--background-color: $ibo-color-white-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--border: solid 2px $ibo-color-grey-500 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--background-color: $ibo-color-pink-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-1--border: solid 2px $ibo-color-pink-600 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--background-color: $ibo-color-warning-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-2--border: solid 2px $ibo-color-warning-400 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--background-color: $ibo-color-success-100 !default;
+$ibo-navigation-menu--notifications--item--new-message-indicator--is-priority-3--border: solid 2px $ibo-color-success-500 !default;

-$ibo-notifications--view-all--item--unread--highlight--background-color: $ibo-color-pink-500;
+$ibo-notifications--view-all--item--unread--highlight--background-color: $ibo-color-pink-500 !default;
--- a/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
+++ b/datamodels/2.x/combodo-db-tools/module.combodo-db-tools.php
@@ -25,7 +25,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'combodo-db-tools/3.2.1',
+	'combodo-db-tools/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/combodo-db-tools/src/Exception/AuthenticationException.php
+++ b/datamodels/2.x/combodo-db-tools/src/Exception/AuthenticationException.php
@@ -1,4 +1,5 @@
 <?php
+
 /*
 * @copyright   Copyright (C) 2010-2026 Combodo SAS
 * @license     http://opensource.org/licenses/AGPL-3.0
@@ -8,5 +9,4 @@ namespace Combodo\iTop\DBTools\Exception;

 class AuthenticationException extends \Exception
 {
-
-}
+}
--- a/datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
@@ -1,15 +1,23 @@
 <?php

 /**
- * Localized data
+ * Copyright (C) 2013-2024 Combodo SAS
 *
- * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    https://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
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Attachments:TabTitle_Count' => '附件 (%1$d)',
 	'Attachments:EmptyTabTitle' => '附件',
@@ -23,7 +31,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Attachment:Max_Mo' => '(最大文件尺寸: %1$s MB)',
 	'Attachment:Max_Ko' => '(最大文件尺寸: %1$s KB)',
 	'Attachments:NoAttachment' => '没有附件. ',
-	'Attachments:PreviewNotAvailable' => '此附件类型不支持预览.',
+	'Attachments:PreviewNotAvailable' => '此类型的附件不支持预览.',
 	'Attachments:Error:FileTooLarge' => '上传的文件过大. %1$s',
 	'Attachments:Error:UploadedFileEmpty' => '收到的文件为空, 无法添加.
 可能是因为您发送的是空文件,
@@ -42,9 +50,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Attachment+' => '',
 	'Class:Attachment/Attribute:expire' => '过期',
 	'Class:Attachment/Attribute:expire+' => '',
-	'Class:Attachment/Attribute:temp_id' => '临时编号',
+	'Class:Attachment/Attribute:temp_id' => '临时id',
 	'Class:Attachment/Attribute:temp_id+' => '',
-	'Class:Attachment/Attribute:item_class' => '项目类型',
+	'Class:Attachment/Attribute:item_class' => '项目类别',
 	'Class:Attachment/Attribute:item_class+' => '',
 	'Class:Attachment/Attribute:item_id' => '项目',
 	'Class:Attachment/Attribute:item_id+' => '',
@@ -69,11 +77,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Attachment/Attribute:creation_date' => '创建日期',
-	'Class:Attachment/Attribute:creation_date+' => '~~',
-	'Class:Attachment/Attribute:user_id' => '用户编号',
-	'Class:Attachment/Attribute:user_id+' => '~~',
-	'Class:Attachment/Attribute:contact_id' => '联系人编号',
-	'Class:Attachment/Attribute:contact_id+' => '~~',
+	'Class:Attachment/Attribute:creation_date+' => '',
+	'Class:Attachment/Attribute:user_id' => '用户id',
+	'Class:Attachment/Attribute:user_id+' => '',
+	'Class:Attachment/Attribute:contact_id' => '联系人id',
+	'Class:Attachment/Attribute:contact_id+' => '',
 ]);

 //
@@ -81,6 +89,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:TriggerOnAttachmentDownload' => '触发器 (于对象附件下载时)',
-	'Class:TriggerOnAttachmentDownload+' => '触发器于指定类型 [子类型] 对象附件下载时',
+	'Class:TriggerOnAttachmentDownload' => '触发器 (对象附件被下载时)',
+	'Class:TriggerOnAttachmentDownload+' => '触发器于指定类别(含子类)对象附件被下载时',
 ]);
--- a/datamodels/2.x/itop-attachments/module.itop-attachments.php
+++ b/datamodels/2.x/itop-attachments/module.itop-attachments.php
@@ -19,7 +19,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-attachments/3.2.1',
+	'itop-attachments/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/dictionaries/zh_cn.dict.itop-backup.php
@@ -21,25 +21,28 @@
 * 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('ZH CN', 'Chinese', '简体中文', [
+
 	'bkp-backup-running' => '备份正在进行, 请稍候...',
-	'bkp-restore-running' => '还原正在进行, 请稍等...',
+	'bkp-restore-running' => '还原正在进行, 请稍候...',
+
 	'Menu:BackupStatus' => '定时备份',
 	'bkp-status-title' => '定时备份',
 	'bkp-status-checks' => '设置与检查',
-	'bkp-mysqldump-ok' => '已找到 mysqldump : %1$s',
-	'bkp-mysqldump-notfound' => 'mysqldump找不到: %1$s - 请确认它安装在正确的路径, 或者调整'.ITOP_APPLICATION_SHORT.'配置文件的参数mysql_bindir.',
-	'bkp-mysqldump-issue' => 'mysqldump无法运行 (retcode=%1$d): 请确认它安装在正确的路径, 或者调整'.ITOP_APPLICATION_SHORT.'配置文件的参数mysql_bindir',
+	'bkp-mysqldump-ok' => 'mysqldump 已存在: %1$s',
+	'bkp-mysqldump-notfound' => 'mysqldump 找不到: %1$s - 请确认它安装在正确的路径, 或者调整配置文件参数 mysql_bindir.',
+	'bkp-mysqldump-issue' => 'mysqldump 无法运行 (retcode=%1$d): 请确认它安装在正确的路径, 或者调整配置文件参数 mysql_bindir',
 	'bkp-missing-dir' => '目标目录<code>%1$s</code>找不到',
-	'bkp-free-disk-space' => '<b>%1$s可用空间</b>位于<code>%2$s</code>',
-	'bkp-dir-not-writeable' => '%1$s没有写入权限',
+	'bkp-free-disk-space' => '<b>%1$s 可用空间 </b> 位于 <code>%2$s</code>',
+	'bkp-dir-not-writeable' => '%1$s 没有写入权限',
 	'bkp-wrong-format-spec' => '当前文件名格式错误 (%1$s). 默认格式应该是: %2$s',
 	'bkp-name-sample' => '备份文件将以数据库名, 日期和时间进行命名. 例如: %1$s',
-	'bkp-week-days' => '在每个<b>%1$s的%2$s</b>进行备份',
-	'bkp-retention' => '最多<b>%1$d份备份文件</b>在目标目录.',
-	'bkp-next-to-delete' => '当下一次备份时将被删除 (参阅设置 "retention_count")',
+	'bkp-week-days' => '在每个 <b>%1$s 的 %2$s </b>进行备份',
+	'bkp-retention' => '最多保留 <b>%1$d 个备份</b>.',
+	'bkp-next-to-delete' => '当下一次备份时将被删除 (见设置 "保留个数")',
 	'bkp-table-file' => '文件',
-	'bkp-table-file+' => '只有扩展名是.zip的文件才被认为是备份文件',
+	'bkp-table-file+' => '只有扩展名是.zip 的文件才被认为是备份文件',
 	'bkp-table-size' => '大小',
 	'bkp-table-size+' => '',
 	'bkp-table-actions' => '操作',
--- a/datamodels/2.x/itop-backup/module.itop-backup.php
+++ b/datamodels/2.x/itop-backup/module.itop-backup.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/3.2.1',
+	'itop-backup/3.2.3',
 	[
 		// Identification
 		//
@@ -41,6 +41,11 @@ SetupWebPage::AddModule(
 		'doc.manual_setup' => '',
 		'doc.more_information' => '',

+		// Security
+		'delegated_authentication_endpoints' => [
+			'ajax.backup.php',
+		],
+
 		// Default settings
 		//
 		'settings' => [
--- a/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/dictionaries/zh_cn.dict.itop-bridge-cmdb-services.php
@@ -17,10 +17,11 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 /**
- * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    https://opensource.org/licenses/AGPL-3.0
- * @author Benjamin Planque <benjamin.planque@combodo.com>
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2024 Combodo SAS
+* @license     https://opensource.org/licenses/AGPL-3.0
 */
+
 //////////////////////////////////////////////////////////////////////
 // Note: The classes have been grouped by categories: bizmodel
 //////////////////////////////////////////////////////////////////////
@@ -31,8 +32,9 @@
 //
 // Class: lnkFunctionalCIToProviderContract
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkFunctionalCIToProviderContract' => '关联功能配置项/供应商合同',
+	'Class:lnkFunctionalCIToProviderContract' => '链接 功能配置项/供应商合同',
 	'Class:lnkFunctionalCIToProviderContract+' => '',
 	'Class:lnkFunctionalCIToProviderContract/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToProviderContract/Attribute:providercontract_id' => '供应商合同',
@@ -50,9 +52,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkFunctionalCIToService' => '关联 功能配置项/服务',
+	'Class:lnkFunctionalCIToService' => '链接 功能配置项/服务',
 	'Class:lnkFunctionalCIToService+' => '',
-	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s~~',
+	'Class:lnkFunctionalCIToService/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToService/Attribute:service_id' => '服务',
 	'Class:lnkFunctionalCIToService/Attribute:service_id+' => '',
 	'Class:lnkFunctionalCIToService/Attribute:service_name' => '服务名称',
@@ -80,7 +82,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Document/Attribute:contracts_list' => '合同',
-	'Class:Document/Attribute:contracts_list+' => '此文档关联的所有合同',
+	'Class:Document/Attribute:contracts_list+' => '此文档相关的所有合同',
 	'Class:Document/Attribute:services_list' => '服务',
-	'Class:Document/Attribute:services_list+' => '此文档关联的所有服务',
+	'Class:Document/Attribute:services_list+' => '此文档相关的所有服务',
 ]);
--- a/datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php
+++ b/datamodels/2.x/itop-bridge-cmdb-services/module.itop-bridge-cmdb-services.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-services/3.2.1',
+	'itop-bridge-cmdb-services/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/dictionaries/zh_cn.dict.itop-bridge-cmdb-ticket.php
@@ -17,10 +17,11 @@
 //   You should have received a copy of the GNU Affero General Public License
 //   along with iTop. If not, see <http://www.gnu.org/licenses/>
 /**
- * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    https://opensource.org/licenses/AGPL-3.0
- * @author Benjamin Planque <benjamin.planque@combodo.com>
- */
+* @author       Benjamin Planque <benjamin.planque@combodo.com>
+* @copyright   Copyright (C) 2010-2024 Combodo SAS
+* @license     https://opensource.org/licenses/AGPL-3.0
+*/
+
 //////////////////////////////////////////////////////////////////////
 // Note: The classes have been grouped by categories: bizmodel
 //////////////////////////////////////////////////////////////////////
@@ -28,11 +29,13 @@
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
+
 //
 // Class: lnkFunctionalCIToTicket
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkFunctionalCIToTicket' => '关联 功能配置项/工单',
+	'Class:lnkFunctionalCIToTicket' => '链接 功能配置项/工单',
 	'Class:lnkFunctionalCIToTicket+' => '',
 	'Class:lnkFunctionalCIToTicket/Name' => '%1$s / %2$s',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_id' => '工单',
@@ -40,7 +43,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref' => '工单编号',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_ref+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title' => '工单标题',
-	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '~~',
+	'Class:lnkFunctionalCIToTicket/Attribute:ticket_title+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id' => '配置项',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_id+' => '',
 	'Class:lnkFunctionalCIToTicket/Attribute:functionalci_name' => '配置项名称',
@@ -50,7 +53,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code' => '影响',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:manual' => '手动添加',
 	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:computed' => '自动添加',
-	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => '不通知',
+	'Class:lnkFunctionalCIToTicket/Attribute:impact_code/Value:not_impacted' => '不受影响',
 ]);

 //
--- a/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
+++ b/datamodels/2.x/itop-bridge-cmdb-ticket/module.itop-bridge-cmdb-ticket.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-cmdb-ticket/3.2.1',
+	'itop-bridge-cmdb-ticket/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-datacenter-mgmt-services/module.itop-bridge-datacenter-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-datacenter-mgmt-services/module.itop-bridge-datacenter-mgmt-services.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-datacenter-mgmt-services/3.2.1',
+	'itop-bridge-datacenter-mgmt-services/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
+++ b/datamodels/2.x/itop-bridge-endusers-devices-services/module.itop-bridge-endusers-devices-services.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-endusers-devices-services/3.2.1',
+	'itop-bridge-endusers-devices-services/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-storage-mgmt-services/module.itop-bridge-storage-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-storage-mgmt-services/module.itop-bridge-storage-mgmt-services.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-storage-mgmt-services/3.2.1',
+	'itop-bridge-storage-mgmt-services/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
+++ b/datamodels/2.x/itop-bridge-virtualization-mgmt-services/module.itop-bridge-virtualization-mgmt-services.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-mgmt-services/3.2.1',
+	'itop-bridge-virtualization-mgmt-services/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
+++ b/datamodels/2.x/itop-bridge-virtualization-storage/module.itop-bridge-virtualization-storage.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-bridge-virtualization-storage/3.2.1',
+	'itop-bridge-virtualization-storage/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/dictionaries/zh_cn.dict.itop-change-mgmt-itil.php
@@ -21,25 +21,26 @@
 * 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('ZH CN', 'Chinese', '简体中文', [
 	'Menu:ChangeManagement' => '变更管理',
 	'Menu:Change:Overview' => '概况',
 	'Menu:Change:Overview+' => '',
 	'Menu:NewChange' => '新建变更',
-	'Menu:NewChange+' => '新建变更',
+	'Menu:NewChange+' => '新建变更工单',
 	'Menu:SearchChanges' => '搜索变更',
-	'Menu:SearchChanges+' => '搜索变更',
+	'Menu:SearchChanges+' => '搜索变更工单',
 	'Menu:Change:Shortcuts' => '快捷方式',
 	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => '等待审核的变更',
+	'Menu:WaitingAcceptance' => '等待核准的变更',
 	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => '等待批准的变更',
+	'Menu:WaitingApproval' => '等待审批的变更',
 	'Menu:WaitingApproval+' => '',
-	'Menu:Changes' => '所有打开的变更',
-	'Menu:Changes+' => '所有打开的变更',
+	'Menu:Changes' => '所有待处理的变更',
+	'Menu:Changes+' => '所有待处理的变更',
 	'Menu:MyChanges' => '分配给我的变更',
 	'Menu:MyChanges+' => '分配给我的变更 (作为办理人)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近一周的变更 (按类型)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近一周的变更 (按种类)',
 	'UI-ChangeManagementOverview-Last-7-days' => '最近一周的变更 (按数量)',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => '最近一周的变更 (按范围)',
 	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => '最近一周的变更 (按状态)',
@@ -76,9 +77,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change/Attribute:status/Value:assigned+' => '',
 	'Class:Change/Attribute:status/Value:plannedscheduled' => '已计划和安排',
 	'Class:Change/Attribute:status/Value:plannedscheduled+' => '',
-	'Class:Change/Attribute:status/Value:approved' => '已批准',
+	'Class:Change/Attribute:status/Value:approved' => '已审批',
 	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:notapproved' => '未批准',
+	'Class:Change/Attribute:status/Value:notapproved' => '已驳回',
 	'Class:Change/Attribute:status/Value:notapproved+' => '',
 	'Class:Change/Attribute:status/Value:implemented' => '已实施',
 	'Class:Change/Attribute:status/Value:implemented+' => '',
@@ -125,7 +126,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change/Attribute:parent_name' => '变更编号',
 	'Class:Change/Attribute:parent_name+' => '',
 	'Class:Change/Attribute:related_request_list' => '相关需求',
-	'Class:Change/Attribute:related_request_list+' => '此变更相关的所有用户需求',
+	'Class:Change/Attribute:related_request_list+' => '此变更相关的所有需求',
 	'Class:Change/Attribute:related_problems_list' => '相关问题',
 	'Class:Change/Attribute:related_problems_list+' => '此变更相关的所有问题',
 	'Class:Change/Attribute:related_incident_list' => '相关事件',
@@ -150,7 +151,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change/Stimulus:ev_approve+' => '',
 	'Class:Change/Stimulus:ev_replan' => '重新计划',
 	'Class:Change/Stimulus:ev_replan+' => '',
-	'Class:Change/Stimulus:ev_notapprove' => '不批准',
+	'Class:Change/Stimulus:ev_notapprove' => '驳回审批',
 	'Class:Change/Stimulus:ev_notapprove+' => '',
 	'Class:Change/Stimulus:ev_implement' => '实施',
 	'Class:Change/Stimulus:ev_implement+' => '',
@@ -181,7 +182,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:RoutineChange/Stimulus:ev_approve+' => '',
 	'Class:RoutineChange/Stimulus:ev_replan' => '重新计划',
 	'Class:RoutineChange/Stimulus:ev_replan+' => '',
-	'Class:RoutineChange/Stimulus:ev_notapprove' => '不批准',
+	'Class:RoutineChange/Stimulus:ev_notapprove' => '驳回审批',
 	'Class:RoutineChange/Stimulus:ev_notapprove+' => '',
 	'Class:RoutineChange/Stimulus:ev_implement' => '实施',
 	'Class:RoutineChange/Stimulus:ev_implement+' => '',
@@ -196,11 +197,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:ApprovedChange' => '已批准的变更',
+	'Class:ApprovedChange' => '已审批的变更',
 	'Class:ApprovedChange+' => '',
-	'Class:ApprovedChange/Attribute:approval_date' => '批准日期',
+	'Class:ApprovedChange/Attribute:approval_date' => '审批日期',
 	'Class:ApprovedChange/Attribute:approval_date+' => '',
-	'Class:ApprovedChange/Attribute:approval_comment' => '批准说明',
+	'Class:ApprovedChange/Attribute:approval_comment' => '审批说明',
 	'Class:ApprovedChange/Attribute:approval_comment+' => '',
 	'Class:ApprovedChange/Stimulus:ev_validate' => '同意',
 	'Class:ApprovedChange/Stimulus:ev_validate+' => '',
@@ -216,7 +217,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ApprovedChange/Stimulus:ev_approve+' => '',
 	'Class:ApprovedChange/Stimulus:ev_replan' => '重新计划',
 	'Class:ApprovedChange/Stimulus:ev_replan+' => '',
-	'Class:ApprovedChange/Stimulus:ev_notapprove' => '不批准',
+	'Class:ApprovedChange/Stimulus:ev_notapprove' => '驳回审批',
 	'Class:ApprovedChange/Stimulus:ev_notapprove+' => '',
 	'Class:ApprovedChange/Stimulus:ev_implement' => '实施',
 	'Class:ApprovedChange/Stimulus:ev_implement+' => '',
@@ -251,7 +252,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:NormalChange/Stimulus:ev_approve+' => '',
 	'Class:NormalChange/Stimulus:ev_replan' => '重新计划',
 	'Class:NormalChange/Stimulus:ev_replan+' => '',
-	'Class:NormalChange/Stimulus:ev_notapprove' => '不批准',
+	'Class:NormalChange/Stimulus:ev_notapprove' => '驳回审批',
 	'Class:NormalChange/Stimulus:ev_notapprove+' => '',
 	'Class:NormalChange/Stimulus:ev_implement' => '实施',
 	'Class:NormalChange/Stimulus:ev_implement+' => '',
@@ -282,7 +283,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:EmergencyChange/Stimulus:ev_approve+' => '',
 	'Class:EmergencyChange/Stimulus:ev_replan' => '重新计划',
 	'Class:EmergencyChange/Stimulus:ev_replan+' => '',
-	'Class:EmergencyChange/Stimulus:ev_notapprove' => '不批准',
+	'Class:EmergencyChange/Stimulus:ev_notapprove' => '驳回审批',
 	'Class:EmergencyChange/Stimulus:ev_notapprove+' => '',
 	'Class:EmergencyChange/Stimulus:ev_implement' => '实施',
 	'Class:EmergencyChange/Stimulus:ev_implement+' => '',
--- a/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
+++ b/datamodels/2.x/itop-change-mgmt-itil/module.itop-change-mgmt-itil.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt-itil/3.2.1',
+	'itop-change-mgmt-itil/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php
@@ -21,25 +21,26 @@
 * 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('ZH CN', 'Chinese', '简体中文', [
 	'Menu:ChangeManagement' => '变更管理',
 	'Menu:Change:Overview' => '概况',
 	'Menu:Change:Overview+' => '',
 	'Menu:NewChange' => '新建变更',
-	'Menu:NewChange+' => '新建变更',
+	'Menu:NewChange+' => '新建变更工单',
 	'Menu:SearchChanges' => '搜索变更',
-	'Menu:SearchChanges+' => '搜索变更',
+	'Menu:SearchChanges+' => '搜索变更工单',
 	'Menu:Change:Shortcuts' => '快捷方式',
 	'Menu:Change:Shortcuts+' => '',
-	'Menu:WaitingAcceptance' => '等待审核的变更',
+	'Menu:WaitingAcceptance' => '等待核准的变更',
 	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => '等待批准的变更',
+	'Menu:WaitingApproval' => '等待审批的变更',
 	'Menu:WaitingApproval+' => '',
 	'Menu:Changes' => '所有打开的变更',
 	'Menu:Changes+' => '所有打开的变更',
 	'Menu:MyChanges' => '分配给我的变更',
 	'Menu:MyChanges+' => '分配给我的变更 (作为办理人)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近一周的变更 (按类型)',
+	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近一周的变更 (按种类)',
 	'UI-ChangeManagementOverview-Last-7-days' => '最近一周的变更 (按数量)',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => '最近一周的变更 (按范围)',
 	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => '最近一周的变更 (按状态)',
@@ -74,11 +75,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change/Attribute:status/Value:planned+' => '',
 	'Class:Change/Attribute:status/Value:rejected' => '已驳回',
 	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Attribute:status/Value:approved' => '已批准',
+	'Class:Change/Attribute:status/Value:approved' => '已审批',
 	'Class:Change/Attribute:status/Value:approved+' => '',
 	'Class:Change/Attribute:status/Value:closed' => '已关闭',
 	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:category' => '类型',
+	'Class:Change/Attribute:category' => '种类',
 	'Class:Change/Attribute:category+' => '',
 	'Class:Change/Attribute:category/Value:application' => '应用',
 	'Class:Change/Attribute:category/Value:application+' => '应用',
@@ -109,7 +110,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change/Attribute:fallback_plan' => '回滚计划',
 	'Class:Change/Attribute:fallback_plan+' => '',
 	'Class:Change/Attribute:related_request_list' => '相关需求',
-	'Class:Change/Attribute:related_request_list+' => '此变更相关的所有用户需求',
+	'Class:Change/Attribute:related_request_list+' => '此变更相关的所有需求',
 	'Class:Change/Attribute:related_incident_list' => '相关事件',
 	'Class:Change/Attribute:related_incident_list+' => '此变更相关的所有事件',
 	'Class:Change/Attribute:related_problems_list' => '相关问题',
--- a/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/module.itop-change-mgmt.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-change-mgmt/3.2.1',
+	'itop-change-mgmt/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php
@@ -21,23 +21,25 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 //////////////////////////////////////////////////////////////////////
 // Relations
 //////////////////////////////////////////////////////////////////////
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Relation:impacts/Description' => '被影响的元素',
-	'Relation:impacts/DownStream' => '影响...',
-	'Relation:impacts/DownStream+' => '被影响的元素',
-	'Relation:impacts/UpStream' => '依赖于...',
-	'Relation:impacts/UpStream+' => '此元素依赖的元素...',
+	'Relation:impacts/Description' 	  => '受影响的元素',
+	'Relation:impacts/DownStream'     => '影响...',
+	'Relation:impacts/DownStream+'    => '受影响的元素',
+	'Relation:impacts/UpStream'       => '依赖于...',
+	'Relation:impacts/UpStream+'      => '被影响的元素...',
 	// Legacy entries
-	'Relation:depends on/Description' => '此元素依赖的元素...',
-	'Relation:depends on/DownStream' => '依赖于...',
-	'Relation:depends on/UpStream' => '影响...',
-	'Relation:impacts/LoadData' => '加载数据',
-	'Relation:impacts/NoFilteredData' => 'please select objects and load data~~',
-	'Relation:impacts/FilteredData' => 'Filtered data~~',
+	'Relation:depends on/Description' => '被影响的元素...',
+	'Relation:depends on/DownStream'  => '依赖于...',
+	'Relation:depends on/UpStream'    => '影响...',
+	'Relation:impacts/LoadData'       => '加载数据',
+	'Relation:impacts/NoFilteredData' => '请选择对象并加载数据',
+	'Relation:impacts/FilteredData'   => '已筛选的数据',
 ]);

 // Dictionnay conventions
@@ -82,7 +84,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkContactToFunctionalCI' => '关联联系人/功能项',
+	'Class:lnkContactToFunctionalCI' => '链接 联系人/功能项',
 	'Class:lnkContactToFunctionalCI+' => '',
 	'Class:lnkContactToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项',
@@ -123,12 +125,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:FunctionalCI/Attribute:contacts_list' => '联系人',
 	'Class:FunctionalCI/Attribute:contacts_list+' => '此配置项的所有联系人',
 	'Class:FunctionalCI/Attribute:documents_list' => '文档',
-	'Class:FunctionalCI/Attribute:documents_list+' => '此配置项关联的所有文档',
+	'Class:FunctionalCI/Attribute:documents_list+' => '此配置项相关的所有文档',
 	'Class:FunctionalCI/Attribute:applicationsolution_list' => '应用方案',
 	'Class:FunctionalCI/Attribute:applicationsolution_list+' => '此配置项依赖的所有应用方案',
 	'Class:FunctionalCI/Attribute:softwares_list' => '软件',
 	'Class:FunctionalCI/Attribute:softwares_list+' => '此配置项上已安装的所有软件',
-	'Class:FunctionalCI/Attribute:finalclass' => '类型',
+	'Class:FunctionalCI/Attribute:finalclass' => '配置项子类',
 	'Class:FunctionalCI/Attribute:finalclass+' => '根本属性的名称',
 	'Class:FunctionalCI/Tab:OpenedTickets' => '活跃的工单',
 	'Class:FunctionalCI/Tab:OpenedTickets+' => '影响当前功能配置项的活跃工单',
@@ -144,7 +146,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:PhysicalDevice/ComplementaryName' => '%1$s - %2$s',
 	'Class:PhysicalDevice/Attribute:serialnumber' => '序列号',
 	'Class:PhysicalDevice/Attribute:serialnumber+' => '',
-	'Class:PhysicalDevice/Attribute:location_id' => '地点',
+	'Class:PhysicalDevice/Attribute:location_id' => '位置',
 	'Class:PhysicalDevice/Attribute:location_id+' => '',
 	'Class:PhysicalDevice/Attribute:location_name' => '名称',
 	'Class:PhysicalDevice/Attribute:location_name+' => '',
@@ -219,7 +221,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:MobilePhone+' => '',
 	'Class:MobilePhone/Attribute:imei' => 'IMEI',
 	'Class:MobilePhone/Attribute:imei+' => '',
-	'Class:MobilePhone/Attribute:hw_pin' => '硬件 PIN 码',
+	'Class:MobilePhone/Attribute:hw_pin' => '硬件PIN 码',
 	'Class:MobilePhone/Attribute:hw_pin+' => '',
 ]);

@@ -250,7 +252,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ConnectableCI+' => '物理配置项',
 	'Class:ConnectableCI/ComplementaryName' => '%1$s - %2$s',
 	'Class:ConnectableCI/Attribute:networkdevice_list' => '网络设备',
-	'Class:ConnectableCI/Attribute:networkdevice_list+' => '所有连接到这台设备的网络设备',
+	'Class:ConnectableCI/Attribute:networkdevice_list+' => '所有连接到此设备的网络设备',
 	'Class:ConnectableCI/Attribute:physicalinterface_list' => '网卡',
 	'Class:ConnectableCI/Attribute:physicalinterface_list+' => '所有物理网卡',
 ]);
@@ -275,20 +277,20 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DatacenterDevice/Attribute:nb_u+' => '',
 	'Class:DatacenterDevice/Attribute:managementip' => '管理IP',
 	'Class:DatacenterDevice/Attribute:managementip+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_id' => '主电源',
+	'Class:DatacenterDevice/Attribute:powerA_id' => '电源A',
 	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_name' => '主电源名称',
+	'Class:DatacenterDevice/Attribute:powerA_name' => '电源A名称',
 	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_id' => '备电源',
+	'Class:DatacenterDevice/Attribute:powerB_id' => '电源B',
 	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_name' => '备电源名称',
+	'Class:DatacenterDevice/Attribute:powerB_name' => '电源B名称',
 	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
-	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => '光纤接口',
+	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => '光口',
 	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => '此设备的所有光纤接口',
-	'Class:DatacenterDevice/Attribute:san_list' => 'SAN',
-	'Class:DatacenterDevice/Attribute:san_list+' => '所有连接到这台设备的SAN交换机',
+	'Class:DatacenterDevice/Attribute:san_list' => '光纤交换机',
+	'Class:DatacenterDevice/Attribute:san_list+' => '连接到此设备的所有光纤交换机',
 	'Class:DatacenterDevice/Attribute:redundancy' => '冗余',
-	'Class:DatacenterDevice/Attribute:redundancy/count' => '此设备运行正常至少需要一路电源 (主或备)',
+	'Class:DatacenterDevice/Attribute:redundancy/count' => '此设备运行正常至少需要一路电源 (A或B)',
 	// Unused yet
 	'Class:DatacenterDevice/Attribute:redundancy/disabled' => '所有电源正常, 此设备才正常',
 	'Class:DatacenterDevice/Attribute:redundancy/percent' => '至少%1$s %%路电源正常, 设备才正常',
@@ -308,9 +310,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:NetworkDevice/Attribute:networkdevicetype_name+' => '',
 	'Class:NetworkDevice/Attribute:connectablecis_list' => '设备',
 	'Class:NetworkDevice/Attribute:connectablecis_list+' => '连接到此网络设备的所有设备',
-	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS版本',
+	'Class:NetworkDevice/Attribute:iosversion_id' => 'IOS 版本',
 	'Class:NetworkDevice/Attribute:iosversion_id+' => '',
-	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS版本名称',
+	'Class:NetworkDevice/Attribute:iosversion_name' => 'IOS 版本名称',
 	'Class:NetworkDevice/Attribute:iosversion_name+' => '',
 	'Class:NetworkDevice/Attribute:ram' => '内存',
 	'Class:NetworkDevice/Attribute:ram+' => '',
@@ -321,27 +323,27 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:Server' => '服务器',
+	'Class:Server' => '物理机',
 	'Class:Server+' => '',
 	'Class:Server/ComplementaryName' => '%1$s - %2$s',
-	'Class:Server/Attribute:osfamily_id' => '操作系统家族',
+	'Class:Server/Attribute:osfamily_id' => 'OS 家族',
 	'Class:Server/Attribute:osfamily_id+' => '',
-	'Class:Server/Attribute:osfamily_name' => '操作系统家族名称',
+	'Class:Server/Attribute:osfamily_name' => 'OS 家族名称',
 	'Class:Server/Attribute:osfamily_name+' => '',
-	'Class:Server/Attribute:osversion_id' => '操作系统版本',
+	'Class:Server/Attribute:osversion_id' => 'OS 版本',
 	'Class:Server/Attribute:osversion_id+' => '',
-	'Class:Server/Attribute:osversion_name' => '操作系统版本名称',
+	'Class:Server/Attribute:osversion_name' => 'OS 版本名称',
 	'Class:Server/Attribute:osversion_name+' => '',
-	'Class:Server/Attribute:oslicence_id' => '操作系统许可证',
+	'Class:Server/Attribute:oslicence_id' => 'OS 许可证',
 	'Class:Server/Attribute:oslicence_id+' => '',
-	'Class:Server/Attribute:oslicence_name' => '操作系统许可证名称',
+	'Class:Server/Attribute:oslicence_name' => 'OS 许可证名称',
 	'Class:Server/Attribute:oslicence_name+' => '',
 	'Class:Server/Attribute:cpu' => 'CPU',
 	'Class:Server/Attribute:cpu+' => '',
 	'Class:Server/Attribute:ram' => '内存',
 	'Class:Server/Attribute:ram+' => '',
 	'Class:Server/Attribute:logicalvolumes_list' => '逻辑卷',
-	'Class:Server/Attribute:logicalvolumes_list+' => '连接到此服务器的所有逻辑卷',
+	'Class:Server/Attribute:logicalvolumes_list+' => '连接到此物理机的所有逻辑卷',
 ]);

 //
@@ -361,11 +363,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:SANSwitch' => 'SAN交换机',
+	'Class:SANSwitch' => '光纤交换机',
 	'Class:SANSwitch+' => '',
 	'Class:SANSwitch/ComplementaryName' => '%1$s - %2$s',
 	'Class:SANSwitch/Attribute:datacenterdevice_list' => '设备',
-	'Class:SANSwitch/Attribute:datacenterdevice_list+' => '连接到此SAN交换机的所有设备',
+	'Class:SANSwitch/Attribute:datacenterdevice_list+' => '连接到此光纤交换机的所有设备',
 ]);

 //
@@ -400,13 +402,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:PC' => 'PC',
 	'Class:PC+' => '',
 	'Class:PC/ComplementaryName' => '%1$s - %2$s',
-	'Class:PC/Attribute:osfamily_id' => '操作系统家族',
+	'Class:PC/Attribute:osfamily_id' => 'OS 家族',
 	'Class:PC/Attribute:osfamily_id+' => '',
-	'Class:PC/Attribute:osfamily_name' => '操作系统家族名称',
+	'Class:PC/Attribute:osfamily_name' => 'OS 家族名称',
 	'Class:PC/Attribute:osfamily_name+' => '',
-	'Class:PC/Attribute:osversion_id' => '操作系统版本',
+	'Class:PC/Attribute:osversion_id' => 'OS 版本',
 	'Class:PC/Attribute:osversion_id+' => '',
-	'Class:PC/Attribute:osversion_name' => '操作系统版本名称',
+	'Class:PC/Attribute:osversion_name' => 'OS 版本名称',
 	'Class:PC/Attribute:osversion_name+' => '',
 	'Class:PC/Attribute:cpu' => 'CPU',
 	'Class:PC/Attribute:cpu+' => '',
@@ -445,11 +447,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:PowerSource' => '电源',
+	'Class:PowerSource' => '动力电源',
 	'Class:PowerSource+' => '',
 	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU',
-	'Class:PowerSource/Attribute:pdus_list+' => '使用此电源的所有 PDU',
+	'Class:PowerSource/Attribute:pdus_list+' => '使用此动力电源的所有 PDU',
 ]);

 //
@@ -464,9 +466,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:PDU/Attribute:rack_id+' => '',
 	'Class:PDU/Attribute:rack_name' => '机架名称',
 	'Class:PDU/Attribute:rack_name+' => '',
-	'Class:PDU/Attribute:powerstart_id' => '上级电源',
+	'Class:PDU/Attribute:powerstart_id' => '上游电源',
 	'Class:PDU/Attribute:powerstart_id+' => '',
-	'Class:PDU/Attribute:powerstart_name' => '上级电源名称',
+	'Class:PDU/Attribute:powerstart_name' => '上游电源名称',
 	'Class:PDU/Attribute:powerstart_name+' => '',
 ]);

@@ -508,7 +510,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => '配置项',
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => '此应用方案包含的所有配置项',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => '业务流程',
-	'Class:ApplicationSolution/Attribute:businessprocess_list+' => '所有依赖此应用方案的业务流程',
+	'Class:ApplicationSolution/Attribute:businessprocess_list+' => '依赖此应用方案的所有业务流程',
 	'Class:ApplicationSolution/Attribute:status' => '状态',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => '启用',
@@ -529,7 +531,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:BusinessProcess' => '业务流程',
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => '应用方案',
-	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => '所有影响此业务流程的应用方案',
+	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => '影响此业务流程的所有应用方案',
 	'Class:BusinessProcess/Attribute:status' => '状态',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => '启用',
@@ -585,8 +587,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DBServer' => '数据库服务器',
 	'Class:DBServer+' => '',
-	'Class:DBServer/Attribute:dbschema_list' => '数据库',
-	'Class:DBServer/Attribute:dbschema_list+' => '此数据库服务器上的所有数据库架构',
+	'Class:DBServer/Attribute:dbschema_list' => '数据库模式',
+	'Class:DBServer/Attribute:dbschema_list+' => '此数据库服务器上的所有逻辑数据库',
 ]);

 //
@@ -594,10 +596,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:WebServer' => 'Web服务器',
+	'Class:WebServer' => 'Web 服务器',
 	'Class:WebServer+' => '',
-	'Class:WebServer/Attribute:webapp_list' => 'Web应用',
-	'Class:WebServer/Attribute:webapp_list+' => '此web服务器上的所有web应用',
+	'Class:WebServer/Attribute:webapp_list' => 'Web 应用',
+	'Class:WebServer/Attribute:webapp_list+' => '此 web 服务器上的所有 web 应用',
 ]);

 //
@@ -628,7 +630,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => '中间件',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
-	'Class:MiddlewareInstance/Attribute:middleware_name' => '名称',
+	'Class:MiddlewareInstance/Attribute:middleware_name' => '中间件名称',
 	'Class:MiddlewareInstance/Attribute:middleware_name+' => '',
 ]);

@@ -637,12 +639,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:DatabaseSchema' => '数据库',
-	'Class:DatabaseSchema+' => '',
+	'Class:DatabaseSchema' => '数据库模式',
+	'Class:DatabaseSchema+' => '运行在数据库服务器上的逻辑数据库',
 	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => '数据库服务器',
 	'Class:DatabaseSchema/Attribute:dbserver_id+' => '',
-	'Class:DatabaseSchema/Attribute:dbserver_name' => '名称',
+	'Class:DatabaseSchema/Attribute:dbserver_name' => '数据库服务器名称',
 	'Class:DatabaseSchema/Attribute:dbserver_name+' => '',
 ]);

@@ -654,9 +656,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:WebApplication' => 'Web 应用',
 	'Class:WebApplication+' => '',
 	'Class:WebApplication/ComplementaryName' => '%1$s - %2$s',
-	'Class:WebApplication/Attribute:webserver_id' => 'Web服务器',
+	'Class:WebApplication/Attribute:webserver_id' => 'Web 服务器',
 	'Class:WebApplication/Attribute:webserver_id+' => '',
-	'Class:WebApplication/Attribute:webserver_name' => '名称',
+	'Class:WebApplication/Attribute:webserver_name' => 'Web 服务器名称',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
 	'Class:WebApplication/Attribute:url' => 'URL',
 	'Class:WebApplication/Attribute:url+' => '',
@@ -688,10 +690,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:VirtualHost' => '宿主机',
+	'Class:VirtualHost' => '虚拟化主机',
 	'Class:VirtualHost+' => '',
 	'Class:VirtualHost/Attribute:virtualmachine_list' => '虚拟机',
-	'Class:VirtualHost/Attribute:virtualmachine_list+' => '此宿主机托管的所有虚拟机',
+	'Class:VirtualHost/Attribute:virtualmachine_list+' => '此虚拟化主机托管的所有虚拟机',
 ]);

 //
@@ -703,11 +705,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Hypervisor+' => '',
 	'Class:Hypervisor/Attribute:farm_id' => '集群',
 	'Class:Hypervisor/Attribute:farm_id+' => '',
-	'Class:Hypervisor/Attribute:farm_name' => '名称',
+	'Class:Hypervisor/Attribute:farm_name' => '集群名称',
 	'Class:Hypervisor/Attribute:farm_name+' => '',
 	'Class:Hypervisor/Attribute:server_id' => '物理机',
 	'Class:Hypervisor/Attribute:server_id+' => '',
-	'Class:Hypervisor/Attribute:server_name' => '名称',
+	'Class:Hypervisor/Attribute:server_name' => '物理机名称',
 	'Class:Hypervisor/Attribute:server_name+' => '',
 ]);

@@ -734,21 +736,21 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:VirtualMachine' => '虚拟机',
 	'Class:VirtualMachine+' => '',
 	'Class:VirtualMachine/ComplementaryName' => '%1$s - %2$s',
-	'Class:VirtualMachine/Attribute:virtualhost_id' => '宿主机',
+	'Class:VirtualMachine/Attribute:virtualhost_id' => '虚拟化主机',
 	'Class:VirtualMachine/Attribute:virtualhost_id+' => '',
 	'Class:VirtualMachine/Attribute:virtualhost_name' => '名称',
 	'Class:VirtualMachine/Attribute:virtualhost_name+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_id' => '操作系统家族',
+	'Class:VirtualMachine/Attribute:osfamily_id' => 'OS 家族',
 	'Class:VirtualMachine/Attribute:osfamily_id+' => '',
-	'Class:VirtualMachine/Attribute:osfamily_name' => '名称',
+	'Class:VirtualMachine/Attribute:osfamily_name' => 'OS 家族名称',
 	'Class:VirtualMachine/Attribute:osfamily_name+' => '',
-	'Class:VirtualMachine/Attribute:osversion_id' => '操作系统版本',
+	'Class:VirtualMachine/Attribute:osversion_id' => 'OS 版本',
 	'Class:VirtualMachine/Attribute:osversion_id+' => '',
-	'Class:VirtualMachine/Attribute:osversion_name' => '名称',
+	'Class:VirtualMachine/Attribute:osversion_name' => 'OS 版本名称',
 	'Class:VirtualMachine/Attribute:osversion_name+' => '',
-	'Class:VirtualMachine/Attribute:oslicence_id' => '操作系统许可证',
+	'Class:VirtualMachine/Attribute:oslicence_id' => 'OS 许可证',
 	'Class:VirtualMachine/Attribute:oslicence_id+' => '',
-	'Class:VirtualMachine/Attribute:oslicence_name' => '名称',
+	'Class:VirtualMachine/Attribute:oslicence_name' => 'OS 许可证名称',
 	'Class:VirtualMachine/Attribute:oslicence_name+' => '',
 	'Class:VirtualMachine/Attribute:cpu' => 'CPU',
 	'Class:VirtualMachine/Attribute:cpu+' => '',
@@ -779,10 +781,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:LogicalVolume/Attribute:size+' => '',
 	'Class:LogicalVolume/Attribute:storagesystem_id' => '存储系统',
 	'Class:LogicalVolume/Attribute:storagesystem_id+' => '',
-	'Class:LogicalVolume/Attribute:storagesystem_name' => '名称',
+	'Class:LogicalVolume/Attribute:storagesystem_name' => '存储系统名称',
 	'Class:LogicalVolume/Attribute:storagesystem_name+' => '',
-	'Class:LogicalVolume/Attribute:servers_list' => '服务器',
-	'Class:LogicalVolume/Attribute:servers_list+' => '使用此逻辑卷的服务器',
+	'Class:LogicalVolume/Attribute:servers_list' => '物理机',
+	'Class:LogicalVolume/Attribute:servers_list+' => '使用此逻辑卷的物理机',
 	'Class:LogicalVolume/Attribute:virtualdevices_list' => '虚拟设备',
 	'Class:LogicalVolume/Attribute:virtualdevices_list+' => '使用此逻辑卷的所有虚拟设备',
 ]);
@@ -792,16 +794,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkServerToVolume' => '关联服务器/逻辑卷',
+	'Class:lnkServerToVolume' => '链接 物理机/逻辑卷',
 	'Class:lnkServerToVolume+' => '',
 	'Class:lnkServerToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkServerToVolume/Attribute:volume_id' => '逻辑卷',
 	'Class:lnkServerToVolume/Attribute:volume_id+' => '',
 	'Class:lnkServerToVolume/Attribute:volume_name' => '逻辑卷名称',
 	'Class:lnkServerToVolume/Attribute:volume_name+' => '',
-	'Class:lnkServerToVolume/Attribute:server_id' => '服务器',
+	'Class:lnkServerToVolume/Attribute:server_id' => '物理机',
 	'Class:lnkServerToVolume/Attribute:server_id+' => '',
-	'Class:lnkServerToVolume/Attribute:server_name' => '服务器名称',
+	'Class:lnkServerToVolume/Attribute:server_name' => '物理机名称',
 	'Class:lnkServerToVolume/Attribute:server_name+' => '',
 	'Class:lnkServerToVolume/Attribute:size_used' => '已用容量',
 	'Class:lnkServerToVolume/Attribute:size_used+' => '',
@@ -812,16 +814,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkVirtualDeviceToVolume' => '关联虚拟设备/逻辑卷',
+	'Class:lnkVirtualDeviceToVolume' => '链接 虚拟设备/逻辑卷',
 	'Class:lnkVirtualDeviceToVolume+' => '',
 	'Class:lnkVirtualDeviceToVolume/Name' => '%1$s / %2$s',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id' => '逻辑卷',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => '名称',
+	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name' => '逻辑卷名称',
 	'Class:lnkVirtualDeviceToVolume/Attribute:volume_name+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id' => '虚拟设备',
 	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_id+' => '',
-	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => '名称',
+	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name' => '虚拟设备名称',
 	'Class:lnkVirtualDeviceToVolume/Attribute:virtualdevice_name+' => '',
 	'Class:lnkVirtualDeviceToVolume/Attribute:size_used' => '已用容量',
 	'Class:lnkVirtualDeviceToVolume/Attribute:size_used+' => '',
@@ -832,18 +834,18 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkSanToDatacenterDevice' => '关联 SAN/数据中心设备',
+	'Class:lnkSanToDatacenterDevice' => '链接 光纤交换机/数据中心设备',
 	'Class:lnkSanToDatacenterDevice+' => '',
 	'Class:lnkSanToDatacenterDevice/Name' => '%1$s / %2$s',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => 'SAN 交换机',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_id' => '光纤交换机',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => '名称',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_name' => '光纤交换机名称',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_name+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id' => '设备',
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_id+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => '名称',
+	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name' => '设备名称',
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_name+' => '',
-	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => 'SAN 光口',
+	'Class:lnkSanToDatacenterDevice/Attribute:san_port' => '交换机光口',
 	'Class:lnkSanToDatacenterDevice/Attribute:san_port+' => '',
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port' => '设备光口',
 	'Class:lnkSanToDatacenterDevice/Attribute:datacenterdevice_port+' => '',
@@ -864,7 +866,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Tape/Attribute:size+' => '',
 	'Class:Tape/Attribute:tapelibrary_id' => '磁带库',
 	'Class:Tape/Attribute:tapelibrary_id+' => '',
-	'Class:Tape/Attribute:tapelibrary_name' => '名称',
+	'Class:Tape/Attribute:tapelibrary_name' => '磁带库名称',
 	'Class:Tape/Attribute:tapelibrary_name+' => '',
 ]);

@@ -913,10 +915,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Software/Attribute:type/Value:Middleware+' => '中间件',
 	'Class:Software/Attribute:type/Value:OtherSoftware' => '其它软件',
 	'Class:Software/Attribute:type/Value:OtherSoftware+' => '其它软件',
-	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC软件',
-	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC软件',
-	'Class:Software/Attribute:type/Value:WebServer' => 'Web服务器',
-	'Class:Software/Attribute:type/Value:WebServer+' => 'Web服务器',
+	'Class:Software/Attribute:type/Value:PCSoftware' => 'PC 软件',
+	'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC 软件',
+	'Class:Software/Attribute:type/Value:WebServer' => 'Web 服务器',
+	'Class:Software/Attribute:type/Value:WebServer+' => 'Web 服务器',
 	'Class:Software/Attribute:softwareinstance_list' => '软件实例',
 	'Class:Software/Attribute:softwareinstance_list+' => '此软件的所有实例',
 	'Class:Software/Attribute:softwarepatch_list' => '软件补丁',
@@ -935,10 +937,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Patch/Attribute:name' => '名称',
 	'Class:Patch/Attribute:name+' => '',
 	'Class:Patch/Attribute:documents_list' => '文档',
-	'Class:Patch/Attribute:documents_list+' => '此补丁关联的所有文档',
+	'Class:Patch/Attribute:documents_list+' => '此补丁相关的所有文档',
 	'Class:Patch/Attribute:description' => '描述',
 	'Class:Patch/Attribute:description+' => '',
-	'Class:Patch/Attribute:finalclass' => '补丁类型',
+	'Class:Patch/Attribute:finalclass' => '补丁子类',
 	'Class:Patch/Attribute:finalclass+' => '根本属性的名称',
 ]);

@@ -947,11 +949,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:OSPatch' => '操作系统补丁',
+	'Class:OSPatch' => 'OS 补丁',
 	'Class:OSPatch+' => '',
 	'Class:OSPatch/Attribute:functionalcis_list' => '设备',
 	'Class:OSPatch/Attribute:functionalcis_list+' => '已安装此补丁的所有系统',
-	'Class:OSPatch/Attribute:osversion_id' => '操作系统版本',
+	'Class:OSPatch/Attribute:osversion_id' => 'OS 版本',
 	'Class:OSPatch/Attribute:osversion_id+' => '',
 	'Class:OSPatch/Attribute:osversion_name' => '名称',
 	'Class:OSPatch/Attribute:osversion_name+' => '',
@@ -966,7 +968,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SoftwarePatch+' => '',
 	'Class:SoftwarePatch/Attribute:software_id' => '软件',
 	'Class:SoftwarePatch/Attribute:software_id+' => '',
-	'Class:SoftwarePatch/Attribute:software_name' => '名称',
+	'Class:SoftwarePatch/Attribute:software_name' => '软件名称',
 	'Class:SoftwarePatch/Attribute:software_name+' => '',
 	'Class:SoftwarePatch/Attribute:softwareinstances_list' => '软件实例',
 	'Class:SoftwarePatch/Attribute:softwareinstances_list+' => '已安装此软件补丁的所有系统',
@@ -979,10 +981,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Licence' => '许可证',
 	'Class:Licence+' => '',
+
 	'Class:Licence/Attribute:name' => '名称',
 	'Class:Licence/Attribute:name+' => '',
 	'Class:Licence/Attribute:documents_list' => '文档',
-	'Class:Licence/Attribute:documents_list+' => '此许可证关联的所有文档',
+	'Class:Licence/Attribute:documents_list+' => '此许可证相关的所有文档',
 	'Class:Licence/Attribute:org_id' => '组织',
 	'Class:Licence/Attribute:org_id+' => '',
 	'Class:Licence/Attribute:organization_name' => '组织名称',
@@ -1003,7 +1006,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Licence/Attribute:perpetual/Value:no+' => '否',
 	'Class:Licence/Attribute:perpetual/Value:yes' => '是',
 	'Class:Licence/Attribute:perpetual/Value:yes+' => '是',
-	'Class:Licence/Attribute:finalclass' => '许可证类型',
+	'Class:Licence/Attribute:finalclass' => '许可证子类',
 	'Class:Licence/Attribute:finalclass+' => '根本属性的名称',
 ]);

@@ -1012,17 +1015,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:OSLicence' => '操作系统许可证',
+	'Class:OSLicence' => 'OS 许可证',
 	'Class:OSLicence+' => '',
 	'Class:OSLicence/ComplementaryName' => '%1$s - %2$s',
-	'Class:OSLicence/Attribute:osversion_id' => '操作系统版本',
+	'Class:OSLicence/Attribute:osversion_id' => 'OS 版本',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
-	'Class:OSLicence/Attribute:osversion_name' => '名称',
+	'Class:OSLicence/Attribute:osversion_name' => 'OS 版本名称',
 	'Class:OSLicence/Attribute:osversion_name+' => '',
 	'Class:OSLicence/Attribute:virtualmachines_list' => '虚拟机',
 	'Class:OSLicence/Attribute:virtualmachines_list+' => '使用此许可证的所有虚拟机',
-	'Class:OSLicence/Attribute:servers_list' => '服务器',
-	'Class:OSLicence/Attribute:servers_list+' => '使用此许可证的所有服务器',
+	'Class:OSLicence/Attribute:servers_list' => '物理机',
+	'Class:OSLicence/Attribute:servers_list+' => '使用此许可证的所有物理机',
 ]);

 //
@@ -1035,7 +1038,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SoftwareLicence/ComplementaryName' => '%1$s - %2$s',
 	'Class:SoftwareLicence/Attribute:software_id' => '软件',
 	'Class:SoftwareLicence/Attribute:software_id+' => '',
-	'Class:SoftwareLicence/Attribute:software_name' => '名称',
+	'Class:SoftwareLicence/Attribute:software_name' => '软件名称',
 	'Class:SoftwareLicence/Attribute:software_name+' => '',
 	'Class:SoftwareLicence/Attribute:softwareinstance_list' => '软件实例',
 	'Class:SoftwareLicence/Attribute:softwareinstance_list+' => '使用此许可证的所有系统',
@@ -1046,12 +1049,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkDocumentToLicence' => '关联文档/许可证',
+	'Class:lnkDocumentToLicence' => '链接 文档/许可证',
 	'Class:lnkDocumentToLicence+' => '',
 	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => '许可证',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
-	'Class:lnkDocumentToLicence/Attribute:licence_name' => '名称',
+	'Class:lnkDocumentToLicence/Attribute:licence_name' => '许可证名称',
 	'Class:lnkDocumentToLicence/Attribute:licence_name+' => '',
 	'Class:lnkDocumentToLicence/Attribute:document_id' => '文档',
 	'Class:lnkDocumentToLicence/Attribute:document_id+' => '',
@@ -1064,11 +1067,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:OSVersion' => '操作系统版本',
+	'Class:OSVersion' => 'OS 版本',
 	'Class:OSVersion+' => '',
-	'Class:OSVersion/Attribute:osfamily_id' => '操作系统家族',
+	'Class:OSVersion/Attribute:osfamily_id' => 'OS 家族',
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
-	'Class:OSVersion/Attribute:osfamily_name' => '名称',
+	'Class:OSVersion/Attribute:osfamily_name' => 'OS 家族名称',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
 ]);

@@ -1077,7 +1080,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:OSFamily' => '操作系统家族',
+	'Class:OSFamily' => 'OS 家族',
 	'Class:OSFamily+' => '',
 ]);

@@ -1112,14 +1115,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Model/Attribute:picture+' => '',
 	'Class:Model/Attribute:type' => '设备类型',
 	'Class:Model/Attribute:type+' => '',
-	'Class:Model/Attribute:type/Value:PowerSource' => '电源',
-	'Class:Model/Attribute:type/Value:PowerSource+' => '电源',
+	'Class:Model/Attribute:type/Value:PowerSource' => '动力电源',
+	'Class:Model/Attribute:type/Value:PowerSource+' => '动力电源',
 	'Class:Model/Attribute:type/Value:DiskArray' => '磁盘阵列',
 	'Class:Model/Attribute:type/Value:DiskArray+' => '磁盘阵列',
 	'Class:Model/Attribute:type/Value:Enclosure' => '机柜',
 	'Class:Model/Attribute:type/Value:Enclosure+' => '机柜',
-	'Class:Model/Attribute:type/Value:IPPhone' => 'IP电话',
-	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP电话',
+	'Class:Model/Attribute:type/Value:IPPhone' => 'IP 电话',
+	'Class:Model/Attribute:type/Value:IPPhone+' => 'IP 电话',
 	'Class:Model/Attribute:type/Value:MobilePhone' => '手机',
 	'Class:Model/Attribute:type/Value:MobilePhone+' => '手机',
 	'Class:Model/Attribute:type/Value:NAS' => 'NAS',
@@ -1136,10 +1139,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Model/Attribute:type/Value:Printer+' => '打印机',
 	'Class:Model/Attribute:type/Value:Rack' => '机架',
 	'Class:Model/Attribute:type/Value:Rack+' => '机架',
-	'Class:Model/Attribute:type/Value:SANSwitch' => 'SAN交换机',
-	'Class:Model/Attribute:type/Value:SANSwitch+' => 'SAN交换机',
-	'Class:Model/Attribute:type/Value:Server' => '服务器',
-	'Class:Model/Attribute:type/Value:Server+' => '服务器',
+	'Class:Model/Attribute:type/Value:SANSwitch' => '光纤交换机',
+	'Class:Model/Attribute:type/Value:SANSwitch+' => '光纤交换机',
+	'Class:Model/Attribute:type/Value:Server' => '物理机',
+	'Class:Model/Attribute:type/Value:Server+' => '物理机',
 	'Class:Model/Attribute:type/Value:StorageSystem' => '存储系统',
 	'Class:Model/Attribute:type/Value:StorageSystem+' => '存储系统',
 	'Class:Model/Attribute:type/Value:Tablet' => '平板',
@@ -1174,7 +1177,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:IOSVersion+' => '',
 	'Class:IOSVersion/Attribute:brand_id' => '品牌',
 	'Class:IOSVersion/Attribute:brand_id+' => '',
-	'Class:IOSVersion/Attribute:brand_name' => '名称',
+	'Class:IOSVersion/Attribute:brand_name' => '品牌名称',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
 ]);

@@ -1183,7 +1186,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkDocumentToPatch' => '关联文档/补丁',
+	'Class:lnkDocumentToPatch' => '链接 文档/补丁',
 	'Class:lnkDocumentToPatch+' => '',
 	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => '补丁',
@@ -1201,7 +1204,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkSoftwareInstanceToSoftwarePatch' => ' 关联软件实例/软件补丁',
+	'Class:lnkSoftwareInstanceToSoftwarePatch' => '链接 软件实例/软件补丁',
 	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => '软件补丁',
@@ -1219,12 +1222,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkFunctionalCIToOSPatch' => '关联功能项/操作系统补丁',
+	'Class:lnkFunctionalCIToOSPatch' => '链接 功能项/OS 补丁',
 	'Class:lnkFunctionalCIToOSPatch+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Name' => '%1$s / %2$s',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => '操作系统补丁',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS 补丁',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '',
-	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => '操作系统补丁名称',
+	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS 补丁名称',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => '功能项',
 	'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '',
@@ -1237,7 +1240,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkDocumentToSoftware' => '关联文档/软件',
+	'Class:lnkDocumentToSoftware' => '链接 文档/软件',
 	'Class:lnkDocumentToSoftware+' => '',
 	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => '软件',
@@ -1265,8 +1268,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Subnet/Attribute:subnet_name+' => '',
 	'Class:Subnet/Attribute:org_id' => '所属组织',
 	'Class:Subnet/Attribute:org_id+' => '',
-	'Class:Subnet/Attribute:org_name' => '名称',
-	'Class:Subnet/Attribute:org_name+' => '名称',
+	'Class:Subnet/Attribute:org_name' => '组织名称',
+	'Class:Subnet/Attribute:org_name+' => '',
 	'Class:Subnet/Attribute:ip' => 'IP',
 	'Class:Subnet/Attribute:ip+' => '',
 	'Class:Subnet/Attribute:ip_mask' => '掩码',
@@ -1282,7 +1285,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:VLAN' => 'VLAN',
 	'Class:VLAN+' => '',
-	'Class:VLAN/Attribute:vlan_tag' => 'VLAN 标记',
+	'Class:VLAN/Attribute:vlan_tag' => 'VLAN 标签',
 	'Class:VLAN/Attribute:vlan_tag+' => '',
 	'Class:VLAN/Attribute:description' => '描述',
 	'Class:VLAN/Attribute:description+' => '',
@@ -1301,7 +1304,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkSubnetToVLAN' => '关联子网/VLAN',
+	'Class:lnkSubnetToVLAN' => '链接 子网/VLAN',
 	'Class:lnkSubnetToVLAN+' => '',
 	'Class:lnkSubnetToVLAN/Name' => '%1$s / %2$s',
 	'Class:lnkSubnetToVLAN/Attribute:subnet_id' => '子网',
@@ -1312,7 +1315,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '',
 	'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN',
 	'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '',
-	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN 标记',
+	'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN 标签',
 	'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '',
 ]);

@@ -1338,7 +1341,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:IPInterface+' => '',
 	'Class:IPInterface/Attribute:ipaddress' => 'IP 地址',
 	'Class:IPInterface/Attribute:ipaddress+' => '',
-	'Class:IPInterface/Attribute:macaddress' => 'MAC地址',
+
+	'Class:IPInterface/Attribute:macaddress' => 'MAC 地址',
 	'Class:IPInterface/Attribute:macaddress+' => '',
 	'Class:IPInterface/Attribute:comment' => '备注',
 	'Class:IPInterface/Attribute:coment+' => '',
@@ -1371,7 +1375,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkPhysicalInterfaceToVLAN' => '关联物理网卡/VLAN',
+	'Class:lnkPhysicalInterfaceToVLAN' => '链接 物理网卡/VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => '物理网卡',
@@ -1384,7 +1388,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '',
-	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN 标记',
+	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN 标签',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '',
 ]);

@@ -1406,7 +1410,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:FiberChannelInterface' => '光纤接口',
+	'Class:FiberChannelInterface' => '光口',
 	'Class:FiberChannelInterface+' => '',
 	'Class:FiberChannelInterface/Attribute:speed' => '速率',
 	'Class:FiberChannelInterface/Attribute:speed+' => '',
@@ -1425,7 +1429,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkConnectableCIToNetworkDevice' => '关联可连接项/网络设备',
+	'Class:lnkConnectableCIToNetworkDevice' => '链接 可连接项/网络设备',
 	'Class:lnkConnectableCIToNetworkDevice+' => '',
 	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => '网络设备',
@@ -1453,7 +1457,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkApplicationSolutionToFunctionalCI' => '关联应用方案/功能项',
+	'Class:lnkApplicationSolutionToFunctionalCI' => '链接 应用方案/功能项',
 	'Class:lnkApplicationSolutionToFunctionalCI+' => '',
 	'Class:lnkApplicationSolutionToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => '应用方案',
@@ -1471,7 +1475,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkApplicationSolutionToBusinessProcess' => '关联应用方案/业务流程',
+	'Class:lnkApplicationSolutionToBusinessProcess' => '链接 应用方案/业务流程',
 	'Class:lnkApplicationSolutionToBusinessProcess+' => '',
 	'Class:lnkApplicationSolutionToBusinessProcess/Name' => '%1$s / %2$s',
 	'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => '业务流程',
@@ -1504,19 +1508,20 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Group/Attribute:status/Value:production+' => '生产',
 	'Class:Group/Attribute:org_id' => '组织',
 	'Class:Group/Attribute:org_id+' => '',
-	'Class:Group/Attribute:owner_name' => '名称',
+	'Class:Group/Attribute:owner_name' => '属主名称',
 	'Class:Group/Attribute:owner_name+' => '通用名称',
 	'Class:Group/Attribute:description' => '描述',
 	'Class:Group/Attribute:description+' => '',
 	'Class:Group/Attribute:type' => '类型',
 	'Class:Group/Attribute:type+' => '',
-	'Class:Group/Attribute:parent_id' => '上级组',
+	'Class:Group/Attribute:parent_id' => '父级配置组',
+
 	'Class:Group/Attribute:parent_id+' => '',
 	'Class:Group/Attribute:parent_name' => '名称',
 	'Class:Group/Attribute:parent_name+' => '',
-	'Class:Group/Attribute:ci_list' => '关联的配置项',
-	'Class:Group/Attribute:ci_list+' => '此组关联的所有配置项',
-	'Class:Group/Attribute:parent_id_friendlyname' => '上级配置组',
+	'Class:Group/Attribute:ci_list' => '相关的配置项',
+	'Class:Group/Attribute:ci_list+' => '此配置组相关的所有配置项',
+	'Class:Group/Attribute:parent_id_friendlyname' => '父级配置组',
 	'Class:Group/Attribute:parent_id_friendlyname+' => '',
 ]);

@@ -1525,16 +1530,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkGroupToCI' => '关联配置组/配置项',
+	'Class:lnkGroupToCI' => '链接 配置组/配置项',
 	'Class:lnkGroupToCI+' => '',
 	'Class:lnkGroupToCI/Name' => '%1$s / %2$s',
 	'Class:lnkGroupToCI/Attribute:group_id' => '组',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
-	'Class:lnkGroupToCI/Attribute:group_name' => '名称',
+	'Class:lnkGroupToCI/Attribute:group_name' => '配置组名称',
 	'Class:lnkGroupToCI/Attribute:group_name+' => '',
 	'Class:lnkGroupToCI/Attribute:ci_id' => '配置项',
 	'Class:lnkGroupToCI/Attribute:ci_id+' => '',
-	'Class:lnkGroupToCI/Attribute:ci_name' => '名称',
+	'Class:lnkGroupToCI/Attribute:ci_name' => '配置项名称',
 	'Class:lnkGroupToCI/Attribute:ci_name+' => '',
 	'Class:lnkGroupToCI/Attribute:reason' => '原因',
 	'Class:lnkGroupToCI/Attribute:reason+' => '',
@@ -1562,7 +1567,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkDocumentToFunctionalCI' => '关联文档/功能项',
+	'Class:lnkDocumentToFunctionalCI' => '链接 文档/功能项',
 	'Class:lnkDocumentToFunctionalCI+' => '',
 	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => '功能项',
@@ -1600,8 +1605,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:Subnet+' => '所有子网',
 	'Menu:NetworkDevice' => '网络设备',
 	'Menu:NetworkDevice+' => '所有网络设备',
-	'Menu:Server' => '服务器',
-	'Menu:Server+' => '所有服务器',
+	'Menu:Server' => '物理机',
+	'Menu:Server+' => '所有物理机',
 	'Menu:Printer' => '打印机',
 	'Menu:Printer+' => '所有打印机',
 	'Menu:MobilePhone' => '手机',
@@ -1631,8 +1636,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //

 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Org id~~',
-	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Location id~~',
-	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
+	'Class:PhysicalInterface/Attribute:org_id' => '组织id',
+	'Class:PhysicalInterface/Attribute:org_id+' => '',
+	'Class:PhysicalInterface/Attribute:location_id' => '位置id',
+	'Class:PhysicalInterface/Attribute:location_id+' => '',
 ]);
--- a/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
+++ b/datamodels/2.x/itop-config-mgmt/module.itop-config-mgmt.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config-mgmt/3.2.1',
+	'itop-config-mgmt/3.2.3',
 	[
 		// Identification
 		//
--- 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
@@ -21,9 +21,10 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Menu:ConfigFileEditor' => 'Plain text editor~~',
-	'Menu:ConfigEditor' => '编辑配置文件',
+
+	'Menu:ConfigFileEditor' => '纯文本编辑器',
 	'config-edit-title' => '配置文件编辑器',
 	'config-edit-intro' => '编辑配置文件时请务必格外小心.',
 	'config-apply' => '应用',
@@ -36,7 +37,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'config-parse-error' => '第%2$d行: %1$s.<br/>配置文件尚未更新.',
 	'config-current-line' => '正在编辑第%1$s行',
 	'config-saved-warning-db-password' => '保存成功, 但因为数据库密码中包含不支持的字符, 配置文件备份不会成功.',
-	'config-error-transaction' => '错误: 无效的事务编号. 配置<b>没有</b>被更新.',
+	'config-error-transaction' => '错误: 无效的事务id. 配置<b>没有</b>被更新.',
 	'config-error-file-changed' => '错误: 配置文件在您打开以后已被更改, 无法保存. 请刷新并再次保存.',
 	'config-not-allowed-in-demo' => '抱歉, '.ITOP_APPLICATION_SHORT.'处于<b>演示模式</b>: 不能编辑配置文件.',
 	'config-interactive-not-allowed' => ITOP_APPLICATION_SHORT.'交互式配置编辑器已禁用. 请在配置文件中查看 <code>\'config_editor\' => \'disabled\'</code>.',
--- a/datamodels/2.x/itop-config/module.itop-config.php
+++ b/datamodels/2.x/itop-config/module.itop-config.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-config/3.2.1',
+	'itop-config/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
@@ -28,10 +28,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'itop-core-update:UI:UpdateCoreFiles' => '应用升级',
 	'iTopUpdate:UI:MaintenanceModeActive' => '此应用当前维护中, 不允许任何用户访问. 必须运行安装或恢复归档来使其处于正常模式.',
 	'itop-core-update:UI:UpdateDone' => '应用升级',
+
 	'itop-core-update/Operation:SelectUpdateFile/Title' => '应用升级',
 	'itop-core-update/Operation:ConfirmUpdate/Title' => '请确认升级应用',
 	'itop-core-update/Operation:UpdateCoreFiles/Title' => '应用正在升级',
 	'itop-core-update/Operation:UpdateDone/Title' => '应用升级完毕',
+
 	'iTopUpdate:UI:SelectUpdateFile' => '请选择要上传的升级文件',
 	'iTopUpdate:UI:CheckUpdate' => '校验升级文件',
 	'iTopUpdate:UI:ConfirmInstallFile' => '即将安装 %1$s',
@@ -50,19 +52,24 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'iTopUpdate:UI:UploadArchive' => '请选择要上传的软件包',
 	'iTopUpdate:UI:ServerFile' => '服务器上的软件包路径已存在',
 	'iTopUpdate:UI:WarningReadOnlyDuringUpdate' => '升级期间, 应用会变成只读状态.',
+
 	'iTopUpdate:UI:Status' => '状态',
 	'iTopUpdate:UI:Action' => '升级',
 	'iTopUpdate:UI:Setup' => ITOP_APPLICATION_SHORT.'安装',
 	'iTopUpdate:UI:History' => '版本历史',
 	'iTopUpdate:UI:Progress' => '升级进度',
+
 	'iTopUpdate:UI:DoBackup:Label' => '备份文件和数据库',
 	'iTopUpdate:UI:DoBackup:Warning' => '由于磁盘空间不足, 不建议备份',
-	'iTopUpdate:UI:DiskFreeSpace' => '磁盘剩余空间',
+
+	'iTopUpdate:UI:DiskFreeSpace' => '剩余磁盘空间',
 	'iTopUpdate:UI:ItopDiskSpace' => ITOP_APPLICATION_SHORT.'的磁盘空间',
 	'iTopUpdate:UI:DBDiskSpace' => '数据库的磁盘空间',
 	'iTopUpdate:UI:FileUploadMaxSize' => '文件上传大小上限',
-	'iTopUpdate:UI:PostMaxSize' => 'PHP ini值post_max_size: %1$s',
+
+	'iTopUpdate:UI:PostMaxSize' => 'PHP ini 值 post_max_size: %1$s',
 	'iTopUpdate:UI:UploadMaxFileSize' => 'PHP ini 值 upload_max_filesize: %1$s',
+
 	'iTopUpdate:UI:CanCoreUpdate:Loading' => '正在检查文件',
 	'iTopUpdate:UI:CanCoreUpdate:Error' => '文件检查失败 (%1$s)',
 	'iTopUpdate:UI:CanCoreUpdate:ErrorFileNotExist' => '文件检查失败 (%1$s 文件不存在)',
@@ -70,11 +77,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'iTopUpdate:UI:CanCoreUpdate:Yes' => '应用可以升级',
 	'iTopUpdate:UI:CanCoreUpdate:No' => '应用无法升级: %1$s',
 	'iTopUpdate:UI:CanCoreUpdate:Warning' => '警告: 应用升级可能失败: %1$s',
-	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>检测到一些文件被修改</b>, 无法进行局部升级.</br>请按照<a target="_blank" href="%2$s">指南</a>一步步操作以手动升级系统. 您必须使用<a href="%1$s">安装</a>已升级应用.',
+	'iTopUpdate:UI:CannotUpdateUseSetup' => '<b>检测到一些文件被篡改</b>, 无法进行局部升级.</br>请按照<a target="_blank" href="%2$s">流程</a>一步步操作来手动升级系统. 您必须使用<a href="%1$s">安装向导</a>来升级应用.',
 	'iTopUpdate:UI:CheckInProgress' => '完整性检查中, 请稍候',
+
 	'iTopUpdate:UI:SetupLaunch' => '启动'.ITOP_APPLICATION_SHORT.'安装',
 	'iTopUpdate:UI:SetupLaunchConfirm' => '将启动'.ITOP_APPLICATION_SHORT.'安装, 确定吗?',
-	'iTopUpdate:UI:FastSetupLaunch' => 'Fast Setup~~',
+	'iTopUpdate:UI:FastSetupLaunch' => '快速安装',

 	// Setup Messages
 	'iTopUpdate:UI:SetupMessage:Ready' => '准备开始',
@@ -101,6 +109,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'iTopUpdate:Error:InvalidToken' => '无效的 token',
 	'iTopUpdate:Error:UpdateFailed' => '升级失败',
 	'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => '上传上限太小. 请调整 PHP 配置.',
+
 	'iTopUpdate:UI:RestoreArchive' => '您可以从归档文件 \'%1$s\' 还原应用程序',
 	'iTopUpdate:UI:RestoreBackup' => '您可以从 \'%1$s\' 还原数据库',
 	'iTopUpdate:UI:UpdateDone' => '升级成功',
--- a/datamodels/2.x/itop-core-update/module.itop-core-update.php
+++ b/datamodels/2.x/itop-core-update/module.itop-core-update.php
@@ -25,7 +25,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-core-update/3.2.1',
+	'itop-core-update/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-datacenter-mgmt/dictionaries/zh_cn.dict.itop-datacenter-mgmt.php
+++ b/datamodels/2.x/itop-datacenter-mgmt/dictionaries/zh_cn.dict.itop-datacenter-mgmt.php
@@ -4,7 +4,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @license	https://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
--- a/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
+++ b/datamodels/2.x/itop-datacenter-mgmt/module.itop-datacenter-mgmt.php
@@ -19,7 +19,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-datacenter-mgmt/3.2.1',
+	'itop-datacenter-mgmt/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-endusers-devices/dictionaries/zh_cn.dict.itop-endusers-devices.php
+++ b/datamodels/2.x/itop-endusers-devices/dictionaries/zh_cn.dict.itop-endusers-devices.php
@@ -4,7 +4,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @license	https://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
--- a/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
+++ b/datamodels/2.x/itop-endusers-devices/module.itop-endusers-devices.php
@@ -26,7 +26,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-endusers-devices/3.2.1',
+	'itop-endusers-devices/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
@@ -21,6 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -30,10 +31,12 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //////////////////////////////////////////////////////////////////////
 // Classes in 'bizmodel'
 //////////////////////////////////////////////////////////////////////
 //
+
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -43,15 +46,17 @@
 // Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
 // Class:<class_name>/Stimulus:<stimulus_code>
 // Class:<class_name>/Stimulus:<stimulus_code>+
+
 //
 // Class: FAQ
 //
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:FAQ' => 'FAQ',
 	'Class:FAQ+' => '常见问题',
 	'Class:FAQ/Attribute:title' => '标题',
 	'Class:FAQ/Attribute:title+' => '',
-	'Class:FAQ/Attribute:summary' => '概要',
+	'Class:FAQ/Attribute:summary' => '摘要',
 	'Class:FAQ/Attribute:summary+' => '',
 	'Class:FAQ/Attribute:description' => '描述',
 	'Class:FAQ/Attribute:description+' => '',
@@ -63,7 +68,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:FAQ/Attribute:error_code+' => '',
 	'Class:FAQ/Attribute:key_words' => '关键字',
 	'Class:FAQ/Attribute:key_words+' => '',
-	'Class:FAQ/Attribute:domains' => '范围',
+	'Class:FAQ/Attribute:domains' => '领域',
 ]);

 //
--- a/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
+++ b/datamodels/2.x/itop-faq-light/module.itop-faq-light.php
@@ -2,7 +2,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-faq-light/3.2.1',
+	'itop-faq-light/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
@@ -4,7 +4,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    https://opensource.org/licenses/AGPL-3.0
+ * @license	https://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -21,6 +21,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	// Errors
 	'FilesInformation:Error:MissingFile' => '文件丢失: %1$s',
--- a/datamodels/2.x/itop-files-information/module.itop-files-information.php
+++ b/datamodels/2.x/itop-files-information/module.itop-files-information.php
@@ -25,7 +25,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-files-information/3.2.1',
+	'itop-files-information/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
+++ b/datamodels/2.x/itop-full-itil/module.itop-full-itil.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-full-itil/3.2.1',
+	'itop-full-itil/3.2.3',
 	[
 		// Identification
 		//
--- a/datamodels/2.x/itop-hub-connector/ajax.php
+++ b/datamodels/2.x/itop-hub-connector/ajax.php
@@ -242,8 +242,8 @@ try {
 				throw new SecurityException(Dict::S('iTopHub:FailAuthent'));
 			}
 			// First step: prepare the datamodel, if it fails, roll-back
-			$aSelectedExtensionCodes = utils::ReadParam('extension_codes', []);
-			$aSelectedExtensionDirs = utils::ReadParam('extension_dirs', []);
+			$aSelectedExtensionCodes = utils::ReadParam('extension_codes', [], false, utils::ENUM_SANITIZATION_FILTER_MODULE_CODE);
+			$aSelectedExtensionDirs = utils::ReadParam('extension_dirs', [], false, utils::ENUM_SANITIZATION_FILTER_MODULE_CODE);

 			$oRuntimeEnv = new HubRunTimeEnvironment('production', false); // use a temp environment: production-build
 			$oRuntimeEnv->MoveSelectedExtensions(APPROOT.'/data/downloaded-extensions/', $aSelectedExtensionDirs);
@@ -279,11 +279,24 @@ try {
 			$oRuntimeEnv = new RunTimeEnvironment('production', true);

 			try {
-				SetupLog::Info('Move to production starts...');
 				$sAuthent = utils::ReadParam('authent', '', false, 'raw_data');
 				if (!file_exists(APPROOT.'data/hub/compile_authent') || $sAuthent !== file_get_contents(APPROOT.'data/hub/compile_authent')) {
 					throw new SecurityException(Dict::S('iTopHub:FailAuthent'));
 				}
+			} catch (Exception $e) {
+				if (file_exists(APPROOT.'data/hub/compile_authent')) {
+					unlink(APPROOT.'data/hub/compile_authent');
+				}
+				// Note: at this point, the dictionnary is not necessarily loaded
+				SetupLog::Error(get_class($e).': '.Dict::S('iTopHub:ConfigurationSafelyReverted')."\n".$e->getMessage());
+				SetupLog::Error('Debug trace: '.$e->getTraceAsString());
+				ReportError($e->getMessage(), $e->getCode());
+				break;
+			}
+
+			try {
+				SetupLog::Info('Move to production starts...');
+
 				unlink(APPROOT.'data/hub/compile_authent');
 				// Load the "production" config file to clone & update it
 				$oConfig = new Config(APPCONF.'production/'.ITOP_CONFIG_FILE);
--- a/datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/zh_cn.dict.itop-hub-connector.php
@@ -21,24 +21,26 @@
 * 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('ZH CN', 'Chinese', '简体中文', [
 	// Dictionary entries go here
 	'Menu:iTopHub' => 'iTop Hub',
-	'Menu:iTopHub:Register' => '进入iTop Hub',
-	'Menu:iTopHub:Register+' => '进入iTop Hub 更新您的组件',
-	'Menu:iTopHub:Register:Description' => '<p>进入iTop Hub社区平台!</br>寻找您想要的内容和信息, 管理本机扩展或安装新的扩展.</br><br/>通过这个页面连接到iTop Hub, 本机的信息也会被推送到iTop Hub上.</p>',
+	'Menu:iTopHub:Register' => '进入 iTop Hub',
+	'Menu:iTopHub:Register+' => '进入 iTop Hub 更新您的组件',
+	'Menu:iTopHub:Register:Description' => '<p>进入 iTop Hub 社区平台!</br>寻找您想要的内容和信息, 管理本机扩展或安装新的扩展.</br><br/>通过这个页面连接到 iTop Hub, 本机的信息也会被推送到 iTop Hub上.</p>',
 	'Menu:iTopHub:MyExtensions' => '已安装的扩展',
 	'Menu:iTopHub:MyExtensions+' => '查看本机已安装的扩展',
-	'Menu:iTopHub:BrowseExtensions' => '从iTop Hub获取扩展',
-	'Menu:iTopHub:BrowseExtensions+' => '去iTop Hub浏览更多的扩展',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>进入iTop Hub商店, 一站式查找各种iTop扩展的地方 !</br>寻找符合您要求的扩展.</br><br/>通过这个页面连接到iTop Hub, 本机的信息也会被推送到iTop Hub上.</p>',
+	'Menu:iTopHub:BrowseExtensions' => '从 iTop Hub 获取扩展',
+	'Menu:iTopHub:BrowseExtensions+' => '去 iTop Hub 浏览更多的扩展',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>进入iTop Hub商店, 一站式查找各种iTop扩展的地方 !</br>寻找符合您要求的扩展.</br><br/>通过这个页面连接到iTop Hub, 本机的信息也会被推送到 iTop Hub上.</p>',
 	'iTopHub:GoBtn' => '进入 iTop Hub',
 	'iTopHub:CloseBtn' => '关闭',
 	'iTopHub:GoBtn:Tooltip' => '跳到 www.itophub.io',
-	'iTopHub:OpenInNewWindow' => '从新窗口打开iTop Hub',
-	'iTopHub:AutoSubmit' => '不再询问. 下次自动进入iTop Hub.',
+	'iTopHub:OpenInNewWindow' => '从新窗口打开 iTop Hub',
+	'iTopHub:AutoSubmit' => '不再询问. 下次自动进入 iTop Hub.',
 	'UI:About:RemoteExtensionSource' => 'iTop Hub',
-	'iTopHub:Explanation' => '点击这个按钮您将被引导至iTop Hub.',
+	'iTopHub:Explanation' => '点击这个按钮您将被引导至 iTop Hub.',
+
 	'iTopHub:BackupFreeDiskSpaceIn' => '%1$s 可用磁盘空间位于 %2$s.',
 	'iTopHub:FailedToCheckFreeDiskSpace' => '检查可用磁盘空间失败.',
 	'iTopHub:BackupOk' => '备份成功.',
@@ -48,32 +50,36 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'iTopHub:CompiledOK' => '编译成功.',
 	'iTopHub:ConfigurationSafelyReverted' => '安装时发生错误!<br/>系统配置将不会改变.',
 	'iTopHub:FailAuthent' => '认证失败.',
+
 	'iTopHub:InstalledExtensions' => '本机已安装的扩展',
 	'iTopHub:ExtensionCategory:Manual' => '手动安装的扩展',
 	'iTopHub:ExtensionCategory:Manual+' => '下列已安装的扩展是手动将文件放置到 %1$s 目录的:',
 	'iTopHub:ExtensionCategory:Remote' => '从 iTop Hub 安装的扩展',
 	'iTopHub:ExtensionCategory:Remote+' => '下列已安装的扩展是来自 iTop Hub:',
 	'iTopHub:NoExtensionInThisCategory' => '尚未安装扩展',
-	'iTopHub:NoExtensionInThisCategory+' => '浏览 iTop Hub, 去寻找符合您喜欢的扩展吧.',
+	'iTopHub:NoExtensionInThisCategory+' => '浏览 iTop Hub, 去寻找符合您要求的扩展吧.',
 	'iTopHub:ExtensionNotInstalled' => '未安装',
 	'iTopHub:GetMoreExtensions' => '从 iTop Hub 获取扩展...',
+
 	'iTopHub:LandingWelcome' => '恭喜! 下列来自 iTop Hub 的扩展已被下载并安装到本机.',
-	'iTopHub:GoBackToITopBtn' => '返回'.ITOP_APPLICATION_SHORT,
+	'iTopHub:GoBackToITopBtn' => '返回 '.ITOP_APPLICATION_SHORT,
 	'iTopHub:Uncompressing' => '扩展解压中...',
 	'iTopHub:InstallationWelcome' => '安装来自 iTop Hub 的扩展',
 	'iTopHub:DBBackupLabel' => '本机备份',
-	'iTopHub:DBBackupSentence' => '在升级之前,备份数据库和'.ITOP_APPLICATION_SHORT.'配置文件',
+	'iTopHub:DBBackupSentence' => '在升级之前,备份数据库和 '.ITOP_APPLICATION_SHORT.' 配置文件',
 	'iTopHub:DeployBtn' => '安装!',
 	'iTopHub:DatabaseBackupProgress' => '实例备份...',
+
 	'iTopHub:InstallationEffect:Install' => '版本: %1$s 将被安装.',
 	'iTopHub:InstallationEffect:NoChange' => '版本: %1$s 已安装. 保持不变.',
 	'iTopHub:InstallationEffect:Upgrade' => '将从版本 %1$s <b>升级</b>到版本 %2$s.',
 	'iTopHub:InstallationEffect:Downgrade' => '将从版本 %1$s <b>降级</b>到版本 %2$s.',
-	'iTopHub:InstallationProgress:DatabaseBackup' => ITOP_APPLICATION_SHORT.'实例备份...',
+	'iTopHub:InstallationProgress:DatabaseBackup' => ITOP_APPLICATION_SHORT.' 实例备份...',
 	'iTopHub:InstallationProgress:ExtensionsInstallation' => '安装扩展',
 	'iTopHub:InstallationEffect:MissingDependencies' => '扩展无法安装, 因为未知的依赖.',
 	'iTopHub:InstallationEffect:MissingDependencies_Details' => '此扩展依赖模块: %1$s',
 	'iTopHub:InstallationProgress:InstallationSuccessful' => '安装成功!',
+
 	'iTopHub:InstallationStatus:Installed_Version' => '%1$s 版本: %2$s.',
 	'iTopHub:InstallationStatus:Installed' => '已安装',
 	'iTopHub:InstallationStatus:Version_NotInstalled' => '版本 %1$s <b>未被</b> 安装.',
--- a/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/module.itop-hub-connector.php
@@ -6,7 +6,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-hub-connector/3.2.1',
+	'itop-hub-connector/3.2.3',
 	[
 		// Identification
 		//
@@ -37,6 +37,10 @@ SetupWebPage::AddModule(
 			// add your sample data XML files here,
 		],

+		'delegated_authentication_endpoints' => [
+			'ajax.php',
+		],
+
 		// Documentation
 		//
 		'doc.manual_setup' => '', // hyperlink to manual setup documentation, if any
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stephen Abello	5523fabdb3	N°9128 - Add padding to fullscreen CKEditor	2026-08-12 16:14:36 +02:00
Molkobain	f657308137	✅ Fix PHP code styles for Chinese dictionaries	2026-08-06 16:33:31 +02:00
Molkobain	64394099f7	📝 Add 3.2.3-1 and 3.2.3-2 to version history	2026-08-06 13:37:44 +02:00
Purple Grape	c7570d62c1	N°9889 - Update zh_cn translation for 3.2 branch (#938 ) * rebase on the latest 3.2 branch rebase Co-Authored-By: Thomas Casteleyn <thomas.casteleyn@me.com> * Update zh_cn.dict.authent-cas.php * Update zh_cn.dict.authent-external.php * Update zh_cn.dict.authent-ldap.php * Update zh_cn.dict.authent-local.php * Update zh_cn.dict.combodo-backoffice-darkmoon-theme.php * Update zh_cn.dict.itop-backup.php * Update zh_cn.dict.itop-change-mgmt.php * Update zh_cn.dict.itop-faq-light.php * Update zh_cn.dict.itop-config.php * Update zh_cn.dict.itop-config-mgmt.php * Update zh_cn.dict.itop-hub-connector.php * Update zh_cn.dict.itop-knownerror-mgmt.php * Update zh_cn.dictionary.itop.core.php * Update zh_cn.dict.authent-cas.php * Update zh_cn.dict.authent-external.php * Update zh_cn.dict.authent-ldap.php * Update zh_cn.dict.authent-local.php * Update zh_cn.dict.combodo-backoffice-darkmoon-theme.php * Update zh_cn.dict.itop-backup.php * Update zh_cn.dict.itop-config-mgmt.php * Update zh_cn.dict.itop-config.php * Update zh_cn.dict.itop-faq-light.php * update license url * Update datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com> * Update datamodels/2.x/authent-cas/dictionaries/en.dict.authent-cas.php --------- Co-authored-by: Thomas Casteleyn <thomas.casteleyn@me.com> Co-authored-by: Molkobain <lajarige.guillaume@free.fr>	2026-08-04 15:26:11 +02:00
Benjamin DALSASS	fa66a09104	N°9838 - Polishing CKEditor for iTop 3.2.4 - fix php unit test	2026-07-28 09:39:58 +02:00
Benjamin DALSASS	476ec75a2e	N°9838 - Polishing CKEditor for iTop 3.2.4	2026-07-28 08:39:24 +02:00
Stephen Abello	42007ffd95	N°9702 - Fix user rights matrix display when an accessibility theme displayed a visual cue	2026-07-24 14:28:59 +02:00
Molkobain	d88687527e	Merge remote-tracking branch 'origin/support/3.2.3' into support/3.2	2026-07-23 10:49:09 +02:00
odain-cbd	73ede13443	N°9746 - Synchro execution time change fixes (#951 ) * N°9746 - Synchro execution can make damage during time change (object deletions) * N°9746 - handle timechange during synchro execution + cleanup m_bIsImportPhaseDateKnown * N°9746 - PR fix * N°9746 - add corner test case	2026-07-21 08:01:31 +02:00
Anne-Catherine	5715e0484f	N°9759 - Truncating AttributeText doesn't work as expected in case of multibytes characters (#964 ) * N°9759 - Truncate AttributeText don't work as expected in case of multibytes characters * WIP * Move TrimValue() base definition to AttributeDefinition class, assign DBObject::SetTrim old behavior to it * Fix variable types * Fix variable types * Apply code review fixes, add tests * Define GetSize in AttributeDefinition to easy polymorphic calls instead of obscure AttributeDBFieldVoid * Update php with right since version and ticket, remove useless method overload * Apply suggestions from code review Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update core/attributedef.class.inc.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Update core/attributedef.class.inc.php Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Apply suggestion from @Molkobain code review Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Apply suggestion from @Molkobain code review Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Apply suggestion from @Molkobain code review Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Apply suggestion from @Molkobain code review Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Apply suggestion from @Molkobain code review Co-authored-by: Molkobain <lajarige.guillaume@free.fr> * Correctly handle null values in new methods --------- Co-authored-by: Stephen Abello <stephen.abello@combodo.com> Co-authored-by: Molkobain <lajarige.guillaume@free.fr>	2026-07-17 16:40:09 +02:00
Benjamin DALSASS	8f87c759b5	N°9635 - Twig security issues CVE-2026-46633 and CVE-2026-46639 and CVE-2026-46640	2026-07-07 13:47:15 +02:00
odain	4b4fe55060	N°9689 - Fix itop-portal-base dependancy	2026-07-03 11:49:47 +02:00
Molkobain	9ae813db2b	Merge remote-tracking branch 'origin/support/3.2.3' into support/3.2	2026-07-02 21:08:45 +02:00
Molkobain	d6ef4fb7bb	N°9687 - Fix incorrect return type for the DBObjectSearch::ApplyDataFilter() function (#939 ) * N°9687 - Fix incorrect return type for the DBObjectSearch::ApplyDataFilter() function * N°9687 - Add unit test * N°9687 - Improve unit test after code review * N°9687 - Improve unit test after code review	2026-07-02 16:11:32 +02:00
Molkobain	1d9e7f9b55	✅ Update test so it works on both ITIL and standard request management	2026-06-20 17:47:19 +02:00
Molkobain	ff2357473b	✅ Add comment on dictionary tests to explain how uncomplete they are compared to whet they seem to do	2026-06-20 10:27:58 +02:00
Molkobain	9a93bcb06f	✅ PHP Code Styles: Fix composer.lock to be compatible with platform requirements (PHP 8.1)	2026-06-20 10:11:45 +02:00
odain	feb89650e4	curl_close deprecated in PHP 8.5	2026-06-02 17:47:10 +02:00
lenaick.moreira	eef06ee032	Merge branch 'support/3.2.3' into support/3.2	2026-05-20 14:20:43 +02:00
Lenaick	d6ce202fa8	N°9614 - Add a specific route to display the icons for an EventNotificationNewsroom (#911 ) * N°9614 - Add a specific route to display the icons for an EventNotificationNewsroom * N°9614 - Display the icon in EventNotificationNewsroom only for events relating to the logged-in user * N°9614 - Refactor icon download logic in EventNotificationNewsroomService and add unit tests * Add unit test to verify icon download functionality for users without read access	2026-05-20 14:18:13 +02:00
Stephen Abello	1c38d989e4	N°9603 - Fix transitions applied when editing only caselog are not working (#908 ) * N°9603 - Fix transitions applied when editing only caselog are not working * Remove unused variable	2026-05-18 17:28:46 +02:00
Molkobain	e65542f978	Merge remote-tracking branch 'origin/support/3.2.3' into support/3.2	2026-05-07 18:54:39 +02:00
Stephen Abello	829857ec85	N°9461 - Fix activity panel send options hidden by CKEditor	2026-05-07 15:55:02 +02:00
Molkobain	769afb2715	Merge remote-tracking branch 'origin/support/3.2.3' into support/3.2	2026-05-06 14:52:10 +02:00
Molkobain	b529a61bc5	✅ Fix PHP code styles	2026-05-06 13:50:58 +02:00
Molkobain	a7d0262b21	Merge remote-tracking branch 'origin/support/3.2.3' into support/3.2	2026-05-06 11:18:36 +02:00
Molkobain	c56617abf5	N°8579 - Update PHPDoc	2026-05-06 10:55:39 +02:00
Molkobain	7676115725	N°9584 - Fix "Unable to connect with STARTTLS" error when sending emails (#901 ) * N°9584 - Fix "Unable to connect with STARTTLS" error when sending emails * N°9584 - Refactor EMailSymfony transport to add unit tests	2026-05-05 09:51:09 +02:00
Molkobain	43ceaeb5a3	Merge remote-tracking branch 'origin/support/3.2.3' into support/3.2	2026-05-04 16:42:30 +02:00
Håkon Harnes	7cac280b83	N°9574 - Fix CKEditor CSS displayed as part of the email message in Gmail (#898 ) * fix(email): generate plain text before inlining HTML CSS * N°9574 - Add unit tests * Apply suggestions from code review Co-authored-by: Molkobain <lajarige.guillaume@free.fr> --------- Co-authored-by: Molkobain <lajarige.guillaume@free.fr>	2026-05-04 16:33:38 +02:00
Stephen Abello	de4ec9d9ce	N°9128 - Update CKEditor5 to v48 (#896 ) * N°9128 - Update CKEditor5 to v48 * Move some CSS vars to ckeditor, align variable overload in portal and backoffice * Add specifics to 3.2 portal * Update CKEditor5 build files * Update scssphp with patched version that handles pseudo selectors and attribute selectors * Update scssphp patched version to fix missing $this * Fix translations specific language file import * Remove unused maximize parameters * Update CKEditor5 build files * Fix font size/color for 3.2 portal * Avoid CKEditor styles from bleeding into fields	2026-04-29 16:56:20 +02:00
Molkobain	8f2c990065	📝 Fix itop-version-history.md display due to new branch	2026-04-29 16:47:03 +02:00
Benjamin Dalsass	03437c3453	📝 Restore itop-version-history.md on support/3.2 branch	2026-04-29 16:37:38 +02:00
Molkobain	33a51b47bf	N°9549 - Fix emails with mime type different than text/plain or text/html are no longer displayed correctly (#895 ) * N°9549 - Fix emails with mime type different than text/plain or text/html are no longer displayed correctly * N°9549 - Fix mime type comparisons to use the primary mime type instead of the whole string	2026-04-27 11:31:56 +02:00
Molkobain	e768cc1c0c	N°9537 - Update "details" zlist on EventNotificationEmail to display cc and cci attributes	2026-04-23 15:49:30 +02:00
jf-cbd	f6741a6306	Update contributions guidelines (#888 )	2026-04-23 13:48:23 +02:00
Stephen Abello	1ec8aca12d	Remove ~~ from French dict entry	2026-04-20 10:23:03 +02:00
Molkobain	39011faedd	Update ITOP_VERSION constant version for 3.2.3 release	2026-04-20 09:17:18 +02:00
Stephen Abello	46f8f5faeb	Update modules and constants version for 3.2.3 release	2026-04-17 15:24:10 +02:00
Stephen Abello	170d24d0ad	Update licenses for 3.2.3 release	2026-04-17 15:17:55 +02:00
Benjamin DALSASS	89231976f8	Revert N°8638 - Adapt mysqldump calls to follow iTop SSL configuration	2026-04-16 15:00:01 +02:00
Stephen Abello	f0a95cbb3d	N°9447 - Harmonize title and panel logo rules	2026-04-15 16:49:52 +02:00
Stephen Abello	30f720b9ad	N°9447 - Setup logo is repeating vertically (#884 )	2026-04-15 15:13:28 +02:00
Benjamin DALSASS	87dd003a6d	N°8638 - Adapt mysqldump calls to follow iTop SSL configuration - fix unitary test	2026-04-14 08:54:54 +02:00
Benjamin Dalsass	7201bef8db	N°8638 - Adapt mysqldump calls to follow iTop SSL configuration (#883 )	2026-04-14 08:08:17 +02:00
Benjamin Dalsass	af01ff9e62	N°9121 - CSV Import : The advanced mode option no longer works as bef… (#863 )	2026-04-14 08:02:00 +02:00
Molkobain	ab1290dfd0	N°8766 - Fix user's login displayed in backoffice log entry instead of user's contact friendlyname when user is disabled	2026-04-13 21:14:03 +02:00
Stephen Abello	68d14c4de6	N°9468 - Fix double scroll down bars in input set (#876 )	2026-04-13 16:28:56 +02:00
Benjamin Dalsass	a96e1c286d	N°9379 PHP unserialize encapsulation (#878 )	2026-04-13 16:04:00 +02:00
Stephen Abello	b799be3cb7	N°9177 - Blockquote in HTML field are unreadable in darkmoon (again)	2026-04-13 10:24:55 +02:00
jf-cbd	d000d93b19	N°8766 - Fix wrong author on portal log (#880 )	2026-04-13 10:10:40 +02:00
Stephen Abello	9f25635a64	N°9177 - Blockquote in HTML field are unreadable in darkmoon	2026-04-09 15:19:15 +02:00
Stephen Abello	6bd34dc73e	N°4460 - Fix date and date time picker in Darkmoon	2026-04-08 14:59:36 +02:00
Stephen Abello	9dc3c56689	N°9448 - Fix external auth variable value (#871 )	2026-04-08 14:19:24 +02:00
Stephen Abello	effd35c3e6	N°8758 - Fix mandatory caselog in transition requiring double confirmation (#868 )	2026-04-08 14:19:09 +02:00
lenaick.moreira	f1735767c3	💚 Fix CI	2026-04-08 10:19:31 +02:00
lenaick.moreira	00735f0c54	N°9483 - The search suggestion message is not displaying correctly	2026-04-08 09:48:15 +02:00
lenaick.moreira	882390e8d6	N°9043 - Fix automatic search on direct linkset block	2026-04-08 09:48:15 +02:00
Lenaick	5d0da47f21	N°8178 - Respect "high_cardinality_classes" parameter on search operation (#870 )	2026-04-08 09:47:46 +02:00
lenaick.moreira	4eadff7f3b	♻️ Refactor BODY_DATA_GUI_TYPE constants to public visibility (N°9101)	2026-04-08 09:38:40 +02:00
Molkobain	f66ce1c956	✅ Fix cURL calls to iTop within Docker dev. environment with PHP version autodetection (#869 )	2026-04-07 19:06:30 +02:00
jf-cbd	802f9f3e08	N°8576 - [RequestTemplate] Slowness during the selection of drop-down list field (#872 )	2026-04-07 17:06:21 +02:00
lenaick.moreira	5c5d98bb78	Enable the retrieval of all data for event notifications in the activity panel	2026-04-01 16:12:36 +02:00
Stephen Abello	a08a9b43f3	N°8737 - Fix search criteria dropdown vertical overflow (#867 ) * N°8737 - Fix search criteria dropdown vertical overflow * Update css/backoffice/components/_search-form.scss	2026-04-01 14:57:10 +02:00
jf-cbd	abd85ff4db	Merge remote-tracking branch 'origin/support/3.2' into support/3.2	2026-04-01 10:37:59 +02:00
jf-cbd	81f328b26e	N°8543 - rename security parameter with new convention	2026-04-01 10:37:46 +02:00
lenaick.moreira	9a2c8f10bf	Fix CliResetSessionTest by allowing empty POST fields to be defined in the curl options	2026-04-01 10:35:59 +02:00
Lenaick	3cdadf3c6e	✅ Add tests for lock acquisition functionality (#865 )	2026-03-31 17:01:22 +02:00
jf-cbd	a6295f1b14	Duplicate try-catch to avoid finally statement in case of uncorrrecth auth	2026-03-31 16:39:05 +02:00
Stephen Abello	e467ca83cf	N°8532 - Apply filters on all DBSearch classes (#848 ) Co-authored-by: Molkobain <lajarige.guillaume@free.fr> Co-authored-by: Thomas Casteleyn <thomas.casteleyn@super-visions.com>	2026-03-31 15:41:28 +02:00
Stephen Abello	7791585387	N°9231 - Make OrmDocument apply same safety to attachments and regular documents (#860 )	2026-03-30 15:25:52 +02:00
Molkobain	3406ca79de	N°9361 - Update PHPDoc	2026-03-30 13:49:30 +02:00
Stephen Abello	91ad01055e	N°5228 - Allow themes variable imports to be overloaded by variable entries (#858 )	2026-03-27 15:46:15 +01:00
Lenaick	804cdffe42	N°8234 - Fix permission checks to conditionally allow display of unauthorized objects (#859 )	2026-03-27 15:09:31 +01:00
v-dumas	5f4affc896	N°9057 - Fix tests broken due to ModuleInstallation given grant_by_profile (2)	2026-03-26 17:56:52 +01:00
v-dumas	042fee2360	N°9057 - Fix tests broken due to ModuleInstallation given grant_by_profile	2026-03-26 17:37:18 +01:00
Vincent Dumas	7f8ec25977	N°9057 - Enable SuperUser to execute collectors (#799 )	2026-03-26 12:13:45 +01:00
Lenaick	41f8437c23	N°8234 - Allow display of unauthorized objects in notifications and event queries (#853 ) * N°8234 - Allow display of unauthorized objects in notifications and event queries * Refactor EventNotificationNewsroom class usage in iTopNewsroomController	2026-03-26 11:44:06 +01:00
Anne-Catherine	df8b25d4b4	N°9223 - Portal - AttributeExternalKey or AttributeEnum are not displayed after adding a link. (#802 )	2026-03-26 10:34:41 +01:00
Lenaick	511dabe2b0	N°8834 - Updated the PHP version to 8.4 for the CI in the commit	2026-03-25 17:43:39 +01:00
Lenaick	0c517f254c	N°9101 - Improve HTML markup for end-to-end tests automation (#856 )	2026-03-25 17:20:28 +01:00
Stephen Abello	c56c7a1f9d	Fix CI by fixing code style	2026-03-25 10:25:37 +01:00
Stephen Abello	fb2f0f1447	N°9328 - Add scssphp compatibility with PHP 8.4 (#851 )	2026-03-25 09:58:05 +01:00
Lenaick	b3223eb9b6	N°8606 - Check user permissions in search operation of ajax.render.php (#836 )	2026-03-24 08:52:22 +01:00
Benjamin DALSASS	458a996c29	N°8612 - force authentication for inline image endpoints - ajax.render dict route needs to be reached without login authentication	2026-03-23 15:50:47 +01:00
Anne-Catherine	c61b21559c	N°8692 - Notification - placeholder attributesubitem (#778 )	2026-03-23 15:33:50 +01:00
jf-cbd	ed33238750	Merge remote-tracking branch 'origin/support/3.2' into support/3.2	2026-03-20 16:31:44 +01:00
jf-cbd	272678b8cd	N°9361 - Indicate to itop admin concerned by 8543 that changes could be required in extension	2026-03-20 16:30:53 +01:00
Benjamin Dalsass	170014e8f0	N°9232 - Information Disclosure (#850 )	2026-03-20 14:35:05 +01:00
Molkobain	006f666089	N°8554 - Fix impossible installation of portal new look via iTop Hub (#846 )	2026-03-18 19:59:42 +01:00
Stephen Abello	2a16143e53	N°9229 - Modernize search foreign keys code with built in JS tools (#847 ) * N°9229 - Modernize search foreign keys code with built in JS tools * N°9229 - Allow modals to have button id specified * N°9229 - Remove the modal instead of only destroying it * N°9229 - Remove dead code * Update js/searchformforeignkeys.js * Add robustness to modals button id	2026-03-18 15:23:52 +01:00
jf-cbd	eabbe2f00b	N°8543 - best practices	2026-03-18 10:09:25 +01:00
Molkobain	58790bc352	N°8597 - Fix special characters being escaped for BrowseBrick items in "Tree" mode (#845 ) * N°8597 - Fix special characters being escaped for BrowseBrick items in "Tree" mode * N°8597 - Fix forgotten use case for "Tree" mode for intermediate levels	2026-03-17 15:02:20 +01:00
Lenaick	28db230697	N°9233 - Check user access before acquiring lock on object (#844 )	2026-03-16 17:07:26 +01:00
jf-cbd	4fe61cbdc7	N°8543 - Add checks on exec.php (#835 )	2026-03-16 17:06:37 +01:00
Benjamin Dalsass	e2994b645b	N°8612 inline images to base64 (#826 )	2026-03-16 08:36:37 +01:00
lenaick.moreira	9fca81cc32	N°9366 - Update PHPUnit to be compatible with PHP 8.4	2026-03-10 10:59:54 +01:00
lenaick.moreira	9792358aea	Remove debug OQL filter in HTML comments of the universal search page	2026-03-09 17:06:00 +01:00
lenaick.moreira	7bfa14a874	N°9235 - Sanitize oql_clause query parameter in universal search page	2026-03-09 17:06:00 +01:00
Lenaick	9236449b21	N°9238 - Sanitize data_source_id query parameter in synchro_import script (#831 )	2026-03-09 09:02:17 +01:00
Benjamin Dalsass	ab8e7bd15e	N°9236 - tag admin fix (#832 )	2026-03-09 08:30:39 +01:00
lenaick.moreira	307c308eb0	Fix unit test testPhpMinVersionConsistency	2026-03-05 16:15:18 +01:00
Lenaick	61e5536b50	N°9234 - Sanitize query expression parameter in suggested OQL on run query page (#829 )	2026-03-05 16:02:30 +01:00
Lenaick	104dd1970f	N°9230 - Sanitize dashboard_id parameter in "revert_dashboard" operation of AJAX render function (#828 )	2026-03-05 15:55:28 +01:00
Stephen Abello	929b8b9eca	Fix CI by fixing code style	2026-03-05 15:28:27 +01:00
Stephen Abello	3b8e079cf1	N°6977 - Sanitize Excel formulas in exports (#818 ) * N°6977 - Sanitize Excel formulas in export in the backoffice --------- Co-authored-by: Molkobain <lajarige.guillaume@free.fr>	2026-03-05 15:07:27 +01:00