Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/guardian/guardian.de.pl b/config/guardian/guardian.de.pl
new file mode 100644 (file)
index 0000000..344d045
--- /dev/null
+++ b/config/guardian/guardian.de.pl
@@ -0,0 +1,45 @@
+%tr = ( 
+%tr,
+
+'guardian' => 'Guardian',
+'guardian block a host' => 'Host blocken',
+'guardian block httpd brute-force' => 'httpd-Brute-Force-Erkennung',
+'guardian block owncloud brute-force' => 'Owncloud-Brute-Force-Erkennung',
+'guardian block ssh brute-force' => 'SSH-Brute-Force-Erkennung',
+'guardian blockcount' => 'Trefferschwelle (Snort)',
+'guardian blocked hosts' => 'Aktuell geblockte Hosts',
+'guardian blocking of this address is not allowed' => 'Diese Addresse darf nicht geblockt werden.',
+'guardian blocktime' => 'Blockzeit (Sekunden)',
+'guardian common settings' => 'Allgemeine Einstellungen',
+'guardian configuration' => 'Guardian-Konfiguration',
+'guardian daemon' => 'Daemon',
+'guardian empty input' => 'Fehlende Angabe: Bitte geben Sie einen gültigen Host oder ein gültiges Netzwerk an.',
+'guardian enabled' => 'Guardian aktivieren',
+'guardian firewallaction' => 'Firewall-Aktion',
+'guardian ignored hosts' => 'Ignorierte Hosts',
+'guardian invalid address or subnet' => 'Ungültige Host-Addresse oder Netzwerk.',
+'guardian invalid blockcount' => 'Ungültige Anzahl: Bitte verwenden Sie eine natürliche Zahl größer als Null.',
+'guardian invalid blocktime' => 'Ungültige Blockzeit: Bitte verwenden Sie eine natürliche Zahl größer als Null.',
+'guardian invalid logfile' => 'Der angegebene Pfad zum "Ignore file" ist ungültig.',
+'guardian logfacility' => 'Logziel',
+'guardian logfile' => 'Logdatei',
+'guardian loglevel' => 'Loglevel',
+'guardian loglevel_off' => 'Aus',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'Datei',
+'guardian logtarget_console' => 'Konsole',
+'guardian no entries' => 'Keine Einträge vorhanden.',
+'guardian not running no hosts can be blocked' => 'Guardian läuft nicht. Es werden keine Hosts geblockt.',
+'guardian priolevel_high' => '1 - Hoch',
+'guardian priolevel_medium' => '2 - Mittel',
+'guardian priolevel_low' => '3 - Niedrig',
+'guardian priolevel_very_low' => '4 - Sehr niedrig',
+'guardian priority level' => 'Prioritätslevel (Snort)',
+'guardian service' => 'Guardian-Dienst',
+'guardian watch snort alertfile' => 'Snort-Alarme auswerten',
+
+);
+
+#EOF

diff --git a/config/guardian/guardian.en.pl b/config/guardian/guardian.en.pl
new file mode 100644 (file)
index 0000000..f6be865
--- /dev/null
+++ b/config/guardian/guardian.en.pl
@@ -0,0 +1,45 @@
+%tr = ( 
+%tr,
+
+'guardian' => 'Guardian',
+'guardian block a host' => 'Block host',
+'guardian block httpd brute-force' => 'httpd Brute Force Detection',
+'guardian block owncloud brute-force' => 'Owncloud Brute Force detection',
+'guardian block ssh brute-force' => 'SSH Brute Force Detection',
+'guardian blockcount' => 'Strike Threshold (Snort)',
+'guardian blocked hosts' => 'Currently blocked hosts',
+'guardian blocking of this address is not allowed' => 'Blocking of the given address is not allowed.',
+'guardian blocktime' => 'Block Time (seconds)',
+'guardian common settings' => 'Common Settings',
+'guardian configuration' => 'Guardian Configuration',
+'guardian daemon' => 'Daemon',
+'guardian empty input' => 'Empty input: Please enter a valid host address or subnet.',
+'guardian enabled' => 'Enable Guardian',
+'guardian firewallaction' => 'Firewall Action',
+'guardian ignored hosts' => 'Ignored Hosts',
+'guardian invalid address or subnet' => 'Invalid host address or subnet.',
+'guardian invalid blockcount' => 'Invalid BlockCount: Please provide a natural number higher than zero.',
+'guardian invalid blocktime' => 'Invalid BlockTime: Please provide a natural number higher than zero.',
+'guardian invalid logfile' => 'The provided path for the logfile is not valid.',
+'guardian logfacility' => 'Log Facility',
+'guardian logfile' => 'Log File',
+'guardian loglevel' => 'Log Level',
+'guardian loglevel_off' => 'Off',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'File',
+'guardian logtarget_console' => 'Console',
+'guardian no entries' => 'No entries at the moment.',
+'guardian not running no hosts can be blocked' => 'Guardian is not running. No hosts will be blocked.',
+'guardian priolevel_high' => '1 - High',
+'guardian priolevel_medium' => '2 - Medium',
+'guardian priolevel_low' => '3 - Low',
+'guardian priolevel_very_low' => '4 - Very low',
+'guardian priority level' => 'Priority Level (Snort)',
+'guardian service' => 'Guardian Service',
+'guardian watch snort alertfile' => 'Monitor Snort Alert File',
+
+);
+
+#EOF

diff --git a/config/guardian/guardian.es.pl b/config/guardian/guardian.es.pl
new file mode 100644 (file)
index 0000000..89ffb52
--- /dev/null
+++ b/config/guardian/guardian.es.pl
@@ -0,0 +1,23 @@
+%tr = ( 
+%tr,
+
+'guardian alertfile' => 'Archivo de alerta',
+'guardian configuration' => 'Configuración de Guardian',
+'guardian ignorefile' => 'Archivo Ignorefile',
+'guardian interface' => 'Interfaz',
+'guardian logfile' => 'Archivo de registro',
+'guardian loglevel_off' => 'Off',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'File',
+'guardian logtarget_console' => 'Console',
+'guardian priolevel_high' => '1 - High',
+'guardian priolevel_medium' => '2 - Medium',
+'guardian priolevel_low' => '3 - Low',
+'guardian priolevel_very_low' => '4 - Very low',
+'guardian timelimit' => 'Límite de tiempo',
+
+);
+
+#EOF

