[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 8f5509c588a96d11f038197244d6aefbe7c8a042 - IPFire-SCM

12 Sep 2021

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  8f5509c588a96d11f038197244d6aefbe7c8a042 (commit)
       via  fbd9b7e15e5d30b4741aa18556844c8926427f18 (commit)
       via  21a6d0129603f8dd2d1508c8e2d7a7c19d391bb3 (commit)
       via  b5dcd0daa45ee430e5fcc776e638a15e4a2847d3 (commit)
       via  fa4b96117953d15f3a52c6b1c0fa7f08d647b8f9 (commit)
       via  6eb9d445bc2f7bbe6ee38bceb954032ebcb44a1c (commit)
       via  f6e9b2a4b118f2f5f6a4823fe359aa967532c161 (commit)
       via  d5f11f4e27fe1fd7a24e198a3a382e596736ff40 (commit)
      from  b9a0d7065b7054a16181948161728192ec675608 (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 8f5509c588a96d11f038197244d6aefbe7c8a042
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Sep 12 09:42:47 2021 +0000
update-contributors
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fbd9b7e15e5d30b4741aa18556844c8926427f18
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Sep 12 09:39:20 2021 +0000
core160: add updatexlerator.cgi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 21a6d0129603f8dd2d1508c8e2d7a7c19d391bb3
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Thu Aug 12 11:51:48 2021 +0200
updatexlrator.cgi: Fix max disk usage input size
Increase to 3 digits to fit a percentage number.
Fixes: #12675
Reported-by: Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit b5dcd0daa45ee430e5fcc776e638a15e4a2847d3
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Mon Aug 9 22:32:53 2021 +0200
updatexlrator.cgi: Fix Bug 10477 - Update Accelerator disk usage statistics are very cramped in 2.15 beta1
- This bug has been open for a long time and is still valid. The Cache statistics on
       the Update accelerator configuration page are jammed closely together making it
       not so easy to see what the numbers are.
    - Implemented similar approach as used on the Memory table section of the Memory
       information page.
    - Installed on vm testbed machine and confirmed to provide the desired layout.
Tested-by Adolf Belka adolf.belka@ipfire.org
    Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
    Tested-by: Bernhard Bitsch bbitsch@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit fa4b96117953d15f3a52c6b1c0fa7f08d647b8f9
Author: Adolf Belka adolf.belka@ipfire.org
Date:   Sun Aug 8 22:57:48 2021 +0200
Update language files: fix for Bug 12671 - remove evil spirits - demon vs daemon
- demon used in place of daemon in the language files
    - This patch corrects that and fixes bug #12671
Signed-off-by: Adolf Belka adolf.belka@ipfire.org
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit 6eb9d445bc2f7bbe6ee38bceb954032ebcb44a1c
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Sat Aug 7 22:42:07 2021 +0200
getrrdimage.cgi: Fix supported origins list
Support for the graphs of "services.cgi" is implemented,
    but it was forgotten to add this to the list of origins.
    This patch fixes the list and prevents possibly missing graphs.
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Reviewed-by: Bernhard Bitsch bbitsch@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit f6e9b2a4b118f2f5f6a4823fe359aa967532c161
Author: Arne Fitzenreiter arne_f@ipfire.org
Date:   Sun Sep 12 09:31:19 2021 +0000
core160: add ovpnmain.cgi
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d5f11f4e27fe1fd7a24e198a3a382e596736ff40
Author: Leo-Andres Hofmann hofmann@leo-andres.de
Date:   Tue Sep 7 17:53:09 2021 +0200
ovpnmain.cgi: Remove unnecessary check/error message
This parameter can either be "host" or "net", but the existing check
    only allows "net" entries. Since other entries are also valid but
    don't require further action, this patch removes the error message.
Fixes: #12686
Signed-off-by: Leo-Andres Hofmann hofmann@leo-andres.de
    Reviewed-by: Michael Tremer michael.tremer@ipfire.org
    Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 config/rootfiles/core/160/filelists/files |  2 ++
 doc/language_issues.en                    |  6 ++--
 doc/language_issues.nl                    |  2 ++
 doc/language_missings                     |  1 +
 html/cgi-bin/credits.cgi                  |  2 +-
 html/cgi-bin/getrrdimage.cgi              |  4 +--
 html/cgi-bin/ovpnmain.cgi                 |  3 --
 html/cgi-bin/pppsetup.cgi                 |  2 +-
 html/cgi-bin/updatexlrator.cgi            | 60 +++++++++++++++++--------------
 langs/de/cgi-bin/de.pl                    |  6 ++--
 langs/en/cgi-bin/en.pl                    |  6 ++--
 langs/es/cgi-bin/es.pl                    |  2 +-
 langs/fr/cgi-bin/fr.pl                    |  2 +-
 langs/it/cgi-bin/it.pl                    |  2 +-
 langs/nl/cgi-bin/nl.pl                    |  4 +--
 langs/pl/cgi-bin/pl.pl                    |  2 +-
 langs/ru/cgi-bin/ru.pl                    |  2 +-
 langs/tr/cgi-bin/tr.pl                    |  2 +-
 18 files changed, 59 insertions(+), 51 deletions(-)
Difference in files:

diff --git a/config/rootfiles/core/160/filelists/files b/config/rootfiles/core/160/filelists/files
index 6606962d9..831b43062 100644
--- a/config/rootfiles/core/160/filelists/files
+++ b/config/rootfiles/core/160/filelists/files
@@ -12,10 +12,12 @@ srv/web/ipfire/cgi-bin/netinternal.cgi
 srv/web/ipfire/cgi-bin/netother.cgi
 srv/web/ipfire/cgi-bin/netovpnrw.cgi
 srv/web/ipfire/cgi-bin/netovpnsrv.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
 srv/web/ipfire/cgi-bin/proxy.cgi
 srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/shutdown.cgi
 srv/web/ipfire/cgi-bin/system.cgi
+srv/web/ipfire/cgi-bin/updatexlrator.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
 srv/web/ipfire/html/themes/ipfire/include/css/style.css
 var/ipfire/general-functions.pl
diff --git a/doc/language_issues.en b/doc/language_issues.en
index ee8321a32..3d10bebc6 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -517,6 +517,7 @@ WARNING: untranslated string: current fixed leases = Current fixed leases
 WARNING: untranslated string: current hosts = Current hosts
 WARNING: untranslated string: current playlist = Current Playlist
 WARNING: untranslated string: current rules = Current rules:
+WARNING: untranslated string: daemon login script = Daemon login script
 WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: date = Date
 WARNING: untranslated string: date not in logs = No (or only partial) logs exist for the day queried
@@ -536,7 +537,6 @@ WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: default lease time = Default lease time (mins):
 WARNING: untranslated string: default renewal time = Default Renewal Time
 WARNING: untranslated string: delete = Delete
-WARNING: untranslated string: demon login script = Demon login script
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: dest ip and port = Dest. IP: Port
 WARNING: untranslated string: destination = Destination
@@ -1635,8 +1635,8 @@ WARNING: untranslated string: ssh no auth = You have not allowed any authenticat
 WARNING: untranslated string: ssh passwords = Allow password based authentication
 WARNING: untranslated string: ssh port = Set SSH port to default 22 (222 is used otherwise)
 WARNING: untranslated string: ssh portfw = Allow TCP forwarding
-WARNING: untranslated string: ssh tempstart15 = Stop SSH demon in 15 minutes
-WARNING: untranslated string: ssh tempstart30 = Stop SSH demon in 30 minutes
+WARNING: untranslated string: ssh tempstart15 = Stop SSH Daemon in 15 minutes
+WARNING: untranslated string: ssh tempstart30 = Stop SSH Daemon in 30 minutes
 WARNING: untranslated string: ssh username = Username
 WARNING: untranslated string: sstraffic = Net-Traffic
 WARNING: untranslated string: standard = Standard
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index eb41b59ed..85fdcbe44 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -191,6 +191,7 @@ WARNING: translation string unused: delete cron
 WARNING: translation string unused: delete pc
 WARNING: translation string unused: delete share
 WARNING: translation string unused: delete user
+WARNING: translation string unused: demon login script
 WARNING: translation string unused: deprecated fs warn
 WARNING: translation string unused: description
 WARNING: translation string unused: destination ip bad
@@ -912,6 +913,7 @@ WARNING: untranslated string: check all = Check all
 WARNING: untranslated string: cpu frequency = CPU frequency
 WARNING: untranslated string: crypto error = Cryptographic error
 WARNING: untranslated string: crypto warning = Cryptographic warning
+WARNING: untranslated string: daemon login script = Daemon login script
 WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default = Default
 WARNING: untranslated string: default IP address = Default IP Address
diff --git a/doc/language_missings b/doc/language_missings
index 344406ebc..7aa2094a4 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -1419,6 +1419,7 @@
 < crypto error
 < cryptographic settings
 < crypto warning
+< daemon login script
 < Daily
 < dangerous
 < default
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 80b18891f..8caabce5e 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -75,12 +75,12 @@ Dirk Wagner,
 Marcel Lorenz,
 Alf Høgemark,
 Ben Schweikert,
+Leo-Andres Hofmann,
 Daniel Weismüller,
 Peter Pfeiffer,
 Daniel Glanzmann,
 Heiner Schmeling,
 Stephan Feddersen,
-Leo-Andres Hofmann,
 Timo Eissler,
 Stéphane Pautrel,
 Jan Lentfer,
diff --git a/html/cgi-bin/getrrdimage.cgi b/html/cgi-bin/getrrdimage.cgi
index 92f8b585d..26bcf0905 100644
--- a/html/cgi-bin/getrrdimage.cgi
+++ b/html/cgi-bin/getrrdimage.cgi
@@ -36,8 +36,8 @@ require "${General::swroot}/graphs.pl";
 # List of graph origins that getrrdimage.cgi can process directly
 # (unknown origins are forwarded to ensure compatibility)
 my @supported_origins = ("entropy.cgi", "hardwaregraphs.cgi", "media.cgi",
-	"memory.cgi","netexternal.cgi", "netinternal.cgi", "netother.cgi",
-	"netovpnrw.cgi", "netovpnsrv.cgi", "qos.cgi", "system.cgi");
+	"memory.cgi", "netexternal.cgi", "netinternal.cgi", "netother.cgi",
+	"netovpnrw.cgi", "netovpnsrv.cgi", "qos.cgi", "services.cgi", "system.cgi");
### Process GET parameters ###
 # URL format: /?origin=[graph origin cgi]&graph=[graph name]&range=[time range]
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 3cd2f9381..2ebf384ed 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2183,9 +2183,6 @@ END
    				&General::system("/usr/local/bin/openvpnctrl", "-kn2n", "$confighash{$cgiparams{'KEY'}}[1]");
    				&writecollectdconf();
    			}
