N°9861 - Changes from review

.doc/itop-version-history.md

@@ -110,9 +110,6 @@ gitGraph
     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"
     checkout develop
     commit id: "2026-07-23" tag: "3.3.0-beta1"
 ```

application/applicationextension/backoffice/iBackofficeSassExtension.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implement this interface to add sass files (SCSS) to the backoffice pages.
+ * Implement this interface to add sass file (SCSS) to the backoffice pages.
  * example: return "css/setup.scss"
  *
  * @api
@@ -11,9 +11,9 @@
 interface iBackofficeSassExtension
 {
 	/**
-	 * @return array An array of relative paths (from loaded import paths) to the files to compile and include
-	 * @see \iTopWebPage::$a_linked_stylesheets
+	 * @return string
+	 * @see \iTopWebPage::$a_styles
 	 * @api
 	 */
-	public function GetSassRelPaths(): array;
+	public function GetSass(): string;
 }

datamodels/2.x/authent-cas/dictionaries/zh_cn.dict.authent-cas.php

@@ -6,9 +6,8 @@
  * @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服务器认证',
 ]);

datamodels/2.x/authent-external/dictionaries/zh_cn.dict.authent-external.php

@@ -5,8 +5,10 @@
  *
  * @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
@@ -21,7 +23,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,11 +32,9 @@
 // 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.'外部验证身份',

datamodels/2.x/authent-ldap/dictionaries/zh_cn.dict.authent-ldap.php

@@ -6,6 +6,7 @@
  * @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
@@ -21,7 +22,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,15 +31,13 @@
 // 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详情',
 ]);
 
 //
@@ -47,6 +45,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:UserLDAP/Attribute:ldap_server' => 'LDAP 服务器',
-	'Class:UserLDAP/Attribute:ldap_server+' => '',
+	'Class:UserLDAP/Attribute:ldap_server' => 'Ldap server~~',
+	'Class:UserLDAP/Attribute:ldap_server+' => '~~',
 ]);

datamodels/2.x/authent-local/dictionaries/zh_cn.dict.authent-local.php

@@ -6,6 +6,7 @@
  * @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
@@ -21,7 +22,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 // Dictionnay conventions
 // Class:<class_name>
 // Class:<class_name>+
@@ -31,19 +31,16 @@
 // 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' => '永不过期',
@@ -52,9 +49,8 @@ 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' => '不允许用户为自己设置 "一次性密码" 的失效期限',

datamodels/2.x/combodo-backoffice-darkmoon-theme/dictionaries/zh_cn.dict.combodo-backoffice-darkmoon-theme.php

@@ -21,7 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'theme:darkmoon' => 'Dark moon',
 ]);

datamodels/2.x/combodo-data-feature-removal/dictionaries/zh_cn.dict.combodo-data-feature-removal.php

@@ -1,62 +0,0 @@
-<?php
-
-/**
- * @copyright   Copyright (C) 2010-2025 Combodo SARL
- * @license     http://opensource.org/licenses/AGPL-3.0
- */
-
-/**
- * Localized data
- */
-
-Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Menu:DataFeatureRemovalMenu' => '扩展管理',
-	'combodo-data-feature-removal/Operation:Main/Title' => '扩展管理',
-
-	'DataFeatureRemoval:Main:Title' => '扩展管理',
-	'DataFeatureRemoval:Main:SubTitle' => '切换安装在您的 iTop 上的扩展',
-	'DataFeatureRemoval:Failure:Title' => '扩展预删除错误',
-	'DataFeatureRemoval:Helper:Title' => '分析是否有任何数据或依赖关系阻止您添加/删除扩展。',
-
-	'DataFeatureRemoval:Features:Title' => '扩展',
-	'DataFeatureRemoval:Result:Title' => '请求的修改',
-	'DataFeatureRemoval:Execution:Title' => '删除执行',
-	'DataFeatureRemoval:Analysis:Title' => '分析结果',
-	'DataFeatureRemoval:Analysis:Subtitle' => '审查所有需要关注的元素',
-	'DataFeatureRemoval:Analysis:SubTitle' => '%1$s 个元素需要在继续之前清理',
-
-	'DataFeatureRemoval:DeletionPlan:Title' => '数据删除计划',
-	'DataFeatureRemoval:DeletionPlan:SubTitle' => '%1$s 行需要在继续之前清理',
-	'DataFeatureRemoval:DoDeletion:Title' => '执行删除',
-	'DataFeatureRemoval:DoDeletion:SubTitle' => '从数据库中删除所有条目',
-	'DataFeatureRemoval:DeletionPlan:Error:Issues' => '某些对象必须在清理前手动删除',
-
-	'DataFeatureRemoval:Table:Analysis:ClassName' => '要删除的元素',
-	'DataFeatureRemoval:Table:Analysis:FeatureName' => '扩展名称',
-	'DataFeatureRemoval:Table:Analysis:Module' => '模块名称',
-	'DataFeatureRemoval:Table:Analysis:Occurrence' => '出现次数',
-
-	'DataFeatureRemoval:CleanupComplete:Title' => '全部清除.',
-	'DataFeatureRemoval:CompilComplete' => '编译成功. 无需清理. 您可以继续进行设置.',
-
-	'UI:Button:Analyze' => '分析',
-	'UI:Button:ModifyChoices' => '改变我的选择',
-	'UI:Button:AnalyzeAndSetup' => '分析并进入设置',
-	'UI:Button:PlanDeletion' => '继续删除',
-	'UI:Button:DoDeletion' => '继续删除',
-	'UI:Button:BackToMain' => '改变我的选择',
-	'UI:Button:Setup' => '运行安装向导',
-
-	'UI:Action:ForceUninstall' => '强制卸载',
-	'UI:Action:MoreInfo' => '更多信息',
-
-	'DataFeatureRemoval:Table:Empty' => '没有数据需要删除',
-
-	'DataFeatureRemoval:Column:Class' => '类',
-	'DataFeatureRemoval:Column:DeleteCount' => '待删除的条目',
-	'DataFeatureRemoval:Column:UpdateCount' => '待更新的条目',
-	'DataFeatureRemoval:Column:IssueCount' => '发现阻止自动清理的问题',
-
-	'DataFeatureRemoval:Column:DeletedCount' => '已删除的条目',
-	'DataFeatureRemoval:Column:UpdatedCount' => '已更新的条目',
-]);

datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php

@@ -33,10 +33,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'DBTools:Disclaimer' => '免责申明: 在应用修复之前, 应先备份数据库',
 	'DBTools:Error' => '错误',
 	'DBTools:Count' => '个数',
-	'DBTools:SQLquery' => 'SQL 查询',
-	'DBTools:FixitSQLquery' => '用于修复问题的 SQL 查询(说明)',
-	'DBTools:SQLresult' => 'SQL 结果',
-	'DBTools:NoError' => '数据库 OK',
+	'DBTools:SQLquery' => 'SQL查询',
+	'DBTools:FixitSQLquery' => '修复问题的SQL查询 (指示)',
+	'DBTools:SQLresult' => 'SQL结果',
+	'DBTools:NoError' => '数据库正确',
 	'DBTools:HideIds' => '错误列表',
 	'DBTools:ShowIds' => '详细视图',
 	'DBTools:ShowReport' => '报告',
@@ -73,7 +73,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 // Lost attachments
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'DBTools:LostAttachments' => '附件缺失',
-	'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件. 请注意, 这不是数据恢复工具, 无法恢复已删除的数据.',
+	'DBTools:LostAttachments:Disclaimer' => '可以在此搜索数据库中丢失或错放的附件. 这不是数据恢复工具, 其无法恢复已删除的数据.',
 
 	'DBTools:LostAttachments:Button:Analyze' => '分析',
 	'DBTools:LostAttachments:Button:Restore' => '还原',

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

@@ -27,24 +27,24 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:Change:Overview' => '概况',
 	'Menu:Change:Overview+' => '',
 	'Menu:NewChange' => '新建变更',
-	'Menu:NewChange+' => '新建变更工单',
+	'Menu:NewChange+' => '新建变更',
 	'Menu:SearchChanges' => '搜索变更',
-	'Menu:SearchChanges+' => '搜索变更工单',
-	'Menu:Change:Shortcuts' => '变更',
-	'Menu:Change:Shortcuts+' => '快速访问预定义的变更数据',
+	'Menu:SearchChanges+' => '搜索变更',
+	'Menu:Change:Shortcuts' => '快捷方式',
+	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
 	'Menu:WaitingAcceptance' => '等待审核的变更',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => '等待批准的变更',
-	'Menu:WaitingApproval+' => '处于计划状态的变更',
-	'Menu:Changes' => '所有待处理的变更',
-	'Menu:Changes+' => '所有待处理的变更',
+	'Menu:WaitingApproval+' => 'Changes in planned status~~',
+	'Menu:Changes' => '所有打开的变更',
+	'Menu:Changes+' => '所有打开的变更',
 	'Menu:MyChanges' => '分配给我的变更',
 	'Menu:MyChanges+' => '分配给我的变更 (作为办理人)',
 	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近一周的变更 (按类型)',
 	'UI-ChangeManagementOverview-Last-7-days' => '最近一周的变更 (按数量)',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => '最近一周的变更 (按范围)',
 	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => '最近一周的变更 (按状态)',
-	'Tickets:Related:OpenChanges' => '待处理的变更',
+	'Tickets:Related:OpenChanges' => '打开的变更',
 	'Tickets:Related:RecentChanges' => '最近的变更 (72小时)',
 ]);
 
@@ -132,7 +132,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change/Attribute:related_incident_list' => '相关事件',
 	'Class:Change/Attribute:related_incident_list+' => '此变更相关的所有事件',
 	'Class:Change/Attribute:child_changes_list' => '子变更',
-	'Class:Change/Attribute:child_changes_list+' => '此变更相关的子变更',
+	'Class:Change/Attribute:child_changes_list+' => '此变更相关的字变更',
 	'Class:Change/Attribute:parent_id_friendlyname' => '父级变更昵称',
 	'Class:Change/Attribute:parent_id_friendlyname+' => '',
 	'Class:Change/Attribute:parent_id_finalclass_recall' => '变更类型',

datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php

@@ -26,15 +26,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:Change:Overview' => '概况',
 	'Menu:Change:Overview+' => '',
 	'Menu:NewChange' => '新建变更',
-	'Menu:NewChange+' => '新建变更工单',
+	'Menu:NewChange+' => '新建变更',
 	'Menu:SearchChanges' => '搜索变更',
-	'Menu:SearchChanges+' => '搜索变更工单',
-	'Menu:Change:Shortcuts' => '变更',
-	'Menu:Change:Shortcuts+' => '快速访问预定义的变更数据',
+	'Menu:SearchChanges+' => '搜索变更',
+	'Menu:Change:Shortcuts' => '快捷方式',
+	'Menu:Change:Shortcuts+' => 'Shortcuts to predefined sets of Changes~~',
 	'Menu:WaitingAcceptance' => '等待审核的变更',
 	'Menu:WaitingAcceptance+' => '',
 	'Menu:WaitingApproval' => '等待批准的变更',
-	'Menu:WaitingApproval+' => '处于计划状态的变更',
+	'Menu:WaitingApproval+' => 'Changes in planned status~~',
 	'Menu:Changes' => '所有打开的变更',
 	'Menu:Changes+' => '所有打开的变更',
 	'Menu:MyChanges' => '分配给我的变更',
@@ -43,7 +43,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI-ChangeManagementOverview-Last-7-days' => '最近一周的变更 (按数量)',
 	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => '最近一周的变更 (按范围)',
 	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => '最近一周的变更 (按状态)',
-	'Tickets:Related:OpenChanges' => '待处理的变更',
+	'Tickets:Related:OpenChanges' => '打开的变更',
 	'Tickets:Related:RecentChanges' => '最近的变更 (72小时)',
 ]);
 

datamodels/2.x/itop-config-mgmt/dictionaries/nl.dict.itop-config-mgmt.php

@@ -494,8 +494,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => 'Alle configuratie-items die deze applicatie-oplossing tot stand brengen',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => 'Bedrijfsprocessen',
 	'Class:ApplicationSolution/Attribute:businessprocess_list+' => 'Alle bedrijfsprocessen die afhankelijk zijn van deze applicatie-oplossing',
-	'Class:ApplicationSolution/Attribute:logo' => 'Logo',
-	'Class:ApplicationSolution/Attribute:logo+' => 'Wordt gebruikt als objectpictogram bij weergave in impactanalyse.',
+	'Class:ApplicationSolution/Attribute:logo' => 'Logo~~',
+	'Class:ApplicationSolution/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:ApplicationSolution/Attribute:status' => 'Status',
 	'Class:ApplicationSolution/Attribute:status+' => '',
 	'Class:ApplicationSolution/Attribute:status/Value:active' => 'Actief',
@@ -517,8 +517,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:BusinessProcess+' => '',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => 'Applicatie-oplossing',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => 'Alle applicatie-oplossingen die impact hebben op dit bedrijfsproces',
-	'Class:BusinessProcess/Attribute:logo' => 'Logo',
-	'Class:BusinessProcess/Attribute:logo+' => 'Wordt gebruikt als objectpictogram bij weergave in impactanalyse.',
+	'Class:BusinessProcess/Attribute:logo' => 'Logo~~',
+	'Class:BusinessProcess/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:BusinessProcess/Attribute:status' => 'Status',
 	'Class:BusinessProcess/Attribute:status+' => '',
 	'Class:BusinessProcess/Attribute:status/Value:active' => 'Actief',
@@ -615,8 +615,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:MiddlewareInstance' => 'Middleware-instantie',
 	'Class:MiddlewareInstance+' => '',
 	'Class:MiddlewareInstance/ComplementaryName' => '%1$s - %2$s',
-	'Class:MiddlewareInstance/Attribute:logo' => 'Logo',
-	'Class:MiddlewareInstance/Attribute:logo+' => 'Wordt gebruikt als objectpictogram bij weergave in impactanalyse.',
+	'Class:MiddlewareInstance/Attribute:logo' => 'Logo~~',
+	'Class:MiddlewareInstance/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:MiddlewareInstance/Attribute:middleware_id' => 'Middleware',
 	'Class:MiddlewareInstance/Attribute:middleware_id+' => '',
 	'Class:MiddlewareInstance/Attribute:middleware_name' => 'Naam middleware',
@@ -649,8 +649,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:WebApplication/Attribute:webserver_id+' => '',
 	'Class:WebApplication/Attribute:webserver_name' => 'Naam webserver',
 	'Class:WebApplication/Attribute:webserver_name+' => '',
-	'Class:WebApplication/Attribute:logo' => 'Logo',
-	'Class:WebApplication/Attribute:logo+' => 'Wordt gebruikt als objectpictogram bij weergave in impactanalyse.',
+	'Class:WebApplication/Attribute:logo' => 'Logo~~',
+	'Class:WebApplication/Attribute:logo+' => 'Used as object icon when displayed within impact analysis graphs~~',
 	'Class:WebApplication/Attribute:url' => 'Link (URL)',
 	'Class:WebApplication/Attribute:url+' => '',
 ]);
@@ -848,7 +848,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Tape' => 'Tape',
-	'Class:Tape+' => 'Een Tape (of cartridge) binnen '.ITOP_APPLICATION_SHORT.' is een verwijderbaar opslagonderdeel van een tapebibliotheek.',
+	'Class:Tape+' => 'A Tape (or cartridge) within '.ITOP_APPLICATION_SHORT.' is a removable piece of storage part of a Tape Library~~',
 	'Class:Tape/Attribute:name' => 'Naam',
 	'Class:Tape/Attribute:name+' => '',
 	'Class:Tape/Attribute:description' => 'Omschrijving',
@@ -898,8 +898,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:documents_list' => 'Documenten',
 	'Class:Software/Attribute:documents_list+' => 'Alle documenten gelinkt aan deze software',
-	'Class:Software/Attribute:logo' => 'Logo',
-	'Class:Software/Attribute:logo+' => 'Wordt gebruikt als pictogram voor alle software-instanties die deze software gebruiken, wanneer deze worden weergegeven in impactanalyses.',
+	'Class:Software/Attribute:logo' => 'Logo~~',
+	'Class:Software/Attribute:logo+' => 'Used as icon for all Software Instance objects using this Software, when displayed within impact analysis graphs~~',
 	'Class:Software/Attribute:type' => 'Type',
 	'Class:Software/Attribute:type+' => '',
 	'Class:Software/Attribute:type/Value:DBServer' => 'Databaseserver',
@@ -1015,7 +1015,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:OSLicence/Attribute:osversion_id' => 'Versie besturingssysteem',
 	'Class:OSLicence/Attribute:osversion_id+' => '',
 	'Class:OSLicence/Attribute:osfamily_id' => 'Soort besturingssysteem',
-	'Class:OSLicence/Attribute:osfamily_id+' => '',
+	'Class:OSLicence/Attribute:osfamily_id+' => '~~',
 	'Class:OSLicence/Attribute:osversion_name' => 'Naam versie bestandssysteem',
 	'Class:OSLicence/Attribute:osversion_name+' => '',
 	'Class:OSLicence/Attribute:virtualmachines_list' => 'Virtuele machines',
@@ -1069,8 +1069,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:OSVersion/Attribute:osfamily_id+' => '',
 	'Class:OSVersion/Attribute:osfamily_name' => 'Naam soort besturingssysteem',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
-	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Naam moet uniek zijn binnen de soort besturingssysteem',
-	'Class:OSVersion/UniquenessRule:name_osfamily' => 'Deze versie van het besturingssysteem bestaat al binnen de soort besturingssysteem',
+	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'Name must be unique in the OS family~~',
+	'Class:OSVersion/UniquenessRule:name_osfamily' => 'this OS version already exists within the OS family~~',
 ]);
 
 //
@@ -1080,8 +1080,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:OSFamily' => 'Soort Besturingssysteem',
 	'Class:OSFamily+' => '',
-	'Class:OSFamily/UniquenessRule:name+' => 'Naam moet uniek zijn',
-	'Class:OSFamily/UniquenessRule:name' => 'Deze soort besturingssysteem bestaat al',
+	'Class:OSFamily/UniquenessRule:name+' => 'Name must be unique~~',
+	'Class:OSFamily/UniquenessRule:name' => 'this OS family already exists~~',
 ]);
 
 //
@@ -1091,12 +1091,12 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Brand' => 'Merk',
 	'Class:Brand+' => '',
-	'Class:Brand/Attribute:logo' => 'Logo',
-	'Class:Brand/Attribute:logo+' => '',
+	'Class:Brand/Attribute:logo' => 'Logo~~',
+	'Class:Brand/Attribute:logo+' => '~~',
 	'Class:Brand/Attribute:physicaldevices_list' => 'Fysieke apparaten',
 	'Class:Brand/Attribute:physicaldevices_list+' => 'Alle fysieke apparaten van dit merk',
 	'Class:Brand/UniquenessRule:name+' => 'De naam van het merk moet uniek zijn',
-	'Class:Brand/UniquenessRule:name' => 'Dit merk bestaat al',
+	'Class:Brand/UniquenessRule:name' => 'De naam van het merk bestaat al',
 ]);
 
 //
@@ -1111,8 +1111,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:Model/Attribute:brand_id+' => '',
 	'Class:Model/Attribute:brand_name' => 'Naam merk',
 	'Class:Model/Attribute:brand_name+' => '',
-	'Class:Model/Attribute:picture' => 'Afbeelding',
-	'Class:Model/Attribute:picture+' => '',
+	'Class:Model/Attribute:picture' => 'Picture~~',
+	'Class:Model/Attribute:picture+' => '~~',
 	'Class:Model/Attribute:type' => 'Soort apparaat',
 	'Class:Model/Attribute:type+' => '',
 	'Class:Model/Attribute:type/Value:PowerSource' => 'Stroombron',
@@ -1164,8 +1164,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:NetworkDeviceType' => 'Soort netwerkapparaat',
 	'Class:NetworkDeviceType+' => '',
-	'Class:NetworkDeviceType/Attribute:logo' => 'Logo',
-	'Class:NetworkDeviceType/Attribute:logo+' => 'Wordt gebruikt als pictogram voor alle netwerkapparaten van dit type wanneer deze in de console worden weergegeven (details, overzichtskaart en impactanalyse).',
+	'Class:NetworkDeviceType/Attribute:logo' => 'Logo~~',
+	'Class:NetworkDeviceType/Attribute:logo+' => 'Used as icon for all Network Device of this type, when displayed in console (details, summary card and impact analysis graphs)~~',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => 'Netwerkapparaten',
 	'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'Alle netwerkapparaten van deze soort',
 ]);
@@ -1181,8 +1181,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:IOSVersion/Attribute:brand_id+' => '',
 	'Class:IOSVersion/Attribute:brand_name' => 'Naam merk',
 	'Class:IOSVersion/Attribute:brand_name+' => '',
-	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Naam moet uniek zijn binnen het merk',
-	'Class:IOSVersion/UniquenessRule:name_brand' => 'Deze IOS versie bestaat al binnen dit merk',
+	'Class:IOSVersion/UniquenessRule:name_brand+' => 'Name must be unique in the brand~~',
+	'Class:IOSVersion/UniquenessRule:name_brand' => 'this IOS version already exists for this brand~~',
 ]);
 
 //
@@ -1550,13 +1550,13 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 // Add translation for Fieldsets
 
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
-	'ConfigMgmt:baseinfo' => 'Globale informatie',
-	'ConfigMgmt:moreinfo' => 'CI specifieke informatie',
-	'Storage:moreinfo' => 'Opslaginformatie',
-	'ConfigMgmt:otherinfo' => 'Andere informatie',
-	'ConfigMgmt:dates' => 'Datums',
-	'Software:moreinfo' => 'Software informatie',
-	'Phone:moreinfo' => 'Telefoon informatie',
+	'ConfigMgmt:baseinfo' => 'General~~',
+	'ConfigMgmt:moreinfo' => 'CI specifics~~',
+	'Storage:moreinfo' => 'Storage specifics~~',
+	'ConfigMgmt:otherinfo' => 'Description~~',
+	'ConfigMgmt:dates' => 'Dates~~',
+	'Software:moreinfo' => 'Software specifics~~',
+	'Phone:moreinfo' => 'Phone specifics~~',
 	'Server:baseinfo' => 'Globale informatie',
 	'Server:Date' => 'Datum',
 	'Server:moreinfo' => 'Meer informatie',
@@ -1645,8 +1645,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 //
 
 Dict::Add('NL NL', 'Dutch', 'Nederlands', [
-	'Class:PhysicalInterface/Attribute:org_id' => 'Organisatie',
-	'Class:PhysicalInterface/Attribute:org_id+' => '',
-	'Class:PhysicalInterface/Attribute:location_id' => 'Locatie',
-	'Class:PhysicalInterface/Attribute:location_id+' => '',
+	'Class:PhysicalInterface/Attribute:org_id' => 'Organization~~',
+	'Class:PhysicalInterface/Attribute:org_id+' => '~~',
+	'Class:PhysicalInterface/Attribute:location_id' => 'Location~~',
+	'Class:PhysicalInterface/Attribute:location_id+' => '~~',
 ]);

datamodels/2.x/itop-config-mgmt/dictionaries/zh_cn.dict.itop-config-mgmt.php

@@ -30,11 +30,11 @@
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Relation:impacts/Description'    => '被影响的元素',
 	'Relation:impacts/DownStream'     => '影响...',
-	'Relation:impacts/DownStream+'    => '受影响的元素',
+	'Relation:impacts/DownStream+'    => '被影响的元素',
 	'Relation:impacts/UpStream'       => '依赖于...',
-	'Relation:impacts/UpStream+'      => '被影响的元素...',
+	'Relation:impacts/UpStream+'      => '此元素依赖的元素...',
 	// Legacy entries
-	'Relation:depends on/Description' => '被影响的元素...',
+	'Relation:depends on/Description' => '此元素依赖的元素...',
 	'Relation:depends on/DownStream'  => '依赖于...',
 	'Relation:depends on/UpStream'    => '影响...',
 	'Relation:impacts/LoadData'       => '加载数据',
@@ -129,7 +129,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+' => '',
@@ -183,7 +183,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:TelephonyCI' => '通讯项',
-	'Class:TelephonyCI+' => '通信设备的抽象类',
+	'Class:TelephonyCI+' => '',
 	'Class:TelephonyCI/Attribute:phonenumber' => '电话号码',
 	'Class:TelephonyCI/Attribute:phonenumber+' => '',
 ]);
@@ -206,7 +206,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+' => '',
 ]);
 
@@ -216,7 +216,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:IPPhone' => 'IP 电话',
-	'Class:IPPhone+' => '用于联网打电话的物理设备',
+	'Class:IPPhone+' => '用于电话的物理设备，连接到网络',
 ]);
 
 //
@@ -262,13 +262,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DatacenterDevice/Attribute:nb_u+' => '',
 	'Class:DatacenterDevice/Attribute:managementip' => '管理IP',
 	'Class:DatacenterDevice/Attribute:managementip+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_id' => '电源A',
+	'Class:DatacenterDevice/Attribute:powerA_id' => '主电源',
 	'Class:DatacenterDevice/Attribute:powerA_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerA_name' => '电源A名称',
+	'Class:DatacenterDevice/Attribute:powerA_name' => '主电源名称',
 	'Class:DatacenterDevice/Attribute:powerA_name+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_id' => '电源B',
+	'Class:DatacenterDevice/Attribute:powerB_id' => '备电源',
 	'Class:DatacenterDevice/Attribute:powerB_id+' => '',
-	'Class:DatacenterDevice/Attribute:powerB_name' => '电源B名称',
+	'Class:DatacenterDevice/Attribute:powerB_name' => '备电源名称',
 	'Class:DatacenterDevice/Attribute:powerB_name+' => '',
 	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list' => '光口',
 	'Class:DatacenterDevice/Attribute:fiberinterfacelist_list+' => '此设备的所有光纤接口',
@@ -295,12 +295,12 @@ 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:ios_end_of_support' => 'IOS 过保日期',
-	'Class:NetworkDevice/Attribute:ios_end_of_support+' => '厂商不再为该IOS版本提供修复的时间.',
+	'Class:NetworkDevice/Attribute:ios_end_of_support' => 'IOS过保时间',
+	'Class:NetworkDevice/Attribute:ios_end_of_support+' => '厂家不再为该IOS版本提供修复的时间.',
 	'Class:NetworkDevice/Attribute:ram' => '内存',
 	'Class:NetworkDevice/Attribute:ram+' => '',
 ]);
@@ -321,8 +321,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Server/Attribute:osversion_id+' => '',
 	'Class:Server/Attribute:osversion_name' => 'OS 版本名称',
 	'Class:Server/Attribute:osversion_name+' => '',
-	'Class:Server/Attribute:os_end_of_support' => 'OS 过保日期',
-	'Class:Server/Attribute:os_end_of_support+' => '厂商不再为该操作系统版本提供补丁的日期.',
+	'Class:Server/Attribute:os_end_of_support' => 'OS 过保时间',
+	'Class:Server/Attribute:os_end_of_support+' => '厂商不再为该操作系统版本提供补丁的时间.',
 	'Class:Server/Attribute:oslicence_id' => 'OS 许可证',
 	'Class:Server/Attribute:oslicence_id+' => '',
 	'Class:Server/Attribute:oslicence_name' => 'OS 许可证名称',
@@ -332,7 +332,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Server/Attribute:ram' => '内存',
 	'Class:Server/Attribute:ram+' => '',
 	'Class:Server/Attribute:logicalvolumes_list' => '逻辑卷',
-	'Class:Server/Attribute:logicalvolumes_list+' => '连接到此物理机的所有逻辑卷',
+	'Class:Server/Attribute:logicalvolumes_list+' => '连接到此服务器的所有逻辑卷',
 ]);
 
 //
@@ -341,7 +341,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:StorageSystem' => '存储系统',
-	'Class:StorageSystem+' => '存储系统通常使用光纤或以太网, 以逻辑卷为单位进行管理.',
+	'Class:StorageSystem+' => '存储系统可以使用光纤或以太网连接. 存储系统以逻辑卷为单位进行管理.',
 	'Class:StorageSystem/ComplementaryName' => '%1$s - %2$s',
 	'Class:StorageSystem/Attribute:logicalvolume_list' => '逻辑卷',
 	'Class:StorageSystem/Attribute:logicalvolume_list+' => '此存储系统包含的所有逻辑卷',
@@ -399,8 +399,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:PC/Attribute:osversion_id+' => '',
 	'Class:PC/Attribute:osversion_name' => 'OS 版本名称',
 	'Class:PC/Attribute:osversion_name+' => '',
-	'Class:PC/Attribute:os_end_of_support' => 'OS 过保日期',
-	'Class:PC/Attribute:os_end_of_support+' => '厂商不再为该操作系统版本提供补丁的日期.',
+	'Class:PC/Attribute:os_end_of_support' => 'OS 过保时间',
+	'Class:PC/Attribute:os_end_of_support+' => '厂商不再为该操作系统版本提供补丁的时间.',
 	'Class:PC/Attribute:cpu' => 'CPU',
 	'Class:PC/Attribute:cpu+' => '',
 	'Class:PC/Attribute:ram' => '内存',
@@ -439,7 +439,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:PowerSource' => '电源',
-	'Class:PowerSource+' => '物理电源连接. 用于描述数据中心的任何类型的电源 (主电源入口, 断路器…) ，但不是 PDU.',
+	'Class:PowerSource+' => '物理电源连接. 用于记录数据中心的任何类型的电源 (主电源入口, 断路器…) ，但不是 PDU.',
 	'Class:PowerSource/ComplementaryName' => '%1$s - %2$s',
 	'Class:PowerSource/Attribute:pdus_list' => 'PDU',
 	'Class:PowerSource/Attribute:pdus_list+' => '使用此电源的所有 PDU',
@@ -451,7 +451,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:PDU' => 'PDU',
-	'Class:PDU+' => '供电线路. PDU (Power Distribution Unit) 是一种配备了多个输出的电力分配设备，特别是为数据中心内的服务器机架和网络设备机架供电.',
+	'Class:PDU+' => '电力供应连接. PDU (Power Distribution Unit) 是一种配备了多个输出的电力分配设备，特别是为数据中心内的服务器机架和网络设备机架供电.',
 	'Class:PDU/ComplementaryName' => '%1$s - %2$s - %3$s - %4$s',
 	'Class:PDU/Attribute:rack_id' => '机架',
 	'Class:PDU/Attribute:rack_id+' => '',
@@ -498,7 +498,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ApplicationSolution' => '应用方案',
-	'Class:ApplicationSolution+' => '应用方案描述了复杂应用是如何由多个基本组件组装的. 应用方案的主要信息是组件之间的依赖关系列表.',
+	'Class:ApplicationSolution+' => '应用方案描述了复杂应用是如何由多个基本组件之间组装(或依赖)的. 应用方案的主要信息是其关系列表.',
 	'Class:ApplicationSolution/Attribute:functionalcis_list' => '配置项',
 	'Class:ApplicationSolution/Attribute:functionalcis_list+' => '此应用方案包含的所有配置项',
 	'Class:ApplicationSolution/Attribute:businessprocess_list' => '业务流程',
@@ -523,7 +523,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:BusinessProcess' => '业务流程',
-	'Class:BusinessProcess+' => '业务流程描述了运营过程中的高级流程或重要应用. 它与应用方案非常类似, 但是用于描述更高层次的应用或整个组织的流程.',
+	'Class:BusinessProcess+' => '业务流程用于描述运营过程中的高级流程或重要应用. 它与应用方案非常类似, 但是为了描述更高层次的应用或整个组织的流程.',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list' => '应用方案',
 	'Class:BusinessProcess/Attribute:applicationsolutions_list+' => '影响此业务流程的所有应用方案',
 	'Class:BusinessProcess/Attribute:logo' => 'Logo',
@@ -551,7 +551,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Software/Attribute:version' => '版本',
 	'Class:Software/Attribute:version+' => '',
 	'Class:Software/Attribute:end_of_support' => '过保日期',
-	'Class:Software/Attribute:end_of_support+' => '厂商提供的最后支持日期，此后不再提供此软件版本的补丁.',
+	'Class:Software/Attribute:end_of_support+' => '厂家提供的最后一个支持日期，此后不再提供此软件版本的补丁.',
 	'Class:Software/Attribute:documents_list' => '文档',
 	'Class:Software/Attribute:documents_list+' => '此软件相关的所有文档',
   'Class:Software/Attribute:logo' => 'Logo',
@@ -591,7 +591,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SoftwareInstance/Attribute:software_id+' => '',
 	'Class:SoftwareInstance/Attribute:software_name' => '软件名称',
 	'Class:SoftwareInstance/Attribute:software_name+' => '',
-	'Class:SoftwareInstance/Attribute:software_end_of_support' => '软件过保日期',
+	'Class:SoftwareInstance/Attribute:software_end_of_support' => '软件过保时间',
 	'Class:SoftwareInstance/Attribute:software_end_of_support+' => '厂商为此软件版本提供补丁的最后日期.',
 	'Class:SoftwareInstance/Attribute:softwarelicence_id' => '软件许可证',
 	'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '',
@@ -625,8 +625,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DBServer' => 'DB 服务器',
 	'Class:DBServer+' => '提供数据库服务的软件实例 (例如: MySQL 8.0, Oracle, SQL Server, DB2…), 通常安装在特定系统(PC, 物理机或虚拟机)上.',
-	'Class:DBServer/Attribute:dbschema_list' => '数据库模式',
-	'Class:DBServer/Attribute:dbschema_list+' => '此数据库服务器上的所有数据库模式',
+	'Class:DBServer/Attribute:dbschema_list' => '数据库架构',
+	'Class:DBServer/Attribute:dbschema_list+' => '此数据库服务器上的所有数据库架构',
 ]);
 
 //
@@ -679,7 +679,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:DatabaseSchema' => '数据库模式',
+	'Class:DatabaseSchema' => '数据库架构',
 	'Class:DatabaseSchema+' => 'DB 服务器上运行的逻辑数据库实例.',
 	'Class:DatabaseSchema/ComplementaryName' => '%1$s - %2$s',
 	'Class:DatabaseSchema/Attribute:dbserver_id' => 'DB 服务器',
@@ -712,7 +712,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:VirtualDevice' => '虚拟设备',
-	'Class:VirtualDevice+' => '用于服务器虚拟化的抽象类 (虚拟化主机和虚拟机).',
+	'Class:VirtualDevice+' => '用于服务器虚拟化的抽象类 (宿主机和虚拟机).',
 	'Class:VirtualDevice/Attribute:status' => '状态',
 	'Class:VirtualDevice/Attribute:status+' => '',
 	'Class:VirtualDevice/Attribute:status/Value:implementation' => '生效',
@@ -732,10 +732,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+' => '此宿主机托管的所有虚拟机',
 ]);
 
 //
@@ -778,7 +778,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:VirtualMachine' => '虚拟机',
 	'Class:VirtualMachine+' => '与物理机类似的虚拟设备，它既可以托管在 Hypervisor 上，也可以托管在集群上.',
 	'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+' => '',
@@ -1061,7 +1061,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkDocumentToLicence' => '链接 文档/许可证',
-	'Class:lnkDocumentToLicence+' => '此链接用于当某个文档适用于某个许可证时.',
+	'Class:lnkDocumentToLicence+' => 'Link used when a Document is applicable to a License.~~',
 	'Class:lnkDocumentToLicence/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToLicence/Attribute:licence_id' => '许可证',
 	'Class:lnkDocumentToLicence/Attribute:licence_id+' => '',
@@ -1085,9 +1085,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:OSVersion/Attribute:osfamily_name' => '名称',
 	'Class:OSVersion/Attribute:osfamily_name+' => '',
 	'Class:OSVersion/Attribute:end_of_support' => '过保日期',
-	'Class:OSVersion/Attribute:end_of_support+' => '厂商停止为此 OS 版本提供补丁的截止日期.',
+	'Class:OSVersion/Attribute:end_of_support+' => 'The date after which the editor ceases to provide patches for this OS version.~~',
 	'Class:OSVersion/Attribute:ospatches_list' => 'OS 补丁',
-	'Class:OSVersion/Attribute:ospatches_list+' => '此 OS 版本的所有补丁',
+	'Class:OSVersion/Attribute:ospatches_list+' => 'All the OS patches for this OS version~~',
 	'Class:OSVersion/UniquenessRule:name_osfamily+' => 'OS 家族的名称必须唯一',
 	'Class:OSVersion/UniquenessRule:name_osfamily' => '此 OS 版本已在 OS 家族中存在',
 ]);
@@ -1222,7 +1222,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkDocumentToPatch' => '链接 文档/补丁',
-	'Class:lnkDocumentToPatch+' => '此链接用于当某个文档适用于某个补丁时.',
+	'Class:lnkDocumentToPatch+' => 'Link used when a Document is applicable to a Patch.~~',
 	'Class:lnkDocumentToPatch/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToPatch/Attribute:patch_id' => '补丁',
 	'Class:lnkDocumentToPatch/Attribute:patch_id+' => '',
@@ -1240,7 +1240,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkSoftwareInstanceToSoftwarePatch' => '链接 软件实例/软件补丁',
-	'Class:lnkSoftwareInstanceToSoftwarePatch+' => '此链接表示某个软件补丁已应用于软件实例.',
+	'Class:lnkSoftwareInstanceToSoftwarePatch+' => 'This link indicates that a software patch has been applied to a software instance.~~',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Name' => '%1$s / %2$s',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => '软件补丁',
 	'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '',
@@ -1276,7 +1276,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkDocumentToSoftware' => '链接 文档/软件',
-	'Class:lnkDocumentToSoftware+' => '此链接用于当某个文档适用于某个软件时.',
+	'Class:lnkDocumentToSoftware+' => 'Link used when a Document is applicable to Software.~~',
 	'Class:lnkDocumentToSoftware/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToSoftware/Attribute:software_id' => '软件',
 	'Class:lnkDocumentToSoftware/Attribute:software_id+' => '',
@@ -1415,7 +1415,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkPhysicalInterfaceToVLAN' => '链接 物理网卡/VLAN',
-	'Class:lnkPhysicalInterfaceToVLAN+' => '此链接表示物理网卡是否属于某个VLAN (虚拟局域网).',
+	'Class:lnkPhysicalInterfaceToVLAN+' => 'This link indicates when a network interface is part of a VLAN (虚拟局域网).',
 	'Class:lnkPhysicalInterfaceToVLAN/Name' => '%1$s %2$s / %3$s',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => '物理网卡',
 	'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '',
@@ -1450,7 +1450,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+' => '',
 	'Class:FiberChannelInterface/Attribute:topology' => '拓扑',
@@ -1469,7 +1469,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkConnectableCIToNetworkDevice' => '链接 可连接项/网络设备',
-	'Class:lnkConnectableCIToNetworkDevice+' => '定义设备连接到哪些网络设备.',
+	'Class:lnkConnectableCIToNetworkDevice+' => 'Defines on which network equipment a device is connected.~~',
 	'Class:lnkConnectableCIToNetworkDevice/Name' => '%1$s / %2$s',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => '网络设备',
 	'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '',
@@ -1569,7 +1569,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkGroupToCI' => '链接 配置组/配置项',
-	'Class:lnkGroupToCI+' => '此链接表示某个功能配置项属于某个配置组.',
+	'Class:lnkGroupToCI+' => 'This link indicates when a Functional CI is part of a Group.~~',
 	'Class:lnkGroupToCI/Name' => '%1$s / %2$s',
 	'Class:lnkGroupToCI/Attribute:group_id' => '组',
 	'Class:lnkGroupToCI/Attribute:group_id+' => '',
@@ -1589,7 +1589,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkDocumentToFunctionalCI' => '链接 文档/功能配置项',
-	'Class:lnkDocumentToFunctionalCI+' => '此链接用于当某个文档适用于某个功能配置项时.',
+	'Class:lnkDocumentToFunctionalCI+' => 'Link used when a Document is applicable to a Functional CI.~~',
 	'Class:lnkDocumentToFunctionalCI/Name' => '%1$s / %2$s',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => '功能配置项',
 	'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '',

datamodels/2.x/itop-container-mgmt/dictionaries/zh_cn.dict.itop-container-mgmt.php

@@ -105,7 +105,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ContainerHost/Name' => '%1$s',
 	'Class:ContainerHost/ComplementaryName' => '%1$s-%2$s',
-	'Class:ContainerHost' => '容器化主机',
+	'Class:ContainerHost' => '容器宿主机',
 	'Class:ContainerHost+' => '托管容器的宿主机. 它是容器平台的基本元素',
 	'Class:ContainerHost/Attribute:containercluster_id' => '容器集群',
 	'Class:ContainerHost/Attribute:containercluster_id+' => '',
@@ -126,12 +126,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ContainerCluster/Name' => '%1$s',
 	'Class:ContainerCluster/ComplementaryName' => '',
 	'Class:ContainerCluster' => '容器集群',
-	'Class:ContainerCluster+' => '由一组容器化主机组成的容器平台',
+	'Class:ContainerCluster+' => '由一组容器宿主机组成的容器平台',
 	'Class:ContainerCluster/Attribute:redundancy' => '冗余配置',
 	'Class:ContainerCluster/Attribute:redundancy/disabled' => '当所有主机都在运行时, 集群才是正常的',
 	'Class:ContainerCluster/Attribute:redundancy/count' => '当至少 %1$s 个主机在运行时, 集群才是正常的',
 	'Class:ContainerCluster/Attribute:redundancy/percent' => '当至少 %1$s %% 的在主机运行时，集群才是正常的',
-	'Class:ContainerCluster/Attribute:containerhosts_list' => '容器化主机',
+	'Class:ContainerCluster/Attribute:containerhosts_list' => '容器宿主机',
 	'Class:ContainerCluster/Attribute:containerhosts_list+' => '此集群的主机',
 ]);
 
@@ -162,12 +162,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:Cloud/Attribute:containerhosts_list' => '容器化主机',
-	'Class:Cloud/Attribute:containerhosts_list+' => '运行在此云平台上的容器化主机列表',
-	'Class:Server/Attribute:containerhosts_list' => '容器化主机',
-	'Class:Server/Attribute:containerhosts_list+' => '运行在此物理机上的容器化主机列表',
-	'Class:VirtualMachine/Attribute:containerhosts_list' => '容器化主机',
-	'Class:VirtualMachine/Attribute:containerhosts_list+' => '运行在此虚拟机上的容器化主机列表',
+	'Class:Cloud/Attribute:containerhosts_list' => '容器宿主机',
+	'Class:Cloud/Attribute:containerhosts_list+' => '运行在此云平台上的容器宿主机列表',
+	'Class:Server/Attribute:containerhosts_list' => '容器宿主机',
+	'Class:Server/Attribute:containerhosts_list+' => '运行在此物理机上的容器宿主机列表',
+	'Class:VirtualMachine/Attribute:containerhosts_list' => '容器宿主机',
+	'Class:VirtualMachine/Attribute:containerhosts_list+' => '运行在此虚拟机上的容器宿主机列表',
 	'Class:Software/Attribute:containerimages_list' => '容器镜像',
 	'Class:Software/Attribute:containerimages_list+' => '运行此软件的容器镜像列表',
 ]);

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	https://opensource.org/licenses/AGPL-3.0
+ * @license	http://opensource.org/licenses/AGPL-3.0
  *
  * This file is part of iTop.
  *

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	https://opensource.org/licenses/AGPL-3.0
+ * @license	http://opensource.org/licenses/AGPL-3.0
  *
  * This file is part of iTop.
  *

datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php

@@ -56,7 +56,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'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+' => '',
@@ -68,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' => '范围',
 ]);
 
 //

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,7 +21,6 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with iTop. If not, see <http://www.gnu.org/licenses/>
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	// Errors
 	'FilesInformation:Error:MissingFile' => '文件丢失: %1$s',

datamodels/2.x/itop-flow-map/data/data.itop-dataflowprotocol.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Set>
-  <DataFlowProtocol alias="DataFlowProtocol" id="1">
-    <name>HTTP</name>
-  </DataFlowProtocol>
-  <DataFlowProtocol alias="DataFlowProtocol" id="2">
-    <name>HTTPS</name>
-  </DataFlowProtocol>
-  <DataFlowProtocol alias="DataFlowProtocol" id="3">
-    <name>FTP</name>
-  </DataFlowProtocol>
-  <DataFlowProtocol alias="DataFlowProtocol" id="4">
-    <name>SFTP</name>
-  </DataFlowProtocol>
-  <DataFlowProtocol alias="DataFlowProtocol" id="5">
-    <name>AS2</name>
-  </DataFlowProtocol>
-  <DataFlowProtocol alias="DataFlowProtocol" id="6">
-    <name>X.400</name>
-  </DataFlowProtocol>
-  <DataFlowProtocol alias="DataFlowProtocol" id="7">
-    <name>FTPS</name>
-  </DataFlowProtocol>
-</Set>

datamodels/2.x/itop-flow-map/data/data.itop-flow-map.en_us.xml

@@ -1,18 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Set>
   <DataFlowType alias="DataFlowType" id="1">
-    <name>REST API</name>
+    <name>HTTP</name>
   </DataFlowType>
   <DataFlowType alias="DataFlowType" id="2">
-    <name>KAFKA</name>
+    <name>HTTPS</name>
   </DataFlowType>
   <DataFlowType alias="DataFlowType" id="3">
-    <name>JSON</name>
+    <name>FTP</name>
   </DataFlowType>
   <DataFlowType alias="DataFlowType" id="4">
-    <name>XML</name>
+    <name>SFTP</name>
   </DataFlowType>
   <DataFlowType alias="DataFlowType" id="5">
-    <name>CSV</name>
+    <name>AS2</name>
+  </DataFlowType>
+  <DataFlowType alias="DataFlowType" id="6">
+    <name>X.400</name>
+  </DataFlowType>
+  <DataFlowType alias="DataFlowType" id="7">
+    <name>FTPS</name>
   </DataFlowType>
 </Set>

datamodels/2.x/itop-flow-map/datamodel.itop-flow-map.xml

@@ -97,31 +97,6 @@
           <on_target_delete>DEL_MANUAL</on_target_delete>
           <tracking_level>all</tracking_level>
         </field>
-        <field id="dataflowprotocol_id" xsi:type="AttributeExternalKey">
-          <sql>dataflowprotocol_id</sql>
-          <filter/>
-          <dependencies/>
-          <is_null_allowed>true</is_null_allowed>
-          <target_class>DataFlowProtocol</target_class>
-          <on_target_delete>DEL_MANUAL</on_target_delete>
-          <tracking_level>all</tracking_level>
-        </field>
-        <field id="documentation_url" xsi:type="AttributeURL">
-          <sql>documentation_url</sql>
-          <default_value/>
-          <target>_blank</target>
-          <dependencies/>
-          <validation_pattern/>
-          <is_null_allowed>true</is_null_allowed>
-          <tracking_level>all</tracking_level>
-        </field>
-        <field id="last_change_date" xsi:type="AttributeDate">
-          <sql>last_change_date</sql>
-          <default_value/>
-          <dependencies/>
-          <is_null_allowed>true</is_null_allowed>
-          <tracking_level>all</tracking_level>
-        </field>
         <field id="status" xsi:type="AttributeEnum">
           <sql>status</sql>
           <values>
@@ -291,11 +266,8 @@
                     <item id="dataflowtype_id">
                       <rank>50</rank>
                     </item>
-                    <item id="dataflowprotocol_id">
-                      <rank>60</rank>
-                    </item>
                     <item id="execution_frequency">
-                      <rank>70</rank>
+                      <rank>60</rank>
                     </item>
                   </items>
                   <rank>20</rank>
@@ -310,9 +282,6 @@
                     <item id="move2production">
                       <rank>10</rank>
                     </item>
-                    <item id="last_change_date">
-                      <rank>20</rank>
-                    </item>
                   </items>
                   <rank>10</rank>
                 </item>
@@ -321,11 +290,8 @@
                     <item id="description">
                       <rank>10</rank>
                     </item>
-                    <item id="documentation_url">
-                      <rank>20</rank>
-                    </item>
                     <item id="groups_list">
-                      <rank>30</rank>
+                      <rank>20</rank>
                     </item>
                   </items>
                   <rank>20</rank>
@@ -456,60 +422,6 @@
         </details>
       </presentation>
     </class>
-    <class id="DataFlowProtocol" _delta="define">
-      <parent>Typology</parent>
-      <properties>
-        <category>bizmodel,searchable</category>
-        <abstract>false</abstract>
-        <db_table>dataflowprotocol</db_table>
-        <naming>
-          <attributes>
-            <attribute id="name"/>
-          </attributes>
-        </naming>
-        <reconciliation>
-          <attributes>
-            <attribute id="name"/>
-            <attribute id="finalclass"/>
-          </attributes>
-        </reconciliation>
-        <uniqueness_rules>
-          <rule id="name">
-            <attributes>
-              <attribute id="name"/>
-            </attributes>
-            <filter><![CDATA[]]></filter>
-            <disabled>false</disabled>
-            <is_blocking>true</is_blocking>
-          </rule>
-        </uniqueness_rules>
-      </properties>
-      <fields/>
-      <methods/>
-      <presentation>
-        <list>
-          <items>
-            <item id="finalclass">
-              <rank>10</rank>
-            </item>
-          </items>
-        </list>
-        <search>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-          </items>
-        </search>
-        <details>
-          <items>
-            <item id="name">
-              <rank>10</rank>
-            </item>
-          </items>
-        </details>
-      </presentation>
-    </class>
     <class id="FunctionalCI" _delta="must_exist">
       <fields>
         <field id="dataflows" xsi:type="AttributeDashboard" _delta="define">
@@ -716,10 +628,6 @@
                 <rank>23</rank>
                 <class>DataFlowType</class>
               </dashlet>
-              <dashlet id="DataFlowProtocol" xsi:type="DashletBadge" _delta="define">
-                <rank>24</rank>
-                <class>DataFlowProtocol</class>
-              </dashlet>
             </dashlets>
           </cell>
         </cells>

datamodels/2.x/itop-flow-map/dictionaries/en.dict.itop-flow-map.php

@@ -45,13 +45,7 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:DataFlow/Attribute:destination_impact/Value:no' => 'no',
 	'Class:DataFlow/Attribute:destination_impact/Value:no+' => 'If the flow stops, the destination is not impacted',
 	'Class:DataFlow/Attribute:dataflowtype_id' => 'Flow type',
-	'Class:DataFlow/Attribute:dataflowtype_id+' => 'Values defined in a typology of Data Flow Type',
-	'Class:DataFlow/Attribute:dataflowprotocol_id' => 'Flow protocol',
-	'Class:DataFlow/Attribute:dataflowprotocol_id+' => 'Values defined in a typology of Data Flow Protocol',
-	'Class:DataFlow/Attribute:documentation_url' => 'Documentation URL',
-	'Class:DataFlow/Attribute:documentation_url+' => 'URL to the documentation of the data flow',
-	'Class:DataFlow/Attribute:last_change_date' => 'Last change date',
-	'Class:DataFlow/Attribute:last_change_date+' => 'Last time the software or configuration of the Data Flow was updated',
+	'Class:DataFlow/Attribute:dataflowtype_id+' => 'Typology of Flow.',
 	'Class:DataFlow/Attribute:status' => 'Status',
 	'Class:DataFlow/Attribute:status+' => '',
 	'Class:DataFlow/Attribute:status/Value:active' => 'active',
@@ -80,7 +74,18 @@ Dict::Add('EN US', 'English', 'English', [
 	'Class:DataFlowType' => 'Data Flow Type',
 	'Class:DataFlowType+' => 'Typology of Data Flow',
 
-	'Class:DataFlowProtocol' => 'Data Flow Protocol',
-	'Class:DataFlowProtocol+' => 'Typology of Data Flow Protocol',
-
+/*
+	'Class:DataFlow/Attribute:source_id_friendlyname'             => 'source_id_friendlyname',
+	'Class:DataFlow/Attribute:source_id_friendlyname+'            => 'Full name',
+	'Class:DataFlow/Attribute:source_id_finalclass_recall'        => 'source_id->CI sub-class',
+	'Class:DataFlow/Attribute:source_id_finalclass_recall+'       => 'Name of the final class',
+	'Class:DataFlow/Attribute:source_id_obsolescence_flag'        => 'source_id->Obsolete',
+	'Class:DataFlow/Attribute:source_id_obsolescence_flag+'       => 'Computed dynamically on other attributes',
+	'Class:DataFlow/Attribute:destination_id_friendlyname'        => 'destination_id_friendlyname',
+	'Class:DataFlow/Attribute:destination_id_friendlyname+'       => 'Full name',
+	'Class:DataFlow/Attribute:destination_id_finalclass_recall'   => 'destination_id->CI sub-class',
+	'Class:DataFlow/Attribute:destination_id_finalclass_recall+'  => 'Name of the final class',
+	'Class:DataFlow/Attribute:destination_id_obsolescence_flag'   => 'destination_id->Obsolete',
+	'Class:DataFlow/Attribute:destination_id_obsolescence_flag+'  => 'Computed dynamically on other attributes',
+*/
 ]);

datamodels/2.x/itop-flow-map/dictionaries/fr.dict.itop-flow-map.php

@@ -44,16 +44,10 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:DataFlow/Attribute:destination_impact/Value:yes+' => 'Si le flux s\'arrête, le destinataire est impacté',
 	'Class:DataFlow/Attribute:destination_impact/Value:no' => 'non',
 	'Class:DataFlow/Attribute:destination_impact/Value:no+' => 'Si le flux s\'arrête, le destinataire n\'est pas impacté',
-	'Class:DataFlow/Attribute:dataflowtype_id'                           => 'Type du flux',
-	'Class:DataFlow/Attribute:dataflowtype_id+'                          => 'Ces valeurs sont gérées dans une typologie',
-	'Class:DataFlow/Attribute:dataflowprotocol_id'                           => 'Protocole',
-	'Class:DataFlow/Attribute:dataflowprotocol_id+'                          => 'Protocole utilisé par le flux. Ces valeurs sont gérées dans une typologie',
-	'Class:DataFlow/Attribute:documentation_url'                           => 'Lien vers la documentation',
-	'Class:DataFlow/Attribute:documentation_url+'                          => 'URL vers la documentation du flux de données',
-	'Class:DataFlow/Attribute:last_change_date' => 'Dernière mise à jour',
-	'Class:DataFlow/Attribute:last_change_date+' => 'Date de la dernière mise à jour du logiciel ou de la configuration du flux de données',
-	'Class:DataFlow/Attribute:status'                => 'Etat',
-	'Class:DataFlow/Attribute:status+'              => '',
+	'Class:DataFlow/Attribute:dataflowtype_id'                           => 'Type de flux',
+	'Class:DataFlow/Attribute:dataflowtype_id+'                          => 'Typologie du flux',
+	'Class:DataFlow/Attribute:status'                            => 'Etat',
+	'Class:DataFlow/Attribute:status+'                           => '',
 	'Class:DataFlow/Attribute:status/Value:active'               => 'actif',
 	'Class:DataFlow/Attribute:status/Value:inactive'             => 'inactif',
 	'Class:DataFlow/Attribute:execution_frequency' => 'Fréquence d\'exécution',
@@ -72,15 +66,26 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Class:DataFlow/Attribute:execution_frequency/Value:monthly+' => '',
 	'Class:DataFlow/Attribute:execution_frequency/Value:yearly'	=> 'annuelle',
 	'Class:DataFlow/Attribute:execution_frequency/Value:yearly+' => '',
-	'Class:DataFlow/Attribute:documents_list+' => 'Ex: spécifications techniques, runbooks, etc.',
-	'Class:DataFlow/Attribute:contacts_list+' => 'Ex: propriétaire du flux, support technique, etc.',
+	'Class:DataFlow/Attribute:documents_list+' => 'Eg: technical specifications, runbooks, etc.',
+	'Class:DataFlow/Attribute:contacts_list+' => 'Eg: flow owner, technical support, etc.',
 	'Class:DataFlow/Error:CheckSource' => 'La source d\'un flux de données ne peut pas être un flux de données elle-même. Choisissez un autre CI source que %1$s',
 	'Class:DataFlow/Error:CheckDestination' => 'La destination d\'un flux de données ne peut pas être un flux de données elle-même. Choisissez un autre CI destination que %1$s',
 
 	'Class:DataFlowType' => 'Type de flux',
 	'Class:DataFlowType+' => 'Typologie des flux de données',
 
-	'Class:DataFlowProtocol' => 'Protocole de flux',
-	'Class:DataFlowProtocol+' => 'Typologie des protocoles de flux',
-
+/*
+	'Class:DataFlow/Attribute:source_id_friendlyname'            => 'source_id_friendlyname',
+	'Class:DataFlow/Attribute:source_id_friendlyname+'           => 'Nom complet',
+	'Class:DataFlow/Attribute:source_id_finalclass_recall'       => 'source_id->CI sub-class',
+	'Class:DataFlow/Attribute:source_id_finalclass_recall+'      => 'Classe finale',
+	'Class:DataFlow/Attribute:source_id_obsolescence_flag'       => 'source_id->Obsolete',
+	'Class:DataFlow/Attribute:source_id_obsolescence_flag+'      => 'Computed dynamically on other attributes',
+	'Class:DataFlow/Attribute:destination_id_friendlyname'       => 'destination_id_friendlyname',
+	'Class:DataFlow/Attribute:destination_id_friendlyname+'      => 'Nom complet',
+	'Class:DataFlow/Attribute:destination_id_finalclass_recall'  => 'destination_id->CI sub-class',
+	'Class:DataFlow/Attribute:destination_id_finalclass_recall+' => 'Classe finale',
+	'Class:DataFlow/Attribute:destination_id_obsolescence_flag'  => 'destination_id->Obsolete',
+	'Class:DataFlow/Attribute:destination_id_obsolescence_flag+' => 'Computed dynamically on other attributes',
+*/
 ]);

datamodels/2.x/itop-flow-map/dictionaries/nl.dict.itop-flow-map.php

@@ -45,13 +45,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:DataFlow/Attribute:destination_impact/Value:no' => 'Nee',
 	'Class:DataFlow/Attribute:destination_impact/Value:no+' => 'Als de gegevensstroom stopt, heeft dit geen gevolgen voor de bestemming.',
 	'Class:DataFlow/Attribute:dataflowtype_id' => 'Type',
-	'Class:DataFlow/Attribute:dataflowtype_id+' => 'Values defined in a typology of Data Flow Type~~',
-	'Class:DataFlow/Attribute:dataflowprotocol_id' => 'Flowprotocol',
-	'Class:DataFlow/Attribute:dataflowprotocol_id+' => 'Values defined in a typology of Data Flow Protocol~~',
-	'Class:DataFlow/Attribute:documentation_url' => 'Documentatie-URL',
-	'Class:DataFlow/Attribute:documentation_url+' => 'URL naar de documentatie van de gegevensstroom',
-	'Class:DataFlow/Attribute:last_change_date' => 'Datum laatste wijziging',
-	'Class:DataFlow/Attribute:last_change_date+' => 'Datum van de laatste wijziging van de software of configuratie van de gegevensstroom',
+	'Class:DataFlow/Attribute:dataflowtype_id+' => 'Soort gegevensstroom',
 	'Class:DataFlow/Attribute:status' => 'Status',
 	'Class:DataFlow/Attribute:status+' => '',
 	'Class:DataFlow/Attribute:status/Value:active' => 'Actief',
@@ -80,7 +74,4 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:DataFlowType' => 'Soort gegevensstroom',
 	'Class:DataFlowType+' => '',
 
-	'Class:DataFlowProtocol' => 'Gegevensstroomprotocol',
-	'Class:DataFlowProtocol+' => 'Typologie van gegevensstroomprotocol',
-
 ]);

datamodels/2.x/itop-flow-map/dictionaries/ru.dict.itop-flow-map.php

@@ -49,13 +49,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:DataFlow/Attribute:destination_impact/Value:no' => 'нет',
 	'Class:DataFlow/Attribute:destination_impact/Value:no+' => 'Если поток останавливается, назначение не подвержено влиянию',
 	'Class:DataFlow/Attribute:dataflowtype_id' => 'Тип потока',
-	'Class:DataFlow/Attribute:dataflowtype_id+' => 'Values defined in a typology of Data Flow Type~~',
-	'Class:DataFlow/Attribute:dataflowprotocol_id' => 'Протокол потока',
-	'Class:DataFlow/Attribute:dataflowprotocol_id+' => 'Values defined in a typology of Data Flow Protocol~~',
-	'Class:DataFlow/Attribute:documentation_url' => 'Ссылка на документацию',
-	'Class:DataFlow/Attribute:documentation_url+' => 'Ссылка на документацию потока данных',
-	'Class:DataFlow/Attribute:last_change_date' => 'Дата последнего изменения',
-	'Class:DataFlow/Attribute:last_change_date+' => 'Дата последнего изменения программного обеспечения или конфигурации потока данных',
+	'Class:DataFlow/Attribute:dataflowtype_id+' => 'Типология потока.',
 	'Class:DataFlow/Attribute:status' => 'Статус',
 	'Class:DataFlow/Attribute:status+' => '',
 	'Class:DataFlow/Attribute:status/Value:active' => 'активен',
@@ -84,7 +78,18 @@ Dict::Add('RU RU', 'Russian', 'Русский', [
 	'Class:DataFlowType' => 'Тип потока данных',
 	'Class:DataFlowType+' => 'Типология потоков данных',
 
-	'Class:DataFlowProtocol' => 'Протокол потока данных',
-	'Class:DataFlowProtocol+' => 'Типология протоколов потоков данных',
-
+/*
+	'Class:DataFlow/Attribute:source_id_friendlyname'             => 'source_id_friendlyname',
+	'Class:DataFlow/Attribute:source_id_friendlyname+'            => 'Full name',
+	'Class:DataFlow/Attribute:source_id_finalclass_recall'        => 'source_id->CI sub-class',
+	'Class:DataFlow/Attribute:source_id_finalclass_recall+'       => 'Name of the final class',
+	'Class:DataFlow/Attribute:source_id_obsolescence_flag'        => 'source_id->Obsolete',
+	'Class:DataFlow/Attribute:source_id_obsolescence_flag+'       => 'Computed dynamically on other attributes',
+	'Class:DataFlow/Attribute:destination_id_friendlyname'        => 'destination_id_friendlyname',
+	'Class:DataFlow/Attribute:destination_id_friendlyname+'       => 'Full name',
+	'Class:DataFlow/Attribute:destination_id_finalclass_recall'   => 'destination_id->CI sub-class',
+	'Class:DataFlow/Attribute:destination_id_finalclass_recall+'  => 'Name of the final class',
+	'Class:DataFlow/Attribute:destination_id_obsolescence_flag'   => 'destination_id->Obsolete',
+	'Class:DataFlow/Attribute:destination_id_obsolescence_flag+'  => 'Computed dynamically on other attributes',
+*/
 ]);

datamodels/2.x/itop-flow-map/dictionaries/zh_cn.dict.itop-flow-map.php

@@ -9,11 +9,11 @@
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
-	'Relation:dataflows/Description'    => '配置项之间的数据流',
-	'Relation:dataflows/DownStream'     => '出站数据流...',
-	'Relation:dataflows/DownStream+'    => '出站数据流图，源自',
-	'Relation:dataflows/UpStream'       => '入站数据流...',
-	'Relation:dataflows/UpStream+'      => '入站数据流图，指向',
+	'Relation:dataflows/Description'    => 'DataFlows between CIs~~',
+	'Relation:dataflows/DownStream'     => 'Outbound flows...',
+	'Relation:dataflows/DownStream+'    => 'Outbound flows map from',
+	'Relation:dataflows/UpStream'       => 'Inbound flows...',
+	'Relation:dataflows/UpStream+'      => 'Inbound flows map to',
 
 	'Class:FunctionalCI/Attribute:dataflows' => '数据流',
 	'Class:FunctionalCI/Attribute:dataflows+' => '该对象作为源或目标的数据流',
@@ -24,7 +24,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'DataFlow:moreinfo' => '数据流详情',
 
 	'Class:DataFlow' => '数据流',
-	'Class:DataFlow+' => '例如应用数据流',
+	'Class:DataFlow+' => 'For application flow for example~~',
 	'Class:DataFlow/Name' => '%1$s',
 	'Class:DataFlow/Attribute:name' => '名称',
 	'Class:DataFlow/Attribute:name+' => '已传输的数据',
@@ -45,13 +45,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DataFlow/Attribute:destination_impact/Value:no' => '否',
 	'Class:DataFlow/Attribute:destination_impact/Value:no+' => '如果数据流停止，目标不受影响',
 	'Class:DataFlow/Attribute:dataflowtype_id' => '数据流类型',
-	'Class:DataFlow/Attribute:dataflowtype_id+' => 'Values defined in a typology of Data Flow Type~~',
-	'Class:DataFlow/Attribute:dataflowprotocol_id' => '数据流协议',
-	'Class:DataFlow/Attribute:dataflowprotocol_id+' => 'Values defined in a typology of Data Flow Protocol~~',
-	'Class:DataFlow/Attribute:documentation_url' => '文档链接',
-	'Class:DataFlow/Attribute:documentation_url+' => '数据流文档链接',
-	'Class:DataFlow/Attribute:last_change_date' => '最后修改日期',
-	'Class:DataFlow/Attribute:last_change_date+' => '数据流软件或配置的最后修改时间',
+	'Class:DataFlow/Attribute:dataflowtype_id+' => '数据流的分类',
 	'Class:DataFlow/Attribute:status' => '状态',
 	'Class:DataFlow/Attribute:status+' => '',
 	'Class:DataFlow/Attribute:status/Value:active' => '启用',
@@ -74,13 +68,24 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DataFlow/Attribute:execution_frequency/Value:yearly+' => '',
 	'Class:DataFlow/Attribute:documents_list+' => '例如: 技术规范, 操作手册等.',
 	'Class:DataFlow/Attribute:contacts_list+' => '例如: 数据流所有者, 技术支持等.',
-	'Class:DataFlow/Error:CheckSource' => '数据流的源头不能是数据流本身。请选择一个不同的源配置项，而不是 %1$s',
-	'Class:DataFlow/Error:CheckDestination' => '数据流的目标不能是数据流本身。请选择一个不同的目标配置项，而不是 %1$s',
+	'Class:DataFlow/Error:CheckSource' => 'The source of a data flow cannot be a data flow itself. Choose another source CI than %1$s~~',
+	'Class:DataFlow/Error:CheckDestination' => 'The destination of a data flow cannot be a data flow itself. Choose another destination CI than %1$s~~',
 
 	'Class:DataFlowType' => '数据流类型',
 	'Class:DataFlowType+' => '数据流的分类',
 
-	'Class:DataFlowProtocol' => '数据流协议',
-	'Class:DataFlowProtocol+' => '数据流协议的分类',
-
+/*
+	'Class:DataFlow/Attribute:source_id_friendlyname'             => 'source_id_friendlyname',
+	'Class:DataFlow/Attribute:source_id_friendlyname+'            => 'Full name',
+	'Class:DataFlow/Attribute:source_id_finalclass_recall'        => 'source_id->CI sub-class',
+	'Class:DataFlow/Attribute:source_id_finalclass_recall+'       => 'Name of the final class',
+	'Class:DataFlow/Attribute:source_id_obsolescence_flag'        => 'source_id->Obsolete',
+	'Class:DataFlow/Attribute:source_id_obsolescence_flag+'       => 'Computed dynamically on other attributes',
+	'Class:DataFlow/Attribute:destination_id_friendlyname'        => 'destination_id_friendlyname',
+	'Class:DataFlow/Attribute:destination_id_friendlyname+'       => 'Full name',
+	'Class:DataFlow/Attribute:destination_id_finalclass_recall'   => 'destination_id->CI sub-class',
+	'Class:DataFlow/Attribute:destination_id_finalclass_recall+'  => 'Name of the final class',
+	'Class:DataFlow/Attribute:destination_id_obsolescence_flag'   => 'destination_id->Obsolete',
+	'Class:DataFlow/Attribute:destination_id_obsolescence_flag+'  => 'Computed dynamically on other attributes',
+*/
 ]);

datamodels/2.x/itop-flow-map/module.itop-flow-map.php

@@ -31,8 +31,7 @@ SetupWebPage::AddModule(
 
 		],
 		'data.struct' => [
-			'data/data.itop-dataflowtype.xml',
-			'data/data.itop-dataflowprotocol.xml',
+			'data/data.itop-flow-map.en_us.xml',
 		],
 		'data.sample' => [
 			// add your sample data XML files here,

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

@@ -35,19 +35,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:Incident:Shortcuts+' => '',
 	'Menu:Incident:MyIncidents' => '分配给我的事件',
 	'Menu:Incident:MyIncidents+' => '分配给我的事件',
-	'Menu:Incident:MySupportIncidents' => '由我报告的事件',
-	'Menu:Incident:MySupportIncidents+' => '由我发起且尚未关闭的的事件',
+	'Menu:Incident:MySupportIncidents' => 'Reported by me~~',
+	'Menu:Incident:MySupportIncidents+' => 'Non closed incidents where I am the caller~~',
 	'Menu:Incident:EscalatedIncidents' => '已升级的事件',
-	'Menu:Incident:EscalatedIncidents+' => '',
-	'Menu:Incident:OpenIncidents' => '所有待处理的事件',
-	'Menu:Incident:OpenIncidents+' => '',
+	'Menu:Incident:EscalatedIncidents+' => '已升级的事件',
+	'Menu:Incident:OpenIncidents' => '所有打开的事件',
+	'Menu:Incident:OpenIncidents+' => '所有打开的事件',
 	'UI-IncidentManagementOverview-IncidentByPriority-last-14-days' => '最近两周的事件 (按优先级)',
 	'UI-IncidentManagementOverview-Last-14-days' => '最近两周的事件 (按数量)',
-	'UI-IncidentManagementOverview-OpenIncidentByStatus' => '待处理的事件 (按状态)',
-	'UI-IncidentManagementOverview-OpenIncidentByAgent' => '待处理的事件 (按办理人)',
-	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => '待处理的事件 (按客户)',
-	'Class:Incident/Method:UpdateChildTicketWith:public_log' => '<i><u>来自父级事件的公共日志 %2$s:</u></i><br><br>',
-	'Class:Incident/Method:UpdateChildTicketWith:private_log' => '<i>来自父级事件的私有日志 [[Incident:%1$s]]:</i><br><br>',
+	'UI-IncidentManagementOverview-OpenIncidentByStatus' => '打开的事件 (按状态)',
+	'UI-IncidentManagementOverview-OpenIncidentByAgent' => '打开的事件 (按办理人)',
+	'UI-IncidentManagementOverview-OpenIncidentByCustomer' => '打开的事件 (按客户)',
 ]);
 
 // Dictionnay conventions
@@ -247,5 +245,5 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 	'Class:Incident/Method:ResolveChildTickets' => '解决子工单',
 	'Class:Incident/Method:ResolveChildTickets+' => '递归解决子工单 (自动解决), 并调整相关字段与父级工单保持一致: 服务, 团队, 办理人, 解决方案',
-	'Tickets:Related:OpenIncidents' => '待处理的事件',
+	'Tickets:Related:OpenIncidents' => '打开的事件',
 ]);

datamodels/2.x/itop-knownerror-mgmt/dictionaries/zh_cn.dict.itop-knownerror-mgmt.php

@@ -55,27 +55,27 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:KnownError' => '已知错误',
 	'Class:KnownError+' => '记录一个已知错误',
 	'Class:KnownError/Attribute:name' => '名称',
-	'Class:KnownError/Attribute:name+' => '该名称将作为此组织内的已知问题的唯一标识符',
+	'Class:KnownError/Attribute:name+' => 'This is expected to be a unique identifier within the Known Errors of this organization~~',
 	'Class:KnownError/Attribute:org_id' => '客户',
-	'Class:KnownError/Attribute:org_id+' => '将已知问题关联至负责处理该问题的服务提供商. 若问题仅针对特定客户，则也可关联至对应的客户组织',
+	'Class:KnownError/Attribute:org_id+' => 'Link the known error to the service provider in charge of handling them, or maybe to a customer organization if the error is specific to them~~',
 	'Class:KnownError/Attribute:cust_name' => '客户名称',
 	'Class:KnownError/Attribute:cust_name+' => '',
 	'Class:KnownError/Attribute:problem_id' => '相关问题',
-	'Class:KnownError/Attribute:problem_id+' => '由于问题无法立即解决,于是才导致了这个已知错误的创建',
+	'Class:KnownError/Attribute:problem_id+' => 'The problem which couldn\'t be solved immediately and has led to the creation of this known error~~',
 	'Class:KnownError/Attribute:problem_ref' => '问题编号',
 	'Class:KnownError/Attribute:problem_ref+' => '',
 	'Class:KnownError/Attribute:symptom' => '现象',
-	'Class:KnownError/Attribute:symptom+' => '该错误的可见的影响是什么？',
+	'Class:KnownError/Attribute:symptom+' => 'What are the observable effects of this error?~~',
 	'Class:KnownError/Attribute:root_cause' => '问题根源',
-	'Class:KnownError/Attribute:root_cause+' => '该错误的底层原因是什么？',
+	'Class:KnownError/Attribute:root_cause+' => 'What is the underlying cause of this error?~~',
 	'Class:KnownError/Attribute:workaround' => '解决过程',
-	'Class:KnownError/Attribute:workaround+' => '如何规避该错误的影响直至找到适当的解决方案？',
+	'Class:KnownError/Attribute:workaround+' => 'How to bypass the effects of this error until a proper solution is found?~~',
 	'Class:KnownError/Attribute:solution' => '解决方案',
-	'Class:KnownError/Attribute:solution+' => '该错误的永久解决方案是什么？',
+	'Class:KnownError/Attribute:solution+' => 'What is the permanent solution for this error?~~',
 	'Class:KnownError/Attribute:error_code' => '错误编码',
-	'Class:KnownError/Attribute:error_code+' => '如果此已知错误关联到特定的错误编码，请在此指定',
+	'Class:KnownError/Attribute:error_code+' => 'If a specific error code is associated to this known error, specify it here~~',
 	'Class:KnownError/Attribute:domain' => '类型',
-	'Class:KnownError/Attribute:domain+' => '请选择该错误相关的技术领域',
+	'Class:KnownError/Attribute:domain+' => 'Choose the technical domain related to this known error?~~',
 	'Class:KnownError/Attribute:domain/Value:Application' => '应用',
 	'Class:KnownError/Attribute:domain/Value:Application+' => '',
 	'Class:KnownError/Attribute:domain/Value:Desktop' => '桌面',
@@ -85,15 +85,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:KnownError/Attribute:domain/Value:Server' => '服务器',
 	'Class:KnownError/Attribute:domain/Value:Server+' => '',
 	'Class:KnownError/Attribute:vendor' => '厂商',
-	'Class:KnownError/Attribute:vendor+' => '这个已知错误相关的厂商',
+	'Class:KnownError/Attribute:vendor+' => 'A free text field to identify the vendor of the CI(s) concerned by this known error~~',
 	'Class:KnownError/Attribute:model' => '型号',
-	'Class:KnownError/Attribute:model+' => '这个已知错误相关的配置项型号',
+	'Class:KnownError/Attribute:model+' => 'The model of the CI(s) concerned by this known error~~',
 	'Class:KnownError/Attribute:version' => '版本',
-	'Class:KnownError/Attribute:version+' => '这个已知错误相关的配置项版本',
+	'Class:KnownError/Attribute:version+' => 'The version of the CI(s) concerned by this known error~~',
 	'Class:KnownError/Attribute:ci_list' => '配置项',
-	'Class:KnownError/Attribute:ci_list+' => '这个已知错误相关的所有配置项',
+	'Class:KnownError/Attribute:ci_list+' => '此已知错误相关的所有配置项',
 	'Class:KnownError/Attribute:document_list' => '文档',
-	'Class:KnownError/Attribute:document_list+' => '这个已知错误相关的所有文档',
+	'Class:KnownError/Attribute:document_list+' => '此已知错误相关的所有文档',
 ]);
 
 //

datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php

@@ -38,27 +38,27 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:OAuthClient' => 'OAuth Mail Access~~',
 	'Class:OAuthClient/Attribute:provider' => '提供商',
-	'Class:OAuthClient/Attribute:provider+' => '',
+	'Class:OAuthClient/Attribute:provider+' => '~~',
 	'Class:OAuthClient/Attribute:name' => '登录',
-	'Class:OAuthClient/Attribute:name+' => '通常, 这里填您的邮箱地址',
+	'Class:OAuthClient/Attribute:name+' => 'In general, this is your email address~~',
 	'Class:OAuthClient/Attribute:status' => '状态',
 	'Class:OAuthClient/Attribute:status+' => '创建后, 通过 "生成访问令牌" 来使用此OAuth 客户端',
 	'Class:OAuthClient/Attribute:status/Value:active' => '已生成访问令牌',
 	'Class:OAuthClient/Attribute:status/Value:inactive' => '没有访问令牌',
-	'Class:OAuthClient/Attribute:description' => '描述',
-	'Class:OAuthClient/Attribute:description+' => '',
+	'Class:OAuthClient/Attribute:description' => '备注',
+	'Class:OAuthClient/Attribute:description+' => '~~',
 	'Class:OAuthClient/Attribute:client_id' => '客户端编号',
 	'Class:OAuthClient/Attribute:client_id+' => 'A long string of characters provided by your OAuth2 provider~~',
 	'Class:OAuthClient/Attribute:client_secret' => '客户端密码',
 	'Class:OAuthClient/Attribute:client_secret+' => 'Another long string of characters provided by your OAuth2 provider~~',
 	'Class:OAuthClient/Attribute:refresh_token' => '刷新令牌',
-	'Class:OAuthClient/Attribute:refresh_token+' => '',
+	'Class:OAuthClient/Attribute:refresh_token+' => '~~',
 	'Class:OAuthClient/Attribute:refresh_token_expiration' => '刷新令牌有效期',
-	'Class:OAuthClient/Attribute:refresh_token_expiration+' => '',
+	'Class:OAuthClient/Attribute:refresh_token_expiration+' => '~~',
 	'Class:OAuthClient/Attribute:token' => '访问令牌',
-	'Class:OAuthClient/Attribute:token+' => '',
+	'Class:OAuthClient/Attribute:token+' => '~~',
 	'Class:OAuthClient/Attribute:token_expiration' => '访问令牌有效期',
-	'Class:OAuthClient/Attribute:token_expiration+' => '',
+	'Class:OAuthClient/Attribute:token_expiration+' => '~~',
 	'Class:OAuthClient/Attribute:redirect_url' => 'Redirect url',
 	'Class:OAuthClient/Attribute:redirect_url+' => <<<EOF
 This url must be copied in the OAuth2 configuration of the provider
@@ -66,7 +66,7 @@ Erase the field to recalculate default value
 EOF
 ,
 	'Class:OAuthClient/Attribute:mailbox_list' => '邮箱列表',
-	'Class:OAuthClient/Attribute:mailbox_list+' => '',
+	'Class:OAuthClient/Attribute:mailbox_list+' => '~~',
 ]);
 
 //
@@ -79,22 +79,22 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:OAuthClientAzure/Attribute:scope' => '范围',
 	'Class:OAuthClientAzure/Attribute:scope+' => '通常情况下使用默认选择最合适',
 	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP' => 'SMTP',
-	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '',
+	'Class:OAuthClientAzure/Attribute:scope/Value:SMTP+' => '~~',
 	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP' => 'IMAP',
-	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '',
+	'Class:OAuthClientAzure/Attribute:scope/Value:IMAP+' => '~~',
 	'Class:OAuthClientAzure/Attribute:advanced_scope' => '高级范围',
 	'Class:OAuthClientAzure/Attribute:advanced_scope+' => '您在此输入的内容将优先于 "范围" 选择并导致其被忽略',
 	'Class:OAuthClientAzure/Attribute:used_scope' => '使用范围',
-	'Class:OAuthClientAzure/Attribute:used_scope+' => '',
-	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => '简单',
-	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '',
+	'Class:OAuthClientAzure/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple' => '精简',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:simple+' => '~~',
 	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced' => '高级',
-	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '',
-	'Class:OAuthClientAzure/Attribute:used_for_smtp' => '用于SMTP',
+	'Class:OAuthClientAzure/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientAzure/Attribute:used_for_smtp' => '使用于SMTP',
 	'Class:OAuthClientAzure/Attribute:used_for_smtp+' => '如果您需要系统使用其发送邮件, 则至少需要有一个OAuth客户端标记为 "是"',
 	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:yes' => '是',
 	'Class:OAuthClientAzure/Attribute:used_for_smtp/Value:no' => '否',
-	'Class:OAuthClientAzure/Attribute:tenant' => '租户',
+	'Class:OAuthClientAzure/Attribute:tenant' => 'Tenant~~',
 	'Class:OAuthClientAzure/Attribute:tenant+' => 'Tenant ID of the configured application. For multi-tenant application, use "common".~~',
 ]);
 
@@ -108,18 +108,18 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:OAuthClientGoogle/Attribute:scope' => '范围',
 	'Class:OAuthClientGoogle/Attribute:scope+' => '通常情况下使用默认选择最合适',
 	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP' => 'SMTP',
-	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:SMTP+' => '~~',
 	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP' => 'IMAP',
-	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '',
+	'Class:OAuthClientGoogle/Attribute:scope/Value:IMAP+' => '~~',
 	'Class:OAuthClientGoogle/Attribute:advanced_scope' => '高级范围',
 	'Class:OAuthClientGoogle/Attribute:advanced_scope+' => '您在此输入的内容将优先于 "范围" 选择并导致其被忽略',
 	'Class:OAuthClientGoogle/Attribute:used_scope' => '使用范围',
-	'Class:OAuthClientGoogle/Attribute:used_scope+' => '',
-	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => '简单',
-	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '',
+	'Class:OAuthClientGoogle/Attribute:used_scope+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple' => '精简',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:simple+' => '~~',
 	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced' => '高级',
-	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '',
-	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => '用于SMTP',
+	'Class:OAuthClientGoogle/Attribute:used_scope/Value:advanced+' => '~~',
+	'Class:OAuthClientGoogle/Attribute:used_for_smtp' => '使用与SMTP',
 	'Class:OAuthClientGoogle/Attribute:used_for_smtp+' => '如果您需要系统使用其发送邮件, 则至少需要有一个OAuth客户端标记为 "是"',
 	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:yes' => '是',
 	'Class:OAuthClientGoogle/Attribute:used_for_smtp/Value:no' => '否',

datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php

@@ -49,7 +49,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Portal:Datatables:Language:Info' => '第 _PAGE_ 页,共 _PAGES_ 页',
 	'Portal:Datatables:Language:InfoEmpty' => '没有信息',
 	'Portal:Datatables:Language:InfoFiltered' => '最多筛选 _MAX_ 项',
-	'Portal:Datatables:Language:EmptyTable' => '暂无数据',
+	'Portal:Datatables:Language:EmptyTable' => '表格中没有数据',
 	'Portal:Datatables:Language:DisplayLength:All' => '全部',
 	'Portal:Datatables:Language:Paginate:First' => '首页',
 	'Portal:Datatables:Language:Paginate:Previous' => '上一页',
@@ -106,14 +106,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Brick:Portal:Browse:Action:CreateObjectFromThis' => '新建 %1$s',
 	'Brick:Portal:Browse:Tree:ExpandAll' => '全部展开',
 	'Brick:Portal:Browse:Tree:CollapseAll' => '全部收起',
-	'Brick:Portal:Browse:Filter:NoData' => '没有数据',
+	'Brick:Portal:Browse:Filter:NoData' => '没有项目',
 	'Brick:Portal:Browse:Mosaic:Back' => '返回',
 ]);
 
 // ManageBrick brick
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Brick:Portal:Manage:Name' => '管理项目',
-	'Brick:Portal:Manage:Table:NoData' => '没有数据.',
+	'Brick:Portal:Manage:Table:NoData' => '没有项目.',
 	'Brick:Portal:Manage:Table:ItemActions' => '操作',
 	'Brick:Portal:Manage:DisplayMode:list' => '列表',
 	'Brick:Portal:Manage:DisplayMode:pie-chart' => '饼图',

datamodels/2.x/itop-portal-base/portal/templates/bricks/aggregate-page/layout.html.twig

@@ -10,7 +10,7 @@
             {% if aTilesRendering[brick.GetId] is defined %}
                 {{ aTilesRendering[brick.GetId]|raw }}
             {% else %}
-                {% include '' ~ brick.GetTemplatePath('tile') with {brick: brick} only %}
+                {% include '' ~ brick.GetTileTemplatePath with {brick: brick} only %}
             {% endif %}
         {% endfor %}
     </section>

datamodels/2.x/itop-portal/dictionaries/zh_cn.dict.itop-portal.php

@@ -41,9 +41,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Brick:Portal:OngoingRequests:Tab:OnGoing' => '正在处理',
 	'Brick:Portal:OngoingRequests:Tab:Resolved' => '已解决',
 	'Brick:Portal:ClosedRequests:Title' => '已关闭的工单',
-	'Brick:Portal:ListAllRequests:Title' => '所有需求',
-	'Brick:Portal:ListAllRequests:Title+' => '<p>查看所有需求，无论其状态如何.</p>',
-	'Brick:Portal:ListAllRequests:Tab' => '处理中和已关闭',
-	'Brick:Portal:SearchInAllRequests:Title' => '在所有需求中搜索',
-	'Brick:Portal:SearchInAllRequests:Title+' => '<p>不论其状态如何.</p>',
+	'Brick:Portal:ListAllRequests:Title' => 'All requests~~',
+	'Brick:Portal:ListAllRequests:Title+' => '<p>View all requests regardless of their status.</p>~~',
+	'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
+	'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
+	'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
 ]);

datamodels/2.x/itop-problem-mgmt/dictionaries/zh_cn.dict.itop-problem-mgmt.php

@@ -49,18 +49,18 @@
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:ProblemManagement' => '问题管理',
-	'Menu:ProblemManagement+' => '一种 ITIL 流程, 用于定位事故根本原因、记录已知错误与常见问题, 以此减轻服务台的工作量',
+	'Menu:ProblemManagement+' => 'An ITIL process that identifies root causes of incidents, documents Known Errors and FAQs, in order to reduce helpdesk workload~~',
 	'Menu:Problem:Overview' => '概况',
 	'Menu:Problem:Overview+' => '概况',
 	'Menu:NewProblem' => '新建问题',
-	'Menu:NewProblem+' => '创建新的问题工单',
+	'Menu:NewProblem+' => 'Create a new problem ticket~~',
 	'Menu:SearchProblems' => '搜索问题',
 	'Menu:SearchProblems+' => '搜索问题',
 	'Menu:Problem:Shortcuts' => '快捷方式',
-	'Menu:Problem:MyProblems' => '分配给我的问题',
-	'Menu:Problem:MyProblems+' => '分配给我且既未解决也未关闭的问题',
+	'Menu:Problem:MyProblems' => '我的问题',
+	'Menu:Problem:MyProblems+' => 'Problems assigned to me which are neither resolved nor closed~~',
 	'Menu:Problem:OpenProblems' => '所有打开的问题',
-	'Menu:Problem:OpenProblems+' => '所有尚未关闭的问题工单',
+	'Menu:Problem:OpenProblems+' => 'All problem tickets which are not closed~~',
 	'UI-ProblemManagementOverview-ProblemByService' => '按服务划分的问题',
 	'UI-ProblemManagementOverview-ProblemByService+' => '按服务划分的问题',
 	'UI-ProblemManagementOverview-ProblemByPriority' => '按优先级划分的问题',

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

@@ -23,7 +23,7 @@ Dict::Add('FR FR', 'French', 'Français', [
 	'Menu:NewUserRequest+' => 'Créer un nouveau ticket de demande utilisateur',
 	'Menu:SearchUserRequests' => 'Rechercher des demandes',
 	'Menu:SearchUserRequests+' => 'Rechercher parmi les demandes utilisateur',
-	'Menu:UserRequest:Shortcuts' => 'Demandes',
+	'Menu:UserRequest:Shortcuts' => 'Les Demandes',
 	'Menu:UserRequest:Shortcuts+' => '',
 	'Menu:UserRequest:MyRequests' => 'Qui me sont assignées',
 	'Menu:UserRequest:MyRequests+' => 'Demandes en cours pour lesquelles je suis l\'agent assigné',

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

@@ -8,37 +8,35 @@
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:RequestManagement' => '服务台',
 	'Menu:RequestManagement+' => '',
-	'Menu:RequestManagementProvider' => '服务台供应商',
+	'Menu:RequestManagementProvider' => '服务台提供者',
 	'Menu:RequestManagementProvider+' => '',
-	'Menu:UserRequest:Provider' => '转交给供应商的待处理的需求',
+	'Menu:UserRequest:Provider' => '转交给供应商的打开的需求',
 	'Menu:UserRequest:Provider+' => '',
 	'Menu:UserRequest:Overview' => '概况',
 	'Menu:UserRequest:Overview+' => '',
 	'Menu:NewUserRequest' => '新建需求',
 	'Menu:NewUserRequest+' => '新建需求工单',
 	'Menu:SearchUserRequests' => '搜索需求',
-	'Menu:SearchUserRequests+' => '搜索需求工单',
+	'Menu:SearchUserRequests+' => '搜索需求',
 	'Menu:UserRequest:Shortcuts' => '快捷方式',
 	'Menu:UserRequest:Shortcuts+' => '',
 	'Menu:UserRequest:MyRequests' => '分配给我的需求',
 	'Menu:UserRequest:MyRequests+' => '分配给我的需求 (作为办理人)',
 	'Menu:UserRequest:MySupportRequests' => '我办理的需求',
-	'Menu:UserRequest:MySupportRequests+' => '由我发起且未关闭的需求',
+	'Menu:UserRequest:MySupportRequests+' => 'Non closed requests where I am the caller~~',
 	'Menu:UserRequest:EscalatedRequests' => '已升级的需求',
-	'Menu:UserRequest:EscalatedRequests+' => '按状态或热门标识分类的已升级的需求',
-	'Menu:UserRequest:OpenRequests' => '所有待处理的需求',
-	'Menu:UserRequest:OpenRequests+' => '所有尚未关闭的需求',
+	'Menu:UserRequest:EscalatedRequests+' => 'Requests which are under escalation, by status or hot flag~~',
+	'Menu:UserRequest:OpenRequests' => '所有打开的需求',
+	'Menu:UserRequest:OpenRequests+' => 'All requests that are not closed~~',
 	'UI:WelcomeMenu:MyAssignedCalls' => '分配给我的需求',
 	'UI-RequestManagementOverview-RequestByType-last-14-days' => '最近两周的需求 (按类型)',
 	'UI-RequestManagementOverview-Last-14-days' => '最近两周的需求 (按数量)',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => '待处理的需求 (按状态)',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => '待处理的需求 (按办理人)',
-	'UI-RequestManagementOverview-OpenRequestByType' => '待处理的需求 (按类型)',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => '待处理的需求 (按客户)',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => '打开的需求 (按状态)',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => '打开的需求 (按办理人)',
+	'UI-RequestManagementOverview-OpenRequestByType' => '打开的需求 (按类型)',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => '打开的需求 (按客户)',
 	'Class:UserRequest:KnownErrorList' => '已知错误',
 	'Class:UserRequest:KnownErrorList+' => '和当前工单关联的功能配置项相关的已知错误',
-	'Class:UserRequest/Method:UpdateChildTicketWith:public_log' => '<i><u>自动复制来自父级需求的公共日志 %2$s:</u></i><br><br>',
-	'Class:UserRequest/Method:UpdateChildTicketWith:private_log' => '<i>自动复制来自父级需求的私有日志 [[UserRequest:%1$s]]:</i><br><br>',
 ]);
 
 // Dictionnay conventions
@@ -158,9 +156,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserRequest/Attribute:tto+' => '',
 	'Class:UserRequest/Attribute:ttr' => 'TTR',
 	'Class:UserRequest/Attribute:ttr+' => '',
-	'Class:UserRequest/Attribute:tto_time_spent' => 'TTO 耗时',
+	'Class:UserRequest/Attribute:tto_time_spent' => 'TTO time spent~~',
 	'Class:UserRequest/Attribute:tto_time_spent+' => '~~',
-	'Class:UserRequest/Attribute:ttr_time_spent' => 'TTR 耗时',
+	'Class:UserRequest/Attribute:ttr_time_spent' => 'TTR time spent~~',
 	'Class:UserRequest/Attribute:ttr_time_spent+' => '~~',
 	'Class:UserRequest/Attribute:tto_escalation_deadline' => 'TTO 截止日期',
 	'Class:UserRequest/Attribute:tto_escalation_deadline+' => '',

datamodels/2.x/itop-request-mgmt/dictionaries/zh_cn.dict.itop-request-mgmt.php

@@ -10,39 +10,37 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:RequestManagement+' => '',
 	'Menu:RequestManagementProvider' => '服务台供应商',
 	'Menu:RequestManagementProvider+' => '',
-	'Menu:UserRequest:Provider' => '转交给供应商的待处理的需求',
+	'Menu:UserRequest:Provider' => '转交给供应商的打开的需求',
 	'Menu:UserRequest:Provider+' => '',
 	'Menu:UserRequest:Overview' => '概况',
 	'Menu:UserRequest:Overview+' => '',
 	'Menu:NewUserRequest' => '新建需求',
 	'Menu:NewUserRequest+' => '新建需求工单',
 	'Menu:SearchUserRequests' => '搜索需求',
-	'Menu:SearchUserRequests+' => '搜索需求工单',
-	'Menu:UserRequest:Shortcuts' => '需求',
+	'Menu:SearchUserRequests+' => '搜索需求',
+	'Menu:UserRequest:Shortcuts' => '快捷方式',
 	'Menu:UserRequest:Shortcuts+' => '',
 	'Menu:UserRequest:MyRequests' => '分配给我的需求',
 	'Menu:UserRequest:MyRequests+' => '分配给我的需求 (作为办理人)',
-	'Menu:UserRequest:MySupportRequests' => '由我发起的需求',
-	'Menu:UserRequest:MySupportRequests+' => '由我发起且未关闭的需求',
+	'Menu:UserRequest:MySupportRequests' => '我办理的需求',
+	'Menu:UserRequest:MySupportRequests+' => 'Non closed requests where I am the caller~~',
 	'Menu:UserRequest:EscalatedRequests' => '已升级的需求',
-	'Menu:UserRequest:EscalatedRequests+' => '按状态或热门标识分类的已升级的需求',
-	'Menu:UserRequest:OpenRequests' => '待处理的需求',
-	'Menu:UserRequest:OpenRequests+' => '尚未关闭的需求',
+	'Menu:UserRequest:EscalatedRequests+' => 'Requests which are under escalation, by status or hot flag~~',
+	'Menu:UserRequest:OpenRequests' => '所有打开的需求',
+	'Menu:UserRequest:OpenRequests+' => 'All requests that are not closed~~',
 	'UI:WelcomeMenu:MyAssignedCalls' => '分配给我的需求',
 	'UI-RequestManagementOverview-RequestByType-last-14-days' => '最近两周的需求 (按类型)',
 	'UI-RequestManagementOverview-Last-14-days' => '最近两周的需求 (按数量)',
-	'UI-RequestManagementOverview-OpenRequestByStatus' => '待处理的需求 (按状态)',
-	'UI-RequestManagementOverview-OpenRequestByAgent' => '待处理的需求 (按办理人)',
-	'UI-RequestManagementOverview-OpenRequestByType' => '待处理的需求 (按类型)',
-	'UI-RequestManagementOverview-OpenRequestByCustomer' => '待处理的需求 (按客户)',
+	'UI-RequestManagementOverview-OpenRequestByStatus' => '打开的需求 (按状态)',
+	'UI-RequestManagementOverview-OpenRequestByAgent' => '打开的需求 (按办理人)',
+	'UI-RequestManagementOverview-OpenRequestByType' => '打开的需求 (按类型)',
+	'UI-RequestManagementOverview-OpenRequestByCustomer' => '打开的需求 (按客户)',
 	'Class:UserRequest:KnownErrorList' => '已知错误',
 	'Class:UserRequest:KnownErrorList+' => '和当前工单关联的功能配置项相关的已知错误',
 	'Menu:UserRequest:MyWorkOrders' => '分配给我的工作任务',
 	'Menu:UserRequest:MyWorkOrders+' => '分配给我的所有工单',
 	'Class:Problem:KnownProblemList' => '已知问题',
-	'Tickets:Related:OpenIncidents' => '待处理的事件',
-	'Class:UserRequest/Method:UpdateChildTicketWith:public_log' => '<i><u>自动复制来自父级需求的公共日志 %2$s:</u></i><br><br>',
-	'Class:UserRequest/Method:UpdateChildTicketWith:private_log' => '<i>自动复制来自父级需求的私有日志 [[UserRequest:%1$s]]:</i><br><br>',
+	'Tickets:Related:OpenIncidents' => '打开的事件',
 ]);
 
 // Dictionnay conventions
@@ -131,7 +129,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:UserRequest/Attribute:origin/Value:phone' => '电话',
 	'Class:UserRequest/Attribute:origin/Value:phone+' => '电话',
 	'Class:UserRequest/Attribute:origin/Value:portal' => '门户',
-	'Class:UserRequest/Attribute:origin/Value:portal+' => '在用户门户中创建的需求工单',
+	'Class:UserRequest/Attribute:origin/Value:portal+' => 'Request created on the user portal~~',
 	'Class:UserRequest/Attribute:approver_id' => '审核人',
 	'Class:UserRequest/Attribute:approver_id+' => '',
 	'Class:UserRequest/Attribute:approver_email' => '邮箱',
@@ -278,7 +276,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Portal:ListOpenProblems' => '处理中的问题',
 	'Portal:ShowProblem' => '问题',
 	'Portal:ShowFaqs' => 'FAQ',
-	'Portal:NoOpenProblem' => '没有待处理的问题',
+	'Portal:NoOpenProblem' => '没有打开的问题',
 	'Portal:SelectLanguage' => '更改您的语言',
 	'Portal:LanguageChangedTo_Lang' => '语言更改为',
 	'Portal:ChooseYourFavoriteLanguage' => '请选择您喜欢的语言',

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

@@ -40,26 +40,26 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:ServiceManagement+' => '服务管理概况',
 	'Menu:Service:Overview' => '概况',
 	'Menu:Service:Overview+' => '',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => '合同 (按服务级别)',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => '合同 (按服务等级)',
 	'UI-ServiceManagementMenu-ContractsByStatus' => '合同 (按状态)',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '近30天内截止的合同',
 
 	'Menu:ProviderContract' => '供应商合同',
-	'Menu:ProviderContract+' => '为外部公司采购',
+	'Menu:ProviderContract+' => '供应商合同',
 	'Menu:CustomerContract' => '客户合同',
-	'Menu:CustomerContract+' => '谁购买的服务',
+	'Menu:CustomerContract+' => '客户合同',
 	'Menu:ServiceSubcategory' => '子服务',
-	'Menu:ServiceSubcategory+' => '服务架构的最低层级',
+	'Menu:ServiceSubcategory+' => '子服务',
 	'Menu:Service' => '服务',
-	'Menu:Service+' => '服务架构的第二层级',
+	'Menu:Service+' => '服务',
 	'Menu:SLA' => 'SLA',
-	'Menu:SLA+' => '服务级别协议',
+	'Menu:SLA+' => '服务等级协议',
 	'Menu:SLT' => 'SLT',
-	'Menu:SLT+' => '服务级别目标',
+	'Menu:SLT+' => '服务等级目标',
 	'Menu:DeliveryModel' => '交付模式',
-	'Menu:DeliveryModel+' => '处理工单的团队',
+	'Menu:DeliveryModel+' => '交付模式',
 	'Menu:ServiceFamily' => '服务家族',
-	'Menu:ServiceFamily+' => '服务架构的最高层级',
+	'Menu:ServiceFamily+' => '服务家族',
 	'Menu:ServiceCatalog' => '服务清单',
 	'Menu:ServiceCatalog+' => '定义所有提供的服务',
 	'UI-ServiceCatalogMenu-Title' => '服务清单',
@@ -71,7 +71,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI-ServiceCatalogMenu-ContractByService' => '统计 服务/合同',
 	'UI-ServiceCatalogMenu-ContractBySLA' => '统计 SLA/合同',
 
-	'Contract:baseinfo' => '基本信息',
+	'Contract:baseinfo' => '常规信息',
 	'Contract:moreinfo' => '合同信息',
 	'Contract:cost' => '费用信息',
 ]);
@@ -140,15 +140,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Contract/Attribute:provider_name' => '供应商名称',
 	'Class:Contract/Attribute:provider_name+' => '',
 	'Class:Contract/Attribute:status' => '状态',
-	'Class:Contract/Attribute:status+' => '状态并非由起止日期自动计算, 必须手动设置.',
+	'Class:Contract/Attribute:status+' => '',
 	'Class:Contract/Attribute:status/Value:implementation' => '生效',
 	'Class:Contract/Attribute:status/Value:implementation+' => '生效',
 	'Class:Contract/Attribute:status/Value:obsolete' => '废弃',
 	'Class:Contract/Attribute:status/Value:obsolete+' => '废弃',
 	'Class:Contract/Attribute:status/Value:production' => '正式',
 	'Class:Contract/Attribute:status/Value:production+' => '正式',
-	'Class:Contract/Attribute:finalclass' => '合同子类',
-	'Class:Contract/Attribute:finalclass+' => '根本属性的名称',
+	'Class:Contract/Attribute:finalclass' => '合同类型',
+	'Class:Contract/Attribute:finalclass+' => '',
 ]);
 
 //
@@ -157,7 +157,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:CustomerContract' => '客户合同',
-	'Class:CustomerContract+' => '客户与供应商之间关于服务交付的协议，可选择包含承诺服务级别 (SLA, 窗口时间).',
+	'Class:CustomerContract+' => 'Agreement between a client and a provider for the delivery of services with an optional level of commitment (SLA, Coverage Window).~~',
 	'Class:CustomerContract/Attribute:services_list' => '服务',
 	'Class:CustomerContract/Attribute:services_list+' => '此合同包含的所有服务',
 	'Class:CustomerContract/Attribute:functionalcis_list' => '配置项',
@@ -172,13 +172,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ProviderContract' => '供应商合同',
-	'Class:ProviderContract+' => '外部供应商与内部组织之间的协议.',
+	'Class:ProviderContract+' => 'Agreement between an external provider and an internal organization.~~',
 	'Class:ProviderContract/Attribute:functionalcis_list' => '配置项',
 	'Class:ProviderContract/Attribute:functionalcis_list+' => '此合同包含的所有配置项',
 	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => '服务级别协议',
+	'Class:ProviderContract/Attribute:sla+' => '服务等级协议',
 	'Class:ProviderContract/Attribute:coverage' => '服务时间',
-	'Class:ProviderContract/Attribute:coverage+' => '合同覆盖的服务时间, 例如 24x7, 9x5 等.',
+	'Class:ProviderContract/Attribute:coverage+' => '',
 ]);
 
 //
@@ -187,7 +187,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkContactToContract' => '链接 联系人/合同',
-	'Class:lnkContactToContract+' => '管理客户或供应商合同中的关键联系人.',
+	'Class:lnkContactToContract+' => 'Manages key contacts on each Customer or Provider Contract.~~',
 	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => '合同',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
@@ -267,7 +267,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Service/Attribute:description' => '描述',
 	'Class:Service/Attribute:description+' => '',
 	'Class:Service/Attribute:servicefamily_id' => '服务家族',
-	'Class:Service/Attribute:servicefamily_id+' => '在用户门户中可见所必需',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => '服务家族名称',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:documents_list' => '文档',
@@ -343,7 +343,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ServiceSubcategory/Attribute:service_name' => '服务名称',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:status' => '状态',
-	'Class:ServiceSubcategory/Attribute:status+' => '子服务状态通常影响在用户门户的可见性',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => '生效',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '生效',
 	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => '废弃',
@@ -351,7 +351,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ServiceSubcategory/Attribute:status/Value:production' => '生产',
 	'Class:ServiceSubcategory/Attribute:status/Value:production+' => '生产',
 	'Class:ServiceSubcategory/Attribute:request_type' => '需求类型',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '定义工单类型(事件或服务需求)，当门户用户选择此服务子类时将创建的工单.',
+	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => '事件',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '事件',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => '服务需求',
@@ -366,7 +366,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '服务级别协议 (SLA) 适用于客户订阅的服务，并通过 SLT 进行衡量和考核.',
+	'Class:SLA+' => 'Service Level Agreement (SLA) 适用于客户订阅的服务，并通过 SLT 进行衡量和考核.',
 	'Class:SLA/Attribute:name' => '名称',
 	'Class:SLA/Attribute:name+' => '',
 	'Class:SLA/Attribute:description' => '描述',
@@ -376,7 +376,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SLA/Attribute:organization_name' => '组织名称',
 	'Class:SLA/Attribute:organization_name+' => '',
 	'Class:SLA/Attribute:slts_list' => 'SLT',
-	'Class:SLA/Attribute:slts_list+' => '此 SLA 包含的所有服务级别目标',
+	'Class:SLA/Attribute:slts_list+' => '此 SLA 包含的所有服务等级目标',
 	'Class:SLA/Attribute:customercontracts_list' => '客户合同',
 	'Class:SLA/Attribute:customercontracts_list+' => '使用此 SLA 的所有客户合同',
 	'Class:SLA/Error:UniqueLnkCustomerContractToService' => '不能保存客户合同 %1$s 于服务 %2$s 的关联: SLA 已存在',
@@ -388,11 +388,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '服务级别目标(SLT)位于服务级别协议(SLA)之下. 它定义了(TTO 或 TTR)指标的最大时限, 需求类型 (事件或服务需求) 和优先级.',
+	'Class:SLT+' => '服务水平目标位于服务水平协议(SLA)之下. 它定义了(TTO 或 TTR)指标的最大时限, 需求类型 (事件或服务需求) 和优先级.',
 	'Class:SLT/Attribute:name' => '名称',
 	'Class:SLT/Attribute:name+' => '',
 	'Class:SLT/Attribute:priority' => '优先级',
-	'Class:SLT/Attribute:priority+' => '此 SLT 适用的工单优先级。仅有此优先级的工单需遵守此 SLT 的要求.',
+	'Class:SLT/Attribute:priority+' => '',
 	'Class:SLT/Attribute:priority/Value:1' => '紧急',
 	'Class:SLT/Attribute:priority/Value:1+' => '紧急',
 	'Class:SLT/Attribute:priority/Value:2' => '高',
@@ -402,21 +402,21 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SLT/Attribute:priority/Value:4' => '低',
 	'Class:SLT/Attribute:priority/Value:4+' => '低',
 	'Class:SLT/Attribute:request_type' => '需求类型',
-	'Class:SLT/Attribute:request_type+' => '定义当用户选择此服务子类别时将创建的工单类型 (事件或服务需求).',
+	'Class:SLT/Attribute:request_type+' => '',
 	'Class:SLT/Attribute:request_type/Value:incident' => '事件',
 	'Class:SLT/Attribute:request_type/Value:incident+' => '事件',
 	'Class:SLT/Attribute:request_type/Value:service_request' => '服务需求',
 	'Class:SLT/Attribute:request_type/Value:service_request+' => '服务需求',
 	'Class:SLT/Attribute:metric' => '衡量指标',
-	'Class:SLT/Attribute:metric+' => '定义适用于此 SLT 的衡量指标, TTO (响应时间) 或 TTR (解决时限).',
+	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
 	'Class:SLT/Attribute:metric/Value:tto+' => '响应时间',
 	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
 	'Class:SLT/Attribute:metric/Value:ttr+' => '解决时限',
 	'Class:SLT/Attribute:value' => '值',
-	'Class:SLT/Attribute:value+' => '定义符合目标要求的最大延迟值, 在 "度量单位" 属性中定义.',
+	'Class:SLT/Attribute:value+' => '',
 	'Class:SLT/Attribute:unit' => '度量单位',
-	'Class:SLT/Attribute:unit+' => '时间的单位',
+	'Class:SLT/Attribute:unit+' => '',
 	'Class:SLT/Attribute:unit/Value:hours' => '小时',
 	'Class:SLT/Attribute:unit/Value:hours+' => '小时',
 	'Class:SLT/Attribute:unit/Value:minutes' => '分钟',
@@ -464,15 +464,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => '客户合同名称',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_id' => '服务',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '与该服务相关的所有子服务也均包含在本合同范围内',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_name' => '服务名称',
 	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
-	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '适用于此客户合同的服务级别协议. 该 SLA 也适用于与该服务相关的所有子服务.',
+	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA名称',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => '供应商',
-	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider~~',
+	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '~~',
 ]);
 
 //
@@ -528,7 +528,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DeliveryModel/Attribute:description' => '描述',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => '联系人',
-	'Class:DeliveryModel/Attribute:contacts_list+' => '必须至少有一个团队才能进行工单分配',
+	'Class:DeliveryModel/Attribute:contacts_list+' => '此交付模式的所有联系人 (包括团队和个体)',
 	'Class:DeliveryModel/Attribute:customers_list' => '客户',
 	'Class:DeliveryModel/Attribute:customers_list+' => '使用此交付模式的所有客户',
 ]);
@@ -560,10 +560,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkContactToContract/Attribute:customer_id' => '客户id',
-	'Class:lnkContactToContract/Attribute:customer_id+' => '',
-	'Class:lnkContactToContract/Attribute:provider_id' => '供应商id',
-	'Class:lnkContactToContract/Attribute:provider_id+' => '',
+	'Class:lnkContactToContract/Attribute:customer_id' => 'Customer id~~',
+	'Class:lnkContactToContract/Attribute:customer_id+' => '~~',
+	'Class:lnkContactToContract/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkContactToContract/Attribute:provider_id+' => '~~',
 ]);
 
 //
@@ -571,8 +571,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkContractToDocument/Attribute:customer_id' => '客户id',
-	'Class:lnkContractToDocument/Attribute:customer_id+' => '',
-	'Class:lnkContractToDocument/Attribute:provider_id' => '供应商id',
-	'Class:lnkContractToDocument/Attribute:provider_id+' => '',
+	'Class:lnkContractToDocument/Attribute:customer_id' => 'Customer id~~',
+	'Class:lnkContractToDocument/Attribute:customer_id+' => '~~',
+	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);

datamodels/2.x/itop-service-mgmt/dictionaries/zh_cn.dict.itop-service-mgmt.php

@@ -40,26 +40,26 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:ServiceManagement+' => '服务管理概况',
 	'Menu:Service:Overview' => '概况',
 	'Menu:Service:Overview+' => '',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => '合同 (按服务级别)',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => '合同 (按服务等级)',
 	'UI-ServiceManagementMenu-ContractsByStatus' => '合同 (按状态)',
 	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => '未来30天内截止的合同',
 
 	'Menu:ProviderContract' => '供应商合同',
-	'Menu:ProviderContract+' => '为外部公司采购',
+	'Menu:ProviderContract+' => '供应商合同',
 	'Menu:CustomerContract' => '客户合同',
-	'Menu:CustomerContract+' => '谁购买服务',
+	'Menu:CustomerContract+' => '客户合同',
 	'Menu:ServiceSubcategory' => '子服务',
-	'Menu:ServiceSubcategory+' => '服务架构中的最低层级',
+	'Menu:ServiceSubcategory+' => '子服务',
 	'Menu:Service' => '服务',
-	'Menu:Service+' => '服务架构中的第二层级',
+	'Menu:Service+' => '服务',
 	'Menu:SLA' => 'SLA',
-	'Menu:SLA+' => '服务级别协议',
+	'Menu:SLA+' => '服务等级协议',
 	'Menu:SLT' => 'SLT',
-	'Menu:SLT+' => '服务级别目标',
+	'Menu:SLT+' => '服务等级目标',
 	'Menu:DeliveryModel' => '交付模式',
-	'Menu:DeliveryModel+' => '处理工单的团队',
+	'Menu:DeliveryModel+' => '交付模式',
 	'Menu:ServiceFamily' => '服务家族',
-	'Menu:ServiceFamily+' => '服务架构的最高层级',
+	'Menu:ServiceFamily+' => '服务家族',
 	'Menu:ServiceCatalog' => '服务清单',
 	'Menu:ServiceCatalog+' => '定义可提供的服务',
 	'UI-ServiceCatalogMenu-Title' => '服务清单',
@@ -73,7 +73,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 	'Menu:Procedure' => '流程清单',
 	'Menu:Procedure+' => '所有流程清单',
-	'Contract:baseinfo' => '基本信息',
+	'Contract:baseinfo' => '常规信息',
 	'Contract:moreinfo' => '合同信息',
 	'Contract:cost' => '费用信息',
 ]);
@@ -138,19 +138,19 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Contract/Attribute:cost_unit' => '计费单位',
 	'Class:Contract/Attribute:cost_unit+' => '',
 	'Class:Contract/Attribute:provider_id' => '供应商',
-	'Class:Contract/Attribute:provider_id+' => '此合同的供应商组织, 可以与相关服务的供应商不同.',
+	'Class:Contract/Attribute:provider_id+' => '',
 	'Class:Contract/Attribute:provider_name' => '供应商名称',
 	'Class:Contract/Attribute:provider_name+' => '通用名称',
 	'Class:Contract/Attribute:status' => '状态',
-	'Class:Contract/Attribute:status+' => '状态并非根据起止日期自动计算, 必须手动设置.',
+	'Class:Contract/Attribute:status+' => '',
 	'Class:Contract/Attribute:status/Value:implementation' => '生效',
 	'Class:Contract/Attribute:status/Value:implementation+' => '生效',
 	'Class:Contract/Attribute:status/Value:obsolete' => '废弃',
 	'Class:Contract/Attribute:status/Value:obsolete+' => '废弃',
 	'Class:Contract/Attribute:status/Value:production' => '生产',
 	'Class:Contract/Attribute:status/Value:production+' => '生产',
-	'Class:Contract/Attribute:finalclass' => '合同子类型',
-	'Class:Contract/Attribute:finalclass+' => '根本属性的名称',
+	'Class:Contract/Attribute:finalclass' => '类型',
+	'Class:Contract/Attribute:finalclass+' => '',
 ]);
 //
 // Class: CustomerContract
@@ -158,7 +158,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:CustomerContract' => '客户合同',
-	'Class:CustomerContract+' => '客户与供应商之间关于服务交付的协议，可选择包含承诺服务级别 (SLA, 窗口时间).',
+	'Class:CustomerContract+' => 'Agreement between a client and a provider for the delivery of services with an optional level of commitment (SLA, Coverage Window).~~',
 	'Class:CustomerContract/Attribute:services_list' => '服务',
 	'Class:CustomerContract/Attribute:services_list+' => '此合同包含的所有服务',
 ]);
@@ -169,19 +169,19 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ProviderContract' => '供应商合同',
-	'Class:ProviderContract+' => '外部供应商与内部组织之间的协议.',
+	'Class:ProviderContract+' => 'Agreement between an external provider and an internal organization.~~',
 	'Class:ProviderContract/Attribute:functionalcis_list' => '配置项',
 	'Class:ProviderContract/Attribute:functionalcis_list+' => '此供应商合同包含的所有配置项',
 	'Class:ProviderContract/Attribute:sla' => 'SLA',
-	'Class:ProviderContract/Attribute:sla+' => '服务级别协议',
+	'Class:ProviderContract/Attribute:sla+' => '服务等级协议',
 	'Class:ProviderContract/Attribute:coverage' => '服务时间',
-	'Class:ProviderContract/Attribute:coverage+' => '合同覆盖的服务时间, 例如. 24x7, 9x5, 等.',
+	'Class:ProviderContract/Attribute:coverage+' => '',
 	'Class:ProviderContract/Attribute:contracttype_id' => '合同类型',
 	'Class:ProviderContract/Attribute:contracttype_id+' => '',
 	'Class:ProviderContract/Attribute:contracttype_name' => '合同类型名称',
 	'Class:ProviderContract/Attribute:contracttype_name+' => '',
 	'Class:ProviderContract/Attribute:services_list' => '服务',
-	'Class:ProviderContract/Attribute:services_list+' => '此供应商合同包含的所有服务',
+	'Class:ProviderContract/Attribute:services_list+' => 'All the services purchased with this contract~~',
 ]);
 
 //
@@ -190,7 +190,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkContactToContract' => '链接 联系人/合同',
-	'Class:lnkContactToContract+' => '管理每个客户或供应商合同的关键联系人.',
+	'Class:lnkContactToContract+' => 'Manages key contacts on each customer or provider contract.~~',
 	'Class:lnkContactToContract/Name' => '%1$s / %2$s',
 	'Class:lnkContactToContract/Attribute:contract_id' => '合同',
 	'Class:lnkContactToContract/Attribute:contract_id+' => '',
@@ -208,7 +208,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkContractToDocument' => '链接 合同/文档',
-	'Class:lnkContractToDocument+' => '此链接用于当某个文档适用于某个合同.',
+	'Class:lnkContractToDocument+' => 'Link used when a Document is applicable to a Contract.~~',
 	'Class:lnkContractToDocument/Name' => '%1$s / %2$s',
 	'Class:lnkContractToDocument/Attribute:contract_id' => '合同',
 	'Class:lnkContractToDocument/Attribute:contract_id+' => '',
@@ -250,7 +250,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Service/Attribute:organization_name' => '供应商名称',
 	'Class:Service/Attribute:organization_name+' => '',
 	'Class:Service/Attribute:servicefamily_id' => '服务家族',
-	'Class:Service/Attribute:servicefamily_id+' => '在用户门户中可见此服务所需的必要条件',
+	'Class:Service/Attribute:servicefamily_id+' => 'Required for this service to be visible on User Portal~~',
 	'Class:Service/Attribute:servicefamily_name' => '服务家族名称',
 	'Class:Service/Attribute:servicefamily_name+' => '',
 	'Class:Service/Attribute:description' => '描述',
@@ -332,13 +332,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ServiceSubcategory/Attribute:service_name' => '服务名称',
 	'Class:ServiceSubcategory/Attribute:service_name+' => '',
 	'Class:ServiceSubcategory/Attribute:request_type' => '需求类型',
-	'Class:ServiceSubcategory/Attribute:request_type+' => '定义工单类型(事件或服务需求)，当门户用户选择此服务子类时将创建的工单.',
+	'Class:ServiceSubcategory/Attribute:request_type+' => 'Define the type of Ticket (Incident or Service Request) that will be created when a Portal user selects this service subcategory.~~',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident' => '事件',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:incident+' => '事件',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request' => '服务需求',
 	'Class:ServiceSubcategory/Attribute:request_type/Value:service_request+' => '服务需求',
 	'Class:ServiceSubcategory/Attribute:status' => '状态',
-	'Class:ServiceSubcategory/Attribute:status+' => '子服务状态通常影响在用户门户的可见度',
+	'Class:ServiceSubcategory/Attribute:status+' => '',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation' => '生效',
 	'Class:ServiceSubcategory/Attribute:status/Value:implementation+' => '生效',
 	'Class:ServiceSubcategory/Attribute:status/Value:obsolete' => '废弃',
@@ -353,7 +353,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SLA' => 'SLA',
-	'Class:SLA+' => '服务级别协议(SLA)适用于客户订阅的服务，并通过 SLT 进行衡量和考核.',
+	'Class:SLA+' => 'Service Level Agreement (SLA) 适用于客户订阅的服务，并通过 SLT 进行衡量和考核.',
 	'Class:SLA/Attribute:name' => '名称',
 	'Class:SLA/Attribute:name+' => '',
 	'Class:SLA/Attribute:description' => '描述',
@@ -363,7 +363,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SLA/Attribute:organization_name' => '供应商名称',
 	'Class:SLA/Attribute:organization_name+' => '通用名称',
 	'Class:SLA/Attribute:slts_list' => 'SLT',
-	'Class:SLA/Attribute:slts_list+' => '此SLA包含的所有服务级别目标',
+	'Class:SLA/Attribute:slts_list+' => '此SLA包含的所有服务等级目标',
 	'Class:SLA/Attribute:customercontracts_list' => '客户合同',
 	'Class:SLA/Attribute:customercontracts_list+' => '使用此SLA的所有客户合同',
 	'Class:SLA/Error:UniqueLnkCustomerContractToService' => '无法保存客户合同%1$s与服务%2$s的链接: SLA已存在',
@@ -375,11 +375,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SLT' => 'SLT',
-	'Class:SLT+' => '服务级别目标(SLT)位于服务级别协议(SLA)之下. 它定义了(TTO 或 TTR)指标的最大时限, 需求类型 (事件或服务需求) 和优先级.',
+	'Class:SLT+' => '服务水平目标(SLT)位于服务水平协议(SLA)之下. 它定义了(TTO 或 TTR)指标的最大时限, 需求类型 (事件或服务需求) 和优先级.',
 	'Class:SLT/Attribute:name' => '名称',
 	'Class:SLT/Attribute:name+' => '',
 	'Class:SLT/Attribute:priority' => '优先级',
-	'Class:SLT/Attribute:priority+' => '此 SLT 适用的工单优先级。仅有此优先级的工单需遵守此 SLT 的要求.',
+	'Class:SLT/Attribute:priority+' => '',
 	'Class:SLT/Attribute:priority/Value:1' => '紧急',
 	'Class:SLT/Attribute:priority/Value:1+' => '紧急',
 	'Class:SLT/Attribute:priority/Value:2' => '高',
@@ -389,21 +389,21 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SLT/Attribute:priority/Value:4' => '低',
 	'Class:SLT/Attribute:priority/Value:4+' => '低',
 	'Class:SLT/Attribute:request_type' => '需求类型',
-	'Class:SLT/Attribute:request_type+' => '定义工单类型(事件或服务需求)，当门户用户选择此服务级别目标时将创建的工单.',
+	'Class:SLT/Attribute:request_type+' => '',
 	'Class:SLT/Attribute:request_type/Value:incident' => '事件',
 	'Class:SLT/Attribute:request_type/Value:incident+' => '事件',
 	'Class:SLT/Attribute:request_type/Value:service_request' => '服务需求',
 	'Class:SLT/Attribute:request_type/Value:service_request+' => '服务需求',
 	'Class:SLT/Attribute:metric' => '衡量指标',
-	'Class:SLT/Attribute:metric+' => '定义适用于此 SLT 的衡量指标, TTO (响应时间) 或 TTR (解决时限).',
+	'Class:SLT/Attribute:metric+' => '',
 	'Class:SLT/Attribute:metric/Value:tto' => 'TTO',
 	'Class:SLT/Attribute:metric/Value:tto+' => '响应时间',
 	'Class:SLT/Attribute:metric/Value:ttr' => 'TTR',
 	'Class:SLT/Attribute:metric/Value:ttr+' => '解决时限',
 	'Class:SLT/Attribute:value' => '值',
-	'Class:SLT/Attribute:value+' => '定义符合目标要求的最大延迟值, 在 "度量单位" 属性中定义。',
+	'Class:SLT/Attribute:value+' => '',
 	'Class:SLT/Attribute:unit' => '度量单位',
-	'Class:SLT/Attribute:unit+' => '时间的单位',
+	'Class:SLT/Attribute:unit+' => '',
 	'Class:SLT/Attribute:unit/Value:hours' => '小时',
 	'Class:SLT/Attribute:unit/Value:hours+' => '小时',
 	'Class:SLT/Attribute:unit/Value:minutes' => '分钟',
@@ -429,11 +429,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkSLAToSLT/Attribute:slt_name' => 'SLT名称',
 	'Class:lnkSLAToSLT/Attribute:slt_name+' => '',
 	'Class:lnkSLAToSLT/Attribute:slt_metric' => 'SLT指标',
-	'Class:lnkSLAToSLT/Attribute:slt_metric+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_metric+' => '~~',
 	'Class:lnkSLAToSLT/Attribute:slt_request_type' => 'SLT类别',
-	'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_request_type+' => '~~',
 	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority' => 'SLT工单优先级',
-	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '',
+	'Class:lnkSLAToSLT/Attribute:slt_ticket_priority+' => '~~',
 	'Class:lnkSLAToSLT/Attribute:slt_value' => 'SLT 值',
 	'Class:lnkSLAToSLT/Attribute:slt_value+' => '',
 	'Class:lnkSLAToSLT/Attribute:slt_value_unit' => 'SLT 单位',
@@ -453,14 +453,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name' => '客户合同名称',
 	'Class:lnkCustomerContractToService/Attribute:customercontract_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_id' => '服务',
-	'Class:lnkCustomerContractToService/Attribute:service_id+' => '与该服务相关的所有子服务也均包含在本合同范围内',
+	'Class:lnkCustomerContractToService/Attribute:service_id+' => '',
 	'Class:lnkCustomerContractToService/Attribute:service_name' => '服务名称',
 	'Class:lnkCustomerContractToService/Attribute:service_name+' => '',
 	'Class:lnkCustomerContractToService/Attribute:sla_id' => 'SLA',
 	'Class:lnkCustomerContractToService/Attribute:sla_id+' => '',
-	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA 名称',
+	'Class:lnkCustomerContractToService/Attribute:sla_name' => 'SLA名称',
 	'Class:lnkCustomerContractToService/Attribute:sla_name+' => '',
-	'Class:lnkCustomerContractToService/Attribute:provider_id' => '供应商id',
+	'Class:lnkCustomerContractToService/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkCustomerContractToService/Attribute:provider_id+' => '',
 ]);
 
@@ -480,7 +480,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkProviderContractToService/Attribute:providercontract_id+' => '',
 	'Class:lnkProviderContractToService/Attribute:providercontract_name' => '供应商合同名称',
 	'Class:lnkProviderContractToService/Attribute:providercontract_name+' => '',
-	'Class:lnkProviderContractToService/Attribute:provider_id' => '供应商id',
+	'Class:lnkProviderContractToService/Attribute:provider_id' => 'Provider id~~',
 	'Class:lnkProviderContractToService/Attribute:provider_id+' => '',
 ]);
 
@@ -493,15 +493,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:DeliveryModel+' => '交付模式指定了可以分配工单的团队;它必须在联系人选项卡中包含至少一个团队.
 每个客户组织都必须有定义好的交付模式.',
 	'Class:DeliveryModel/Attribute:name' => '名称',
-	'Class:DeliveryModel/Attribute:name+' => '别忘了给这个交付模式添加团队',
+	'Class:DeliveryModel/Attribute:name+' => 'Don\'t forget to add teams to this delivery model~~',
 	'Class:DeliveryModel/Attribute:org_id' => '组织',
-	'Class:DeliveryModel/Attribute:org_id+' => '通常是提供服务的那个组织',
+	'Class:DeliveryModel/Attribute:org_id+' => 'Usually the organization that provides the services~~',
 	'Class:DeliveryModel/Attribute:organization_name' => '组织名称',
 	'Class:DeliveryModel/Attribute:organization_name+' => '通用名称',
 	'Class:DeliveryModel/Attribute:description' => '描述',
 	'Class:DeliveryModel/Attribute:description+' => '',
 	'Class:DeliveryModel/Attribute:contacts_list' => '联系人',
-	'Class:DeliveryModel/Attribute:contacts_list+' => '必须至少有一个团队才能进行工单分配',
+	'Class:DeliveryModel/Attribute:contacts_list+' => '此交付模式相关的所有联系人 (包括团队和个体)',
 	'Class:DeliveryModel/Attribute:customers_list' => '客户',
 	'Class:DeliveryModel/Attribute:customers_list+' => '使用此交付模式的所有客户',
 ]);
@@ -512,7 +512,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:lnkDeliveryModelToContact' => '链接 交付模式/联系人',
-	'Class:lnkDeliveryModelToContact+' => '此链接指定了团队 (较少是个体) 在交付模式中的角色.',
+	'Class:lnkDeliveryModelToContact+' => 'This link specifies the role of a Team (more rarely a Person) within a Delivery Model.~~',
 	'Class:lnkDeliveryModelToContact/Name' => '%1$s / %2$s',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id' => '交付模式',
 	'Class:lnkDeliveryModelToContact/Attribute:deliverymodel_id+' => '',
@@ -533,10 +533,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkContactToContract/Attribute:customer_id' => '客户id',
-	'Class:lnkContactToContract/Attribute:customer_id+' => '',
-	'Class:lnkContactToContract/Attribute:provider_id' => '供应商id',
-	'Class:lnkContactToContract/Attribute:provider_id+' => '',
+	'Class:lnkContactToContract/Attribute:customer_id' => 'Customer id~~',
+	'Class:lnkContactToContract/Attribute:customer_id+' => '~~',
+	'Class:lnkContactToContract/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkContactToContract/Attribute:provider_id+' => '~~',
 ]);
 
 //
@@ -544,8 +544,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:lnkContractToDocument/Attribute:customer_id' => '客户id',
-	'Class:lnkContractToDocument/Attribute:customer_id+' => '',
-	'Class:lnkContractToDocument/Attribute:provider_id' => '供应商id',
-	'Class:lnkContractToDocument/Attribute:provider_id+' => '',
+	'Class:lnkContractToDocument/Attribute:customer_id' => 'Customer id~~',
+	'Class:lnkContractToDocument/Attribute:customer_id+' => '~~',
+	'Class:lnkContractToDocument/Attribute:provider_id' => 'Provider id~~',
+	'Class:lnkContractToDocument/Attribute:provider_id+' => '~~',
 ]);

datamodels/2.x/itop-storage-mgmt/dictionaries/zh_cn.dict.itop-storage-mgmt.php

@@ -31,9 +31,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:NASFileSystem/Attribute:org_id' => '组织id',
+	'Class:NASFileSystem/Attribute:org_id' => '组织 ID',
 	'Class:NASFileSystem/Attribute:org_id+' => '',
-	'Class:NASFileSystem/Attribute:location_id' => '位置id',
+	'Class:NASFileSystem/Attribute:location_id' => '位置 ID',
 	'Class:NASFileSystem/Attribute:location_id+' => '',
 	'Class:NASFileSystem/Attribute:location_name' => '位置名称',
 	'Class:NASFileSystem/Attribute:location_name+' => '',
@@ -45,9 +45,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:FiberChannelInterface/Name' => '%2$s %1$s',
-	'Class:FiberChannelInterface/Attribute:org_id' => '组织id',
+	'Class:FiberChannelInterface/Attribute:org_id' => '组织 ID',
 	'Class:FiberChannelInterface/Attribute:org_id+' => '',
-	'Class:FiberChannelInterface/Attribute:location_id' => '位置id',
+	'Class:FiberChannelInterface/Attribute:location_id' => '位置 ID',
 	'Class:FiberChannelInterface/Attribute:location_id+' => '',
 ]);
 
@@ -56,9 +56,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:LogicalVolume/Attribute:org_id' => '组织id',
+	'Class:LogicalVolume/Attribute:org_id' => '组织 ID',
 	'Class:LogicalVolume/Attribute:org_id+' => '',
-	'Class:LogicalVolume/Attribute:location_id' => '位置id',
+	'Class:LogicalVolume/Attribute:location_id' => '位置 ID',
 	'Class:LogicalVolume/Attribute:location_id+' => '',
 	'Class:LogicalVolume/Attribute:location_name' => '位置名称',
 	'Class:LogicalVolume/Attribute:location_name+' => '',

datamodels/2.x/itop-structure/dictionaries/zh_cn.dict.itop-structure.php

@@ -69,7 +69,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Organization/Attribute:deliverymodel_name+' => '',
 	'Class:Organization/Attribute:parent_id_friendlyname' => '上级组织',
 	'Class:Organization/Attribute:parent_id_friendlyname+' => '上级组织',
-	'Class:Organization/Attribute:overview' => '概况',
+	'Class:Organization/Attribute:overview' => '概览',
 	'Organization:Overview:FunctionalCIs' => '此组织的所有配置项',
 	'Organization:Overview:FunctionalCIs:subtitle' => '按类型',
 	'Organization:Overview:Users' => '此组织里所有的'.ITOP_APPLICATION_SHORT.'用户',
@@ -80,8 +80,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:Location' => '位置',
-	'Class:Location+' => '任何类型的位置: 区域, 国家, 城市, 位置, 建筑, 楼层, 房间, 机架,...',
+	'Class:Location' => '地点',
+	'Class:Location+' => '任何类型的地点: 区域, 国家, 城市, 位置, 建筑, 楼层, 房间, 机架,...',
 	'Class:Location/Attribute:name' => '名称',
 	'Class:Location/Attribute:name+' => '',
 	'Class:Location/Attribute:status' => '状态',
@@ -163,13 +163,13 @@ Other usage: the caller of a User request is a Person as well as the agent assig
 	'Class:Person/Attribute:employee_number+' => '',
 	'Class:Person/Attribute:mobile_phone' => '手机',
 	'Class:Person/Attribute:mobile_phone+' => '',
-	'Class:Person/Attribute:location_id' => '位置',
+	'Class:Person/Attribute:location_id' => '地点',
 	'Class:Person/Attribute:location_id+' => '',
 	'Class:Person/Attribute:location_name' => '名称',
 	'Class:Person/Attribute:location_name+' => '',
-	'Class:Person/Attribute:manager_id' => '经理',
+	'Class:Person/Attribute:manager_id' => '直属上级',
 	'Class:Person/Attribute:manager_id+' => '',
-	'Class:Person/Attribute:manager_name' => '经理名称',
+	'Class:Person/Attribute:manager_name' => '名称',
 	'Class:Person/Attribute:manager_name+' => '',
 	'Class:Person/Attribute:team_list' => '团队',
 	'Class:Person/Attribute:team_list+' => '这个体归属的所有团队',
@@ -178,7 +178,7 @@ Other usage: the caller of a User request is a Person as well as the agent assig
 	'Class:Person/Attribute:tickets_list/UI:Links:Create:Modal:Title' => 'Create a %4$s for %2$s~~',
 	'Class:Person/Attribute:user_list' => '用户',
 	'Class:Person/Attribute:user_list+' => '此个体相关的所有用户',
-	'Class:Person/Attribute:manager_id_friendlyname' => '经理昵称',
+	'Class:Person/Attribute:manager_id_friendlyname' => '直属上级姓名',
 	'Class:Person/Attribute:manager_id_friendlyname+' => '',
 	'Class:Person/Attribute:picture' => '头像',
 	'Class:Person/Attribute:picture+' => '',
@@ -199,7 +199,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Team/ComplementaryName' => '%1$s - %2$s',
 	'Class:Team/Attribute:persons_list' => '成员',
 	'Class:Team/Attribute:persons_list+' => '此团队包含的所有成员',
-	'Class:Team/Attribute:overview' => '概况',
+	'Class:Team/Attribute:overview' => '概览',
 	'Team:Overview' => '此团队管理的工单和配置项',
 	'Team:Overview:ActiveTickets' => '活跃的工单',
 	'Team:Overview:FunctionalCIs-ByType' => '功能配置项',
@@ -352,8 +352,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:ConfigManagement+' => '配置管理',
 	'Menu:ConfigManagementCI' => '配置项',
 	'Menu:ConfigManagementCI+' => '配置项',
-	'Menu:ConfigManagementOverview' => '概况',
-	'Menu:ConfigManagementOverview+' => '概况',
+	'Menu:ConfigManagementOverview' => '概览',
+	'Menu:ConfigManagementOverview+' => '概览',
 	'Menu:Contact' => '联系人',
 	'Menu:Contact+' => '联系人',
 	'Menu:Contact:Count' => '%1$d 个联系人',
@@ -363,7 +363,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:Team+' => '所有团队',
 	'Menu:Document' => '文档',
 	'Menu:Document+' => '所有文档',
-	'Menu:Location' => '位置',
+	'Menu:Location' => '地点',
 	'Menu:Location+' => '所有位置',
 	'Menu:NewContact' => '新建联系人',
 	'Menu:NewContact+' => '新建联系人',

datamodels/2.x/itop-virtualization-mgmt/dictionaries/zh_cn.dict.itop-virtualization-mgmt.php

@@ -40,7 +40,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Cloud/Name' => '%1$s',
 	'Class:Cloud/ComplementaryName' => '%1$s-%2$s',
 	'Class:Cloud' => '云平台',
-	'Class:Cloud+' => '由云供应商运营的虚拟化主机. 它可以托管虚拟机和容器化主机.',
+	'Class:Cloud+' => '由云供应商运营的虚拟化主机. 它可以托管虚拟机和容器宿主机.',
 	'Class:Cloud/Attribute:provider_id' => '供应商',
 	'Class:Cloud/Attribute:logo' => 'Logo',
 	'Class:Cloud/Attribute:logo+' => '在影响分析图中显示此云平台时用作对象图标',

datamodels/2.x/itop-welcome-itil/dictionaries/zh_cn.dict.itop-welcome-itil.php

@@ -4,7 +4,7 @@
  * Localized data
  *
  * @copyright Copyright (C) 2010-2024 Combodo SAS
- * @license    https://opensource.org/licenses/AGPL-3.0
+ * @license    http://opensource.org/licenses/AGPL-3.0
  *
  * This file is part of iTop.
  *

dictionaries/core/uniqueness-rule/en_gb.dictionary.itop.uniqueness-rule.php

@@ -4,7 +4,7 @@
  * Localized data
  *
  * @copyright Copyright (C) 2024 Combodo SAS
- * @license    https://opensource.org/licenses/AGPL-3.0
+ * @license    http://opensource.org/licenses/AGPL-3.0
  *
  * This file is part of iTop.
  *

dictionaries/cs.dictionary.itop.core.php

@@ -976,38 +976,39 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Poslední varování',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Datum vytvoření',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Datum poslední úpravy',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Uživatelské předvolby',
 	'Class:appUserPreferences/Attribute:userid' => 'Uživatel',
 	'Class:appUserPreferences/Attribute:preferences' => 'Předvolby',

dictionaries/da.dictionary.itop.core.php

@@ -975,39 +975,39 @@ Dict::Add('DA DA', 'Danish', 'Dansk', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Advarsler',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Oprettelses Dato',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Sidste Ændrings Dato',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Bruger Indstillinger',
 	'Class:appUserPreferences/Attribute:userid' => 'Bruger',
 	'Class:appUserPreferences/Attribute:preferences' => 'Inst.',

dictionaries/de.dictionary.itop.core.php

@@ -972,39 +972,39 @@ Dict::Add('DE DE', 'German', 'Deutsch', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Letzte Warnung',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Erzeugungs-Datum',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Datum der letzten Modifikation',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Benutzer-Voreinstellungen',
 	'Class:appUserPreferences/Attribute:userid' => 'Benutzer',
 	'Class:appUserPreferences/Attribute:preferences' => 'Voreinstellungen',

dictionaries/en.dictionary.itop.core.php

@@ -1075,38 +1075,39 @@ The hyperlink is displayed in the tooltip appearing on the “Lock” symbol of
 	'Class:SynchroReplica/Attribute:status_last_warning'                => 'Warnings',
 	'Class:SynchroReplica/Attribute:info_creation_date'                 => 'Creation Date',
 	'Class:SynchroReplica/Attribute:info_last_modified'                 => 'Last Modified Date',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica',
 
 	'Class:appUserPreferences'                       => 'User Preferences',
 	'Class:appUserPreferences/Attribute:userid'      => 'User',

dictionaries/en_gb.dictionary.itop.core.php

@@ -1058,38 +1058,39 @@ The hyperlink is displayed in the tooltip appearing on the “Lock” symbol of
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Warnings',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Creation Date',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Last Modified Date',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'User Preferences',
 	'Class:appUserPreferences/Attribute:userid' => 'User',
 	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',

dictionaries/es_cr.dictionary.itop.core.php

@@ -963,39 +963,39 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Advertencias',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Fecha de Creación',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Fecha Última Modificación',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Preferencias de Usuario',
 	'Class:appUserPreferences/Attribute:userid' => 'Usuario',
 	'Class:appUserPreferences/Attribute:preferences' => 'Preferencias',

dictionaries/fr.dictionary.itop.core.php

@@ -1021,38 +1021,38 @@ Plusieurs champs peuvent ainsi être modifiés lors d\'une "mise à jour" en app
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Avertissements',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Date de création',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Date de dernière modification',
-	'Class:SynchroReplica/Action:delete+' => 'Supprime le réplica sans détruire l\'objet destination. Si la ligne correspondant à ce replica est toujours présente dans la source celui-ci sera recréé lors du prochain import de la Source de données.',
-	'Class:SynchroReplica/Action:unlink' => 'Détacher',
-	'Class:SynchroReplica/Action:unlink+' => 'Détache le réplica de son objet destination, sans toucher à ce dernier. Le réplica sera traité lors de la prochaine synchronisation de la Source de données. Vous pouvez forcer l\'opération via "Synchroniser".',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Détacher & Synchroniser',
-	'Class:SynchroReplica/Action:unlinksynchro+'  => 'Détache l\'actuel objet destination et force la resynchronisation immédiate du réplica. Cela peut modifier le champ "Objet destination" ou remettre le même. Cette action est requise si la logique de réconciliation a été changée dans la Source des données, ou si des champs de réconciliation n\'avaient pas verrouillé leur modification et que l\'on souhaite conserver les objets iTop modifiés depuis, tout en retrouvant ou recréant des objets alignés avec la source.',
+	'Class:SynchroReplica/Action:delete+' => 'Supprimer le réplica',
+	'Class:SynchroReplica/Action:unlink' => 'Délier',
+	'Class:SynchroReplica/Action:unlink+' => 'Séparer le réplica de son objet lié',
+	'Class:SynchroReplica/Action:unlinksynchro'  => 'Délier & Synchroniser',
+	'Class:SynchroReplica/Action:unlinksynchro+'  => 'Délier le réplica avec son objet cible et executer la synchronisation sur ce réplica',
 	'Class:SynchroReplica/Action:synchro' => 'Synchroniser',
-	'Class:SynchroReplica/Action:synchro+'  => 'Force la synchronisation immédiate du réplica. Utile si on a ajouté un champ à mettre à jour dans la Source des données ou si des champs n\'avaient pas verrouillé leur modification et que l\'on souhaite réaligner les objets iTop avec la source.',
-	'Class:SynchroReplica/Action:allowdelete' => 'Autoriser la suppression de l\'objet lié',
-	'Class:SynchroReplica/Action:allowdelete+' => 'Autorise la suppression du Réplica à entrainer celle de l\'objet destination, si la politique de suppression de la Source de données le demande.',
-	'Class:SynchroReplica/Action:denydelete' => 'Interdire la suppression de l\'objet lié',
-	'Class:SynchroReplica/Action:denydelete+' =>  'Interdit que la suppression du Réplica entraine celle de l\'objet destination, même si la politique de suppression de la Source de données le demande.',
+	'Class:SynchroReplica/Action:synchro+'  => 'Exécuter la synchronisation sur ce réplica',
+	'Class:SynchroReplica/Action:allowdelete' => 'Permettre la suppression de l\'objet lié à ce réplica',
+	'Class:SynchroReplica/Action:allowdelete+' => 'L\'objet lié à un réplica supprimé est supprimé',
+	'Class:SynchroReplica/Action:denydelete' => 'Interdire la suppression de l\objet lié à ce réplica',
+	'Class:SynchroReplica/Action:denydelete+' =>  'L\'objet lié à un réplica supprimé n\'est pas supprimé',
 
-	'Class:SynchroReplica/Action:unlink_all' => 'Détacher les réplicas',
-	'Class:SynchroReplica/Action:unlink_all+' => 'Détache les réplicas de leur objet destination, sans toucher à ces derniers. Ces réplicas seront traités lors de la prochaine synchronisation de la Source de données. Vous pouvez forcer l\'opération via "Synchroniser".',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Détacher & Resynchroniser les réplicas',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Détache les réplicas de leur objet destination et force leur resynchronisation immédiate. Cette action est requise si la logique de réconciliation a été changée dans la Source des données, ou si des champs de réconciliation n\'avaient pas verrouillé leur modification et que l\'on souhaite conserver les objets iTop modifiés depuis, tout en retrouvant ou recréant des objets alignés avec la source.',
-	'Class:SynchroReplica/Action:synchro_all' => 'Synchroniser les réplicas',
-	'Class:SynchroReplica/Action:synchro_all+' => 'Force la synchronisation immédiate des réplicas. Utile si on a ajouté un champ à mettre à jour dans la Source des données ou si des champs n\'avaient pas verrouillé leur modification et que l\'on souhaite réaligner les objets iTop avec la source.',
-	'Class:SynchroReplica/Action:allowdelete_all' => 'Autoriser la suppression des objets liés',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Autorise la suppression du Réplica à entrainer celle de l\'objet destination, si la politique de suppression de la Source de données le demande.',
-	'Class:SynchroReplica/Action:denydelete_all' => 'Interdire la suppression des objets liés',
-	'Class:SynchroReplica/Action:denydelete_all+' => 'Interdit que la suppression du Réplica entraine celle de l\'objet destination, même si la politique de suppression de la Source de données le demande.',
+	'Class:SynchroReplica/Action:unlink_all' => 'Délier les réplicas et les objets',
+	'Class:SynchroReplica/Action:unlink_all+' => 'Séparer les réplicas de leurs objets liés',
+	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Délier & Synchroniser les réplicas et les objets',
+	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Séparer les réplicas le leurs objets cilbles et exécuter la synchronisation sur les réplicas',
+	'Class:SynchroReplica/Action:synchro_all' => 'Synchroniser les objets Réplica',
+	'Class:SynchroReplica/Action:synchro_all+' => 'Exécuter la synchronisation avec ces réplicas',
+	'Class:SynchroReplica/Action:allowdelete_all' => 'Autoriser la suppression des objets liés aux Réplicas',
+	'Class:SynchroReplica/Action:allowdelete_all+' => 'L\'objet lié à un réplica supprimé est supprimé',
+	'Class:SynchroReplica/Action:denydelete_all' => 'Interdire la suppression des objets liés aux Réplicas',
+	'Class:SynchroReplica/Action:denydelete_all+' => 'L\'objet lié à un réplica supprimé n\'est pas supprimé',
 
-	'UI:UnlinkAllTabTitle' => 'Détacher les réplicas',
-	'UI:UnlinkAllPageTitle' => 'Détache les réplicas de leur objet destination',
-	'UI:UnlinkSynchroAllTabTitle' => 'Détacher & Resynchroniser les réplicas',
-	'UI:UnlinkSynchroAllPageTitle' => 'Détacher les réplicas de leur objet destination et forcer leur resynchronisation',
-	'UI:SynchroAllTabTitle' => 'Synchroniser les réplicas',
-	'UI:SynchroAllPageTitle' => 'Synchroniser maintenant les réplicas',
-	'UI:AllowDeleteAllTabTitle' => 'Autoriser la suppression',
+	'UI:UnlinkAllTabTitle' => 'Délier les réplicas des objets',
+	'UI:UnlinkAllPageTitle' => 'Séparer les réplicas de leurs objets liés',
+	'UI:UnlinkSynchroAllTabTitle' => 'Délier & synchroniser les réplicas',
+	'UI:UnlinkSynchroAllPageTitle' => 'Délier & synchroniser les réplicas ',
+	'UI:SynchroAllTabTitle' => 'Synchroniser les réplica',
+	'UI:SynchroAllPageTitle' => 'Synchroniser les réplica',
+	'UI:AllowDeleteAllTabTitle' => 'Autoriser la suppression des objets liés aux réplicas',
 	'UI:AllowDeleteAllPageTitle' => 'Autoriser la suppression des objets liés aux réplicas',
-	'UI:DenyDeleteAllTabTitle' => 'Interdire la suppression',
+	'UI:DenyDeleteAllTabTitle' => 'Interdire la suppression des objets liés aux réplicas',
 	'UI:DenyDeleteAllPageTitle' => 'Interdire la suppression des objets liés aux réplicas',
 
 	'Class:appUserPreferences' => 'Préférences utilisateur',

dictionaries/hu.dictionary.itop.core.php

@@ -970,38 +970,39 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Figyelmeztetések',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Létrehozás dátuma',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Utolsó módosítás dátuma',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Felhasználói beállítások',
 	'Class:appUserPreferences/Attribute:userid' => 'Felhasználónév',
 	'Class:appUserPreferences/Attribute:preferences' => 'Beállítások',

dictionaries/it.dictionary.itop.core.php

@@ -970,38 +970,39 @@ Dict::Add('IT IT', 'Italian', 'Italiano', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Avvisi',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data di creazione',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Data di ultima modifica',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Preferenze utente',
 	'Class:appUserPreferences/Attribute:userid' => 'Utente',
 	'Class:appUserPreferences/Attribute:preferences' => 'Prefs',

dictionaries/ja.dictionary.itop.core.php

@@ -974,38 +974,39 @@ Dict::Add('JA JP', 'Japanese', '日本語', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => '警告',
 	'Class:SynchroReplica/Attribute:info_creation_date' => '作成日',
 	'Class:SynchroReplica/Attribute:info_last_modified' => '最終修正日',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'ユーザプリファレンス',
 	'Class:appUserPreferences/Attribute:userid' => 'ユーザ',
 	'Class:appUserPreferences/Attribute:preferences' => 'プリファレンス',

dictionaries/nl.dictionary.itop.core.php

@@ -972,38 +972,39 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Waarschuwingen',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Datum van aanmaken',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Datum van de laatste aanpassing',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Gebruikersvoorkeuren',
 	'Class:appUserPreferences/Attribute:userid' => 'Gebruiker',
 	'Class:appUserPreferences/Attribute:preferences' => 'Voorkeuren',

dictionaries/pl.dictionary.itop.core.php

@@ -969,38 +969,39 @@ Dict::Add('PL PL', 'Polish', 'Polski', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Ostrzeżenia',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data utworzenia',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Data ostatniej zmiany',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Preferencje użytkownika',
 	'Class:appUserPreferences/Attribute:userid' => 'Użytkownik',
 	'Class:appUserPreferences/Attribute:preferences' => 'Preferencje',

dictionaries/pt_br.dictionary.itop.core.php

@@ -970,38 +970,39 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Alertas',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Data de criação',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Última data modificação',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Preferências de usuário',
 	'Class:appUserPreferences/Attribute:userid' => 'Usuário',
 	'Class:appUserPreferences/Attribute:preferences' => 'Preferências',

dictionaries/sk.dictionary.itop.core.php

@@ -993,39 +993,39 @@ The hyperlink is displayed in the tooltip appearing on the “Lock” symbol of
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Upozornenia',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Dátum vytvorenia',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Dátum poslednej úpravy',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Užívateľské preferencie',
 	'Class:appUserPreferences/Attribute:userid' => 'Užívateľ',
 	'Class:appUserPreferences/Attribute:preferences' => 'Preferencie',

dictionaries/tr.dictionary.itop.core.php

@@ -975,39 +975,39 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => 'Uyarılar',
 	'Class:SynchroReplica/Attribute:info_creation_date' => 'Yaratılış Tarihi',
 	'Class:SynchroReplica/Attribute:info_last_modified' => 'Son değiştirilme tarih',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 	'Class:appUserPreferences' => 'Kullanıcı Tercihleri',
 	'Class:appUserPreferences/Attribute:userid' => 'Kullanıcı',
 	'Class:appUserPreferences/Attribute:preferences' => 'Tercihler',

dictionaries/ui/application/bulk/zh_cn.dictionary.itop.bulk.php

@@ -23,8 +23,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Bulk:modify:IncompatibleAttribute' => '此属性无法在批量操作中编辑',
 	'UI:Bulk:Export:MaliciousInjection:Alert:Title' => 'Excel 安全警告',
 	'UI:Bulk:Export:MaliciousInjection:Alert:Message' => '在 Microsoft Excel 中打开不信任的文件可能导致公式注入. 请确保 Excel 设置能够安全的处理该文件. <a href="%1$s" target="_blank">进入我们的文档了解更多.</a>',
-	'UI:Bulk:Export:MaliciousInjection:Sanitization:Alert:Message' => '部分数据已进行脱敏处理以规避 Microsoft Excel 中可能的潜在安全问题. <a href="%1$s" target="_blank">进入我们的文档了解更多.</a>',
-	'UI:Bulk:Export:MaliciousInjection:Input:Label' => '对危险数据进行脱敏',
-	'UI:Bulk:Export:MaliciousInjection:Input:Tooltip' => '当启用时, 导出过程中会对危险数据进行脱敏. 这样做可以阻止 Microsoft Excel 把它们当作公式. 请注意，该操作可能会在原始数据前添加单引号(\')作为前缀，以此确保数据被正确识别为文本格式.',
-	'Core:BulkExport:Security' => '安全',
+	'UI:Bulk:Export:MaliciousInjection:Sanitization:Alert:Message' => 'Some values have been sanitized to prevent potential security issues in Microsoft Excel. <a href="%1$s" target="_blank">Learn more in our documentation.</a>~~',
+	'UI:Bulk:Export:MaliciousInjection:Input:Label' => 'Sanitize potentially dangerous values~~',
+	'UI:Bulk:Export:MaliciousInjection:Input:Tooltip' => 'When enabled, potentially dangerous values will be sanitized during export. This will prevent Microsoft Excel from interpreting them as formulas. Note that this may alter the original data by prefixing it with a single quote (\') to ensure it is treated as text.~~',
+	'Core:BulkExport:Security' => 'Security~~',
 ]);

dictionaries/ui/application/display-block/zh_cn.dictionary.itop.display-block.php

@@ -17,7 +17,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'UI:DisplayBlock:List:AddEntry:Tooltip' => '向表格中添加条目',
+	'UI:DisplayBlock:List:AddEntry:Tooltip' => '向列表添加条目',
 ]);

dictionaries/ui/application/welcome-popup/zh_cn.dictionary.itop.welcome-popup.php

@@ -4,7 +4,6 @@
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 // UI elements
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:WelcomePopup:Button:RemindLater' => '以后再提醒我',
@@ -14,29 +13,29 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 // Message
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'UI:WelcomePopup:Message:330_01_Welcome:Title' => '欢迎使用 '.ITOP_APPLICATION_SHORT.' 3.3',
-	'UI:WelcomePopup:Message:330_01_Welcome:Description' => '<div>我们很高兴推出最新版本, 带来了一系列更新和改进!</div>
+	'UI:WelcomePopup:Message:330_01_Welcome:Title' => 'Welcome to '.ITOP_APPLICATION_SHORT.' 3.3~~',
+	'UI:WelcomePopup:Message:330_01_Welcome:Description' => '<div>We’re pleased to introduce this latest release, bringing you a range of updates and improvements !</div>
 <br>
-<div>除了多因子认证等全新功能之外, 此版本还搭载了关键安全更新, 首批 AI 组件, 以及多项优化升级, 旨在带来更流畅稳定的使用体验.</div>
+<div>Alongside new features like Multi-Factor Authentication, this version includes essential security updates, the first AI bricks, and various enhancements designed to deliver a smoother and more reliable experience.</div>
 <br>
-<div>希望您能尽情享受这个版本, 就像我们构建它时一样.</div>
-<div>别忘了调整您的 iTop 偏好设置, 以满足您的个性化体验.</div>',
-	'UI:WelcomePopup:Message:330_02_AIFoundations:Title' => '为 AI 奠定基础',
-	'UI:WelcomePopup:Message:330_02_AIFoundations:Description' => '<div>本次版本更新推出了首批基础组件, 用于支撑我们即将上线的多个 AI 驱动的新功能.</div>
+<div>We hope you enjoy using this version as much as we enjoyed building it.</div>
+<div>Don’t forget to adjust your iTop preferences to tailor the experience to your needs.</div>~~',
+	'UI:WelcomePopup:Message:330_02_AIFoundations:Title' => 'Laying the foundations for AI~~',
+	'UI:WelcomePopup:Message:330_02_AIFoundations:Description' => '<div>This release introduces the first building blocks for our upcoming AI-powered features.</div>
 <br>
-<div>我们已实现核心 API ,它将支持未来的增强功能，为新的智能功能和更丰富的体验铺平道路.</div>
+<div>We’ve implemented the core APIs that will support future enhancements, paving the way for new intelligent capabilities and richer experiences in the next updates.</div>
 <br>
-<div>敬请拭目以待,这仅仅是好戏的开始.</div>',
-	'UI:WelcomePopup:Message:330_03_CMDB:Title' => '增强版 CMDB',
-	'UI:WelcomePopup:Message:330_03_CMDB:Description' => '<div>此版本对数据模型进行了多项改进，以更好地适配持续变化的业务需求.</div>
+<div>Stay tuned—this is just the beginning of what’s ahead.</div>~~',
+	'UI:WelcomePopup:Message:330_03_CMDB:Title' => 'Enhanced CMDB~~',
+	'UI:WelcomePopup:Message:330_03_CMDB:Description' => '<div>This version brings several improvements to our datamodel to better support evolving needs.</div>
 <br>
-<div>我们引入了容器管理, 改进的工作流管理, 更丰富的类描述, 以及生命周期管理 (End of Life / End of Support). 服务管理菜单也经过重新设计, 界面更加清晰易用, 部分配置项中还新增了图片和 Logo.</div>
+<div>We’ve introduced containerization management, improved flow management, enriched class descriptions, and lifecycle management (End of Life / End of Support). The service management menu has also been redesigned for greater clarity and usability, along with the addition of images and logos on selected configuration items.</div>
 <br>
-<div>这些更新旨在带来更有条理、直观易懂的使用体验.</div>',
-	'UI:WelcomePopup:Message:330_04_MFA:Title' => '使用 MFA 增强安全',
-	'UI:WelcomePopup:Message:330_04_MFA:Description' => '<div>多因子认证(MFA) 现在已完全集成进入 iTop.</div>
+<div>These updates aim to provide a more structured and intuitive experience.</div>~~',
+	'UI:WelcomePopup:Message:330_04_MFA:Title' => 'Strengthening security with MFA~~',
+	'UI:WelcomePopup:Message:330_04_MFA:Description' => '<div>Multi-Factor Authentication (MFA) is now fully integrated into iTop.</div>
 <br>
-<div>MFA, 现已直接集成至核心使用流程, 在强化整体安全防护能力的同时, 保障用户获得更流畅统一的使用体验.</div>
+<div>MFA, now built directly into the core experience, strengthens overall security while ensuring a more seamless and consistent user experience.</div>
 <br>
-<div>我们建议您检查账户设置并开启多因子认证，以获得更强的账户安全防护.</div>',
+<div>We encourage you to review your settings and enable MFA to benefit from enhanced account protection.</div>~~',
 ]);

dictionaries/ui/components/breadcrumbs/zh_cn.dictionary.itop.breadcrumbs.php

@@ -17,8 +17,6 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
-// Global search
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Component:Breadcrumbs:PreviousItemsListToggler:Label' => '上一页',
 ]);

dictionaries/ui/components/datatable/zh_cn.dictionary.itop.datatable.php

@@ -24,7 +24,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Datatables:Language:ZeroRecords' => '未找到相关结果',
 	'UI:Datatables:Language:Info' => '共 _TOTAL_ 项',
 	'UI:Datatables:Language:InfoEmpty' => '未找到相关信息',
-	'UI:Datatables:Language:EmptyTable' => '暂无数据',
+	'UI:Datatables:Language:EmptyTable' => '当前列表没有数据',
 	'UI:Datatables:Language:Error' => '运行查询时出错',
 	'UI:Datatables:Language:DisplayLength:All' => '全部',
 	'UI:Datatables:Language:Sort:Ascending' => '升序',

dictionaries/ui/components/input/zh_cn.dictionary.itop.input.php

@@ -17,10 +17,9 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Input
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'UI:Component:Input:ChangeNotAllowed' => '不允许修改',
+	'UI:Component:Input:ChangeNotAllowed' => 'This change is not allowed~~',
 	'UI:Component:Input:Password:DoesNotMatch' => '密码不匹配',
-	'UI:Component:Input:Set:MinimumItems' => '至少需要 %1$s 项',
+	'UI:Component:Input:Set:MinimumItems' => 'Minimum %1$s item(s) required~~',
 ]);

dictionaries/ui/components/quick-create/zh_cn.dictionary.itop.quick-create.php

@@ -1,30 +1,21 @@
 <?php
 
 /**
+ * Localized data
+ *
  * @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
  */
-
-// Quick create
+/**
+ *
+ */
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Component:QuickCreate:Tooltip' => '快速创建任意类型的对象',
 	'UI:Component:QuickCreate:Input:Placeholder' => '请选择对象类型...',
 	'UI:Component:QuickCreate:Recents:Title' => '最近',
 	'UI:Component:QuickCreate:LastClasses:NoClass:Placeholder' => '您尚未创建任何对象',
+	'UI:Component:QuickCreate:MostPopular:Title' => '最常用',
 	'UI:Component:QuickCreate:HistoryDisabled' => '历史记录已禁用',
 	'UI:Component:QuickCreate:KeyboardShortcut:OpenDrawer' => '打开快速创建',
 ]);

dictionaries/ui/layouts/activity-panel/zh_cn.dictionary.itop.activity-panel.php

@@ -55,6 +55,6 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Layout:ActivityPanel:NoEntry:Placeholder:Hint' => '暂无任何活动',
 
 	// Closed cover
-	'UI:Layout:ActivityPanel:ClosedCover:Title' => '活动侧板',
-	'UI:Layout:ActivityPanel:ClosedCover:Tooltip' => '点击打开活动侧板',
+	'UI:Layout:ActivityPanel:ClosedCover:Title' => '侧面板',
+	'UI:Layout:ActivityPanel:ClosedCover:Tooltip' => '点击打开侧面板',
 ]);

dictionaries/ui/layouts/object-details/zh_cn.dictionary.itop.object-details.php

@@ -2,14 +2,13 @@
 
 /**
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
- * @license     https://opensource.org/licenses/AGPL-3.0
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Layout:ObjectDetails:KeyboardShortcut:EditObject' => '编辑当前对象',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:DeleteObject' => '删除当前对象',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:NewObject' => '创建新对象 (与当前对象相同)',
 	'UI:Layout:ObjectDetails:KeyboardShortcut:SaveObject' => '保存当前对象',
-	'UI:Layout:ObjectDetails:New:Modal:Title' => '对象创建',
-	'UI:Layout:ObjectDetails:DatamodelSchemaLink:Tooltip' => '定义数据模型',
+	'UI:Layout:ObjectDetails:New:Modal:Title' => '创建对象',
+	'UI:Layout:ObjectDetails:DatamodelSchemaLink:Tooltip' => 'Class data model schema~~',
 ]);

dictionaries/ui/layouts/page-content/zh_cn.dictionary.itop.page-content.php

@@ -2,9 +2,8 @@
 
 /**
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
- * @license     https://opensource.org/licenses/AGPL-3.0
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
-
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'UIBlock:Error:CannotGetBlocks' => '无法从内容字段 "%1$s" 获取块, 因为它似乎在页面内容 "%2$s" 中不存在',
+	'UIBlock:Error:CannotGetBlocks' => '无法由内容区域 "%1$s" 获取块, 因为其在页面内容 "%2$s" 中不存在',
 ]);

dictionaries/ui/layouts/tab-container/zh_cn.dictionary.itop.tab-container.php

@@ -2,7 +2,7 @@
 
 /*
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
- * @license     https://opensource.org/licenses/AGPL-3.0
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Layout:TabContainer:ExtraTabsListToggler:Label' => '其它标签页',

dictionaries/ui/layouts/ui-content-block/zh_cn.dictionary.itop.ui-content-block.php

@@ -2,7 +2,7 @@
 
 /**
  * @copyright   Copyright (C) 2010-2024 Combodo SAS
- * @license     https://opensource.org/licenses/AGPL-3.0
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UIBlock:Error:AddBlockForbidden' => '无法添加至 %1$s',

dictionaries/ui/pages/login/zh_cn.dictionary.itop.login.php

@@ -2,12 +2,12 @@
 
 /*
  * @copyright   Copyright (C) 2010-2026 Combodo SAS
- * @license     https://opensource.org/licenses/AGPL-3.0
+ * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Login:Title'                  => ITOP_APPLICATION_SHORT.'登录',
-	'UI:Login:Logo:AltText'           => ITOP_APPLICATION_SHORT.' Logo',
+	'UI:Login:Logo:AltText'           => ITOP_APPLICATION_SHORT.' logo~~',
 	'UI:Login:Welcome'                => '欢迎使用'.ITOP_APPLICATION_SHORT.'!',
 	'UI:Login:IncorrectLoginPassword' => '用户名或密码错误, 请重试.',
 	'UI:Login:IdentifyYourself'       => '请完成身份认证',

dictionaries/ui/pages/oauth.landing/zh_cn.dictionary.itop.oauth.landing.php

@@ -17,8 +17,7 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  */
-
 // Navigation menu
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'core/Operation:Landing/Title' => 'OAuth token 创建',
+	'core/Operation:Landing/Title' => 'OAuth令牌创建',
 ]);

dictionaries/ui/pages/preferences/zh_cn.dictionary.itop.preferences.php

@@ -25,16 +25,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Preferences:General:Title'                                      => '概况',
 	'UI:Preferences:General:Theme'                                      => '主题',
 	'UI:Preferences:General:Theme:DefaultThemeLabel'                    => '%1$s (默认)',
-	'UI:Favorites:General:ShowSummaryCards'                             => '显示摘要卡片',
-	'UI:Favorites:General:ShowSummaryCards+'                            => '当鼠标悬停在某个对象的超链接上时, 如果该对象支持摘要信息显示, 则会显示此对象的摘要信息',
+	'UI:Favorites:General:ShowSummaryCards'                             => '显示汇总卡片',
+	'UI:Favorites:General:ShowSummaryCards+'                            => '当鼠标移动到对象链接时, 显示此对象的简要汇总信息, 如果该类型支持',
 	'UI:Preferences:Lists:Title'                                        => '列表',
 	'UI:Preferences:RichText:Title'                                     => '富文本编辑器',
 	'UI:Preferences:RichText:ToolbarState'                              => '工具栏默认状态',
 	'UI:Preferences:RichText:ToolbarState:Expanded'                     => '展开',
 	'UI:Preferences:RichText:ToolbarState:Collapsed'                    => '折叠',
-	'UI:Preferences:ActivityPanel:Title'                                => '活动侧板',
-	'UI:Preferences:ActivityPanel:EntryFormOpened'                      => '默认打开活动侧板',
-	'UI:Preferences:ActivityPanel:EntryFormOpened+'                     => '在显示对象时是否打开活动侧板. 如果不勾选, 您仍可以通过点击按钮打开活动侧板',
+	'UI:Preferences:ActivityPanel:Title'                                => '侧面板',
+	'UI:Preferences:ActivityPanel:EntryFormOpened'                      => '默认打开侧面板',
+	'UI:Preferences:ActivityPanel:EntryFormOpened+'                     => '在显示对象时是否打开侧面板. 如果不选择, 仍可以点击按钮打开侧面板',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Title'                 => '键盘快捷键',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Input:Hint'            => '请输入键盘快捷键',
 	'UI:Preferences:PersonalizeKeyboardShortcuts:Button:Tooltip'        => '录制键盘快捷键',

dictionaries/zh_cn.dictionary.itop.core.php

@@ -90,7 +90,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Core:AttributeObsolescenceFlag/Value:yes+' => '该对象排除在影响分析中, 并且在搜索结果中隐藏',
 	'Core:AttributeObsolescenceFlag/Value:no' => '否',
 	'Core:AttributeObsolescenceFlag/Label' => '废弃标识',
-	'Core:AttributeObsolescenceFlag/Label+' => '基于其它属性动态计算',
+	'Core:AttributeObsolescenceFlag/Label+' => '基于其他属性动态计算',
 	'Core:AttributeObsolescenceDate/Label' => '废弃时间',
 	'Core:AttributeObsolescenceDate/Label+' => '该对象被废弃的大概日期',
 
@@ -540,16 +540,16 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Action/Attribute:status/Value:disabled+' => '',
 	'Class:Action/Attribute:trigger_list' => '相关的触发器',
 	'Class:Action/Attribute:trigger_list+' => '此操作相关的触发器',
-	'Class:Action/Attribute:asynchronous' => '异步',
-	'Class:Action/Attribute:asynchronous+' => '此操作是否应在后台执行',
+	'Class:Action/Attribute:asynchronous' => 'Asynchronous~~',
+	'Class:Action/Attribute:asynchronous+' => 'Whether this action should be executed in the background or not~~',
 	'Class:Action/Attribute:asynchronous/Value:use_global_setting' => '使用全局设置',
 	'Class:Action/Attribute:asynchronous/Value:yes' => '是',
 	'Class:Action/Attribute:asynchronous/Value:no' => '否',
 	'Class:Action/Attribute:finalclass' => '操作类型',
 	'Class:Action/Attribute:finalclass+' => '根本属性的名称',
 	'Action:WarningNoTriggerLinked' => '警告, 此动作没有关联任何触发器. 至少关联1个触发器才会启用.',
-	'Action:last_executions_tab' => '最近执行记录',
-	'Action:last_executions_tab_panel_title' => '此操作的执行记录 (%1$s)',
+	'Action:last_executions_tab' => 'Last executions~~',
+	'Action:last_executions_tab_panel_title' => 'Executions of this action (%1$s)~~',
 	'Action:last_executions_tab_limit_days' => '过去 %1$s 天',
 	'Action:last_executions_tab_limit_none' => '无限制',
 ]);
@@ -590,9 +590,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ActionEmail'                                     => '邮件通知',
 	'Class:ActionEmail+'                                    => '',
 	'Class:ActionEmail/Attribute:status+'                   => '此状态将决定提醒谁: 
-- 正在测试: 仅测试收件人, 
-- 生产: 所有人 (收件人, 抄送和密送) 
-- 禁用: 没有人',
+- 测试中: 仅测试者, 
+- 生产的: 所有人 (收件人, 抄送和密送) 
+- 禁用的: 没有人',
 	'Class:ActionEmail/Attribute:status/Value:test+'        => '仅测试收件人会被通知',
 	'Class:ActionEmail/Attribute:status/Value:enabled+'     => '通知所有人, 包含抄送和秘抄',
 	'Class:ActionEmail/Attribute:status/Value:disabled+'    => '不发送邮件通知',
@@ -681,7 +681,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 - Else the icon of the triggering object class,
 - Otherwise, the application compact logo will be used~~',
 	'Class:ActionNewsroom/Attribute:priority' => '优先级',
-	'Class:ActionNewsroom/Attribute:priority+' => '消息将按优先级降序排列，当在新闻室弹出窗口中显示时',
+	'Class:ActionNewsroom/Attribute:priority+' => 'News will be ordered by decreasing priority, when displayed in the Newsroom popup',
 	'Class:ActionNewsroom/Attribute:priority/Value:1' => '严重',
 	'Class:ActionNewsroom/Attribute:priority/Value:1+' => '严重',
 	'Class:ActionNewsroom/Attribute:priority/Value:2' => '紧急',
@@ -693,7 +693,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:ActionNewsroom/Attribute:test_recipient_id' => '测试收件人',
 	'Class:ActionNewsroom/Attribute:test_recipient_id+' => 'Person used instead of Recipients when notification is being tested~~',
 	'Class:ActionNewsroom/Attribute:recipients' => '收件人',
-	'Class:ActionNewsroom/Attribute:recipients+' => '返回联系人的 OQL 查询',
+	'Class:ActionNewsroom/Attribute:recipients+' => 'An OQL query returning Contact objects~~',
 	'Class:ActionNewsroom/Attribute:url' => 'URL',
 	'Class:ActionNewsroom/Attribute:url+' => 'By default, it points to the object triggering the notification. But you can also specify a custom URL.~~',
 ]);
@@ -716,11 +716,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Trigger/Attribute:context+'      => '允许此触发器开启的上下文',
 	'Class:Trigger/Attribute:complement'    => '其它信息',
 	'Class:Trigger/Attribute:complement+'   => '此触发器提供的更多信息, 使用英文',
-	'Class:Trigger/Attribute:subscription_policy'   => '订阅策略',
-	'Class:Trigger/Attribute:subscription_policy+'  => '允许用户从触发器取消订阅',
-	'Class:Trigger/Attribute:subscription_policy/Value:allow_no_channel' => '允许完全取消订阅',
-	'Class:Trigger/Attribute:subscription_policy/Value:force_at_least_one_channel' => '强制至少选择一个通道 (新闻或邮件)',
-	'Class:Trigger/Attribute:subscription_policy/Value:force_all_channels' => '拒绝取消订阅',
+	'Class:Trigger/Attribute:subscription_policy'   => 'Subscription policy~~',
+	'Class:Trigger/Attribute:subscription_policy+'  => 'Allows users to unsubscribe from the trigger~~',
+	'Class:Trigger/Attribute:subscription_policy/Value:allow_no_channel' => 'Allow complete unsubscription~~',
+	'Class:Trigger/Attribute:subscription_policy/Value:force_at_least_one_channel' => 'Force at least one channel (News or Email)~~',
+	'Class:Trigger/Attribute:subscription_policy/Value:force_all_channels' => 'Deny unsubscription~~',
 ]);
 
 //
@@ -731,11 +731,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:TriggerOnObject'                         => '触发器 (类型依赖的)',
 	'Class:TriggerOnObject+'                        => '在指定类型对象上的触发器',
 	'Class:TriggerOnObject/Attribute:target_class'  => '目标类型',
-	'Class:TriggerOnObject/Attribute:target_class+' => '可激活此触发器的类',
+	'Class:TriggerOnObject/Attribute:target_class+' => 'Objects in this class will activate the trigger~~',
 	'Class:TriggerOnObject/Attribute:filter'        => '筛选器',
-	'Class:TriggerOnObject/Attribute:filter+'       => '限定将激活触发器的对象 (目标类型)',
+	'Class:TriggerOnObject/Attribute:filter+'       => '限定将激活触发器的对象 (目标类型的)',
 	'TriggerOnObject:WrongFilterQuery'              => '错误的筛选查询: %1$s',
-	'TriggerOnObject:WrongFilterClass'              => '筛选查询返回的对象必须是 "%1$s"',
+	'TriggerOnObject:WrongFilterClass'              => '筛选查询返回的对象必须是类型 "%1$s"',
 ]);
 
 //
@@ -801,7 +801,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:TriggerOnObjectUpdate' => '触发器 (对象被更新时)',
 	'Class:TriggerOnObjectUpdate+' => '指定类型或子类型对象更新时的触发器',
-	'Class:TriggerOnObjectUpdate/Attribute:filter+' => '此筛选器在数据库中的对象更新后开始计算. 它可限制可以触发操作的对象',
+	'Class:TriggerOnObjectUpdate/Attribute:filter+' => 'This filter is computed after the object update in database. It restricts the objects which can trigger the actions~~',
 	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes' => '目标字段',
 	'Class:TriggerOnObjectUpdate/Attribute:target_attcodes+' => '',
 ]);
@@ -814,7 +814,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:TriggerOnObjectMention' => '触发器 (对象被提及时)',
 	'Class:TriggerOnObjectMention+' => '指定类型或子类型对象在属性日志中提及 (@xxx) 时的触发器',
 	'Class:TriggerOnObjectMention/Attribute:mentioned_filter' => '提及筛选',
-	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => '限定将激活此触发器的提及对象. 如果为空则任何类的提及对象将激活此触发器.',
+	'Class:TriggerOnObjectMention/Attribute:mentioned_filter+' => '限丁将激活此触发器的提及对象. 如果为空则任何类的提及对象将激活此触发器.',
 ]);
 
 //
@@ -1013,7 +1013,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:AsyncSendEmail/Attribute:to' => '收件人',
 	'Class:AsyncSendEmail/Attribute:subject' => '主题',
 	'Class:AsyncSendEmail/Attribute:body' => '正文',
-	'Class:AsyncSendEmail/Attribute:header' => '标题',
+	'Class:AsyncSendEmail/Attribute:header' => '标头',
 	'Class:CMDBChangeOpSetAttributeOneWayPassword' => '加密密码',
 	'Class:CMDBChangeOpSetAttributeOneWayPassword/Attribute:prev_pwd' => '原值',
 	'Class:CMDBChangeOpSetAttributeEncrypted' => '加密字段',
@@ -1024,7 +1024,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SynchroAttribute/Attribute:sync_source_id' => '同步数据源',
 	'Class:SynchroAttribute/Attribute:attcode' => '属性编码',
 	'Class:SynchroAttribute/Attribute:update' => '更新',
-	'Class:SynchroAttribute/Attribute:reconcile' => '调和',
+	'Class:SynchroAttribute/Attribute:reconcile' => '使一致',
 	'Class:SynchroAttribute/Attribute:update_policy' => '更新策略',
 	'Class:SynchroAttribute/Attribute:update_policy/Value:master_locked' => '已锁定',
 	'Class:SynchroAttribute/Attribute:update_policy/Value:master_unlocked' => '未锁定',
@@ -1075,38 +1075,39 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:SynchroReplica/Attribute:status_last_warning' => '告警',
 	'Class:SynchroReplica/Attribute:info_creation_date' => '创建日期',
 	'Class:SynchroReplica/Attribute:info_last_modified' => '最后修改日期',
-	'Class:SynchroReplica/Action:delete+'        => 'Delete the replica but not the destination object. If the raw data corresponding to this replica is still part of the source, it will be recreated during the next synchronization import.~~',
-	'Class:SynchroReplica/Action:unlink'         => 'Unlink~~',
-	'Class:SynchroReplica/Action:unlink+'        => 'Unlink replica from destination object. It will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro'  => 'Unlink & Synchronize~~',
-	'Class:SynchroReplica/Action:unlinksynchro+' => 'Force immediate resynchronization of the replica. This can change the destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro'       => 'Synchronize~~',
-	'Class:SynchroReplica/Action:synchro+'      => 'Force immediate synchronization of the replica. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete'   => 'Allow deletion of destination~~',
-	'Class:SynchroReplica/Action:allowdelete+'  => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete'    => 'Deny deletion of destination~~',
-	'Class:SynchroReplica/Action:denydelete+'   => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:unlink_all'    => 'Unlink Replicas~~',
-	'Class:SynchroReplica/Action:unlink_all+'   => 'Unlink Replicas from their destination object. They will be processed during the next run of the Data Synchro or you can force it with "Synchronize".~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all' => 'Unlink & Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:unlinksynchro_all+' => 'Force immediate resynchronization of the replicas. This can change their destination id. Required after a Data Synchro change on attribute reconciliation flag or if reconciliation attributes were not locked, and you wish to retain the iTop objects modified since then, while recovering or recreating objects aligned with the source.~~',
-	'Class:SynchroReplica/Action:synchro_all'      => 'Synchronize Replicas~~',
-	'Class:SynchroReplica/Action:synchro_all+'     => 'Force immediate synchronization of the replicas. Useful after a Data Synchro change on an attribute update flag, or if reconciliation attributes were not locked, and you wish to realign the iTop objects with the source.~~',
-	'Class:SynchroReplica/Action:allowdelete_all'  => 'Allow deletion of destination objects~~',
-	'Class:SynchroReplica/Action:allowdelete_all+' => 'Allow the replica deletion to lead to the destination object deletion, if the Data Synchro deletion policy requires so.~~',
-	'Class:SynchroReplica/Action:denydelete_all'   => 'Deny deletion of destination objects~~',
-	'Class:SynchroReplica/Action:denydelete_all+'  => 'Prevent the Replica deletion to lead to the destination object deletion, even if the Data Synchro deletion policy requires so.~~',
+	'Class:SynchroReplica/Action:delete+'                               => 'delete replica~~',
+	'Class:SynchroReplica/Action:unlink'                                => 'Unlink~~',
+	'Class:SynchroReplica/Action:unlink+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro'                         => 'Unlink & Synchro~~',
+	'Class:SynchroReplica/Action:unlinksynchro+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro'                               => 'Synchro~~',
+	'Class:SynchroReplica/Action:synchro+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete'                               => 'Allow delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:allowdelete+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete'                               => 'Deny delete of object linked to this synchro replica~~',
+	'Class:SynchroReplica/Action:denydelete+'                              =>  'Object linked to a deleted replica is not deleted~~',
 
-	'UI:UnlinkAllTabTitle'         => 'Unlink Replicas~~',
-	'UI:UnlinkAllPageTitle'        => 'Unlink Replicas from their destination object~~',
-	'UI:UnlinkSynchroAllTabTitle'  => 'Unlink & Synchronize Replicas~~',
-	'UI:UnlinkSynchroAllPageTitle' => 'Unlink Replicas from their destination object & Synchronize them again~~',
-	'UI:SynchroAllTabTitle'        => 'Synchronize Replicas~~',
-	'UI:SynchroAllPageTitle'       => 'Synchronize Replicas: leading to a destination object creation, mapping or an error~~',
-	'UI:AllowDeleteAllTabTitle'    => 'Allow deletion of synchronized object~~',
-	'UI:AllowDeleteAllPageTitle'   => 'Allow propagation of Replica deletion to their destination object~~',
-	'UI:DenyDeleteAllTabTitle'     => 'Deny deletion of synchronized object~~',
-	'UI:DenyDeleteAllPageTitle'    => 'Deny propagation of Replica deletion to their destination object~~',
+	'Class:SynchroReplica/Action:unlink_all'                                => 'Unlink Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlink_all+'                               => 'Unlink replica with destination object~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all'                         => 'Unlink & Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:unlinksynchro_all+'                        => 'Unlink replica with destination object and execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:synchro_all'                               => 'Synchronize Synchro Replica objects~~',
+	'Class:SynchroReplica/Action:synchro_all+'                              => 'Execute synchronization with this replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all'                               => 'Allow delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:allowdelete_all+'                              => 'Object linked to a deleted replica is deleted~~',
+	'Class:SynchroReplica/Action:denydelete_all'                               => 'Deny delete of objects linked to Synchro Replica~~',
+	'Class:SynchroReplica/Action:denydelete_all+'                              =>  'Object linked to a deleted replica is not deleted~~',
+
+	'UI:UnlinkAllTabTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkAllPageTitle' => 'Unlink Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllTabTitle'       => 'Unlink & Synchronize Synchro Replica objects~~',
+	'UI:UnlinkSynchroAllPageTitle' => ' Unlink & Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllTabTitle' => 'Synchronize Synchro Replica objects~~',
+	'UI:SynchroAllPageTitle'       => 'Synchronize Synchro Replica objects~~',
+	'UI:AllowDeleteAllTabTitle' => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:AllowDeleteAllPageTitle'             => 'Allow delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllTabTitle'              => 'Deny delete of objects linked to Synchro Replica~~',
+	'UI:DenyDeleteAllPageTitle'                   => 'Deny delete of objects linked to Synchro Replica~~',
 
 	'Class:appUserPreferences' => '用户偏好',
 	'Class:appUserPreferences/Attribute:userid' => '用户',
@@ -1143,11 +1144,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Core:BulkExport:AvailableColumnsFrom_Class' => '%1$s属性中可用的列',
 	'Core:BulkExport:NoFieldSelected' => '请至少选择导出一列',
 	'Core:BulkExport:CheckAll' => '全选',
-	'Core:BulkExport:UncheckAll' => '全不选',
+	'Core:BulkExport:UncheckAll' => '反选',
 	'Core:BulkExport:ExportCancelledByUser' => '导出被用户取消',
-	'Core:BulkExport:CSVOptions' => 'CSV 选项',
+	'Core:BulkExport:CSVOptions' => 'CSV选项',
 	'Core:BulkExport:CSVLocalization' => '本地化',
-	'Core:BulkExport:PDFOptions' => 'PDF 选项',
+	'Core:BulkExport:PDFOptions' => 'PDF选项',
 	'Core:BulkExport:PDFPageFormat' => '页面格式',
 	'Core:BulkExport:PDFPageSize' => '页面大小:',
 	'Core:BulkExport:PageSize-A4' => 'A4',
@@ -1157,14 +1158,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Core:BulkExport:PageOrientation-L' => '横向',
 	'Core:BulkExport:PageOrientation-P' => '纵向',
 	'Core:BulkExport:XMLFormat' => 'XML文件 (*.xml)',
-	'Core:BulkExport:XMLOptions' => 'XML 选项',
+	'Core:BulkExport:XMLOptions' => 'XML选项',
 	'Core:BulkExport:SpreadsheetFormat' => 'HTML表单(*.html)',
 	'Core:BulkExport:SpreadsheetOptions' => '表单选项',
 	'Core:BulkExport:OptionNoLocalize' => '不要本地化这些值 (举的例子)',
 	'Core:BulkExport:OptionLinkSets' => '包含外链的对象',
 	'Core:BulkExport:OptionFormattedText' => '保持文本格式',
 	'Core:BulkExport:ScopeDefinition' => '定义要导出的对象',
-	'Core:BulkExportLabelOQLExpression' => 'OQL 查询:',
+	'Core:BulkExportLabelOQLExpression' => 'OQL查询:',
 	'Core:BulkExportLabelPhrasebookEntry' => '来自预定义查询:',
 	'Core:BulkExportMessageEmptyOQL' => '请输入有效的预定义查询.',
 	'Core:BulkExportMessageEmptyPhrasebookEntry' => '请选择有效的预定义查询.',
@@ -1172,7 +1173,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Core:BulkExportCanRunNonInteractive' => '点击这里运行非交互式导出.',
 	'Core:BulkExportLegacyExport' => '点击这里进入旧版导出.',
 	'Core:BulkExport:XLSXOptions' => 'Excel 选项',
-	'Core:BulkExport:TextFormat' => '包含 HTML 的文本',
+	'Core:BulkExport:TextFormat' => '文本中包含一些 HTML 标签',
 	'Core:BulkExport:DateTimeFormat' => '日期和时间格式',
 	'Core:BulkExport:DateTimeFormatDefault_Example' => '默认格式 (%1$s), e.g. %2$s',
 	'Core:BulkExport:DateTimeFormatCustom_Format' => '自定义格式: %1$s',
@@ -1201,7 +1202,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 // Class: TagSetFieldData
 //
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:TagSetFieldData' => '%1$s %2$s',
+	'Class:TagSetFieldData' => '类型%1$s的%2$s',
 	'Class:TagSetFieldData+' => '',
 
 	'Class:TagSetFieldData/Attribute:code' => '代码',

dictionaries/zh_cn.dictionary.itop.ui.php

@@ -51,24 +51,24 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:AuditRule/Attribute:name+'                   => '规则名称',
 	'Class:AuditRule/Attribute:description'             => '描述',
 	'Class:AuditRule/Attribute:description+'            => '检查什么? 如何修复? 谁去做? ...',
-	'Class:AuditRule/Attribute:process'                 => '修正流程',
-	'Class:AuditRule/Attribute:process+'                => '如何修复? 谁来做? ...',
+	'Class:AuditRule/Attribute:process'                 => 'Correction process~~',
+	'Class:AuditRule/Attribute:process+'                => 'How should it be fixed? Who should do it? ...~~',
 	'Class:AuditRule/Attribute:query'                   => '要运行的查询',
 	'Class:AuditRule/Attribute:query+'                  => '要运行的OQL表达式',
 	'Class:AuditRule/Attribute:valid_flag'              => '返回的对象:',
-	'Class:AuditRule/Attribute:valid_flag+'             => '查询返回的是有效对象还是无效对象?
-"有效对象": 存在错误的对象是该范围之内的对象但不在有效对象列表中,
-"无效对象": 存在错误的对象是该范围之内的无效对象',
+	'Class:AuditRule/Attribute:valid_flag+'             => 'Does the query to run returns valid or invalid objects?
+"Valid objects": then objects in error are those part of the scope and not in the list of valid objects,
+"Invalid objects": then objects in error are the invalid objects which are part of the scope',
 	'Class:AuditRule/Attribute:valid_flag/Value:true'   => '有效对象',
-	'Class:AuditRule/Attribute:valid_flag/Value:true+'  => '存在错误的对象是该范围之内的对象但不在有效对象列表中',
+	'Class:AuditRule/Attribute:valid_flag/Value:true+'  => 'Then objects in error are those part of the scope and not in the list of valid objects~~',
 	'Class:AuditRule/Attribute:valid_flag/Value:false'  => '无效对象',
-	'Class:AuditRule/Attribute:valid_flag/Value:false+' => '存在错误的对象是该范围内的无效对象',
+	'Class:AuditRule/Attribute:valid_flag/Value:false+' => 'Then objects in error are the invalid objects which are part of the scope~~',
 	'Class:AuditRule/Attribute:category_id'             => '类别',
 	'Class:AuditRule/Attribute:category_id+'            => '该规则对应的类别',
 	'Class:AuditRule/Attribute:category_name'           => '类别名称',
 	'Class:AuditRule/Attribute:category_name+'          => '该规则对应的类名称',
-	'Class:AuditRule/Attribute:contact_id'              => '所有者',
-	'Class:AuditRule/Attribute:contact_id+'             => '该规则检测出的负责修复的团队或个体',
+	'Class:AuditRule/Attribute:contact_id'              => 'Owner~~',
+	'Class:AuditRule/Attribute:contact_id+'             => 'Team or person in charge of fixing the errors detected by this rule~~',
 ]);
 
 //
@@ -121,26 +121,26 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Query/Attribute:is_template+'              => '可用于通知中的收件人OQL',
 	'Class:Query/Attribute:is_template/Value:yes'     => '是',
 	'Class:Query/Attribute:is_template/Value:no'      => '否',
-	'Class:Query/Attribute:export_count'              => '导出次数',
-	'Class:Query/Attribute:export_count+'             => '统计该查询的执行次数',
+	'Class:Query/Attribute:export_count'              => '导出计数',
+	'Class:Query/Attribute:export_count+'             => '反应此查询执行的次数',
 	'Class:Query/Attribute:export_last_date'          => '最近导出',
-	'Class:Query/Attribute:export_last_date+'         => '最近一次执行导出的日期和时间',
+	'Class:Query/Attribute:export_last_date+'         => '最近一次导出执行的日期和时间',
 	'Class:Query/Attribute:export_last_user_id'       => '用户',
-	'Class:Query/Attribute:export_last_user_id+'      => '最近一次执行导出的用户',
+	'Class:Query/Attribute:export_last_user_id+'      => '执行最近一次导出的用户',
 	'Class:Query/Attribute:export_last_user_contact'  => '联系人',
-	'Class:Query/Attribute:export_last_user_contact+' => '最近一次执行导出的联系人',
-	'Class:Query/Attribute:usages' => '用法',
-	'Class:Query/Attribute:usages+' => '说明该查询可能的用法.
- - "参考 AI" 标签, 假定描述非常明确且符合 OQL 标准。它可以作为通过 AI 构建 OQL 查询的范例。
- - "通知" 标签, 表示返回的对象，有且仅有一个类型为 email 的字段。
- - "仪表" 标签, 假定 OQL 返回一个单一类型的对象.',
-	'Class:Query/Attribute:usages/Value:export' => '导出',
-	'Class:Query/Attribute:usages/Value:reference' => '参考 AI',
-	'Class:Query/Attribute:usages/Value:notif' => '通知',
-	'Class:Query/Attribute:usages/Value:draft' => '草稿',
-	'Class:Query/Attribute:usages/Value:dashlet' => '仪表',
-	'Class:Query/Attribute:owner_id' => '负责人',
-	'Class:Query/Attribute:owner_id+' => '负责此查询的团队或个体',
+	'Class:Query/Attribute:export_last_user_contact+' => '执行最近一次导出的联系人',
+	'Class:Query/Attribute:usages' => 'Usages~~',
+		'Class:Query/Attribute:usages+' => 'Specify the possible usages for this query.
+ - The "Reference for AI" tag assumes the description is very explicit and compliant with OQL. It may be used as an example for building OQL queries by AI.
+ - The "Notification" tag implies the class of returned objects has one and only one field of type email.
+ - The "Dashlet" tag assumes the OQL returns a single class of objects.~~',
+	'Class:Query/Attribute:usages/Value:export' => 'Export~~',
+	'Class:Query/Attribute:usages/Value:reference' => 'Reference for AI~~',
+	'Class:Query/Attribute:usages/Value:notif' => 'Notification~~',
+	'Class:Query/Attribute:usages/Value:draft' => 'Draft~~',
+	'Class:Query/Attribute:usages/Value:dashlet' => 'Dashlet~~',
+	'Class:Query/Attribute:owner_id' => 'Owner~~',
+	'Class:Query/Attribute:owner_id+' => 'Team or person responsible for this query~~',
 	'Query:baseinfo'                                  => '基本信息',
 	'Query:exportInfo'                                => '导出信息',
 	'Class:QueryOQL/Attribute:fields'                 => '字段',
@@ -166,7 +166,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:User/Attribute:finalclass'            => '账号类型',
 	'Class:User/Attribute:finalclass+'           => '根本属性的名称',
 	'Class:User/Attribute:contactid'             => '个体',
-	'Class:User/Attribute:contactid+'            => '用户门户必备, 除了技术账户, 强烈推荐全部启用',
+	'Class:User/Attribute:contactid+'            => '来自业务数据的个体明细信息',
 	'Class:User/Attribute:org_id'                => '组织',
 	'Class:User/Attribute:org_id+'               => '用户所属的组织',
 	'Class:User/Attribute:last_name'             => '姓',
@@ -176,17 +176,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:User/Attribute:email'                 => '邮箱',
 	'Class:User/Attribute:email+'                => '对应联系人的邮箱',
 	'Class:User/Attribute:login'                 => '登录名',
-	'Class:User/Attribute:login+'                => '账户标识字符串, 在'.ITOP_APPLICATION_SHORT.'中必须唯一',
+	'Class:User/Attribute:login+'                => '用户标识字符串',
 	'Class:User/Attribute:language'              => '语言',
-	'Class:User/Attribute:language+'             => '此用户的'.ITOP_APPLICATION_SHORT.'默认语言, 在 '.ITOP_APPLICATION_SHORT.' 支持的本地化语言中选择. ',
+	'Class:User/Attribute:language+'             => '用户语言',
 	'Class:User/Attribute:language/Value:EN US'  => '英语',
 	'Class:User/Attribute:language/Value:EN US+' => '英语 (U.S.)',
 	'Class:User/Attribute:language/Value:FR FR'  => '法语',
 	'Class:User/Attribute:language/Value:FR FR+' => '法语 (France)',
 	'Class:User/Attribute:profile_list'          => '角色',
-	'Class:User/Attribute:profile_list+'         => '授予此用户的角色和权限',
+	'Class:User/Attribute:profile_list+'         => '授予此用户的角色',
 	'Class:User/Attribute:allowed_org_list'      => '可访问的组织',
-	'Class:User/Attribute:allowed_org_list+'     => '终端用户可以看到以下组织的数据. 如果没有指定,则无限制.',
+	'Class:User/Attribute:allowed_org_list+'     => '目标用户可以看到以下组织的数据. 如果没有指定,则无限制.',
 	'Class:User/Attribute:status'                => '状态',
 	'Class:User/Attribute:status+'               => '账号是否启用.',
 	'Class:User/Attribute:status/Value:enabled'  => '启用',
@@ -194,19 +194,19 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 	'Class:User/Error:LoginMustBeUnique' => '登录名必须唯一 - "%1s" 已经被使用.',
 	'Class:User/Error:AtLeastOneProfileIsNeeded' => '必须指定至少一个角色给此用户.',
-	'Class:User/Error:PrivilegedUserMustHaveAccessToBackOffice' => '角色 "%1$s" 无法授权给特权用户 (Administrator, SuperUser 和 REST Services User)',
-	'Class:User/Error:ProfileNotAllowed' => '无法添加角色 "%1$s" 因为这将导致无法访问后台',
+	'Class:User/Error:PrivilegedUserMustHaveAccessToBackOffice' => 'Profile "%1$s" cannot be given to privileged Users (Administrators, SuperUsers and REST Services Users)~~',
+	'Class:User/Error:ProfileNotAllowed' => '无法添加角色 "%1$s" 因为这将导致禁止访问后台',
 	'Class:User/Error:StatusChangeIsNotAllowed' => '不允许更改您自己用户的状态',
 	'Class:User/Error:AllowedOrgsMustContainUserOrg' => '允许访问组织必须包含用户组织',
-	'Class:User/Error:AdminProfileCannotBeRemovedBySelf' => '您无法删除自己的管理员角色. 请让另一个管理员为您操作',
+	'Class:User/Error:AdminProfileCannotBeRemovedBySelf' => 'You cannot remove your own Administrator profile. Ask another Administrator to do it for you~~',
 	'Class:User/Error:CurrentProfilesHaveInsufficientRights' => '当前指定的角色列表没有提供足够的访问权限 (用户将无法被修改)',
-	'Class:User/Error:PortalPowerUserHasInsufficientRights' => '角色 "Portal power user" 没有足够的访问权限 (必须与其它角色配合使用)',
+	'Class:User/Error:PortalPowerUserHasInsufficientRights' => 'The Portal power user profile does not give sufficient access rights (another profile must be added)~~',
 	'Class:User/Error:AtLeastOneOrganizationIsNeeded' => '必须为此用户指定一个组织.',
 	'Class:User/Error:OrganizationNotAllowed' => '此组织不被允许.',
 	'Class:User/Error:UserOrganizationNotAllowed' => '此用户不属于那个组织.',
 	'Class:User/Error:PersonIsMandatory' => '联系人必填.',
-	'Class:User/Warning:NoOrganizationMeansFullAccess' => '没有为此用户定义 "可访问的组织" , 这意味着他可以访问任何组织',
-	'Class:User/Warning:NoContactHasImpact' => '注意: 此用户未关联任何个体, 这会导致无法访问门户、接收新闻推送, 同时后台管理系统也会出现其它异常',
+	'Class:User/Warning:NoOrganizationMeansFullAccess' => 'No "Allowed Organizations" defined for this user, this means they have access to all organizations~~',
+	'Class:User/Warning:NoContactHasImpact' => 'Cautious: there is no Person defined on this User, this prevents access to portals, news notifications and other side effects in back-office~~',
 	'Class:UserInternal' => '内部用户',
 	'Class:UserInternal+' => ITOP_APPLICATION_SHORT.'内部定义的用户',
 ]);
@@ -219,9 +219,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:URP_Profiles' => '角色',
 	'Class:URP_Profiles+' => '用户角色',
 	'Class:URP_Profiles/Attribute:name' => '名称',
-	'Class:URP_Profiles/Attribute:name+' => '',
+	'Class:URP_Profiles/Attribute:name+' => '标签',
 	'Class:URP_Profiles/Attribute:description' => '描述',
-	'Class:URP_Profiles/Attribute:description+' => '简短描述',
+	'Class:URP_Profiles/Attribute:description+' => '单行描述',
 	'Class:URP_Profiles/Attribute:user_list' => '用户',
 	'Class:URP_Profiles/Attribute:user_list+' => '拥有此角色的用户',
 ]);
@@ -234,11 +234,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:URP_Dimensions' => '维度',
 	'Class:URP_Dimensions+' => '应用维度 (定义纵深)',
 	'Class:URP_Dimensions/Attribute:name' => '名称',
-	'Class:URP_Dimensions/Attribute:name+' => '',
+	'Class:URP_Dimensions/Attribute:name+' => '标签',
 	'Class:URP_Dimensions/Attribute:description' => '描述',
-	'Class:URP_Dimensions/Attribute:description+' => '简短描述',
+	'Class:URP_Dimensions/Attribute:description+' => '单行描述',
 	'Class:URP_Dimensions/Attribute:type' => '类型',
-	'Class:URP_Dimensions/Attribute:type+' => '类名或数据类型 (映射单元)',
+	'Class:URP_Dimensions/Attribute:type+' => '类型名称或数据类型 (投影单位)',
 ]);
 
 //
@@ -246,9 +246,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 //
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
-	'Class:URP_UserProfile' => '用户角色',
-	'Class:URP_UserProfile+' => '用户角色',
-	'Class:URP_UserProfile/Name' => '链接 %1$s 和 %2$s',
+	'Class:URP_UserProfile' => '角色目标用户',
+	'Class:URP_UserProfile+' => '用户的角色',
+	'Class:URP_UserProfile/Name' => '关联 %1$s 和 %2$s',
 	'Class:URP_UserProfile/Attribute:userid' => '用户',
 	'Class:URP_UserProfile/Attribute:userid+' => '账号',
 	'Class:URP_UserProfile/Attribute:userlogin' => '登录名',
@@ -268,7 +268,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:URP_UserOrg' => '用户组织',
 	'Class:URP_UserOrg+' => '可以访问的组织',
-	'Class:URP_UserOrg/Name' => '链接 %1$s 和 %2$s',
+	'Class:URP_UserOrg/Name' => '关联 %1$s 和 %2$s',
 	'Class:URP_UserOrg/Attribute:userid' => '用户',
 	'Class:URP_UserOrg/Attribute:userid+' => '账号',
 	'Class:URP_UserOrg/Attribute:userlogin' => '登录名',
@@ -373,7 +373,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:URP_AttributeGrant' => '属性权限',
-	'Class:URP_AttributeGrant+' => '属性层面的权限',
+	'Class:URP_AttributeGrant+' => '属性的权限',
 	'Class:URP_AttributeGrant/Attribute:actiongrantid' => '操作权限',
 	'Class:URP_AttributeGrant/Attribute:actiongrantid+' => '操作权限',
 	'Class:URP_AttributeGrant/Attribute:attcode' => '属性',
@@ -415,7 +415,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Menu:NotificationsMenu+' => '配置通知',
 	'Menu:MyShortcuts' => '我的快捷方式',
 	'Menu:DataAdministration' => '数据管理',
-	'Menu:DataAdministration+' => '',
+	'Menu:DataAdministration+' => '数据管理',
 ]);
 
 //
@@ -426,9 +426,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'BooleanLabel:yes' => '是',
 	'BooleanLabel:no' => '否',
 	'UI:WelcomeMenu:Title' => '欢迎使用'.ITOP_APPLICATION_SHORT,
-	'UI:WelcomeMenu:AllOpenRequests' => '所有待处理的需求: %1$d',
+	'UI:WelcomeMenu:AllOpenRequests' => '所有打开的需求: %1$d',
 	'UI:WelcomeMenu:MyCalls'         => '我办理的需求',
-	'UI:WelcomeMenu:OpenIncidents'   => '所有待处理的事件: %1$d',
+	'UI:WelcomeMenu:OpenIncidents'   => '所有打开的事件: %1$d',
 	'UI:WelcomeMenu:AllConfigItems'  => '配置项: %1$d',
 	'UI:WelcomeMenu:MyIncidents'     => '分配给我的事件',
 	'UI:AllOrganizations'            => ' 所有组织 ',
@@ -522,7 +522,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Error:MaintenanceMode'                            => '应用正处于维护中',
 	'UI:Error:MaintenanceTitle'                           => '维护',
 	'UI:Error:InvalidToken'                               => '错误: 所请求的操作已执行 (没有CSRF token)',
-	'UI:Error:TwigController'                             => '表单控制器内部错误',
+	'UI:Error:TwigController'                             => 'Internal error in form controller~~',
 
 	'UI:Error:SMTP:UnknownVendor' => 'OAuth SMTP提供者%1$s不存在 (email_transport_smtp.oauth.provider)',
 
@@ -531,12 +531,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:CountOfObjects'             => '%1$d个对象符合指定的条件.',
 	'UI_CountOfObjectsShort'        => '%1$d个对象.',
 	'UI:NoObject_Class_ToDisplay'   => '没有%1$s可以显示',
-	'UI:History:LastModified_On_By' => '最近修改位于%1$s, 修改者%2$s.',
+	'UI:History:LastModified_On_By' => '最后修改%1$s被%2$s.',
 	'UI:HistoryTab'                 => '历史',
 	'UI:NotificationsTab' => '通知',
 	'UI:History:BulkImports' => '历史',
-	'UI:History:BulkImports+' => 'CSV导入列表 (最新导入排在最前)',
-	'UI:History:BulkImportDetails' => '在%1$s执行CSV导入时导致的变化 (由%2$s)',
+	'UI:History:BulkImports+' => 'CSV导入列表 (最新导入在最)',
+	'UI:History:BulkImportDetails' => '在%1$s执行CSV导入时造成的变更 (由%2$s)',
 	'UI:History:Date' => '日期',
 	'UI:History:Date+' => '变更日期',
 	'UI:History:User' => '用户',
@@ -559,8 +559,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Menu:Add' => '添加...',
 	'UI:Menu:Manage' => '管理...',
 	'UI:Menu:EMail' => '邮件',
-	'UI:Menu:CSVExport' => 'CSV 导出...',
-	'UI:Menu:OpenOQL' => '查看 OQL 查询',
+	'UI:Menu:CSVExport' => 'CSV导出...',
+	'UI:Menu:OpenOQL' => 'View the OQL query~~',
 	'UI:Menu:Modify' => '修改...',
 	'UI:Menu:Delete' => '删除...',
 	'UI:Menu:BulkDelete' => '删除...',
@@ -586,27 +586,27 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:SearchValue:Mixed' => '* 混合 *',
 	'UI:SearchValue:NbSelected' => '# 已选择',
 	'UI:SearchValue:CheckAll' => '全选',
-	'UI:SearchValue:UncheckAll' => '全不选',
+	'UI:SearchValue:UncheckAll' => '反选',
 	'UI:SelectOne' => '-- 请选择 --',
-	'UI:AccessRO-All'                               => ITOP_APPLICATION.' 是只读的',
-	'UI:AccessRO-Users'                             => ITOP_APPLICATION.'对于终端用户是只读的',
-	'UI:ApplicationEnvironment'                     => '应用环境: %1$s',
-	'UI:CSVImport:MappingSelectOne'                 => '-- 请选择 --',
-	'UI:CSVImport:MappingNotApplicable'             => '-- 忽略此字段 --',
-	'UI:CSVImport:NoData'                           => '数据为空..., 请提供数据!',
-	'UI:Title:DataPreview'                          => '数据预览',
-	'UI:CSVImport:ErrorOnlyOneColumn'               => '错误: 数据仅包含一列. 您选择了合适的分隔符了吗?',
-	'UI:CSVImport:FieldName'                        => '字段 %1$d',
-	'UI:CSVImport:DataLine1'                        => '数据行 1',
-	'UI:CSVImport:DataLine2'                        => '数据行 2',
-	'UI:CSVImport:idField'                          => 'id (主键)',
-	'UI:Title:BulkImport'                           => ITOP_APPLICATION_SHORT.' - 批量导入',
-	'UI:Title:BulkImport+'                          => 'CSV 导入向导',
-	'UI:Title:BulkSynchro_nbItem_ofClass_class'     => '同步 %2$s 个对象中的 %1$d',
-	'UI:CSVImport:ClassesSelectOne'                 => '-- 请选择 --',
-	'UI:CSVImport:ErrorExtendedAttCode'             => '内部错误: "%1$s" 是错误的编码, 因为 "%2$s" 不是类型 "%3$s" 的外键',
-	'UI:CSVImport:ObjectsWillStayUnchanged'         => '%1$d个对象保持不变.',
-	'UI:CSVImport:ObjectsWillBeModified'            => '%1$d个对象将被修改.',
+	'UI:AccessRO-All' => ITOP_APPLICATION.'是只读的',
+	'UI:AccessRO-Users' => ITOP_APPLICATION.'对于终端用户是只读的',
+	'UI:ApplicationEnvironment' => '应用环境: %1$s',
+	'UI:CSVImport:MappingSelectOne' => '-- 请选择 --',
+	'UI:CSVImport:MappingNotApplicable' => '-- 忽略此字段 --',
+	'UI:CSVImport:NoData' => '数据为空..., 请提供数据!',
+	'UI:Title:DataPreview' => '数据预览',
+	'UI:CSVImport:ErrorOnlyOneColumn' => '错误: 数据仅包含一列. 您选择了合适的分隔符了吗?',
+	'UI:CSVImport:FieldName' => '字段 %1$d',
+	'UI:CSVImport:DataLine1' => '数据行 1',
+	'UI:CSVImport:DataLine2' => '数据行 2',
+	'UI:CSVImport:idField' => 'id (主键)',
+	'UI:Title:BulkImport' => ITOP_APPLICATION_SHORT.' - 批量导入',
+	'UI:Title:BulkImport+' => 'CSV 导入向导',
+	'UI:Title:BulkSynchro_nbItem_ofClass_class' => '同步 %2$s 个对象中的 %1$d',
+	'UI:CSVImport:ClassesSelectOne' => '-- 请选择 --',
+	'UI:CSVImport:ErrorExtendedAttCode' => '内部错误: "%1$s" 是错误的编码, 因为 "%2$s" 不是类型 "%3$s" 的外键',
+	'UI:CSVImport:ObjectsWillStayUnchanged' => '%1$d个对象保持不变.',
+	'UI:CSVImport:ObjectsWillBeModified' => '%1$d个对象将被修改.',
 	'UI:CSVImport:ObjectsWillBeAdded' => '%1$d个对象将被添加.',
 	'UI:CSVImport:ObjectsWillHaveErrors' => '%1$d个对象将发生错误.',
 	'UI:CSVImport:ObjectsRemainedUnchanged' => '%1$d个对象保持不变.',
@@ -629,7 +629,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:CSVImport:TreatFirstLineAsHeader'     => '将第一行视作标题头 (列名)',
 	'UI:CSVImport:Skip_N_LinesAtTheBeginning' => '跳过文件的前%1$s行',
 	'UI:CSVImport:CSVDataPreview'             => 'CSV 数据预览',
-	'UI:CSVImport:Column'                     => '列 %1$s',
+	'UI:CSVImport:Column'                     => 'Column %1$s~~',
 	'UI:CSVImport:SelectFile'                 => '请选择要导入的文件:',
 	'UI:CSVImport:Tab:LoadFromFile'           => '从文件导入',
 	'UI:CSVImport:Tab:CopyPaste'              => '复制和粘贴的数据',
@@ -655,15 +655,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:CSVImport:ViewAllAmbiguousValues'     => '查看所有模糊值',
 	'UI:UniversalSearchTitle'                 => ITOP_APPLICATION_SHORT.' - 全局搜索',
 	'UI:UniversalSearch:Error'                => '错误: %1$s',
-	'UI:UniversalSearch:LabelSelectTheClass'  => '请选择要搜索的类别: ',
+	'UI:UniversalSearch:LabelSelectTheClass'  => '选择要搜索的类别: ',
 
-	'UI:CSVReport-Value-Modified'                                   => '已修改',
-	'UI:CSVReport-Value-SetIssue'                                   => '属性值不合法',
-	'UI:CSVReport-Value-ChangeIssue'                                => '\'%1$s\' 值不合法',
-	'UI:CSVReport-Value-NoMatch'                                    => '没有匹配到值 \'%1$s\'',
-	'UI:CSVReport-Value-NoMatch-PossibleValues'                     => '一些可能的 \'%1$s\' 值: %2$s',
-	'UI:CSVReport-Value-NoMatch-NoObject'                           => '对象 \'%1$s\' 不存在',
-	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser'            => '对象 \'%1$s\' 在您当前角色下没有找到',
+	'UI:CSVReport-Value-Modified' => '已修改',
+	'UI:CSVReport-Value-SetIssue' => '属性值不合法',
+	'UI:CSVReport-Value-ChangeIssue' => '\'%1$s\' 值不合法',
+	'UI:CSVReport-Value-NoMatch' => '没有匹配到值 \'%1$s\'',
+	'UI:CSVReport-Value-NoMatch-PossibleValues' => '一些可能的 \'%1$s\' 值: %2$s',
+	'UI:CSVReport-Value-NoMatch-NoObject' => '对象 \'%1$s\' 不存在',
+	'UI:CSVReport-Value-NoMatch-NoObject-ForCurrentUser' => '对象 \'%1$s\' 在您当前角色下没有找到',
 	'UI:CSVReport-Value-NoMatch-SomeObjectNotVisibleForCurrentUser' => '一些对象 \'%1$s\' 在您当前角色下不可见',
 
 	'UI:CSVReport-Value-Missing'                => '缺少必填项',
@@ -725,9 +725,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Audit:Interactive:Domain:Title' 	  	  => '审计结果在域: %1$s',
 	'UI:Audit:Interactive:Domain:SubTitle' 	      => '所有关联所述域的类别内的审计规则的结果: %1$s',
 	'UI:Audit:Interactive:Domain:BreadCrumb'      => '全量审计',
-	'UI:Audit:Interactive:Domain:BreadCrumb+'     => '审计域: %1$s',
+	'UI:Audit:Interactive:Domain:BreadCrumb+'     => '审计在域: %1$s',
 	'UI:Audit:Interactive:Selection:Title'        => '审计的选择',
-	'UI:Audit:Interactive:Selection:SubTitle'     => '请选择一个审计域并将结果限定在该审计域内或者选择 "所有类别" 进行全量审计 (要审计的数据太大可能导致耗时较长甚至失败)',
+	'UI:Audit:Interactive:Selection:SubTitle'     => '请选择一个域以将结果限定在该域内或者选择 "所有类别" 进行全量审计 (要审计的数据太大可能导致耗时较长甚至失败)',
 	'UI:Audit:Interactive:Selection:BreadCrumb'   => '请选择',
 	'UI:Audit:Interactive:Selection:BreadCrumb+'  => '请选择要运行的审计',
 	'UI:Audit:Interactive:Selection:BadgeAll'     => '所有类别',
@@ -772,7 +772,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Query:UrlV1'                    => '没有定义字段列表. 没有这个信息页面<em>export-V2.php</em>无法调用. 因此, 建议的以下 URL 指向传统页面: <em>export.php</em>. 该传统版本导出具有以下限制: 导出的字段列表很大程度依赖于导出格式和'.ITOP_APPLICATION_SHORT.'数据模型. <br/>如果您需要确保导出的列保持长期稳定, 则必须为属性 "Fields" 指定值并使用页面<em>export-V2.php</em>.',
 	'UI:Schema:Title'                   => ITOP_APPLICATION_SHORT.'对象模型',
 	'UI:Schema:TitleForClass'           => '%1$s 模式',
-	'UI:Schema:NoClassSelected'         => '尚未选择, 必须选择一项',
+	'UI:Schema:NoClassSelected'         => 'No class selected, please choose one~~',
 	'UI:Schema:CategoryMenuItem'        => '类别 <b>%1$s</b>',
 	'UI:Schema:Relationships'           => '关联',
 	'UI:Schema:AbstractClass'           => '抽象类型: 此类型不能实例化对象.',
@@ -934,7 +934,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:BulkDeletePageTitle' => ITOP_APPLICATION_SHORT.' - 批量删除',
 	'UI:BulkDeleteTitle' => '请选择要删除的对象:',
 	'UI:PageTitle:ObjectCreated' => ITOP_APPLICATION_SHORT.' 对象已创建.',
-	'UI:Title:Object_Of_Class_Created' => '已创建 %2$s - %1$s.',
+	'UI:Title:Object_Of_Class_Created' => '%1$s - %2$s已创建.',
 	'UI:Apply_Stimulus_On_Object_In_State_ToTarget_State' => '应用 %1$s 在对象: %2$s上, 从 %3$s 状态到目标状态: %4$s.',
 	'UI:ObjectCouldNotBeWritten' => '对象不能写入: %1$s',
 	'UI:PageTitle:FatalError' => ITOP_APPLICATION_SHORT.' - 致命错误',
@@ -1018,7 +1018,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:ContactsMenu' => '联系人',
 	'UI:ContactsMenu+' => '联系人',
 	'UI:ContactsMenu:Title' => '联系人概况',
-	'UI-ContactsMenu-ContactsByLocation' => '按位置划分联系人',
+	'UI-ContactsMenu-ContactsByLocation' => '按地点划分联系人',
 	'UI-ContactsMenu-ContactsByType' => '按类别划分联系人',
 	'UI-ContactsMenu-ContactsByStatus' => '按状态划分联系人',
 
@@ -1035,7 +1035,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 <p>
 <i><b>操作</b></i>定义了触发器执行时要运行的动作. 目前仅支持3类动作:
 <ol>
-	<li>发送电子邮件: 此动作同时需要指定发送的邮件所使用的模板, 以及一些其它参数, 例如收件人, 优先级, 等.<br />
+	<li>发送电子邮件: 此动作同时需要指定发送的邮件所使用的模板, 以及一些其他参数, 例如收件人, 优先级, 等.<br />
 	这里有一个专用的页面: <a href="../setup/email.test.php" target="_blank">email.test.php</a>可用于测试和调试PHP的邮件配置.</li>
 	<li>发送新闻消息: 在应用程序中通过新闻室直接向用户显示新闻消息（左侧菜单上的铃铛图标）</li>
 	<li>调用外部webhook: 允许通过发送结构化数据到指定URL来与第三方应用集成.</li>
@@ -1116,14 +1116,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Portal:Back' => '返回',
 	'Portal:WelcomeUserOrg' => '欢迎%1$s, 来自%2$s',
 	'Portal:TitleDetailsFor_Request' => '需求详情',
-	'Portal:ShowOngoing' => '显示待处理的需求',
+	'Portal:ShowOngoing' => '显示打开的需求',
 	'Portal:ShowClosed' => '显示已关闭的需求',
 	'Portal:CreateNewRequest' => '新建需求',
 	'Portal:CreateNewRequestItil' => '新建需求',
 	'Portal:CreateNewIncidentItil' => '新建事件报告',
 	'Portal:ChangeMyPassword' => '修改密码',
 	'Portal:Disconnect' => '断开',
-	'Portal:OpenRequests' => '我待处理的需求',
+	'Portal:OpenRequests' => '我打开的需求',
 	'Portal:ClosedRequests' => '我已关闭的需求',
 	'Portal:ResolvedRequests' => '已解决的需求',
 	'Portal:SelectService' => '从类别中选择一项服务:',
@@ -1132,7 +1132,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Portal:PleaseSelectAServiceSubCategory' => '请选择子类型',
 	'Portal:DescriptionOfTheRequest' => '请输入描述:',
 	'Portal:TitleRequestDetailsFor_Request' => '需求详情%1$s:',
-	'Portal:NoOpenRequest' => '此类别中没有待处理的需求.',
+	'Portal:NoOpenRequest' => '此类别中没有打开的需求.',
 	'Portal:NoClosedRequest' => '此分类中没有需求',
 	'Portal:Button:ReopenTicket' => '重新打开工单',
 	'Portal:Button:CloseTicket' => '关闭工单',
@@ -1333,15 +1333,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:GroupBy:max+' => '%1$s 最大值',
 	// ---
 
-	'UI:DashletHeaderStatic:Label' => '标题',
+	'UI:DashletHeaderStatic:Label' => '标头',
 	'UI:DashletHeaderStatic:Description' => '显示水平分隔符',
 	'UI:DashletHeaderStatic:Prop-Title' => '标题',
 	'UI:DashletHeaderStatic:Prop-Title:Default' => '联系人',
 	'UI:DashletHeaderStatic:Prop-Icon' => '图标',
 	'UI:DashletIcon:None' => '无',
 
-	'UI:DashletHeaderDynamic:Label' => '标题(带统计)',
-	'UI:DashletHeaderDynamic:Description' => '带统计的标题 (分组...)',
+	'UI:DashletHeaderDynamic:Label' => '统计标头',
+	'UI:DashletHeaderDynamic:Description' => '统计标头 (分组...)',
 	'UI:DashletHeaderDynamic:Prop-Title' => '标题',
 	'UI:DashletHeaderDynamic:Prop-Title:Default' => '联系人',
 	'UI:DashletHeaderDynamic:Prop-Icon' => '图标',
@@ -1351,7 +1351,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:DashletHeaderDynamic:Prop-GroupBy' => '分组依据',
 	'UI:DashletHeaderDynamic:Prop-Values' => '值',
 
-	'UI:DashletBadge:Label' => '徽章',
+	'UI:DashletBadge:Label' => '证件',
 	'UI:DashletBadge:Description' => '新建/查询的对象图标',
 	'UI:DashletBadge:Prop-Class' => '类型',
 
@@ -1454,11 +1454,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:SelectionOf_Class' => '选择 %1$s',
 
 	'UI:AboutBox' => '关于'.ITOP_APPLICATION_SHORT.'...',
-	'UI:About:Title' => '关于'.ITOP_APPLICATION_SHORT,
+	'UI:About:Title' => '关于'.ITOP_APPLICATION_SHORT, 'UI:About:DataModel' => '数据模型',
 	'UI:About:DataModel' => '数据模型',
 	'UI:About:Support' => '支持信息',
 	'UI:About:Licenses' => '许可证',
-	'UI:About:InstallationOptions' => '安装选项',
+	'UI:About:InstallationOptions' => '已安装的模块',
 	'UI:About:ManualExtensionSource' => '扩展',
 	'UI:About:Extension_Version' => '版本: %1$s',
 	'UI:About:RemoteExtensionSource' => '数据',
@@ -1485,12 +1485,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:CurrentObjectIsLockedBy_User_Explanation' => '此对象正在被%1$s修改. 您的修改无法提交以避免冲突.',
 	'UI:CurrentObjectIsSoftLockedBy_User' => '此对象当前正在被%1$s修改. 在其修改结束后您将能提交您的修改.',
 	'UI:CurrentObjectLockExpired' => '并发修改的锁定期已过.',
-	'UI:CurrentObjectLockExpired_Explanation' => '防止对象被并发修改的锁定已失效. 其它用户已允许修改当前对象因此您不能再提交您的修改.',
+	'UI:CurrentObjectLockExpired_Explanation' => '防止对象被并发修改的锁定已失效. 其他用户已允许修改当前对象因此您不能再提交您的修改.',
 	'UI:ConcurrentLockKilled' => '阻止并发修改当前对象的锁定已被删除.',
 	'UI:Menu:KillConcurrentLock' => '消除并发修改锁定!',
 
 	'UI:Menu:ExportPDF' => '导出PDF...',
-	'UI:Menu:PrintableVersion' => '优质打印版本',
+	'UI:Menu:PrintableVersion' => '打印友好的版本',
 
 	'UI:BrowseInlineImages' => '浏览图片...',
 	'UI:UploadInlineImageLegend' => '上传新图片',
@@ -1510,7 +1510,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	// Search form
 	'UI:Search:Toggle' => '折叠/展开',
 	'UI:Search:AutoSubmit:DisabledHint' => '此类别已禁用自动提交',
-	'UI:Search:Obsolescence:DisabledHint' => '根据您的偏好设置, 废弃的数据已被隐藏',
+	'UI:Search:Obsolescence:DisabledHint' => '根据您的设置, 废弃的数据会被隐藏',
 	'UI:Search:NoAutoSubmit:ExplainText' => '在搜索框中添加规则, 或者单击对象按钮查看对象.',
 	'UI:Search:Criterion:MoreMenu:AddCriteria' => '添加条件',
 	// - Add new criteria button
@@ -1553,7 +1553,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s',
 	//   - Enum widget
 	'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s',
-	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s 和 %3$s 其它',
+	'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s 和 %3$s 其他',
 	'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: 任何',
 	//   - TagSet widget
 	'UI:Search:Criteria:Title:TagSet:Matches' => '%1$s: %2$s',
@@ -1562,14 +1562,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s 未定义',
 	'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s',
-	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s 和 %3$s 其它',
+	'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s 和 %3$s 其他',
 	'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: 任何',
 	//   - Hierarchical key widget
 	'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s 已定义',
 	'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s 未定义',
 	'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s',
 	'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s',
-	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s 和 %3$s 其它',
+	'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s 和 %3$s 其他',
 	'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: 任何',
 
 	// - Criteria operators

setup/setuputils.class.inc.php

@@ -537,7 +537,6 @@ class SetupUtils
 				$sDetail = str_replace('Error: ', '', $oCheckRes->sLabel);
 				$sError = sprintf($sErrorLabel, $sDetail);
 				SetupLog::Error($sError, null, ["output" => $aOutput, 'php_path' => $sPHPExec]);
-				$sError .= '. You may change the CLI PHP executable path by setting the "php_path" config parameter.';
 				throw new CoreException($sError);
 			}
 		}

setup/wizardcontroller.class.inc.php

@@ -59,7 +59,7 @@ class WizardController
 	 * Removes information about the previous step from the stack
 	 * @return array{'class': string, 'state': string}
 	 */
-	protected function PopStep(): array
+	public function PopStep(): array
 	{
 		$aStep = array_pop($this->aWizardSteps);
 		$this->SetParameter('_steps', $this->aWizardSteps);
@@ -335,4 +335,21 @@ EOF
 	{
 		$this->oSessionParameters->Erase();
 	}
+
+	/**
+	 * @param string $sStepClass The class name of the step to find the latest state for
+	 *
+	 * @return WizardState
+	 */
+	public function GetLatestWizardStateFromStepClass(string $sStepClass, bool $bPopStep = true): WizardState
+	{
+		$iCountModulesChoiceSteps = count(array_filter($this->aWizardSteps, fn (array $step): bool => $step['class'] === $sStepClass && $step['state'] !== ''));
+		$sStepState = $iCountModulesChoiceSteps > 0 ? (string) ($iCountModulesChoiceSteps - 1) : '';
+
+		if ($bPopStep) {
+			$this->PopStep();
+		}
+
+		return new WizardState($sStepClass, $sStepState);
+	}
 }

setup/wizardsteps/WizStepLandingBeforeAudit.php

@@ -69,6 +69,7 @@ class WizStepLandingBeforeAudit extends WizStepModulesChoice
 			$aWizardSteps = $this->GetWizardSteps();
 			if ($bSkipWizard) {
 				$this->oWizard->SetParameter('_steps', $aWizardSteps);
+				$this->oWizard->SetWizardSteps($aWizardSteps);
 			}
 
 			// Component selection in previous screens
@@ -80,6 +81,17 @@ class WizStepLandingBeforeAudit extends WizStepModulesChoice
 				$aSelectedComponents = json_decode($this->oWizard->GetParameter('selected_components'), true);
 			}
 
+			$bForceUninstall = (bool)$this->oWizard->GetParameter('force-uninstall', false);
+			$aOptions = $this->oExtensionsMap->GetAllExtensionsOptionInfo(bRemoteExtensionsShouldBeMandatory: !$bForceUninstall);
+			foreach ($aOptions as $index => $aChoice) {
+				$sChoiceId = self::$SEP.$index;
+				$aFlags = $this->ComputeChoiceFlags($aChoice, $sChoiceId, $aSelectedComponents, false, $bForceUninstall, true);
+				if (!$this->CanMoveForwardFromChoiceFlags($aFlags, $bForceUninstall)) {
+					// If the user has selected incompatible modules, we need to go back to the extensions choice step which is the last modules choice step in the wizard
+					return $this->oWizard->GetLatestWizardStateFromStepClass(WizStepModulesChoice::class);
+				}
+			}
+
 			// Save the choices for the summary step
 			$sDisplayChoices = '<ul>';
 			$i = 0;
@@ -104,7 +116,7 @@ class WizStepLandingBeforeAudit extends WizStepModulesChoice
 
 	public function GetPossibleSteps()
 	{
-		return [WizStepDataAudit::class];
+		return [WizStepDataAudit::class, WizStepModulesChoice::class];
 	}
 
 	public function GetNextButtonLabel()

setup/wizardsteps/WizStepModulesChoice.php

@@ -702,8 +702,8 @@ EOF
 	protected function GetStepInfo($idx = null)
 	{
 		$index = $idx ?? $this->GetStepIndex();
-		$bRemoteExtensionsShouldBeMandatory = !$this->oWizard->GetParameter('force-uninstall', false);
 		if (is_null($this->aSteps)) {
+			$bRemoteExtensionsShouldBeMandatory = !$this->oWizard->GetParameter('force-uninstall', false);
 			$this->oWizard->SetParameter('additional_extensions_modules', json_encode([])); // Default value, no additional extensions
 
 			if (@file_exists($this->GetSourceFilePath())) {
@@ -817,15 +817,7 @@ EOF
 		foreach ($aOptions as $index => $aChoice) {
 			$sChoiceId = $sParentId.self::$SEP.$index;
 			$aFlags = $this->ComputeChoiceFlags($aChoice, $sChoiceId, $aSelectedComponents, $bAllDisabled, $bDisableUninstallCheck, $this->bUpgrade);
-
-			if (!$aFlags['checked'] && $aFlags['installed'] && !$bDisableUninstallCheck && (!$aFlags['uninstallable'] || $aFlags['mandatory'])) {
-				// If the user cannot uninstall a mandatory extension, he cannot move forward unless he uses the "force-uninstall" option
-				// The same applies if the extension is not uninstallable (i.e. a product extension)
-				$this->bCanMoveForward = false;
-			} elseif ($aFlags['checked'] && $aFlags['disabled'] && $aFlags['dependency_issue'] && !$bDisableUninstallCheck) {
-				// If there is a dependency issue on a selected and disabled extension, the user cannot move forward unless he uses the "force-uninstall" option
-				$this->bCanMoveForward = false;
-			}
+			$this->bCanMoveForward = $this->bCanMoveForward && $this->CanMoveForwardFromChoiceFlags($aFlags, $bDisableUninstallCheck);
 
 			$this->DisplayChoice($oPage, $aChoice, $aSelectedComponents, $aDefaults, $sChoiceId, $sChoiceId, $aFlags);
 		}
@@ -872,6 +864,20 @@ EOF
 		}
 	}
 
+	protected function CanMoveForwardFromChoiceFlags(array $aFlags, bool $bDisableUninstallCheck): bool
+	{
+		if (!$aFlags['checked'] && $aFlags['installed'] && !$bDisableUninstallCheck && (!$aFlags['uninstallable'] || $aFlags['mandatory'])) {
+			// If the user cannot uninstall a mandatory extension, he cannot move forward unless he uses the "force-uninstall" option
+			// The same applies if the extension is not uninstallable (i.e. a product extension)
+			return false;
+		} elseif ($aFlags['checked'] && $aFlags['disabled'] && $aFlags['dependency_issue'] && !$bDisableUninstallCheck) {
+			// If there is a dependency issue on a selected and disabled extension, the user cannot move forward unless he uses the "force-uninstall" option
+			return false;
+		}
+
+		return true;
+	}
+
 	protected function DisplayChoice($oPage, $aChoice, $aSelectedComponents, $aDefaults, $sChoiceName, $sChoiceId, $aFlags, $sInputType = 'checkbox')
 	{
 		$sMoreInfo = (isset($aChoice['more_info']) && ($aChoice['more_info'] != '')) ? '

sources/Application/WebPage/iTopWebPage.php

@@ -826,9 +826,7 @@ HTML;
 
 		/** @var \iBackofficeSassExtension $oExtensionInstance */
 		foreach (MetaModel::EnumPlugins('iBackofficeSassExtension') as $oExtensionInstance) {
-			foreach ($oExtensionInstance->GetSassRelPaths() as $sSassFileRelPath) {
-				$this->add_saas($sSassFileRelPath);
-			}
+			$this->add_saas($oExtensionInstance->GetSass());
 		}
 
 		// TODO 3.0.0 not displayed ?

synchro/synchrodatasource.class.inc.php

@@ -2403,7 +2403,7 @@ class SynchroReplica extends DBObject implements iDisplay
 	public function ReSynchro(): SynchroLog
 	{
 		$oDataSource = MetaModel::GetObject(SynchroDataSource::class, $this->Get('sync_source_id'));
-		SynchroExecution::$m_oCurrentTask = $oDataSource;
+
 		$oStatLog = new SynchroLog();
 		$oStatLog->Set('sync_source_id', $oDataSource->GetKey());
 		$oStatLog->Set('start_date', time());
@@ -2464,7 +2464,7 @@ class SynchroReplica extends DBObject implements iDisplay
 
 		$this->Synchro($oDataSource, $aReconciliationKeys, $aAttributesToUpdate, $oChange, $oStatLog);
 		$this->DBUpdate();
-		SynchroExecution::$m_oCurrentTask = null;
+
 		return $oStatLog;
 	}
 
@@ -2884,7 +2884,7 @@ class SynchroReplica extends DBObject implements iDisplay
 			$oActionsToolbar->AddSubBlock($oActionButton);
 		}
 
-		$sUrl = "{$sRootUrl}pages/$sUIPage?operation=details&class=$sClass&id=$sId{$sContext}";
+		$sUrl = "{$sRootUrl}pages/$sUIPage?operation=display&class=$sClass&id=$sId{$sContext}";
 		$oActionButton = ButtonUIBlockFactory::MakeAlternativeNeutral('', 'UI:Button:Refresh');
 		$oActionButton->SetIconClass('fas fa-sync-alt')
 			->SetOnClickJsCode('window.location.href=\''.$sUrl.'\'')

tests/php-unit-tests/unitary-tests/application/applicationextension/Delta/application-extension-usages-in-snippets.xml

@@ -222,11 +222,9 @@ CSS;
       <content><![CDATA[
 class ExampleFor_iBackofficeSassExtension implements \iBackofficeSassExtension
 {
-	public function GetSassRelPaths(): array
+	public function GetSass(): string
 	{
-		return [
-		  "css/setup.scss"
-    ];
+		return "css/setup.scss";
 	}
 }
       ]]></content>

tests/php-unit-tests/unitary-tests/setup/ModuleInstallerAPITest.php

@@ -344,25 +344,17 @@ SQL
 	}
 
 	/**
-	 * Doesn't test the localized data per se, but test that sample data are indeed loaded on a version crossing
 	 * @covers \ModuleInstallerAPI::LoadLocalizedDataOnCrossingVersion
 	 */
 	public function testLoadLocalizedData_LoadsWhenVersionCrossingIsTrue(): void
 	{
-		[$oConfig, $sPattern] = $this->GivenLocalizedDataTestContext('en_us', 'data.sample.organizations.en_us.xml');
+		$this->markTestSkipped('Test skipped because failing in CI. Investigation required, cf Bug N°9787');
 
-		// Get the original number of organization
-		$oOriginalOrganizationSet = new \DBObjectSet(\DBSearch::FromOQL("SELECT Organization"));
-		$iOriginalOrganizationCount = $oOriginalOrganizationSet->Count();
-		// We expect original + 6 (data.sample.organizations.en_us.xml number of organization) organization
-		$iExpectedOrganizationCount = $iOriginalOrganizationCount + 6;
+		[$oConfig, $sPattern] = $this->GivenLocalizedDataTestContext('FR FR', 'data.sample.organizations.en_us.xml');
 
 		ModuleInstallerAPI::LoadLocalizedDataOnCrossingVersion($oConfig, '3.0.0', '3.2.0', '3.1.0', $sPattern);
 
-		$oFinalOrganizationSet = new \DBObjectSet(\DBSearch::FromOQL("SELECT Organization"));
-		$iFinalOrganizationCount = $oFinalOrganizationSet->Count();
-
-		$this->assertEquals($iExpectedOrganizationCount, $iFinalOrganizationCount);
+		$this->AssertOrganizationNamesExist(['Client (Test)', 'Département informatique (Test)']);
 	}
 	/**
 	 * Test that loading a file twice (because of the version conditions) does not create duplicates (idempotent loading).