mirror of
https://github.com/Combodo/iTop.git
synced 2026-05-19 15:22:17 +02:00
Merge remote-tracking branch 'origin/support/2.7' into support/3.0
# 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:
@@ -97,17 +97,17 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
//
|
||||
|
||||
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Class:lnkErrorToFunctionalCI' => 'Link Error / FunctionalCI~~',
|
||||
'Class:lnkErrorToFunctionalCI+' => 'Infra related to a known error~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI~~',
|
||||
'Class:lnkErrorToFunctionalCI' => 'Hata / İşlevsel CI bağla',
|
||||
'Class:lnkErrorToFunctionalCI+' => ' Bilinen bir hatayla ilgili alt bilgi',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id' => 'CI',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_id+' => '~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI name~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name' => 'CI Adı',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:functionalci_name+' => '~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Error~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:error_id' => 'Hata',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:error_id+' => '~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Error name~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:error_name' => 'Hata Adı',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:error_name+' => '~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Reason~~',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:reason' => 'Sebep',
|
||||
'Class:lnkErrorToFunctionalCI/Attribute:reason+' => '~~',
|
||||
));
|
||||
|
||||
@@ -116,17 +116,17 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
//
|
||||
|
||||
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
|
||||
'Class:lnkDocumentToError' => 'Link Documents / Errors~~',
|
||||
'Class:lnkDocumentToError+' => 'A link between a document and a known error~~',
|
||||
'Class:lnkDocumentToError/Attribute:document_id' => 'Document~~',
|
||||
'Class:lnkDocumentToError' => 'Belge / hata bağla',
|
||||
'Class:lnkDocumentToError+' => 'Bir belge ile bilinen bir hata arasındaki bağlantı',
|
||||
'Class:lnkDocumentToError/Attribute:document_id' => 'Belge',
|
||||
'Class:lnkDocumentToError/Attribute:document_id+' => '~~',
|
||||
'Class:lnkDocumentToError/Attribute:document_name' => 'Document Name~~',
|
||||
'Class:lnkDocumentToError/Attribute:document_name' => 'Belge Adı',
|
||||
'Class:lnkDocumentToError/Attribute:document_name+' => '~~',
|
||||
'Class:lnkDocumentToError/Attribute:error_id' => 'Error~~',
|
||||
'Class:lnkDocumentToError/Attribute:error_id' => 'Hata',
|
||||
'Class:lnkDocumentToError/Attribute:error_id+' => '~~',
|
||||
'Class:lnkDocumentToError/Attribute:error_name' => 'Error name~~',
|
||||
'Class:lnkDocumentToError/Attribute:error_name' => 'Hata Adı',
|
||||
'Class:lnkDocumentToError/Attribute:error_name+' => '~~',
|
||||
'Class:lnkDocumentToError/Attribute:link_type' => 'link_type~~',
|
||||
'Class:lnkDocumentToError/Attribute:link_type' => 'Bağlantı tipi',
|
||||
'Class:lnkDocumentToError/Attribute:link_type+' => '~~',
|
||||
));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user