From: ms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Wed, 31 May 2006 10:09:27 +0000 (+0000)
Subject: Großes Update:
X-Git-Tag: v2.3-beta1~1106
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=78331e301975a38f952ad9311a7ff3201e5a5e2e

Großes Update:
Hinzugefügt:
  * L7-Protokolle
Geändert:
  * XAMPP 1.5.1 --> 1.5.3
  * Sämtliche "IPCops" durch "IPFire" im Webinterface ersetzt
  * Einige Fixes, wegen Errors im Webinterface. (Im Forum zu finden.)


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

diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index cdfe13e339..3fd3a523e4 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -240,7 +240,7 @@ sub genmenu {
 				  'enabled' => 1,
 				  };
     $subnetwork->{'05.nettraf'} = {
-				  'caption' => '$tr{'sstraffic'}',
+				  'caption' => $tr{'sstraffic'},
 			     	  'uri' => '/cgi-bin/traffic.cgi',
 			     	  'title' => "$tr{'sstraffic'}",
 			         'enabled' => 1,
@@ -258,7 +258,7 @@ sub genmenu {
 			         'enabled' => 1,
 			   	  };
     $subnetwork->{'08.ipsec'} = {
-				  'caption' => 'IPSec,
+				  'caption' => 'IPSec',
 			     	  'uri' => '/cgi-bin/vpnmain.cgi',
 			     	  'title' => "$tr{'virtual private networking'}",
 			     	  'enabled' => 1,
@@ -727,11 +727,12 @@ sub openpage {
 
     $extrahead
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+    <meta http-equiv="Page-Enter" content="blendTrans(Duration=0.5,Transition=12)">
+    <meta http-equiv="Page-Exit" content="blendTrans(Duration=0.5,Transition=12)">
     <link rel="shortcut icon" href="/favicon.ico" />
     <style type="text/css">\@import url(/include/style.css);</style>
     <style type="text/css">\@import url(/include/menu.css);</style>
     <style type="text/css">\@import url(/include/content.css);</style>
-
     <script language="javascript" type="text/javascript">
       
         function swapVisibility(id) {
@@ -814,8 +815,6 @@ sub closepage () {
             </p>
           </div>
 	</body>
-	<meta http-equiv="Page-Enter" content="blendTrans(Duration=1.0,Transition=12)">
-	<meta http-equiv="Page-Exit" content="blendTrans(Duration=1.0,Transition=12)">
 </html>
 END
 ;
diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 95d51bdcaa..4fd797527a 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -114,6 +114,7 @@
   * jpegsrc.v6b
   * kbd-1.12
   * kudzu-0.99.50
+  * l7-protocols-2006-05-29
   * lame-3.96.1
   * less-382
   * libcap-1.10
@@ -214,6 +215,6 @@
   * vim-6.3
   * vlan.1.9
   * wget-1.10.2
-  * xampp-linux-1.5.1
+  * xampp-linux-1.5.3
   * xinetd-2.3.14
   * zlib-1.2.3
diff --git a/html/cgi-bin/aliases.cgi b/html/cgi-bin/aliases.cgi
index 5c2a4a1920..d32d842f70 100644
--- a/html/cgi-bin/aliases.cgi
+++ b/html/cgi-bin/aliases.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# IPCop CGI's - aliases.cgi
+# IPFire CGI's - aliases.cgi
 #
 # This code is distributed under the terms of the GPL
 #
@@ -17,7 +17,7 @@ use strict;
 #use Carp ();
 #local $SIG{__WARN__} = \&Carp::cluck;
 
-require 'CONFIG_ROOT/general-functions.pl';	# replace CONFIG_ROOT with /var/ipcop in case of manual install
+require 'CONFIG_ROOT/general-functions.pl';	# replace CONFIG_ROOT with /var/ipfire in case of manual install
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index b8184095f2..eab30eb8e4 100644
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 #
-# IPCop CGI's - backup.cgi: manage import/export of configuration files
+# IPFire CGI's - backup.cgi: manage import/export of configuration files
 #
 # This code is distributed under the terms of the GPL
 #
-# (c) The IPCop Team
+# (c) The IPFire Team
 # 2005	Franck Bourdonnec, major rewrite
 #
 # $Id: backup.cgi,v 1.2.2.15 2006/01/29 15:31:49 eoberlander Exp $
@@ -53,10 +53,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'backup export key'})  {
     if ($settings{'PASSWORD1'} ne '' && $settings{'PASSWORD1'} ne $settings{'PASSWORD2'} ){
 	$errormessage = $Lang::tr{'passwords do not match'}
     } else {
-	my @lines = `/usr/local/bin/ipcopbackup -keycat $settings{'PASSWORD'}`;
+	my @lines = `/usr/local/bin/ipfirebackup -keycat $settings{'PASSWORD'}`;
 	# If previous operation succeded and the key need to be crypted, redo operation with pipe to openssl
 	if (@lines && $settings{'PASSWORD1'}) {
-	    @lines = `/usr/local/bin/ipcopbackup -keycat $settings{'PASSWORD'}|openssl enc -a -e -aes256 -salt -pass pass:$settings{'PASSWORD1'} `;
+	    @lines = `/usr/local/bin/ipfirebackup -keycat $settings{'PASSWORD'}|openssl enc -a -e -aes256 -salt -pass pass:$settings{'PASSWORD1'} `;
 	}
         if (@lines) {
     	    use bytes;
@@ -92,7 +92,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'backup import key'})  {
 		print FILE @lines;
 		close (FILE);
 	    }
-	    $errormessage = &get_bk_error(system ('/usr/local/bin/ipcopbackup -key import')>>8);
+	    $errormessage = &get_bk_error(system ('/usr/local/bin/ipfirebackup -key import')>>8);
 	}
     }
 }
@@ -110,7 +110,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'backup extract key'})  {
 	    	    mv -f /tmp${General::swroot}/backup/backup.key $tmpkeyfile;\
 	    	    rm -rf /tmp${General::swroot};\
 		    rm /tmp/tmptarfile.tgz");
-	    $errormessage = &get_bk_error(system ('/usr/local/bin/ipcopbackup -key import')>>8);
+	    $errormessage = &get_bk_error(system ('/usr/local/bin/ipfirebackup -key import')>>8);
 	}
     }
 }