diff --git a/config/guardian/guardian.fr.pl b/config/guardian/guardian.fr.pl
new file mode 100644 (file)
index 0000000..82e5736
--- /dev/null
+++ b/config/guardian/guardian.fr.pl
@@ -0,0 +1,23 @@
+%tr = ( 
+%tr,
+
+'guardian alertfile' => 'Fichier d\'alerte',
+'guardian configuration' => 'Configuration du gardien',
+'guardian ignorefile' => 'Fichier d\'ignorés',
+'guardian interface' => 'Interface',
+'guardian logfile' => 'Fichier log',
+'guardian loglevel_off' => 'Off',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'File',
+'guardian logtarget_console' => 'Console',
+'guardian priolevel_high' => '1 - High',
+'guardian priolevel_medium' => '2 - Medium',
+'guardian priolevel_low' => '3 - Low',
+'guardian priolevel_very_low' => '4 - Very low',
+'guardian timelimit' => 'Délai maximum',
+
+);
+
+#EOF

diff --git a/config/guardian/guardian.it.pl b/config/guardian/guardian.it.pl
new file mode 100644 (file)
index 0000000..9b89a52
--- /dev/null
+++ b/config/guardian/guardian.it.pl
@@ -0,0 +1,24 @@
+%tr = ( 
+%tr,
+
+'guaranteed bandwith' => 'Guaranteed bandwith',
+'guardian alertfile' => 'Alertfile',
+'guardian configuration' => 'Guardian Configuration',
+'guardian ignorefile' => 'Ignorefile',
+'guardian interface' => 'Interface',
+'guardian logfile' => 'Logfile',
+'guardian loglevel_off' => 'Off',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'File',
+'guardian logtarget_console' => 'Console',
+'guardian priolevel_high' => '1 - High',
+'guardian priolevel_medium' => '2 - Medium',
+'guardian priolevel_low' => '3 - Low',
+'guardian priolevel_very_low' => '4 - Very low',
+'guardian timelimit' => 'Timelimit',
+
+);
+
+#EOF

diff --git a/config/guardian/guardian.nl.pl b/config/guardian/guardian.nl.pl
new file mode 100644 (file)
index 0000000..d71a91f
--- /dev/null
+++ b/config/guardian/guardian.nl.pl
@@ -0,0 +1,23 @@
+%tr = ( 
+%tr,
+
+'guardian alertfile' => 'Meldingenbestand',
+'guardian configuration' => 'Guardian configuratie',
+'guardian ignorefile' => 'Negeerbestand',
+'guardian interface' => 'Interface',
+'guardian logfile' => 'Logbestand',
+'guardian loglevel_off' => 'Off',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'File',
+'guardian logtarget_console' => 'Console',
+'guardian priolevel_high' => '1 - High',
+'guardian priolevel_medium' => '2 - Medium',
+'guardian priolevel_low' => '3 - Low',
+'guardian priolevel_very_low' => '4 - Very low',
+'guardian timelimit' => 'Tijdlimiet',
+
+);
+
+#EOF

diff --git a/config/guardian/guardian.pl.pl b/config/guardian/guardian.pl.pl
new file mode 100644 (file)
index 0000000..18cb396
--- /dev/null
+++ b/config/guardian/guardian.pl.pl
@@ -0,0 +1,23 @@
+%tr = ( 
+%tr,
+
+'guardian alertfile' => 'Plik alertów',
+'guardian configuration' => 'Konfiguracja Guardian\'a',
+'guardian ignorefile' => 'Plik ignorowanych',
+'guardian interface' => 'Interfejs',
+'guardian logfile' => 'Plik Log',
+'guardian loglevel_off' => 'Off',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'File',
+'guardian logtarget_console' => 'Console',
+'guardian priolevel_high' => '1 - High',
+'guardian priolevel_medium' => '2 - Medium',
+'guardian priolevel_low' => '3 - Low',
+'guardian priolevel_very_low' => '4 - Very low',
+'guardian timelimit' => 'Ograniczenie czasowe',
+
+);
+
+#EOF

diff --git a/config/guardian/guardian.ru.pl b/config/guardian/guardian.ru.pl
new file mode 100644 (file)
index 0000000..34b8928
--- /dev/null
+++ b/config/guardian/guardian.ru.pl
@@ -0,0 +1,24 @@
+%tr = ( 
+%tr,
+
+'guardian alertfile' => 'Alertfile',
+'guardian configuration' => 'Настройки защиты',
+'guardian ignorefile' => 'Ignorefile',
+'guardian interface' => 'Интерфейс',
+'guardian logfile' => 'Logfile',
+'guardian loglevel_off' => 'Off',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'File',
+'guardian logtarget_console' => 'Console',
+'guardian priolevel_high' => '1 - High',
+'guardian priolevel_medium' => '2 - Medium',
+'guardian priolevel_low' => '3 - Low',
+'guardian priolevel_very_low' => '4 - Very low',
+'guardian timelimit' => 'Ограничение времени',
+
+);
+
+#EOF
+

diff --git a/config/guardian/guardian.tr.pl b/config/guardian/guardian.tr.pl
new file mode 100644 (file)
index 0000000..701dc15
--- /dev/null
+++ b/config/guardian/guardian.tr.pl
@@ -0,0 +1,24 @@
+%tr = ( 
+%tr,
+
+'guardian alertfile' => 'Uyarı dosyası',
+'guardian configuration' => 'Koruyucu Yapılandırması',
+'guardian ignorefile' => 'Yoksayılan dosya',
+'guardian interface' => 'Ara birim',
+'guardian logfile' => 'Günlük dosyası',
+'guardian loglevel_off' => 'Off',
+'guardian loglevel_info' => 'Info',
+'guardian loglevel_debug' => 'Debug',
+'guardian logtarget_syslog' => 'Systemlog',
+'guardian logtarget_file' => 'File',
+'guardian logtarget_console' => 'Console',
+'guardian priolevel_high' => '1 - High',
+'guardian priolevel_medium' => '2 - Medium',
+'guardian priolevel_low' => '3 - Low',
+'guardian priolevel_very_low' => '4 - Very low',
+'guardian timelimit' => 'Zaman sınırlaması',
+
+);
+
+#EOF
+

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 26069ce8190c90008a4913b506ebfae6953f1450..101411e890e0a58b142de87d122d34139b966546 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -672,9 +672,43 @@ WARNING: untranslated string: dead peer detection
 WARNING: untranslated string: emerging rules
 WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
