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

Merge remote-tracking branch 'origin/support/3.1' into support/3.2

Browse Source 
# Conflicts:
#	datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
#	datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
#	datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
#	dictionaries/cs.dictionary.itop.core.php
#	dictionaries/cs.dictionary.itop.ui.php
#	dictionaries/zh_cn.dictionary.itop.core.php
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	tests/php-unit-tests/README.md
This commit is contained in:
Pierre Goiffon
2024-02-14 14:51:59 +01:00
parent 41eb927480 391c78ae42
commit 85dac470aa
127 changed files with 1021 additions and 950 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-service-mgmt/dictionaries/da.dict.itop-service-mgmt.php
View File

@@ -338,7 +338,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Class:SLA/Attribute:slts_list' => 'SLTs',
'Class:SLA/Attribute:slts_list+' => 'Service Level Threshholds:',
'Class:SLA/Attribute:customercontracts_list' => 'Kunde kontrakter',
'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracted services using this SLA~~',
'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
));

2
datamodels/2.x/itop-service-mgmt/dictionaries/it.dict.itop-service-mgmt.php
View File

@@ -348,7 +348,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Class:SLA/Attribute:slts_list' => 'SLTs~~',
'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
'Class:SLA/Attribute:customercontracts_list' => 'Customer contracts~~',
'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracted services using this SLA~~',
'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
));

2
datamodels/2.x/itop-service-mgmt/dictionaries/ja.dict.itop-service-mgmt.php
View File

@@ -337,7 +337,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Class:SLA/Attribute:slts_list' => 'SLT',
'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
'Class:SLA/Attribute:customercontracts_list' => '顧客連絡先',
'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracted services using this SLA~~',
'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
));

2
datamodels/2.x/itop-service-mgmt/dictionaries/sk.dict.itop-service-mgmt.php
View File

@@ -347,7 +347,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Class:SLA/Attribute:slts_list' => 'SLTs',
'Class:SLA/Attribute:slts_list+' => 'All the service level targets for this SLA~~',
'Class:SLA/Attribute:customercontracts_list' => 'Zákaznícke zmluvy',
'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracts using this SLA~~',
'Class:SLA/Attribute:customercontracts_list+' => 'All the customer contracted services using this SLA~~',
'Class:SLA/Error:UniqueLnkCustomerContractToService' => 'Could not save link with Customer contract %1$s and service %2$s : SLA already exists~~',
));