mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# Conflicts: # composer.json # composer.lock # core/config.class.inc.php # core/dbobject.class.php # core/email.class.inc.php # datamodels/2.x/itop-core-update/dictionaries/hu.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/nl.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/ru.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php # datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php # datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php # datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig # datamodels/2.x/itop-portal-base/portal/src/Twig/AppExtension.php # datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml # datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml # dictionaries/cs.dictionary.itop.core.php # dictionaries/cs.dictionary.itop.ui.php # dictionaries/da.dictionary.itop.core.php # dictionaries/da.dictionary.itop.ui.php # dictionaries/de.dictionary.itop.core.php # dictionaries/de.dictionary.itop.ui.php # dictionaries/en.dictionary.itop.ui.php # dictionaries/es_cr.dictionary.itop.core.php # dictionaries/es_cr.dictionary.itop.ui.php # dictionaries/fr.dictionary.itop.core.php # dictionaries/fr.dictionary.itop.ui.php # dictionaries/hu.dictionary.itop.core.php # dictionaries/hu.dictionary.itop.ui.php # dictionaries/it.dictionary.itop.core.php # dictionaries/it.dictionary.itop.ui.php # dictionaries/ja.dictionary.itop.core.php # dictionaries/ja.dictionary.itop.ui.php # dictionaries/nl.dictionary.itop.core.php # dictionaries/nl.dictionary.itop.ui.php # dictionaries/pt_br.dictionary.itop.core.php # dictionaries/pt_br.dictionary.itop.ui.php # dictionaries/ru.dictionary.itop.core.php # dictionaries/ru.dictionary.itop.ui.php # dictionaries/sk.dictionary.itop.core.php # dictionaries/sk.dictionary.itop.ui.php # dictionaries/tr.dictionary.itop.core.php # dictionaries/tr.dictionary.itop.ui.php # dictionaries/zh_cn.dictionary.itop.core.php # dictionaries/zh_cn.dictionary.itop.ui.php # lib/composer/autoload_classmap.php # lib/composer/autoload_real.php # lib/composer/autoload_static.php # lib/composer/installed.json # lib/composer/installed.php # sources/application/TwigBase/Controller/Controller.php # sources/application/TwigBase/Twig/TwigHelper.php
This commit is contained in:
Benjamin Dalsass
@@ -1661,30 +1661,46 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
|
||||
'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: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' => '我的快捷方式',
|
||||
'Menu:UserManagement' => '用户管理',
|
||||
'Menu:Queries' => '查询',
|
||||
'Menu:ConfigurationTools' => '配置',
|
||||
'Menu:MyShortcuts' => '我的快捷方式',
|
||||
'Menu:UserManagement' => '用户管理',
|
||||
'Menu:Queries' => '查询',
|
||||
'Menu:ConfigurationTools' => '配置',
|
||||
));
|
||||
|
||||
// OAuth
|
||||
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
|
||||
'Menu:OAuthWizardMenu' => 'OAuth 2.0~~',
|
||||
'core/Operation:Wizard/Title' => 'OAuth 2.0 Configuration~~',
|
||||
'UI:OAuth:Wizard:Page:Title' => 'OAuth 2.0 Configuration~~',
|
||||
'UI:OAuth:Wizard:Form:Panel:Title' => 'OAuth 2.0 Configuration~~',
|
||||
'UI:OAuth:Wizard:Form:Input:ClientId:Label' => 'Client Id~~',
|
||||
'UI:OAuth:Wizard:Form:Input:ClientSecret:Label' => 'Client Secret~~',
|
||||
'UI:OAuth:Wizard:Form:Input:Scope:Label' => 'Scope~~',
|
||||
'UI:OAuth:Wizard:Form:Input:Additional:Label' => 'Additional parameters~~',
|
||||
'UI:OAuth:Wizard:Form:Input:RedirectUri:Label' => 'Redirect Uri~~',
|
||||
'UI:OAuth:Wizard:Form:Button:Submit:Label' => 'Authentication~~',
|
||||
'UI:OAuth:Wizard:ResultConf:Panel:Title' => 'Configuration for SMTP~~',
|
||||
'UI:OAuth:Wizard:ResultConf:Panel:Description' => 'Paste this content into your configuration file to use this OAuth connection for your outgoing emails~~',
|
||||
));
|
||||
|
||||
// Additional language entries not present in English dict
|
||||
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
|
||||
'UI:Toggle:StandardDashboard' => '标准',
|
||||
'UI:Toggle:CustomDashboard' => '自定义',
|
||||
'UI:Dashboard:Edit' => '编辑这个页面...',
|
||||
'UI:Dashboard:Revert' => '还原到初始版本...',
|
||||
'UI:Toggle:StandardDashboard' => '标准',
|
||||
'UI:Toggle:CustomDashboard' => '自定义',
|
||||
'UI:Dashboard:Edit' => '编辑这个页面...',
|
||||
'UI:Dashboard:Revert' => '还原到初始版本...',
|
||||
));
|
||||
|
||||
Reference in New Issue
Block a user