+WARNING: untranslated string: guardian
+WARNING: untranslated string: guardian block a host
+WARNING: untranslated string: guardian block httpd brute-force
+WARNING: untranslated string: guardian block owncloud brute-force
+WARNING: untranslated string: guardian block ssh brute-force
+WARNING: untranslated string: guardian blockcount
+WARNING: untranslated string: guardian blocked hosts
+WARNING: untranslated string: guardian blocking of this address is not allowed
+WARNING: untranslated string: guardian blocktime
+WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
+WARNING: untranslated string: guardian daemon
+WARNING: untranslated string: guardian empty input
+WARNING: untranslated string: guardian enabled
+WARNING: untranslated string: guardian firewallaction
+WARNING: untranslated string: guardian ignored hosts
+WARNING: untranslated string: guardian invalid address or subnet
 WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
+WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
+WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
+WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
+WARNING: untranslated string: guardian priority level
+WARNING: untranslated string: guardian service
+WARNING: untranslated string: guardian watch snort alertfile
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
 WARNING: untranslated string: info messages
 WARNING: untranslated string: no data

diff --git a/doc/language_issues.en b/doc/language_issues.en
index e1bf78b384681a68324b17e9e8edc47f92614129..596cf71083d03281baf4ed56ddbfe4ad950b12f0 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -299,8 +299,6 @@ WARNING: translation string unused: geoipblock country code
 WARNING: translation string unused: geoipblock country name
 WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
-WARNING: translation string unused: guardian not running no hosts can be blocked
-WARNING: translation string unused: guardian snort alertfile
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
@@ -706,9 +704,43 @@ WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: bytes
 WARNING: untranslated string: fwhost cust geoipgrp
 WARNING: untranslated string: fwhost err hostip
+WARNING: untranslated string: guardian
+WARNING: untranslated string: guardian block a host
+WARNING: untranslated string: guardian block httpd brute-force
+WARNING: untranslated string: guardian block owncloud brute-force
+WARNING: untranslated string: guardian block ssh brute-force
+WARNING: untranslated string: guardian blockcount
+WARNING: untranslated string: guardian blocked hosts
+WARNING: untranslated string: guardian blocking of this address is not allowed
+WARNING: untranslated string: guardian blocktime
+WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
+WARNING: untranslated string: guardian daemon
+WARNING: untranslated string: guardian empty input
+WARNING: untranslated string: guardian enabled
+WARNING: untranslated string: guardian firewallaction
+WARNING: untranslated string: guardian ignored hosts
+WARNING: untranslated string: guardian invalid address or subnet
 WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
+WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
+WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
+WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
+WARNING: untranslated string: guardian priority level
+WARNING: untranslated string: guardian service
+WARNING: untranslated string: guardian watch snort alertfile
 WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
 WARNING: untranslated string: info messages
 WARNING: untranslated string: no data

diff --git a/doc/language_issues.es b/doc/language_issues.es
index e0b420dabeafe1c43fd07e2ebfc137e636b31f17..ad64380c6848ebd76bcd725b1e59f27979a0f84c 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -244,10 +244,6 @@ WARNING: translation string unused: geoipblock country code
 WARNING: translation string unused: geoipblock country name
 WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
-WARNING: translation string unused: guardian alertfile
-WARNING: translation string unused: guardian ignorefile
-WARNING: translation string unused: guardian interface
-WARNING: translation string unused: guardian timelimit
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
@@ -939,6 +935,7 @@ WARNING: untranslated string: guardian blocked hosts
 WARNING: untranslated string: guardian blocking of this address is not allowed
 WARNING: untranslated string: guardian blocktime
 WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
 WARNING: untranslated string: guardian daemon
 WARNING: untranslated string: guardian empty input
 WARNING: untranslated string: guardian enabled
@@ -949,8 +946,19 @@ WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
 WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
 WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
 WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
 WARNING: untranslated string: guardian priority level
 WARNING: untranslated string: guardian service
 WARNING: untranslated string: guardian watch snort alertfile

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index c0edce6c3af519149309d2ac4b8db9be9238465d..28e80c9767499bda38390a6f94285508d50a66f8 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -241,10 +241,6 @@ WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
 WARNING: translation string unused: green interface
-WARNING: translation string unused: guardian alertfile
-WARNING: translation string unused: guardian ignorefile
-WARNING: translation string unused: guardian interface
-WARNING: translation string unused: guardian timelimit
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
@@ -954,6 +950,7 @@ WARNING: untranslated string: guardian blocked hosts
 WARNING: untranslated string: guardian blocking of this address is not allowed
 WARNING: untranslated string: guardian blocktime
 WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
 WARNING: untranslated string: guardian daemon
 WARNING: untranslated string: guardian empty input
 WARNING: untranslated string: guardian enabled
@@ -964,8 +961,19 @@ WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
 WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
 WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
 WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
 WARNING: untranslated string: guardian priority level
 WARNING: untranslated string: guardian service
 WARNING: untranslated string: guardian watch snort alertfile

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 0358b2cc2fbdcfee3c70ebc3a210ab48a44f63c9..d221534a517054f64b20b11e02faa7d4580dba3a 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -291,10 +291,6 @@ WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
 WARNING: translation string unused: green interface
