Merge remote-tracking branch 'origin/support/2.5' into release/2.6

# Conflicts:
#	datamodels/2.x/itop-attachments/zh.dict.itop-attachments.php
#	datamodels/2.x/itop-backup/zh.dict.itop-backup.php
#	datamodels/2.x/itop-change-mgmt-itil/zh.dict.itop-change-mgmt-itil.php
#	datamodels/2.x/itop-change-mgmt/zh.dict.itop-change-mgmt.php
#	datamodels/2.x/itop-config-mgmt/es_cr.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-config/zh.dict.itop-config.php
#	datamodels/2.x/itop-datacenter-mgmt/zh.dict.itop-datacenter-mgmt.php
#	datamodels/2.x/itop-hub-connector/zh.dict.itop-hub-connector.php
#	datamodels/2.x/itop-incident-mgmt-itil/zh.dict.itop-incident-mgmt-itil.php
#	datamodels/2.x/itop-knownerror-mgmt/zh.dict.itop-knownerror-mgmt.php
#	datamodels/2.x/itop-portal-base/zh.dict.itop-portal-base.php
#	datamodels/2.x/itop-problem-mgmt/es_cr.dict.itop-problem-mgmt.php
#	datamodels/2.x/itop-problem-mgmt/zh.dict.itop-problem-mgmt.php
#	datamodels/2.x/itop-request-mgmt-itil/es_cr.dict.itop-request-mgmt-itil.php
#	datamodels/2.x/itop-request-mgmt-itil/zh.dict.itop-request-mgmt-itil.php
#	datamodels/2.x/itop-request-mgmt/es_cr.dict.itop-request-mgmt.php
#	datamodels/2.x/itop-request-mgmt/zh.dict.itop-request-mgmt.php
#	datamodels/2.x/itop-service-mgmt-provider/zh.dict.itop-service-mgmt-provider.php
#	datamodels/2.x/itop-service-mgmt/zh.dict.itop-service-mgmt.php
#	datamodels/2.x/itop-tickets/zh.dict.itop-tickets.php
#	datamodels/2.x/itop-welcome-itil/zh.dict.itop-welcome-itil.php
#	dictionaries/zh.dictionary.itop.core.php
#	dictionaries/zh.dictionary.itop.ui.php
This commit is contained in:
Pierre Goiffon
2018-12-10 08:38:19 +01:00
27 changed files with 4833 additions and 4948 deletions

View File

@@ -3,7 +3,7 @@
//
// This file is part of iTop.
//
// iTop is free software; you can redistribute it and/or modify
// 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.
@@ -15,42 +15,44 @@
//
// You should have received a copy of the GNU Affero General Public License
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* @copyright Copyright (C) 2010-2014 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Menu:DataSources' => 'Synchronization Data Sources~~',
'Menu:DataSources+' => 'All Synchronization Data Sources~~',
'Menu:DataSources' => '同步数据源',
'Menu:DataSources+' => '所有同步数据源',
'Menu:WelcomeMenu' => '欢迎',
'Menu:WelcomeMenu+' => '欢迎来到iTop',
'Menu:WelcomeMenu+' => '欢迎使用iTop',
'Menu:WelcomeMenuPage' => '欢迎',
'Menu:WelcomeMenuPage+' => '欢迎来到iTop',
'Menu:WelcomeMenuPage+' => '欢迎使用iTop',
'Menu:AdminTools' => '管理工具',
'Menu:AdminTools+' => '管理工具',
'Menu:AdminTools?' => '具有系统管理员简档的用户才能获得的工具',
'Menu:AdminTools?' => '具有管理员角色的用户才能使用的工具',
'Menu:DataModelMenu' => '数据模型',
'Menu:DataModelMenu+' => '数据模型概',
'Menu:DataModelMenu+' => '数据模型概',
'Menu:ExportMenu' => '导出',
'Menu:ExportMenu+' => '以HTML, CSV or XML格式导出任何查询的结果',
'Menu:ExportMenu+' => '以HTML, CSV XML 格式导出任何查询的结果',
'Menu:NotificationsMenu' => '通知',
'Menu:NotificationsMenu+' => '通知的配置',
'Menu:AuditCategories' => '审计类',
'Menu:AuditCategories+' => '审计类',
'Menu:Notifications:Title' => '审计类',
'Menu:NotificationsMenu+' => '配置通知',
'Menu:AuditCategories' => '审计类',
'Menu:AuditCategories+' => '审计类',
'Menu:Notifications:Title' => '审计类',
'Menu:RunQueriesMenu' => '运行查询',
'Menu:RunQueriesMenu+' => '运行任何查询',
'Menu:QueryMenu' => 'Query phrasebook~~',
'Menu:QueryMenu+' => 'Query phrasebook~~',
'Menu:UniversalSearchMenu' => '通用搜索',
'Menu:QueryMenu' => '查询手册',
'Menu:QueryMenu+' => '查询手册',
'Menu:UniversalSearchMenu' => '全局搜索',
'Menu:UniversalSearchMenu+' => '搜索所有...',
'Menu:UserManagementMenu' => '用户管理',
'Menu:UserManagementMenu+' => '用户管理',
'Menu:ProfilesMenu' => '简档',
'Menu:ProfilesMenu+' => '简档',
'Menu:ProfilesMenu:Title' => '简档',
'Menu:ProfilesMenu' => '角色',
'Menu:ProfilesMenu+' => '角色',
'Menu:ProfilesMenu:Title' => '角色',
'Menu:UserAccountsMenu' => '用户帐户',
'Menu:UserAccountsMenu+' => '用户帐户',
'Menu:UserAccountsMenu:Title' => '用户帐户',
'Menu:MyShortcuts' => 'My Shortcuts~~',
'Menu:MyShortcuts' => '我的快捷方式',
));