Merge branch 'support/3.2' into develop

# Conflicts: # dictionaries/ui/components/quick-create/zh_cn.dictionary.itop.quick-create.php # dictionaries/zh_cn.dictionary.itop.core.php # setup/runtimeenv.class.inc.php
2026-05-20 07:42:17 +02:00 · 2024-12-16 18:38:07 +01:00
parent 96414dcc98 0a3b02bf45
commit 9fdf183851
67 changed files with 8559 additions and 5796 deletions
--- a/datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php
+++ b/datamodels/2.x/itop-change-mgmt/dictionaries/zh_cn.dict.itop-change-mgmt.php
@@ -4,16 +4,81 @@
 *
 * @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
+ * along with iTop. If not, see <http://www.gnu.org/licenses/>
 */
+
+Dict::Add('ZH CN', 'Chinese', '简体中文', [
+	'Menu:ChangeManagement' => '变更管理',
+	'Menu:Change:Overview' => '概况',
+	'Menu:Change:Overview+' => '',
+	'Menu:NewChange' => '新建变更',
+	'Menu:NewChange+' => '新建变更',
+	'Menu:SearchChanges' => '搜索变更',
+	'Menu:SearchChanges+' => '搜索变更',
+	'Menu:Change:Shortcuts' => '快捷方式',
+	'Menu:Change:Shortcuts+' => '',
+	'Menu:WaitingAcceptance' => '等待审核的变更',
+	'Menu:WaitingAcceptance+' => '',
+	'Menu:WaitingApproval' => '等待批准的变更',
+	'Menu:WaitingApproval+' => '',
+	'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:RecentChanges' => '最近的变更 (72小时)',
+]);
+
+// Dictionnay conventions
+// Class:<class_name>
+// Class:<class_name>+
+// Class:<class_name>/Attribute:<attribute_code>
+// Class:<class_name>/Attribute:<attribute_code>+
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>
+// Class:<class_name>/Attribute:<attribute_code>/Value:<value>+
+// Class:<class_name>/Stimulus:<stimulus_code>
+// Class:<class_name>/Stimulus:<stimulus_code>+
+
+
+//
+// Class: Change
+//
+
 Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change' => '变更',
 	'Class:Change+' => '',
-	'Class:Change/Attribute:approval_date' => '审批日期',
-	'Class:Change/Attribute:approval_date+' => '',
+	'Class:Change/Attribute:status' => '状态',
+	'Class:Change/Attribute:status+' => '',
+	'Class:Change/Attribute:status/Value:new' => '新建',
+	'Class:Change/Attribute:status/Value:new+' => '',
+	'Class:Change/Attribute:status/Value:assigned' => '已分配',
+	'Class:Change/Attribute:status/Value:assigned+' => '',
+	'Class:Change/Attribute:status/Value:planned' => '已计划',
+	'Class:Change/Attribute:status/Value:planned+' => '',
+	'Class:Change/Attribute:status/Value:rejected' => '已驳回',
+	'Class:Change/Attribute:status/Value:rejected+' => '',
+	'Class:Change/Attribute:status/Value:approved' => '已批准',
+	'Class:Change/Attribute:status/Value:approved+' => '',
+	'Class:Change/Attribute:status/Value:closed' => '已关闭',
+	'Class:Change/Attribute:status/Value:closed+' => '',
 	'Class:Change/Attribute:category' => '类型',
 	'Class:Change/Attribute:category+' => '',
 	'Class:Change/Attribute:category/Value:application' => '应用',
@@ -28,83 +93,48 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'Class:Change/Attribute:category/Value:software+' => '软件',
 	'Class:Change/Attribute:category/Value:system' => '系统',
 	'Class:Change/Attribute:category/Value:system+' => '系统',
-	'Class:Change/Attribute:changemanager_email' => '邮箱',
-	'Class:Change/Attribute:changemanager_email+' => '',
-	'Class:Change/Attribute:changemanager_id' => '变更经理',
-	'Class:Change/Attribute:changemanager_id+' => '',
-	'Class:Change/Attribute:child_changes_list' => '子变更',
-	'Class:Change/Attribute:child_changes_list+' => '此变更相关的所有子变更',
-	'Class:Change/Attribute:creation_date' => '创建日期',
-	'Class:Change/Attribute:creation_date+' => '',
-	'Class:Change/Attribute:fallback_plan' => '回滚计划',
-	'Class:Change/Attribute:fallback_plan+' => '',
-	'Class:Change/Attribute:outage' => '停机',
-	'Class:Change/Attribute:outage+' => '',
-	'Class:Change/Attribute:outage/Value:no' => '否',
-	'Class:Change/Attribute:outage/Value:no+' => '',
-	'Class:Change/Attribute:outage/Value:yes' => '是',
-	'Class:Change/Attribute:outage/Value:yes+' => '',
-	'Class:Change/Attribute:parent_id' => '父级变更',
-	'Class:Change/Attribute:parent_id+' => '',
-	'Class:Change/Attribute:parent_id_friendlyname' => '父级变更昵称',
-	'Class:Change/Attribute:parent_id_friendlyname+' => '',
-	'Class:Change/Attribute:parent_name' => '变更编号',
-	'Class:Change/Attribute:parent_name+' => '',
 	'Class:Change/Attribute:reject_reason' => '驳回原因',
 	'Class:Change/Attribute:reject_reason+' => '',
