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

# Conflicts:
#	composer.json
#	setup/setuputils.class.inc.php
This commit is contained in:
Pierre Goiffon
2018-12-17 17:04:39 +01:00
25 changed files with 18 additions and 4 deletions

View File

@@ -0,0 +1,56 @@
<?php
// Copyright (C) 2010-2014 Combodo SARL
//
// 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/>
/**
* @copyright Copyright (C) 2010-2014 Combodo SARL
* @license http://opensource.org/licenses/AGPL-3.0
*/
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Menu:DataSources' => '同步数据源',
'Menu:DataSources+' => '所有同步数据源',
'Menu:WelcomeMenu' => '欢迎',
'Menu:WelcomeMenu+' => '欢迎使用iTop',
'Menu:WelcomeMenuPage' => '欢迎',
'Menu:WelcomeMenuPage+' => '欢迎使用iTop',
'Menu:AdminTools' => '管理工具',
'Menu:AdminTools+' => '管理工具',
'Menu:AdminTools?' => '具有管理员角色的用户才能使用的工具',
'Menu:DataModelMenu' => '数据模型',
'Menu:DataModelMenu+' => '数据模型概况',
'Menu:ExportMenu' => '导出',
'Menu:ExportMenu+' => '以HTML, CSV 或XML 格式导出任何查询的结果',
'Menu:NotificationsMenu' => '通知',
'Menu:NotificationsMenu+' => '配置通知',
'Menu:AuditCategories' => '审计类别',
'Menu:AuditCategories+' => '审计类别',
'Menu:Notifications:Title' => '审计类别',
'Menu:RunQueriesMenu' => '运行查询',
'Menu:RunQueriesMenu+' => '运行任何查询',
'Menu:QueryMenu' => '查询手册',
'Menu:QueryMenu+' => '查询手册',
'Menu:UniversalSearchMenu' => '全局搜索',
'Menu:UniversalSearchMenu+' => '搜索所有...',
'Menu:UserManagementMenu' => '用户管理',
'Menu:UserManagementMenu+' => '用户管理',
'Menu:ProfilesMenu' => '角色',
'Menu:ProfilesMenu+' => '角色',
'Menu:ProfilesMenu:Title' => '角色',
'Menu:UserAccountsMenu' => '用户帐户',
'Menu:UserAccountsMenu+' => '用户帐户',
'Menu:UserAccountsMenu:Title' => '用户帐户',
'Menu:MyShortcuts' => '我的快捷方式',
));