From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 eef9b2529c3cab522dac4f4bcfa1a0075376514e
Date: Tue, 04 Oct 2016 22:45:14 +0100
Message-ID: <20161004214517.AF5691078E81@git01.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0583647557080934854=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============0583647557080934854==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  eef9b2529c3cab522dac4f4bcfa1a0075376514e (commit)
       via  574ee681d21b394cbc4d4b498bd4dba9a2a8ebf8 (commit)
       via  350e29c26fe9d6cb8c075f47674db04a81f4ddc7 (commit)
       via  c5f633c91712e4e1f5bb68633f4d55f030aed8a6 (commit)
      from  e3a90a5736be84bd4292a05c006802aa26ffcc0d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eef9b2529c3cab522dac4f4bcfa1a0075376514e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Oct 4 22:40:03 2016 +0100

    setup: Store passwords in SHA format
   =20
    htpasswd doesn't protect passwords very well. MD5 was used
    before and now any newly created passwords will use the
    SHA format.
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 574ee681d21b394cbc4d4b498bd4dba9a2a8ebf8
Merge: 350e29c e3a90a5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Oct 4 22:34:23 2016 +0100

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

commit 350e29c26fe9d6cb8c075f47674db04a81f4ddc7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 3 12:13:43 2016 +0100

    Update translations
   =20
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit c5f633c91712e4e1f5bb68633f4d55f030aed8a6
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date:   Fri Sep 23 16:33:04 2016 +0200

    guardian 2.0: suggested cosmetic changes
   =20
    I did the following:
   =20
    - Rearranged the fields on 'guardian.cgi' a bit - in a (hopefully) logica=
l manner,
      so that they don't need so much room.
    - Added some translation-strings and explanations to (revised) 'guardian.=
cgi'.
    - Added missing language string(s), deleted obsolete.
    - Deleted all guardian entries from standard language files in
      '/var/ipfire/langs'-directory.
    - Added (upgraded) addon-specific language files to '/var/ipfire/addon-la=
ng'-directory.
   =20
    I hope, I didn't forget something...
   =20
    Best,
    Matthias
   =20
    Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
    Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/guardian/guardian.de.pl            | 45 ++++++++++++++++
 config/guardian/guardian.en.pl            | 45 ++++++++++++++++
 config/guardian/guardian.es.pl            | 23 ++++++++
 config/guardian/guardian.fr.pl            | 23 ++++++++
 config/guardian/guardian.it.pl            | 24 +++++++++
 config/guardian/guardian.nl.pl            | 23 ++++++++
 config/guardian/guardian.pl.pl            | 23 ++++++++
 config/guardian/guardian.ru.pl            | 24 +++++++++
 config/guardian/guardian.tr.pl            | 24 +++++++++
 config/rootfiles/core/106/filelists/files |  1 +
 doc/language_issues.de                    | 34 ++++++++++++
 doc/language_issues.en                    | 36 ++++++++++++-
 doc/language_issues.es                    | 16 ++++--
 doc/language_issues.fr                    | 16 ++++--
 doc/language_issues.it                    | 17 ++++--
 doc/language_issues.nl                    | 16 ++++--
 doc/language_issues.pl                    | 16 ++++--
 doc/language_issues.ru                    | 16 ++++--
 doc/language_issues.tr                    | 16 ++++--
 doc/language_missings                     | 88 -----------------------------=
--
 html/cgi-bin/guardian.cgi                 | 80 +++++++++++++++-------------
 langs/de/cgi-bin/de.pl                    | 24 ---------
 langs/en/cgi-bin/en.pl                    | 26 ---------
 langs/es/cgi-bin/es.pl                    |  6 ---
 langs/fr/cgi-bin/fr.pl                    |  6 ---
 langs/it/cgi-bin/it.pl                    |  7 ---
 langs/nl/cgi-bin/nl.pl                    |  6 ---
 langs/pl/cgi-bin/pl.pl                    |  6 ---
 langs/ru/cgi-bin/ru.pl                    |  6 ---
 langs/tr/cgi-bin/tr.pl                    |  6 ---
 lfs/guardian                              |  9 ++--
 src/setup/passwords.c                     |  2 +-
 32 files changed, 459 insertions(+), 251 deletions(-)
 create mode 100644 config/guardian/guardian.de.pl
 create mode 100644 config/guardian/guardian.en.pl
 create mode 100644 config/guardian/guardian.es.pl
 create mode 100644 config/guardian/guardian.fr.pl
 create mode 100644 config/guardian/guardian.it.pl
 create mode 100644 config/guardian/guardian.nl.pl
 create mode 100644 config/guardian/guardian.pl.pl
 create mode 100644 config/guardian/guardian.ru.pl
 create mode 100644 config/guardian/guardian.tr.pl

