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/3.0' into support/3.1

Browse Source 
# Conflicts:
#	datamodels/2.x/combodo-db-tools/dictionaries/zh_cn.dict.combodo-db-tools.php
#	datamodels/2.x/itop-attachments/dictionaries/zh_cn.dict.itop-attachments.php
#	datamodels/2.x/itop-backup/dictionaries/da.dict.itop-backup.php
#	datamodels/2.x/itop-backup/dictionaries/it.dict.itop-backup.php
#	datamodels/2.x/itop-backup/dictionaries/ja.dict.itop-backup.php
#	datamodels/2.x/itop-backup/dictionaries/sk.dict.itop-backup.php
#	datamodels/2.x/itop-backup/dictionaries/tr.dict.itop-backup.php
#	datamodels/2.x/itop-config-mgmt/dictionaries/it.dict.itop-config-mgmt.php
#	datamodels/2.x/itop-config/dictionaries/da.dict.itop-config.php
#	datamodels/2.x/itop-config/dictionaries/it.dict.itop-config.php
#	datamodels/2.x/itop-config/dictionaries/ja.dict.itop-config.php
#	datamodels/2.x/itop-config/dictionaries/sk.dict.itop-config.php
#	datamodels/2.x/itop-config/dictionaries/tr.dict.itop-config.php
#	datamodels/2.x/itop-core-update/dictionaries/cs.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/da.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/it.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/ja.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/sk.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/tr.dict.itop-core-update.php
#	datamodels/2.x/itop-core-update/dictionaries/zh_cn.dict.itop-core-update.php
#	datamodels/2.x/itop-faq-light/dictionaries/zh_cn.dict.itop-faq-light.php
#	datamodels/2.x/itop-files-information/dictionaries/de.dict.itop-files-information.php
#	datamodels/2.x/itop-files-information/dictionaries/pl.dict.itop-files-information.php
#	datamodels/2.x/itop-files-information/dictionaries/zh_cn.dict.itop-files-information.php
#	datamodels/2.x/itop-hub-connector/dictionaries/pt_br.dict.itop-hub-connector.php
#	datamodels/2.x/itop-oauth-client/dictionaries/cs.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/da.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/es_cr.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/it.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/ja.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/nl.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/pt_br.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/ru.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/sk.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/tr.dict.itop-oauth-client.php
#	datamodels/2.x/itop-oauth-client/dictionaries/zh_cn.dict.itop-oauth-client.php
#	datamodels/2.x/itop-service-mgmt-provider/dictionaries/de.dict.itop-service-mgmt-provider.php
#	datamodels/2.x/itop-tickets/dictionaries/da.dict.itop-tickets.php
#	datamodels/2.x/itop-tickets/dictionaries/hu.dict.itop-tickets.php
#	datamodels/2.x/itop-tickets/dictionaries/it.dict.itop-tickets.php
#	datamodels/2.x/itop-tickets/dictionaries/ja.dict.itop-tickets.php
#	dictionaries/cs.dictionary.itop.ui.php
#	dictionaries/da.dictionary.itop.core.php
#	dictionaries/da.dictionary.itop.ui.php
#	dictionaries/de.dictionary.itop.ui.php
#	dictionaries/en.dictionary.itop.ui.php
#	dictionaries/es_cr.dictionary.itop.ui.php
#	dictionaries/fr.dictionary.itop.ui.php
#	dictionaries/hu.dictionary.itop.ui.php
#	dictionaries/it.dictionary.itop.core.php
#	dictionaries/it.dictionary.itop.ui.php
#	dictionaries/ja.dictionary.itop.core.php
#	dictionaries/ja.dictionary.itop.ui.php
#	dictionaries/nl.dictionary.itop.ui.php
#	dictionaries/pl.dictionary.itop.core.php
#	dictionaries/pl.dictionary.itop.ui.php
#	dictionaries/pt_br.dictionary.itop.core.php
#	dictionaries/pt_br.dictionary.itop.ui.php
#	dictionaries/ru.dictionary.itop.core.php
#	dictionaries/ru.dictionary.itop.ui.php
#	dictionaries/sk.dictionary.itop.core.php
#	dictionaries/sk.dictionary.itop.ui.php
#	dictionaries/tr.dictionary.itop.core.php
#	dictionaries/tr.dictionary.itop.ui.php
#	dictionaries/zh_cn.dictionary.itop.core.php
#	dictionaries/zh_cn.dictionary.itop.ui.php
#	tests/php-unit-tests/integration-tests/DictionariesConsistencyTest.php
This commit is contained in:
Pierre Goiffon
2024-02-14 11:44:54 +01:00
parent 5663c61e51 aa53de467d
commit 391c78ae42
127 changed files with 1027 additions and 944 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/dictionaries/cs.dict.itop-portal-base.php
View File

