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

# 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
2026-05-20 15:52:24 +02:00 · 2024-02-14 14:51:59 +01:00
parent 41eb927480 391c78ae42
commit 85dac470aa
127 changed files with 1021 additions and 950 deletions
--- a/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/cs.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
--- a/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/da.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
--- a/datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/en.dict.itop-hub-connector.php
@@ -65,7 +65,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...',
 	'iTopHub:InstallationWelcome' => 'Installation of the extensions downloaded from iTop Hub',
 	'iTopHub:DBBackupLabel' => 'Instance backup',
-	'iTopHub:DBBackupSentence' => 'Do a backup of the database and iTop configuration before updating',
+	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating',
 	'iTopHub:DeployBtn' => 'Deploy !',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...',

--- a/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/it.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
--- a/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/ja.dict.itop-hub-connector.php
@@ -24,13 +24,13 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	// Dictionary entries go here
 	'Menu:iTopHub' => 'iTop Hub~~',
 	'Menu:iTopHub:Register' => 'Connect to iTop Hub~~',
-	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your iTop instance~~',
-	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this iTop instance into the Hub.</p>~~',
+	'Menu:iTopHub:Register+' => 'Go to iTop Hub to update your '.ITOP_APPLICATION_SHORT.' instance~~',
+	'Menu:iTopHub:Register:Description' => '<p>Get access to your community platform iTop Hub!<br>Find all the content and information you need, manage your instances through personalized tools & install more extensions.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'Menu:iTopHub:MyExtensions' => 'Deployed extensions~~',
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt iTop to your processes.<br><br>By connecting to the Hub from this page, you will push information about this iTop instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
@@ -45,7 +45,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:Landing:Status' => 'Deployment status~~',
 	'iTopHub:Landing:Install' => 'Deploying extensions...~~',
 	'iTopHub:CompiledOK' => 'Compilation successful.~~',
-	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>iTop configuration has NOT been modified.~~',
+	'iTopHub:ConfigurationSafelyReverted' => 'Error detected during deployment!<br>'.ITOP_APPLICATION_SHORT.' configuration has NOT been modified.~~',
 	'iTopHub:FailAuthent' => 'Authentication failed for this action.~~',
 	'iTopHub:InstalledExtensions' => 'Extensions deployed on this instance~~',
 	'iTopHub:ExtensionCategory:Manual' => 'Extensions deployed manually~~',
@@ -53,7 +53,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:ExtensionCategory:Remote' => 'Extensions deployed from iTop Hub~~',
 	'iTopHub:ExtensionCategory:Remote+' => 'The following extensions have been deployed from iTop Hub:~~',
 	'iTopHub:NoExtensionInThisCategory' => 'There is no extension in this category~~',
-	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt iTop to your processes !~~',
+	'iTopHub:NoExtensionInThisCategory+' => 'Browse iTop Hub to find the extensions that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes !',
 	'iTopHub:ExtensionNotInstalled' => 'Not installed~~',
 	'iTopHub:GetMoreExtensions' => 'Get extensions from iTop Hub...~~',
 	'iTopHub:LandingWelcome' => 'Congratulations! The following extensions were downloaded from iTop Hub and deployed into your '.ITOP_APPLICATION_SHORT.'.~~',
@@ -61,7 +61,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'iTopHub:Uncompressing' => 'Uncompressing extensions...~~',
 	'iTopHub:InstallationWelcome' => 'Installation of the extensions downloaded from iTop Hub~~',
 	'iTopHub:DBBackupLabel' => 'Instance backup~~',
-	'iTopHub:DBBackupSentence' => 'Do a backup of the database and iTop configuration before updating~~',
+	'iTopHub:DBBackupSentence' => 'Do a backup of the database and '.ITOP_APPLICATION_SHORT.' configuration before updating',
 	'iTopHub:DeployBtn' => 'Deploy !~~',
 	'iTopHub:DatabaseBackupProgress' => 'Instance backup...~~',
 	'iTopHub:InstallationEffect:Install' => 'Version: %1$s will be installed.~~',
--- a/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/ru.dict.itop-hub-connector.php
@@ -18,7 +18,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Menu:iTopHub:MyExtensions+' => 'Расширения, развернутые на данном экземпляре '.ITOP_APPLICATION_SHORT,
 	'Menu:iTopHub:BrowseExtensions' => 'Получить расширения из iTop Hub',
 	'Menu:iTopHub:BrowseExtensions+' => 'Найдите дополнительные расширения на iTop Hub',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
--- a/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/sk.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',
--- a/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
+++ b/datamodels/2.x/itop-hub-connector/dictionaries/tr.dict.itop-hub-connector.php
@@ -30,7 +30,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'Menu:iTopHub:MyExtensions+' => 'See the list of extensions deployed on this instance of '.ITOP_APPLICATION_SHORT.'~~',
 	'Menu:iTopHub:BrowseExtensions' => 'Get extensions from iTop Hub~~',
 	'Menu:iTopHub:BrowseExtensions+' => 'Browse for more extensions on iTop Hub~~',
-	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful '.ITOP_APPLICATION_SHORT.' extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>~~',
+	'Menu:iTopHub:BrowseExtensions:Description' => '<p>Look into iTop Hub’s store, your one stop place to find wonderful iTop extensions !<br>Find the ones that will help you customize and adapt '.ITOP_APPLICATION_SHORT.' to your processes.<br><br>By connecting to the Hub from this page, you will push information about this '.ITOP_APPLICATION_SHORT.' instance into the Hub.</p>',
 	'iTopHub:GoBtn' => 'Go To iTop Hub~~',
 	'iTopHub:CloseBtn' => 'Close~~',
 	'iTopHub:GoBtn:Tooltip' => 'Jump to www.itophub.io~~',