Difference in files:
diff --git a/config/guardian/guardian.de.pl b/config/guardian/guardian.de.pl
new file mode 100644
index 0000000..344d045
--- /dev/null
+++ b/config/guardian/guardian.de.pl
@@ -0,0 +1,45 @@
+%tr =3D (=20
+%tr,
+
+'guardian' =3D> 'Guardian',
+'guardian block a host' =3D> 'Host blocken',
+'guardian block httpd brute-force' =3D> 'httpd-Brute-Force-Erkennung',
+'guardian block owncloud brute-force' =3D> 'Owncloud-Brute-Force-Erkennung',
+'guardian block ssh brute-force' =3D> 'SSH-Brute-Force-Erkennung',
+'guardian blockcount' =3D> 'Trefferschwelle (Snort)',
+'guardian blocked hosts' =3D> 'Aktuell geblockte Hosts',
+'guardian blocking of this address is not allowed' =3D> 'Diese Addresse darf=
 nicht geblockt werden.',
+'guardian blocktime' =3D> 'Blockzeit (Sekunden)',
+'guardian common settings' =3D> 'Allgemeine Einstellungen',
+'guardian configuration' =3D> 'Guardian-Konfiguration',
+'guardian daemon' =3D> 'Daemon',
+'guardian empty input' =3D> 'Fehlende Angabe: Bitte geben Sie einen g=C3=BCl=
tigen Host oder ein g=C3=BCltiges Netzwerk an.',
+'guardian enabled' =3D> 'Guardian aktivieren',
+'guardian firewallaction' =3D> 'Firewall-Aktion',
+'guardian ignored hosts' =3D> 'Ignorierte Hosts',
+'guardian invalid address or subnet' =3D> 'Ung=C3=BCltige Host-Addresse oder=
 Netzwerk.',
+'guardian invalid blockcount' =3D> 'Ung=C3=BCltige Anzahl: Bitte verwenden S=
ie eine nat=C3=BCrliche Zahl gr=C3=B6=C3=9Fer als Null.',
+'guardian invalid blocktime' =3D> 'Ung=C3=BCltige Blockzeit: Bitte verwenden=
 Sie eine nat=C3=BCrliche Zahl gr=C3=B6=C3=9Fer als Null.',
+'guardian invalid logfile' =3D> 'Der angegebene Pfad zum "Ignore file" ist u=
ng=C3=BCltig.',
+'guardian logfacility' =3D> 'Logziel',
+'guardian logfile' =3D> 'Logdatei',
+'guardian loglevel' =3D> 'Loglevel',
+'guardian loglevel_off' =3D> 'Aus',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'Datei',
+'guardian logtarget_console' =3D> 'Konsole',
+'guardian no entries' =3D> 'Keine Eintr=C3=A4ge vorhanden.',
+'guardian not running no hosts can be blocked' =3D> 'Guardian l=C3=A4uft nic=
ht. Es werden keine Hosts geblockt.',
+'guardian priolevel_high' =3D> '1 - Hoch',
+'guardian priolevel_medium' =3D> '2 - Mittel',
+'guardian priolevel_low' =3D> '3 - Niedrig',
+'guardian priolevel_very_low' =3D> '4 - Sehr niedrig',
+'guardian priority level' =3D> 'Priorit=C3=A4tslevel (Snort)',
+'guardian service' =3D> 'Guardian-Dienst',
+'guardian watch snort alertfile' =3D> 'Snort-Alarme auswerten',
+
+);
+
+#EOF
diff --git a/config/guardian/guardian.en.pl b/config/guardian/guardian.en.pl
new file mode 100644
index 0000000..f6be865
--- /dev/null
+++ b/config/guardian/guardian.en.pl
@@ -0,0 +1,45 @@
+%tr =3D (=20
+%tr,
+
+'guardian' =3D> 'Guardian',
+'guardian block a host' =3D> 'Block host',
+'guardian block httpd brute-force' =3D> 'httpd Brute Force Detection',
+'guardian block owncloud brute-force' =3D> 'Owncloud Brute Force detection',
+'guardian block ssh brute-force' =3D> 'SSH Brute Force Detection',
+'guardian blockcount' =3D> 'Strike Threshold (Snort)',
+'guardian blocked hosts' =3D> 'Currently blocked hosts',
+'guardian blocking of this address is not allowed' =3D> 'Blocking of the giv=
en address is not allowed.',
+'guardian blocktime' =3D> 'Block Time (seconds)',
+'guardian common settings' =3D> 'Common Settings',
+'guardian configuration' =3D> 'Guardian Configuration',
+'guardian daemon' =3D> 'Daemon',
+'guardian empty input' =3D> 'Empty input: Please enter a valid host address =
or subnet.',
+'guardian enabled' =3D> 'Enable Guardian',
+'guardian firewallaction' =3D> 'Firewall Action',
+'guardian ignored hosts' =3D> 'Ignored Hosts',
+'guardian invalid address or subnet' =3D> 'Invalid host address or subnet.',
+'guardian invalid blockcount' =3D> 'Invalid BlockCount: Please provide a nat=
ural number higher than zero.',
+'guardian invalid blocktime' =3D> 'Invalid BlockTime: Please provide a natur=
al number higher than zero.',
+'guardian invalid logfile' =3D> 'The provided path for the logfile is not va=
lid.',
+'guardian logfacility' =3D> 'Log Facility',
+'guardian logfile' =3D> 'Log File',
+'guardian loglevel' =3D> 'Log Level',
+'guardian loglevel_off' =3D> 'Off',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'File',
+'guardian logtarget_console' =3D> 'Console',
+'guardian no entries' =3D> 'No entries at the moment.',
+'guardian not running no hosts can be blocked' =3D> 'Guardian is not running=
. No hosts will be blocked.',
+'guardian priolevel_high' =3D> '1 - High',
+'guardian priolevel_medium' =3D> '2 - Medium',
+'guardian priolevel_low' =3D> '3 - Low',
+'guardian priolevel_very_low' =3D> '4 - Very low',
+'guardian priority level' =3D> 'Priority Level (Snort)',
+'guardian service' =3D> 'Guardian Service',
+'guardian watch snort alertfile' =3D> 'Monitor Snort Alert File',
+
+);
+
+#EOF
diff --git a/config/guardian/guardian.es.pl b/config/guardian/guardian.es.pl
new file mode 100644
index 0000000..89ffb52
--- /dev/null
+++ b/config/guardian/guardian.es.pl
@@ -0,0 +1,23 @@
+%tr =3D (=20
+%tr,
+
+'guardian alertfile' =3D> 'Archivo de alerta',
+'guardian configuration' =3D> 'Configuraci=C3=B3n de Guardian',
+'guardian ignorefile' =3D> 'Archivo Ignorefile',
+'guardian interface' =3D> 'Interfaz',
+'guardian logfile' =3D> 'Archivo de registro',
+'guardian loglevel_off' =3D> 'Off',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'File',
+'guardian logtarget_console' =3D> 'Console',
+'guardian priolevel_high' =3D> '1 - High',
+'guardian priolevel_medium' =3D> '2 - Medium',
+'guardian priolevel_low' =3D> '3 - Low',
+'guardian priolevel_very_low' =3D> '4 - Very low',
+'guardian timelimit' =3D> 'L=C3=ADmite de tiempo',
+
+);
+
+#EOF
diff --git a/config/guardian/guardian.fr.pl b/config/guardian/guardian.fr.pl
new file mode 100644
index 0000000..82e5736
--- /dev/null
+++ b/config/guardian/guardian.fr.pl
@@ -0,0 +1,23 @@
+%tr =3D (=20
+%tr,
+
+'guardian alertfile' =3D> 'Fichier d\'alerte',
+'guardian configuration' =3D> 'Configuration du gardien',
+'guardian ignorefile' =3D> 'Fichier d\'ignor=C3=A9s',
+'guardian interface' =3D> 'Interface',
+'guardian logfile' =3D> 'Fichier log',
+'guardian loglevel_off' =3D> 'Off',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'File',
+'guardian logtarget_console' =3D> 'Console',
+'guardian priolevel_high' =3D> '1 - High',
+'guardian priolevel_medium' =3D> '2 - Medium',
+'guardian priolevel_low' =3D> '3 - Low',
+'guardian priolevel_very_low' =3D> '4 - Very low',
+'guardian timelimit' =3D> 'D=C3=A9lai maximum',
+
+);
+
+#EOF
diff --git a/config/guardian/guardian.it.pl b/config/guardian/guardian.it.pl
new file mode 100644
index 0000000..9b89a52
--- /dev/null
+++ b/config/guardian/guardian.it.pl
@@ -0,0 +1,24 @@
+%tr =3D (=20
+%tr,
+
+'guaranteed bandwith' =3D> 'Guaranteed bandwith',
+'guardian alertfile' =3D> 'Alertfile',
+'guardian configuration' =3D> 'Guardian Configuration',
+'guardian ignorefile' =3D> 'Ignorefile',
+'guardian interface' =3D> 'Interface',
+'guardian logfile' =3D> 'Logfile',
+'guardian loglevel_off' =3D> 'Off',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'File',
+'guardian logtarget_console' =3D> 'Console',
+'guardian priolevel_high' =3D> '1 - High',
+'guardian priolevel_medium' =3D> '2 - Medium',
+'guardian priolevel_low' =3D> '3 - Low',
+'guardian priolevel_very_low' =3D> '4 - Very low',
+'guardian timelimit' =3D> 'Timelimit',
+
+);
+
+#EOF
diff --git a/config/guardian/guardian.nl.pl b/config/guardian/guardian.nl.pl
new file mode 100644
index 0000000..d71a91f
--- /dev/null
+++ b/config/guardian/guardian.nl.pl
@@ -0,0 +1,23 @@
+%tr =3D (=20
+%tr,
+
+'guardian alertfile' =3D> 'Meldingenbestand',
+'guardian configuration' =3D> 'Guardian configuratie',
+'guardian ignorefile' =3D> 'Negeerbestand',
+'guardian interface' =3D> 'Interface',
+'guardian logfile' =3D> 'Logbestand',
+'guardian loglevel_off' =3D> 'Off',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'File',
+'guardian logtarget_console' =3D> 'Console',
+'guardian priolevel_high' =3D> '1 - High',
+'guardian priolevel_medium' =3D> '2 - Medium',
+'guardian priolevel_low' =3D> '3 - Low',
+'guardian priolevel_very_low' =3D> '4 - Very low',
+'guardian timelimit' =3D> 'Tijdlimiet',
+
+);
+
+#EOF
diff --git a/config/guardian/guardian.pl.pl b/config/guardian/guardian.pl.pl
new file mode 100644
index 0000000..18cb396
--- /dev/null
+++ b/config/guardian/guardian.pl.pl
@@ -0,0 +1,23 @@
+%tr =3D (=20
+%tr,
+
+'guardian alertfile' =3D> 'Plik alert=C3=B3w',
+'guardian configuration' =3D> 'Konfiguracja Guardian\'a',
+'guardian ignorefile' =3D> 'Plik ignorowanych',
+'guardian interface' =3D> 'Interfejs',
+'guardian logfile' =3D> 'Plik Log',
+'guardian loglevel_off' =3D> 'Off',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'File',
+'guardian logtarget_console' =3D> 'Console',
+'guardian priolevel_high' =3D> '1 - High',
+'guardian priolevel_medium' =3D> '2 - Medium',
+'guardian priolevel_low' =3D> '3 - Low',
+'guardian priolevel_very_low' =3D> '4 - Very low',
+'guardian timelimit' =3D> 'Ograniczenie czasowe',
+
+);
+
+#EOF
diff --git a/config/guardian/guardian.ru.pl b/config/guardian/guardian.ru.pl
new file mode 100644
index 0000000..34b8928
--- /dev/null
+++ b/config/guardian/guardian.ru.pl
@@ -0,0 +1,24 @@
+%tr =3D (=20
+%tr,
+
+'guardian alertfile' =3D> 'Alertfile',
+'guardian configuration' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=
=BA=D0=B8 =D0=B7=D0=B0=D1=89=D0=B8=D1=82=D1=8B',
+'guardian ignorefile' =3D> 'Ignorefile',
+'guardian interface' =3D> '=D0=98=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=
=D1=81',
+'guardian logfile' =3D> 'Logfile',
+'guardian loglevel_off' =3D> 'Off',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'File',
+'guardian logtarget_console' =3D> 'Console',
+'guardian priolevel_high' =3D> '1 - High',
+'guardian priolevel_medium' =3D> '2 - Medium',
+'guardian priolevel_low' =3D> '3 - Low',
+'guardian priolevel_very_low' =3D> '4 - Very low',
+'guardian timelimit' =3D> '=D0=9E=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=
=D0=BD=D0=B8=D0=B5 =D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8',
+
+);
+
+#EOF
+
diff --git a/config/guardian/guardian.tr.pl b/config/guardian/guardian.tr.pl
new file mode 100644
index 0000000..701dc15
--- /dev/null
+++ b/config/guardian/guardian.tr.pl
@@ -0,0 +1,24 @@
+%tr =3D (=20
+%tr,
+
+'guardian alertfile' =3D> 'Uyar=C4=B1 dosyas=C4=B1',
+'guardian configuration' =3D> 'Koruyucu Yap=C4=B1land=C4=B1rmas=C4=B1',
+'guardian ignorefile' =3D> 'Yoksay=C4=B1lan dosya',
+'guardian interface' =3D> 'Ara birim',
+'guardian logfile' =3D> 'G=C3=BCnl=C3=BCk dosyas=C4=B1',
+'guardian loglevel_off' =3D> 'Off',
+'guardian loglevel_info' =3D> 'Info',
+'guardian loglevel_debug' =3D> 'Debug',
+'guardian logtarget_syslog' =3D> 'Systemlog',
+'guardian logtarget_file' =3D> 'File',
+'guardian logtarget_console' =3D> 'Console',
+'guardian priolevel_high' =3D> '1 - High',
+'guardian priolevel_medium' =3D> '2 - Medium',
+'guardian priolevel_low' =3D> '3 - Low',
+'guardian priolevel_very_low' =3D> '4 - Very low',
+'guardian timelimit' =3D> 'Zaman s=C4=B1n=C4=B1rlamas=C4=B1',
+
+);
+
+#EOF
+
diff --git a/config/rootfiles/core/106/filelists/files b/config/rootfiles/cor=
e/106/filelists/files
index 3468c58..77f73c8 100644
--- a/config/rootfiles/core/106/filelists/files
+++ b/config/rootfiles/core/106/filelists/files
@@ -19,3 +19,4 @@ srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/logs.cgi/log.dat
 srv/web/ipfire/cgi-bin/pppsetup.cgi
 srv/web/ipfire/cgi-bin/services.cgi