-WARNING: translation string unused: guardian alertfile
-WARNING: translation string unused: guardian ignorefile
-WARNING: translation string unused: guardian interface
-WARNING: translation string unused: guardian timelimit
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
@@ -750,6 +746,7 @@ WARNING: untranslated string: geoipblock configuration
 WARNING: untranslated string: geoipblock country is allowed
 WARNING: untranslated string: geoipblock country is blocked
 WARNING: untranslated string: geoipblock enable feature
+WARNING: untranslated string: guaranteed bandwith
 WARNING: untranslated string: guardian
 WARNING: untranslated string: guardian block a host
 WARNING: untranslated string: guardian block httpd brute-force
@@ -760,6 +757,7 @@ WARNING: untranslated string: guardian blocked hosts
 WARNING: untranslated string: guardian blocking of this address is not allowed
 WARNING: untranslated string: guardian blocktime
 WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
 WARNING: untranslated string: guardian daemon
 WARNING: untranslated string: guardian empty input
 WARNING: untranslated string: guardian enabled
@@ -770,8 +768,19 @@ WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
 WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
 WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
 WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
 WARNING: untranslated string: guardian priority level
 WARNING: untranslated string: guardian service
 WARNING: untranslated string: guardian watch snort alertfile

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index c8cd0d8ed2a24ab9eea70e09febe2372543d0123..1dfc968eae2f62db63ee006069f5a0685068c892 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -290,10 +290,6 @@ WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
 WARNING: translation string unused: green interface
-WARNING: translation string unused: guardian alertfile
-WARNING: translation string unused: guardian ignorefile
-WARNING: translation string unused: guardian interface
-WARNING: translation string unused: guardian timelimit
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
@@ -775,6 +771,7 @@ WARNING: untranslated string: guardian blocked hosts
 WARNING: untranslated string: guardian blocking of this address is not allowed
 WARNING: untranslated string: guardian blocktime
 WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
 WARNING: untranslated string: guardian daemon
 WARNING: untranslated string: guardian empty input
 WARNING: untranslated string: guardian enabled
@@ -785,8 +782,19 @@ WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
 WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
 WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
 WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
 WARNING: untranslated string: guardian priority level
 WARNING: untranslated string: guardian service
 WARNING: untranslated string: guardian watch snort alertfile

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index e0b420dabeafe1c43fd07e2ebfc137e636b31f17..ad64380c6848ebd76bcd725b1e59f27979a0f84c 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -244,10 +244,6 @@ WARNING: translation string unused: geoipblock country code
 WARNING: translation string unused: geoipblock country name
 WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
-WARNING: translation string unused: guardian alertfile
-WARNING: translation string unused: guardian ignorefile
-WARNING: translation string unused: guardian interface
-WARNING: translation string unused: guardian timelimit
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
@@ -939,6 +935,7 @@ WARNING: untranslated string: guardian blocked hosts
 WARNING: untranslated string: guardian blocking of this address is not allowed
 WARNING: untranslated string: guardian blocktime
 WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
 WARNING: untranslated string: guardian daemon
 WARNING: untranslated string: guardian empty input
 WARNING: untranslated string: guardian enabled
@@ -949,8 +946,19 @@ WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
 WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
 WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
 WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
 WARNING: untranslated string: guardian priority level
 WARNING: untranslated string: guardian service
 WARNING: untranslated string: guardian watch snort alertfile

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 9daa20f5688d9c518119a03905284687bb3d39eb..31855fa7ba34a7698de79a2d5c0d3776d92002e6 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -237,10 +237,6 @@ WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
 WARNING: translation string unused: green interface
-WARNING: translation string unused: guardian alertfile
-WARNING: translation string unused: guardian ignorefile
-WARNING: translation string unused: guardian interface
-WARNING: translation string unused: guardian timelimit
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
@@ -938,6 +934,7 @@ WARNING: untranslated string: guardian blocked hosts
 WARNING: untranslated string: guardian blocking of this address is not allowed
 WARNING: untranslated string: guardian blocktime
 WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
 WARNING: untranslated string: guardian daemon
 WARNING: untranslated string: guardian empty input
 WARNING: untranslated string: guardian enabled
@@ -948,8 +945,19 @@ WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
 WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
 WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
 WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
 WARNING: untranslated string: guardian priority level
 WARNING: untranslated string: guardian service
 WARNING: untranslated string: guardian watch snort alertfile

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 8f060dcf4618b6e9f7d26209e7c97ae73d7120b8..6629cd63201ec9ab8b748df73a82b1b84ed7a730 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -299,10 +299,6 @@ WARNING: translation string unused: geoipblock country code
 WARNING: translation string unused: geoipblock country name
 WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
-WARNING: translation string unused: guardian alertfile
-WARNING: translation string unused: guardian ignorefile
-WARNING: translation string unused: guardian interface
-WARNING: translation string unused: guardian timelimit
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
@@ -719,6 +715,7 @@ WARNING: untranslated string: guardian blocked hosts
 WARNING: untranslated string: guardian blocking of this address is not allowed
 WARNING: untranslated string: guardian blocktime
 WARNING: untranslated string: guardian common settings
+WARNING: untranslated string: guardian configuration
 WARNING: untranslated string: guardian daemon
 WARNING: untranslated string: guardian empty input
 WARNING: untranslated string: guardian enabled
@@ -729,8 +726,19 @@ WARNING: untranslated string: guardian invalid blockcount
 WARNING: untranslated string: guardian invalid blocktime
 WARNING: untranslated string: guardian invalid logfile
 WARNING: untranslated string: guardian logfacility
+WARNING: untranslated string: guardian logfile
 WARNING: untranslated string: guardian loglevel
+WARNING: untranslated string: guardian loglevel_debug
+WARNING: untranslated string: guardian loglevel_info
+WARNING: untranslated string: guardian loglevel_off
+WARNING: untranslated string: guardian logtarget_console
+WARNING: untranslated string: guardian logtarget_file
+WARNING: untranslated string: guardian logtarget_syslog
 WARNING: untranslated string: guardian no entries
+WARNING: untranslated string: guardian priolevel_high
+WARNING: untranslated string: guardian priolevel_low
+WARNING: untranslated string: guardian priolevel_medium
+WARNING: untranslated string: guardian priolevel_very_low
 WARNING: untranslated string: guardian priority level
 WARNING: untranslated string: guardian service
 WARNING: untranslated string: guardian watch snort alertfile

