diff mbox series

[2/4] Cleaning the lang files: customized GUI files

Message ID 20180114194159.2004-2-matthias.fischer@ipfire.org
State Superseded
Headers
Series [1/4] Cleaning the lang files: removed unused translations and something more |

Commit Message

Matthias Fischer Jan. 15, 2018, 6:41 a.m. UTC 
  Patch 2:
The required changes for several GUI files.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
---
 config/cfgroot/graphs.pl       |  2 +-
 config/menu/20-status.menu     |  2 +-
 config/menu/40-services.menu   |  2 +-
 html/cgi-bin/captive.cgi       |  4 ++--
 html/cgi-bin/captive/index.cgi |  4 ++--
 html/cgi-bin/firewall.cgi      | 12 ++++++------
 html/cgi-bin/fwhosts.cgi       | 12 ++++++------
 html/cgi-bin/ids.cgi           |  4 ++--
 html/cgi-bin/logs.cgi/log.dat  |  4 ++--
 html/cgi-bin/media.cgi         |  2 +-
 html/cgi-bin/pakfire.cgi       |  6 +++---
 html/cgi-bin/pppsetup.cgi      |  6 +++---
 html/cgi-bin/qos.cgi           | 24 ++++++++++++------------
 html/cgi-bin/routing.cgi       | 12 ++++++------
 html/cgi-bin/urlfilter.cgi     |  7 +++++--
 15 files changed, 53 insertions(+), 50 deletions(-)
diff mbox series

Patch

diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl
index 1bed49fa3..928a74cfb 100644
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -256,7 +256,7 @@  sub updateloadgraph {
 		"-1".$period,
 		"-l 0",
 		"-r",
-		"-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
+		"-t ".$Lang::tr{'uptime load average'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'processes'},
 		"--color=SHADEA".$color{"color19"},
 		"--color=SHADEB".$color{"color19"},
diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index 2bcf0d5e8..0ba4e392b 100644
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -49,7 +49,7 @@ 
 	$substatus->{'54.networkovpnsrv'} = {
 				'caption' => "$Lang::tr{'vpn statistic n2n'}",
 				'uri' => '/cgi-bin/netovpnsrv.cgi',
-				'title' => "$Lang::tr{'vpn statistics n2n'}",
+				'title' => "$Lang::tr{'vpn statistic n2n'}",
 				'enabled' => 1,
 			  };
     $substatus->{'60.hardwaregraphs'} = {
diff --git a/config/menu/40-services.menu b/config/menu/40-services.menu
index 2f4d96e73..2c1c8984f 100644
--- a/config/menu/40-services.menu
+++ b/config/menu/40-services.menu
@@ -25,7 +25,7 @@ 
 				'title' => "Quality of Service",
 				'enabled' => 1,
 				};
-    $subservices->{'60.ids'} = {'caption' => $Lang::tr{'intrusion detection'},
+    $subservices->{'60.ids'} = {'caption' => $Lang::tr{'intrusion detection system'},
 				'enabled' => 1,
 				'uri' => '/cgi-bin/ids.cgi',
 				'title' => "$Lang::tr{'intrusion detection system'}",
diff --git a/html/cgi-bin/captive.cgi b/html/cgi-bin/captive.cgi
index 65cc349ba..0114c4c72 100755
--- a/html/cgi-bin/captive.cgi
+++ b/html/cgi-bin/captive.cgi
@@ -758,9 +758,9 @@  sub generate_pdf() {
 
 			if ($settings{'TITLE'}) {
 				$f_headline->text_center(decode("utf8", $settings{'TITLE'}));
-				$f_subheadline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}));
+				$f_subheadline->text_center(decode("utf8", $Lang::tr{'Captive wifi coupon'}));
 			} else {
-				$f_headline->text_center(decode("utf8", $Lang::tr{'Captive WiFi coupon'}));
+				$f_headline->text_center(decode("utf8", $Lang::tr{'Captive wifi coupon'}));
 			}
 
 			# Coupon
diff --git a/html/cgi-bin/captive/index.cgi b/html/cgi-bin/captive/index.cgi
index e9606b1bf..e90ee50c5 100755
--- a/html/cgi-bin/captive/index.cgi
+++ b/html/cgi-bin/captive/index.cgi
@@ -174,8 +174,8 @@  $tmpl->param(ERROR => $errormessage);
 $tmpl->param(TERMS => &getterms());
 
 # Some translated strings
-$tmpl->param(L_ACTIVATE        => $Lang::tr{'Captive ACTIVATE'});
-$tmpl->param(L_GAIN_ACCESS     => $Lang::tr{'Captive GAIN ACCESS'});
+$tmpl->param(L_ACTIVATE        => $Lang::tr{'Captive activate'});
+$tmpl->param(L_GAIN_ACCESS     => $Lang::tr{'Captive gain access'});
 $tmpl->param(L_AGREE_TERMS     => $Lang::tr{'Captive agree tac'});
 
 # Print header
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi
index face0f460..67b4fcea4 100644
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -1083,8 +1083,8 @@  END
 	print "<td align='right'><select name='cust_geoip_$srctgt' style='width:200px;'>\n";
 
 	# Add GeoIP groups to dropdown.
-	if (!-z $configgeoipgrp) {
-		print "<optgroup label='$Lang::tr{'fwhost cust geoipgroup'}'>\n";
+	if ( ! -z $configgeoipgrp) {
+		print "<optgroup label='$Lang::tr{'fwhost cust geoipgrp'}'>\n";
 		foreach my $key (sort { ncmp($customgeoipgrp{$a}[0],$customgeoipgrp{$b}[0]) } keys %customgeoipgrp) {
 			my $selected;
 
@@ -2074,7 +2074,7 @@  END
 							<td width="20em">&nbsp;</td>
 							<td>$Lang::tr{'fwdfw numcon'}: <input type='text' name='ratecon' size='2' value="$fwdfwsettings{'ratecon'}"> /
 								<select name='RATETIME' style='width:100px;'>
-									<option value='second' $selected{'RATETIME'}{'second'}>$Lang::tr{'age second'}</option>
+									<option value='second' $selected{'RATETIME'}{'second'}>$Lang::tr{'second'}</option>
 									<option value='minute' $selected{'RATETIME'}{'minute'}>$Lang::tr{'minute'}</option>
 									<option value='hour' $selected{'RATETIME'}{'hour'}>$Lang::tr{'hour'}</option>
 								</select>
@@ -2094,14 +2094,14 @@  END
 			<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' />
 			<input type='hidden' name='config' value='$config' >
 			<input type='hidden' name='ACTION' value='saverule' ></form>
-			<form method='post' style='display:inline;'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='reset'></form></td></tr>
+			<form method='post' style='display:inline;'><input type='submit' value='$Lang::tr{'back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='reset'></form></td></tr>
 			</table>
 			<br>
 END
 		}else{
 			print<<END;
 			<table border='0' width='100%'>
-			<tr><td align='right'><input type='submit' value='$Lang::tr{'fwdfw change'}' style='min-width:100px;' /><input type='hidden' name='updatefwrule' value='$fwdfwsettings{'updatefwrule'}'><input type='hidden' name='key' value='$fwdfwsettings{'key'}'>
+			<tr><td align='right'><input type='submit' value='$Lang::tr{'update'}' style='min-width:100px;' /><input type='hidden' name='updatefwrule' value='$fwdfwsettings{'updatefwrule'}'><input type='hidden' name='key' value='$fwdfwsettings{'key'}'>
 			<input type='hidden' name='oldgrp1a' value='$fwdfwsettings{'oldgrp1a'}' />
 			<input type='hidden' name='oldgrp1b' value='$fwdfwsettings{'oldgrp1b'}' />
 			<input type='hidden' name='oldgrp2a' value='$fwdfwsettings{'oldgrp2a'}' />
@@ -2116,7 +2116,7 @@  END
 			<input type='hidden' name='oldnat' value='$fwdfwsettings{'oldnat'}' />
 			<input type='hidden' name='oldruletype' value='$fwdfwsettings{'oldruletype'}' />
 			<input type='hidden' name='oldconcon' value='$fwdfwsettings{'oldconcon'}' />
-			<input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td>
+			<input type='hidden' name='ACTION' value='saverule' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value'reset'></td></td>
 			</table></form>
 END
 		}
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index a2ade8a20..c7f9beff8 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -1324,7 +1324,7 @@  END
 	}else{
 		print "<td colspan='6' align='right'><input type='submit' value='$Lang::tr{'save'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='savenet'><input type='hidden' name='newnet' value='on'>";
 	}
-	print "</form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;' ><input type='hidden' name='ACTION' value='resetnet'></form></td></tr></table>";
+	print "</form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'back'}' style='min-width:100px;' ><input type='hidden' name='ACTION' value='resetnet'></form></td></tr></table>";
 	&Header::closebox();
 }
 sub addhost
@@ -1349,7 +1349,7 @@  END
 	}else{
 		print "	<td colspan='4' align='right'><input type='submit' name='savehost' value='$Lang::tr{'save'}' style='min-width:100px;' /><input type='hidden' name='ACTION' value='savehost' /><input type='hidden' name='newhost' value='on'>";
 	}	
