diff --git a/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php index 2a6198138..1daf5fa01 100644 --- a/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php index 4902d8c30..70ecb0aa4 100644 --- a/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/da.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php index 0f38c7f22..72ad62598 100644 --- a/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/de.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Anwendungsupgrade kann durchgeführt werden', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Anwendungsupgrade nicht möglich: %1$s', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Einige angepasste Dateien wurden erkannt, eine Teil-Update kann nicht ausgeführt werden.
Befolgen Sie das Verfahren, um Ihr iTop manuell zu aktualisieren. Sie müssen das Setup benutzen, um Ihre Applikation zu aktualisieren.
', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Einige neue Module wurden erkannt, eine Teil-Update kann nicht ausgeführt werden.
Befolgen Sie das Verfahren, um Ihr iTop manuell zu aktualisieren. Sie müssen das Setup benutzen, um Ihre Applikation zu aktualisieren.
', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Einige angepasste Dateien wurden erkannt, eine Teil-Update kann nicht ausgeführt werden.
Befolgen Sie das Verfahren, um Ihr iTop manuell zu aktualisieren. Sie müssen das Setup benutzen, um Ihre Applikation zu aktualisieren.
', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Einige neue Module wurden erkannt, eine Teil-Update kann nicht ausgeführt werden.
Befolgen Sie das Verfahren, um Ihr iTop manuell zu aktualisieren. Sie müssen das Setup benutzen, um Ihre Applikation zu aktualisieren.
', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php index da1bd3050..d68e136a3 100644 --- a/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/en.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('EN US', 'English', 'English', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php index 46b8861dd..546ef11ef 100644 --- a/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php @@ -76,8 +76,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'La aplicación puede ser actualizada', 'iTopUpdate:UI:CanCoreUpdate:No' => 'La aplicación no puede ser actualizada: %1$s', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Advertencia: la actualización de la aplicación puede fallar: %1$s', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php index d77588d57..6618a4537 100644 --- a/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('FR FR', 'French', 'Français', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'L\'application peut être mise à jour', 'iTopUpdate:UI:CanCoreUpdate:No' => 'L\'application ne peut pas être mise à jour : %1$s', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Attention : la mise à jour de l\'application peut échouer : %1$s', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Des fichiers modifiés ont été détectés, une mise à jour partielle ne peut pas être effectuée.
Suivez la procedure pour mettre à jour manuellement votre iTop. Vous devez utiliser la page d\'installation pour mettre à jour l\'application.', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'De nouveaux modules ont été détectés, une mise à jour partielle ne peut pas être effectuée.
Suivez la procedure pour mettre à jour manuellement votre iTop. Vous devez utiliser la page d\'installation pour mettre à jour l\'application.', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Des fichiers modifiés ont été détectés, une mise à jour partielle ne peut pas être effectuée.
Suivez la procedure pour mettre à jour manuellement votre iTop. Vous devez utiliser la page d\'installation pour mettre à jour l\'application.', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'De nouveaux modules ont été détectés, une mise à jour partielle ne peut pas être effectuée.
Suivez la procedure pour mettre à jour manuellement votre iTop. Vous devez utiliser la page d\'installation pour mettre à jour l\'application.', 'iTopUpdate:UI:CheckInProgress'=>'Veuillez patienter pendant la vérification d\'intégrité', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php index c3d4f2130..67583ef4a 100644 --- a/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php index 385470b4f..ae86afa1e 100644 --- a/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/it.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php index cefb64e3d..aad058424 100644 --- a/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php index f7931969d..a5e396f95 100644 --- a/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php @@ -77,8 +77,8 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Updaten van toepassing is mogelijk', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Updaten van de toepassing is niet mogelijk: %1$s', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php index c3e97c171..5c1538739 100644 --- a/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php index 3ec38c424..0909f2b95 100644 --- a/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php @@ -63,8 +63,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Приложение может быть обновлено', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Приложение не может быть обновлено: %1$s', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php index 6b70b3d9e..e3ee182fe 100644 --- a/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php index 5b3dfb2a6..a69c8f7df 100644 --- a/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => 'Application can be updated~~', 'iTopUpdate:UI:CanCoreUpdate:No' => 'Application cannot be updated: %1$s~~', 'iTopUpdate:UI:CanCoreUpdate:Warning' => 'Warning: application update can fail: %1$s~~', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig index 700d2343c..57bdac538 100644 --- a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig +++ b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig @@ -11,8 +11,9 @@
{{ 'iTopUpdate:UI:CanCoreUpdate:Loading'|dict_s }}
- diff --git a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig index ac39ffec9..395725c82 100644 --- a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig +++ b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig @@ -18,6 +18,7 @@ $.ajax({ if(data.sMessageDetails){ $("#header-requirements-details").show(); $('#can-core-update-details').html(data.sMessageDetails); + $("#toggle-requirements-details").click( function() { $("#can-core-update-details").toggle(); } ); } oRequirements.removeClass("message_info"); if (data.bStatus) diff --git a/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php b/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php index c1676c95e..f368a69a9 100644 --- a/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php +++ b/datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php @@ -75,8 +75,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'iTopUpdate:UI:CanCoreUpdate:Yes' => '应用无法升级', 'iTopUpdate:UI:CanCoreUpdate:No' => '应用无法升级: %1$s', 'iTopUpdate:UI:CanCoreUpdate:Warning' => '警告: 应用升级可能会失败: %1$s', - 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', - 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateUseSetup' => 'Some modified files were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', + 'iTopUpdate:UI:CannotUpdateNewModules' => 'Some new modules were detected, a partial update cannot be executed.
Follow the procedure in order to manually upgrade your iTop. You must use the setup to update the application.~~', 'iTopUpdate:UI:CheckInProgress'=>'Please wait during integrity check~~', // Setup Messages diff --git a/datamodels/2.x/itop-files-information/cs.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/cs.dict.itop-files-information.php index e339ee5cb..310f5b68e 100644 --- a/datamodels/2.x/itop-files-information/cs.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/cs.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~', )); diff --git a/datamodels/2.x/itop-files-information/da.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/da.dict.itop-files-information.php index 2a4f4700a..b1b909d64 100644 --- a/datamodels/2.x/itop-files-information/da.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/da.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~', )); diff --git a/datamodels/2.x/itop-files-information/de.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/de.dict.itop-files-information.php index d5937343b..b985672f3 100644 --- a/datamodels/2.x/itop-files-information/de.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/de.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( // Errors 'FilesInformation:Error:MissingFile' => 'Fehlende Datei: %1$s', 'FilesInformation:Error:CorruptedFile' => 'Datei %1$s ist beschädigt', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Datei %1$s kann nicht geschrieben werden', )); diff --git a/datamodels/2.x/itop-files-information/en.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/en.dict.itop-files-information.php index f91eb17cd..f37037fe5 100644 --- a/datamodels/2.x/itop-files-information/en.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/en.dict.itop-files-information.php @@ -25,6 +25,7 @@ Dict::Add('EN US', 'English', 'English', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted', + 'FilesInformation:Error:ListCorruptedFile' => 'File(s) corrupted: %1$s ', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s', )); diff --git a/datamodels/2.x/itop-files-information/es_cr.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/es_cr.dict.itop-files-information.php index 49c8848a7..8f6b609e7 100644 --- a/datamodels/2.x/itop-files-information/es_cr.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/es_cr.dict.itop-files-information.php @@ -25,6 +25,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( // Errors 'FilesInformation:Error:MissingFile' => 'Archivo faltante: %1$s', 'FilesInformation:Error:CorruptedFile' => 'El archivo %1$s está corrupto', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'No se puede escribir al archivo %1$s', )); diff --git a/datamodels/2.x/itop-files-information/fr.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/fr.dict.itop-files-information.php index b8c33835a..68d9066df 100644 --- a/datamodels/2.x/itop-files-information/fr.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/fr.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('FR FR', 'French', 'Français', array( // Errors 'FilesInformation:Error:MissingFile' => 'Ficher manquant : %1$s', 'FilesInformation:Error:CorruptedFile' => 'Le fichier %1$s est corrompu', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s', 'FilesInformation:Error:CantWriteToFile' => 'Impossible de modifier le fichier %1$s', )); diff --git a/datamodels/2.x/itop-files-information/hu.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/hu.dict.itop-files-information.php index 600c56ecc..96b115a50 100644 --- a/datamodels/2.x/itop-files-information/hu.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/hu.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~', )); diff --git a/datamodels/2.x/itop-files-information/it.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/it.dict.itop-files-information.php index da90731fc..88d95b45c 100644 --- a/datamodels/2.x/itop-files-information/it.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/it.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~', )); diff --git a/datamodels/2.x/itop-files-information/ja.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/ja.dict.itop-files-information.php index c9e10dbcf..d208276b4 100644 --- a/datamodels/2.x/itop-files-information/ja.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/ja.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~', )); diff --git a/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php index 853304440..9752dc5f1 100644 --- a/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/nl.dict.itop-files-information.php @@ -26,6 +26,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( // Errors 'FilesInformation:Error:MissingFile' => 'Ontbrekend bestand: %1$s', 'FilesInformation:Error:CorruptedFile' => 'Corrupt bestand: %1$s', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Kan niet schrijven naar bestand %1$s', )); diff --git a/datamodels/2.x/itop-files-information/pt_br.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/pt_br.dict.itop-files-information.php index fd41eeeda..449fefce9 100644 --- a/datamodels/2.x/itop-files-information/pt_br.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/pt_br.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~', )); diff --git a/datamodels/2.x/itop-files-information/ru.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/ru.dict.itop-files-information.php index bf07888dd..e9dfd44d9 100644 --- a/datamodels/2.x/itop-files-information/ru.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/ru.dict.itop-files-information.php @@ -12,6 +12,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( // Errors 'FilesInformation:Error:MissingFile' => 'Файл %1$s отсутствует', 'FilesInformation:Error:CorruptedFile' => 'Файл %1$s повреждён', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Невозможно выполнить запись в файл %1$s', )); diff --git a/datamodels/2.x/itop-files-information/sk.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/sk.dict.itop-files-information.php index 531778617..b05cf3fc6 100644 --- a/datamodels/2.x/itop-files-information/sk.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/sk.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~', )); diff --git a/datamodels/2.x/itop-files-information/src/Service/FilesInformation.php b/datamodels/2.x/itop-files-information/src/Service/FilesInformation.php index db105ba8a..a6602808d 100644 --- a/datamodels/2.x/itop-files-information/src/Service/FilesInformation.php +++ b/datamodels/2.x/itop-files-information/src/Service/FilesInformation.php @@ -56,7 +56,7 @@ class FilesInformation try { - FilesIntegrity::CheckInstallationIntegrity(); + FilesIntegrity::CheckInstallationIntegrity(APPROOT, false); } catch (FileIntegrityException $e) { diff --git a/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php b/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php index 04e2e6fa7..b76fee647 100644 --- a/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php +++ b/datamodels/2.x/itop-files-information/src/Service/FilesIntegrity.php @@ -81,8 +81,9 @@ class FilesIntegrity * @param string $sRootPath * * @throws \Combodo\iTop\FilesInformation\Service\FileIntegrityException + * @since 2.7.7 3.0.1 */ - public static function CheckInstallationIntegrity($sRootPath = APPROOT) + public static function CheckInstallationIntegrity($sRootPath = APPROOT, $bExitAtFirstError = true) { $aFilesInfo = FilesIntegrity::GetInstalledFiles($sRootPath.'manifest.xml'); @@ -91,6 +92,9 @@ class FilesIntegrity throw new FileIntegrityException(Dict::Format('FilesInformation:Error:MissingFile', 'manifest.xml')); } + $bHasErrors = false; + $sErrorFiles =""; + @clearstatcache(); foreach ($aFilesInfo as $aFileInfo) { @@ -103,11 +107,19 @@ class FilesIntegrity $sChecksum = md5($sContent); if (($iSize != $aFileInfo['size']) || ($sChecksum != $aFileInfo['md5'])) { - throw new FileIntegrityException(Dict::Format('FilesInformation:Error:CorruptedFile', $sFile)); + if($bExitAtFirstError) { + throw new FileIntegrityException(Dict::Format('FilesInformation:Error:CorruptedFile', $sFile)); + } else { + $bHasErrors = true; + $sErrorFiles .='
  • '.$aFileInfo['path'].'
  • '; + } } } // Packed with missing files... } + if($bHasErrors){ + throw new FileIntegrityException(Dict::Format('FilesInformation:Error:ListCorruptedFile','')); + } } public static function IsInstallationConform($sRootPath, &$sErrorMsg) diff --git a/datamodels/2.x/itop-files-information/tr.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/tr.dict.itop-files-information.php index 50764da99..9260f1c66 100644 --- a/datamodels/2.x/itop-files-information/tr.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/tr.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( // Errors 'FilesInformation:Error:MissingFile' => 'Missing file: %1$s~~', 'FilesInformation:Error:CorruptedFile' => 'File %1$s is corrupted~~', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => 'Can not write to file %1$s~~', )); diff --git a/datamodels/2.x/itop-files-information/zh_cn.dict.itop-files-information.php b/datamodels/2.x/itop-files-information/zh_cn.dict.itop-files-information.php index da73ba611..f77501f0c 100644 --- a/datamodels/2.x/itop-files-information/zh_cn.dict.itop-files-information.php +++ b/datamodels/2.x/itop-files-information/zh_cn.dict.itop-files-information.php @@ -24,6 +24,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( // Errors 'FilesInformation:Error:MissingFile' => '文件丢失: %1$s~~', 'FilesInformation:Error:CorruptedFile' => '文件 %1$s 已损坏', + 'FilesInformation:Error:ListCorruptedFile' => 'Fichier(s) corrompu(s): %1$s~~', 'FilesInformation:Error:CantWriteToFile' => '无法写入文件 %1$s', ));