@@ -118,10 +118,10 @@ if ($settings{'ACTION'} eq $Lang::tr{'backup extract key'})  {
 #  Create the key. Cannot overwrite existing key to avoid difference with exported (saved) key
 #
 if ($settings{'ACTION'} eq $Lang::tr{'backup generate key'})  {
-    $errormessage = &get_bk_error(system('/usr/local/bin/ipcopbackup -key new')>>8);
+    $errormessage = &get_bk_error(system('/usr/local/bin/ipfirebackup -key new')>>8);
 }
 
-my $cryptkeymissing = system ('/usr/local/bin/ipcopbackup -key exist')>>8;
+my $cryptkeymissing = system ('/usr/local/bin/ipfirebackup -key exist')>>8;
 
 &Header::showhttpheaders();
 if ($cryptkeymissing) {  #If no key is present, force creation or import
@@ -157,7 +157,7 @@ if ($cryptkeymissing) {  #If no key is present, force creation or import
 	  <td align='right'>$Lang::tr{'backup protect key password'}:<td><input type = 'password' name='PASSWORD1' size='10' />
           </td>
 	</tr><tr>
-	  <td align='right'>$Lang::tr{'backup clear archive'}:</td><td><input type = 'file' name = 'FH' size = '30' value='your-ipcop.tar.gz' />
+	  <td align='right'>$Lang::tr{'backup clear archive'}:</td><td><input type = 'file' name = 'FH' size = '30' value='your-ipfire.tar.gz' />
 	  </td><td>
 	  <input type = 'submit' name = 'ACTION' value = '$Lang::tr{'backup extract key'}' />
           </td>
@@ -188,7 +188,7 @@ erase_files ($setdir);			#clean up
 # create new archive set
 #
 if ($settings{'ACTION'} eq $Lang::tr{'create'}) {
-    $errormessage = &get_bk_error(system('/usr/local/bin/ipcopbkcfg > /dev/null')>>8);
+    $errormessage = &get_bk_error(system('/usr/local/bin/ipfirebkcfg > /dev/null')>>8);
     &import_set (" ".&Header::cleanhtml ($settings{'COMMENT'})) if (!$errormessage);
 }
 #
@@ -220,7 +220,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'restore'}) {
 	if (!$cryptkeymissing) {   			# if keyfile exists
 	    if (-e "$settings{'KEY'}/$datafile"){   	# encrypted dat is required
     		copy_files($settings{'KEY'}, $setdir);	# to working dir
-        	$errormessage = get_rs_error(system("/usr/local/bin/ipcoprscfg" 
+        	$errormessage = get_rs_error(system("/usr/local/bin/ipfirerscfg" 
 					. ($settings{'RESTOREHW'} eq 'on' ? ' --hardware' : '') 
 					. ' >/dev/null')>>8);
 		if (!$errormessage) {
@@ -274,7 +274,7 @@ END
 
 # Read partitions sizes registered with the system
 my %partitions;
-foreach my $li (`/usr/local/bin/ipcopbackup -proc partitions`) {		# use suid helper...
+foreach my $li (`/usr/local/bin/ipfirebackup -proc partitions`) {		# use suid helper...
     # partitions{'sda1'} = 128M        if         /major minor  blocks name/
     $partitions{$4} = &kmgt($3*1024,4) if ($li =~ /(\d+) +(\d+) +(\d+) +(.*)/);
 }
@@ -282,7 +282,7 @@ foreach my $li (`/usr/local/bin/ipcopbackup -proc partitions`) {		# use suid hel
 # Search usb-storage scsi device
 my %medias;
     
-foreach (`/usr/local/bin/ipcopbackup -glob '/proc/scsi/usb-storage*/*'`) {# use suid helper...
+foreach (`/usr/local/bin/ipfirebackup -glob '/proc/scsi/usb-storage*/*'`) {# use suid helper...
     my $m;
     foreach ( `cat $_` ) {	# list each line of information for the device:
 #	Host scsi0: usb-storage
@@ -315,8 +315,8 @@ if ($settings{'ACTION'} eq $Lang::tr{'mount'})
     # Find what is really mounted under backup. Can be local hard disk or any removable media
     my $mounted = &findmounted();
     #umount previous, even if same device already mouted.
-    system ("/usr/local/bin/ipcopbackup -U $mounted") if ($mounted ne $Lang::tr{'local hard disk'});
-    $errormessage = `/usr/local/bin/ipcopbackup -M $settings{'SELECT'}` if (grep (/$settings{'SELECT'}/,%partitions));
+    system ("/usr/local/bin/ipfirebackup -U $mounted") if ($mounted ne $Lang::tr{'local hard disk'});
+    $errormessage = `/usr/local/bin/ipfirebackup -M $settings{'SELECT'}` if (grep (/$settings{'SELECT'}/,%partitions));
 }
 #
 # Compute a full description of device
@@ -515,7 +515,7 @@ sub floppybox {
 END
 ;
     print   "<b>$Lang::tr{'alt information'}</b><pre>" .
-    	    `/usr/local/bin/ipcopbackup -savecfg floppy` .
+    	    `/usr/local/bin/ipfirebackup -savecfg floppy` .
 	    '&nbsp;</pre>' if ($settings{'ACTION'} eq $Lang::tr{'backup to floppy'} );
 }
 
diff --git a/html/cgi-bin/base.cgi b/html/cgi-bin/base.cgi
index b98e991d48..57acddd613 100644
--- a/html/cgi-bin/base.cgi
+++ b/html/cgi-bin/base.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# IPCop CGI's - base.cgi
+# IPFire CGI's - base.cgi
 #
 # This code is distributed under the terms of the GPL
 #
@@ -41,8 +41,8 @@ use strict;
 #use Carp ();
 #local $SIG{__WARN__} = \&Carp::cluck;
 
-require '/var/ipcop/general-functions.pl';	# Replace all occurences of </var/ipcop> with CONFIG_ROOT
-						# before updating cvs IPCop file.
+require '/var/ipfire/general-functions.pl';	# Replace all occurences of </var/ipfire> with CONFIG_ROOT
+						# before updating cvs IPFire file.
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 
diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index 8384253505..673a025e5f 100644
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -368,7 +368,7 @@ print <<END
     <td align='center' bgcolor='${Header::colourred}'><b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b></td>
     <td align='center' bgcolor='${Header::colourorange}'><b><font color='#FFFFFF'>$Lang::tr{'dmz'}</font></b></td>
     <td align='center' bgcolor='${Header::colourblue}'><b><font color='#FFFFFF'>$Lang::tr{'wireless'}</font></b></td>
-    <td align='center' bgcolor='${Header::colourfw}'><b><font color='#FFFFFF'>IPCop</font></b></td>
+    <td align='center' bgcolor='${Header::colourfw}'><b><font color='#FFFFFF'>IPFire</font></b></td>
     <td align='center' bgcolor='${Header::colourvpn}'><b><font color='#FFFFFF'>$Lang::tr{'vpn'}</font></b></td>
 </tr>
 </table>
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index 96b71b3389..a8cc23f7d8 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -29,7 +29,7 @@ print <<END
 <br /><center><b>Besuchen sie uns auf <a href='http://www.ipfire.org/'>http://www.ipfire.org/</a></b></center>
 <br /><center><b>Visit us on <a href='http://www.ipfire.org/'>http://www.ipfire.org/</a></b></center>
 <p>
-<br /><center><b>IPFire is based on IPCop and Smoothwall. Many thanks to its developers for this great piece of software.</b></center>
+<br /><center><b>IPFire is based on IPFire and Smoothwall. Many thanks to its developers for this great piece of software.</b></center>
 
 <p><b>Credits:</b><br />
 Projektleiter - Michael Tremer
diff --git a/html/cgi-bin/ddns.cgi b/html/cgi-bin/ddns.cgi
index 69b9838e68..3e6d549cd5 100644
--- a/html/cgi-bin/ddns.cgi
+++ b/html/cgi-bin/ddns.cgi
@@ -263,7 +263,7 @@ print <<END
         <td class='base'>$Lang::tr{'dyn dns source choice'}</td>
 </tr><tr>
     <td class='base'><input type='radio' name='BEHINDROUTER' value='RED_IP' $checked{'BEHINDROUTER'}{'RED_IP'} />
-    $Lang::tr{'use ipcop red ip'}</td>
+    $Lang::tr{'use ipfire red ip'}</td>
 </tr><tr>
     <td class='base'><input type='radio' name='BEHINDROUTER' value='FETCH_IP' $checked{'BEHINDROUTER'}{'FETCH_IP'} />
     $Lang::tr{'fetch ip from'} <img src='/blob.gif' alt='*' /></td>
diff --git a/html/cgi-bin/gui.cgi b/html/cgi-bin/gui.cgi
index 3eaf37cd6e..991a31fceb 100644
--- a/html/cgi-bin/gui.cgi
+++ b/html/cgi-bin/gui.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# IPCop CGIs
+# IPFire CGIs
 #
 # This code is distributed under the terms of the GPL
 #
diff --git a/html/cgi-bin/hosts.cgi b/html/cgi-bin/hosts.cgi
index d1f946704f..7d68028157 100644
--- a/html/cgi-bin/hosts.cgi
+++ b/html/cgi-bin/hosts.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# IPCop CGIs
+# IPFire CGIs
 #
 # This code is distributed under the terms of the GPL
 #
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 035ee83ebd..df5f1c7003 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -105,7 +105,7 @@ if ($snortsettings{'ACTION'} eq $Lang::tr{'download new ruleset'}) {
 				$errormessage = "$Lang::tr{'invalid md5sum'}";
 			} else {
 				$results = "<b>$Lang::tr{'installed updates'}</b>\n<pre>";
-				$results .=`/usr/local/bin/oinkmaster.pl -s -u file://$filename -C /var/ipcop/snort/oinkmaster.conf -o /etc/snort 2>&1`;
+				$results .=`/usr/local/bin/oinkmaster.pl -s -u file://$filename -C /var/ipfire/snort/oinkmaster.conf -o /etc/snort 2>&1`;
 				$results .= "</pre>";
 			}
 			unlink ($filename);
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index 1d374f4a6b..9aa77d6ef0 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -88,7 +88,7 @@ if ( ( $pppsettings{'VALID'} eq 'yes'&& $modemsettings{'VALID'} eq 'yes' ) ||
 	    	    close IPADDR;
 	    	    chomp ($fetch_ip);
 	    	    my $host_name = (gethostbyaddr(pack("C4", split(/\./, $fetch_ip)), 2))[0];
-	    	    print "<br />$Lang::tr{'ip address'} (internet): $fetch_ip <br /> $Lang::tr{'ipcops hostname'} (internet): $host_name <br />";
+	    	    print "<br />$Lang::tr{'ip address'} (internet): $fetch_ip <br /> $Lang::tr{'ipfires hostname'} (internet): $host_name <br />";
 		}
 	    }
 	    if (open(IPADDR,"${General::swroot}/red/local-ipaddress")) {
@@ -97,7 +97,7 @@ if ( ( $pppsettings{'VALID'} eq 'yes'&& $modemsettings{'VALID'} eq 'yes' ) ||
 	    	chomp ($ipaddr);
 		if ($ipaddr ne $fetch_ip){	#do not show info twice
 	    	    my $host_name = (gethostbyaddr(pack("C4", split(/\./, $ipaddr)), 2))[0];
-	    	    print "<br />$Lang::tr{'ip address'}: $ipaddr <br /> $Lang::tr{'ipcops hostname'}: $host_name <br />";
+	    	    print "<br />$Lang::tr{'ip address'}: $ipaddr <br /> $Lang::tr{'ipfires hostname'}: $host_name <br />";
 		}
 	    }
         }
diff --git a/html/cgi-bin/logs.cgi/config.dat b/html/cgi-bin/logs.cgi/config.dat
index 6e82cf4f6f..7ad2eb85ee 100644
--- a/html/cgi-bin/logs.cgi/config.dat
+++ b/html/cgi-bin/logs.cgi/config.dat
@@ -1,10 +1,10 @@
 #!/usr/bin/perl
 #
-# IPCop CGIs
+# IPFire CGIs
 #
 # This code is distributed under the terms of the GPL
 #
-# (c) The IPCop Team
+# (c) The IPFire Team
 #
 # $Id: config.dat,v 1.2.2.10 2005/06/14 12:32:07 eoberlander Exp $
 #
diff --git a/html/cgi-bin/logs.cgi/firewalllog.dat b/html/cgi-bin/logs.cgi/firewalllog.dat
index 78cfdda897..b48b009a53 100644
--- a/html/cgi-bin/logs.cgi/firewalllog.dat
+++ b/html/cgi-bin/logs.cgi/firewalllog.dat
@@ -199,7 +199,7 @@ while ($gzindex >=0 && $loop) {
 if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 {
 	print "Content-type: text/plain\n\n";
-	print "IPCop firewall log\r\n";
+	print "IPFire firewall log\r\n";
 	print "$Lang::{'date'}: $date\r\n\r\n";
 
 	if ($logsettings{'LOGVIEW_REVERSE'} eq 'on') { @log = reverse @log; }
diff --git a/html/cgi-bin/logs.cgi/ids.dat b/html/cgi-bin/logs.cgi/ids.dat
index 09dde00116..aa76202f38 100644
--- a/html/cgi-bin/logs.cgi/ids.dat
+++ b/html/cgi-bin/logs.cgi/ids.dat
@@ -152,7 +152,7 @@ if ($multifile) {
 if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 {
 	print "Content-type: text/plain\n\n";
-	print "IPCop IDS snort log\r\n";
+	print "IPFire IDS snort log\r\n";
 	print "Date: $cgiparams{'DAY'} $longmonths[$cgiparams{'MONTH'}]\r\n"; 
 	print "\r\n";
 
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 87701ad448..76d5d29596 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -45,10 +45,10 @@ my $year = $now[5]+1900;
 $cgiparams{'DAY'} = $now[3];
 $cgiparams{'MONTH'} = $now[4];
 $cgiparams{'ACTION'} = '';
-$cgiparams{'SECTION'} = 'ipcop';
+$cgiparams{'SECTION'} = 'ipfire';
 
 my %sections = (
-        'ipcop' => '(ipcop)',
+        'ipfire' => '(ipfire)',
         'red' => '(red.*|kernel: usb.*|pppd\[.*\]|chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|kernel: eth.*|dhcpcd\[.*\]|modem_run\[.*\])',
         'dns' => '(dnsmasq\[.*\])',
         'dhcp' => '(dhcpd)',
@@ -64,7 +64,7 @@ my %sections = (
 
 # Translations for the %sections array.
 my %trsections = (
-        'ipcop' => 'IPCop',
+        'ipfire' => 'IPFire',
         'red' => 'RED',
         'dns' => 'DNS',
         'dhcp' => "$Lang::tr{'dhcp server'}",
@@ -229,7 +229,7 @@ while ($gzindex >=0 && $loop) {
 if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 {
 	print "Content-type: text/plain\n\n";
-	print "IPCop diagnostics\r\n";
+	print "IPFire diagnostics\r\n";
 	print "$Lang::tr{'section'}: $cgiparams{'SECTION'}\n";
 	print "$Lang::tr{'date'}: $date\r\n\r\n";
 
diff --git a/html/cgi-bin/logs.cgi/proxylog.dat b/html/cgi-bin/logs.cgi/proxylog.dat
index f790e2ff18..70208b9eda 100644
--- a/html/cgi-bin/logs.cgi/proxylog.dat
+++ b/html/cgi-bin/logs.cgi/proxylog.dat
@@ -268,7 +268,7 @@ if ($@ ne '')
 if ($cgiparams{'ACTION'} eq $Lang::tr{'export'})
 {
 	print "Content-type: text/plain\n\n";
-	print "IPCop proxy log\r\n";
+	print "IPFire proxy log\r\n";
 	print "$Lang::tr{'date'}: $daystr\r\n"; 
 	print "Source IP: $cgiparams{'SOURCE_IP'}\r\n";
 	if ($cgiparams{'ENABLE_FILTER'} eq 'on') {
diff --git a/html/cgi-bin/networks.cgi b/html/cgi-bin/networks.cgi
index 54b3f22e6d..4861dba675 100644
--- a/html/cgi-bin/networks.cgi
+++ b/html/cgi-bin/networks.cgi
@@ -1,19 +1,19 @@
 #!/usr/bin/perl
 #
-# This file is part of the IPCop Firewall.
+# This file is part of the IPFire Firewall.
 #
-# IPCop is free software; you can redistribute it and/or modify
+# IPFire is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# IPCop is distributed in the hope that it will be useful,
+# IPFire is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
+# along with IPFire; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # Copyright (C) 2003-09-22 Darren Critchley <darrenc@telus.net>
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 7b4722bb32..41845e4fbd 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 #
-# IPCop CGIs
+# IPFire CGIs
 #
-# This file is part of the IPCop Project
+# This file is part of the IPFire Project
 # 
 # This code is distributed under the terms of the GPL
 #
diff --git a/html/cgi-bin/portfw.cgi b/html/cgi-bin/portfw.cgi
index 65647ab4c1..fcd77e5483 100644
--- a/html/cgi-bin/portfw.cgi
+++ b/html/cgi-bin/portfw.cgi
@@ -1122,10 +1122,10 @@ sub valaddupdate
 		$prtrange2 = 1;
 	}
 	if ($cgiparams{'SRC_IP'} eq '0.0.0.0') { # Dave Roberts - only check if using DEFAULT IP
-		if ($prtrange2 == 1){ # check for destination ports reserved for IPCop
+		if ($prtrange2 == 1){ # check for destination ports reserved for IPFire
 			&disallowreserved($cgiparams{'DEST_PORT'},1,$cgiparams{'PROTOCOL'},"dst");
 			if ($errormessage) { goto EXITSUB; }
-		} else { # check for destination port reserved for IPCop
+		} else { # check for destination port reserved for IPFire
 			&disallowreserved($cgiparams{'DEST_PORT'},0,$cgiparams{'PROTOCOL'},"dst");
 			if ($errormessage) { goto EXITSUB; }
 		}
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 4bd8d6b97a..66f8c92141 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -637,10 +637,10 @@ END
 ;
 	if ( $netsettings{'CONFIG_TYPE'} =~ /^(2|3|6|7)$/ && ( $netsettings{'RED_TYPE'} eq "DHCP" || $netsettings{'RED_TYPE'} eq "STATIC") ) {
 		$pppsettings{'AUTOCONNECT'} = 'on';
-		print "<tr><td align='right'>$Lang::tr{'connect on ipcop restart'}</td>\n";
+		print "<tr><td align='right'>$Lang::tr{'connect on ipfire restart'}</td>\n";
 		print "<td><input type='checkbox' disabled='disabled' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'} /></td>\n";
 	} else {
-		print "<tr><td align='right'>$Lang::tr{'connect on ipcop restart'}</td>\n";
+		print "<tr><td align='right'>$Lang::tr{'connect on ipfire restart'}</td>\n";
 		print "<td><input type='checkbox' name='AUTOCONNECT' value='on' $checked{'AUTOCONNECT'}{'on'} /></td>\n";
 	}
 print <<END
diff --git a/html/cgi-bin/services.cgi b/html/cgi-bin/services.cgi
index 9a1c016a82..b6d5263f04 100644
--- a/html/cgi-bin/services.cgi
+++ b/html/cgi-bin/services.cgi
@@ -1,19 +1,19 @@
 #!/usr/bin/perl
 #
-# This file is part of the IPCop Firewall.
+# This file is part of the IPFire Firewall.
 #
-# IPCop is free software; you can redistribute it and/or modify
+# IPFire is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# IPCop is distributed in the hope that it will be useful,
+# IPFire is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
+# along with IPFire; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # Copyright (C) 2003-09-22 Darren Critchley <darrenc@telus.net>
diff --git a/html/cgi-bin/shutdown.cgi b/html/cgi-bin/shutdown.cgi
index 1e50bd2429..4ccf805ae0 100644
--- a/html/cgi-bin/shutdown.cgi
+++ b/html/cgi-bin/shutdown.cgi
@@ -29,12 +29,12 @@ $cgiparams{'ACTION'} = '';
 
 if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
 	$death = 1;
-	&General::log($Lang::tr{'shutting down ipcop'});
+	&General::log($Lang::tr{'shutting down ipfire'});
 	#system '/usr/local/bin/ipfiredeath';
 	system '/usr/local/bin/ipfirereboot down';
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'reboot'}) {
 	$rebirth = 1;
-	&General::log($Lang::tr{'rebooting ipcop'});
+	&General::log($Lang::tr{'rebooting ipfire'});
 	#system '/usr/local/bin/ipfirerebirth';
 	system '/usr/local/bin/ipfirereboot boot';
 } elsif ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
@@ -202,10 +202,10 @@ END
 	my $refresh = "<meta http-equiv='refresh' content='5; URL=/cgi-bin/index.cgi' />";
 	if ($death) {
 		$title = $Lang::tr{'shutting down'};
-		$message = $Lang::tr{'ipcop has now shutdown'};
+		$message = $Lang::tr{'ipfire has now shutdown'};
 	} else {
 		$title = $Lang::tr{'rebooting'};
-		$message = $Lang::tr{'ipcop has now rebooted'};
+		$message = $Lang::tr{'ipfire has now rebooted'};
 	}
 	&Header::openpage($title, 0, $refresh);
 
diff --git a/html/cgi-bin/time.cgi b/html/cgi-bin/time.cgi
index 639e051e91..aa96479da4 100644
--- a/html/cgi-bin/time.cgi
+++ b/html/cgi-bin/time.cgi
@@ -1,8 +1,8 @@
 #!/usr/bin/perl
 #
-# IPCop CGIs
+# IPFire CGIs
 #
-# This file is part of the IPCop Project
+# This file is part of the IPFire Project
 # 
 # This code is distributed under the terms of the GPL
 #
diff --git a/html/cgi-bin/upload.cgi b/html/cgi-bin/upload.cgi
index 03d27b9ec8..6bc955ec76 100644
--- a/html/cgi-bin/upload.cgi
+++ b/html/cgi-bin/upload.cgi
@@ -152,7 +152,7 @@ print <<END
 <table width='100%'>
 <tr>
 	<td colspan='4'>$Lang::tr{'fritzdsl help'}<br />
-	URL: <a href='http://www.ipcop.org/'>http://www.ipcop.org/</a>
+	URL: <a href='http://www.ipfire.org/'>http://www.ipfire.org/</a>
 	</td>
 </tr>
 <tr>
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 66fd685af1..2a30d03c29 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -1,19 +1,19 @@
 #!/usr/bin/perl
 #
-# This file is part of the IPCop Firewall.
+# This file is part of the IPFire Firewall.
 #
-# IPCop is free software; you can redistribute it and/or modify
+# IPFire is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
-# IPCop is distributed in the hope that it will be useful,
+# IPFire is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
+# along with IPFire; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # Copyright (C) 2003-05-25 Mark Wormgoor <mark@wormgoor.com>
@@ -991,7 +991,7 @@ END
 	<tr><td width='30%' class='base'>$Lang::tr{'organization name'}:</td>
 	    <td width='35%' class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_ORGANIZATION' value='$cgiparams{'ROOTCERT_ORGANIZATION'}' size='32' /></td>
 	    <td width='35%' colspan='2'>&nbsp;</td></tr>
-	<tr><td class='base'>$Lang::tr{'ipcops hostname'}:</td>
+	<tr><td class='base'>$Lang::tr{'ipfires hostname'}:</td>
 	    <td class='base' nowrap='nowrap'><input type='text' name='ROOTCERT_HOSTNAME' value='$cgiparams{'ROOTCERT_HOSTNAME'}' size='32' /></td>
 	    <td colspan='2'>&nbsp;</td></tr>
 	<tr><td class='base'>$Lang::tr{'your e-mail'}:&nbsp;<img src='/blob.gif' alt='*' /></td>
@@ -1250,7 +1250,7 @@ END
 	}
 
 	if (($cgiparams{'TYPE'} eq 'net') && ($cgiparams{'SIDE'} !~ /^(left|right)$/)) {
-	    $errormessage = $Lang::tr{'ipcop side is invalid'};
+	    $errormessage = $Lang::tr{'ipfire side is invalid'};
 	    goto VPNCONF_ERROR;
 	}
 
@@ -1749,7 +1749,7 @@ END
 	} else {
 	    print <<END
 		<tr><input type='hidden' name='INTERFACE' value='RED' />
-		    <td class='boldbase' nowrap='nowrap'>$Lang::tr{'ipcop side'}</td>
+		    <td class='boldbase' nowrap='nowrap'>$Lang::tr{'ipfire side'}</td>
 		    <td><select name='SIDE'><option value='left' $selected{'SIDE'}{'left'}>left</option>
 					    <option value='right' $selected{'SIDE'}{'right'}>right</option></select></td>
  		    <td class='boldbase'>$Lang::tr{'remote host/ip'}:</td>
diff --git a/html/cgi-bin/wireless.cgi b/html/cgi-bin/wireless.cgi
index a1ee844597..129e8df238 100644
--- a/html/cgi-bin/wireless.cgi
+++ b/html/cgi-bin/wireless.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# IPCop CGIs
+# IPFire CGIs
 #
 # This code is distributed under the terms of the GPL
 #
diff --git a/html/html/index.cgi b/html/html/index.cgi
index 98121b9a34..064a53170b 100644
--- a/html/html/index.cgi
+++ b/html/html/index.cgi
@@ -1,8 +1,4 @@
 #!/usr/bin/perl
 
-#
-# $Id: index.cgi,v 1.4 2003/12/11 11:06:41 riddles Exp $
-#
-
 print "Status: 302 Moved\n";
 print "Location: /cgi-bin/index.cgi\n\n";
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 6f4d46bab9..4fd441ec1d 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1,60 +1,53 @@
 # German (de) Data File 
 #
-# This file is part of the IPCop Firewall.
+# This file is part of the IPFire Firewall.
 # 
-# IPCop is free software; you can redistribute it and/or modify
+# IPFire is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 # 
-# IPCop is distributed in the hope that it will be useful,
+# IPFire is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
+# along with IPFire; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-# 
-# (c) The SmoothWall Team
-# 
-# IPCop translation
-# (c) 2003 Dirk Loss, Ludwig Steininger, Michael Knappe, Michael Linke,
-# Richard Hartmann, Ufuk Altinkaynak, Gerhard Abrahams, Benjamin Kohberg,
-# Samuel Wiktor 
-#
 
 %tr = ( 
 %tr, 
- 
+
 'a ca certificate with this name already exists' => 'Ein CA-Zertifikat mit diesem Namen existiert bereits.', 
-'a connection with this common name already exists' => 'Eine Verbindung mit diesem gemeinsamen Namen existiert bereits.', 
-'a connection with this name already exists' => 'Eine Verbindung mit diesem Namen existiert bereits.', 
 'access allowed' => 'Zugriff erlaubt von:', 
 'access refused with this oinkcode' => 'Zugriff mit diesem Oink Code verweigert', 
+'a connection with this common name already exists' => 'Eine Verbindung mit diesem gemeinsamen Namen existiert bereits.', 
+'a connection with this name already exists' => 'Eine Verbindung mit diesem Namen existiert bereits.', 
 'action' => 'Aktion', 
-'add' => 'Hinzufügen', 
 'add a host' => 'Host hinzufügen:', 
 'add a new rule' => 'Neue Regel hinzufügen:', 
 'add device' => 'Gerät hinzufügen', 
+'added from dhcp lease list' => 'hinzugefügt von der DHCP Zuordnungsliste', 
+'add' => 'Hinzufügen', 
 'add network' => 'Netzwerk hinzufügen', 
 'add new alias' => 'Neue Alias-Adresse hinzufügen:', 
 'add new lease' => 'Neue Zuordnung definieren', 
 'add service' => 'Dienst hinzufügen', 
 'add xtaccess' => 'Externen Zugang hinzugefügt', 
-'added from dhcp lease list' => 'hinzugefügt von der DHCP Zuordnungsliste', 
-'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.', 
 'administrator user password' => 'Passwort für Benutzer &quot;admin&quot;:', 
+'admin user password has been changed' => 'Passwort für Benutzer admin wurde geändert.', 
 'adsl settings' => 'ADSL-Einstellungen', 
 'advanced' => 'Erweitert', 
 'again' => 'Wiederholung:', 
-'alcatelusb help' => 'Um das Speedtouch USB Modem zu verwenden, müssen Sie die Firmware in Ihre IPCop Box hochladen. Bitte laden sie das <b>Embedded Firmware</b> Paket von speedtouch.com herunter, entpacken es und laden dann die passende Datei für Ihr Modem hoch: KQD6_3.xxx für Revisionsnummern <4 oder ZZZL_3.xxx für Rev.=4 mittels des unten angegebenen Formulars.', 
+'alcatelusb help' => 'Um das Speedtouch USB Modem zu verwenden, müssen Sie die Firmware in Ihre IPFire Box hochladen. Bitte laden sie das <b>Embedded Firmware</b> Paket von speedtouch.com herunter, entpacken es und laden dann die passende Datei für Ihr Modem hoch: KQD6_3.xxx für Revisionsnummern <4 oder ZZZL_3.xxx für Rev.=4 mittels des unten angegebenen Formulars.', 
 'alcatelusb upload' => 'Speedtouch USB Firmware hochladen', 
-'alias ip' => 'Alias-IP-Adresse', 
 'aliases' => 'Aliase', 
 'aliases not active' => 'Aliase-Adresse wird erst aktiviert, wenn Ihr ROTES Interface STATISCH ist', 
+'alias ip' => 'Alias-IP-Adresse', 
 'all' => 'Alle', 
 'all interfaces' => 'Alle Schnittstellen', 
+'allmsg' => 'zeige alles',
 'all updates installed' => 'Alle Updates installiert', 
 'alt dialup' => 'Einwahl', 
 'alt home' => 'Startseite', 
@@ -75,26 +68,26 @@
 'automatic' => 'Automatisch', 
 'available updates' => 'Verfügbare Updates:', 
 'average' => 'Durchschnitt', 
-'avoid dod' => 'Benutzen Sie diese Option nicht mit Dial on Demand! Wird hautpsächlich verwendet, wenn ihr IPCop sich hinter einem Router befindet. Ihre ROTE IP muß sich innerhalb eines der drei reservierten Netzwerkbereiche befinden z.B. 10/8, 172.16/12, 192.168/16.', 
-'back' => 'ZURÜCK', 
-'backup' => 'Datensicherung', 
+'avoid dod' => 'Benutzen Sie diese Option nicht mit Dial on Demand! Wird hautpsächlich verwendet, wenn ihr IPFire sich hinter einem Router befindet. Ihre ROTE IP muß sich innerhalb eines der drei reservierten Netzwerkbereiche befinden z.B. 10/8, 172.16/12, 192.168/16.', 
 'backup config floppy' => 'Backup-Konfiguration - Diskette', 
 'backup configuration' => 'Backup-Konfiguration:', 
+'backup' => 'Datensicherung', 
+'backupprofile' => 'Falls die Wiederverbindung scheitert, auf Profil umschalten', 
 'backup sets' => 'Datensicherungssätze', 
 'backup to floppy' => 'Datensicherung auf Diskette', 
-'backupprofile' => 'Falls die Wiederverbindung scheitert, auf Profil umschalten', 
+'back' => 'ZURÜCK', 
 'bad characters in script field' => 'Nicht erlaubte Zeichen im Skriptnamen', 
 'bad characters in the telephone number field' => 'Nicht erlaubte(s) Zeichen im Feld Telefonnummer.', 
 'bad destination range' => 'Der erste Wert des Zielportbereichs ist größer oder gleich dem zweiten Wert.', 
 'bad ignore filter' => 'Falscher &quot;Ignorieren&quot;-Filter:', 
 'bad return code' => 'Das Hilfsprogramm hat einen Fehlercode gemeldet', 
 'bad source range' => 'Der erste Wert des Quellportbereich ist größer oder gleich dem zweiten Wert.', 
-'beep when ppp connects or disconnects' => 'Piepen, wenn IPCop verbindet oder trennt', 
+'beep when ppp connects or disconnects' => 'Piepen, wenn IPFire verbindet oder trennt', 
 'behind a proxy' => 'Hinter einem Proxy:', 
 'bewan adsl pci st' => 'Bewan ADSL PCI ST', 
 'bewan adsl usb' => 'Bewan ADSL USB', 
-'blue' => 'BLAU', 
 'blue access' => 'Zugriff auf Blau', 
+'blue' => 'BLAU', 
 'blue interface' => 'Blaues Interface', 
 'broadcast' => 'Broadcast', 
 'broken pipe' => 'Zerbrochene Pipe', 
@@ -102,11 +95,11 @@
 'buffers' => 'Puffer', 
 'bytes per second' => 'Bytes pro Sekunde', 
 'ca certificate' => 'CA Zertifikat', 
-'ca name' => 'CA Name', 
+'cached memory' => 'Cache Speicher', 
+'cached' => 'zwischengespeichert', 
 'cache management' => 'Cache Verwaltung', 
 'cache size' => 'Cache-Größe (MB):', 
-'cached' => 'zwischengespeichert', 
-'cached memory' => 'Cache Speicher', 
+'ca name' => 'CA Name', 
 'cancel' => 'Abbrechen', 
 'cannot enable both nat traversal and compression' => 'NAT Traversal und Kompression können nicht gleichzeitig aktiviert sein.', 
 'cannot enable ntp without specifying primary' => 'NTP kann nicht aktiviert werden, ohne vorherige Eingabe in \'primär\'.', 
@@ -120,11 +113,11 @@
 'capsclosed' => 'BEENDET', 
 'capsopen' => 'OFFEN', 
 'capswarning' => 'WARNUNG', 
-'cert' => 'Zertifikat', 
-'certificate' => 'Zertifikat', 
 'certificate authorities' => 'Zertifizierungsstellen (CAs)', 
 'certificate does not have a valid ca associated with it' => 'Mit dem Zertifikat ist keine gültige CA verbunden.', 
 'certificate file move failed' => 'Verschieben der Zertifikatsdatei fehlgeschlagen', 
+'certificate' => 'Zertifikat', 
+'cert' => 'Zertifikat', 
 'cfg restart' => 'Nach dem Wiederherstellen eines Konfigurationsarchivs wird ein Neustart empfohlen.', 
 'chain' => 'Verknüpfung', 
 'change passwords' => 'Passwörter&nbsp;ändern', 
@@ -141,22 +134,22 @@
 'computer to modem rate' => 'Übertragungsrate zwischen Computer und Modem:', 
 'concentrator name' => 'Name des Konzentrators:', 
 'confirmation' => 'Bestätigung', 
-'connect on ipcop restart' => 'Verbinden bei IPCop-Neustart', 
-'connect the modem' => 'Das Modem anschließen', 
-'connect timeout' => 'Anwahl-Wartezeit:', 
 'connected' => 'Verbunden', 
 'connecting' => 'Baue Verbindung auf...', 
-'connection' => 'Verbindung', 
 'connection debugging' => 'Verbindungs-Debugging', 
+'connections are associated with this ca.  deleting the ca will delete these connections as well.' => 'Es sind noch Verbindungen mit dieser CA verknüpft.  Das Löschen dieser CA wird diese Verbindungen ebenfalls löschen.', 
 'connection status and controlc' => 'Verbindungsstatus und -kontrolle:', 
+'connections' => 'Verbindungen', 
 'connection tracking' => 'IPTables-Verbindungsverfolgung', 
-'connection type' => 'Verbindungstyp', 
 'connection type is invalid' => 'Verbindungstyp ist ungültig', 
-'connections' => 'Verbindungen', 
-'connections are associated with this ca.  deleting the ca will delete these connections as well.' => 'Es sind noch Verbindungen mit dieser CA verknüpft.  Das Löschen dieser CA wird diese Verbindungen ebenfalls löschen.', 
+'connection type' => 'Verbindungstyp', 
+'connection' => 'Verbindung', 
+'connect on ipfire restart' => 'Verbinden bei IPFire-Neustart', 
+'connect the modem' => 'Das Modem anschließen', 
+'connect timeout' => 'Anwahl-Wartezeit:', 
 'could not be opened' => 'konnte nicht geöffnet werden', 
 'could not connect to' => 'Konnte keine Verbindung herstellen mit', 
-'could not connect to www ipcop org' => 'Keine Verbindung zu www.ipcop.org möglich', 
+'could not connect to www ipfire org' => 'Keine Verbindung zu www.ipfire.org möglich', 
 'could not create directory' => 'Verzeichnis konnte nicht erzeugt werden.', 
 'could not download latest patch list' => 'Die neueste Update-Liste konnte nicht heruntergeladen werden (keine Verbindung).', 
 'could not download latest updates' => 'Konnte die neuesten Updates nicht downloaden.', 
@@ -180,36 +173,36 @@
 'current rules' => 'Aktuelle Regeln:', 
 'custom networks' => 'Benutzerdefinierte Netzwerke', 
 'custom services' => 'Benutzerdefinierte Dienste', 
-'dat without key' => 'Ein verschlüsseltes Archiv kann ohne Schlüssel nicht wiederhergestellt werden.', 
 'date' => 'Datum', 
 'date not in logs' => 'Für den gesuchten Tag existiert kein (oder nur ein unvollständiges) Log', 
-'day' => 'Tag', 
+'dat without key' => 'Ein verschlüsseltes Archiv kann ohne Schlüssel nicht wiederhergestellt werden.', 
 'day after' => 'Tag danach', 
 'day before' => 'Tag davor', 
 'days' => 'Tage', 
+'day' => 'Tag', 
 'ddns hostname added' => 'Hostname für dynamischen DNS hinzugefügt', 
 'ddns hostname modified' => 'Hostname für dynamischen DNS geändert', 
 'ddns hostname removed' => 'Hostname für dynamischen DNS gelöscht', 
 'ddns minimize updates' => 'Updates minimieren: Vergleicht vor einem Update die DNS-IP-Adresse für Hostname "[host.]domain" gegen die ROTE IP-Addresse.', 
 'ddns noip prefix' => 'Um no-ip im Gruppenmodus zu benutzen, dem Hostnamen <b>%</b> hinzufügen', 
 'december' => 'Dezember', 
-'def lease time' => 'Standardzeit für Zuordnung', 
 'default lease time' => 'Haltezeit-Voreinstellung in min:', 
 'default networks' => 'Standard Netzwerke', 
 'default renewal time' => 'Standard-Aktualisierungszeit', 
 'default services' => 'Standard Dienste', 
+'def lease time' => 'Standardzeit für Zuordnung', 
 'delete' => 'Löschen', 
 'demon login script' => 'Demon-Anmeldeskript', 
 'description' => 'Beschreibung', 
-'dest ip and port' => 'Ziel-IP:Port', 
-'destination' => 'Ziel', 
-'destination ip' => 'Ziel-IP-Adresse', 
 'destination ip bad' => 'Ungültige Ziel-IP-Adresse', 
 'destination ip or net' => 'Ziel-IP oder Netz', 
+'destination ip' => 'Ziel-IP-Adresse', 
 'destination net' => 'Ziel-Netz', 
-'destination port' => 'Ziel-Port', 
 'destination port numbers' => 'Zielport muß ein(e) gültige(r) Portnummer oder Portbereich sein.', 
 'destination port overlaps' => 'Der Zielportbereich überlappt einen bereits bestehenden Portbereich.', 
+'destination port' => 'Ziel-Port', 
+'destination' => 'Ziel', 
+'dest ip and port' => 'Ziel-IP:Port', 
 'detail level' => 'Detaillierungsgrad', 
 'device' => 'Gerät', 
 'devices on blue' => 'Geräte auf Blau', 
@@ -225,9 +218,9 @@
 'dhcp advopt modified' => 'DHCP Option modifiziert', 
 'dhcp advopt name' => 'Optionsname', 
 'dhcp advopt removed' => 'DHCP Option entfernt', 
-'dhcp advopt scope' => 'Options-Wertebereich', 
 'dhcp advopt scope global' => 'Global', 
 'dhcp advopt scope help' => 'Globaler Bereich oder begenze Bereich auf überprüfte Schnittstellen', 
+'dhcp advopt scope' => 'Options-Wertebereich', 
 'dhcp advopt unknown' => 'Name der DHCP Option wurde nicht erkannt', 
 'dhcp advopt value' => 'Optionswert', 
 'dhcp allow bootp' => 'BOOTP Clients zulassen', 
@@ -239,11 +232,12 @@
 'dhcp server disabled on blue interface' => 'DHCP-Server auf BLAUER Schnittstelle deaktiviert', 
 'dhcp server enabled' => 'DHCP-Server aktiviert. Starte neu.', 
 'dhcp server enabled on blue interface' => 'DHCP-Server auf BLAUER Schnittstelle aktviert', 
-'dial' => 'Verbinden', 
-'dial user password' => 'Passwort für Benutzer &quot;dial&quot;:', 
-'dial user password has been changed' => 'Passwort für Benutzer -dial- wurde geändert.', 
 'dialing mode' => 'Wählmodus:', 
+'dial profile' => 'Verbinden mit Profil',
 'dialup settings' => 'Einwahl-Einstellungen', 
+'dial user password has been changed' => 'Passwort für Benutzer -dial- wurde geändert.', 
+'dial user password' => 'Passwort für Benutzer &quot;dial&quot;:', 
+'dial' => 'Verbinden', 
 'disk access per' => 'Plattenzugriff je', 
 'disk usage' => 'Festplattenbelegung:', 
 'display' => 'Anzeige', 
@@ -255,7 +249,6 @@
 'dmzpinholes for same net not necessary' => 'DMZ-Schlupflöcher werden im gleichen Netz nicht benötigt. Wählen Sie ein anderes Quell- oder Ziel-Netz.', 
 'dns check failed' => 'Fehler bei DNS-Überprüfung', 
 'dns proxy server' => 'DNS-Proxyserver', 
-'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)', 
 'dod' => 'Dial-on-Demand-Modus', 
 'dod for dns' => 'Dial-on-Demand für DNS:', 
 'dod not compatible with ddns' => 'Dial on Demand ist nicht kompatibel mit dynamischen DNS Diensten', 
@@ -264,6 +257,7 @@
 'domain name' => 'Domainname', 
 'domain name suffix' => 'Domain-Name-Suffix:', 
 'domain not set' => 'Domain nicht eingegeben.', 
+'do not log this port list' => 'Verwerfe diese Port-Liste kurz bevor sie protokolliert werden (reduziert Protokollgröße)', 
 'downlink speed' => 'Downlink-Geschwindigkeit (kBit/sek)', 
 'download ca certificate' => 'CA Zertifikat herunterladen', 
 'download certificate' => 'Zertifikate herunterladen', 
@@ -276,34 +270,34 @@
 'dst port' => 'Ziel-Port', 
 'dstprt range overlaps' => 'Der Zielportbereich überlappt mit einem bereits definierten Port.', 
 'dstprt within existing' => 'Der Zielport liegt innerhalb eines bereits definierten Portbereichs.', 
-'duplicate ip' => 'IP-Adresse doppelt eingegeben', 
 'duplicate ip bold' => 'Doppelte Adressen sind <b>fett</b> gedruckt', 
+'duplicate ip' => 'IP-Adresse doppelt eingegeben', 
 'duplicate mac' => 'Doppelte MAC-Adresse eingegeben', 
 'duplicate name' => 'Dieser Name wird bereits benutzt. Bitte wählen Sie einen anderen.', 
-'dyn dns source choice' => 'Dynamic DNS Anbieter werden eine IP-Adresse für diesen IPCop erhalten von:', 
-'dynamic dns' => 'Dynamischer DNS', 
 'dynamic dns client' => 'Dynamischer DNS-Client', 
-'e-mail address too long' => 'E-mail Adresse ist zu lang; sie sollte nicht länger als 40 Zeichen sein.', 
-'eciadsl help' => 'Um ein ECI PCI-Modem nutzen zu können, müssen Sie zuerst die Treiber-Software zur IPCop-Box hochladen. Laden Sie zuerst den Tarball von ECIADSL herunter und laden Sie dann die Datei <B>synch.bin</B> über das untenstehende Formblatt zu IPCop hoch.', 
+'dynamic dns' => 'Dynamischer DNS', 
+'dyn dns source choice' => 'Dynamic DNS Anbieter werden eine IP-Adresse für diesen IPFire erhalten von:', 
+'eciadsl help' => 'Um ein ECI PCI-Modem nutzen zu können, müssen Sie zuerst die Treiber-Software zur IPFire-Box hochladen. Laden Sie zuerst den Tarball von ECIADSL herunter und laden Sie dann die Datei <B>synch.bin</B> über das untenstehende Formblatt zu IPFire hoch.', 
 'eciadsl upload' => 'Hochladen der ECI ADSL Datei synch.bin', 
-'edit' => 'Bearbeiten', 
-'edit a rule' => 'Existierende Regel bearbeiten:', 
 'edit advanced settings when done' => 'Erweiterte Einstellungen bearbeiten, wenn fertig.', 
 'edit an existing alias' => 'Einen bestehenden Alias bearbeiten', 
 'edit an existing host' => 'Einen bestehenden Host hinzufügen', 
 'edit an existing lease' => 'Eine existierende Zuordnung bearbeiten', 
+'edit a rule' => 'Existierende Regel bearbeiten:', 
+'edit' => 'Bearbeiten', 
 'edit device' => 'Gerät bearbeiten', 
 'edit hosts' => 'Hosts bearbeiten', 
 'edit network' => 'Netzwerk bearbeiten', 
 'edit service' => 'Dienst bearbeiten', 
 'eg' => 'z.B.:', 
+'e-mail address too long' => 'E-mail Adresse ist zu lang; sie sollte nicht länger als 40 Zeichen sein.', 
 'empty' => 'Leer', 
-'enable ignore filter' => '&quot;Ignorieren&quot;-Filter ein', 
-'enable javascript' => 'Javascript aktivieren', 
-'enable wildcards' => 'Wildcards erlauben:', 
 'enabled' => 'Aktiviert:', 
 'enabled on' => 'Aktiviert auf', 
 'enabledtitle' => 'Aktiviert', 
+'enable ignore filter' => '&quot;Ignorieren&quot;-Filter ein', 
+'enable javascript' => 'Javascript aktivieren', 
+'enable wildcards' => 'Wildcards erlauben:', 
 'encapsulation' => 'Encapsulation', 
 'encrypted' => 'Verschlüsselt', 
 'end address' => 'Endadresse:', 
@@ -312,11 +306,11 @@
 'err bk 3 tar' => 'Fehler beim Anhängen der Datei ans Archiv', 
 'err bk 4 gz' => 'Fehler beim Komprimieren des Archivs', 
 'err bk 5 encrypt' => 'Fehler beim Verschlüsseln des Archivs', 
+'error messages' => 'Fehlermeldungen:', 
 'err rs 1' => 'Fehler beim Wiederherstellen des Archivs', 
 'err rs 6 decrypt' => 'Fehler beim Entschlüsseln des Archivs', 
 'err rs 7 untartst' => 'Ungültiges entschlüsseltes Archiv', 
 'err rs 8 untar' => 'Fehler beim un-tar-en des Archivs', 
-'error messages' => 'Fehlermeldungen:', 
 'esp encryption' => 'ESP Verschlüsselung:', 
 'esp grouptype' => 'ESP Gruppentyp:', 
 'esp integrity' => 'ESP Integrität:', 
@@ -327,8 +321,8 @@
 'expected' => 'Erwartet', 
 'expires' => 'Ablaufdatum', 
 'export' => 'Export', 
-'external access' => 'Externer Zugang', 
 'external access configuration' => 'Einstellungen für externen Zugang', 
+'external access' => 'Externer Zugang', 
 'external access rule added' => 'Regel für externen Zugang hinzugefügt; Starte Zugangskontroller neu', 
 'external access rule removed' => ' Regel für externen Zugang entfernt; Starte Zugangskontroller neu', 
 'external aliases configuration' => 'Externe Alias-Konfiguration', 
@@ -339,8 +333,8 @@
 'firewall' => 'Firewall', 
 'firewall hits' => 'Gesamtanzahl der Firewall-Treffer für', 
 'firewall log' => 'Firewall-Protokoll', 
-'firewall log viewer' => 'Betrachter der Firewall-Logdateien', 
 'firewall logs' => 'Firewall-Logdateien', 
+'firewall log viewer' => 'Betrachter der Firewall-Logdateien', 
 'firmware' => 'Firmware', 
 'firmware upload' => 'Hochladen der Firmware/Treiber', 
 'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt', 
@@ -354,16 +348,16 @@
 'free memory' => 'Freier Speicher', 
 'free swap' => 'Freier Swap', 
 'friday' => 'Freitag', 
-'fritzdsl help' => 'Um eines der folgenden Fritz!DSL Modems (Fritz!Card DSL=fcdsl / Fritz!CardDSL SL=fcdslsl / Fritz!Card DSL V2.0=fcdsl2 / Fritz!Card DSL USB=fcdslusb / Fritz!Card DSL USB SL=fcdslslusb) nutzen zu können, müssen Sie ein Paket auf Ihre IPCop-Box laden. Bitte laden Sie den tarball entsprechend Ihrer Version von der IPCop-Webseite herunter und laden Sie dann die gesamte <b>fcdsl-(ihre_version).tgz</b> mit dem folgenden Formular hoch.', 
+'fritzdsl help' => 'Um eines der folgenden Fritz!DSL Modems (Fritz!Card DSL=fcdsl / Fritz!CardDSL SL=fcdslsl / Fritz!Card DSL V2.0=fcdsl2 / Fritz!Card DSL USB=fcdslusb / Fritz!Card DSL USB SL=fcdslslusb) nutzen zu können, müssen Sie ein Paket auf Ihre IPFire-Box laden. Bitte laden Sie den tarball entsprechend Ihrer Version von der IPFire-Webseite herunter und laden Sie dann die gesamte <b>fcdsl-(ihre_version).tgz</b> mit dem folgenden Formular hoch.', 
 'fritzdsl upload' => 'Fritz!DSL-Treiber hochladen', 
 'from' => 'Von', 
-'g.dtm' => 'G.dmt', 
-'g.lite' => 'G.lite', 
 'gateway' => 'Gateway', 
 'gateway ip' => 'Gateway-IP', 
+'g.dtm' => 'G.dmt', 
 'generate a certificate' => 'Erzeuge ein Zertifikat:', 
 'generate root/host certificates' => 'Erzeuge Root/Host Zertifikate', 
 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Die Erzeugung der Root und Host Zertifikate kann lange Zeit dauern.  Auf älterer Hardware kann es mehrere Minuten lang dauern. Bitte haben Sie etwas Geduld.', 
+'g.lite' => 'G.lite', 
 'global settings' => 'Globale Einstellungen', 
 'graph' => 'Diagramm', 
 'graph per' => 'Diagramm pro', 
@@ -371,38 +365,38 @@
 'green interface' => 'Grünes Interface', 
 'gui settings' => 'Benutzeroberfläche', 
 'gz with key' => 'Nur ein verschlüsseltes Archiv kann auf dieser Maschine wiederhergestellt werden.', 
-'hangup' => 'Trennen', 
 'hangup string' => 'Auflegen:', 
+'hangup' => 'Trennen', 
 'high' => 'Hoch', 
 'high memory usage' => 'Speicher wird knapp', 
 'holdoff' => 'Holdoff-Zeit in (Sekunden)', 
-'host' => 'Host', 
 'host certificate' => 'Host Zertifikat', 
 'host configuration' => 'Host-Konfiguration', 
+'host' => 'Host', 
 'host ip' => 'Host IP-Adresse', 
-'host to net vpn' => 'Host-zu-Netz Virtual Private Network (RoadWarrior)', 
-'hostname' => 'Hostname', 
 'hostname and domain already in use' => 'Hostname und Domain sind werden bereits benutzt.', 
 'hostname cant be empty' => 'Hostname darf nicht leer bleiben.', 
+'hostname' => 'Hostname', 
 'hostname not set' => 'Hostname nicht eingegeben.', 
 'hosts config added' => 'Hosts-Konfiguration hinzugefügt', 
 'hosts config changed' => 'Hosts-Konfiguration geändert', 
-'hours' => 'Stunden', 
+'host to net vpn' => 'Host-zu-Netz Virtual Private Network (RoadWarrior)', 
 'hours2' => 'Stunden', 
+'hours' => 'Stunden', 
 'ibod for dual isdn only' => 'iBOD kann nur bei ISDN-Kanalbündelung genutzt werden.', 
 'icmp selected but no type' => 'ICMP wurde zwar als Protokoll gewählt, es wurde aber kein ICMP-Typ angegeben.', 
 'icmp type' => 'ICMP-Typ', 
 'id' => 'ID', 
-'idle' => 'Leerlauf', 
 'idle cpu' => 'CPU Leerlauf', 
 'idle cpu usage' => 'Leerlauf CPU Nutzung', 
+'idle' => 'Leerlauf', 
 'idle timeout' => 'Leerlauf-Wartezeit in min (0 zum Deaktivieren):', 
 'idle timeout not set' => 'Leerlauf-Wartezeit nicht angegeben.', 
-'ids log viewer' => 'Ansicht IDS-Log', 
 'ids logs' => 'IDS-Logdateien', 
-'ids rules license' => 'Um  Sourcefire VRT Zertifizierte Regeln zu nutzen, müssen Sie ich registrieren auf', 
+'ids log viewer' => 'Ansicht IDS-Log', 
 'ids rules license2' => 'Bestätigen Sie die Lizenz, empfangen Sie Ihr Passwort per email und gehen Sie auf die Website. Gehen Sie zu', 
 'ids rules license3' => 'klicken Sie den \'Get Code\' Knopf am Fuß und kopieren den 40-Zeichen Oink Code in das untere Feld.', 
+'ids rules license' => 'Um  Sourcefire VRT Zertifizierte Regeln zu nutzen, müssen Sie ich registrieren auf', 
 'ids rules update' => 'Snort Regeln Update', 
 'iface' => 'Iface', 
 'ignore filter' => '&quot;Ignorieren&quot;-Filter', 
@@ -412,22 +406,22 @@
 'ike lifetime' => 'IKE Lebensdauer:', 
 'ike lifetime should be between 1 and 8 hours' => 'IKE Lebensdauer sollte zwischen 1 und 8 Stunden betragen.', 
 'import' => 'Import', 
-'in' => 'Ein', 
 'incoming traffic in bytes per second' => 'Eingehender Verkehr in Bytes pro Sekunde', 
+'in' => 'Ein', 
 'info' => 'Info', 
 'init string' => 'Initialisierung:', 
-'insert floppy' => 'Legen Sie eine formatierte Diskette in das Floppy-Laufwerk in IPCop und klicken auf <i>Datensicherung auf Diskette</i>, um die Systemeinstellungen zu sichern.  Überprüfen Sie das Ergebnis sorgfältig, um sicher zu sein, dass die Datensicherung vollständig und erfolgreich abgeschlossen wurde.<p>', 
-'install new update' => 'Installiere neues Update:', 
+'insert floppy' => 'Legen Sie eine formatierte Diskette in das Floppy-Laufwerk in IPFire und klicken auf <i>Datensicherung auf Diskette</i>, um die Systemeinstellungen zu sichern.  Überprüfen Sie das Ergebnis sorgfältig, um sicher zu sein, dass die Datensicherung vollständig und erfolgreich abgeschlossen wurde.<p>', 
 'installed' => 'Installiert', 
 'installed updates' => 'Installierte Updates:', 
+'install new update' => 'Installiere neues Update:', 
 'instant update' => 'Sofortiges Update', 
 'interface' => 'Schnittstelle', 
 'interfaces' => 'Schnittstellen:', 
 'internet' => 'INTERNET', 
 'intrusion detection' => 'Einbruchdetektierung', 
+'intrusion detection system2' => 'Intrusion Detection System:', 
 'intrusion detection system' => 'Intrusion Detection System', 
 'intrusion detection system log viewer' => 'Betrachter der IDS-Logfiles', 
-'intrusion detection system2' => 'Intrusion Detection System:', 
 'invalid broadcast ip' => 'Ungültige Broadcast-IP', 
 'invalid cache size' => 'Ungültige Cache-Größe.', 
 'invalid characters found in pre-shared key' => 'Ungültige Zeichen im Pre-Shared Schlüssel gefunden.', 
@@ -439,7 +433,6 @@
 'invalid fixed ip address' => 'Ungültige feste IP-Adresse', 
 'invalid fixed mac address' => 'Ungültige feste MAC-Adresse', 
 'invalid hostname' => 'Ungültiger Hostname.', 
-'invalid input' => 'Ungültige Eingabe', 
 'invalid input for authentication method' => 'Ungültige Eingabe für Authentifizierungsmethode.', 
 'invalid input for city' => 'Ungültige Eingabe für Stadt.', 
 'invalid input for country' => 'Ungültige Eingabe für das Land', 
@@ -453,21 +446,22 @@
 'invalid input for organization' => 'Ungültige Eingabe für Organisation', 
 'invalid input for remote host/ip' => 'Ungültige Eingabe für Remote Host/IP', 
 'invalid input for state or province' => 'Ungültige Eingabe für Bundesstaat oder Provinz.', 
+'invalid input' => 'Ungültige Eingabe', 
 'invalid ip' => 'Ungültige IP-Adresse', 
 'invalid keep time' => 'Die Aufbewahrungszeit muss eine gültige Zahl sein', 
 'invalid key' => 'Ungültiger Schlüssel.', 
 'invalid loaded file' => 'Ungültige geladene Datei', 
 'invalid local-remote id' => 'Falls verwendet, dürfen leftid und rightid nicht gleich sein, und mit einem "@"-Zeichen beginnen. Dies sind leftid und rightid in der OpenSwan-Terminologie.', 
 'invalid logserver address' => 'Ungültige syslogd server Adresse', 
-'invalid max lease time' => 'Ungültige max. Haltezeit.', 
 'invalid maximum incoming size' => 'Ungültige max. ankommende Größe.', 
 'invalid maximum object size' => 'Ungültige max. Objektgröße.', 
 'invalid maximum outgoing size' => 'Ungültige max. abgehende Größe.', 
+'invalid max lease time' => 'Ungültige max. Haltezeit.', 
 'invalid md5sum' => 'Ungültige MD5-Summe.', 
 'invalid minimum object size' => 'Ungültige min. Objektgröße.', 
 'invalid netmask' => 'Ungültige Netzwerkmaske', 
-'invalid port' => 'Ungültiger Port. Bitte gültige Portnummer eingeben.', 
 'invalid port list' => 'Portlisten-Syntax lautet: port[,port]... wobei port in /etc/services vorkommt oder Nummer', 
+'invalid port' => 'Ungültiger Port. Bitte gültige Portnummer eingeben.', 
 'invalid primary dns' => 'Ungültiger primärer DNS.', 
 'invalid primary ntp' => 'Ungültiger primärer NTP.', 
 'invalid secondary dns' => 'Ungültiger sekundärer DNS.', 
@@ -480,23 +474,23 @@
 'invalid vpi vpci' => 'Ungültige VPI/VPCI-Einstellungen', 
 'invalid wins address' => 'Ungültige WINS Server Addresse.', 
 'invert' => 'Invertieren', 
-'ip address' => 'IP-Adresse', 
 'ip address in use' => 'IP-Adresse bereits vergeben', 
+'ip address' => 'IP-Adresse', 
 'ip address outside subnets' => 'IP-Adresse ausserhalb der(s) lokalen Subnetze(s)', 
 'ip alias added' => 'Externer IP-Alias hinzugefügt', 
 'ip alias changed' => 'Externer IP-Alias geändert', 
 'ip alias removed' => 'Externer IP-Alias entfernt', 
-'ip info' => 'IP-Information', 
-'ipcop has now rebooted' => 'IPCop ist jetzt neu gestartet.', 
-'ipcop has now shutdown' => 'IPCop ist jetzt heruntergefahren.', 
-'ipcop side' => 'IPCop Seite:', 
-'ipcop side is invalid' => 'IPCop Seite ist ungültig.', 
-'ipcops hostname' => 'IPCop\'s Hostname', 
+'ipfire has now rebooted' => 'IPFire ist jetzt neu gestartet.', 
+'ipfire has now shutdown' => 'IPFire ist jetzt heruntergefahren.', 
+'ipfires hostname' => 'IPFire\'s Hostname', 
+'ipfire side' => 'IPFire Seite:', 
+'ipfire side is invalid' => 'IPFire Seite ist ungültig.', 
 'ipinfo' => 'IP-Info', 
-'isdn' => 'ISDN', 
-'isdn settings' => 'Zusätzliche ISDN-Einstellungen:', 
+'ip info' => 'IP-Information', 
 'isdn1' => 'Einfaches ISDN', 
 'isdn2' => 'ISDN-Kanalbündelung', 
+'isdn' => 'ISDN', 
+'isdn settings' => 'Zusätzliche ISDN-Einstellungen:', 
 'january' => 'Januar', 
 'javascript menu error1' => 'Wenn die Drop-down-Menus nicht funktionieren, deaktivieren Sie Javascript auf der', 
 'javascript menu error2' => 'Seite.', 
@@ -505,27 +499,27 @@
 'kernel' => 'Kernel', 
 'kernel logging server' => 'Kernel-Protokollierungs-Server', 
 'kernel version' => 'Kernel-Version:', 
+'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:', 
 'lan' => 'LAN', 
-'languagepurpose' => 'Wählen Sie eine Sprache, in der IPCop angezeigt werden soll:', 
 'lease expires' => 'Zuordnung verfällt', 
 'legend' => 'Legende', 
 'line' => 'Leitung', 
 'loaded modules' => 'Geladene Module:', 
 'local ntp server specified but not enabled' => 'Lokaler NTP Server angegeben aber nicht aktiviert', 
-'local subnet' => 'Lokales Subnetz:', 
 'local subnet is invalid' => 'Lokales Subnet ist ungültig.', 
+'local subnet' => 'Lokales Subnetz:', 
 'local vpn hostname/ip' => 'Lokaler VPN Hostname/IP', 
-'log' => 'Protokoll:', 
 'log enabled' => 'Log aktiviert', 
+'logging server' => 'Protokollierungs-Server', 
+'loginlogout' => 'Login/Logout', 
 'log lines per page' => 'Zeilen pro Seite', 
+'log' => 'Protokoll:', 
 'log server address' => 'Syslog Server', 
 'log settings' => 'Logdatei-Einstellungen', 
 'log summaries' => 'Log Übersicht', 
 'log summary' => 'Log Zusammenfassung', 
 'log viewer' => 'Protokollansicht', 
 'log viewing options' => 'Log Ansichts-Optionen', 
-'logging server' => 'Protokollierungs-Server', 
-'loginlogout' => 'Login/Logout', 
 'lookup failed' => 'Reverse Lookup gescheitert', 
 'low' => 'Niedrig', 
 'ls_dhcpd' => 'DHCP-Server:', 
@@ -538,22 +532,22 @@
 'ls_pam_unix' => 'Lokale Benutzeranmeldungen:', 
 'ls_sshd' => 'Fern-Benutzeranmeldungen:', 
 'ls_syslogd' => 'Syslogd:', 
-'mac address' => 'MAC-Adresse', 
 'mac address in use' => 'MAC-Adresse bereits vergeben', 
+'mac address' => 'MAC-Adresse', 
 'main page' => 'Startseite', 
-'manual' => 'Manuell', 
 'manual control and status' => 'Manuelle Einstellung und Status:', 
 'manually' => 'Manuell', 
+'manual' => 'Manuell', 
 'march' => 'März', 
 'marked' => 'Markiert', 
+'maximal' => 'Maximal', 
+'maximum retries' => 'Maximale Wiederholversuche:', 
 'max incoming size' => 'Max. eingehende Größe (kB):', 
 'max lease time' => 'Max. Haltezeit in min:', 
 'max outgoing size' => 'Max. abgehende Größe (kB):', 
 'max renewal time' => 'Maximale Aktualisierungszeit', 
 'max retries not set' => 'Maximale Wiederholversuche nicht angegeben.', 
 'max size' => 'Max. Objektgröße (kB):', 
-'maximal' => 'Maximal', 
-'maximum retries' => 'Maximale Wiederholversuche:', 
 'may' => 'Mai', 
 'medium' => 'Mittel', 
 'memory' => 'Speicher:', 
@@ -563,8 +557,8 @@
 'minutes' => 'Minuten', 
 'missing dat' => 'Verschlüsseltes Archiv wurde nicht gefunden', 
 'missing gz' => 'Nichtverschlüsseltes Archiv wurde nicht gefunden', 
-'modem' => 'Modem', 
 'modem configuration' => 'Modem-Konfiguration', 
+'modem' => 'Modem', 
 'modem on com1' => 'Modem an COM1', 
 'modem on com2' => 'Modem an COM2', 
 'modem on com3' => 'Modem an COM3', 
@@ -577,29 +571,28 @@
 'month' => 'Monat', 
 'months' => 'Monate', 
 'mounted on' => 'Mounted auf', 
-'name' => 'Name', 
 'name is invalid' => 'Name ist ungültig', 
 'name must only contain characters' => 'Name darf nur Buchstaben enthalten.', 
+'name' => 'Name', 
 'name too long' => 'Der volle Benutzername oder der System Hostname ist zu lang', 
 'nat-traversal' => 'Nat Traversal:', 
+'netmask' => 'Netzwerkmaske', 
 'net' => 'Netz', 
 'net to net vpn' => 'Netz-zu-Netz Virtual Private Network', 
-'netmask' => 'Netzwerkmaske', 
-'network' => 'Netzwerk', 
 'network added' => 'Benutzerdefiniertes Netzwerk hinzugefügt', 
 'network configuration' => 'Netzwerk Konfiguration', 
+'network' => 'Netzwerk', 
 'network removed' => 'Benutzerdefiniertes Netzwerk entfernt', 
+'networks settings' => 'Firewall - Netzwerkeinstellungen', 
 'network status information' => 'Netzwerk-Statusinformationen', 
 'network time' => 'Benutze NTP-Server:', 
 'network time from' => 'Uhrzeit von einem Netzwerk Zeitserver ermitteln', 
 'network traffic graphs' => 'Diagramme zur Netzwerkauslastung', 
 'network updated' => 'Benutzerdefiniertes Netzwerk aktualisiert', 
-'networks settings' => 'Firewall - Netzwerkeinstellungen', 
-'new optionsfw later' => 'Ihre Modifikation(en) wird (werden) beim nächsten Neustart aktiv werden', 
-'new optionsfw must boot' => 'Sie müssen Ihren IPCop neu starten', 
 'newer' => 'Neuer', 
+'new optionsfw later' => 'Ihre Modifikation(en) wird (werden) beim nächsten Neustart aktiv werden', 
+'new optionsfw must boot' => 'Sie müssen Ihren IPFire neu starten', 
 'next address' => 'WIRD ENTFERNT', 
-'no' => 'Nein', 
 'no alcatelusb firmware' => 'Keine Alcatel USB ADSL-Firmware vorhanden. Bitte hochladen.', 
 'no cfg upload' => 'Keine Daten wurden hochgeladen', 
 'no dhcp lease' => 'Eine DHCP-Zuordnung konnte nicht empfangen werden', 
@@ -607,22 +600,23 @@
 'no fritzdsl driver' => 'Kein Fritz!DSL-Treiber vorhanden. Bitte hochladen.', 
 'no information available' => 'Keine Informationen verfügbar.', 
 'no modem selected' => 'Kein Modem ausgewählt', 
-'no set selected' => 'Es wurde kein Satz ausgewählt', 
-'no time limit' => 'unbregenzte Zeit', 
 'none found' => 'nichts gefunden', 
+'no' => 'Nein', 
 'nonetworkname' => 'Kein Netzwerkname wurde eingegeben', 
 'noservicename' => 'Kein Dienstname wurde eingegeben', 
+'no set selected' => 'Es wurde kein Satz ausgewählt', 
 'not a valid ca certificate' => 'Kein gültiges CA Zertifikat.', 
 'not enough disk space' => 'Nicht genügend Plattenplatz vorhanden', 
+'no time limit' => 'unbregenzte Zeit', 
 'not present' => '<B>Nicht</B> vorhanden', 
 'not running' => 'nicht gestartet', 
 'november' => 'November', 
 'ntp configuration' => 'NTP-Konfiguration', 
+'ntpd restarted' => 'ntpd neu gestartet', 
 'ntp must be enabled to have clients' => 'Um Clients annehmen zu können, muß NTP vorher aktiviert sein.', 
 'ntp server' => 'NTP-Server', 
 'ntp syncro disabled' => 'NTP-Synchronisierung deaktiviert', 
 'ntp syncro enabled' => 'NTP-Synchronisierung aktiviert', 
-'ntpd restarted' => 'ntpd neu gestartet', 
 'number' => 'Nummer:', 
 'october' => 'Oktober', 
 'older' => 'Älter', 
@@ -631,12 +625,12 @@
 'only digits allowed in max retries field' => 'Im Feld &quot;Maximale Wiederholversuche&quot; sind nur Ziffern erlaubt.', 
 'only digits allowed in the idle timeout' => 'Im Feld &quot;Leerlauf-Wartezeit&quot; sind nur Ziffern erlaubt.', 
 'only red' => 'Nur ROT', 
-'open to all' => 'Überschreibe externen Zugang zu ALL', 
 'openssl produced an error' => 'OpenSSL hat einen Fehler verursacht', 
-'options' => 'Optionen', 
+'open to all' => 'Überschreibe externen Zugang zu ALL', 
 'options fw' => 'Firewall Optionen', 
 'optionsfw portlist hint' => 'Die Liste der Ports muss durch ein Komma getrennt werden (z.B. 137,138). Sie können maximal bis zu 15 Ports pro Protokoll angeben.', 
 'optionsfw warning' => 'Verändern dieser Optionen bedingt einen Neustart der Firewall', 
+'options' => 'Optionen', 
 'orange' => 'ORANGE', 
 'organization cant be empty' => 'Organisation darf nicht leer sein.', 
 'organization name' => 'Name der Organisation', 
@@ -649,12 +643,12 @@
 'override mtu' => 'Überschreibe Standard MTU', 
 'package failed to install' => 'Programmpaket konnte nicht installiert werden.', 
 'pap or chap' => 'PAP oder CHAP', 
-'password' => 'Passwort:', 
 'password contains illegal characters' => 'Passwort enthält ungültige(s) Zeichen.', 
 'password not set' => 'Passwort nicht angegeben.', 
-'password too short' => 'Passwort ist zu kurz.', 
+'password' => 'Passwort:', 
 'passwords do not match' => 'Die Passwörter stimmen nicht überein.', 
 'passwords must be at least 6 characters in length' => 'Passwörter müssen mind. 6 Zeichen lang sein', 
+'password too short' => 'Passwort ist zu kurz.', 
 'percentage' => 'Prozent', 
 'persistent' => 'Dauerhaft', 
 'pfs yes no' => 'Perfect Forward Secrecy (PFS)', 
@@ -662,44 +656,45 @@
 'phonebook entry' => 'Telefonbuch-Eintrag:', 
 'ping disabled' => 'Ping Antwort deaktivieren', 
 'pkcs12 file password' => 'PKCS12 Datei-Passwort', 
-'port' => 'Port', 
 'port forwarding configuration' => 'Konfiguration der Port-Weiterleitung', 
+'port' => 'Port', 
 'ports' => 'Ports', 
 'pots' => 'Analoges Telefon', 
-'ppp setup' => 'PPP-Einstellungen', 
 'pppoe' => 'PPPoE', 
 'pppoe settings' => 'Zusätzliche PPPoE-Einstellungen:', 
+'ppp setup' => 'PPP-Einstellungen', 
 'pptp settings' => 'Zusätzliche PPTP-Einstellungen:', 
-'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz', 
 'present' => 'Vorhanden', 
+'pre-shared key is too short' => 'Pre-shared Schlüsel ist zu kurz', 
 'primary dns' => 'Primärer DNS:', 
 'primary ntp server' => 'Primärer NTP-Server', 
 'primary wins server address' => 'Primäre WINS-Server Adresse', 
 'priority' => 'Priorität', 
-'profile' => 'Profil', 
 'profile deleted' => 'Profil gelöscht: ', 
 'profile has errors' => 'Profil fehlerhaft', 
 'profile made current' => 'Profil ausgewählt: ', 
-'profile name' => 'Profilname:', 
 'profile name not given' => 'Profilname nicht angegeben.', 
+'profile name' => 'Profilname:', 
+'profile' => 'Profil', 
 'profile saved' => 'Profil gespeichert: ', 
 'profiles' => 'Profile:', 
-'proto' => 'Proto', 
 'protocol' => 'Protokoll', 
-'proxy' => 'Proxy', 
+'proto' => 'Proto', 
 'proxy access graphs' => 'Diagramme zur Proxyauslastung', 
-'proxy log viewer' => 'Ansicht Proxy-Log', 
 'proxy logs' => 'Proxy-Logdateien', 
+'proxy log viewer' => 'Ansicht Proxy-Log', 
 'proxy port' => 'Proxy-Port', 
+'proxy' => 'Proxy', 
 'psk' => 'PSK', 
-'pulse' => 'Puls', 
 'pulse dial' => 'Pulswahl:', 
+'pulse' => 'Puls', 
+'quick control' => 'Quick Control',
 'ram' => 'RAM-Speicher', 
 'read sectors' => 'Sektoren lesen', 
-'reboot' => 'Neustart', 
-'reboot schedule' => 'Zeitsteuerung für IPCop Neustarts', 
+'rebooting ipfire' => 'Starte IPFire neu', 
 'rebooting' => 'Starte neu ...', 
-'rebooting ipcop' => 'Starte IPCop neu', 
+'reboot' => 'Neustart', 
+'reboot schedule' => 'Zeitsteuerung für IPFire Neustarts', 
 'reconnection' => 'Wiederverbindung', 
 'references' => 'Referenzen', 
 'refresh' => 'Aktualisieren', 
@@ -712,30 +707,30 @@
 'remote access' => 'Fernwartung', 
 'remote host/ip' => 'Remote Host/IP', 
 'remote logging' => 'Remote logging', 
-'remote subnet' => 'Remote Subnetz:', 
 'remote subnet is invalid' => 'Remote Subnetz ist ungültig.', 
-'remove' => 'Löschen', 
+'remote subnet' => 'Remote Subnetz:', 
 'remove ca certificate' => 'CA-Zertifikat entfernen', 
-'reserved dst port' => 'Dieser Zielport ist für die ausschließliche Benutzung durch IPCop reserviert:', 
-'reserved src port' => 'Dieser Quellport ist für die ausschließliche Benutzung durch IPCop reserviert:', 
-'reset' => 'Zurücksetzen', 
+'remove' => 'Löschen', 
+'reserved dst port' => 'Dieser Zielport ist für die ausschließliche Benutzung durch IPFire reserviert:', 
+'reserved src port' => 'Dieser Quellport ist für die ausschließliche Benutzung durch IPFire reserviert:', 
 'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Das Zurücksetzen der VPN-Konfiguration wird die Root-CA, die Host-Zertifikate und alle weiteren Zertifikate und alle zertifikatsbasierten Verbindungen entfernen', 
+'reset' => 'Zurücksetzen', 
 'restart' => 'Neustart', 
-'restore' => 'Wiederherstellen', 
 'restore defaults' => 'Voreinstellungen wiederherstellen', 
 'restore hardware settings' => 'Hardware-Einstellungen wiederherstellen', 
+'restore' => 'Wiederherstellen', 
 'reverse sort' => 'In umgekehrter chronologischer Reihenfolge sortieren', 
 'root certificate' => 'Root-Zertifikat', 
 'root path' => 'Root-Pfad', 
 'router ip' => 'IP-Adresse des Routers:', 
 'routing table entries' => 'Einträge der Routing-Tabelle:', 
-'rsvd dst port overlap' => 'Dieser Zielportbereich überlappt mit einem Port, der für die ausschließliche Benutzung durch IPCop reserviert ist:', 
-'rsvd src port overlap' => 'Dieser Quellportbereich überlappt mit einem Port, der für die ausschließliche Benutzung durch IPCop reserviert ist:', 
+'rsvd dst port overlap' => 'Dieser Zielportbereich überlappt mit einem Port, der für die ausschließliche Benutzung durch IPFire reserviert ist:', 
+'rsvd src port overlap' => 'Dieser Quellportbereich überlappt mit einem Port, der für die ausschließliche Benutzung durch IPFire reserviert ist:', 
 'rules already up to date' => 'Regeln sind schon aktuell', 
 'running' => 'LÄUFT', 
 'saturday' => 'Samstag', 
-'save' => 'Speichern', 
 'save error' => 'Konfigurationsarchiv-Datei konnte nicht gespeichert werden', 
+'save' => 'Speichern', 
 'script name' => 'Skriptname:', 
 'secondary dns' => 'Sekundärer DNS:', 
 'secondary ntp server' => 'Sekundärer NTP-Server', 
@@ -748,50 +743,51 @@
 'select' => 'Auswählen', 
 'select dest net' => 'Auswahl Ziel-Netz', 
 'select source net' => 'Auswahl Quell-Netz', 
+'selecttraffic' => 'Wähle den Nutzungs Zeitraum:',
 'send cr' => 'ISP verlangt Zeilenrücklaufzeichen:', 
 'september' => 'September', 
 'serial' => 'serielle', 
-'service' => 'Dienst', 
 'service added' => 'Benutzerdefinierter Netzwerkdienst wurde hinzugefügt', 
+'service' => 'Dienst', 
+'servicename' => 'Dienstname', 
 'service name' => 'Name des Dienstes:', 
 'service removed' => 'Benutzerdefinierter Netzwerkdienst wurde entfernt', 
-'service updated' => 'Benutzerdefinierter Netzwerkdienst wurde aktualisiert', 
-'servicename' => 'Dienstname', 
 'services' => 'Dienste:', 
 'services settings' => 'Firewall - Diensteeinstellungen', 
-'set time now' => 'Stelle jetzt die Uhrzeit ein', 
+'service updated' => 'Benutzerdefinierter Netzwerkdienst wurde aktualisiert', 
 'set time now help' => 'Um ein Synchronisationsereignis zu jeder Zeit in die Warteschlange zu stellen, drücken Sie die <i>Stelle jetzt die Uhrzeit ein</i> Schaltfläche. Bitte beachten Sie, daß Sie 5 Minuten, oder länger, warten müssen, bevor ein Sync-Ergeinis eintritt.', 
+'set time now' => 'Stelle jetzt die Uhrzeit ein', 
 'settings' => 'Konfiguration', 
 'shaping add options' => 'Dienst hinzufügen', 
 'shaping list options' => 'Datenflußkontrolldienste', 
-'shared' => 'shared', 
 'shared memory' => 'Gemeins. Speicher', 
+'shared' => 'shared', 
 'show ca certificate' => 'CA Zertifikat anzeigen', 
 'show certificate' => 'Zertifikat anzeigen', 
 'show host certificate' => 'Host-Zertifikat anzeigen', 
 'show root certificate' => 'Root-Zertifikat anzeigen', 
-'shutdown' => 'Herunterfahren', 
-'shutdown control' => 'Herunterfahren', 
 'shutdown2' => 'Herunterfahren:', 
+'shutdown control' => 'Herunterfahren', 
+'shutdown' => 'Herunterfahren', 
 'shutting down' => 'Fahre herunter', 
-'shutting down ipcop' => 'Fahre IPCop herunter', 
+'shutting down ipfire' => 'Fahre IPFire herunter', 
 'size' => 'Größe', 
 'snort hits' => 'Gesamtanzahl der aktivierten Intrusion-Regeln für', 
 'sort ascending' => 'Sortiere aufsteigend', 
 'sort descending' => 'Sortiere absteigend', 
 'sound' => 'Klang', 
-'source' => 'Quelle', 
-'source ip' => 'Quell-IP-Adresse', 
 'source ip and port' => 'Quell-IP:Port', 
 'source ip bad' => 'Ungültige Quell-IP-Adresse.', 
 'source ip in use' => 'Benutzte Quell-IP:', 
 'source ip or net' => 'Quellen-IP oder Netz', 
+'source ip' => 'Quell-IP-Adresse', 
 'source net' => 'Quell-Netz', 
 'source network' => 'Quell-IP, oder Netzwerk (leer für "ALL"):', 
-'source port' => 'Quell-Port', 
 'source port in use' => 'Benutzter Quell-Port:', 
 'source port numbers' => 'Quell-Port muß ein(e) gültige(r) Port-Nummer oder Port-Bereich sein.', 
 'source port overlaps' => 'Quell-Port-Bereich überlappt mit einem bereits definierten Port-Bereich.', 
+'source port' => 'Quell-Port', 
+'source' => 'Quelle', 
 'speaker off' => 'Lautsprecher aus:', 
 'speaker on' => 'Lautsprecher ein:', 
 'squid extension methods' => 'Ihre <tt>extension_methods</tt> Liste', 
@@ -800,32 +796,33 @@
 'srcprt range overlaps' => 'Quell-Port-Bereich überlappt mit einem bereits definierten Port.', 
 'srcprt within existing' => 'Quell-Port befindet sich innnerhalb eines bereits definierten Port-Bereichs.', 
 'ssdmz pinholes' => 'DMZ-Schlupflöcher', 
+'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.', 
+'ssh1 support' => 'Unterstützung für Version 1 des SSH-Protokolls (wird nur für alte Clients benötigt)', 
 'ssh access' => 'SSH-Zugriff', 
 'ssh fingerprint' => 'Fingerabdruck', 
 'ssh host keys' => 'SSH Host Schlüssel', 
 'ssh is disabled' => 'Secure Shell ist deaktiviert.  Halte an.', 
 'ssh is enabled' => 'Secure Shell ist aktiviert.  Starte neu.', 
+'ssh keys' => 'Authentifizierung auf Basis öffentlicher Schlüssel zulassen', 
 'ssh key' => 'Schlüssel', 
 'ssh key size' => 'Länge (bits)', 
-'ssh keys' => 'Authentifizierung auf Basis öffentlicher Schlüssel zulassen', 
 'ssh no auth' => 'Sie haben keinerlei Authentifizierungverfahren zugelassen; dies wird Ihre Anmeldung verhindern', 
 'ssh passwords' => 'Passwortbasierte Authentifizierung zulassen', 
 'ssh portfw' => 'TCP-Weiterleitung zulassen', 
-'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.', 
-'ssh1 support' => 'Unterstützung für Version 1 des SSH-Protokolls (wird nur für alte Clients benötigt)', 
 'ssnetwork status' => 'Netzwerk-Status', 
 'sspasswords' => 'Passwörter', 
 'ssport forwarding' => 'Port-Weiterleitung', 
 'ssproxy graphs' => 'Proxy-Diagramme', 
 'sssystem status' => 'System-Status', 
 'sstraffic graphs' => 'Netzwerk-Diagramme', 
+'sstraffic' => 'Net-Traffic',
 'standard login script' => 'Standard-Anmeldeskript', 
 'start address' => 'Anfangsadresse:', 
 'state or province' => 'Bundesstat oder Provinz', 
 'static ip' => 'Statisch IP', 
-'status' => 'Status', 
 'status information' => 'Statusinformationen', 
+'status' => 'Status', 
 'stopped' => 'ANGEHALTEN', 
 'subject' => 'Betreff', 
 'subnet is invalid' => 'Netzmaske ist ungültig', 
@@ -838,35 +835,46 @@
 'system cpu' => 'System CPU', 
 'system cpu usage' => 'System CPU Nutzung', 
 'system graphs' => 'System-Diagramme', 
-'system log viewer' => 'Betrachter der System-Logdateien', 
 'system logs' => 'System-Logdateien', 
+'system log viewer' => 'Betrachter der System-Logdateien', 
 'system status information' => 'System-Statusinformationen', 
 'telephone not set' => 'Telefonnummer nicht angegeben.', 
 'the following update was successfully installed' => 'Das folgende Update wurde erfolgreich installiert', 
-'the statistics were last updated at' => 'Die Statistik wurde zuletzt aktualisiert am', 
-'there are updates' => 'Für Ihr System sind Updates verfügbar. Im Abschnitt &quot;Updates&quot; erhalten Sie weitere Informationen dazu.', 
 'there are updates available' => 'Für Ihr System sind Programm-Updates verfügbar. Es wird dringend empfohlen, daß Sie Ihr System baldmöglichst aktualisieren.', 
+'there are updates' => 'Für Ihr System sind Updates verfügbar. Im Abschnitt &quot;Updates&quot; erhalten Sie weitere Informationen dazu.', 
 'there was no file upload' => 'Es wurde keine Datei hochgeladen', 
+'the statistics were last updated at' => 'Die Statistik wurde zuletzt aktualisiert am', 
 'this feature has been sponsored by' => 'Diese Funktion wurde gesponsort von', 
 'this field may be blank' => 'Dieses Feld kann leer bleiben.', 
-'this is not a valid archive' => 'Dies ist kein gültiges Archiv.', 
 'this is not an authorised update' => 'Dies ist kein autorisiertes Update.', 
+'this is not a valid archive' => 'Dies ist kein gültiges Archiv.', 
 'this update is already installed' => 'Dieses Update wurde bereits installiert.', 
 'thursday' => 'Donnerstag', 
-'time' => 'Uhrzeit', 
 'time date manually reset' => 'Datum/Zeit wurden manuell zurückgesetzt.', 
-'time server' => 'Zeitserver', 
 'timeout must be a number' => 'Wartezeit muss eine Zahl sein.', 
+'time server' => 'Zeitserver', 
+'time' => 'Uhrzeit', 
 'title' => 'Titel', 
 'to' => 'Bis', 
-'to install an update' => 'Um ein Update zu installieren, laden Sie zuerst die folgende .tgz.gpg Datei hoch:', 
 'toggle enable disable' => 'Aktivieren oder Deaktivieren', 
-'tone' => 'Ton', 
+'to install an update' => 'Um ein Update zu installieren, laden Sie zuerst die folgende .tgz.gpg Datei hoch:', 
 'tone dial' => 'Tonwahl:', 
+'tone' => 'Ton', 
 'total hits for log section' => 'Gesamte Treffer für Log Sektion', 
+'trafficblue' => 'WLAN',
+'trafficdate' => 'Datum',
+'trafficfrom' => 'Von',
+'trafficgreen' => 'Internes Netz',
+'trafficin' => 'Input',
 'traffic on' => 'Verkehr auf', 
-'traffic shaping' => 'Traffic Shaping', 
+'trafficorange' => 'DMZ',
+'trafficout' => 'Output',
+'trafficred' => 'Internet',
 'traffic shaping settings' => 'Einstellungen der Datenflußkontrolle', 
+'traffic shaping' => 'Traffic Shaping', 
+'traffics' => 'Nutzungs-überblick:',
+'trafficsum' => 'Gesamt',
+'trafficto' => 'Bis',
 'transfer limits' => 'Transferbeschränkungen', 
 'transparent on' => 'Transparent auf', 
 'tuesday' => 'Dienstag', 
@@ -877,19 +885,19 @@
 'unknown' => 'Unbekannt', 
 'unnamed' => 'Unbenannt', 
 'update' => 'Aktualisieren', 
-'update time' => 'Aktualisiere die Uhrzeit:', 
-'update transcript' => 'Aktualisieren', 
-'updates' => 'Updates', 
 'updates installed' => 'Updates wurden installiert', 
 'updates is old1' => 'Ihre Update-Datei ist ', 
 'updates is old2' => 'Tage alt. Wir empfehlen Ihnen, Ihr System über die &quot;Updates&quot;-Seite zu aktualisieren.', 
+'updates' => 'Updates', 
+'update time' => 'Aktualisiere die Uhrzeit:', 
+'update transcript' => 'Aktualisieren', 
 'uplink speed' => 'Uplink-Geschwindigkeit (kBit/sek)', 
-'upload' => 'Hochladen', 
 'upload a certificate' => 'Ein Zertifikat hochladen:', 
 'upload a certificate request' => 'Eine Zertifikatsanfrage hochladen:', 
 'upload ca certificate' => 'CA Zertifikat hochladen', 
 'upload fcdsl.o' => 'Fcdsl.o hochladen', 
 'upload file' => 'Datei zum hochladen', 
+'upload' => 'Hochladen', 
 'upload p12 file' => 'PKCS12 Datei hochladen', 
 'upload successful' => 'Erfolgreich hochgeladen.', 
 'upload synch.bin' => 'Synch.bin hochladen', 
@@ -902,15 +910,15 @@
 'usb modem on acm1' => 'USB Modem an ACM1', 
 'usb modem on acm2' => 'USB Modem an ACM2', 
 'usb modem on acm3' => 'USB Modem an ACM3', 
-'use' => 'Einsatz', 
 'use a pre-shared key' => 'Verwenden Sie einen Pre-Shared Schlüssel:', 
-'use dov' => 'DOV (Data Over Voice) benutzen:', 
-'use ibod' => 'Bandwidth on Demand (iBOD) benutzen:', 
-'use ipcop red ip' => 'Die klassische ROTE IP, welche von IPCop während der Verbindung verwendet wird', 
-'use only proposed settings' => 'Verwenden Sie nur die vorgeschlagenen Einstellungen.', 
 'used' => 'Benutzt', 
 'used memory' => 'Genutzter Speicher', 
+'use dov' => 'DOV (Data Over Voice) benutzen:', 
 'used swap' => 'Genutzter Swap', 
+'use' => 'Einsatz', 
+'use ibod' => 'Bandwidth on Demand (iBOD) benutzen:', 
+'use ipfire red ip' => 'Die klassische ROTE IP, welche von IPFire während der Verbindung verwendet wird', 
+'use only proposed settings' => 'Verwenden Sie nur die vorgeschlagenen Einstellungen.', 
 'user cpu' => 'Benutzer CPU', 
 'user cpu usage' => 'Benutzer CPU', 
 'username' => 'Benutzername:', 
@@ -922,27 +930,27 @@
 'vci number' => 'VCI-Nummer:', 
 'virtual private networking' => 'Virtuelles Privates Netzwerk', 
 'vpi number' => 'VPI-Nummer:', 
-'vpn' => 'VPN', 
 'vpn configuration main' => 'VPN-Konfiguration - Übersicht', 
-'vpn delayed start' => 'Verzögerung bevor VPN gestartet wird (Sekunden)', 
 'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic DNS Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.', 
+'vpn delayed start' => 'Verzögerung bevor VPN gestartet wird (Sekunden)', 
 'vpn mtu invalid' => 'MTU muß ein numerischer Wert sein!', 
 'vpn on blue' => 'VPN auf BLAU', 
+'vpn' => 'VPN', 
 'waiting to synchronize clock' => 'Bitte warten, die Uhr wird synchronisiert', 
 'warning messages' => 'Warnhinweise', 
 'web hits' => 'Gesamtanzahl der Websites zum ausgewählten Kriterium', 
-'web proxy' => 'Web-Proxy', 
 'web proxy configuration' => 'Webproxy-Konfiguration', 
+'web proxy' => 'Web-Proxy', 
 'web server' => 'Web-Server', 
 'website' => 'Website', 
 'wednesday' => 'Mittwoch', 
-'week' => 'Woche', 
 'weeks' => 'Wochen', 
+'week' => 'Woche', 
 'wildcards' => 'Wildcards', 
-'wireless' => 'Wireless', 
 'wireless config added' => 'Wireless Konfiguration hinzugefügt', 
 'wireless config changed' => 'Wireless Konfiguration geändert', 
 'wireless configuration' => 'Wireless-Konfiguration', 
+'wireless' => 'Wireless', 
 'written sectors' => 'Sektoren schr.', 
 'xtaccess all error' => 'Sie können einen externen Zugang nicht auf \'ALL\' setzen - dies erfolgt in den Port-Weiterleitungsregeln.', 
 'year' => 'Jahr', 
@@ -950,22 +958,6 @@
 'you can only define one roadwarrior connection when using pre-shared key authentication' => 'Sie können nur eine Roadwarrior Verbindung definieren, wenn die Pre-shared Schlüsselauthentifizierung verwendet wird.<br/>Entweder haben Sie bereits eine Roadwarrior Verbindung mit Pre-shared Schlüsselauthentifizierung, oder Sie versuchen gerade eine hinzuzufügen.', 
 'your department' => 'Ihre Abteilung', 
 'your e-mail' => 'Ihre E-mail Adresse', 
-'dial profile' => 'Verbinden mit Profil',
-'quick control' => 'Quick Control',
-'allmsg' => 'zeige alles',
-'selecttraffic' => 'Wähle den Nutzungs Zeitraum:',
-'sstraffic' => 'Net-Traffic',
-'trafficblue' => 'WLAN',
-'trafficdate' => 'Datum',
-'trafficfrom' => 'Von',
-'trafficgreen' => 'Internes Netz',
-'trafficin' => 'Input',
-'trafficorange' => 'DMZ',
-'trafficout' => 'Output',
-'trafficred' => 'Internet',
-'traffics' => 'Nutzungs-überblick:',
-'trafficsum' => 'Gesamt',
-'trafficto' => 'Bis',
 
 ); 
- 
\ No newline at end of file
+
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 966b6fb2f9..68c1fad3e7 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,19 +1,19 @@
 # English (en) Data File 
 #
-# This file is part of the IPCop Firewall.
+# This file is part of the IPFire Firewall.
 # 
-# IPCop is free software; you can redistribute it and/or modify
+# IPFire is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 # 
-# IPCop is distributed in the hope that it will be useful,
+# IPFire is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
-# along with IPCop; if not, write to the Free Software
+# along with IPFire; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 # 
 # (c) The SmoothWall Team
@@ -44,7 +44,7 @@
 'adsl settings' => 'ADSL settings', 
 'advanced' => 'Advanced', 
 'again' => 'Again:', 
-'alcatelusb help' => 'To utilise the Speedtouch 330 or Speedtouch USB modem you must upload the firmware to your IPCop box. Please download the <b>Embedded Firmware</b> package for SpeedTouch 330 from speedtouch.com, unzip and then upload the appropriate file for your modem : KQD6_3.xxx when Rev<4 or ZZZL_3.xxx for Rev=4 using the form below.', 
+'alcatelusb help' => 'To utilise the Speedtouch 330 or Speedtouch USB modem you must upload the firmware to your IPFire box. Please download the <b>Embedded Firmware</b> package for SpeedTouch 330 from speedtouch.com, unzip and then upload the appropriate file for your modem : KQD6_3.xxx when Rev<4 or ZZZL_3.xxx for Rev=4 using the form below.', 
 'alcatelusb upload' => 'Upload Speedtouch USB Firmware', 
 'alias ip' => 'Alias IP', 
 'aliases' => 'Aliases', 
@@ -71,7 +71,7 @@
 'automatic' => 'Automatic', 
 'available updates' => 'Available updates:', 
 'average' => 'Average', 
-'avoid dod' => 'Do not use this option with Dial on Demand! Mainly used if your IPCop is behind a router. Your RED IP must be inside one of the three reserved network numbers e.g. 10/8, 172.16/12, 192.168/16', 
+'avoid dod' => 'Do not use this option with Dial on Demand! Mainly used if your IPFire is behind a router. Your RED IP must be inside one of the three reserved network numbers e.g. 10/8, 172.16/12, 192.168/16', 
 'back' => 'BACK', 
 'backup' => 'Backup', 
 'backup config floppy' => 'Backup Configuration - Floppy Disk', 
@@ -85,7 +85,7 @@
 'bad ignore filter' => 'Bad ignore filter:', 
 'bad return code' => 'Helper program returned error code', 
 'bad source range' => 'The Source port range has a first value that is greater than or equal to the second value.', 
-'beep when ppp connects or disconnects' => 'Beep when IPCop connects or disconnects', 
+'beep when ppp connects or disconnects' => 'Beep when IPFire connects or disconnects', 
 'behind a proxy' => 'Behind a proxy:', 
 'bewan adsl pci st' => 'TO BE REMOVED', 
 'bewan adsl usb' => 'TO BE REMOVED', 
@@ -137,7 +137,7 @@
 'computer to modem rate' => 'Computer to modem rate:', 
 'concentrator name' => 'Concentrator name:', 
 'confirmation' => 'confirmation', 
-'connect on ipcop restart' => 'Connect on IPCop restart:', 
+'connect on ipfire restart' => 'Connect on IPFire restart:', 
 'connect the modem' => 'Connect the modem', 
 'connect timeout' => 'Connect timeout:', 
 'connected' => 'Connected', 
@@ -152,7 +152,7 @@
 'connections are associated with this ca.  deleting the ca will delete these connections as well.' => 'connections are associated with this CA.  Deleting the CA will delete these connections as well.', 
 'could not be opened' => 'could not be opened', 
 'could not connect to' => 'Could not connect to', 
-'could not connect to www ipcop org' => 'Could not connect to www.ipcop.org', 
+'could not connect to www ipfire org' => 'Could not connect to www.ipfire.org', 
 'could not create directory' => 'Could not create directory.', 
 'could not download latest patch list' => 'Could not download latest patch list (not connected).', 
 'could not download latest updates' => 'Could not download latest updates.', 
@@ -275,11 +275,11 @@
 'duplicate ip bold' => 'Duplicate addresses are in <b>bold</b>', 
 'duplicate mac' => 'Duplicate MAC address entered', 
 'duplicate name' => 'That name is already being used, please choose another.', 
-'dyn dns source choice' => 'Dynamic DNS provider(s) will receive an IP address for this IPCop from:', 
+'dyn dns source choice' => 'Dynamic DNS provider(s) will receive an IP address for this IPFire from:', 
 'dynamic dns' => 'Dynamic DNS', 
 'dynamic dns client' => 'Dynamic DNS Client', 
 'e-mail address too long' => 'E-mail address is too long; it should not be longer than 40 characters.', 
-'eciadsl help' => 'To utilise the ECI ADSL modem you must upload a synch.bin file to your IPCop box. Please download the file from the ECIADSL website and then upload the file <b>synch.bin</b> using the form below.', 
+'eciadsl help' => 'To utilise the ECI ADSL modem you must upload a synch.bin file to your IPFire box. Please download the file from the ECIADSL website and then upload the file <b>synch.bin</b> using the form below.', 
 'eciadsl upload' => 'Upload ECI ADSL Synch.bin File', 
 'edit' => 'Edit', 
 'edit a rule' => 'Edit an existing rule:', 
@@ -349,7 +349,7 @@
 'free memory' => 'Free Memory', 
 'free swap' => 'Free Swap', 
 'friday' => 'Friday', 
-'fritzdsl help' => 'To utilise one of Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, you must upload a package to your IPCop box. Please download the tarball corresponding to your version from the IPCop Website and then upload the entire <b>fcdsl-(your_version).tgz</b> using the form below.', 
+'fritzdsl help' => 'To utilise one of Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, you must upload a package to your IPFire box. Please download the tarball corresponding to your version from the IPFire Website and then upload the entire <b>fcdsl-(your_version).tgz</b> using the form below.', 
 'fritzdsl upload' => 'Upload Fritz!DSL Driver', 
 'from' => 'From', 
 'g.dtm' => 'TO BE REMOVED', 
@@ -411,7 +411,7 @@
 'incoming traffic in bytes per second' => 'Incoming Traffic in Bytes per Second', 
 'info' => 'Info', 
 'init string' => 'Init:', 
-'insert floppy' => 'To backup to floppy, insert a formatted floppy into the drive on IPCop and click <i>Backup to floppy</i> to backup the system configuration. Please examine the results carefully to make sure the backup completed successfully. This can take a while to complete, so please be patient.<p>', 
+'insert floppy' => 'To backup to floppy, insert a formatted floppy into the drive on IPFire and click <i>Backup to floppy</i> to backup the system configuration. Please examine the results carefully to make sure the backup completed successfully. This can take a while to complete, so please be patient.<p>', 
 'install new update' => 'Install new update:', 
 'installed' => 'Installed', 
 'installed updates' => 'Installed updates:', 
@@ -480,11 +480,11 @@
 'ip alias changed' => 'External IP alias changed', 
 'ip alias removed' => 'External IP alias removed', 
 'ip info' => 'IP Information', 
-'ipcop has now rebooted' => 'IPCop has now rebooted.', 
-'ipcop has now shutdown' => 'IPCop has now shutdown.', 
-'ipcop side' => 'IPCop side:', 
-'ipcop side is invalid' => 'IPCop Side is invalid.', 
-'ipcops hostname' => 'IPCop\'s Hostname', 
+'ipfire has now rebooted' => 'IPFire has now rebooted.', 
+'ipfire has now shutdown' => 'IPFire has now shutdown.', 
+'ipfire side' => 'IPFire side:', 
+'ipfire side is invalid' => 'IPFire Side is invalid.', 
+'ipfires hostname' => 'IPFire\'s Hostname', 
 'ipinfo' => 'IP info', 
 'isdn' => 'ISDN', 
 'isdn settings' => 'Additional ISDN settings:', 
@@ -499,7 +499,7 @@
 'kernel logging server' => 'Kernel logging server', 
 'kernel version' => 'Kernel version:', 
 'lan' => 'LAN', 
-'languagepurpose' => 'Select the language you wish IPCop to display in:', 
+'languagepurpose' => 'Select the language you wish IPFire to display in:', 
 'lease expires' => 'Lease expires', 
 'legend' => 'Legend', 
 'line' => 'Line', 
@@ -589,7 +589,7 @@
 'network updated' => 'Custom Network updated', 
 'networks settings' => 'Firewall - Network settings', 
 'new optionsfw later' => 'Your modification(s) will be active on next restart', 
-'new optionsfw must boot' => 'You must reboot your IPCop', 
+'new optionsfw must boot' => 'You must reboot your IPFire', 
 'newer' => 'Newer', 
 'no' => 'No', 
 'no alcatelusb firmware' => 'No Alcatel USB firmware. Please upload.', 
@@ -688,9 +688,9 @@
 'ram' => 'RAM', 
 'read sectors' => 'Read Sectors', 
 'reboot' => 'Reboot', 
-'reboot schedule' => 'Schedule IPCop reboots', 
+'reboot schedule' => 'Schedule IPFire reboots', 
 'rebooting' => 'Rebooting', 
-'rebooting ipcop' => 'Rebooting IPCop', 
+'rebooting ipfire' => 'Rebooting IPFire', 
 'reconnection' => 'Reconnection', 
 'references' => 'References', 
 'refresh' => 'Refresh', 
@@ -707,8 +707,8 @@
 'remote subnet is invalid' => 'Remote subnet is invalid.', 
 'remove' => 'Remove', 
 'remove ca certificate' => 'Remove CA Certificate', 
-'reserved dst port' => 'Destination port is reserved for IPCop use only:', 
-'reserved src port' => 'Source port is reserved for IPCop use only:', 
+'reserved dst port' => 'Destination port is reserved for IPFire use only:', 
+'reserved src port' => 'Source port is reserved for IPFire use only:', 
 'reset' => 'Reset', 
 'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Resetting the VPN configuration will remove the root CA, the host certificate and all certificate based connections', 
 'restart' => 'Restart', 
@@ -719,8 +719,8 @@
 'root certificate' => 'Root Certificate', 
 'router ip' => 'Router IP Address:', 
 'routing table entries' => 'Routing Table Entries:', 
-'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPCop:', 
-'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPCop:', 
+'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPFire:', 
+'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:', 
 'rules already up to date' => 'Rules already up to date', 
 'running' => 'RUNNING', 
 'saturday' => 'Saturday', 
@@ -764,7 +764,7 @@
 'shutdown control' => 'Shutdown control', 
 'shutdown2' => 'Shutdown:', 
 'shutting down' => 'Shutting down', 
-'shutting down ipcop' => 'Shutting down IPCop', 
+'shutting down ipfire' => 'Shutting down IPFire', 
 'size' => 'Size', 
 'snort hits' => 'Total of number of Intrusion rules activated for', 
 'sort ascending' => 'Sort Ascending', 
@@ -894,7 +894,7 @@
 'use a pre-shared key' => 'Use a Pre-Shared Key:', 
 'use dov' => 'Use DOV (Data Over Voice):', 
 'use ibod' => 'Use Bandwidth on Demand (iBOD):', 
-'use ipcop red ip' => 'The classical RED IP used by IPCop during connection', 
+'use ipfire red ip' => 'The classical RED IP used by IPFire during connection', 
 'use only proposed settings' => 'Use only proposed settings.', 
 'used' => 'Used', 
 'used memory' => 'Used Memory', 
@@ -947,16 +947,16 @@
 'backup erase key'    => 'Erase key',
 'backup missing key'  => 'Need the backup key to restore a set',
 'backup export key'   => 'Export key',
-'backup explain key'  => 'Backup are encrypted using a key. To avoid illegal backup manipulations, IPCop only restores a backup that is encrypted with the key you will specify here. You have three options available to you',
-'backup explain key li1'  => 'let IPCop create key for you.',
+'backup explain key'  => 'Backup are encrypted using a key. To avoid illegal backup manipulations, IPFire only restores a backup that is encrypted with the key you will specify here. You have three options available to you',
+'backup explain key li1'  => 'let IPFire create key for you.',
 'backup explain key li2'  => 'import a saved key (possibly password protected).',
 'backup explain key li3'  => 'extract a key from a non-encrypted 1.4.10 backup only.' ,
-'backup explain key no1'  => 'you should save this key if you plan to restore new machines, IPCop accepts only once key creation/import.' , 
+'backup explain key no1'  => 'you should save this key if you plan to restore new machines, IPFire accepts only once key creation/import.' , 
 'backup explain key no2'  => 'legacy floppy backups are not concerned with this key.',
 'backup protect key password' => 'Backup key password',
 'backup import dat file' => 'Import a backup (.dat) file',
-'backup key info' => 'IPcop restricts access to the backup key, thus you must know root password. You have possibility to protect this key outside of IPCop with a password.',
-'backup media info'   => 'Floppy and/or unformatted media may display stranges partitions sizes. In this case, select the whole device. Remenber to mount harddisk before removing device. Note: floppy created here are not usable with IPCop installer program!',
+'backup key info' => 'IPFire restricts access to the backup key, thus you must know root password. You have possibility to protect this key outside of IPFire with a password.',
+'backup media info'   => 'Floppy and/or unformatted media may display stranges partitions sizes. In this case, select the whole device. Remenber to mount harddisk before removing device. Note: floppy created here are not usable with IPFire installer program!',
 'notes'   => 'Notes',
 'current media' => 'Current media', 
 'choose media'        => 'Choose media',
@@ -972,7 +972,7 @@
 'override mtu' => 'Override default MTU',
 'vpn mtu invalid' => 'MTU must be a numeric value!',
 'squid extension methods'=>'Your <tt>extension_methods</tt> list',
-'squid extension methods invalid' => 'Your \'extension_methods\' list can only contain uppercase words of letters and digits, separated with a space. '
+'squid extension methods invalid' => 'Your \'extension_methods\' list can only contain uppercase words of letters and digits, separated with a space. ',
 'dial profile' => 'Connect with Profile',
 'quick control' => 'Quick Control',
 'allmsg' => 'show all',
diff --git a/lfs/l7-protocols b/lfs/l7-protocols
new file mode 100644
index 0000000000..2474845a52
--- /dev/null
+++ b/lfs/l7-protocols
@@ -0,0 +1,80 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop is free software; you can redistribute it and/or modify               #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation; either version 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop is distributed in the hope that it will be useful,                    #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2006-05-29
+
+THISAPP    = l7-protocols-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 4c0173dcce3d9c4ee716e39eeecb5b42
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+#dist: 
+#	make-packages.sh l7-protocols $(THISAPP)-ipfire-beta-1
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	mkdir -p /etc/l7-protocols && cp -Rfv $(DIR_APP)/* /etc/l7-protocols
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
\ No newline at end of file
diff --git a/lfs/pakfire b/lfs/pakfire
index 8ecdb55a46..ff0077b72f 100644
--- a/lfs/pakfire
+++ b/lfs/pakfire
@@ -54,7 +54,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd /opt && mkdir -p /opt/confire/paks
 	cd /opt/confire && cp -fRv $(DIR_SRC)/src/confire/* .
 	cd /opt/confire && chown root.root /opt/confire -R && chmod 755 confire /opt/confire/paks -R
-	# cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
-	# cd $(DIR_APP) && find /opt/confire -name .svn -exec rm -rf {} \;
+	-cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \;
+	-cd $(DIR_APP) && find /opt/confire -name .svn -exec rm -rf {} \;
 	@$(POSTBUILD)
 
diff --git a/lfs/xampp b/lfs/xampp
index fd39e8c7ab..8d625867fe 100644
--- a/lfs/xampp
+++ b/lfs/xampp
@@ -26,7 +26,7 @@
 
 include Config
 
-VER        = 1.5.1
+VER        = 1.5.3
 
 THISAPP    = xampp-linux-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -39,7 +39,7 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 
 objects = $(DL_FILE) \
-	xampp-linux-devel-1.5.1.tar.gz \
+	xampp-linux-devel-$(VER).tar.gz \
 	PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz \
 	Python-AddOn-1.3.tar.gz
 
@@ -48,8 +48,8 @@ xampp-linux-devel-$(VER).tar.gz 	= $(URL_IPFIRE)/xampp-linux-devel-$(VER).tar.gz
 PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz = $(URL_IPFIRE)/PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz
 Python-AddOn-1.3.tar.gz = $(URL_IPFIRE)/Python-AddOn-1.3.tar.gz
 
-$(DL_FILE)_MD5 = baefcf7ac3629a641c7b75c547564a3f
-xampp-linux-devel-$(VER).tar.gz_MD5 = e4ab1c867551a831ae6af38fa3c4dfd9
+$(DL_FILE)_MD5 = 649c1fdc76435e3d5315e1ad86f9bace
+xampp-linux-devel-$(VER).tar.gz_MD5 = fbdc87b3c1d6ee123173d08310baca7a
 PostGreSQL-AddOn-1.0-pgsql8.1.tar.gz_MD5 = 63171afe553fd557032407e1ba6af477
 Python-AddOn-1.3.tar.gz_MD5 = 5a962ea63c3e502227c8cca30e0ce786
 
diff --git a/make.sh b/make.sh
index 0d87dc9bf6..803baeee5e 100644
--- a/make.sh
+++ b/make.sh
@@ -335,6 +335,7 @@ ipcopmake() {
 
 ipfiredist() {
 	if [ -f $BASEDIR/build/usr/src/lfs/$1 ]; then
+	  if [ "`ls -w1 $BASEDIR/packages/ | grep $1; echo $?`" -ne "0" ]; then
 		echo "`date -u '+%b %e %T'`: Packaging $1" | tee -a $LOGFILE
 		cp -f $BASEDIR/src/scripts/make-packages.sh $BASEDIR/build/usr/local/bin
 		chroot $LFS /tools/bin/env -i 	HOME=/root \
@@ -352,11 +353,12 @@ ipfiredist() {
 		if [ $? -ne 0 ]; then
 			exiterror "Packaging $1"
 		fi
+	  else
+		echo "`date -u '+%b %e %T'`: Package $1 already exists" | tee -a $LOGFILE
+	  fi		
 	else
 		exiterror "No such file or directory: $BASEDIR/build/usr/src/lfs/$1"
 	fi
-#	test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-#	mv -f $BASEDIR/build/paks/* $BASEDIR/packages/
 	return 0
 }
 
@@ -602,6 +604,7 @@ buildipcop() {
   ipcopmake iproute2
   ipcopmake iptstate
   ipcopmake iputils
+  ipcopmake l7-protocols
   ipcopmake isapnptools
   ipcopmake isdn4k-utils
   ipcopmake kudzu
@@ -806,6 +809,27 @@ buildpackages() {
   ipcopmake cdrom
   cp $LFS/install/images/{*.iso,*.tgz} $BASEDIR >> $LOGFILE 2>&1
 
+  ipfiredist applejuice
+  ipfiredist asterisk
+  ipfiredist cyrusimap
+  ipfiredist fetchmail
+  ipfiredist gnump3d
+  ipfiredist lame
+  ipfiredist libtiff
+  ipfiredist libxml2
+  ipfiredist mc
+  ipfiredist postfix
+  ipfiredist pwlib
+  ipfiredist sane
+  ipfiredist spandsp
+  ipfiredist sudo
+  ipfiredist xampp
+  ipfiredist xinetd
+  test -d $BASEDIR/packages || mkdir $BASEDIR/packages
+  mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
+  rm -rf $LFS/paks
+  rm -rf $BASEDIR/build/tmp/*
+
   # Cleanup
   stdumount
   rm -rf $BASEDIR/build/tmp/*
@@ -1057,6 +1081,10 @@ gettoolchain)
 		fi
 	fi
 	;;
+paks)
+	prepareenv
+	buildpackages
+	;;
 update)
 	echo "Load the latest source-files:"
 	svn update
@@ -1064,11 +1092,10 @@ update)
 commit)
 	echo "Upload the changed files:"
 	svn commit
-	svn up > /dev/null
 	;;
 make)
 	echo "Do a complete compile:"	
-	./make.sh prefetch && ./make.sh gettoolchain && ./make.sh build && ./make.sh paks
+	./make.sh prefetch && ./make.sh gettoolchain && ./make.sh build
 	;;
 diff)
 	echo -ne "Make a local diff to last SVN revision: "
@@ -1100,30 +1127,6 @@ sync)
 	done
 	rm -f ftplist
 	;;
-paks)
-	# Build IPFire packages
-	prepareenv
-	ipfiredist applejuice
-	ipfiredist asterisk
-	ipfiredist cyrusimap
-	ipfiredist fetchmail
-	ipfiredist gnump3d
-	ipfiredist lame
-	ipfiredist libtiff
-	ipfiredist libxml2
-	ipfiredist mc
-	ipfiredist postfix
-	ipfiredist pwlib
-	ipfiredist sane
-	ipfiredist spandsp
-	ipfiredist sudo
-	ipfiredist xampp
-	ipfiredist xinetd
-	test -d $BASEDIR/packages || mkdir $BASEDIR/packages
-	mv -f $LFS/paks/*.tar.gz $LFS/paks/*.md5 $BASEDIR/packages >> $LOGFILE 2>&1
-	rm -rf $LFS/paks
-	rm -rf $BASEDIR/build/tmp/*
-	;;
 *)
 	echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|shell|sync|toolchain|update}"
 	cat doc/make.sh-usage
diff --git a/src/ROOTFILES.i386 b/src/ROOTFILES.i386
index 2e1468fbf7..00b9a66adb 100644
--- a/src/ROOTFILES.i386
+++ b/src/ROOTFILES.i386
@@ -20994,6 +20994,7 @@ home/httpd/cgi-bin/hosts.cgi
 home/httpd/cgi-bin/ids.cgi
 home/httpd/cgi-bin/index.cgi
 home/httpd/cgi-bin/ipinfo.cgi
+home/httpd/cgi-bin/fwhits.cgi
 #home/httpd/cgi-bin/logs.cgi
 home/httpd/cgi-bin/logs.cgi/config.dat
 home/httpd/cgi-bin/logs.cgi/firewalllog.dat
@@ -26667,4 +26668,246 @@ usr/share/screen/utf8encodings/c7
 usr/share/screen/utf8encodings/c8
 usr/share/screen/utf8encodings/cc
 usr/share/screen/utf8encodings/cd
-usr/share/screen/utf8encodings/d6
\ No newline at end of file
+usr/share/screen/utf8encodings/d6
+##
+## l7-protocols-2006-05-29
+##
+etc/l7-protocols
+etc/l7-protocols/CHANGELOG
+etc/l7-protocols/HOWTO
+etc/l7-protocols/LICENSE
+etc/l7-protocols/Makefile
+etc/l7-protocols/README
+etc/l7-protocols/WANTED
+etc/l7-protocols/extra
+etc/l7-protocols/extra/README
+etc/l7-protocols/extra/audiogalaxy.pat
+etc/l7-protocols/extra/http-dap.pat
+etc/l7-protocols/extra/http-freshdownload.pat
+etc/l7-protocols/extra/http-itunes.pat
+etc/l7-protocols/extra/httpaudio.pat
+etc/l7-protocols/extra/httpcachehit.pat
+etc/l7-protocols/extra/httpcachemiss.pat
+etc/l7-protocols/extra/httpvideo.pat
+etc/l7-protocols/extra/pressplay.pat
+etc/l7-protocols/extra/quicktime.pat
+etc/l7-protocols/extra/snmp-mon.pat
+etc/l7-protocols/extra/snmp-trap.pat
+etc/l7-protocols/file_types
+etc/l7-protocols/file_types/README
+etc/l7-protocols/file_types/exe.pat
+etc/l7-protocols/file_types/flash.pat
+etc/l7-protocols/file_types/gif.pat
+etc/l7-protocols/file_types/html.pat
+etc/l7-protocols/file_types/jpeg.pat
+etc/l7-protocols/file_types/ogg.pat
+etc/l7-protocols/file_types/pdf.pat
+etc/l7-protocols/file_types/perl.pat
+etc/l7-protocols/file_types/postscript.pat
+etc/l7-protocols/file_types/rar.pat
+etc/l7-protocols/file_types/rpm.pat
+etc/l7-protocols/file_types/rtf.pat
+etc/l7-protocols/file_types/tar.pat
+etc/l7-protocols/file_types/zip.pat
+etc/l7-protocols/groups.sh
+etc/l7-protocols/l7-protocols.spec
+etc/l7-protocols/malware
+etc/l7-protocols/malware/README
+etc/l7-protocols/malware/code_red.pat
+etc/l7-protocols/malware/nimda.pat
+etc/l7-protocols/protocols
+etc/l7-protocols/protocols/100bao.pat
+etc/l7-protocols/protocols/aim.pat
+etc/l7-protocols/protocols/aimwebcontent.pat
+etc/l7-protocols/protocols/applejuice.pat
+etc/l7-protocols/protocols/ares.pat
+etc/l7-protocols/protocols/battlefield1942.pat
+etc/l7-protocols/protocols/battlefield2.pat
+etc/l7-protocols/protocols/bgp.pat
+etc/l7-protocols/protocols/biff.pat
+etc/l7-protocols/protocols/bittorrent.pat
+etc/l7-protocols/protocols/ciscovpn.pat
+etc/l7-protocols/protocols/citrix.pat
+etc/l7-protocols/protocols/counterstrike-source.pat
+etc/l7-protocols/protocols/cvs.pat
+etc/l7-protocols/protocols/dayofdefeat-source.pat
+etc/l7-protocols/protocols/dhcp.pat
+etc/l7-protocols/protocols/directconnect.pat
+etc/l7-protocols/protocols/dns.pat
+etc/l7-protocols/protocols/doom3.pat
+etc/l7-protocols/protocols/edonkey.pat
+etc/l7-protocols/protocols/fasttrack.pat
+etc/l7-protocols/protocols/finger.pat
+etc/l7-protocols/protocols/freenet.pat
+etc/l7-protocols/protocols/ftp.pat
+etc/l7-protocols/protocols/gkrellm.pat
+etc/l7-protocols/protocols/gnucleuslan.pat
+etc/l7-protocols/protocols/gnutella.pat
+etc/l7-protocols/protocols/goboogy.pat
+etc/l7-protocols/protocols/gopher.pat
+etc/l7-protocols/protocols/h323.pat
+etc/l7-protocols/protocols/halflife2-deathmatch.pat
+etc/l7-protocols/protocols/hddtemp.pat
+etc/l7-protocols/protocols/hotline.pat
+etc/l7-protocols/protocols/http-rtsp.pat
+etc/l7-protocols/protocols/http.pat
+etc/l7-protocols/protocols/ident.pat
+etc/l7-protocols/protocols/imap.pat
+etc/l7-protocols/protocols/imesh.pat
+etc/l7-protocols/protocols/ipp.pat
+etc/l7-protocols/protocols/irc.pat
+etc/l7-protocols/protocols/jabber.pat
+etc/l7-protocols/protocols/kugoo.pat
+etc/l7-protocols/protocols/live365.pat
+etc/l7-protocols/protocols/lpd.pat
+etc/l7-protocols/protocols/msn-filetransfer.pat
+etc/l7-protocols/protocols/msnmessenger.pat
+etc/l7-protocols/protocols/mute.pat
+etc/l7-protocols/protocols/napster.pat
+etc/l7-protocols/protocols/nbns.pat
+etc/l7-protocols/protocols/ncp.pat
+etc/l7-protocols/protocols/netbios.pat
+etc/l7-protocols/protocols/nntp.pat
+etc/l7-protocols/protocols/ntp.pat
+etc/l7-protocols/protocols/openft.pat
+etc/l7-protocols/protocols/pcanywhere.pat
+etc/l7-protocols/protocols/poco.pat
+etc/l7-protocols/protocols/pop3.pat
+etc/l7-protocols/protocols/qq.pat
+etc/l7-protocols/protocols/quake-halflife.pat
+etc/l7-protocols/protocols/quake1.pat
+etc/l7-protocols/protocols/rdp.pat
+etc/l7-protocols/protocols/rlogin.pat
+etc/l7-protocols/protocols/rtsp.pat
+etc/l7-protocols/protocols/shoutcast.pat
+etc/l7-protocols/protocols/sip.pat
+etc/l7-protocols/protocols/skypeout.pat
+etc/l7-protocols/protocols/skypetoskype.pat
+etc/l7-protocols/protocols/smb.pat
+etc/l7-protocols/protocols/smtp.pat
+etc/l7-protocols/protocols/snmp.pat
+etc/l7-protocols/protocols/socks.pat
+etc/l7-protocols/protocols/soribada.pat
+etc/l7-protocols/protocols/soulseek.pat
+etc/l7-protocols/protocols/ssdp.pat
+etc/l7-protocols/protocols/ssh.pat
+etc/l7-protocols/protocols/ssl.pat
+etc/l7-protocols/protocols/subspace.pat
+etc/l7-protocols/protocols/subversion.pat
+etc/l7-protocols/protocols/teamspeak.pat
+etc/l7-protocols/protocols/telnet.pat
+etc/l7-protocols/protocols/tesla.pat
+etc/l7-protocols/protocols/tftp.pat
+etc/l7-protocols/protocols/thecircle.pat
+etc/l7-protocols/protocols/tls.pat
+etc/l7-protocols/protocols/tsp.pat
+etc/l7-protocols/protocols/unknown.pat
+etc/l7-protocols/protocols/uucp.pat
+etc/l7-protocols/protocols/validcertssl.pat
+etc/l7-protocols/protocols/ventrilo.pat
+etc/l7-protocols/protocols/vnc.pat
+etc/l7-protocols/protocols/whois.pat
+etc/l7-protocols/protocols/worldofwarcraft.pat
+etc/l7-protocols/protocols/x11.pat
+etc/l7-protocols/protocols/xboxlive.pat
+etc/l7-protocols/protocols/xunlei.pat
+etc/l7-protocols/protocols/yahoo.pat
+etc/l7-protocols/protocols/zmaap.pat
+#etc/l7-protocols/testing
+#etc/l7-protocols/testing/Makefile
+#etc/l7-protocols/testing/README
+#etc/l7-protocols/testing/add.sh
+#etc/l7-protocols/testing/data
+#etc/l7-protocols/testing/data/aim-1
+#etc/l7-protocols/testing/data/aim-2
+#etc/l7-protocols/testing/data/aim-3
+#etc/l7-protocols/testing/data/aim-4
+#etc/l7-protocols/testing/data/aim-5
+#etc/l7-protocols/testing/data/aim-6
+#etc/l7-protocols/testing/data/bittorrent-1
+#etc/l7-protocols/testing/data/bittorrent-2
+#etc/l7-protocols/testing/data/bittorrent-3
+#etc/l7-protocols/testing/data/bittorrent-4
+#etc/l7-protocols/testing/data/bittorrent-another-1
+#etc/l7-protocols/testing/data/bittorrent-another-2
+#etc/l7-protocols/testing/data/bittorrent-another-3
+#etc/l7-protocols/testing/data/bittorrent-another-4
+#etc/l7-protocols/testing/data/dns-1
+#etc/l7-protocols/testing/data/dns-2
+#etc/l7-protocols/testing/data/edonkey-tcp-1
+#etc/l7-protocols/testing/data/edonkey-tcp-2
+#etc/l7-protocols/testing/data/edonkey-tcp-b-1
+#etc/l7-protocols/testing/data/edonkey-tcp-b-2
+#etc/l7-protocols/testing/data/edonkey-tcp-b-3
+#etc/l7-protocols/testing/data/edonkey-tcp-b-4
+#etc/l7-protocols/testing/data/edonkey-tcp-b-5
+#etc/l7-protocols/testing/data/edonkey-tcp-b-6
+#etc/l7-protocols/testing/data/edonkey-udp-a
+#etc/l7-protocols/testing/data/edonkey-udp-b
+#etc/l7-protocols/testing/data/ftp-1
+#etc/l7-protocols/testing/data/ftp-2
+#etc/l7-protocols/testing/data/ftp-3
+#etc/l7-protocols/testing/data/ftp-4
+#etc/l7-protocols/testing/data/ftp-5
+#etc/l7-protocols/testing/data/gnutella-1
+#etc/l7-protocols/testing/data/gnutella-2
+#etc/l7-protocols/testing/data/gnutella-3
+#etc/l7-protocols/testing/data/gnutella-connect-1
+#etc/l7-protocols/testing/data/gnutella-connect-2
+#etc/l7-protocols/testing/data/gnutella-udp-a
+#etc/l7-protocols/testing/data/gnutella-udp-b
+#etc/l7-protocols/testing/data/gnutella-udp-c
+#etc/l7-protocols/testing/data/http-digg-304-1
+#etc/l7-protocols/testing/data/http-digg-304-2
+#etc/l7-protocols/testing/data/http-wunderground-1
+#etc/l7-protocols/testing/data/http-wunderground-2
+#etc/l7-protocols/testing/data/imap-1
+#etc/l7-protocols/testing/data/imap-2
+#etc/l7-protocols/testing/data/imap-3
+#etc/l7-protocols/testing/data/imap-4
+#etc/l7-protocols/testing/data/imap-5
+#etc/l7-protocols/testing/data/imap-6
+#etc/l7-protocols/testing/data/ipp-1
+#etc/l7-protocols/testing/data/jabber-1
+#etc/l7-protocols/testing/data/jabber-2
+#etc/l7-protocols/testing/data/jabber-3
+#etc/l7-protocols/testing/data/jabber-4
+#etc/l7-protocols/testing/data/jabber-5
+#etc/l7-protocols/testing/data/jabber-6
+#etc/l7-protocols/testing/data/ssdp-1
+#etc/l7-protocols/testing/data/ssh-1
+#etc/l7-protocols/testing/data/ssh-2
+#etc/l7-protocols/testing/data/ssh-3
+#etc/l7-protocols/testing/data/ssh-4
+#etc/l7-protocols/testing/data/ssh-5
+#etc/l7-protocols/testing/data/ssh-6
+#etc/l7-protocols/testing/data/validcertssl-1
+#etc/l7-protocols/testing/data/validcertssl-2
+#etc/l7-protocols/testing/data/validcertssl-3
+#etc/l7-protocols/testing/data/validcertssl-4
+#etc/l7-protocols/testing/data/validcertssl-5
+#etc/l7-protocols/testing/data/validcertssl-6
+#etc/l7-protocols/testing/data/winmx-1
+#etc/l7-protocols/testing/data/winmx-2
+#etc/l7-protocols/testing/data/winmx-3
+#etc/l7-protocols/testing/data/x11-1
+#etc/l7-protocols/testing/data/x11-2
+#etc/l7-protocols/testing/data/x11-3
+#etc/l7-protocols/testing/data/x11-4
+#etc/l7-protocols/testing/data/x11-5
+#etc/l7-protocols/testing/data/yahoo-1
+#etc/l7-protocols/testing/data/yahoo-2
+#etc/l7-protocols/testing/data/yahoo-3
+#etc/l7-protocols/testing/data/yahoo-4
+#etc/l7-protocols/testing/match.c
+#etc/l7-protocols/testing/randchars.c
+#etc/l7-protocols/testing/randprintable.c
+#etc/l7-protocols/testing/regexp
+#etc/l7-protocols/testing/regexp/regerror.c
+#etc/l7-protocols/testing/regexp/regexp.c
+#etc/l7-protocols/testing/regexp/regexp.h
+#etc/l7-protocols/testing/regexp/regmagic.h
+#etc/l7-protocols/testing/regexp/regsub.c
+#etc/l7-protocols/testing/test_match.sh
+#etc/l7-protocols/testing/test_speed.c
+#etc/l7-protocols/testing/timeit.sh
\ No newline at end of file