diff --git a/doc/language_missings b/doc/language_missings
index 8afdfe8f073cbc92ef85b2f11408e98892ab4306..32e1e48ecc43d8d8f6774a23363397606fcc8ab4 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -372,28 +372,6 @@
 < geoipblock enable feature
 < geoipblock flag
 < grouptype
-< guardian
-< guardian block a host
-< guardian blockcount
-< guardian blocked hosts
-< guardian block httpd brute-force
-< guardian blocking of this address is not allowed
-< guardian block owncloud brute-force
-< guardian block ssh brute-force
-< guardian blocktime
-< guardian common settings
-< guardian daemon
-< guardian empty input
-< guardian enabled
-< guardian firewallaction
-< guardian ignored hosts
-< guardian invalid address or subnet
-< guardian logfacility
-< guardian loglevel
-< guardian no entries
-< guardian priority level
-< guardian service
-< guardian watch snort alertfile
 < hardware support
 < imei
 < imsi
@@ -995,28 +973,6 @@
 < gen dh
 < generate dh key
 < grouptype
-< guardian
-< guardian block a host
-< guardian blockcount
-< guardian blocked hosts
-< guardian block httpd brute-force
-< guardian blocking of this address is not allowed
-< guardian block owncloud brute-force
-< guardian block ssh brute-force
-< guardian blocktime
-< guardian common settings
-< guardian daemon
-< guardian empty input
-< guardian enabled
-< guardian firewallaction
-< guardian ignored hosts
-< guardian invalid address or subnet
-< guardian logfacility
-< guardian loglevel
-< guardian no entries
-< guardian priority level
-< guardian service
-< guardian watch snort alertfile
 < hardware support
 < imei
 < imsi
@@ -1612,28 +1568,6 @@
 < geoipblock enable feature
 < geoipblock flag
 < grouptype
-< guardian
-< guardian block a host
-< guardian blockcount
-< guardian blocked hosts
-< guardian block httpd brute-force
-< guardian blocking of this address is not allowed
-< guardian block owncloud brute-force
-< guardian block ssh brute-force
-< guardian blocktime
-< guardian common settings
-< guardian daemon
-< guardian empty input
-< guardian enabled
-< guardian firewallaction
-< guardian ignored hosts
-< guardian invalid address or subnet
-< guardian logfacility
-< guardian loglevel
-< guardian no entries
-< guardian priority level
-< guardian service
-< guardian watch snort alertfile
 < hardware support
 < imei
 < imsi
@@ -2218,28 +2152,6 @@
 < geoipblock enable feature
 < geoipblock flag
 < grouptype
-< guardian
-< guardian block a host
-< guardian blockcount
-< guardian blocked hosts
-< guardian block httpd brute-force
-< guardian blocking of this address is not allowed
-< guardian block owncloud brute-force
-< guardian block ssh brute-force
-< guardian blocktime
-< guardian common settings
-< guardian daemon
-< guardian empty input
-< guardian enabled
-< guardian firewallaction
-< guardian ignored hosts
-< guardian invalid address or subnet
-< guardian logfacility
-< guardian loglevel
-< guardian no entries
-< guardian priority level
-< guardian service
-< guardian watch snort alertfile
 < hardware support
 < hour-graph
 < imei

diff --git a/html/cgi-bin/guardian.cgi b/html/cgi-bin/guardian.cgi
index 9d044fe7566e1941b692bec89571537395a988ed..963a564307685ab7720a45563dce166a4ad9f954 100644 (file)
--- a/html/cgi-bin/guardian.cgi
+++ b/html/cgi-bin/guardian.cgi
@@ -534,33 +534,39 @@ END
                        <tr>
                                <td colspan='2' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'guardian common settings'}</b></td>
                        </tr>
+
                        <tr>
-                               <td width='20%' class='base'>$Lang::tr{'guardian enabled'}:</td>
+                               <td width='25%' class='base'>$Lang::tr{'guardian enabled'}:</td>
                                <td><input type='checkbox' name='GUARDIAN_ENABLED' $checked{'GUARDIAN_ENABLED'}{'on'} /></td>
                        </tr>
+
                        <tr>
                                <td colspan='2'><br></td>
                        </tr>
+
                        <tr>
-                               <td width='20%' class='base'>$Lang::tr{'guardian watch snort alertfile'}</td>
+                               <td width='25%' class='base'>$Lang::tr{'guardian watch snort alertfile'}</td>
                                <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_SNORT' value='on' $checked{'GUARDIAN_MONITOR_SNORT'}{'on'} /> /
                                <input type='radio' name='GUARDIAN_MONITOR_SNORT' value='off' $checked{'GUARDIAN_MONITOR_SNORT'}{'off'} /> off</td>
                        </tr>
+
                        <tr>
-                               <td width='20%' class='base'>$Lang::tr{'guardian block ssh brute-force'}</td>
+                               <td width='25%' class='base'>$Lang::tr{'guardian block ssh brute-force'}</td>
                                <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_SSH' value='on' $checked{'GUARDIAN_MONITOR_SSH'}{'on'} /> /
                                <input type='radio' name='GUARDIAN_MONITOR_SSH' value='off' $checked{'GUARDIAN_MONITOR_SSH'}{'off'} /> off</td>
                        </tr>
+
                        <tr>
-                               <td width='20%' class='base'>$Lang::tr{'guardian block httpd brute-force'}</td>
+                               <td width='25%' class='base'>$Lang::tr{'guardian block httpd brute-force'}</td>
                                <td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='on' $checked{'GUARDIAN_MONITOR_HTTPD'}{'on'} /> /
                                <input type='radio' name='GUARDIAN_MONITOR_HTTPD' value='off' $checked{'GUARDIAN_MONITOR_HTTPD'}{'off'} /> off</td>
                        </tr>
 END
