Merge branch 'master' into develop

# Conflicts: # core/config.class.inc.php # core/htmlsanitizer.class.inc.php # css/css-variables.scss # css/light-grey.css # datamodels/2.x/version.xml # dictionaries/zh_cn.dictionary.itop.ui.php # synchro/synchrodatasource.class.inc.php
2026-05-19 23:32:17 +02:00 · 2019-06-20 16:11:38 +02:00
parent b1761e04b2 5c341138e1
commit e68340273b
232 changed files with 7198 additions and 6186 deletions
--- a/datamodels/2.x/itop-backup/cs.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/cs.dict.itop-backup.php
@@ -26,7 +26,7 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 	'bkp-week-days' => 'Záloha bude provedena <b>vždy v %1$s v %2$s</b>',
 	'bkp-retention' => 'V cílové složce <b>bude uchováno maximálně %1$d souborů záloh</b>.',
 	'bkp-next-to-delete' => 'Bude odstraněna při další záloze (nastavení "retention_count")',
-	'bkp-table-file' => 'Soubor', 
+	'bkp-table-file' => 'Soubor',
 	'bkp-table-file+' => 'Pouze soubory s příponou .zip jsou považovány za soubory zálohy.',
 	'bkp-table-size' => 'Velikost',
 	'bkp-table-size+' => '',
--- a/datamodels/2.x/itop-backup/da.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/da.dict.itop-backup.php
@@ -39,7 +39,7 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
 	'bkp-week-days' => 'Backups will occur <b>every %1$s at %2$s</b>~~',
 	'bkp-retention' => 'At most <b>%1$d backup files will be kept</b> in the target directory.~~',
 	'bkp-next-to-delete' => 'Will be deleted when the next backup occurs (see the setting "retention_count")~~',
-	'bkp-table-file' => 'File~~', 
+	'bkp-table-file' => 'File~~',
 	'bkp-table-file+' => 'Only files having the extension .zip are considered as being backup files~~',
 	'bkp-table-size' => 'Size~~',
 	'bkp-table-size+' => '~~',
--- a/datamodels/2.x/itop-backup/de.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/de.dict.itop-backup.php
@@ -41,7 +41,7 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
 	'bkp-week-days' => 'Backups werden <b>jeden %1$s um %2$s durchgeführt</b>',
 	'bkp-retention' => 'Mindestens <b>%1$d Backups werden im Zielverzeichniss vorgehalten</b>',
 	'bkp-next-to-delete' => 'Wird gelöscht, wenn das nächste Backup angelegt wird (unter Einstellungen "Menge vorhalten")',
-	'bkp-table-file' => 'Datei', 
+	'bkp-table-file' => 'Datei',
 	'bkp-table-file+' => 'Nur Dateien mit der Endung .zip werden als Backup-Dateien berücksichtigt.',
 	'bkp-table-size' => 'Grösse',
 	'bkp-table-size+' => '',
--- a/datamodels/2.x/itop-backup/en.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/en.dict.itop-backup.php
@@ -3,7 +3,7 @@
 * Localized data
 *
 * @copyright Copyright (C) 2010-2018 Combodo SARL
- * @license	http://opensource.org/licenses/AGPL-3.0
+ * @license    http://opensource.org/licenses/AGPL-3.0
 *
 * This file is part of iTop.
 *
@@ -40,7 +40,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'bkp-week-days' => 'Backups will occur <b>every %1$s at %2$s</b>',
 	'bkp-retention' => 'At most <b>%1$d backup files will be kept</b> in the target directory.',
 	'bkp-next-to-delete' => 'Will be deleted when the next backup occurs (see the setting "retention_count")',
-	'bkp-table-file' => 'File', 
+	'bkp-table-file' => 'File',
 	'bkp-table-file+' => 'Only files having the extension .zip are considered as being backup files',
 	'bkp-table-size' => 'Size',
 	'bkp-table-size+' => '',