-	print "	</form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;' ><input type='hidden' name='ACTION' value='resethost'></form></td></tr></table>";
+	print "	</form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'back'}' style='min-width:100px;' ><input type='hidden' name='ACTION' value='resethost'></form></td></tr></table>";
 	&Header::closebox();
 }
 sub addgrp
@@ -1577,7 +1577,7 @@  END
 			print"<br><br>";
 		}
 		print"<table width='100%'>";
-		print"<tr><td style='text-align:right;'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='oldremark' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='update' value=\"$fwhostsettings{'update'}\"><input type='hidden' name='ACTION' value='savegrp' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='resetgrp'></form></td></table>";
+		print"<tr><td style='text-align:right;'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='oldremark' value='$fwhostsettings{'oldremark'}'><input type='hidden' name='update' value=\"$fwhostsettings{'update'}\"><input type='hidden' name='ACTION' value='savegrp' ></form><form method='post' style='display:inline'><input type='submit' value='$Lang::tr{'back'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='resetgrp'></form></td></table>";
 	&Header::closebox();
 }
 sub addgeoipgrp
@@ -1679,7 +1679,7 @@  END
 
 			<form method='post' style='display:inline'>
 
-			<input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'>
+			<input type='submit' value='$Lang::tr{'back'}' style='min-width:100px;'>
 			<input type='hidden' name='ACTION' value='resetgeoipgrp'>
 
 			</form>
@@ -1747,7 +1747,7 @@  END
 		print"<input type='submit' value='$Lang::tr{'save'}' style='min-width:100px;'><input type='hidden' name='ACTION' value='saveservice'></form>";
 	}
 	print<<END;
-	<form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'></form></td></tr>
+	<form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'back'}' style='min-width:100px;'></form></td></tr>
 	</table></form>
 END
 	&Header::closebox();
@@ -1827,7 +1827,7 @@  END
 	}
 	print<<END;
 	<table width='100%'>
-	<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='updatesrvgrp' value='$fwhostsettings{'updatesrvgrp'}'><input type='hidden' name='oldsrvgrpremark' value='$fwhostsettings{'oldsrvgrpremark'}'><input type='hidden' name='ACTION' value='saveservicegrp' ></form><form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'fwhost back'}' style='min-width:100px;'></td></tr>
+	<tr><td align='right'><input type='submit' value='$Lang::tr{'add'}' style='min-width:100px;' /><input type='hidden' name='updatesrvgrp' value='$fwhostsettings{'updatesrvgrp'}'><input type='hidden' name='oldsrvgrpremark' value='$fwhostsettings{'oldsrvgrpremark'}'><input type='hidden' name='ACTION' value='saveservicegrp' ></form><form style='display:inline;' method='post'><input type='submit' value='$Lang::tr{'back'}' style='min-width:100px;'></td></tr>
 	</table></form>
 END
 	&Header::closebox();
diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 17cb23292..144244a91 100644
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -446,7 +446,7 @@  END
 	refreshpage();
 }
 
-&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system'});
+&Header::openbox('100%', 'left', $Lang::tr{'intrusion detection system settings'});
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'><table width='100%'>
 <tr><td class='base'><input type='checkbox' name='ENABLE_SNORT_GREEN' $checked{'ENABLE_SNORT_GREEN'}{'on'} />GREEN Snort
@@ -597,7 +597,7 @@  if ( -e "${General::swroot}/snort/enable" || -e "${General::swroot}/snort/enable
 
 			# Check for empty 'Description'
 			if ($snortrules{$rulefile}{'Description'} eq '') {
-				print "<table width='100%'><tr><td class='base'>No description available</td></tr>";
+				print "<table width='100%'><tr><td class='base'>$Lang::tr{'ids rules no description available'}</td></tr>";
 			} else {
 				# Output rule file 'Description'
 				print "<table width='100%'><tr><td class='base'>$snortrules{$rulefile}{'Description'}</td></tr>";
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index f241365a1..7f117ccb9 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -78,7 +78,7 @@  my %sections = (
 my %trsections = (
         'auth' => "$Lang::tr{'loginlogout'}",
 		'wio' => 'Who Is Online?',
-        'captive' => $Lang::tr{'captive'},
+        'captive' => $Lang::tr{'Captive'},
         'clamav' => 'ClamAV',
         'collectd' => 'Collectd',
         'cron' => 'Cron',
@@ -93,7 +93,7 @@  my %trsections = (
         'openvpn' => 'OpenVPN',
         'pakfire' => 'Pakfire',
         'red' => 'RED',
-        'snort' => "$Lang::tr{'intrusion detection'}",
+        'snort' => "$Lang::tr{'intrusion detection system'}",
         'squid' => "$Lang::tr{'web proxy'}",
         'ssh' => 'SSH',
         'unbound' => 'DNS: Unbound',
diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi
index 4c94d1c8d..32eadd6d9 100644
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -147,7 +147,7 @@  END
 	my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}');
 	my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$5}');
 	my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}');
-	print "<tr><td colspan='3'>&nbsp;\n<tr><td colspan='3'><h3>transfers</h3></td></tr>";
+	print "<tr><td colspan='3'>&nbsp;\n<tr><td colspan='3'><h3>Transfers</h3></td></tr>";
 	my $i=0;
 
 	for(my $i = 1; $i <= $#iostat1; $i++){
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 143f123b7..857003715 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -245,13 +245,13 @@  END
 					</select>
 					<br />
 					<input type='hidden' name='ACTION' value='upgrade' />
-					<input type='image' alt='$Lang::tr{'upgrade'}' title='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
+					<input type='image' alt='$Lang::tr{'update'}' title='$Lang::tr{'update'}' src='/images/document-save.png' />
 				 </form>
 
 		<tr><td colspan="2"><!-- Just an empty line -->&nbsp;
 		<tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b>
 				<td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
-		<tr><td align="center">
+		<tr><td style="padding:5px 10px 20px 20px" align="center">
 			<p>$Lang::tr{'pakfire install description'}</p>
 			<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 				<select name="INSPAKS" size="10" multiple>
@@ -265,7 +265,7 @@  print <<END;
 				<input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/list-add.png' />
 			</form>
 
-		<td align="center">
+		<td style="padding:5px 10px 20px 20px" align="center">
 			<p>$Lang::tr{'pakfire uninstall description'}</p>
 		 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 			<select name="DELPAKS" size="10" multiple>
diff --git a/html/cgi-bin/pppsetup.cgi b/html/cgi-bin/pppsetup.cgi
index 4b45ee50c..42360fd32 100644
--- a/html/cgi-bin/pppsetup.cgi
+++ b/html/cgi-bin/pppsetup.cgi
@@ -59,7 +59,7 @@  if ($pppsettings{'ACTION'} ne '' &&
         %pppsettings = ();
         $pppsettings{'VALID'} = '';
         &General::readhash("${General::swroot}/ppp/settings", \%pppsettings);}
-elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
+elsif ($pppsettings{'ACTION'} eq $Lang::tr{'update'})
 {
         unless ($pppsettings{'TYPE'} =~ /^(modem|serial|isdn|pppoe|pptp|vdsl|pppoeatm|pptpatm)$/) {
                 $errormessage = $Lang::tr{'invalid input'};
@@ -274,7 +274,7 @@  elsif ($pppsettings{'ACTION'} eq $Lang::tr{'delete'})
         &General::writehash("${General::swroot}/ppp/settings-$pppsettings{'PROFILE'}",
                 \%pppsettings);
 }
-elsif ($pppsettings{'ACTION'} eq $Lang::tr{'refresh'})
+elsif ($pppsettings{'ACTION'} eq $Lang::tr{'update'})
 {
 }
 else
@@ -565,7 +565,7 @@  END
 
         print <<END
         </select></td>
-        <td colspan='1' width='25%'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}'></td>
+        <td colspan='1' width='25%'><input type='submit' name='ACTION' value='$Lang::tr{'update'}'></td>
 END
 ;
         if ($pppsettings{'TYPE'} =~ /^(modem)$/) {
diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 071b93f5d..519b29c78 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -628,7 +628,7 @@  elsif ($qossettings{'ACTION'} eq $Lang::tr{'Add Rule'})
 		<tr><td align='center'>
 			<input type="button" onClick="swapVisibility('l7rule')" value='$Lang::tr{'Level7 Rule'}' />
 			<input type="button" onClick="swapVisibility('portrule')" value='$Lang::tr{'Port Rule'}' />
-			<input type="button" onClick="swapVisibility('tosrule')" value='$Lang::tr{'TOS rule'}' />
+			<input type="button" onClick="swapVisibility('tosrule')" value='$Lang::tr{'TOS Rule'}' />
 		</table>
 END
 ;
@@ -838,10 +838,10 @@  END
 }
 
 sub changebandwidth {
-	&Header::openbox('100%', 'center', $Lang::tr{'bandwithsettings'});
+	&Header::openbox('100%', 'center', $Lang::tr{'bandwidthsettings'});
 	if ($qossettings{'ENABLED'} eq 'on') {
-		print "$Lang::tr{'bandwitherror'}";
-		print "<a href='/cgi-bin/qos.cgi'>$Lang::tr{'back'}</a>";
+		print "$Lang::tr{'bandwidtherror'}";
+		print "<table width='100%'><tr><td align='center'><a href='/cgi-bin/qos.cgi'><img src='/images/back.png' alt='$Lang::tr{'back'}' title='$Lang::tr{'back'}' /></a></td></tr></table>";
 	} else {
 		print <<END
 		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
@@ -932,10 +932,10 @@  END
 		print <<END
 		</select>
 		<td width='33%' align='center'>&nbsp;
-		<tr><td width='33%' align='right'>$Lang::tr{'guaranteed bandwith'}:
+		<tr><td width='33%' align='right'>$Lang::tr{'guaranteed bandwidth'}:
 		    <td width='33%' align='left'><input type='text' size='20' name='MINBWDTH' maxlength='8' required='1' value="$qossettings{'MINBWDTH'}" />
 		    <td width='33%' align='center'>&nbsp;
-		<tr><td width='33%' align='right'>$Lang::tr{'max bandwith'}&nbsp;<img src='/blob.gif' alt='*' />:
+		<tr><td width='33%' align='right'>$Lang::tr{'max bandwidth'}&nbsp;<img src='/blob.gif' alt='*' />:
 		    <td width='33%' align='left'><input type='text' size='20' name='MAXBWDTH' maxlength='8' required='1' value="$qossettings{'MAXBWDTH'}" />
 		    <td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>Burst:
@@ -1014,10 +1014,10 @@  END
 		}
 		print <<END
 		<td width='33%' align='center'>&nbsp;
-		<tr><td width='33%' align='right'>$Lang::tr{'guaranteed bandwith'}:
+		<tr><td width='33%' align='right'>$Lang::tr{'guaranteed bandwidth'}:
 		    <td width='33%' align='left'><input type='text' name='MINBWDTH' maxlength='8' required='1' value="$qossettings{'MINBWDTH'}" />
 		    <td width='33%' align='center'>&nbsp;
-		<tr><td width='33%' align='right'>$Lang::tr{'max bandwith'}:
+		<tr><td width='33%' align='right'>$Lang::tr{'max bandwidth'}:
 		    <td width='33%' align='left'><input type='text' name='MAXBWDTH' maxlength='8' required='1' value="$qossettings{'MAXBWDTH'}" />
 		    <td width='33%' align='center'>&nbsp;
 		<tr><td width='33%' align='right'>Burst:
@@ -1187,8 +1187,8 @@  sub showclasses {
 				<tr><td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'interface'}</b>
 				    <td bgcolor='$color{'color20'}' width='10%' align='center'><b>$Lang::tr{'Class'}</b>
 				    <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'priority'}
-				    <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'guaranteed bandwith'}
-				    <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'max bandwith'}
+				    <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'guaranteed bandwidth'}
+				    <td bgcolor='$color{'color20'}' width='10%' align='center'>$Lang::tr{'max bandwidth'}
 				    <td bgcolor='$color{'color20'}' width='10%' align='center'>Burst
 				    <td bgcolor='$color{'color20'}' width='10%' align='center'>Ceil Burst
 				    <td bgcolor='$color{'color20'}' width='10%' align='center'>TOS