- 
-			} else {
-				$errormessage = $Lang::tr{'invalid key'};
    		}
    	}
   }
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index beb7fabc7..7fbb46a77 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -931,7 +931,7 @@ END
 if ($pppsettings{'TYPE'} eq 'modem') {
 print <<END
                 <option value='standard-login-script' $selected{'AUTH'}{'standard-login-script'}>$Lang::tr{'standard login script'}</option>
-                <option value='demon-login-script' $selected{'AUTH'}{'demon-login-script'}>$Lang::tr{'demon login script'}</option>
+                <option value='demon-login-script' $selected{'AUTH'}{'demon-login-script'}>$Lang::tr{'daemon login script'}</option>
                 <option value='other-login-script' $selected{'AUTH'}{'other-login-script'}>$Lang::tr{'other login script'}</option>
 END
 ;
diff --git a/html/cgi-bin/updatexlrator.cgi b/html/cgi-bin/updatexlrator.cgi
index 9cfe08f4e..629f8ca0e 100644
--- a/html/cgi-bin/updatexlrator.cgi
+++ b/html/cgi-bin/updatexlrator.cgi
@@ -398,7 +398,7 @@ print <<END
    <td class='base'>$Lang::tr{'updxlrtr passive mode'}:</td>
    <td class='base'><input type='checkbox' name='PASSIVE_MODE' $checked{'PASSIVE_MODE'}{'on'} /></td>
    <td class='base'>$Lang::tr{'updxlrtr max disk usage'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
-	<td class='base'><input type='text' name='MAX_DISK_USAGE' value='$xlratorsettings{'MAX_DISK_USAGE'}' size='1' /> %</td>
+	<td class='base'><input type='text' name='MAX_DISK_USAGE' value='$xlratorsettings{'MAX_DISK_USAGE'}' size='3' /> %</td>
 </tr>
 </table>
 <hr size='1'>
@@ -722,15 +722,18 @@ unless ($numfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>\n<hr s
print <<END
 <table>
-<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
+<tr>
+<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
+</tr>
 </table>
-<table cellpadding='3'>
+<table width='75%' cellspacing='5'>
 <tr>
-<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
-<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
-<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
-<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
-<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
+<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
+<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
+<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
+<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
+<td></td>
+<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
 </tr>
 END
 ;
@@ -745,17 +748,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
print <<END
 <tr>
-<td>[$repository]</td>
-<td align='right'>$size</td>
-<td align='right'>$used</td>
-<td align='right'>$free</td>
-<td>
+<td align='center'>[$repository]</td>
+<td align='center'>$size</td>
+<td align='center'>$used</td>
+<td align='center'>$free</td>
+<td align='right' colspan='2'>
 END
 ;
 &percentbar($percent);
 print <<END
 </td>
-<td align='right'>$percent</td>
+<td align='center'>$percent</td>
 </tr>
 </table>
 END
@@ -1015,15 +1018,18 @@ unless (@repositoryfiles) { print "<i>$Lang::tr{'updxlrtr empty repository'}</i>
print <<END
 <table>
-<tr><td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td></tr>
+<tr>
+<td class='boldbase'><b>$Lang::tr{'updxlrtr disk usage'}</b></td>
+</tr>
 </table>
-<table cellpadding='3'>
+<table width='75%' cellspacing='5'>
 <tr>
-<td align='left' class='base'><i>$Lang::tr{'updxlrtr cache dir'}</i></td>
-<td align='center' class='base'><i>$Lang::tr{'size'}</i></td>
-<td align='center' class='base'><i>$Lang::tr{'used'}</i></td>
-<td align='center' class='base'><i>$Lang::tr{'free'}</i></td>
-<td align='left' class='base' colspan='2'><i>$Lang::tr{'percentage'}</i></td>
+<td align='center' class='boldbase'><b>$Lang::tr{'updxlrtr cache dir'}</b></td>
+<td align='center' class='boldbase'><b>$Lang::tr{'size'}</b></td>
+<td align='center' class='boldbase'><b>$Lang::tr{'used'}</b></td>
+<td align='center' class='boldbase'><b>$Lang::tr{'free'}</b></td>
+<td></td>
+<td align='left' class='boldbase' colspan='2'><b>$Lang::tr{'percentage'}</b></td>
 </tr>
 END
 ;
@@ -1038,17 +1044,17 @@ my ($device,$size,$used,$free,$percent,$mount) = split(' ',$dfstr);
print <<END
 <tr>
-<td>[$repository]</td>
-<td align='right'>$size</td>
-<td align='right'>$used</td>
-<td align='right'>$free</td>
-<td>
+<td align='center'>[$repository]</td>
+<td align='center'>$size</td>
+<td align='center'>$used</td>
+<td align='center'>$free</td>
+<td align='right' colspan='2'>
 END
 ;
 &percentbar($percent);
 print <<END
 </td>
-<td align='right'>$percent</td>
+<td align='center'>$percent</td>
 </tr>
 </table>
 END
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 76bf0469d..70dcb10a6 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -696,6 +696,7 @@
 'current rules' => 'Aktuelle Regeln:',
 'custom networks' => 'Benutzerdefinierte Netzwerke',
 'custom services' => 'Benutzerdefinierte Dienste',
+'daemon login script' => 'Daemon-Anmeldeskript',
 'daily firewallhits' => 'tägliche Firewalltreffer',
 'dangerous' => 'gefährlich',
 'dat without key' => 'Ein verschlüsseltes Archiv kann ohne Schlüssel nicht wiederhergestellt werden.',
@@ -735,7 +736,6 @@
 'delete pc' => 'PC löschen',
 'delete share' => 'Freigabe löschen',
 'delete user' => 'Benutzer löschen',
-'demon login script' => 'Demon-Anmeldeskript',
 'deprecated fs warn' => 'Veraltetes Dateisystem! Keine Unterstützung in neueren Kernelversionen. Sichern und Umformatieren!',
 'description' => 'Beschreibung',
 'dest ip and port' => 'Ziel-IP:Port',
@@ -2286,8 +2286,8 @@
 'ssh passwords' => 'Passwortbasierte Authentifizierung zulassen',
 'ssh port' => 'SSH-Port auf Standardport 22 setzen (andernfalls 222)',
 'ssh portfw' => 'TCP-Weiterleitung zulassen',
-'ssh tempstart15' => 'SSH-Deamon in 15 Minuten beenden',
-'ssh tempstart30' => 'SSH-Deamon in 30 Minuten beenden',
+'ssh tempstart15' => 'SSH-Daemon in 15 Minuten beenden',
+'ssh tempstart30' => 'SSH-Daemon in 30 Minuten beenden',
 'ssh username' => 'Benutzername',
 'ssh1 disabled' => 'SSHv1 ist deaktiviert, ein Client der Version 2 wird benötigt.',
 'ssh1 enabled' => 'SSHv1 ist aktiviert, Clients mit alten Versionen werden unterstützt.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 181dc80b0..679588940 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -713,6 +713,7 @@
 'current rules' => 'Current rules:',
 'custom networks' => 'Custom networks',
 'custom services' => 'Custom services',
+'daemon login script' => 'Daemon login script',
 'daily firewallhits' => 'daily firewallhits',
 'dangerous' => 'Dangerous',
 'dat without key' => 'An encrypted archive cannot be restored without the key.',
@@ -752,7 +753,6 @@
 'delete pc' => 'Delete workstation',
 'delete share' => 'Delete share',
 'delete user' => 'Delete user',
-'demon login script' => 'Demon login script',
 'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
 'description' => 'Description',
 'desired' => 'Desired',
@@ -2327,8 +2327,8 @@
 'ssh passwords' => 'Allow password based authentication',
 'ssh port' => 'Set SSH port to default 22 (222 is used otherwise)',
 'ssh portfw' => 'Allow TCP forwarding',
-'ssh tempstart15' => 'Stop SSH demon in 15 minutes',
-'ssh tempstart30' => 'Stop SSH demon in 30 minutes',
+'ssh tempstart15' => 'Stop SSH Daemon in 15 minutes',
+'ssh tempstart30' => 'Stop SSH Daemon in 30 minutes',
 'ssh username' => 'Username',
 'ssh1 disabled' => 'SSHv1 is disabled, a version 2 client will be required.',
 'ssh1 enabled' => 'SSHv1 is enabled, old clients will be supported.',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 1080afdea..6ddcd325c 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -615,6 +615,7 @@
 'current rules' => 'Reglas actuales',
 'custom networks' => 'Redes personalizadas',
 'custom services' => 'Servicios personalizados',
+'daemon login script' => 'Daemon login script',
 'daily firewallhits' => 'Hits diarios al firewall',
 'dat without key' => 'Un archivo encriptado no puede ser restaurado sin la respectiva llave',
 'date' => 'Fecha',
@@ -649,7 +650,6 @@
 'delete pc' => 'Eliminar Estación de Trabajo',
 'delete share' => 'Eliminar recurso compartido de red',
 'delete user' => 'Eliminar usuario',
-'demon login script' => 'Demon login script',
 'description' => 'Descripción:',
 'dest ip and port' => 'Puerto IP de destino:',
 'destination' => 'Destino',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 984b974f1..7f8239773 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -719,6 +719,7 @@
 'current rules' => 'Règles actuelles :',
 'custom networks' => 'Réseaux personnalisés',
 'custom services' => 'Services personnalisés',
+'daemon login script' => 'Script de login du service',
 'daily firewallhits' => 'Contacts journaliers du pare-feu',
 'dangerous' => 'dangereux',
 'dat without key' => 'Une archive chiffrée ne pouvant être restaurée sans la clef.',
@@ -758,7 +759,6 @@
 'delete pc' => 'Effacer la station de travail',
 'delete share' => 'Effacer le partage',
 'delete user' => 'Supprimer utilisateur',
-'demon login script' => 'Script de login du service',
 'deprecated fs warn' => 'Système de fichiers obsolète ! Le nouveau noyau supprime le support. Sauvegarde et reformatage !',
 'description' => 'Description',
 'desired' => 'Souhaité',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index e9bd157a3..701961dff 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -628,6 +628,7 @@
 'current rules' => 'Current rules:',
 'custom networks' => 'Custom networks',
 'custom services' => 'Servizio Custom',
+'daemon login script' => 'Daemon login script',
 'daily firewallhits' => 'daily firewallhits',
 'dat without key' => 'An encrypted archive cannot be restored without the key.',
 'date' => 'Date',
@@ -665,7 +666,6 @@
 'delete pc' => 'Delete workstation',
 'delete share' => 'Delete share',
 'delete user' => 'Delete user',
-'demon login script' => 'Demon login script',
 'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
 'description' => 'Description',
 'dest ip and port' => 'Ip Destinazione: Porta',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index d607e4f89..400e6b722 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1991,8 +1991,8 @@
 'ssh passwords' => 'Toestaan van authenticatie m.b.v. een wachtwoord',
 'ssh port' => 'SSH poort gezet op 22 (standaard is 222)',
 'ssh portfw' => 'Toestaan van TCP forwarding',
-'ssh tempstart15' => 'Stop SSH daemon over 15 minuten',
-'ssh tempstart30' => 'Stop SSH daemon over 30 minuten',
+'ssh tempstart15' => 'Stop SSH Daemon over 15 minuten',
+'ssh tempstart30' => 'Stop SSH Daemon over 30 minuten',
 'ssh1 disabled' => 'SSHv1 is uitgeschakeld, een versie 2 client is vereist',
 'ssh1 enabled' => 'SSHv1 is ingeschakeld, oudere clients zullen ondersteund worden.',
 'ssh1 support' => 'Ondersteun SSH protocol versie 1 (alleen noodzakelijk voor oudere clients)',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index a44f43fa4..03a922c5f 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -562,6 +562,7 @@
 'current rules' => 'Aktualne reguły:',
 'custom networks' => 'Własne sieci',
 'custom services' => 'Własne usługi',
+'daemon login script' => 'Daemon login script',
 'daily firewallhits' => 'daily firewallhits',
 'dat without key' => 'Zaszyfrowane archiwa nie mogą być odzyskane bez podania klucza.',
 'date' => 'Data',
@@ -596,7 +597,6 @@
 'delete pc' => 'Usuń komputer',
 'delete share' => 'Usuń zasób',
 'delete user' => 'Usuń użytkownika',
-'demon login script' => 'Demon login script',
 'description' => 'Opis',
 'dest ip and port' => 'Cel IP: Port',
 'destination' => 'Cel',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index c0342eb25..1d440a940 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -560,6 +560,7 @@
 'current rules' => 'Установленные правила:',
 'custom networks' => 'Пользовательские сети',
 'custom services' => 'Пользовательские сервисыs',
+'daemon login script' => 'Daemon login скрипт',
 'daily firewallhits' => 'daily firewallhits',
 'dat without key' => 'Зашифрованный архив не может быть использован без ключа.',
 'date' => 'Дата',
@@ -593,7 +594,6 @@
 'delete pc' => 'Удалить рабочую станцию',
 'delete share' => 'Удалить шару',
 'delete user' => 'Удалить пользователя',
-'demon login script' => 'Demon login скрипт',
 'description' => 'Описание',
 'dest ip and port' => 'IP получателя: Порт',
 'destination' => 'Пункт назначения',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index f90bee0ea..c1d53adbc 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -693,6 +693,7 @@
 'current rules' => 'Mevcut kurallar:',
 'custom networks' => 'Özel ağlar',
 'custom services' => 'Özel hizmetler',
+'daemon login script' => 'Daemon giriş betiği',
 'daily firewallhits' => 'günlük güvenlik duvarı kaydı',
 'dat without key' => 'Şifreli bir arşiv anahtarı olmadan geri yüklenemez.',
 'date' => 'Tarih',
@@ -730,7 +731,6 @@
 'delete pc' => 'İş istasyonunu sil',
 'delete share' => 'Paylaşımı sil',
 'delete user' => 'Kullanıcıyı sil',
-'demon login script' => 'Demon giriş betiği',
 'deprecated fs warn' => 'Dosya sistemi kalktı. Yeni çekirdekte bu destek bırakıldı. Yedekleyip yeniden biçimlendirin!',
 'description' => 'Açıklama',
 'dest ip and port' => 'Hedef IP: Bağlantı noktası',
hooks/post-receive
--
IPFire 2.x development tree

    