--- a/datamodels/2.x/itop-backup/es_cr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/es_cr.dict.itop-backup.php
@@ -39,7 +39,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellaño', array(
 	'bkp-week-days' => 'Respaldos se realizaran <b>cada %1$s a %2$s</b>',
 	'bkp-retention' => 'Al menos <b>%1$d archivos de respaldo serán conservados</b> en el directorio destino.',
 	'bkp-next-to-delete' => 'Serán borrados cuando el siguiente respaldo ocurra (ver configuración "retention_count")',
-	'bkp-table-file' => 'Archivo', 
+	'bkp-table-file' => 'Archivo',
 	'bkp-table-file+' => 'Solo archivos con la extensión .zip son considerados como archivos de respaldos',
 	'bkp-table-size' => 'Tamaño',
 	'bkp-table-size+' => '',
--- a/datamodels/2.x/itop-backup/fr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/fr.dict.itop-backup.php
@@ -24,7 +24,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'bkp-week-days' => 'Les sauvegardes seront effectuées <b>tous les %1$s à %2$s</b>',
 	'bkp-retention' => 'Au plus <b>%1$d fichiers de sauvegardes seront conservés</b> dans le répertoire cible.',
 	'bkp-next-to-delete' => 'Sera effacé lors de la prochaine sauvegarde (Cf. réglage "retention_count")',
-	'bkp-table-file' => 'Fichier', 
+	'bkp-table-file' => 'Fichier',
 	'bkp-table-file+' => 'Seuls les fichiers ayant l\'extension .zip sont considérés comme étant des fichiers de sauvegarde',
 	'bkp-table-size' => 'Taille',
 	'bkp-table-size+' => '',
--- a/datamodels/2.x/itop-backup/hu.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/hu.dict.itop-backup.php
@@ -39,7 +39,7 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
 	'bkp-week-days' => 'Backups will occur <b>every %1$s at %2$s</b>~~',
 	'bkp-retention' => 'At most <b>%1$d backup files will be kept</b> in the target directory.~~',
 	'bkp-next-to-delete' => 'Will be deleted when the next backup occurs (see the setting "retention_count")~~',
-	'bkp-table-file' => 'File~~', 
+	'bkp-table-file' => 'File~~',
 	'bkp-table-file+' => 'Only files having the extension .zip are considered as being backup files~~',
 	'bkp-table-size' => 'Size~~',
 	'bkp-table-size+' => '~~',
