composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-22 00:32:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	core/htmlsanitizer.class.inc.php
#	css/css-variables.scss
#	css/light-grey.css
#	datamodels/2.x/version.xml
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	synchro/synchrodatasource.class.inc.php
This commit is contained in:
Eric
2019-06-20 16:11:38 +02:00
parent b1761e04b2 5c341138e1
commit e68340273b
232 changed files with 7198 additions and 6186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-tickets/zh_cn.dict.itop-tickets.php
View File

@@ -67,7 +67,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Class:Ticket/Attribute:close_date+' => '',
'Class:Ticket/Attribute:private_log' => '私信',
'Class:Ticket/Attribute:private_log+' => '',
'Class:Ticket/Attribute:contacts_list' => '联系人',
'Class:Ticket/Attribute:contacts_list' => '联系人',
'Class:Ticket/Attribute:contacts_list+' => '该工单相关的所有联系人',
'Class:Ticket/Attribute:functionalcis_list' => '配置项',
'Class:Ticket/Attribute:functionalcis_list+' => '该工单相关的所有配置项.',