From 55674e0d3877ac07f71e26e0d07dacc6baf5759f Mon Sep 17 00:00:00 2001
From: Alexander Marx <amarx@ipfire.org>
Date: Sat, 29 Dec 2012 07:09:37 +0100
Subject: [PATCH] Forward Firewall: fixed Typos

Signed-off-by: Alexander Marx <amarx@ipfire.org>
---
 html/cgi-bin/forwardfw.cgi | 8 ++++----
 html/cgi-bin/fwhosts.cgi   | 2 +-
 langs/de/cgi-bin/de.pl     | 2 +-
 langs/en/cgi-bin/en.pl     | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index be2f0cfea..6ed0a9b22 100755
--- a/html/cgi-bin/forwardfw.cgi
+++ b/html/cgi-bin/forwardfw.cgi
@@ -577,7 +577,7 @@ sub checksource
 		my @tmp= split (/\./,$ip);
 		if (($tmp[3] eq "0") || ($tmp[3] eq "255"))
 		{
-			$errormessage=$Lang::tr{'fwhost err hostip'};
+			$errormessage=$Lang::tr{'fwhost err hostip'}."<br>";
 		}
 		$fwdfwsettings{'src_addr'}="$ip/$subnet";
 				
@@ -650,9 +650,9 @@ sub checktarget
 		my @tmp= split (/\./,$ip);
 		if (($tmp[3] eq "0") || ($tmp[3] eq "255"))
 		{
-			$errormessage=$Lang::tr{'fwhost err hostip'};
+			$errormessage=$Lang::tr{'fwhost err hostip'}."<br>";
 		}
-		$fwdfwsettings{'tgt_addr'}=$ip."/".$subnet;
+		$fwdfwsettings{'tgt_addr'}="$ip/$subnet";
 				
 		if(!&General::validipandmask($fwdfwsettings{'tgt_addr'})){
 			$errormessage.=$Lang::tr{'fwdfw err tgt_addr'}."<br>";
@@ -762,7 +762,7 @@ sub checkrule
 			my ($tbyte1,$tbyte2,$tbyte3,$tbyte4)=split(".",$networkip2);
 				if ($sbyte1 eq $tbyte1 && $sbyte2 eq $tbyte2 && $sbyte3 eq $tbyte3){
 					$hint=$Lang::tr{'fwdfw hint ip1'}."<br>";
-					$hint.=$Lang::tr{'fwdfw hint ip2'}." Source: $networkip1/$scidr Target:$networkip2/$tcidr<br>";
+					$hint.=$Lang::tr{'fwdfw hint ip2'}." Source: $networkip1/$scidr Target: $networkip2/$tcidr<br>";
 				}
 		
 		}else{
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 8fe281b74..e82aca576 100755
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1226,7 +1226,7 @@ END
 		print"<input type='submit' value='$Lang::tr{'save'}'><input type='hidden' name='ACTION' value='saveservice'></form>";
 	}
 	print<<END;
-	<form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'fwhost reset'}'></form></td></tr>
+	<form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'fwhost back'}'></form></td></tr>
 	</table></form>
 	
 	
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a6989d3fe..d31d3c7d1 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -953,7 +953,7 @@
 'fwhost addrule' 		=> 'Neue Regel hinzufügen:',
 'fwhost any'			=> 'Alle',
 'fwhost attention'		=> 'ACHTUNG',
-'fwhost back'			=> 'Übernehmen',
+'fwhost back'			=> 'Zurück',
 'fwhost blue'			=> 'Blau',
 'fwhost ccdhost'		=> 'OpenVPN Clients:',
 'fwhost ccdnet'			=> 'OpenVPN Netzwerke:',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 77e24130d..6175c2b40 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -936,11 +936,11 @@
 'fwdfw err tgtport'		=> 'Please provide target port.',
 'fwdfw err tgt_addr'	=> 'Invalid target IP-address.',
 'fwdfw err tgt_port'	=> 'Invalid target port',
-'fwdfw err tgt_mac'		=> 'MAC addresses can not be used as target.',
+'fwdfw err tgt_mac'		=> 'MAC addresses cannot be used as target.',
 'fwdfw err tgt_grp'		=> 'Target servicegroup is empty',
 'fwdfw err time'		=> 'You have to define at least one day.',
 'fwdfw from'			=> 'From:',
-'fwdfw hint ip1'		=> 'The last generated rule may never be activated because source and target my be in same subnet.',
+'fwdfw hint ip1'		=> 'The last generated rule may never be activated because source and target probably are in same subnet.',
 'fwdfw hint ip2'		=> 'Please doublecheck if this rule makes sense: ',
 'fwdfw ipsec network'	=> 'IpSec networks:',
 'fwdfw log rule'		=> 'Log rule',
@@ -978,7 +978,7 @@
 'fwhost addrule' 		=> 'Add new rule:',
 'fwhost any'			=> 'Any',
 'fwhost attention'		=> 'ATTENTION',
-'fwhost back'			=> 'commit',
+'fwhost back'			=> 'back',
 'fwhost blue'			=> 'Blue',
 'fwhost ccdhost'		=> 'OpenVPN clients:',
 'fwhost ccdnet'			=> 'OpenVPN networks:',
-- 
2.39.2