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, thirteen,
 updated. 5e30738231ced6bfbfb603742a40265e7eef1113
Date: Wed, 07 Nov 2012 21:22:30 +0100
Message-ID: <20121107202230.7715C200DB@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0481335744994627992=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============0481335744994627992==
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, thirteen has been updated
       via  5e30738231ced6bfbfb603742a40265e7eef1113 (commit)
       via  0d3e1e8c1da5b0ae9e56ac320be02bdb043485d4 (commit)
       via  9724a0bcd4e962d109fa3effb7b4a82aa7d420b6 (commit)
       via  ab74c839ddf125b73f7b79e925c31d03e92aa079 (commit)
       via  55ecfab2b7d879554df2b5027865b4cdff9b95b1 (commit)
       via  fb874f2e7cb3a251d16b0555e51a45e219b9e46b (commit)
      from  f0a4269bfee8bce9904abe62144bc377ca7aab14 (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 5e30738231ced6bfbfb603742a40265e7eef1113
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Nov 7 21:13:45 2012 +0100

    updater: remove double files from backup.
   =20
    Add some missed files.

commit 0d3e1e8c1da5b0ae9e56ac320be02bdb043485d4
Merge: f0a4269 9724a0b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Wed Nov 7 00:01:32 2012 +0100

    Merge remote-tracking branch 'origin/next' into thirteen

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

Summary of changes:
 config/outgoingfw/outgoingfw.pl          |   61 +++++++++++------------------
 config/rootfiles/core/64/filelists/files |    2 +
 config/rootfiles/core/65/filelists/files |    2 +-
 config/rootfiles/core/65/filelists/setup |    1 +
 config/rootfiles/core/65/update.sh       |   33 ++++++++++++----
 doc/language_issues.de                   |    3 +
 doc/language_issues.en                   |    3 +
 doc/language_issues.es                   |    8 +++-
 doc/language_issues.fr                   |    8 +++-
 doc/language_issues.pl                   |    8 +++-
 doc/language_issues.ru                   |    8 +++-
 doc/language_missings                    |   20 ++++++++++
 html/cgi-bin/credits.cgi                 |   43 +++++++++++----------
 langs/de/cgi-bin/de.pl                   |   13 ++++--
 langs/en/cgi-bin/en.pl                   |   13 ++++--
 langs/es/cgi-bin/es.pl                   |    8 ++--
 langs/fr/cgi-bin/fr.pl                   |    8 ++--
 langs/pl/cgi-bin/pl.pl                   |    8 ++--
 langs/ru/cgi-bin/ru.pl                   |    8 ++--
 src/initscripts/init.d/firewall          |    1 -
 20 files changed, 155 insertions(+), 104 deletions(-)
 create mode 120000 config/rootfiles/core/65/filelists/setup

Difference in files:
diff --git a/config/outgoingfw/outgoingfw.pl b/config/outgoingfw/outgoingfw.pl
index 8bb49e0..7dd1430 100644
--- a/config/outgoingfw/outgoingfw.pl
+++ b/config/outgoingfw/outgoingfw.pl
@@ -181,6 +181,7 @@ foreach $configentry (sort @configs)
 			@PROTO =3D ("tcp","udp");
 		}