+usr/sbin/setup
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 26069ce..101411e 100644
--- 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 allow=
ed
+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 e1bf78b..596cf71 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -299,8 +299,6 @@ WARNING: translation string unused: geoipblock country co=
de
 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 blo=
cked
-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 allow=
ed
+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 e0b420d..ad64380 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -244,10 +244,6 @@ WARNING: translation string unused: geoipblock country c=
ode
 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 allow=
ed
 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 c0edce6..28e80c9 100644
--- 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 allow=
ed
 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 0358b2c..d221534 100644
--- 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 allow=
ed
 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 c8cd0d8..1dfc968 100644
--- 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 allow=
ed
 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 e0b420d..ad64380 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -244,10 +244,6 @@ WARNING: translation string unused: geoipblock country c=
ode
 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 allow=
ed
 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 9daa20f..31855fa 100644
--- 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 allow=
ed
 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 8f060dc..6629cd6 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -299,10 +299,6 @@ WARNING: translation string unused: geoipblock country c=
ode
 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 allow=
ed
 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 8afdfe8..32e1e48 100644
--- 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 9d044fe..963a564 100644
--- a/html/cgi-bin/guardian.cgi
+++ b/html/cgi-bin/guardian.cgi
@@ -534,33 +534,39 @@ END
 			<tr>
 				<td colspan=3D'2' class=3D'base' bgcolor=3D'$color{'color20'}'><b>$Lang:=