@@ -1439,7 +1439,7 @@  sub validminbwdth {
 		}
 		unless ( ( $qossettings{'MINBWDTH'} >= 1 ) && ( $qossettings{'MINBWDTH'} <= $qossettings{'SPD'} ) ) {
 			$qossettings{'VALID'} = 'no';
-			$message = "$Lang::tr{'false min bandwith'}";
+			$message = "$Lang::tr{'false min bandwidth'}";
 		}
 		$qossettings{'SPD'} = '';
 	}
@@ -1454,7 +1454,7 @@  sub validmaxbwdth {
 		}
 		unless ( ( $qossettings{'MAXBDWTH'} >= 0 ) && ($qossettings{'MAXBDWTH'} >= $qossettings{'MINBDWTH'}) &&( $qossettings{'MAXBDWTH'} <= $qossettings{'SPD'} ) ) {
 			$qossettings{'VALID'} = 'no';
-			$message = "$Lang::tr{'false max bandwith'}";
+			$message = "$Lang::tr{'false max bandwidth'}";
 		}
 		$qossettings{'SPD'} = '';
 	}
diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi
index f2014e2e1..dc77f7f03 100644
--- a/html/cgi-bin/routing.cgi
+++ b/html/cgi-bin/routing.cgi
@@ -49,7 +49,7 @@  $settings{'IP'} = '';
 $settings{'GATEWAY'} = '';
 $settings{'REMARK'} = '';
 my @nosaved=('EN','IP','GATEWAY','REMARK');	# List here ALL setting2 fields. Mandatory
