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

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source 
# Conflicts:
#	core/config.class.inc.php
This commit is contained in:
Molkobain
2022-01-12 15:54:18 +01:00
parent c17ceb1702 31e7a5383c
commit 812606db78
93 changed files with 4027 additions and 3667 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
datamodels/2.x/itop-service-mgmt-provider/dictionaries/tr.dict.itop-service-mgmt-provider.php
View File

@@ -73,9 +73,9 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
//
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Class:Organization/Attribute:deliverymodel_id' => 'Delivery model~~',
'Class:Organization/Attribute:deliverymodel_id' => 'Teslimat Modeli',
'Class:Organization/Attribute:deliverymodel_id+' => '~~',
'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name~~',
'Class:Organization/Attribute:deliverymodel_name' => 'Teslimat Modeli Adı',
'Class:Organization/Attribute:deliverymodel_name+' => '~~',
));