+
                        # Display owncloud checkbox when the addon is installed.
                        if ( -e "$owncloud_meta" ) {
                                print"<tr>\n";
-                               print"<td width='20%' class='base'>$Lang::tr{'guardian block owncloud brute-force'}</td>\n";
+                               print"<td width='25%' class='base'>$Lang::tr{'guardian block owncloud brute-force'}</td>\n";
                                print"<td align='left'>on <input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='on' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'on'} /> /\n";
                                print"<input type='radio' name='GUARDIAN_MONITOR_OWNCLOUD' value='off' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'off'} /> off</td>\n";
                                print"</tr>\n";
@@ -569,62 +575,64 @@ END
                        <tr>
                                <td colspan='2'><br></td>
                        </tr>
+
                        <tr>
                                <td align='left' width='20%'>$Lang::tr{'guardian logfacility'}:</td>
-                               <td><select id='GUARDIAN_LOG_FACILITY' name='GUARDIAN_LOG_FACILITY'>
-                                       <option id='logfacility_syslog' value='syslog' $selected{'GUARDIAN_LOG_FACILITY'}{'syslog'}>syslog</option>
-                                       <option id='logfacility_file' value='file' $selected{'GUARDIAN_LOG_FACILITY'}{'file'}>file</option>
-                                       <option id='logfacility_console' value='console' $selected{'GUARDIAN_LOG_FACILITY'}{'console'}>console</option>
+                               <td width='25%'><select id='GUARDIAN_LOG_FACILITY' name='GUARDIAN_LOG_FACILITY'>
+                                       <option id='logfacility_syslog' value='syslog' $selected{'GUARDIAN_LOG_FACILITY'}{'syslog'}>$Lang::tr{'guardian logtarget_syslog'}</option>
+                                       <option id='logfacility_file' value='file' $selected{'GUARDIAN_LOG_FACILITY'}{'file'}>$Lang::tr{'guardian logtarget_file'}</option>
+                                       <option id='logfacility_console' value='console' $selected{'GUARDIAN_LOG_FACILITY'}{'console'}>$Lang::tr{'guardian logtarget_console'}</option>
+                               </select></td>
+
+                               <td align='left' width='20%'>$Lang::tr{'guardian loglevel'}:</td>
+                               <td width='25%'><select id='GUARDIAN_LOGLEVEL' name='GUARDIAN_LOGLEVEL'>
+                                       <option id='loglevel_off' value='off' $selected{'GUARDIAN_LOGLEVEL'}{'off'}>$Lang::tr{'guardian loglevel_off'}</option>
+                                       <option id='loglevel_info' value='info' $selected{'GUARDIAN_LOGLEVEL'}{'info'}>$Lang::tr{'guardian loglevel_info'}</option>
+                                       <option id='loglevel_debug' value='debug' $selected{'GUARDIAN_LOGLEVEL'}{'debug'}>$Lang::tr{'guardian loglevel_debug'}</option>
                                </select></td>
                        </tr>
-                       <tr>
+
+                       <tr class="GUARDIAN_LOGFILE">
                                <td colspan='2'><br></td>
                        </tr>
-                       <tr>
-                               <td align='left' width='20%'>$Lang::tr{'guardian loglevel'}:</td>
-                               <td><select id='GUARDIAN_LOGLEVEL' name='GUARDIAN_LOGLEVEL'>
-                                       <option id='loglevel_off' value='off' $selected{'GUARDIAN_LOGLEVEL'}{'off'}>off</option>
-                                       <option id='loglevel_info' value='info' $selected{'GUARDIAN_LOGLEVEL'}{'info'}>info</option>
-                                       <option id='loglevel_debug' value='debug' $selected{'GUARDIAN_LOGLEVEL'}{'debug'}>debug</option>
-                               </select></td>
+
+                       <tr class="GUARDIAN_LOGFILE">
+                               <td width='25%' class='base'>$Lang::tr{'guardian logfile'}:</td>
+                               <td><input type='text' name='GUARDIAN_LOGFILE' value='$settings{'GUARDIAN_LOGFILE'}' size='30' /></td>
                        </tr>
+
                        <tr class="GUARDIAN_SNORT_PRIORITY_LEVEL">
                                <td colspan='2'><br></td>
                        </tr>
+
                        <tr class="GUARDIAN_SNORT_PRIORITY_LEVEL">
                                <td align='left' width='20%'>$Lang::tr{'guardian priority level'}:</td>
                                <td><select name='GUARDIAN_SNORT_PRIORITY_LEVEL'>
-                                       <option value='1' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'1'}>1</option>
-                                       <option value='2' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'2'}>2</option>
-                                       <option value='3' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'3'}>3</option>
-                                       <option value='4' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'4'}>4</option>
+                                       <option value='1' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'1'}>$Lang::tr{'guardian priolevel_high'}</option>
+                                       <option value='2' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'2'}>$Lang::tr{'guardian priolevel_medium'}</option>
+                                       <option value='3' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'3'}>$Lang::tr{'guardian priolevel_low'}</option>
+                                       <option value='4' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'4'}>$Lang::tr{'guardian priolevel_very_low'}</option>
                                </select></td>
+
+                               <td width='25%' class='base'>$Lang::tr{'guardian blockcount'}:</td>
+                               <td><input type='text' name='GUARDIAN_BLOCKCOUNT' value='$settings{'GUARDIAN_BLOCKCOUNT'}' size='5' /></td>
                        </tr>
+
                        <tr>
                                <td colspan='2'><br></td>
                        </tr>
+
                        <tr>
-                               <td width='20%' class='base'>$Lang::tr{'guardian firewallaction'}:</td>
+                               <td width='25%' class='base'>$Lang::tr{'guardian firewallaction'}:</td>
                                <td><select name='GUARDIAN_FIREWALL_ACTION'>
                                        <option value='DROP' $selected{'GUARDIAN_FIREWALL_ACTION'}{'DROP'}>Drop</option>
                                        <option value='REJECT' $selected{'GUARDIAN_FIREWALL_ACTION'}{'REJECT'}>Reject</option>
                                </select></td>
