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

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

Browse Source 
# Conflicts:
#	core/cmdbsource.class.inc.php
#	core/config.class.inc.php
#	core/displayablegraph.class.inc.php
#	core/log.class.inc.php
#	datamodels/2.x/itop-config-mgmt/dictionaries/tr.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-knownerror-mgmt/dictionaries/tr.dict.itop-knownerror-mgmt.php
#	datamodels/2.x/itop-service-mgmt/dictionaries/tr.dict.itop-service-mgmt.php
#	datamodels/2.x/itop-tickets/tr.dict.itop-tickets.php
#	datamodels/2.x/itop-welcome-itil/tr.dict.itop-welcome-itil.php
#	dictionaries/tr.dictionary.itop.core.php
#	dictionaries/tr.dictionary.itop.ui.php
#	pages/UI.php
#	setup/itopdesignformat.class.inc.php
#	test/core/LogAPITest.php
#	test/integration/iTopModulesPhpVersionChecklistTest.php
#	test/postbuild_integration/SetupCssIntegrityChecklistTest.php
#	test/postbuild_integration/iTopModuleXmlInstallationChecklistTest.php
#	test/status/StatusTest.php
This commit is contained in:
Pierre Goiffon
2022-01-10 16:15:00 +01:00
parent 9b0e55210d e530cbb4f2
commit 8578d18e7f
43 changed files with 1944 additions and 1840 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+' => '~~',
));