Kleine Fixes.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@496 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/urlfilter/squidGuard.conf b/config/urlfilter/squidGuard.conf
index 4f43648777c0f8a74e8c4038992440a6a3f3d4bf..0232eadb8c4c6c96db733f2831d2fd69f85ac943 100644 (file)
--- a/config/urlfilter/squidGuard.conf
+++ b/config/urlfilter/squidGuard.conf
@@ -1,5 +1,5 @@
 logdir /var/log/squidGuard
 logdir /var/log/squidGuard

-dbhome /var/ipcop/urlfilter/blacklists
+dbhome /var/ipfire/urlfilter/blacklists

 
 acl {
     default {
 
 acl {
     default {

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 94eff7c2d4e5f380a31f42b1199f3b25eabd227d..4adb38190b9e3fa156c66a100a9737ace9792c00 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -113,6 +113,7 @@ WARNING: translation string unused: err rs 7 untartst
 WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access

+WARNING: translation string unused: expected

 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: filename
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: filename


@@ -177,6 +178,7 @@ WARNING: translation string unused: ls_sshd
 WARNING: translation string unused: ls_syslogd
 WARNING: translation string unused: manage ovpn
 WARNING: translation string unused: manual control and status
 WARNING: translation string unused: ls_syslogd
 WARNING: translation string unused: manage ovpn
 WARNING: translation string unused: manual control and status

+WARNING: translation string unused: marked

 WARNING: translation string unused: max incoming size
 WARNING: translation string unused: max outgoing size
 WARNING: translation string unused: max size
 WARNING: translation string unused: max incoming size
 WARNING: translation string unused: max outgoing size
 WARNING: translation string unused: max size


@@ -208,6 +210,7 @@ WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or

+WARNING: translation string unused: original

 WARNING: translation string unused: other countries
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing traffic in bytes per second
 WARNING: translation string unused: other countries
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing traffic in bytes per second

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 33d290dbd8e01134ad51ff36b13b9f259d0dab0e..2ef1a39a3e707148596ea4b6d7168bc02c232707 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -123,6 +123,7 @@ WARNING: translation string unused: err rs 7 untartst
 WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access
 WARNING: translation string unused: err rs 8 untar
 WARNING: translation string unused: error config
 WARNING: translation string unused: error external access

+WARNING: translation string unused: expected

 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: filename
 WARNING: translation string unused: exportkey
 WARNING: translation string unused: external access rule changed
 WARNING: translation string unused: filename


@@ -190,6 +191,7 @@ WARNING: translation string unused: ls_sshd
 WARNING: translation string unused: ls_syslogd
 WARNING: translation string unused: manage ovpn
 WARNING: translation string unused: manual control and status
 WARNING: translation string unused: ls_syslogd
 WARNING: translation string unused: manage ovpn
 WARNING: translation string unused: manual control and status

+WARNING: translation string unused: marked

 WARNING: translation string unused: max incoming size
 WARNING: translation string unused: max outgoing size
 WARNING: translation string unused: max size
 WARNING: translation string unused: max incoming size
 WARNING: translation string unused: max outgoing size
 WARNING: translation string unused: max size


@@ -222,6 +224,7 @@ WARNING: translation string unused: openvpn server
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning

+WARNING: translation string unused: original

 WARNING: translation string unused: other countries
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing traffic in bytes per second
 WARNING: translation string unused: other countries
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing traffic in bytes per second

diff --git a/src/scripts/dialctrl.pl b/src/scripts/dialctrl.pl
index 042cf9627cfbb5a1513ddf0ce27a40166be198f8..81ef3dde7938dbd17e2338fbcf25c1b6e9dfda0c 100644 (file)
--- a/src/scripts/dialctrl.pl
+++ b/src/scripts/dialctrl.pl
@@ -161,7 +161,7 @@ else {
                }
 
 print <<END
                }
 
 print <<END

-<br />$Lang::tr{'since'} $start
+<br />$Lang::tr{'since'} $update

 <tr><td colspan='3' align='center'>$Lang::tr{'connections'}: $up | $Lang::tr{'disconnects'}: $down | $Lang::tr{'attemps'}: $rec
 <tr><td><b>Verbindungszeit:</b><td align='right'>$current<td align='left'> ~ $ontime%
 END
 <tr><td colspan='3' align='center'>$Lang::tr{'connections'}: $up | $Lang::tr{'disconnects'}: $down | $Lang::tr{'attemps'}: $rec
 <tr><td><b>Verbindungszeit:</b><td align='right'>$current<td align='left'> ~ $ontime%
 END