-                       </tr>
-                       <tr>
-                               <td colspan='2'><br></td>
-                       </tr>
-                       <tr>
-                               <td width='20%' class='base'>$Lang::tr{'guardian blockcount'}:</td>
-                               <td><input type='text' name='GUARDIAN_BLOCKCOUNT' value='$settings{'GUARDIAN_BLOCKCOUNT'}' size='5' /></td>
-                       </tr>
-                       <tr>
-                               <td width='20%' class='base'>$Lang::tr{'guardian blocktime'}:</td>
+
+                               <td width='25%' class='base'>$Lang::tr{'guardian blocktime'}:</td>
                                <td><input type='text' name='GUARDIAN_BLOCKTIME' value='$settings{'GUARDIAN_BLOCKTIME'}' size='10' /></td>
                        </tr>
-                       <tr class="GUARDIAN_LOGFILE">
-                                <td width='20%' class='base'>$Lang::tr{'guardian logfile'}:</td>
-                                <td><input type='text' name='GUARDIAN_LOGFILE' value='$settings{'GUARDIAN_LOGFILE'}' size='30' /></td>
-                        </tr>
+
                </table>
 END
 

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 400c2fed7a9c4f7fbafd8b0e153b7dfcb1d29f36..261b92fe7fe78f3d9d67e6840750772aa265dc77 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1217,30 +1217,6 @@
 'green interface' => 'Grünes Interface',
 'grouptype' => 'Gruppentyp:',
 'guaranteed bandwith' => 'Garantierte Bandbreite',
-'guardian' => 'Guardian',
-'guardian block a host' => 'Host blocken',
-'guardian block httpd brute-force' => 'httpd-Brute-Force-Erkennung',
-'guardian block owncloud brute-force' => 'Owncloud-Brute-Force-Erkennung',
-'guardian block ssh brute-force' => 'SSH-Brute-Force-Erkennung',
-'guardian blockcount' => 'Trefferschwelle',
-'guardian blocked hosts' => 'Aktuell geblockte Hosts',
-'guardian blocking of this address is not allowed' => 'Diese Addresse darf nicht gelockt werden.',
-'guardian blocktime' => 'Blockzeit',
-'guardian common settings' => 'Allgemeine Einstellungen',
-'guardian configuration' => 'Guardian-Konfiguration',
-'guardian daemon' => 'Daemon',
-'guardian empty input' => 'Fehlende Angabe: Bitte eine gültige IP-Addresse oder Netzwerk angeben.',
-'guardian enabled' => 'Guardian aktivieren',
-'guardian firewallaction' => 'Firewall-Aktion',
-'guardian ignored hosts' => 'Ignorierte Hosts',
-'guardian invalid address or subnet' => 'Ungültige Host-Addresse oder Netzwerk.',
-'guardian logfacility' => 'Logziel',
-'guardian logfile' => 'Logdatei',
-'guardian loglevel' => 'Loglevel',
-'guardian no entries' => 'Keine Einträge vorhanden.',
-'guardian priority level' => 'Prioritätslevel',
-'guardian service' => 'Guardian-Dienst',
-'guardian watch snort alertfile' => 'Snort-Alarme auswerten',
 'guest ok' => 'Gastzugang gewähren',
 'gui settings' => 'Benutzeroberfläche',
 'gz with key' => 'Nur ein verschlüsseltes Archiv kann auf dieser Maschine wiederhergestellt werden.',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7a7c1040fe0214453094db7c59fcea1cb33205fe..0e5b46d348df33568d53c7ae81cda67447dbdf04 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1246,32 +1246,6 @@
 'green interface' => 'Green Interface',
 'grouptype' => 'Grouptype:',
 'guaranteed bandwith' => 'Guaranteed bandwith',
-'guardian' => 'Guardian',
-'guardian block a host' => 'Block host',
-'guardian block httpd brute-force' => 'httpd Brute Force Detection',
-'guardian block owncloud brute-force' => 'Owncloud Brute Force detection',
-'guardian block ssh brute-force' => 'SSH Brute Force Detection',
-'guardian blockcount' => 'Strike Threshold',
-'guardian blocked hosts' => 'Currently blocked hosts',
-'guardian blocking of this address is not allowed' => 'Blocking of the given address is not allowed.',
-'guardian blocktime' => 'Block Time',
-'guardian common settings' => 'Common Settings',
-'guardian configuration' => 'Guardian Configuration',
-'guardian daemon' => 'Daemon',
-'guardian empty input' => 'Empty input: Please perform a valid host address or subnet.',
-'guardian enabled' => 'Enable Guardian',
-'guardian firewallaction' => 'Firewall Action',
-'guardian ignored hosts' => 'Ignored Hosts',
-'guardian invalid address or subnet' => 'Invalid host address or subnet.',
-'guardian logfacility' => 'Log Facility',
-'guardian logfile' => 'Log File',
-'guardian loglevel' => 'Log Level',
-'guardian no entries' => 'No entries at the moment.',
-'guardian not running no hosts can be blocked' => 'Guardian is not running. No hosts will be blocked.',
-'guardian priority level' => 'Priority Level',
-'guardian service' => 'Guardian Service',
-'guardian snort alertfile' => 'Snort Alert File',
-'guardian watch snort alertfile' => 'Monitor Snort Alert File',
 'guest ok' => 'allow guests to access',
 'gui settings' => 'GUI Settings',
 'gz with key' => 'Only an encrypted archive can be restored on this machine.',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 7ac5d11e788b588b59fa460f0bdab04b42c126a3..ede7b661db56325be2036408bc1000ecab521815 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -886,12 +886,6 @@
 'green' => 'Green',
 'green interface' => 'Interfaz Green',
 'guaranteed bandwith' => 'Ancho de banda garantizado',
-'guardian alertfile' => 'Archivo de alerta',
-'guardian configuration' => 'Configuración de Guardian',
-'guardian ignorefile' => 'Archivo Ignorefile',
-'guardian interface' => 'Interfaz',
-'guardian logfile' => 'Archivo de registro',
-'guardian timelimit' => 'Límite de tiempo',
 'guest ok' => 'permitir acceso de invitado',
 'gui settings' => 'Configuraciones de GUI',
 'gz with key' => 'Esta máquina sólo se puede restaurar desde archivos encriptados',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 61c514daf3d3081294095fab6dbb6054c4290239..e896c9b2a0de6c7737b09f9b9bbe980892d78a6e 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -877,12 +877,6 @@
 'green' => 'VERT',
 'green interface' => 'Interface VERTE',
 'guaranteed bandwith' => 'Bande passante garantie',