=20
+		my $macrule =3D 0;
 		foreach $PROTO (@PROTO){
 			foreach $SOURCE (@SOURCE) {
 				$SOURCE =3D~ s/\s//gi;
@@ -189,9 +190,10 @@ foreach $configentry (sort @configs)
=20
 				if ( ( $configline[6] ne "" || $configline[2] eq 'mac' ) && $configline[=
2] ne 'all'){
 					$SOURCE =3D~ s/[^a-zA-Z0-9]/:/gi;
-					$CMD =3D "/sbin/iptables -A OUTGOINGFWMAC -m mac --mac-source $SOURCE -=
d $DESTINATION -p $PROTO";
+					$CMD =3D "-m mac --mac-source $SOURCE -d $DESTINATION -p $PROTO";
+					$macrule =3D 1;
 				} else {
-					$CMD =3D "/sbin/iptables -A OUTGOINGFW -s $SOURCE -d $DESTINATION -p $P=
ROTO";
+					$CMD =3D "-s $SOURCE -d $DESTINATION -p $PROTO";
 				}
=20
 				 if ($configline[8] && ( $configline[3] ne 'esp' || $configline[3] ne 'g=
re') ) {
@@ -218,24 +220,12 @@ foreach $configentry (sort @configs)
 				$CMD =3D "$CMD -o $netsettings{'RED_DEV'}";
=20
 				if ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY'} eq=
 'MODE1' ) {
-					if ($DEBUG) {
-						print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGOI=
NGFW '\n";
-					} else {
-						system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUTGO=
INGFW '");
-					}
+					applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'LOG_OUT=
GOINGFW '", $macrule);
 				} elsif ( $configline[9] eq $Lang::tr{'aktiv'} && $outfwsettings{'POLICY=
'} eq 'MODE2' ) {
-					if ($DEBUG) {
-						print "$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTGO=
INGFW '\n";
-					} else {
-						system("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OUTG=
OINGFW '");
-					}
+					applyrule("$CMD -m limit --limit 10/minute -j LOG --log-prefix 'DROP_OU=
TGOINGFW '", $macrule);
 				}
=20
-				if ($DEBUG) {
-					print "$CMD -j $DO\n";
-				} else {
-					system("$CMD -j $DO");
-				}
+				applyrule("$CMD -j $DO", $macrule);
 			}
 		}
 	}
@@ -246,10 +236,9 @@ open( FILE, "< $p2pfile" ) or die "Unable to read $p2pfi=
le";
 @p2ps =3D <FILE>;
 close FILE;
=20
-$CMD =3D "/sbin/iptables -A OUTGOINGFW -m ipp2p";
+$CMD =3D "-m ipp2p";
=20
-foreach $p2pentry (sort @p2ps)
-{
+foreach $p2pentry (sort @p2ps) {
 	@p2pline =3D split( /\;/, $p2pentry );
 	if ( $outfwsettings{'POLICY'} eq 'MODE2' ) {
 		$DO =3D "DROP";
@@ -264,27 +253,23 @@ foreach $p2pentry (sort @p2ps)
 	}
 }
 if ($P2PSTRING) {
-	if ($DEBUG) {
-		print "$CMD $P2PSTRING -j $DO\n";
-	} else {
-		system("$CMD $P2PSTRING -j $DO");
-	}
+	applyrule("$CMD $P2PSTRING -j $DO", 0);
 }
=20
 if ( $outfwsettings{'POLICY'} eq 'MODE1' ) {
-	 if ( $outfwsettings{'MODE1LOG'} eq 'on' ) {
-		 	$CMD =3D "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -m lim=
it --limit 10/minute -j LOG --log-prefix 'DROP_OUTGOINGFW '";
-		if ($DEBUG) {
-			print "$CMD\n";
-		} else {
-			system("$CMD");
-		}
-	 }
+	if ( $outfwsettings{'MODE1LOG'} eq 'on' ) {
+		applyrule("-o $netsettings{'RED_DEV'} -m limit --limit 10/minute -j LOG --=
log-prefix 'DROP_OUTGOINGFW '", 0);
+	}
=20
-	$CMD =3D "/sbin/iptables -A OUTGOINGFW -o $netsettings{'RED_DEV'} -j DROP -=
m comment --comment 'DROP_OUTGOINGFW '";
-	if ($DEBUG) {
-		print "$CMD\n";
-	} else {
-		system("$CMD");
+	applyrule("-o $netsettings{'RED_DEV'} -j DROP -m comment --comment 'DROP_OU=
TGOINGFW '", 0);
+}
+
+sub applyrule($$) {
+	my $cmd =3D shift;
+	my $macrule =3D shift;
+
+	system("/sbin/iptables -A OUTGOINGFWMAC $cmd");
+	if ($macrule =3D=3D 0) {
+		system("/sbin/iptables -A OUTGOINGFW $cmd");
 	}
 }
diff --git a/config/rootfiles/core/64/filelists/files b/config/rootfiles/core=
/64/filelists/files
index 26308b4..a3b99c8 100644
--- a/config/rootfiles/core/64/filelists/files
+++ b/config/rootfiles/core/64/filelists/files
@@ -1,4 +1,6 @@
 etc/system-release
 etc/issue
+etc/rc.d/init.d/firewall
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+var/ipfire/outgoing/bin/outgoingfw.pl
diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core=
/65/filelists/files
index 6d0030e..62756fa 100644
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -15,6 +15,6 @@ srv/web/ipfire/cgi-bin/qos.cgi
 srv/web/ipfire/cgi-bin/services.cgi
 srv/web/ipfire/cgi-bin/updatexlrator.cgi
 srv/web/ipfire/cgi-bin/vpnmain.cgi
-usr/local/sbin/setup
 var/ipfire/langs
 var/ipfire/qos/bin/makeqosscripts.pl
+usr/local/bin/readhash
diff --git a/config/rootfiles/core/65/filelists/setup b/config/rootfiles/core=
/65/filelists/setup
new file mode 120000
index 0000000..209374b
--- /dev/null
+++ b/config/rootfiles/core/65/filelists/setup
@@ -0,0 +1 @@
+../../../common/setup
\ No newline at end of file
diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/up=
date.sh
index 6335e1d..0f1d431 100644
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -24,6 +24,15 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
=20
+function add_to_backup ()
+{
+	# Add path to ROOTFILES but remove old entries to prevent double
+	# files in the tar
+	grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp
+	mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES
+	echo $1 >> /opt/pakfire/tmp/ROOTFILES
+}
+
 #
 # Remove old core updates from pakfire cache to save space...
 core=3D65
@@ -52,12 +61,13 @@ fi
 echo First we made a backup of all files that was inside of the
 echo update archive. This may take a while ...
 # Add some files that are not in the package to backup
-echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
-echo etc/udev >> /opt/pakfire/tmp/ROOTFILES
-echo lib/udev >> /opt/pakfire/tmp/ROOTFILES
-echo boot >> /opt/pakfire/tmp/ROOTFILES
-echo etc/snort >> /opt/pakfire/tmp/ROOTFILES
-echo usr/lib/snort_* >> /opt/pakfire/tmp/ROOTFILES
+add_to_backup lib/modules
+add_to_backup etc/udev
+add_to_backup lib/udev
+add_to_backup boot
+add_to_backup etc/snort
+add_to_backup usr/lib/snort_*
+add_to_backup usr/share/zoneinfo
=20
 # Backup the files
 tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \
@@ -76,12 +86,16 @@ rm -rf /lib/modules/*-ipfire
 #
 # Remove old udev rules.
 #
-cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/
+if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then
+	cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/
+fi
 cp /etc/udev/rules.d/30-persistent-network.rules /tmp/
 rm -rf /etc/udev
 rm -rf /lib/udev
 mkdir -p /etc/udev/rules.d
-mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/
+if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then
+	mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/
+fi
 mv /tmp/30-persistent-network.rules /etc/udev/rules.d/
=20
 #
@@ -95,9 +109,10 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
 /etc/init.d/squid stop
 /etc/init.d/ipsec stop
=20
-#Remove old snort
+#Remove old snort and zoneinfo
 rm -rf /etc/snort
 rm -rf /usr/lib/snort_*
+rm -rf /usr/share/zoneinfo
=20
 #
 #Extract files
diff --git a/doc/language_issues.de b/doc/language_issues.de
index d182dbb..5a42ae5 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -117,6 +117,7 @@ WARNING: translation string unused: disconnect
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
 WARNING: translation string unused: driver
 WARNING: translation string unused: dynamic dns client
 WARNING: translation string unused: eciadsl help
@@ -279,6 +280,8 @@ WARNING: translation string unused: o-no
 WARNING: translation string unused: o-yes
 WARNING: translation string unused: online help en
 WARNING: translation string unused: only red
+WARNING: translation string unused: openvpn disabled
+WARNING: translation string unused: openvpn enabled
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 3ae364c..6d6a2a6 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
 WARNING: translation string unused: driver
 WARNING: translation string unused: dynamic dns client
@@ -307,6 +308,8 @@ WARNING: translation string unused: o-no
 WARNING: translation string unused: o-yes
 WARNING: translation string unused: online help en
 WARNING: translation string unused: only red
+WARNING: translation string unused: openvpn disabled
+WARNING: translation string unused: openvpn enabled
 WARNING: translation string unused: optional data
 WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6b2ab8e..6bcbf86 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
 WARNING: translation string unused: driver
 WARNING: translation string unused: dynamic dns client
@@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: bytes
+WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled
@@ -520,14 +523,14 @@ WARNING: untranslated string: minute
 WARNING: untranslated string: new
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
-WARNING: untranslated string: openvpn disabled
-WARNING: untranslated string: openvpn enabled
 WARNING: untranslated string: openvpn fragment allowed with udp
 WARNING: untranslated string: openvpn mssfix allowed with udp
 WARNING: untranslated string: openvpn prefix local subnet
 WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
+WARNING: untranslated string: other
+WARNING: untranslated string: our donors
 WARNING: untranslated string: outgoing firewall add ip group
 WARNING: untranslated string: outgoing firewall add mac group
 WARNING: untranslated string: outgoing firewall edit ip group
@@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: static routes
 WARNING: untranslated string: system information
+WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index b1a94a1..189932f 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
 WARNING: translation string unused: driver
 WARNING: translation string unused: dynamic dns client
@@ -497,7 +498,9 @@ WARNING: translation string unused: xtaccess bad transfert
 WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: bytes
+WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: dns address deleted txt
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
@@ -522,14 +525,14 @@ WARNING: untranslated string: ntp common settings
 WARNING: untranslated string: ntp sync
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
-WARNING: untranslated string: openvpn disabled
-WARNING: untranslated string: openvpn enabled
 WARNING: untranslated string: openvpn fragment allowed with udp
 WARNING: untranslated string: openvpn mssfix allowed with udp
 WARNING: untranslated string: openvpn prefix local subnet
 WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
+WARNING: untranslated string: other
+WARNING: untranslated string: our donors
 WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: pakfire ago
 WARNING: untranslated string: route config changed
@@ -542,6 +545,7 @@ WARNING: untranslated string: system information
 WARNING: untranslated string: upload new ruleset
 WARNING: untranslated string: urlfilter file ext block
 WARNING: untranslated string: urlfilter mode block
+WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
 WARNING: untranslated string: wlanap access point
 WARNING: untranslated string: wlanap channel
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6b2ab8e..6bcbf86 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -140,6 +140,7 @@ WARNING: translation string unused: disconnect
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
 WARNING: translation string unused: driver
 WARNING: translation string unused: dynamic dns client
@@ -498,7 +499,9 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Async logging enabled
 WARNING: untranslated string: Scan for Songs
 WARNING: untranslated string: Set time on boot
+WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: bytes
+WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: fireinfo ipfire version
 WARNING: untranslated string: fireinfo is disabled
 WARNING: untranslated string: fireinfo is enabled
@@ -520,14 +523,14 @@ WARNING: untranslated string: minute
 WARNING: untranslated string: new
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
-WARNING: untranslated string: openvpn disabled
-WARNING: untranslated string: openvpn enabled
 WARNING: untranslated string: openvpn fragment allowed with udp
 WARNING: untranslated string: openvpn mssfix allowed with udp
 WARNING: untranslated string: openvpn prefix local subnet
 WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
+WARNING: untranslated string: other
+WARNING: untranslated string: our donors
 WARNING: untranslated string: outgoing firewall add ip group
 WARNING: untranslated string: outgoing firewall add mac group
 WARNING: untranslated string: outgoing firewall edit ip group
@@ -550,4 +553,5 @@ WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: static routes
 WARNING: untranslated string: system information
+WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index ee67873..e25d81d 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -139,6 +139,7 @@ WARNING: translation string unused: disconnect
 WARNING: translation string unused: display traffic at home
 WARNING: translation string unused: dns server
 WARNING: translation string unused: do not log this port list
+WARNING: translation string unused: donation-link
 WARNING: translation string unused: done
 WARNING: translation string unused: driver
 WARNING: translation string unused: dynamic dns client
@@ -489,7 +490,9 @@ WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Add a route
 WARNING: untranslated string: Edit an existing route
 WARNING: untranslated string: Scan for Songs
+WARNING: untranslated string: advproxy errmsg invalid upstream proxy
 WARNING: untranslated string: bytes
+WARNING: untranslated string: deprecated fs warn
 WARNING: untranslated string: disk access per
 WARNING: untranslated string: extrahd because there is already a device moun=
ted
 WARNING: untranslated string: extrahd cant umount
@@ -503,14 +506,14 @@ WARNING: untranslated string: minute
 WARNING: untranslated string: new
 WARNING: untranslated string: openvpn default
 WARNING: untranslated string: openvpn destination port used
-WARNING: untranslated string: openvpn disabled
-WARNING: untranslated string: openvpn enabled
 WARNING: untranslated string: openvpn fragment allowed with udp
 WARNING: untranslated string: openvpn mssfix allowed with udp
 WARNING: untranslated string: openvpn prefix local subnet
 WARNING: untranslated string: openvpn prefix openvpn subnet
 WARNING: untranslated string: openvpn prefix remote subnet
 WARNING: untranslated string: openvpn subnet is used
+WARNING: untranslated string: other
+WARNING: untranslated string: our donors
 WARNING: untranslated string: outgoing firewall reserved groupname
 WARNING: untranslated string: outgoing traffic in bytes per second
 WARNING: untranslated string: route config changed
@@ -518,4 +521,5 @@ WARNING: untranslated string: routing config added
 WARNING: untranslated string: routing config changed
 WARNING: untranslated string: routing table
 WARNING: untranslated string: static routes
+WARNING: untranslated string: visit us at
 WARNING: untranslated string: vpn keyexchange
diff --git a/doc/language_missings b/doc/language_missings
index 16e3ba5..55e0e40 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -10,6 +10,8 @@
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
+< advproxy errmsg invalid upstream proxy
+< deprecated fs warn
 < dns address deleted txt
 < fireinfo ipfire version
 < fireinfo is disabled
@@ -41,12 +43,15 @@
 < openvpn prefix openvpn subnet
 < openvpn prefix remote subnet
 < openvpn subnet is used
+< other
+< our donors
 < snort working
 < static routes
 < system information
 < upload new ruleset
 < urlfilter file ext block
 < urlfilter mode block
+< visit us at
 < vpn keyexchange
 < wlanap access point
 < wlanap channel
@@ -74,7 +79,9 @@
 ############################################################################
 # Checking cgi-bin translations for language: es                           #
 ############################################################################
+< advproxy errmsg invalid upstream proxy
 < Async logging enabled
+< deprecated fs warn
 < fireinfo ipfire version
 < fireinfo is disabled
 < fireinfo is enabled
@@ -103,6 +110,8 @@
 < openvpn prefix openvpn subnet
 < openvpn prefix remote subnet
 < openvpn subnet is used
+< other
+< our donors
 < outgoing firewall add ip group
 < outgoing firewall add mac group
 < outgoing firewall edit ip group
@@ -120,6 +129,7 @@
 < Set time on boot
 < static routes
 < system information
+< visit us at
 < vpn keyexchange
 ############################################################################
 # Checking install/setup translations for language: pl                     #
@@ -127,6 +137,8 @@
 ############################################################################
 # Checking cgi-bin translations for language: pl                           #
 ############################################################################
+< advproxy errmsg invalid upstream proxy
+< deprecated fs warn
 < extrahd because there is already a device mounted
 < extrahd cant umount
 < extrahd install or load driver
@@ -147,7 +159,10 @@
 < openvpn prefix openvpn subnet
 < openvpn prefix remote subnet
 < openvpn subnet is used
+< other
+< our donors
 < static routes
+< visit us at
 < vpn keyexchange
 ############################################################################
 # Checking install/setup translations for language: ru                     #
@@ -156,7 +171,9 @@
 # Checking cgi-bin translations for language: ru                           #
 ############################################################################
 < Add a route
+< advproxy errmsg invalid upstream proxy
 < day-graph
+< deprecated fs warn
 < disk access per
 < Edit an existing route
 < extrahd because there is already a device mounted
@@ -183,8 +200,11 @@
 < openvpn prefix openvpn subnet
 < openvpn prefix remote subnet
 < openvpn subnet is used
+< other
+< our donors
 < outgoing traffic in bytes per second
 < static routes
+< visit us at
 < vpn keyexchange
 < week-graph
 < year-graph
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 0d091a2..3224267 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -41,9 +41,16 @@ print <<END
 <p>$Lang::tr{'donation-text'}</p>
=20
 <div align=3D"center">
-	<a href=3D"http://www.ipfire.org/donate">$Lang::tr{'donation'}</a>
+	<a href=3D"http://www.ipfire.org/donate">
+		<strong>$Lang::tr{'donation'}</strong>
+	</a>
 </div>
-<br>
+<br><br><hr><br>
+<p style=3D"text-align: center;">
+	$Lang::tr{'our donors'}:
+
+	<a href=3D"http://www.irrsinn.de" target=3D"_blank">irrsinn.de gmbh</a>
+</p>
 END
 ;
 &Header::closebox();
@@ -51,12 +58,11 @@ END
 &Header::openbox('100%', 'left', $Lang::tr{'credits'});
=20
 print <<END
-<br /><center><b><a href=3D'http://www.ipfire.org/' target=3D"_blank">http:/=
/www.ipfire.org/</a></b></center>
-<br />
-<p>
-	<b>IPFire is based on IPCop and Smoothwall. Many thanks to its developers.<=
/b><br />
-	<b>We want to say thank you to all of the developers who ever contributed a=
nything to IPFire.</b>
-</p>
+<br>
+<center>
+	$Lang::tr{'visit us at'}: <b><a href=3D'http://www.ipfire.org/' target=3D"_=
blank">http://www.ipfire.org/</a></b>
+</center>
+<br><hr><br>
=20
 <p><b>Development:</b><br />
=20
@@ -90,23 +96,18 @@ Peter Sch&auml;lchli
 Jan Paul T&uuml;cking
 (<a href=3D'mailto:jan.tuecking\@ipfire.org'>jan.tuecking\@ipfire.org</a>)<b=
r />
 </p>
-<p>
-This product includes GeoLite data created by MaxMind, available from <a hre=
f=3D'http://www.maxmind.com/' target=3D"_blank">http://www.maxmind.com/</a>.
-</p>
 END
 ;
 &Header::closebox();
=20
-&Header::openbox('100%', 'left', 'General Public License v3');
-if ( -e "/usr/share/doc/licenses/GPLv3" )  {
-	print '<textarea rows=3D"25" cols=3D"75" readonly=3D"true">';
-	print `cat "/usr/share/doc/licenses/GPLv3"`;
-	print '</textarea>';
-}
-else {
-	print '<br /><a href=3D"http://www.gnu.org/licenses/gpl-3.0.txt" target=3D"=
_blank">GENERAL PUBLIC LICENSE</a><br />';
-}
-
+&Header::openbox("100%", "left", $Lang::tr{'other'});
+print <<END
+	<p>
+		This product includes GeoLite data created by MaxMind, available from
+		<a href=3D'http://www.maxmind.com/' target=3D"_blank">http://www.maxmind.c=
om/</a>.
+	</p>
+END
+;
 &Header::closebox();
=20
 &Header::closebigbox();
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 3ec57eb..f686c30 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -222,8 +222,8 @@
 'advproxy errmsg invalid mac' =3D> 'Ung=C3=BCltige MAC-Adresse',
 'advproxy errmsg invalid pdc' =3D> 'Ung=C3=BCltiger Hostname f=C3=BCr den Pr=
imary Domain Controller',
 'advproxy errmsg invalid proxy port' =3D> 'Ung=C3=BCltiger Proxy-Port',
-'advproxy errmsg invalid upstream proxy username or password setting' =3D> '=
Ung=C3=BCltiger Benutzername oder ung=C3=BCltiges Kennwort f=C3=BCr Upstream =
Proxy',
 'advproxy errmsg invalid upstream proxy' =3D> 'Ung=C3=BCltige IP f=C3=BCr Up=
stream-Proxy',
+'advproxy errmsg invalid upstream proxy username or password setting' =3D> '=
Ung=C3=BCltiger Benutzername oder ung=C3=BCltiges Kennwort f=C3=BCr Upstream =
Proxy',
 'advproxy errmsg invalid user' =3D> 'Benutzername existiert nicht',
 'advproxy errmsg ldap base dn' =3D> 'LDAP base DN erforderlich',
 'advproxy errmsg ldap bind dn' =3D> 'LDAP bind DN Benutzername und Passwort =
erforderlich',
@@ -1311,10 +1311,12 @@
 'organization too long' =3D> 'Organisation ist zu lang; sie sollte nicht l=
=C3=A4nger als 60 Zeichen lang sein.',
 'original' =3D> 'Original',
 'os level' =3D> 'OS Level',
+'other' =3D> 'Sonstiges',
 'other countries' =3D> 'Andere L=C3=A4nder',
 'other login script' =3D> 'Anderes Anmeldeskript',
 'otherip' =3D> 'Andere IP',
 'otherport' =3D> 'Anderer Port',
+'our donors' =3D> 'Unsere Unterst=C3=BCtzer',
 'out' =3D> 'Aus',
 'outgoing' =3D> 'ausgehend',
 'outgoing firewall' =3D> 'Ausgehende Firewall',
@@ -1345,10 +1347,14 @@
 'ovpn config' =3D> 'OVPN-Konfiguration',
 'ovpn device' =3D> 'OpenVPN Ger=C3=A4t',
 'ovpn dl' =3D> 'OVPN-Konfiguration downloaden',
+'ovpn errmsg green already pushed' =3D> 'Route f=C3=BCr gr=C3=BCnes Netzwerk=
 wird immer gesetzt',
+'ovpn errmsg invalid ip or mask' =3D> 'Ung=C3=BCltige Netzwerk-Adresse oder =
Subnetzmaske',
 'ovpn log' =3D> 'OVPN-Log',
 'ovpn on blue' =3D> 'OpenVPN auf BLAU',
 'ovpn on orange' =3D> 'OpenVPN auf ORANGE',
 'ovpn on red' =3D> 'OpenVPN auf ROT',
+'ovpn routes push' =3D> 'Routen (eine pro Zeile)',
+'ovpn routes push options' =3D> 'Route push Optionen',
 'ovpn server status' =3D> 'OpenVPN Server Status',
 'ovpn subnet' =3D> 'OpenVPN Subnetz (z.B. 10.0.10.0/255.255.255.0)',
 'ovpn subnet is invalid' =3D> 'Das OpenVPN Subnetz ist ung=C3=BCltig.',
@@ -1369,10 +1375,6 @@
 'ovpn_processprioVH' =3D> 'Sehr Hoch',
 'ovpnstatus log' =3D> 'OVPN-Status-Log',
 'ovpnsys log' =3D> 'OVPN-System-Log',
-'ovpn routes push options' =3D> 'Route push Optionen',
-'ovpn routes push' =3D> 'Routen (eine pro Zeile)',
-'ovpn errmsg invalid ip or mask' =3D> 'Ung=C3=BCltige Netzwerk-Adresse oder =
Subnetzmaske',
-'ovpn errmsg green already pushed' =3D> 'Route f=C3=BCr gr=C3=BCnes Netzwerk=
 wird immer gesetzt',
 'package failed to install' =3D> 'Programmpaket konnte nicht installiert wer=
den.',
 'pagerefresh' =3D> 'Seite wird aktualisiert. Bitte warten.',
 'pakfire accept all' =3D> 'M=C3=B6chten Sie der Installation aller Pakete zu=
stimmen?',
@@ -2096,6 +2098,7 @@
 'virtual address' =3D> 'Virtuelle Addresse',
 'virtual private networking' =3D> 'Virtuelles Privates Netzwerk',
 'visible in browselist' =3D> 'Sichtbar in der Verzeichnisliste',
+'visit us at' =3D> 'Besuchen Sie uns auf',
 'voldown10' =3D> 'Laust=C3=A4rke um 10 verringern',
 'voldown5' =3D> 'Laust=C3=A4rke um 5 verringern',
 'volup10' =3D> 'Laust=C3=A4rke um 10 erh=C3=B6hen',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 003056f..5fe2391 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -222,8 +222,8 @@
 'advproxy errmsg invalid mac' =3D> 'Invalid MAC address',
 'advproxy errmsg invalid pdc' =3D> 'Invalid hostname for primary domain cont=
roller',
 'advproxy errmsg invalid proxy port' =3D> 'Invalid proxy port',
-'advproxy errmsg invalid upstream proxy username or password setting' =3D> '=
Invalid upstream proxy username or password setting',
 'advproxy errmsg invalid upstream proxy' =3D> 'Invalid upstream proxy IP',
+'advproxy errmsg invalid upstream proxy username or password setting' =3D> '=
Invalid upstream proxy username or password setting',
 'advproxy errmsg invalid user' =3D> 'Username does not exist',
 'advproxy errmsg ldap base dn' =3D> 'LDAP base DN required',
 'advproxy errmsg ldap bind dn' =3D> 'LDAP bind DN username and password requ=
ired',
@@ -1339,10 +1339,12 @@
 'organization too long' =3D> 'Organization is too long; it should not be lon=
ger than 60 characters.',
 'original' =3D> 'Original',
 'os level' =3D> 'OS Level',
+'other' =3D> 'Other',
 'other countries' =3D> 'Other countries',
 'other login script' =3D> 'Other login script',
 'otherip' =3D> 'other IP',
 'otherport' =3D> 'other Port',
+'our donors' =3D> 'Our donors',
 'out' =3D> 'Out',
 'outgoing' =3D> 'outgoing',
 'outgoing firewall' =3D> 'Outgoing Firewall',
@@ -1373,10 +1375,14 @@
 'ovpn config' =3D> 'OVPN-Config',
 'ovpn device' =3D> 'OpenVPN device:',
 'ovpn dl' =3D> 'OVPN-Config Download',
+'ovpn errmsg green already pushed' =3D> 'Route for green network is always s=
et',
+'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask=
',
 'ovpn log' =3D> 'OVPN-Log',
 'ovpn on blue' =3D> 'OpenVPN on BLUE',
 'ovpn on orange' =3D> 'OpenVPN on ORANGE',
 'ovpn on red' =3D> 'OpenVPN on RED',
+'ovpn routes push' =3D> 'Routes (one per line):',
+'ovpn routes push options' =3D> 'Route push options',
 'ovpn server status' =3D> 'Current OpenVPN server status:',
 'ovpn subnet' =3D> 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)',
 'ovpn subnet is invalid' =3D> 'OpenVPN subnet is invalid.',
@@ -1397,10 +1403,6 @@
 'ovpn_processprioVH' =3D> 'Very high',
 'ovpnstatus log' =3D> 'OVPN-Status-Log',
 'ovpnsys log' =3D> 'OVPN-System-Log',
-'ovpn routes push options' =3D> 'Route push options',
-'ovpn routes push' =3D> 'Routes (one per line):',
-'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask=
',
-'ovpn errmsg green already pushed' =3D> 'Route for green network is always s=
et',
 'package failed to install' =3D> 'Package failed to install.',
 'pagerefresh' =3D> 'Page is beeing refreshed, please wait.',
 'pakfire accept all' =3D> 'Do you want to install all packages?',
@@ -2130,6 +2132,7 @@
 'virtual address' =3D> 'Virtual Address',
 'virtual private networking' =3D> 'Virtual Private Networking',
 'visible in browselist' =3D> 'visible in browselist',
+'visit us at' =3D> 'Visit us at',
 'voldown10' =3D> 'Decrease volume by 10',
 'voldown5' =3D> 'Decrease volume by 5',
 'volup10' =3D> 'Increase volume by 10',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 387ab4a..f96284f 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -1328,10 +1328,14 @@
 'ovpn config' =3D> 'Configruaci=C3=B3n de OVPN',
 'ovpn device' =3D> 'Dispositivo OpenVPN',
 'ovpn dl' =3D> 'Configuraci=C3=B3n de descargas OVPN',
+'ovpn errmsg green already pushed' =3D> 'Route for green network is always s=
et',
+'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask=
',
 'ovpn log' =3D> 'Registro de log de OVPN',
 'ovpn on blue' =3D> 'OpenVPN en BLUE',
 'ovpn on orange' =3D> 'OpenVPN en ORANGE',
 'ovpn on red' =3D> 'OpenVPN en RED',
+'ovpn routes push' =3D> 'Routes (one per line):',
+'ovpn routes push options' =3D> 'Route push options',
 'ovpn server status' =3D> 'Status actual del servidor OpenVPN:',
 'ovpn subnet' =3D> 'Subred de OpenVPN (ej. 10.0.10.0/255.255.255.0',
 'ovpn subnet is invalid' =3D> 'Subred de OpenVPN no es v=C3=A1lida.',
@@ -1352,10 +1356,6 @@
 'ovpn_processprioVH' =3D> 'Muy alto',
 'ovpnstatus log' =3D> 'OVPN-Status-Log',
 'ovpnsys log' =3D> 'OVPN-System-Log',
-'ovpn routes push options' =3D> 'Route push options',
-'ovpn routes push' =3D> 'Routes (one per line):',
-'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask=
',
-'ovpn errmsg green already pushed' =3D> 'Route for green network is always s=
et',
 'package failed to install' =3D> 'Fall=C3=B3 la instalaci=C3=B3n del paquete=
',
 'pagerefresh' =3D> 'La p=C3=A1gina se est=C3=A1 actualiszando, por favor esp=
ere.',
 'pakfire accept all' =3D> '=C2=BFDesea instalar todos los paquetes?',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index a537459..e91191d 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1340,10 +1340,14 @@
 'ovpn config' =3D> 'OVPN-Config',
 'ovpn device' =3D> 'P=C3=A9riph=C3=A9rique OpenVPN :',
 'ovpn dl' =3D> 'T=C3=A9l=C3=A9charger OVPN-Config',
+'ovpn errmsg green already pushed' =3D> 'La route pour le r?seau green est t=
oujours activ?e',
+'ovpn errmsg invalid ip or mask' =3D> 'Adresse ou masque de sous-r?seau inva=
lide',
 'ovpn log' =3D> 'OVPN-Log',
 'ovpn on blue' =3D> 'OpenVPN sur BLEU',
 'ovpn on orange' =3D> 'OpenVPN sur ORANGE',
 'ovpn on red' =3D> 'OpenVPN sur RED',
+'ovpn routes push' =3D> 'Routes (une par ligne):',
+'ovpn routes push options' =3D> 'Options de Route push',
 'ovpn server status' =3D> 'Statut actuel du serveur OpenVPN :',
 'ovpn subnet' =3D> 'Sous-r=C3=A9seau OpenVPN (c.a.d. 10.0.10.0/255.255.255.0=
)',
 'ovpn subnet is invalid' =3D> 'Sous-r=C3=A9seau OpenVPN non valide.',
@@ -1364,10 +1368,6 @@
 'ovpn_processprioVH' =3D> 'Tr=C3=A8s haute',
 'ovpnstatus log' =3D> 'Journal statut OVPN',
 'ovpnsys log' =3D> 'Journal syst=C3=A8me OVPN',
-'ovpn routes push options' =3D> 'Options de Route push',
-'ovpn routes push' =3D> 'Routes (une par ligne):',
-'ovpn errmsg invalid ip or mask' =3D> 'Adresse ou masque de sous-r?seau inva=
lide',
-'ovpn errmsg green already pushed' =3D> 'La route pour le r?seau green est t=
oujours activ?e',
 'package failed to install' =3D> 'L\'installation du paquet a =C3=A9chou=C3=
=A9.',
 'pagerefresh' =3D> 'La page est entrain d\'=C3=AAtre rafraichie, veuillez at=
tendre.',
 'pakfire accept all' =3D> 'Voulez-vous installer tout les paquets?',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index d8f1890..e0d64a0 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1351,10 +1351,14 @@
 'ovpn config' =3D> 'OVPN-Konfig',
 'ovpn device' =3D> 'Urz=C4=85dzenie OpenVPN:',
 'ovpn dl' =3D> 'Pobierz konfig OVPN',
+'ovpn errmsg green already pushed' =3D> 'Route for green network is always s=
et',
+'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask=
',
 'ovpn log' =3D> 'Log OVPN',
 'ovpn on blue' =3D> 'OpenVPN na int. BLUE',
 'ovpn on orange' =3D> 'OpenVPN na int. ORANGE',
 'ovpn on red' =3D> 'OpenVPN na int. RED',
+'ovpn routes push' =3D> 'Routes (one per line):',
+'ovpn routes push options' =3D> 'Route push options',
 'ovpn server status' =3D> 'Stan serwera OpenVPN:',
 'ovpn subnet' =3D> 'Podsie=C4=87 OpenVPN (np. 10.0.10.0/255.255.255.0)',
 'ovpn subnet is invalid' =3D> 'Podsie=C4=87 OpenVPN jest niepoprawna.',
@@ -1375,10 +1379,6 @@
 'ovpn_processprioVH' =3D> 'Bardzo wysoki',
 'ovpnstatus log' =3D> 'OVPN-Status-Log',
 'ovpnsys log' =3D> 'OVPN-System-Log',
-'ovpn routes push options' =3D> 'Route push options',
-'ovpn routes push' =3D> 'Routes (one per line):',
-'ovpn errmsg invalid ip or mask' =3D> 'Invalid network-address or subnetmask=
',
-'ovpn errmsg green already pushed' =3D> 'Route for green network is always s=
et',
 'package failed to install' =3D> 'B=C5=82=C4=85d instalacji pakietu.',
 'pagerefresh' =3D> 'Strona jest od=C5=9Bwie=C5=BCana, prosz=C4=99 czeka=C4=
=87.',
 'pakfire accept all' =3D> 'Czy chcesz zainstalowa=C4=87 wszystkie pakiety?',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index c1afd01..4619983 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -1342,10 +1342,14 @@
 'ovpn config' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8 O=
VPN',
 'ovpn device' =3D> '=D0=A3=D1=81=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2=
=D0=BE OpenVPN:',
 'ovpn dl' =3D> '=D0=97=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA=D0=B0 =D0=BD=D0=
=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA OVPN',
+'ovpn errmsg green already pushed' =3D> '=D0=9C=D0=B0=D1=80=D1=88=D1=80=D1=
=83=D1=82 =D0=B4=D0=BB=D1=8F =D0=B7=D0=B5=D0=BB=D1=91=D0=BD=D0=BE=D0=B9 =D1=
=81=D0=B5=D1=82=D0=B8 =D0=B2=D1=81=D0=B5=D0=B3=D0=B4=D0=B0 =D0=B2=D0=BA=D0=BB=
=D1=8E=D1=87=D1=91=D0=BD',
+'ovpn errmsg invalid ip or mask' =3D> '=D0=9D=D0=B5=D0=BF=D1=80=D0=B0=D0=B2=
=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9 =D0=B0=D0=B4=D1=80=D0=B5=D1=81 =D0=B8=D0=
=BB=D0=B8 =D0=BC=D0=B0=D1=81=D0=BA=D0=B0 =D0=BF=D0=BE=D0=B4=D1=81=D1=82=D0=B8=
',
 'ovpn log' =3D> '=D0=96=D1=83=D1=80=D0=BD=D0=B0=D0=BB OVPN',
 'ovpn on blue' =3D> 'OpenVPN =D0=BD=D0=B0 BLUE',
 'ovpn on orange' =3D> 'OpenVPN =D0=BD=D0=B0 ORANGE',
 'ovpn on red' =3D> 'OpenVPN =D0=BD=D0=B0 RED',
+'ovpn routes push' =3D> '=D0=9C=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=D0=B8=D0=
=B7=D0=B0=D1=82=D0=BE=D1=80=D1=8B (=D0=BF=D0=BE =D0=BE=D0=B4=D0=BD=D0=BE=D0=
=BC=D1=83 =D0=BD=D0=B0 =D1=81=D1=82=D1=80=D0=BE=D1=87=D0=BA=D1=83)',
+'ovpn routes push options' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=
=D0=BA=D0=B8 =D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=D0=B8=D0=B7=D0=B0=D1=
=86=D0=B8=D0=B8',
 'ovpn server status' =3D> '=D0=A2=D0=B5=D0=BA=D1=83=D1=89=D0=B8=D0=B9 =D1=81=
=D1=82=D0=B0=D1=82=D1=83=D1=81 =D1=81=D0=B5=D1=80=D0=B2=D0=B5=D1=80=D0=B0 Ope=
nVPN:',
 'ovpn subnet' =3D> '=D0=9F=D0=BE=D0=B4=D1=81=D0=B5=D1=82=D1=8C OpenVPN (e.g.=
 10.0.10.0/255.255.255.0)',
 'ovpn subnet is invalid' =3D> '=D0=9F=D0=BE=D0=B4=D1=81=D0=B5=D1=82=D1=8C Op=
enVPN =D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B0 =D0=BD=D0=B5=D0=B2=D0=B5=D1=80=D0=
=BD=D0=BE.',
@@ -1366,10 +1370,6 @@
 'ovpn_processprioVH' =3D> 'Very high',
 'ovpnstatus log' =3D> 'OVPN-Status-Log',
 'ovpnsys log' =3D> 'OVPN-System-Log',
-'ovpn routes push options' =3D> '=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9=
=D0=BA=D0=B8 =D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=D0=B8=D0=B7=D0=B0=D1=
=86=D0=B8=D0=B8',
-'ovpn routes push' =3D> '=D0=9C=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=D0=B8=D0=
=B7=D0=B0=D1=82=D0=BE=D1=80=D1=8B (=D0=BF=D0=BE =D0=BE=D0=B4=D0=BD=D0=BE=D0=
=BC=D1=83 =D0=BD=D0=B0 =D1=81=D1=82=D1=80=D0=BE=D1=87=D0=BA=D1=83)',
-'ovpn errmsg invalid ip or mask' =3D> '=D0=9D=D0=B5=D0=BF=D1=80=D0=B0=D0=B2=
=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9 =D0=B0=D0=B4=D1=80=D0=B5=D1=81 =D0=B8=D0=
=BB=D0=B8 =D0=BC=D0=B0=D1=81=D0=BA=D0=B0 =D0=BF=D0=BE=D0=B4=D1=81=D1=82=D0=B8=
',
-'ovpn errmsg green already pushed' =3D> '=D0=9C=D0=B0=D1=80=D1=88=D1=80=D1=
=83=D1=82 =D0=B4=D0=BB=D1=8F =D0=B7=D0=B5=D0=BB=D1=91=D0=BD=D0=BE=D0=B9 =D1=
=81=D0=B5=D1=82=D0=B8 =D0=B2=D1=81=D0=B5=D0=B3=D0=B4=D0=B0 =D0=B2=D0=BA=D0=BB=
=D1=8E=D1=87=D1=91=D0=BD',
 'package failed to install' =3D> 'Package failed to install.',
 'pagerefresh' =3D> 'Page is beeing refreshed, please wait.',
 'pakfire accept all' =3D> 'Do you want to install all packages?',
diff --git a/src/initscripts/init.d/firewall b/src/initscripts/init.d/firewall
index c90687c..7478978 100644
--- a/src/initscripts/init.d/firewall
+++ b/src/initscripts/init.d/firewall
@@ -188,7 +188,6 @@ case "$1" in
=20
 	# Outgoing Firewall
 	/sbin/iptables -A FORWARD -j OUTGOINGFWMAC
-	/sbin/iptables -A FORWARD -j OUTGOINGFW
=20
 	# localhost and ethernet.
 	/sbin/iptables -A INPUT   -i lo -m state --state NEW -j ACCEPT


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

--===============0481335744994627992==--