Forward Firewall: fixed Typos

Signed-off-by: Alexander Marx <amarx@ipfire.org>

diff --git a/html/cgi-bin/forwardfw.cgi b/html/cgi-bin/forwardfw.cgi
index be2f0cfead7182718b9800d05f5686d9b43f2520..6ed0a9b2217a330503101d71b61be2369c353930 100755 (executable)
--- 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 8fe281b7481797a5dd4e2c55d0d4b81f8d755e59..e82aca576e969aa7a5faf7fb8a7fb80b4333b53e 100755 (executable)
--- 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 a6989d3fe9e303a76ed35404c9e6143d57da9c19..d31d3c7d1673dc6a58e21801c64cb71fbe7df89b 100644 (file)
--- 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 77e24130d658a6a718def0278b2086a682401f83..6175c2b40f5730fe825643094d38accec5daf5d6 100644 (file)
--- 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:',