-    
+
 $settings{'ACTION'} = '';		# add/edit/remove
 $settings{'KEY1'} = '';			# point record for ACTION
 
@@ -105,14 +105,14 @@  if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) {
     $temp[0] = $temp[0] ne '' ? '' : 'on';		# Toggle the field
     @current[$settings{'KEY1'}] = join (',',@temp)."\n";
     $settings{'KEY1'} = ''; 				# End edit mode
-    
+
     &General::log($Lang::tr{'routing config changed'});
 
     #Save current
     open(FILE, ">$datafile") or die 'routing datafile error';
     print FILE @current;
     close(FILE);
-	
+
     # Rebuild configuration file
     &BuildConfiguration;
 }
@@ -194,7 +194,7 @@  if ($settings{'ACTION'} eq $Lang::tr{'remove'}) {
     print FILE @current;
     close(FILE);
     $settings{'KEY1'} = '';				# End remove mode
-    &General::log($Lang::tr{'route config changed'});
+    &General::log($Lang::tr{'routing config changed'});
 
     &BuildConfiguration;				# then re-build conf which use new data
 }
@@ -402,7 +402,7 @@  if ( $output != "" ) {
 sub SortDataFile
 {
     our %entries = ();
-    
+
     # Sort pair of record received in $a $b special vars.
     # When IP is specified use numeric sort else alpha.
     # If sortname ends with 'Rev', do reverse sort.
@@ -452,7 +452,7 @@  sub SortDataFile
 	%{$record} = @record;                		# populate that hash with @record
 	$entries{$record->{KEY}} = $record; 		# add this to a hash of hashes
     }
-    
+
     open(FILE, ">$datafile") or die 'routing datafile error';
 
     # Each field value is printed , with the newline ! Don't forget separator and order of them.
diff --git a/html/cgi-bin/urlfilter.cgi b/html/cgi-bin/urlfilter.cgi
index c3c327eec..0eb015a9e 100644
--- a/html/cgi-bin/urlfilter.cgi
+++ b/html/cgi-bin/urlfilter.cgi
@@ -1479,16 +1479,19 @@  print <<END
 	<td class='base'>$Lang::tr{'urlfilter username log'}:</td>
 	<td><input type='checkbox' name='ENABLE_USERNAME_LOG' $checked{'ENABLE_USERNAME_LOG'}{'on'} /></td>
 </tr>
+
 <tr>
 	<td class='base'>$Lang::tr{'urlfilter empty ads'}:</td>
 	<td><input type='checkbox' name='ENABLE_EMPTY_ADS' $checked{'ENABLE_EMPTY_ADS'}{'on'} /></td>
 	<td class='base'>$Lang::tr{'urlfilter category log'}:</td>
 	<td><input type='checkbox' name='ENABLE_CATEGORY_LOG' $checked{'ENABLE_CATEGORY_LOG'}{'on'} /></td>
 </tr>
+
 <tr>
 	<td class='base'>$Lang::tr{'urlfilter block ip'}:</td>
 	<td><input type='checkbox' name='BLOCK_IP_ADDR' $checked{'BLOCK_IP_ADDR'}{'on'} /></td>
 </tr>
+
 <tr>
 	<td class='base'>$Lang::tr{'urlfilter block all'}:</td>
 	<td><input type='checkbox' name='BLOCK_ALL' $checked{'BLOCK_ALL'}{'on'} /></td>
@@ -1782,7 +1785,7 @@  print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 $buttontext = $Lang::tr{'urlfilter add rule'};
 if ($tcsettings{'ACTION'} eq $Lang::tr{'edit'}) {
 &Header::openbox('100%', 'left', $Lang::tr{'urlfilter edit time constraint rule'}.':');
-$buttontext = $Lang::tr{'urlfilter update rule'};
+$buttontext = $Lang::tr{'update'};
 } else {
 &Header::openbox('100%', 'left', $Lang::tr{'urlfilter add new time constraint rule'}.':');
 }
@@ -2153,7 +2156,7 @@  print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 $buttontext = $Lang::tr{'urlfilter add rule'};
 if ($uqsettings{'ACTION'} eq $Lang::tr{'edit'}) {
 &Header::openbox('100%', 'left', $Lang::tr{'urlfilter edit user quota rule'}.':');
-$buttontext = $Lang::tr{'urlfilter update rule'};
+$buttontext = $Lang::tr{'update'};
 } else {
 &Header::openbox('100%', 'left', $Lang::tr{'urlfilter add new user quota rule'}.':');
 }