+	'Class:Change/Attribute:changemanager_id' => '变更经理',
+	'Class:Change/Attribute:changemanager_id+' => '',
+	'Class:Change/Attribute:changemanager_email' => '邮箱',
+	'Class:Change/Attribute:changemanager_email+' => '',
+	'Class:Change/Attribute:parent_id' => '父级变更',
+	'Class:Change/Attribute:parent_id+' => '',
+	'Class:Change/Attribute:parent_name' => '变更编号',
+	'Class:Change/Attribute:parent_name+' => '',
+	'Class:Change/Attribute:creation_date' => '创建日期',
+	'Class:Change/Attribute:creation_date+' => '',
+	'Class:Change/Attribute:approval_date' => '审批日期',
+	'Class:Change/Attribute:approval_date+' => '',
+	'Class:Change/Attribute:fallback_plan' => '回滚计划',
+	'Class:Change/Attribute:fallback_plan+' => '',
+	'Class:Change/Attribute:related_request_list' => '相关需求',
+	'Class:Change/Attribute:related_request_list+' => '此变更相关的所有用户需求',
 	'Class:Change/Attribute:related_incident_list' => '相关事件',
 	'Class:Change/Attribute:related_incident_list+' => '此变更相关的所有事件',
 	'Class:Change/Attribute:related_problems_list' => '相关问题',
 	'Class:Change/Attribute:related_problems_list+' => '此变更相关的所有问题',
-	'Class:Change/Attribute:related_request_list' => '相关需求',
-	'Class:Change/Attribute:related_request_list+' => '此变更相关的所有用户需求',
-	'Class:Change/Attribute:status' => '状态',
-	'Class:Change/Attribute:status+' => '',
-	'Class:Change/Attribute:status/Value:approved' => '已批准',
-	'Class:Change/Attribute:status/Value:approved+' => '',
-	'Class:Change/Attribute:status/Value:assigned' => '已分配',
-	'Class:Change/Attribute:status/Value:assigned+' => '',
-	'Class:Change/Attribute:status/Value:closed' => '已关闭',
-	'Class:Change/Attribute:status/Value:closed+' => '',
-	'Class:Change/Attribute:status/Value:new' => '新建',
-	'Class:Change/Attribute:status/Value:new+' => '',
-	'Class:Change/Attribute:status/Value:planned' => '已计划',
-	'Class:Change/Attribute:status/Value:planned+' => '',
-	'Class:Change/Attribute:status/Value:rejected' => '已驳回',
-	'Class:Change/Attribute:status/Value:rejected+' => '',
-	'Class:Change/Stimulus:ev_approve' => '批准',
-	'Class:Change/Stimulus:ev_approve+' => '',
+	'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/Stimulus:ev_assign' => '分配',
 	'Class:Change/Stimulus:ev_assign+' => '',
-	'Class:Change/Stimulus:ev_finish' => '关闭',
-	'Class:Change/Stimulus:ev_finish+' => '',
 	'Class:Change/Stimulus:ev_plan' => '计划',
 	'Class:Change/Stimulus:ev_plan+' => '',
 	'Class:Change/Stimulus:ev_reject' => '驳回',
 	'Class:Change/Stimulus:ev_reject+' => '',
 	'Class:Change/Stimulus:ev_reopen' => '重新打开',
 	'Class:Change/Stimulus:ev_reopen+' => '',
-	'Menu:Change:Overview' => '概况',
-	'Menu:Change:Overview+' => '',
-	'Menu:Change:Shortcuts' => '快捷方式',
-	'Menu:Change:Shortcuts+' => '',
-	'Menu:ChangeManagement' => '变更管理',
-	'Menu:Changes' => '所有打开的变更',
-	'Menu:Changes+' => '所有打开的变更',
-	'Menu:MyChanges' => '分配给我的变更',
-	'Menu:MyChanges+' => '分配给我的变更 (作为办理人)',
-	'Menu:NewChange' => '新建变更',
-	'Menu:NewChange+' => '新建变更',
-	'Menu:SearchChanges' => '搜索变更',
-	'Menu:SearchChanges+' => '搜索变更',
-	'Menu:WaitingAcceptance' => '等待审核的变更',
-	'Menu:WaitingAcceptance+' => '',
-	'Menu:WaitingApproval' => '等待批准的变更',
-	'Menu:WaitingApproval+' => '',
-	'Tickets:Related:OpenChanges' => '打开的变更',
-	'Tickets:Related:RecentChanges' => '最近的变更 (72小时)',
-	'UI-ChangeManagementOverview-ChangeByCategory-last-7-days' => '最近一周的变更 (按类型)',
-	'UI-ChangeManagementOverview-ChangeByDomain-last-7-days' => '最近一周的变更 (按范围)',
-	'UI-ChangeManagementOverview-ChangeByStatus-last-7-days' => '最近一周的变更 (按状态)',
-	'UI-ChangeManagementOverview-Last-7-days' => '最近一周的变更 (按数量）',
+	'Class:Change/Stimulus:ev_approve' => '批准',
+	'Class:Change/Stimulus:ev_approve+' => '',
+	'Class:Change/Stimulus:ev_finish' => '关闭',
+	'Class:Change/Stimulus:ev_finish+' => '',
+	'Class:Change/Attribute:outage' => '停机',
+	'Class:Change/Attribute:outage+' => '',
+	'Class:Change/Attribute:outage/Value:no' => '否',
+	'Class:Change/Attribute:outage/Value:no+' => '',
+	'Class:Change/Attribute:outage/Value:yes' => '是',
+	'Class:Change/Attribute:outage/Value:yes+' => '',
 ]);