Merge remote branch 'mainline/master'

Conflicts:
	usr/local/www/diag_backup.php
	usr/local/www/diag_dns.php
	usr/local/www/diag_ipsec_sad.php
	usr/local/www/diag_logs_vpn.php
	usr/local/www/diag_ping.php
	usr/local/www/diag_pkglogs.php
	usr/local/www/diag_showbogons.php
	usr/local/www/diag_states_summary.php
	usr/local/www/diag_traceroute.php

13 files changed, 167 insertions, 167 deletions

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index e2cbacb..2e9e8b2 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -60,7 +60,7 @@ function add_base_packages_menu_items() {
 	$modified_config = false;
 	foreach($base_packages as $bp) {
 		$basepkg_path = "/usr/local/pkg/{$bp}";
-		$tmpinfo = pathinfo($basepkg_path, PATHINFO_EXTENSION); 
+		$tmpinfo = pathinfo($basepkg_path, PATHINFO_EXTENSION);
 		if($tmpinfo['extension'] == "xml" && file_exists($basepkg_path)) {
 			$pkg_config = parse_xml_config_pkg($basepkg_path, "packagegui");
 			if($pkg_config['menu'] != "") {
@@ -80,7 +80,7 @@ function add_base_packages_menu_items() {
 		}
 	}
 	if($modified_config) {
-		write_confg("Restored base_package menus after configuration restore.");
+		write_confg(gettext("Restored base_package menus after configuration restore."));
 		$config = parse_config(true);
 	}
 }
@@ -98,46 +98,46 @@ function check_and_returnif_section_exists($section) {
 
 function spit_out_select_items($area, $showall) {
 	global $config;
-		
-	$areas = array("aliases" => "Aliases", 
-				   "captiveportal" => "Captive Portal",
-				   "voucher" => "Captive Portal Vouchers",
-				   "dnsmasq" => "DNS Forwarder",				
-				   "dhcpd" => "DHCP Server",
-				   "filter" => "Firewall Rules",
-				   "interfaces" => "Interfaces",
-				   "ipsec" => "IPSEC",
-				   "nat" => "NAT",
-				   "ovpn" => "OpenVPN",
-				   "installedpackages" => "Package Manager",
-				   "pptpd" => "PPTP Server",
-				   "cron" => "Scheduled Tasks",				
-				   "syslog" => "Syslog",
-				   "system" => "System",
-				   "staticroutes" => "Static routes",
-				   "sysctl" => "System tunables",
-				   "snmpd" => "SNMP Server",
-				   "shaper" => "Traffic Shaper",
-				   "vlans" => "VLANS",
-				   "wol" => "Wake on LAN"
+
+	$areas = array("aliases" => gettext("Aliases"),
+				   "captiveportal" => gettext("Captive Portal"),
+				   "voucher" => gettext("Captive Portal Vouchers"),
+				   "dnsmasq" => gettext("DNS Forwarder"),
+				   "dhcpd" => gettext("DHCP Server"),
+				   "filter" => gettext("Firewall Rules"),
+				   "interfaces" => gettext("Interfaces"),
+				   "ipsec" => gettext("IPSEC"),
+				   "nat" => gettext("NAT"),
+				   "ovpn" => gettext("OpenVPN"),
+				   "installedpackages" => gettext("Package Manager"),
+				   "pptpd" => gettext("PPTP Server"),
+				   "cron" => gettext("Scheduled Tasks"),
+				   "syslog" => gettext("Syslog"),
+				   "system" => gettext("System"),
+				   "staticroutes" => gettext("Static routes"),
+				   "sysctl" => gettext("System tunables"),
+				   "snmpd" => gettext("SNMP Server"),
+				   "shaper" => gettext("Traffic Shaper"),
+				   "vlans" => gettext("VLANS"),
+				   "wol" => gettext("Wake on LAN")
 	);
 
 	$select  = "<select name=\"{$area}\" id=\"{$aread}\" ";
 	if ($area == "backuparea")
 		$select .= " onChange=backuparea_change(this)";
 	$select .= " >\n";
-	$select .= "<option VALUE=\"\">ALL</option>";
+	$select .= "<option VALUE=\"\">" . gettext("ALL") . "</option>";
 
-	if($showall == true) 
+	if($showall == true)
 		foreach($areas as $area => $areaname)
 			$select .= "<option value='{$area}'>{$areaname}</option>\n";
-	else 
+	else
 		foreach($areas as $area => $areaname)
 			if(check_and_returnif_section_exists($area) == true)
 				$select .= "<option value='{$area}'>{$areaname}</option>\n";
 
 	$select .= "</select>\n";
-		
+
 	echo $select;
 
 }
@@ -153,13 +153,13 @@ if ($_POST['apply']) {
 
 if ($_POST) {
 	unset($input_errors);
-	if (stristr($_POST['Submit'], "Restore configuration"))
+	if (stristr($_POST['Submit'], gettext("Restore configuration")))
 		$mode = "restore";
-	else if (stristr($_POST['Submit'], "Reinstall"))
+	else if (stristr($_POST['Submit'], gettext("Reinstall")))
 		$mode = "reinstallpackages";
-	else if (stristr($_POST['Submit'], "Download"))
+	else if (stristr($_POST['Submit'], gettext("Download")))
 		$mode = "download";
-	else if (stristr($_POST['Submit'], "Restore version"))
+	else if (stristr($_POST['Submit'], gettext("Restore version")))
 		$mode = "restore_ver";
 
 	if ($_POST["nopackages"] <> "")
@@ -174,9 +174,9 @@ if ($_POST) {
 
 			if ($_POST['encrypt']) {
 				if(!$_POST['encrypt_password'] || !$_POST['encrypt_passconf'])
-					$input_errors[] = "You must supply and confirm the password for encryption.";
+					$input_errors[] = gettext("You must supply and confirm the password for encryption.");
 				if($_POST['encrypt_password'] != $_POST['encrypt_passconf'])
-					$input_errors[] = "The supplied 'Password' and 'Confirm' field values must match.";
+					$input_errors[] = gettext("The supplied 'Password' and 'Confirm' field values must match.");
 			}
 
 			if (!$input_errors) {
@@ -199,7 +199,7 @@ if ($_POST) {
 					$sfn = "{$g['tmp_path']}/config.xml.nopkg";
 					file_put_contents($sfn, $data);
 					exec("sed '/<installedpackages>/,/<\/installedpackages>/d' {$sfn} > {$sfn}-new");
-					$data = file_get_contents($sfn . "-new");					
+					$data = file_get_contents($sfn . "-new");
 				} else {
 					if(!$_POST['backuparea']) {
 						/* backup entire configuration */
@@ -218,7 +218,7 @@ if ($_POST) {
 					tagfile_reformat($data, $data, "config.xml");
 				}
 
-				/* 
+				/*
 				 *  Backup RRD Data
 				 */
 				if(!$_POST['donotbackuprrd']) {
@@ -238,7 +238,7 @@ if ($_POST) {
 					$data .= "\t</rrddata>\n";
 					$data .= "</pfsense>\n";
 				}
-				
+
 				$size = strlen($data);
 				header("Content-Type: application/octet-stream");
 				header("Content-Disposition: attachment; filename={$name}");
@@ -260,9 +260,9 @@ if ($_POST) {
 
 			if ($_POST['decrypt']) {
 				if(!$_POST['decrypt_password'] || !$_POST['decrypt_passconf'])
-					$input_errors[] = "You must supply and confirm the password for decryption.";
+					$input_errors[] = gettext("You must supply and confirm the password for decryption.");
 				if($_POST['decrypt_password'] != $_POST['decrypt_passconf'])
-					$input_errors[] = "The supplied 'Password' and 'Confirm' field values must match.";
+					$input_errors[] = gettext("The supplied 'Password' and 'Confirm' field values must match.");
 			}
 
 			if (!$input_errors) {
@@ -272,20 +272,20 @@ if ($_POST) {
 					/* read the file contents */
 					$data = file_get_contents($_FILES['conffile']['tmp_name']);
 					if(!$data) {
-						log_error("Warning, could not read file " . $_FILES['conffile']['tmp_name']);
+						log_error(gettext("Warning, could not read file") . " " . $_FILES['conffile']['tmp_name']);
 						return 1;
 					}
 
 					if ($_POST['decrypt']) {
 						if (!tagfile_deformat($data, $data, "config.xml")) {
-							$input_errors[] = "The uploaded file does not appear to contain an encrypted pfsense configuration.";
+							$input_errors[] = gettext("The uploaded file does not appear to contain an encrypted pfsense configuration.");
 							return 1;
 						}
 						$data = decrypt_data($data, $_POST['decrypt_password']);
 					}
 
 					if(stristr($data, "<m0n0wall>")) {
-						log_error("Upgrading m0n0wall configuration to pfsense.");
+						log_error(gettext("Upgrading m0n0wall configuration to pfsense."));
 						/* m0n0wall was found in config.  convert it. */
 						$data = str_replace("m0n0wall", "pfsense", $data);
 						$m0n0wall_upgrade = true;
@@ -293,15 +293,15 @@ if ($_POST) {
 					if($_POST['restorearea']) {
 						/* restore a specific area of the configuration */
 						if(!stristr($data, $_POST['restorearea'])) {
-							$input_errors[] = "You have selected to restore an area but we could not locate the correct xml tag.";
+							$input_errors[] = gettext("You have selected to restore an area but we could not locate the correct xml tag.");
 						} else {
 							restore_config_section($_POST['restorearea'], $data);
 							filter_configure();
-							$savemsg = "The configuration area has been restored.  You may need to reboot the firewall.";
+							$savemsg = gettext("The configuration area has been restored.  You may need to reboot the firewall.");
 						}
 					} else {
 						if(!stristr($data, "<" . $g['xml_rootobj'] . ">")) {
-							$input_errors[] = "You have selected to restore the full configuration but we could not locate a " . $g['xml_rootobj'] . " tag.";
+							$input_errors[] = gettext("You have selected to restore the full configuration but we could not locate a") . " " . $g['xml_rootobj'] . " " . gettext("tag.");
 						} else {
 							/* restore the entire configuration */
 							file_put_contents($_FILES['conffile']['tmp_name'], $data);
@@ -370,7 +370,7 @@ if ($_POST) {
 									}
 									unlink_if_exists("{$g['tmp_path']}/config.cache");
 									// Reset configuration version to something low
-									// in order to force the config upgrade code to 
+									// in order to force the config upgrade code to
 									// run through with all steps that are required.
 									$config['system']['version'] = "1.0";
 									// Deal with descriptions longer than 63 characters
@@ -432,10 +432,10 @@ if ($_POST) {
 									}
 									$config['diag']['ipv6nat'] = true;
 									write_config();
-									add_base_packages_menu_items();									
+									add_base_packages_menu_items();
 									convert_config();
 									conf_mount_ro();
-									$savemsg = "The m0n0wall configuration has been restored and upgraded to pfSense.";
+									$savemsg = gettext("The m0n0wall configuration has been restored and upgraded to pfSense.");
 									mark_subsystem_dirty("restore");
 								}
 								if(isset($config['captiveportal']['enable'])) {
@@ -451,12 +451,12 @@ if ($_POST) {
 									exit;
 								}
 							} else {
-								$input_errors[] = "The configuration could not be restored.";
+								$input_errors[] = gettext("The configuration could not be restored.");
 							}
 						}
 					}
 				} else {
-					$input_errors[] = "The configuration could not be restored (file upload error).";
+					$input_errors[] = gettext("The configuration could not be restored (file upload error).");
 				}
 			}
 		}
@@ -466,16 +466,16 @@ if ($_POST) {
 			header("Location: pkg_mgr_install.php?mode=reinstallall");
 			exit;
                 } else if ($mode == "restore_ver") {
-			$input_errors[] = "XXX - this feature may hose your config (do NOT backrev configs!) - billm";
+			$input_errors[] = gettext("XXX - this feature may hose your config (do NOT backrev configs!) - billm");
 			if ($ver2restore <> "") {
 				$conf_file = "{$g['cf_conf_path']}/bak/config-" . strtotime($ver2restore) . ".xml";
 				if (config_install($conf_file) == 0) {
 						mark_subsystem_dirty("restore");
                         } else {
-                        	$input_errors[] = "The configuration could not be restored.";
+                        	$input_errors[] = gettext("The configuration could not be restored.");
                         }
                 } else {
-                        $input_errors[] = "No version selected.";
+                        $input_errors[] = gettext("No version selected.");
                 }
 		}
 	}
@@ -486,7 +486,7 @@ $id = rand() . '.' . time();
 $mth = ini_get('upload_progress_meter.store_method');
 $dir = ini_get('upload_progress_meter.file.filename_template');
 
-$pgtitle = array("Diagnostics","Backup/restore");
+$pgtitle = array(gettext("Diagnostics"),gettext("Backup/restore"));
 include("head.inc");
 
 ?>
@@ -527,7 +527,7 @@ function backuparea_change(obj) {
 <?php if (is_subsystem_dirty('restore')): ?><p>
 <form action="reboot.php" method="post">
 <input name="Submit" type="hidden" value=" Yes ">
-<?php print_info_box("The firewall configuration has been changed.<br/>The firewall is now rebooting.");?><br>
+<?php print_info_box(gettext("The firewall configuration has been changed.") . "<br/>" . gettext("The firewall is now rebooting."));?><br>
 </form>
 <?php endif; ?>
 <form action="diag_backup.php" method="post" name="iform" enctype="multipart/form-data">
@@ -536,8 +536,8 @@ function backuparea_change(obj) {
 		<td>
 <?php
 		$tab_array = array();
-		$tab_array[0] = array("Config History", false, "diag_confbak.php");
-		$tab_array[1] = array("Backup/Restore", true, "diag_backup.php");
+		$tab_array[0] = array(gettext("Config History"), false, "diag_confbak.php");
+		$tab_array[1] = array(gettext("Backup/Restore"), true, "diag_backup.php");
 		display_top_tabs($tab_array);
 ?>
 		</td>
@@ -547,19 +547,19 @@ function backuparea_change(obj) {
 			<div id="mainarea">
 			<table class="tabcont" align="center" width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" class="listtopic">Backup configuration</td>
+					<td colspan="2" class="listtopic"><?=gettext("Backup configuration"); ?></td>
 				</tr>
 				<tr>
 					<td width="22%" valign="baseline" class="vncell">&nbsp;</td>
 					<td width="78%" class="vtable">
-						<p>Click this button to download the system configuration in XML format.<br /><br /> Backup area: <?php spit_out_select_items("backuparea", false); ?></p>
+						<p><?=gettext("Click this button to download the system configuration in XML format."); ?><br /><br /> <?=gettext("Backup area:"); ?> <?php spit_out_select_items("backuparea", false); ?></p>
 						<table>
 							<tr>
 								<td>
 									<input name="nopackages" type="checkbox" class="formcheckbox" id="nopackages">
 								</td>
 								<td>
-									<span class="vexpl">Do not backup package information.</span>
+									<span class="vexpl"><?=gettext("Do not backup package information."); ?></span>
 								</td>
 							</tr>
 						</table>
@@ -569,7 +569,7 @@ function backuparea_change(obj) {
 									<input name="encrypt" type="checkbox" class="formcheckbox" id="nopackages" onClick="encrypt_change()">
 								</td>
 								<td>
-									<span class="vexpl">Encrypt this configuration file.</span>
+									<span class="vexpl"><?=gettext("Encrypt this configuration file."); ?></span>
 								</td>
 							</tr>
 							<tr>
@@ -577,14 +577,14 @@ function backuparea_change(obj) {
 									<input name="donotbackuprrd" type="checkbox" class="formcheckbox" id="dotnotbackuprrd" checked>
 								</td>
 								<td>
-									<span class="vexpl">Do not backup RRD data (NOTE: RRD Data can consume 4+ megabytes of config.xml space!)</span>
+									<span class="vexpl"><?=gettext("Do not backup RRD data (NOTE: RRD Data can consume 4+ megabytes of config.xml space!)"); ?></span>
 								</td>
 							</tr>
 						</table>
 						<table id="encrypt_opts">
 							<tr>
 								<td>
-									<span class="vexpl">Password :</span>
+									<span class="vexpl"><?=gettext("Password"); ?> :</span>
 								</td>
 								<td>
 									<input name="encrypt_password" type="password" class="formfld pwd" size="20" value="" />
@@ -592,26 +592,26 @@ function backuparea_change(obj) {
 							</tr>
 							<tr>
 								<td>
-									<span class="vexpl">confirm :</span>
+									<span class="vexpl"><?=gettext("confirm"); ?> :</span>
 								</td>
 								<td>
 									<input name="encrypt_passconf" type="password" class="formfld pwd" size="20" value="" />
 								</td>
 							</tr>
 						</table>
-						<p><input name="Submit" type="submit" class="formbtn" id="download" value="Download configuration"></p>
+						<p><input name="Submit" type="submit" class="formbtn" id="download" value="<?=gettext("Download configuration"); ?>"></p>
 					</td>
 				</tr>
 				<tr>
 					<td colspan="2" class="list" height="12">&nbsp;</td>
                 </tr>
                 <tr>
-					<td colspan="2" class="listtopic">Restore configuration</td>
+					<td colspan="2" class="listtopic"><?=gettext("Restore configuration"); ?></td>
 				</tr>
 				<tr>
 					<td width="22%" valign="baseline" class="vncell">&nbsp;</td>
 					<td width="78%" class="vtable">
-						Open a <?=$g['[product_name']?> configuration XML file and click the button below to restore the configuration. <br /><br /> Restore area: <?php spit_out_select_items("restorearea", true); ?>
+						<?=gettext("Open a"); ?> <?=$g['[product_name']?> <?=gettext("configuration XML file and click the button below to restore the configuration."); ?> <br /><br /> <?=gettext("Restore area:"); ?> <?php spit_out_select_items("restorearea", true); ?>
 						<p><input name="conffile" type="file" class="formfld unknown" id="conffile" size="40"></p>
 						<table>
 							<tr>
@@ -619,14 +619,14 @@ function backuparea_change(obj) {
 									<input name="decrypt" type="checkbox" class="formcheckbox" id="nopackages" onClick="decrypt_change()">
 								</td>
 								<td>
-									<span class="vexpl">Configuration file is encrypted.</span>
+									<span class="vexpl"><?=gettext("Configuration file is encrypted."); ?></span>
 								</td>
 							</tr>
 						</table>
 						<table id="decrypt_opts">
 							<tr>
 								<td>
-									<span class="vexpl">Password :</span>
+									<span class="vexpl"><?=gettext("Password :"); ?></span>
 								</td>
 								<td>
 									<input name="decrypt_password" type="password" class="formfld pwd" size="20" value="" />
@@ -634,15 +634,15 @@ function backuparea_change(obj) {
 							</tr>
 							<tr>
 								<td>
-									<span class="vexpl">confirm :</span>
+									<span class="vexpl"><?=gettext("confirm :"); ?></span>
 								</td>
 								<td>
 									<input name="decrypt_passconf" type="password" class="formfld pwd" size="20" value="" />
 								</td>
 							</tr>
 						</table>
-						<p><input name="Submit" type="submit" class="formbtn" id="restore" value="Restore configuration"></p>
-                      	<p><strong><span class="red">Note:</span></strong><br />The firewall will reboot after restoring the configuration.<br /></p>
+						<p><input name="Submit" type="submit" class="formbtn" id="restore" value="<?=gettext("Restore configuration"); ?>"></p>
+                      	<p><strong><span class="red"><?=gettext("Note"); ?>:</span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p>
 					</td>
 				</tr>
 				<?php if($config['installedpackages']['package'] != "") { ?>
@@ -650,13 +650,13 @@ function backuparea_change(obj) {
 					<td colspan="2" class="list" height="12">&nbsp;</td>
 				</tr>
 				<tr>
-					<td colspan="2" class="listtopic">Reinstall packages</td>
+					<td colspan="2" class="listtopic"><?=gettext("Reinstall packages"); ?></td>
 				</tr>
 				<tr>
 					<td width="22%" valign="baseline" class="vncell">&nbsp;</td>
 					<td width="78%" class="vtable">
-						<p>Click this button to reinstall all system packages.  This may take a while. <br /><br />
-		  				<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="Reinstall packages">
+						<p><?=gettext("Click this button to reinstall all system packages.  This may take a while."); ?> <br /><br />
+		  				<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>">
 					</td>
 				</tr>
 				<?php } ?>
diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php
index abdeea3..d1392d3 100644
--- a/usr/local/www/diag_dns.php
+++ b/usr/local/www/diag_dns.php
@@ -31,7 +31,7 @@
 	pfSense_MODULE:	dns
 */
 
-$pgtitle = array("Diagnostics","DNS Lookup");
+$pgtitle = array(gettext("Diagnostics"),gettext("DNS Lookup"));
 require("guiconfig.inc");
 
 /* Cheap hack to support both $_GET and $_POST */
@@ -49,7 +49,7 @@ if ($_POST) {
 	$host_esc = escapeshellarg(trim($_POST['host']));
 	
 	if (!is_hostname($host) && !is_ipaddr($host)) 
-		$input_errors[] = "Host must be a valid hostname or IP address.";
+		$input_errors[] = gettext("Host must be a valid hostname or IP address.");
 
 	// Test resolution speed of each DNS server.
 	if ((is_hostname($host) || is_ipaddr($host))) {
@@ -59,7 +59,7 @@ if ($_POST) {
 			$dns_server = $pconfig['dns' . $dnscounter];
 			$query_time = `dig {$host_esc} @{$dns_server} | grep Query | cut -d':' -f2`;
 			if($query_time == "")
-				$query_time = "No response";
+				$query_time = gettext("No response");
 			$new_qt = array();
 			$new_qt['dns_server'] = $dns_server;
 			$new_qt['query_time'] = $query_time;			
@@ -88,7 +88,7 @@ if ($_POST) {
 		}
 
 		if ($host == $resolved) {
-			$resolved = "No record found";
+			$resolved = gettext("No record found");
 		}
 	}
 }
@@ -103,10 +103,10 @@ include("head.inc"); ?>
 	<form action="diag_dns.php" method="post" name="iform" id="iform">
 	  <table width="100%" border="0" cellpadding="6" cellspacing="0">
 		<tr>
-			<td colspan="2" valign="top" class="listtopic">Resolve DNS hostname or IP</td>
+			<td colspan="2" valign="top" class="listtopic"> <?=gettext("Resolve DNS hostname or IP");?></td>
 		</tr>
         <tr>
-		  <td width="22%" valign="top" class="vncellreq">Hostname or IP</td>
+		  <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP");?></td>
 		  <td width="78%" class="vtable">
             <?=$mandfldhtml;?><input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>">
 			<? if ($resolved && $type) { ?>
@@ -116,15 +116,15 @@ include("head.inc"); ?>
 		</tr>
 <?php		if($_POST): ?>
 		<tr>
-		  <td width="22%" valign="top" class="vncell">Resolution time per server</td>
+		  <td width="22%" valign="top" class="vncell"><?=gettext("Resolution time per server");?></td>
 		  <td width="78%" class="vtable">
 				<table width="170" border="1" cellpadding="2" style="border-width: 1px 1px 1px 1px; border-collapse: collapse;">
 					<tr>
 						<td>
-							<b>Server</b>
+							<b><?=gettext("Server");?></b>
 						</td>
 						<td>
-							<b>Query time</b>
+							<b><?=gettext("Query time");?></b>
 						</td>
 					</tr>
 <?php
@@ -148,14 +148,14 @@ include("head.inc"); ?>
 		<?php endif; ?>
 		<?php if (!$input_errors && $ipaddr) { ?>
 		<tr>
-			<td width="22%" valign="top"  class="vncell">More Information:</td>
+			<td width="22%" valign="top"  class="vncell"><?=gettext("More Information:");?></td>
 			<td width="78%" class="vtable">
-				<a target="_new" href ="/diag_ping.php?host=<?=$host?>&interface=wan&count=3">Ping</a> <br/>
-				<a target="_new" href ="/diag_traceroute.php?host=<?=$host?>&ttl=18">Traceroute</a>
+				<a target="_new" href ="/diag_ping.php?host=<?=$host?>&interface=wan&count=3"><?=gettext("Ping");?></a> <br/>
+				<a target="_new" href ="/diag_traceroute.php?host=<?=$host?>&ttl=18"><?=gettext("Traceroute");?></a>
 				<p/>
-				NOTE: The following links are to external services, so their reliability cannot be guaranteed.<br/><br/>
-				<a target="_new" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?php echo $ipaddr; ?>">IP WHOIS @ DNS Stuff</a><br />
-				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>">IP Info @ DNS Stuff</a>
+				<?=gettext("NOTE: The following links are to external services, so their reliability cannot be guaranteed.");?><br/><br/>
+				<a target="_new" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP WHOIS @ DNS Stuff");?></a><br />
+				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff");?></a>
 			</td>
 		</tr>
 		<?php } ?>
@@ -163,7 +163,7 @@ include("head.inc"); ?>
 		  <td width="22%" valign="top">&nbsp;</td>
 		  <td width="78%">
 			<br/>&nbsp;
-            <input name="Submit" type="submit" class="formbtn" value="DNS Lookup">
+            <input name="Submit" type="submit" class="formbtn" value="<?=gettext("DNS Lookup");?>">
 		</td>
 		</tr>
 	</table>
diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php
index c3818f6..50cdb32 100755
--- a/usr/local/www/diag_dump_states.php
+++ b/usr/local/www/diag_dump_states.php
@@ -64,7 +64,7 @@ else {
 	exec("/sbin/pfctl -s state", $states);
 }
 
-$pgtitle = array("Diagnostics","Show States");
+$pgtitle = array(gettext("Diagnostics"),gettext("Show States"));
 include("head.inc");
 
 ?>
@@ -134,7 +134,7 @@ include("head.inc");
 				<tr>
 					<td>Current state count: <?=$current_statecount?></td>
 					<td style="font-weight:bold;" align="right">
-						<?=gettext("Filter expression:");?>
+						<?=gettext("Filter expression");?>:
 						<input type="text" name="filter" class="formfld search" value="<?=$_GET['filter'];?>" size="30" />
 						<input type="submit" class="formbtn" value="<?=gettext("Filter");?>" />
 					<td>
diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
index d0dd0b0..4400055 100755
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -46,7 +46,7 @@
 require("guiconfig.inc");
 require("ipsec.inc");
 
-$pgtitle = array("Status","IPsec","SAD");
+$pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SAD"));
 include("head.inc");
 
 $sad = ipsec_dump_sad();
@@ -70,10 +70,10 @@ if ($_GET['act'] == "del") {
 			<td>
 				<?php
 					$tab_array = array();
-					$tab_array[0] = array("Overview", false, "diag_ipsec.php");
-					$tab_array[1] = array("SAD", true, "diag_ipsec_sad.php");
-					$tab_array[2] = array("SPD", false, "diag_ipsec_spd.php");
-					$tab_array[3] = array("Logs", false, "diag_logs_ipsec.php");
+					$tab_array[0] = array(gettext("Overview"), false, "diag_ipsec.php");
+					$tab_array[1] = array(gettext("SAD"), true, "diag_ipsec_sad.php");
+					$tab_array[2] = array(gettext("SPD"), false, "diag_ipsec_spd.php");
+					$tab_array[3] = array(gettext("Logs"), false, "diag_logs_ipsec.php");
 					display_top_tabs($tab_array);
 				?>
 			</td>
@@ -84,12 +84,12 @@ if ($_GET['act'] == "del") {
 					<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
 						<?php if (count($sad)): ?>
 						<tr>
-							<td nowrap class="listhdrr">Source</td>
-							<td nowrap class="listhdrr">Destination</td>
-							<td nowrap class="listhdrr">Protocol</td>
-							<td nowrap class="listhdrr">SPI</td>
-							<td nowrap class="listhdrr">Enc. alg.</td>
-							<td nowrap class="listhdr">Auth. alg.</td>
+							<td nowrap class="listhdrr"><?=gettext("Source");?></td>
+							<td nowrap class="listhdrr"><?=gettext("Destination");?></td>
+							<td nowrap class="listhdrr"><?=gettext("Protocol");?></td>
+							<td nowrap class="listhdrr"><?=gettext("SPI");?></td>
+							<td nowrap class="listhdrr"><?=gettext("Enc. alg.");?></td>
+							<td nowrap class="listhdr"><?=gettext("Auth. alg.");?></td>
 							<td nowrap class="list"></td>
 						</tr>
 						<?php foreach ($sad as $sa): ?>
@@ -116,7 +116,7 @@ if ($_GET['act'] == "del") {
 						<?php else: ?>
 						<tr>
 							<td>
-								<p><strong>No IPsec security associations.</strong></p>
+								<p><strong><?=gettext("No IPsec security associations.");?></strong></p>
 							</td>
 						</tr>
 						<?php endif; ?>
@@ -129,8 +129,8 @@ if ($_GET['act'] == "del") {
 <p/>
 
 <span class="vexpl">
-<span class="red"><strong>Note:<br></strong></span>
-You can configure your IPsec <a href="vpn_ipsec.php">here</a>.
+<span class="red"><strong><?=gettext("Note");?>:<br></strong></span>
+<?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php"><?=gettext("here");?></a>.
 </span>
 
 <?php include("fend.inc"); ?>
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index 83d0ecd..98fe1bb 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -41,7 +41,7 @@
 ##|*MATCH=diag_logs_vpn.php*
 ##|-PRIV
 
-$pgtitle = array("Status","System logs","VPN");
+$pgtitle = array(gettext("Status"), gettext("System logs"), gettext("VPN"));
 require("guiconfig.inc");
 require_once("vpn.inc");
 
@@ -98,17 +98,17 @@ include("head.inc");
   <tr><td class="tabnavtbl">
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", true, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), true, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -117,7 +117,7 @@ include("head.inc");
 <form action="diag_logs_vpn.php" method="post">
 		<table width="100%" border="0" cellpadding="0" cellspacing="0"><tr>
 		  <td colspan="4" class="listtopic">
-			Choose which type of VPN you want to view.
+			<?=gettext("Choose which type of VPN you want to view.");?>
 		  </td></tr><tr>
 		  <td colspan="4">
 			<?php $vpns = array("pptp" => "PPTP", "pppoe" => "PPPoE", "l2tp" => "L2TP");
@@ -131,13 +131,13 @@ include("head.inc");
 		  </td></tr>
 		  <tr>
 		  <td colspan="4" class="listtopic">
-			    Last <?=$nentries;?> <?=$vpns[$vpntype];?> VPN log entries</td>
+				<?php printf(gettext("Last %s %s VPN log entries"),$nentries,$vpns[$vpntype]);?></td>
 			</tr>
 			<tr>
-			  <td class="listhdrr">Time</td>
-			  <td class="listhdrr">Action</td>
-			  <td class="listhdrr">User</td>
-			  <td class="listhdrr">IP address</td>
+			  <td class="listhdrr"><?=gettext("Time");?></td>
+			  <td class="listhdrr"><?=gettext("Action");?></td>
+			  <td class="listhdrr"><?=gettext("User");?></td>
+			  <td class="listhdrr"><?=gettext("IP address");?></td>
 			</tr>
 			<?php dump_clog_vpn("/var/log/{$vpntype}.log", $nentries); ?>
           </table>
diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index b5658f5..489cab6 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -40,7 +40,7 @@
 ##|*MATCH=diag_ping.php*
 ##|-PRIV
 
-$pgtitle = array("Diagnostics", "Ping");
+$pgtitle = array(gettext("Diagnostics"), gettext("Ping"));
 require("guiconfig.inc");
 
 define('MAX_COUNT', 10);
@@ -52,11 +52,11 @@ if ($_POST || $_REQUEST['host']) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "host count");
-	$reqdfieldsn = explode(",", "Host,Count");
+	$reqdfieldsn = array(gettext("Host"),gettext("Count"));
 	do_input_validation($_REQUEST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if (($_REQUEST['count'] < 1) || ($_REQUEST['count'] > MAX_COUNT)) {
-		$input_errors[] = "Count must be between 1 and {MAX_COUNT}";
+		$input_errors[] = sprintf(gettext("Count must be between 1 and %s"), MAX_COUNT);
 	}
 
 	if (!$input_errors) {
@@ -82,15 +82,15 @@ include("head.inc"); ?>
 			<form action="diag_ping.php" method="post" name="iform" id="iform">
 			  <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic">Ping</td>
+					<td colspan="2" valign="top" class="listtopic"><?=gettext("Ping"); ?></td>
 				</tr>
                 <tr>
-				  <td width="22%" valign="top" class="vncellreq">Host</td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Host"); ?></td>
 				  <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>"></td>
 				</tr>
 				<tr>
-				  <td width="22%" valign="top" class="vncellreq">Interface</td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Interface"); ?></td>
 				  <td width="78%" class="vtable">
 				  <select name="interface" class="formfld">
                       <?php $interfaces = get_configured_interface_with_descr();
@@ -103,7 +103,7 @@ include("head.inc"); ?>
 				  </td>
 				</tr>
 				<tr>
-				  <td width="22%" valign="top" class="vncellreq">Count</td>
+				  <td width="22%" valign="top" class="vncellreq"><?= gettext("Count"); ?></td>
 				  <td width="78%" class="vtable">
 					<select name="count" class="formfld" id="count">
 					<?php for ($i = 1; $i <= MAX_COUNT; $i++): ?>
@@ -114,14 +114,14 @@ include("head.inc"); ?>
 				<tr>
 				  <td width="22%" valign="top">&nbsp;</td>
 				  <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="Ping">
+                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Ping"); ?>">
 				</td>
 				</tr>
 				<tr>
 				<td valign="top" colspan="2">
 				<? if ($do_ping) {
 					echo "<font face='terminal' size='2'>";
-					echo("<strong>Ping output:</strong><br>");
+					echo "<strong>" . gettext("Ping output") . ":</strong><br>";
 					echo('<pre>');
 					$ifaddr = get_interface_ip($interface);
 					if ($ifaddr)
diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php
index d8f5436..bf7be9e 100755
--- a/usr/local/www/diag_pkglogs.php
+++ b/usr/local/www/diag_pkglogs.php
@@ -77,7 +77,7 @@ if(!$apkg) { // If we aren't looking for a specific package, locate the first pa
 	$i = $apkgid;
 }
 
-$pgtitle = array("Status","Package logs");
+$pgtitle = array(gettext("Status"),gettext("Package logs"));
 include("head.inc");
 
 ?>
@@ -88,7 +88,7 @@ include("head.inc");
   <ul id="tabnav">
     <?php
 	if($pkgwithlogging == false) {
-		print_info_box("No packages with logging facilities are currently installed.");
+		print_info_box(gettext("No packages with logging facilities are currently installed."));
 		echo '</ul></td></tr></table>';
 		include("fend.inc");
 		exit;
@@ -112,7 +112,7 @@ include("head.inc");
 		<table width="100%" border="0" cellspacing="0" cellpadding="0">
 		  <tr>
 			<td colspan="2" class="listtopic">
-			  Last <?= $nentries ?> <?= $curtab ?> log entries</td>
+			  <?php printf(gettext("Last %s %s log entries"),$nentries,$curtab); ?></td>
 		  </tr>
 		  <?php
 			$package =& $config['installedpackages']['package'][$apkgid];
diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php
index 1b136ab..94b94fd 100644
--- a/usr/local/www/diag_routes.php
+++ b/usr/local/www/diag_routes.php
@@ -67,7 +67,7 @@ include('head.inc');
 <tr>
 <td class="vncellreq" width="22%">&nbsp;</td>
 <td class="vtable" width="78%">
-<input type="submit" class="formbtn" name="submit" value="Show" />
+<input type="submit" class="formbtn" name="submit" value="<?=gettext("Show"); ?>" />
 <br />
 <br />
 <span class="vexpl"><span class="red"><strong>Note:</strong></span> By enabling name resolution, the query should take a bit longer. You can stop it at any time by clicking the Stop button in your browser.</span>
diff --git a/usr/local/www/diag_showbogons.php b/usr/local/www/diag_showbogons.php
index e3f45b3..95f71ec 100644
--- a/usr/local/www/diag_showbogons.php
+++ b/usr/local/www/diag_showbogons.php
@@ -55,11 +55,11 @@ if($_POST['Download']) {
 		sleep(1);
 	}
 	if($maxtimetowait < 90)
-		$savemsg = "The bogons database has been updated.";
+		$savemsg = gettext("The bogons database has been updated.");
 }
 
 $bogons = file_get_contents(trim("/etc/bogons"));
-$pgtitle = "Diagnostics: Show Bogons";
+$pgtitle = array(gettext("Diagnostics"),gettext("Show Bogons"));
 
 include("head.inc");
 ?>
@@ -87,7 +87,7 @@ pre { font-size: 1.15em; }
 					<tr>
 						<td>
 							<font size="+1">
-								<b>Currently loaded bogons table:</b><p/>
+								<b><?=gettext("Currently loaded bogons table");?>:</b><p/>
 								<pre>
 <?php echo $bogons; ?>
 								</pre>
@@ -103,7 +103,7 @@ pre { font-size: 1.15em; }
   </tr>
 </table>
 <p/>
-<input type="submit" name="Download" value="Download"> latest bogon data.
+<input type="submit" name="Download" value="<?=gettext("Download");?>"><?=gettext("latest bogon data.");?>
 </form>
 <?php include("fend.inc"); ?>
 </body>
diff --git a/usr/local/www/diag_states_summary.php b/usr/local/www/diag_states_summary.php
index 40d064f..cb0807a 100644
--- a/usr/local/www/diag_states_summary.php
+++ b/usr/local/www/diag_states_summary.php
@@ -121,12 +121,12 @@ function print_summary_table($label, $iparr, $sort = TRUE) { ?>
 <h3><?php echo $label; ?></h3>
 <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
-		<td class="listhdrr">IP</td>
-		<td class="listhdrr"># States</td>
-		<td class="listhdrr">Proto</td>
-		<td class="listhdrr"># States</td>
-		<td class="listhdrr">Src Ports</td>
-		<td class="listhdrr">Dst Ports</td>
+		<td class="listhdrr"><?=gettext("IP");?></td>
+		<td class="listhdrr"># <?=gettext("States");?></td>
+		<td class="listhdrr"><?=gettext("Proto");?></td>
+		<td class="listhdrr"># <?=gettext("States");?></td>
+		<td class="listhdrr"><?=gettext("Src Ports");?></td>
+		<td class="listhdrr"><?=gettext("Dst Ports");?></td>
 	</tr>
 <?php   if ($sort)
 		uksort($iparr, "sort_by_ip");
@@ -156,16 +156,16 @@ function print_summary_table($label, $iparr, $sort = TRUE) { ?>
 <?
 }
 
-$pgtitle = array("Diagnostics", "State Table Summary");
+$pgtitle = array(gettext("Diagnostics"),gettext("State Table Summary"));
 require_once("guiconfig.inc");
 include("head.inc");
 include("fbegin.inc");
 
 
-print_summary_table("By Source IP", $srcipinfo);
-print_summary_table("By Destination IP", $dstipinfo);
-print_summary_table("Total per IP", $allipinfo);
-print_summary_table("By IP Pair", $pairipinfo, FALSE);
+print_summary_table(gettext("By Source IP"), $srcipinfo);
+print_summary_table(gettext("By Destination IP"), $dstipinfo);
+print_summary_table(gettext("Total per IP"), $allipinfo);
+print_summary_table(gettext("By IP Pair"), $pairipinfo, FALSE);
 ?>
 
 <?php include("fend.inc"); ?>
diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php
index 6dcee5c..9778e8a 100644
--- a/usr/local/www/diag_system_pftop.php
+++ b/usr/local/www/diag_system_pftop.php
@@ -48,7 +48,7 @@ if($_REQUEST['getactivity']) {
 	if($_REQUEST['sorttype'])
 		$sorttype = escapeshellarg($_REQUEST['sorttype']);
 	else
-		$sorttype = "bytes";	
+		$sorttype = gettext("bytes");	
 	$text = `pftop -b -a -o {$sorttype}`;
 	echo $text;
 	exit;
@@ -59,7 +59,7 @@ include("head.inc");
 if($_REQUEST['sorttype'])
 	$sorttype = htmlentities($_REQUEST['sorttype']);
 else
-	$sorttype = "bytes";
+	$sorttype = gettext("bytes");
 
 ?>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
@@ -96,7 +96,7 @@ else
 		print_input_errors($input_errors);
 ?>
 	<form method="post">
-	Sort type: 
+	<?=gettext("Sort type"); ?>: 
 	<select name='sorttype' id='sorttype' onChange='this.form.submit();'>
 		<option value='<?=$sorttype?>'><?=$sorttype?></option>
 		<option value='age'>age</option>
diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php
index 7f30bbe..62b42e5 100755
--- a/usr/local/www/diag_traceroute.php
+++ b/usr/local/www/diag_traceroute.php
@@ -42,7 +42,7 @@
 
 require("guiconfig.inc");
 
-$pgtitle = array("Diagnostics","Traceroute");
+$pgtitle = array(gettext("Diagnostics"),gettext("Traceroute"));
 include("head.inc");
 
 ?>
@@ -59,11 +59,11 @@ if ($_POST || $_REQUEST['host']) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "host ttl");
-	$reqdfieldsn = explode(",", "Host,ttl");
+	$reqdfieldsn = array(gettext("Host"),gettext("ttl"));
 	do_input_validation($_REQUEST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if (($_REQUEST['ttl'] < 1) || ($_REQUEST['ttl'] > MAX_TTL)) {
-		$input_errors[] = "Maximum number of hops must be between 1 and {MAX_TTL}";
+		$input_errors[] = sprintf(gettext("Maximum number of hops must be between 1 and '%s'"), MAX_TLL);
 	}
 
 	if (!$input_errors) {
@@ -83,15 +83,15 @@ if (!isset($do_traceroute)) {
 			<form action="diag_traceroute.php" method="post" name="iform" id="iform">
 			  <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic">Traceroute</td>
+					<td colspan="2" valign="top" class="listtopic"><?=gettext("Traceroute");?></td>
 				</tr>	
                 <tr>
-				  <td width="22%" valign="top" class="vncellreq">Host</td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Host");?></td>
 				  <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>"></td>
 				</tr>
 				<tr>
-				  <td width="22%" valign="top" class="vncellreq">Maximum number of hops</td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Maximum number of hops");?></td>
 				  <td width="78%" class="vtable">
 					<select name="ttl" class="formfld" id="ttl">
 					<?php for ($i = 1; $i <= MAX_TTL; $i++): ?>
@@ -101,7 +101,7 @@ if (!isset($do_traceroute)) {
 				</tr>
 
 				<tr>
-				  <td width="22%" valign="top" class="vncellreq">Use ICMP</td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Use ICMP");?></td>
 				  <td width="78%" class="vtable">
 					<input name="useicmp" type="checkbox"<?php if($_REQUEST['useicmp']) echo " CHECKED"; ?>>
 					</td>
@@ -109,12 +109,12 @@ if (!isset($do_traceroute)) {
 				<tr>
 				  <td width="22%" valign="top">&nbsp;</td>
 				  <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="Traceroute">
+                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Traceroute");?>">
 				</td>
 				</tr>
 				<tr>
 				<td valign="top" colspan="2">
-				<p><span class="vexpl"><span class="red"><strong>Note: </strong></span> Traceroute may take a while to complete.  You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.<p>
+				<p><span class="vexpl"><span class="red"><b><?=gettext("Note");?>:</b></span><?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?><p>
 				<? if ($do_traceroute) {
 					echo "<font face='terminal' size='2'>";
 					echo("<br><strong>Traceroute output:</strong><br>");
@@ -133,7 +133,7 @@ if (!isset($do_traceroute)) {
 				<tr>
 				  <td width="22%" valign="top">&nbsp;</td>
 				  <td width="78%"> 
-					<span class="vexpl"><strong>Note: </strong></span> Multi-wan is not supported from this utility currently. 
+					<span class="vexpl"><b><?=gettext("Note");?>:</b></span><?=gettext("Multi-wan is not supported from this utility currently.");?> 
 				 </td>
 				</tr>					
 			</table>
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 277ad26..0823aec 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -647,7 +647,7 @@ include("head.inc");
 						$interfaces["openvpn"] = "OpenVPN";
 					$selected_interfaces = explode(",", $pconfig['interface']);
 					foreach ($interfaces as $iface => $ifacename): ?>
-						<option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && ( strcasecmp($pconfig['interface'], $iface) == 0 || in_array($iface, $selected_interfaces) )) echo "selected"; ?>><?=gettext($ifacename);?></option>
+						<option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && ( strcasecmp($pconfig['interface'], $iface) == 0 || in_array($iface, $selected_interfaces) )) echo "selected"; ?>><?=$ifacename?></option>
 <?php 				endforeach; ?>
 				</select>
 				<br />