From 16663797b27708dc95e8d7b1dc30fb57b204497f Mon Sep 17 00:00:00 2001 From: Eric Espie Date: Mon, 13 Jun 2022 15:51:36 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B04642=20-=20Core=20Update=20:=20limit=20t?= =?UTF-8?q?he=20usage=20of=20this=20function=20to=20minor=20version=20-=20?= =?UTF-8?q?fix=20error=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- datamodels/2.x/itop-core-update/cs.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/da.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/de.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/en.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/es_cr.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/fr.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/hu.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/it.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/ja.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/nl.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/pt_br.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/ru.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/sk.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/tr.dict.itop-core-update.php | 1 + datamodels/2.x/itop-core-update/zh_cn.dict.itop-core-update.php | 1 + 15 files changed, 15 insertions(+) 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 ee3034eccd..90da27b9ad 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 @@ -103,6 +103,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~', 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 ab703a9ab5..6236412e2c 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 @@ -103,6 +103,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~', 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 7f801244bc..84370d523c 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 @@ -103,6 +103,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array( 'iTopUpdate:Error:InvalidToken' => 'Ungültiges Token', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade fehlgeschlagen', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'Die maximale Größe für Dateiuploads ist zu klein. Bitte die PHP-Konfiguration anpassen.', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'Wiederherstellung der Anwendung aus archivierten Daten \'%1$s\'', 'iTopUpdate:UI:RestoreBackup' => 'Wiederherstellung der Datenbank aus \'%1$s\'', 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 4cc013a272..63b9b18548 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 @@ -103,6 +103,7 @@ Dict::Add('EN US', 'English', 'English', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'', 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 5ffe65d8d8..64b7f39625 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 @@ -104,6 +104,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array( 'iTopUpdate:Error:InvalidToken' => 'Token inválido', 'iTopUpdate:Error:UpdateFailed' => 'La actualización ha fallado', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'El archivo de actualización parece demasiado pequeño. Por favor cambie la configuración PHP.', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'Usted puede restaurar su aplicación desde el archivo \'%1$s\'', 'iTopUpdate:UI:RestoreBackup' => 'Usted puede restaurar la base de datos desde \'%1$s\'', 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 fb80f26447..2caabb7802 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 @@ -103,6 +103,7 @@ Dict::Add('FR FR', 'French', 'Français', array( 'iTopUpdate:Error:InvalidToken' => 'Information manquante', 'iTopUpdate:Error:UpdateFailed' => 'La mise à jour a échoué', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'La taille maximale de chargement de fichier semble trop petite pour faire la mise à jour. Veuillez changer la configuration de PHP.', + 'iTopUpdate:Error:PackageVersionNotCompatible' => 'Vous essayez d\'installer %1$s via la mise à jour de l\'application, ce qui n\'est pas possible sur %2$s. Vous devez lancer la procédure d\'installation standard.', 'iTopUpdate:UI:RestoreArchive' => 'Vous pouvez restaurer l\'application depuis \'%1$s\'', 'iTopUpdate:UI:RestoreBackup' => 'Vous pouvez restaurer la base de données depuis \'%1$s\'', 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 bf5ac0674c..3bd9f92df9 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 @@ -103,6 +103,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~', 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 e7fb3489d4..5443b0609f 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 @@ -103,6 +103,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~', 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 865cfb5133..d26b324b19 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 @@ -103,6 +103,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~', 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 4e15021e25..220010a984 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 @@ -105,6 +105,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array( 'iTopUpdate:Error:InvalidToken' => 'Token ongeldig', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade mislukt', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'De maximale bestandsgrootte voor uploads lijkt te klein voor deze update. Controleer de PHP-configuratie.', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'Je kan de toepassing herstellen via het archief "%1$s"', 'iTopUpdate:UI:RestoreBackup' => 'Je kan de database herstellen via het archief "%1$s"', 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 1d6ead8f87..07ed6a3854 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 @@ -103,6 +103,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~', 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 c93bd7d250..35c489f5c0 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 @@ -91,6 +91,7 @@ Dict::Add('RU RU', 'Russian', 'Русский', array( 'iTopUpdate:Error:InvalidToken' => 'Недопустимый токен', 'iTopUpdate:Error:UpdateFailed' => 'Ошибка обновления', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'Максимальный размер загрузки недостаточный для обновления. Пожалуйста, измените конфигурацию PHP.', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'Вы можете восстановить приложение из архива \'%1$s\'', 'iTopUpdate:UI:RestoreBackup' => 'Вы можете восстановить базу данных из резервной копии \'%1$s\'', 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 25677f8079..936ffd8534 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 @@ -103,6 +103,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~', 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 041679a47f..06d96bc334 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 @@ -103,6 +103,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array( 'iTopUpdate:Error:InvalidToken' => 'Invalid token~~', 'iTopUpdate:Error:UpdateFailed' => 'Upgrade failed ~~', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => 'The upload max size seems too small for update. Please change the PHP configuration.~~', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => 'You can restore your application from the archive \'%1$s\'~~', 'iTopUpdate:UI:RestoreBackup' => 'You can restore the database from \'%1$s\'~~', 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 7553fd5432..1f3ee867d5 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 @@ -103,6 +103,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'iTopUpdate:Error:InvalidToken' => '无效的token', 'iTopUpdate:Error:UpdateFailed' => '升级失败', 'iTopUpdate:Error:FileUploadMaxSizeTooSmall' => '上传上限太小. 请调整 PHP 配置.', + 'iTopUpdate:Error:PackageVersionNotCompatible' => '%1$s cannot be installed automatically on %2$s. Please perform upgrade manually.~~', 'iTopUpdate:UI:RestoreArchive' => '您可以从归档文件 \'%1$s\' 还原应用程序', 'iTopUpdate:UI:RestoreBackup' => '您可以从 \'%1$s\' 还原数据库',