-'guardian alertfile' => 'Fichier d\'alerte',
-'guardian configuration' => 'Configuration du gardien',
-'guardian ignorefile' => 'Fichier d\'ignorés',
-'guardian interface' => 'Interface',
-'guardian logfile' => 'Fichier log',
-'guardian timelimit' => 'Délai maximum',
 'guest ok' => 'autoriser l\'accès aux invités',
 'gui settings' => 'Réglage GUI',
 'gz with key' => 'Seulement les archives chiffrées peuvent être restaurées sur cette machine.',

diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 2ed22f231c4b4b9222095a89759e57dea5528b43..b039cdbe0648af85f991d1c4c3dbf80c8d4d57a6 100644 (file)
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1187,13 +1187,6 @@
 'green' => 'Verde',
 'green interface' => 'Interface Verde',
 'grouptype' => 'Grouptype:',
-'guaranteed bandwith' => 'Guaranteed bandwith',
-'guardian alertfile' => 'Alertfile',
-'guardian configuration' => 'Guardian Configuration',
-'guardian ignorefile' => 'Ignorefile',
-'guardian interface' => 'Interface',
-'guardian logfile' => 'Logfile',
-'guardian timelimit' => 'Timelimit',
 'guest ok' => 'allow guests to access',
 'gui settings' => 'Settaggio GUI',
 'gz with key' => 'Only an encrypted archive can be restored on this machine.',

diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 2469ff248f1b0d6791a68e4848b829c83269ef68..49c0cced67a2f150d9fb2b6815581c9f4f0bd6b2 100644 (file)
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1168,12 +1168,6 @@
 'green interface' => 'Groene Interface',
 'grouptype' => 'Groeptype:',
 'guaranteed bandwith' => 'Gegarandeerde bandbreedte',
-'guardian alertfile' => 'Meldingenbestand',
-'guardian configuration' => 'Guardian configuratie',
-'guardian ignorefile' => 'Negeerbestand',
-'guardian interface' => 'Interface',
-'guardian logfile' => 'Logbestand',
-'guardian timelimit' => 'Tijdlimiet',
 'guest ok' => 'verleen gasten toegang',
 'gui settings' => 'Gebruikersinterface',
 'gz with key' => 'Alleen gecodeerde archieven kunnen worden teruggezet op deze machine.',

diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 92142058d430057969145484e2e82b05d062b955..e2f9da5c0a8bd31f2679d8272329d954e2dbab17 100644 (file)
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -885,12 +885,6 @@
 'green' => 'Green',
 'green interface' => 'Interfejs Green',
 'guaranteed bandwith' => 'Gwarantowane pasmo',
-'guardian alertfile' => 'Plik alertów',
-'guardian configuration' => 'Konfiguracja Guardian\'a',
-'guardian ignorefile' => 'Plik ignorowanych',
-'guardian interface' => 'Interfejs',
-'guardian logfile' => 'Plik Log',
-'guardian timelimit' => 'Ograniczenie czasowe',
 'guest ok' => 'zezwól na dostęp dla gości',
 'gui settings' => 'Ustawienia GUI',
 'gz with key' => 'Tylko zaszyfrowane archiwum może być odtworzone na tej maszynie.',

diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 6a45f7f051ec05f2be9bd7b9407d79cd55a95185..4b0edb58261c28cf277b138049971594cee04524 100644 (file)
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -880,12 +880,6 @@
 'green' => 'Green',
 'green interface' => 'Green Интерфейс',
 'guaranteed bandwith' => 'Гарантированная пропускная способность',
-'guardian alertfile' => 'Alertfile',
-'guardian configuration' => 'Настройки защиты',
-'guardian ignorefile' => 'Ignorefile',
-'guardian interface' => 'Интерфейс',
-'guardian logfile' => 'Logfile',
-'guardian timelimit' => 'Ограничение времени',
 'guest ok' => 'Разрешить гостевой доступ',
 'gui settings' => 'Внешний вид',
 'gz with key' => 'Только зашифрованный архив может быть восстановлен на этой машине.',

diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 3af233961f4334382ca1710028c9ebb65ad43209..9eb3000067e46a4cedb86a2d888dc69fb4978e17 100644 (file)
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1245,12 +1245,6 @@
 'green interface' => 'Yeşil Arabirim',
 'grouptype' => 'Grup türü:',
 'guaranteed bandwith' => 'Garantili bant genişliği',
-'guardian alertfile' => 'Uyarı dosyası',
-'guardian configuration' => 'Koruyucu Yapılandırması',
-'guardian ignorefile' => 'Yoksayılan dosya',
-'guardian interface' => 'Ara birim',
-'guardian logfile' => 'Günlük dosyası',
-'guardian timelimit' => 'Zaman sınırlaması',
 'guest ok' => 'istemcilere erişim izni',
 'gui settings' => 'GUI Ayarları',
 'gz with key' => 'Sadece şifreli bir arşiv bu makinede geri yüklenebilir.',

diff --git a/lfs/guardian b/lfs/guardian
index b02ec5413a289dfa48a2e5c11408e4729450fc84..c016f04279ffd0de9d67e265aa6ff18ce6acb928 100644 (file)
--- a/lfs/guardian
+++ b/lfs/guardian
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -33,11 +33,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 PROG       = guardian
-PAK_VER    = 10
+PAK_VER    = 11
 
 DEPS       = "perl-inotify2 perl-Net-IP"
 
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -108,5 +107,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/guardian/guardian.logrotate \
                /etc/logrotate.d/guardian
 
+       # Install addon-specific language-files.
+       install -v -m 004 $(DIR_SRC)/config/guardian/guardian.*.pl \
+               /var/ipfire/addon-lang/
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)