:tr{'guardian common settings'}</b></td>
 			</tr>
+
 			<tr>
-				<td width=3D'20%' class=3D'base'>$Lang::tr{'guardian enabled'}:</td>
+				<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian enabled'}:</td>
 				<td><input type=3D'checkbox' name=3D'GUARDIAN_ENABLED' $checked{'GUARDIA=
N_ENABLED'}{'on'} /></td>
 			</tr>
+
 			<tr>
 				<td colspan=3D'2'><br></td>
 			</tr>
+
 			<tr>
-				<td width=3D'20%' class=3D'base'>$Lang::tr{'guardian watch snort alertfi=
le'}</td>
+				<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian watch snort alertfi=
le'}</td>
 				<td align=3D'left'>on <input type=3D'radio' name=3D'GUARDIAN_MONITOR_SNO=
RT' value=3D'on' $checked{'GUARDIAN_MONITOR_SNORT'}{'on'} /> /
 				<input type=3D'radio' name=3D'GUARDIAN_MONITOR_SNORT' value=3D'off' $che=
cked{'GUARDIAN_MONITOR_SNORT'}{'off'} /> off</td>
 			</tr>
+
 			<tr>
-				<td width=3D'20%' class=3D'base'>$Lang::tr{'guardian block ssh brute-for=
ce'}</td>
+				<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian block ssh brute-for=
ce'}</td>
 				<td align=3D'left'>on <input type=3D'radio' name=3D'GUARDIAN_MONITOR_SSH=
' value=3D'on' $checked{'GUARDIAN_MONITOR_SSH'}{'on'} /> /
 				<input type=3D'radio' name=3D'GUARDIAN_MONITOR_SSH' value=3D'off' $check=
ed{'GUARDIAN_MONITOR_SSH'}{'off'} /> off</td>
 			</tr>
+
 			<tr>
-				<td width=3D'20%' class=3D'base'>$Lang::tr{'guardian block httpd brute-f=
orce'}</td>
+				<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian block httpd brute-f=
orce'}</td>
 				<td align=3D'left'>on <input type=3D'radio' name=3D'GUARDIAN_MONITOR_HTT=
PD' value=3D'on' $checked{'GUARDIAN_MONITOR_HTTPD'}{'on'} /> /
 				<input type=3D'radio' name=3D'GUARDIAN_MONITOR_HTTPD' value=3D'off' $che=
cked{'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=3D'20%' class=3D'base'>$Lang::tr{'guardian block ownclou=
d brute-force'}</td>\n";
+				print"<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian block ownclou=
d brute-force'}</td>\n";
 				print"<td align=3D'left'>on <input type=3D'radio' name=3D'GUARDIAN_MONIT=
OR_OWNCLOUD' value=3D'on' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'on'} /> /\n";
 				print"<input type=3D'radio' name=3D'GUARDIAN_MONITOR_OWNCLOUD' value=3D'=
off' $checked{'GUARDIAN_MONITOR_OWNCLOUD'}{'off'} /> off</td>\n";
 				print"</tr>\n";
@@ -569,62 +575,64 @@ END
 			<tr>
 				<td colspan=3D'2'><br></td>
 			</tr>
+
 			<tr>
 				<td align=3D'left' width=3D'20%'>$Lang::tr{'guardian logfacility'}:</td>
-				<td><select id=3D'GUARDIAN_LOG_FACILITY' name=3D'GUARDIAN_LOG_FACILITY'>
-					<option id=3D'logfacility_syslog' value=3D'syslog' $selected{'GUARDIAN_=
LOG_FACILITY'}{'syslog'}>syslog</option>
-					<option id=3D'logfacility_file' value=3D'file' $selected{'GUARDIAN_LOG_=
FACILITY'}{'file'}>file</option>
-					<option id=3D'logfacility_console' value=3D'console' $selected{'GUARDIA=
N_LOG_FACILITY'}{'console'}>console</option>
+				<td width=3D'25%'><select id=3D'GUARDIAN_LOG_FACILITY' name=3D'GUARDIAN_=
LOG_FACILITY'>
+					<option id=3D'logfacility_syslog' value=3D'syslog' $selected{'GUARDIAN_=
LOG_FACILITY'}{'syslog'}>$Lang::tr{'guardian logtarget_syslog'}</option>
+					<option id=3D'logfacility_file' value=3D'file' $selected{'GUARDIAN_LOG_=
FACILITY'}{'file'}>$Lang::tr{'guardian logtarget_file'}</option>
+					<option id=3D'logfacility_console' value=3D'console' $selected{'GUARDIA=
N_LOG_FACILITY'}{'console'}>$Lang::tr{'guardian logtarget_console'}</option>
+				</select></td>
+
+				<td align=3D'left' width=3D'20%'>$Lang::tr{'guardian loglevel'}:</td>
+				<td width=3D'25%'><select id=3D'GUARDIAN_LOGLEVEL' name=3D'GUARDIAN_LOGL=
EVEL'>
+					<option id=3D'loglevel_off' value=3D'off' $selected{'GUARDIAN_LOGLEVEL'=
}{'off'}>$Lang::tr{'guardian loglevel_off'}</option>
+					<option id=3D'loglevel_info' value=3D'info' $selected{'GUARDIAN_LOGLEVE=
L'}{'info'}>$Lang::tr{'guardian loglevel_info'}</option>
+					<option id=3D'loglevel_debug' value=3D'debug' $selected{'GUARDIAN_LOGLE=
VEL'}{'debug'}>$Lang::tr{'guardian loglevel_debug'}</option>
 				</select></td>
 			</tr>
-			<tr>
+
+			<tr class=3D"GUARDIAN_LOGFILE">
 				<td colspan=3D'2'><br></td>
 			</tr>
-			<tr>
-				<td align=3D'left' width=3D'20%'>$Lang::tr{'guardian loglevel'}:</td>
-				<td><select id=3D'GUARDIAN_LOGLEVEL' name=3D'GUARDIAN_LOGLEVEL'>
-					<option id=3D'loglevel_off' value=3D'off' $selected{'GUARDIAN_LOGLEVEL'=
}{'off'}>off</option>
-					<option id=3D'loglevel_info' value=3D'info' $selected{'GUARDIAN_LOGLEVE=
L'}{'info'}>info</option>
-					<option id=3D'loglevel_debug' value=3D'debug' $selected{'GUARDIAN_LOGLE=
VEL'}{'debug'}>debug</option>
-				</select></td>
+
+			<tr class=3D"GUARDIAN_LOGFILE">
+				<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian logfile'}:</td>
+				<td><input type=3D'text' name=3D'GUARDIAN_LOGFILE' value=3D'$settings{'G=
UARDIAN_LOGFILE'}' size=3D'30' /></td>
 			</tr>
+
 			<tr class=3D"GUARDIAN_SNORT_PRIORITY_LEVEL">
 				<td colspan=3D'2'><br></td>
 			</tr>
+
 			<tr class=3D"GUARDIAN_SNORT_PRIORITY_LEVEL">
 				<td align=3D'left' width=3D'20%'>$Lang::tr{'guardian priority level'}:</=
td>
 				<td><select name=3D'GUARDIAN_SNORT_PRIORITY_LEVEL'>
-					<option value=3D'1' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'1'}>1</=
option>
-					<option value=3D'2' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'2'}>2</=
option>
-					<option value=3D'3' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'3'}>3</=
option>
-					<option value=3D'4' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'4'}>4</=
option>
+					<option value=3D'1' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'1'}>$La=
ng::tr{'guardian priolevel_high'}</option>
+					<option value=3D'2' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'2'}>$La=
ng::tr{'guardian priolevel_medium'}</option>
+					<option value=3D'3' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'3'}>$La=
ng::tr{'guardian priolevel_low'}</option>
+					<option value=3D'4' $selected{'GUARDIAN_SNORT_PRIORITY_LEVEL'}{'4'}>$La=
ng::tr{'guardian priolevel_very_low'}</option>
 				</select></td>
+
+				<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian blockcount'}:</td>
+				<td><input type=3D'text' name=3D'GUARDIAN_BLOCKCOUNT' value=3D'$settings=
{'GUARDIAN_BLOCKCOUNT'}' size=3D'5' /></td>
 			</tr>
+
 			<tr>
 				<td colspan=3D'2'><br></td>
 			</tr>
+
 			<tr>
-				<td width=3D'20%' class=3D'base'>$Lang::tr{'guardian firewallaction'}:</=
td>
+				<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian firewallaction'}:</=
td>
 				<td><select name=3D'GUARDIAN_FIREWALL_ACTION'>
 					<option value=3D'DROP' $selected{'GUARDIAN_FIREWALL_ACTION'}{'DROP'}>Dr=
op</option>
 					<option value=3D'REJECT' $selected{'GUARDIAN_FIREWALL_ACTION'}{'REJECT'=
}>Reject</option>
 				</select></td>
-			</tr>
-			<tr>
-				<td colspan=3D'2'><br></td>
-			</tr>
-			<tr>
-				<td width=3D'20%' class=3D'base'>$Lang::tr{'guardian blockcount'}:</td>
-				<td><input type=3D'text' name=3D'GUARDIAN_BLOCKCOUNT' value=3D'$settings=
{'GUARDIAN_BLOCKCOUNT'}' size=3D'5' /></td>
-			</tr>
-			<tr>
-				<td width=3D'20%' class=3D'base'>$Lang::tr{'guardian blocktime'}:</td>
+
+				<td width=3D'25%' class=3D'base'>$Lang::tr{'guardian blocktime'}:</td>
 				<td><input type=3D'text' name=3D'GUARDIAN_BLOCKTIME' value=3D'$settings{=
'GUARDIAN_BLOCKTIME'}' size=3D'10' /></td>
 			</tr>
-			<tr class=3D"GUARDIAN_LOGFILE">
-                                <td width=3D'20%' class=3D'base'>$Lang::tr{'=
guardian logfile'}:</td>
-                                <td><input type=3D'text' name=3D'GUARDIAN_LO=
GFILE' value=3D'$settings{'GUARDIAN_LOGFILE'}' size=3D'30' /></td>
-                        </tr>
+
 		</table>
 END
=20
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 400c2fe..261b92f 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1217,30 +1217,6 @@
 'green interface' =3D> 'Gr=C3=BCnes Interface',
 'grouptype' =3D> 'Gruppentyp:',
 'guaranteed bandwith' =3D> 'Garantierte Bandbreite',
-'guardian' =3D> 'Guardian',
-'guardian block a host' =3D> 'Host blocken',
-'guardian block httpd brute-force' =3D> 'httpd-Brute-Force-Erkennung',
-'guardian block owncloud brute-force' =3D> 'Owncloud-Brute-Force-Erkennung',
-'guardian block ssh brute-force' =3D> 'SSH-Brute-Force-Erkennung',
-'guardian blockcount' =3D> 'Trefferschwelle',
-'guardian blocked hosts' =3D> 'Aktuell geblockte Hosts',
-'guardian blocking of this address is not allowed' =3D> 'Diese Addresse darf=
 nicht gelockt werden.',
-'guardian blocktime' =3D> 'Blockzeit',
-'guardian common settings' =3D> 'Allgemeine Einstellungen',
-'guardian configuration' =3D> 'Guardian-Konfiguration',
-'guardian daemon' =3D> 'Daemon',
-'guardian empty input' =3D> 'Fehlende Angabe: Bitte eine g=C3=BCltige IP-Add=
resse oder Netzwerk angeben.',
-'guardian enabled' =3D> 'Guardian aktivieren',
-'guardian firewallaction' =3D> 'Firewall-Aktion',
-'guardian ignored hosts' =3D> 'Ignorierte Hosts',
-'guardian invalid address or subnet' =3D> 'Ung=C3=BCltige Host-Addresse oder=
 Netzwerk.',
-'guardian logfacility' =3D> 'Logziel',
-'guardian logfile' =3D> 'Logdatei',
-'guardian loglevel' =3D> 'Loglevel',
-'guardian no entries' =3D> 'Keine Eintr=C3=A4ge vorhanden.',
-'guardian priority level' =3D> 'Priorit=C3=A4tslevel',
-'guardian service' =3D> 'Guardian-Dienst',
-'guardian watch snort alertfile' =3D> 'Snort-Alarme auswerten',
 'guest ok' =3D> 'Gastzugang gew=C3=A4hren',
 'gui settings' =3D> 'Benutzeroberfl=C3=A4che',
 'gz with key' =3D> 'Nur ein verschl=C3=BCsseltes Archiv kann auf dieser Masc=
hine wiederhergestellt werden.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7a7c104..0e5b46d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1246,32 +1246,6 @@
 'green interface' =3D> 'Green Interface',
 'grouptype' =3D> 'Grouptype:',
 'guaranteed bandwith' =3D> 'Guaranteed bandwith',
-'guardian' =3D> 'Guardian',
-'guardian block a host' =3D> 'Block host',
-'guardian block httpd brute-force' =3D> 'httpd Brute Force Detection',
-'guardian block owncloud brute-force' =3D> 'Owncloud Brute Force detection',
-'guardian block ssh brute-force' =3D> 'SSH Brute Force Detection',
-'guardian blockcount' =3D> 'Strike Threshold',
-'guardian blocked hosts' =3D> 'Currently blocked hosts',
-'guardian blocking of this address is not allowed' =3D> 'Blocking of the giv=
en address is not allowed.',
-'guardian blocktime' =3D> 'Block Time',
-'guardian common settings' =3D> 'Common Settings',
-'guardian configuration' =3D> 'Guardian Configuration',
-'guardian daemon' =3D> 'Daemon',
-'guardian empty input' =3D> 'Empty input: Please perform a valid host addres=
s or subnet.',
-'guardian enabled' =3D> 'Enable Guardian',
-'guardian firewallaction' =3D> 'Firewall Action',
-'guardian ignored hosts' =3D> 'Ignored Hosts',
-'guardian invalid address or subnet' =3D> 'Invalid host address or subnet.',
-'guardian logfacility' =3D> 'Log Facility',
-'guardian logfile' =3D> 'Log File',
-'guardian loglevel' =3D> 'Log Level',
-'guardian no entries' =3D> 'No entries at the moment.',
-'guardian not running no hosts can be blocked' =3D> 'Guardian is not running=
. No hosts will be blocked.',
-'guardian priority level' =3D> 'Priority Level',
-'guardian service' =3D> 'Guardian Service',
-'guardian snort alertfile' =3D> 'Snort Alert File',
-'guardian watch snort alertfile' =3D> 'Monitor Snort Alert File',
 'guest ok' =3D> 'allow guests to access',
 'gui settings' =3D> 'GUI Settings',
 'gz with key' =3D> 'Only an encrypted archive can be restored on this machin=
e.',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 7ac5d11..ede7b66 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -886,12 +886,6 @@
 'green' =3D> 'Green',
 'green interface' =3D> 'Interfaz Green',
 'guaranteed bandwith' =3D> 'Ancho de banda garantizado',
-'guardian alertfile' =3D> 'Archivo de alerta',
-'guardian configuration' =3D> 'Configuraci=C3=B3n de Guardian',
-'guardian ignorefile' =3D> 'Archivo Ignorefile',
-'guardian interface' =3D> 'Interfaz',
-'guardian logfile' =3D> 'Archivo de registro',
-'guardian timelimit' =3D> 'L=C3=ADmite de tiempo',
 'guest ok' =3D> 'permitir acceso de invitado',
 'gui settings' =3D> 'Configuraciones de GUI',
 'gz with key' =3D> 'Esta m=C3=A1quina s=C3=B3lo se puede restaurar desde arc=
hivos encriptados',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 61c514d..e896c9b 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -877,12 +877,6 @@
 'green' =3D> 'VERT',
 'green interface' =3D> 'Interface VERTE',
 'guaranteed bandwith' =3D> 'Bande passante garantie',
-'guardian alertfile' =3D> 'Fichier d\'alerte',
-'guardian configuration' =3D> 'Configuration du gardien',
-'guardian ignorefile' =3D> 'Fichier d\'ignor=C3=A9s',
-'guardian interface' =3D> 'Interface',
-'guardian logfile' =3D> 'Fichier log',
-'guardian timelimit' =3D> 'D=C3=A9lai maximum',
 'guest ok' =3D> 'autoriser l\'acc=C3=A8s aux invit=C3=A9s',
 'gui settings' =3D> 'R=C3=A9glage GUI',
 'gz with key' =3D> 'Seulement les archives chiffr=C3=A9es peuvent =C3=AAtre =
restaur=C3=A9es sur cette machine.',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 2ed22f2..b039cdb 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1187,13 +1187,6 @@
 'green' =3D> 'Verde',
 'green interface' =3D> 'Interface Verde',
 'grouptype' =3D> 'Grouptype:',
-'guaranteed bandwith' =3D> 'Guaranteed bandwith',
-'guardian alertfile' =3D> 'Alertfile',
-'guardian configuration' =3D> 'Guardian Configuration',
-'guardian ignorefile' =3D> 'Ignorefile',
-'guardian interface' =3D> 'Interface',
-'guardian logfile' =3D> 'Logfile',
-'guardian timelimit' =3D> 'Timelimit',
 'guest ok' =3D> 'allow guests to access',
 'gui settings' =3D> 'Settaggio GUI',
 'gz with key' =3D> 'Only an encrypted archive can be restored on this machin=
e.',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 2469ff2..49c0cce 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1168,12 +1168,6 @@
 'green interface' =3D> 'Groene Interface',
 'grouptype' =3D> 'Groeptype:',
 'guaranteed bandwith' =3D> 'Gegarandeerde bandbreedte',
-'guardian alertfile' =3D> 'Meldingenbestand',
-'guardian configuration' =3D> 'Guardian configuratie',
-'guardian ignorefile' =3D> 'Negeerbestand',
-'guardian interface' =3D> 'Interface',
-'guardian logfile' =3D> 'Logbestand',
-'guardian timelimit' =3D> 'Tijdlimiet',
 'guest ok' =3D> 'verleen gasten toegang',
 'gui settings' =3D> 'Gebruikersinterface',
 'gz with key' =3D> '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 9214205..e2f9da5 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -885,12 +885,6 @@
 'green' =3D> 'Green',
 'green interface' =3D> 'Interfejs Green',
 'guaranteed bandwith' =3D> 'Gwarantowane pasmo',
-'guardian alertfile' =3D> 'Plik alert=C3=B3w',
-'guardian configuration' =3D> 'Konfiguracja Guardian\'a',
-'guardian ignorefile' =3D> 'Plik ignorowanych',
-'guardian interface' =3D> 'Interfejs',
-'guardian logfile' =3D> 'Plik Log',
-'guardian timelimit' =3D> 'Ograniczenie czasowe',
 'guest ok' =3D> 'zezw=C3=B3l na dost=C4=99p dla go=C5=9Bci',
 'gui settings' =3D> 'Ustawienia GUI',
 'gz with key' =3D> 'Tylko zaszyfrowane archiwum mo=C5=BCe by=C4=87 odtworzon=
e na tej maszynie.',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 6a45f7f..4b0edb5 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -880,12 +880,6 @@
 'green' =3D> 'Green',
 'green interface' =3D> 'Green =D0=98=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=
=B9=D1=81',
 'guaranteed bandwith' =3D> '=D0=93=D0=B0=D1=80=D0=B0=D0=BD=D1=82=D0=B8=D1=80=
=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D0=B0=D1=8F =D0=BF=D1=80=D0=BE=D0=BF=D1=83=D1=
=81=D0=BA=D0=BD=D0=B0=D1=8F =D1=81=D0=BF=D0=BE=D1=81=D0=BE=D0=B1=D0=BD=D0=BE=
=D1=81=D1=82=D1=8C',
-'guardian alertfile' =3D> 'Alertfile',
-'guardian configuration' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=
=BA=D0=B8 =D0=B7=D0=B0=D1=89=D0=B8=D1=82=D1=8B',
-'guardian ignorefile' =3D> 'Ignorefile',
-'guardian interface' =3D> '=D0=98=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5=D0=B9=
=D1=81',
-'guardian logfile' =3D> 'Logfile',
-'guardian timelimit' =3D> '=D0=9E=D0=B3=D1=80=D0=B0=D0=BD=D0=B8=D1=87=D0=B5=
=D0=BD=D0=B8=D0=B5 =D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=B8',
 'guest ok' =3D> '=D0=A0=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B8=D1=82=D1=8C =D0=
=B3=D0=BE=D1=81=D1=82=D0=B5=D0=B2=D0=BE=D0=B9 =D0=B4=D0=BE=D1=81=D1=82=D1=83=
=D0=BF',
 'gui settings' =3D> '=D0=92=D0=BD=D0=B5=D1=88=D0=BD=D0=B8=D0=B9 =D0=B2=D0=B8=
=D0=B4',
 'gz with key' =3D> '=D0=A2=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE =D0=B7=D0=B0=D1=88=
=D0=B8=D1=84=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9 =D0=B0=D1=80=D1=
=85=D0=B8=D0=B2 =D0=BC=D0=BE=D0=B6=D0=B5=D1=82 =D0=B1=D1=8B=D1=82=D1=8C =D0=
=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD =D0=BD=
=D0=B0 =D1=8D=D1=82=D0=BE=D0=B9 =D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D0=B5.',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 3af2339..9eb3000 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1245,12 +1245,6 @@
 'green interface' =3D> 'Ye=C5=9Fil Arabirim',
 'grouptype' =3D> 'Grup t=C3=BCr=C3=BC:',
 'guaranteed bandwith' =3D> 'Garantili bant geni=C5=9Fli=C4=9Fi',
-'guardian alertfile' =3D> 'Uyar=C4=B1 dosyas=C4=B1',
-'guardian configuration' =3D> 'Koruyucu Yap=C4=B1land=C4=B1rmas=C4=B1',
-'guardian ignorefile' =3D> 'Yoksay=C4=B1lan dosya',
-'guardian interface' =3D> 'Ara birim',
-'guardian logfile' =3D> 'G=C3=BCnl=C3=BCk dosyas=C4=B1',
-'guardian timelimit' =3D> 'Zaman s=C4=B1n=C4=B1rlamas=C4=B1',
 'guest ok' =3D> 'istemcilere eri=C5=9Fim izni',
 'gui settings' =3D> 'GUI Ayarlar=C4=B1',
 'gz with key' =3D> 'Sadece =C5=9Fifreli bir ar=C5=9Fiv bu makinede geri y=C3=
=BCklenebilir.',
diff --git a/lfs/guardian b/lfs/guardian
index b02ec54..c016f04 100644
--- 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(a)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    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
=20
 PROG       =3D guardian
-PAK_VER    =3D 10
+PAK_VER    =3D 11
=20
 DEPS       =3D "perl-inotify2 perl-Net-IP"
=20
-
 ############################################################################=
###
 # 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
=20
+	# Install addon-specific language-files.
+	install -v -m 004 $(DIR_SRC)/config/guardian/guardian.*.pl \
+		/var/ipfire/addon-lang/
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/src/setup/passwords.c b/src/setup/passwords.c
index e7b4b52..50ee38e 100644
--- a/src/setup/passwords.c
+++ b/src/setup/passwords.c
@@ -56,7 +56,7 @@ int handleadminpassword(void)
 		return 0;
 =09
 	snprintf(commandstring, STRING_SIZE,
-		"/usr/sbin/htpasswd -c -m -b " CONFIG_ROOT "/auth/users admin '%s'", passw=
ord);
+		"/usr/sbin/htpasswd -c -s -b " CONFIG_ROOT "/auth/users admin '%s'", passw=
ord);
 	sprintf(message, _("Setting %s 'admin' user password..."), NAME);
 	if (runhiddencommandwithstatus(commandstring, _("Setting password"), messag=
e, NULL)) {
 		sprintf(message, _("Problem setting %s 'admin' user password."), NAME);


hooks/post-receive
--
IPFire 2.x development tree

--===============0583647557080934854==--