@@ -132,7 +132,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Vyplňte prosím následující informace:',
'Brick:Portal:Object:Form:Message:Saved' => 'Uloženo',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s uloženo~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s uloženo',
'Brick:Portal:Object:Search:Regular:Title' => 'Vybrat %1$s (%2$s)',
'Brick:Portal:Object:Search:Hierarchy:Title' => 'Vybrat %1$s (%2$s)',
'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s~~',

6
datamodels/2.x/itop-portal-base/dictionaries/da.dict.itop-portal-base.php
View File

@@ -81,7 +81,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',

6
datamodels/2.x/itop-portal-base/dictionaries/it.dict.itop-portal-base.php
View File

@@ -81,7 +81,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',

6
datamodels/2.x/itop-portal-base/dictionaries/ja.dict.itop-portal-base.php
View File

@@ -81,7 +81,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',

6
datamodels/2.x/itop-portal-base/dictionaries/sk.dict.itop-portal-base.php
View File

@@ -81,7 +81,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',

6
datamodels/2.x/itop-portal-base/dictionaries/tr.dict.itop-portal-base.php
View File

@@ -81,7 +81,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Brick:Portal:UserProfile:Password:ConfirmPassword' => 'Confirm password~~',
'Brick:Portal:UserProfile:Password:CantChangeContactAdministrator' => 'To change your password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:Password:CantChangeForUnknownReason' => 'Can\'t change password, please contact your %1$s administrator~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal informations~~',
'Brick:Portal:UserProfile:PersonalInformations:Title' => 'Personal information~~',
'Brick:Portal:UserProfile:Photo:Title' => 'Photo~~',
));
@@ -129,8 +129,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Brick:Portal:Object:Name' => 'Object~~',
'Brick:Portal:Object:Form:Create:Title' => 'New %1$s~~',
'Brick:Portal:Object:Form:Edit:Title' => 'Updating %2$s (%1$s)~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, fill the following informations:~~',
'Brick:Portal:Object:Form:View:Title' => '%1$s: %2$s~~',
'Brick:Portal:Object:Form:Stimulus:Title' => 'Please, complete the following information:~~',
'Brick:Portal:Object:Form:Message:Saved' => 'Saved~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '%1$s saved~~',
'Brick:Portal:Object:Search:Regular:Title' => 'Select %1$s (%2$s)~~',

2
datamodels/2.x/itop-portal-base/dictionaries/zh_cn.dict.itop-portal-base.php
View File

@@ -132,7 +132,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:Object:Form:View:Title' => '%1$s : %2$s',
'Brick:Portal:Object:Form:Stimulus:Title' => '请填写下列信息:',
'Brick:Portal:Object:Form:Message:Saved' => '已保存',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '已保存 %1$s~~',
'Brick:Portal:Object:Form:Message:ObjectSaved' => '已保存 %1$s',
'Brick:Portal:Object:Search:Regular:Title' => '选择 %1$s (%2$s)',
'Brick:Portal:Object:Search:Hierarchy:Title' => '选择 %1$s (%2$s)',
'Brick:Portal:Object:Copy:TextToCopy' => '%1$s: %2$s',