composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'support/2.7' into develop

Browse Source 
# Conflicts:
#	README.md
#	composer.json
#	composer.lock
#	core/cmdbsource.class.inc.php
#	core/dbobject.class.php
#	datamodels/2.x/combodo-db-tools/db_analyzer.class.inc.php
#	datamodels/2.x/combodo-db-tools/dbtools.php
#	datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
#	datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
#	datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
#	dictionaries/zh_cn.dictionary.itop.core.php
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	lib/composer/InstalledVersions.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.php
#	lib/composer/platform_check.php
#	pages/ajax.render.php
#	pages/csvimport.php
#	setup/ajax.dataloader.php
#	setup/index.php
#	setup/setuputils.class.inc.php
#	test/application/UtilsTest.php
This commit is contained in:
Pierre Goiffon
2021-06-14 16:19:56 +02:00
parent 51e24a4e35 3a876d5c75
commit d8e2a1cc7c
65 changed files with 3743 additions and 3485 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
dictionaries/zh_cn.dictionary.itop.core.php
View File

@@ -205,7 +205,7 @@ Operators:<br/>
'Core:AttributeTag' => '标签',
'Core:AttributeTag+' => '标签',
'Core:Context=REST/JSON' => 'REST~~',
'Core:Context=REST/JSON' => 'REST',
'Core:Context=Synchro' => 'Synchro~~',
'Core:Context=Setup' => '安装向导',
'Core:Context=GUI:Console' => 'Console~~',
@@ -550,7 +550,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:Trigger' => '触发器',
'Class:Trigger+' => 'Custom event handler',
'Class:Trigger/Attribute:description' => '描述',
'Class:Trigger/Attribute:description+' => '一行描述',
'Class:Trigger/Attribute:description+' => '简短描述',
'Class:Trigger/Attribute:action_list' => '触发的行为',
'Class:Trigger/Attribute:action_list+' => 'Actions performed when the trigger is activated',
'Class:Trigger/Attribute:finalclass' => '触发器子类别',
@@ -767,7 +767,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:SynchroDataSource/Error:DeletePolicyUpdateMustBeSpecified' => 'Obsolete objects are to be updated, but no update is specified.',
'Class:SynchroDataSource/Error:DataTableAlreadyExists' => 'The table %1$s already exists in the database. Please use another name for the synchro data table.',
'Core:SynchroReplica:PublicData' => '公共数据',
'Core:SynchroReplica:PrivateDetails' => 'Private Details',
'Core:SynchroReplica:PrivateDetails' => '专属详情',
'Core:SynchroReplica:BackToDataSource' => '返回同步数据源: %1$s',
'Core:SynchroReplica:ListOfReplicas' => 'List of Replica',
'Core:SynchroAttExtKey:ReconciliationById' => 'id (Primary Key)',
@@ -941,11 +941,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Core:BulkExport:OptionLinkSets' => '包含外链的对象',
'Core:BulkExport:OptionFormattedText' => '保持文本格式',
'Core:BulkExport:ScopeDefinition' => '定义要导出的对象',
'Core:BulkExportLabelOQLExpression' => 'OQL Query:',
'Core:BulkExportLabelOQLExpression' => 'OQL 查询:',
'Core:BulkExportLabelPhrasebookEntry' => 'Query Phrasebook Entry:',
'Core:BulkExportMessageEmptyOQL' => 'Please enter a valid OQL query.',
'Core:BulkExportMessageEmptyOQL' => '请输入有效的OQL 查询.',
'Core:BulkExportMessageEmptyPhrasebookEntry' => 'Please select a valid phrasebook entry.',
'Core:BulkExportQueryPlaceholder' => 'Type an OQL query here...',
'Core:BulkExportQueryPlaceholder' => '请在这里输入OQL 查询...',
'Core:BulkExportCanRunNonInteractive' => '点击这里运行非交互式导出.',
'Core:BulkExportLegacyExport' => '点击这里进入旧版导出.',
'Core:BulkExport:XLSXOptions' => 'Excel 选项',
@@ -982,7 +982,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:TagSetFieldData+' => '~~',
'Class:TagSetFieldData/Attribute:code' => '代码',
'Class:TagSetFieldData/Attribute:code+' => 'Internal code. Must contain at least 3 alphanumeric characters~~',
'Class:TagSetFieldData/Attribute:code+' => '内部代码. 必须至少包含3个数字或字母',
'Class:TagSetFieldData/Attribute:label' => '标签',
'Class:TagSetFieldData/Attribute:label+' => '显示的标签',
'Class:TagSetFieldData/Attribute:description' => '描述',