--- a/datamodels/2.x/itop-backup/it.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/it.dict.itop-backup.php
@@ -39,7 +39,7 @@ Dict::Add('IT IT', 'Italian', 'Italiano', array(
 	'bkp-week-days' => 'Backups will occur <b>every %1$s at %2$s</b>~~',
 	'bkp-retention' => 'At most <b>%1$d backup files will be kept</b> in the target directory.~~',
 	'bkp-next-to-delete' => 'Will be deleted when the next backup occurs (see the setting "retention_count")~~',
-	'bkp-table-file' => 'File~~', 
+	'bkp-table-file' => 'File~~',
 	'bkp-table-file+' => 'Only files having the extension .zip are considered as being backup files~~',
 	'bkp-table-size' => 'Size~~',
 	'bkp-table-size+' => '~~',
--- a/datamodels/2.x/itop-backup/ja.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/ja.dict.itop-backup.php
@@ -39,7 +39,7 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'bkp-week-days' => 'Backups will occur <b>every %1$s at %2$s</b>~~',
 	'bkp-retention' => 'At most <b>%1$d backup files will be kept</b> in the target directory.~~',
 	'bkp-next-to-delete' => 'Will be deleted when the next backup occurs (see the setting "retention_count")~~',
-	'bkp-table-file' => 'File~~', 
+	'bkp-table-file' => 'File~~',
 	'bkp-table-file+' => 'Only files having the extension .zip are considered as being backup files~~',
 	'bkp-table-size' => 'Size~~',
 	'bkp-table-size+' => '~~',
--- a/datamodels/2.x/itop-backup/module.itop-backup.php
+++ b/datamodels/2.x/itop-backup/module.itop-backup.php
@@ -3,7 +3,7 @@

 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'itop-backup/2.6.1',
+	'itop-backup/'.ITOP_VERSION,
 	array(
 		// Identification
 		//
--- a/datamodels/2.x/itop-backup/nl.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/nl.dict.itop-backup.php
@@ -40,7 +40,7 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
 	'bkp-week-days' => 'Backups gebeuren <b>elke %1$s om %2$s</b>',
 	'bkp-retention' => 'Maximaal <b>%1$d backup-bestanden blijven bewaard</b> in de doelmap.',
 	'bkp-next-to-delete' => 'Zal verwijderd worden bij de volgende backuptaak (volgens de instelling "retention_count")',
-	'bkp-table-file' => 'Bestand', 
+	'bkp-table-file' => 'Bestand',
 	'bkp-table-file+' => 'Enkel .ZIP-bestanden worden beschouwd als backupbestanden.',
 	'bkp-table-size' => 'Grootte',
 	'bkp-table-size+' => '',
--- a/datamodels/2.x/itop-backup/pt_br.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/pt_br.dict.itop-backup.php
@@ -24,7 +24,7 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
 	'bkp-week-days' => 'Backups ocorrerão <b>cada %1$s a %2$s</b>',
 	'bkp-retention' => 'No máximo <b>%1$d arquivos de backup serão mantidos</b> no diretório destino.',
 	'bkp-next-to-delete' => 'Será deletado quando ocorrer o próximo backup (veja a configuração de "retention_count")',
-	'bkp-table-file' => 'Arquivo', 
+	'bkp-table-file' => 'Arquivo',
 	'bkp-table-file+' => 'Apenas arquivos com a extensão .zip são considerados arquivos de backup',
 	'bkp-table-size' => 'Tamanho',
 	'bkp-table-size+' => '',
--- a/datamodels/2.x/itop-backup/sk.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/sk.dict.itop-backup.php
@@ -39,7 +39,7 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
 	'bkp-week-days' => 'Backups will occur <b>every %1$s at %2$s</b>~~',
 	'bkp-retention' => 'At most <b>%1$d backup files will be kept</b> in the target directory.~~',
 	'bkp-next-to-delete' => 'Will be deleted when the next backup occurs (see the setting "retention_count")~~',
-	'bkp-table-file' => 'File~~', 
+	'bkp-table-file' => 'File~~',
 	'bkp-table-file+' => 'Only files having the extension .zip are considered as being backup files~~',
 	'bkp-table-size' => 'Size~~',
 	'bkp-table-size+' => '~~',
--- a/datamodels/2.x/itop-backup/tr.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/tr.dict.itop-backup.php
@@ -39,7 +39,7 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
 	'bkp-week-days' => 'Backups will occur <b>every %1$s at %2$s</b>~~',
 	'bkp-retention' => 'At most <b>%1$d backup files will be kept</b> in the target directory.~~',
 	'bkp-next-to-delete' => 'Will be deleted when the next backup occurs (see the setting "retention_count")~~',
-	'bkp-table-file' => 'File~~', 
+	'bkp-table-file' => 'File~~',
 	'bkp-table-file+' => 'Only files having the extension .zip are considered as being backup files~~',
 	'bkp-table-size' => 'Size~~',
 	'bkp-table-size+' => '~~',
--- a/datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
+++ b/datamodels/2.x/itop-backup/zh_cn.dict.itop-backup.php
@@ -39,7 +39,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'bkp-week-days' => '在每个 <b> %1$s 的 %2$s</b> 进行备份',
 	'bkp-retention' => '最多 <b>%1$d 份备份文件 </b> 在目标目录.',
 	'bkp-next-to-delete' => '当下一次备份时将被删除 (see the setting "retention_count")',
-	'bkp-table-file' => 'File', 
+	'bkp-table-file' => 'File',
 	'bkp-table-file+' => '只有扩展名是.zip的文件才被认为是备份文件',
 	'bkp-table-size' => '大小',
 	'bkp-table-size+' => '',