Reset interface_* files

18 files changed, 448 insertions, 448 deletions

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 81f3694..94fd82f 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -177,7 +177,7 @@ $pconfig['enable'] = isset($wancfg['enable']);
 if (is_array($config['aliases']['alias'])) {
 	foreach($config['aliases']['alias'] as $alias) {
 		if($alias['name'] == $wancfg['descr']) {
-			$input_errors[] = sprintf(gettext("Sorry, an alias with the name '%s' already exists."),$wancfg['descr']);
+			$input_errors[] = gettext("Sorry, an alias with the name {$wancfg['descr']} already exists.");
 		}
 	}
 }
@@ -355,31 +355,31 @@ if ($_POST) {
 	switch($_POST['type']) {
 		case "static":
 			$reqdfields = explode(" ", "ipaddr subnet gateway");
-			$reqdfieldsn = array(gettext("IP address"),gettext("Subnet bit count"),gettext("Gateway"));
+			$reqdfieldsn = explode(",", "IP address,Subnet bit count,Gateway");
 			do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 			break;
 		case "ppp":
 			$reqdfields = explode(" ", "port phone");
-			$reqdfieldsn = array(gettext("Modem Port"),gettext("Phone Number"));
+			$reqdfieldsn = explode(",", "Modem Port,Phone Number");
 			do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 			break;
 		case "PPPoE":
 			if ($_POST['pppoe_dialondemand']) {
 				$reqdfields = explode(" ", "pppoe_username pppoe_password pppoe_dialondemand pppoe_idletimeout");
-				$reqdfieldsn = array(gettext("PPPoE username"),gettext("PPPoE password"),gettext("Dial on demand"),gettext("Idle timeout value"));
+				$reqdfieldsn = explode(",", "PPPoE username,PPPoE password,Dial on demand,Idle timeout value");
 			} else {
 				$reqdfields = explode(" ", "pppoe_username pppoe_password");
-				$reqdfieldsn = array(gettext("PPPoE username"),gettext("PPPoE password"));
+				$reqdfieldsn = explode(",", "PPPoE username,PPPoE password");
 			}
 			do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 			break;
 		case "PPTP":
 			if ($_POST['pptp_dialondemand']) {
 				$reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote pptp_dialondemand pptp_idletimeout");
-				$reqdfieldsn = array(gettext("PPTP username"),gettext("PPTP password"),gettext("PPTP local IP address"),gettext("PPTP subnet"),gettext("PPTP remote IP address"),gettext("Dial on demand"),gettext("Idle timeout value"));
+				$reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address,Dial on demand,Idle timeout value");
 			} else {
 				$reqdfields = explode(" ", "pptp_username pptp_password pptp_local pptp_subnet pptp_remote");
-				$reqdfieldsn = array(gettext("PPTP username"),gettext("PPTP password"),gettext("PPTP local IP address"),gettext("PPTP subnet"),gettext("PPTP remote IP address"));
+				$reqdfieldsn = explode(",", "PPTP username,PPTP password,PPTP local IP address,PPTP subnet,PPTP remote IP address");
 			}
 			do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 			break;
@@ -433,7 +433,7 @@ if ($_POST) {
 	/* Wireless interface? */
 	if (isset($wancfg['wireless'])) {
 		$reqdfields = explode(" ", "mode ssid");
-		$reqdfieldsn = array(gettext("Mode"),gettext("SSID"));
+		$reqdfieldsn = explode(",", "Mode,SSID");
 		do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 		check_wireless_mode();
 		/* loop through keys and enforce size */
@@ -804,7 +804,7 @@ function check_wireless_mode() {
 	}
 }
 
-$pgtitle = array(gettext("Interfaces"),sprintf(gettext("'%s'"),$pconfig['descr']));
+$pgtitle = array("Interfaces", $pconfig['descr']);
 $statusurl = "status_interfaces.php";
 
 $closehead = false;
@@ -974,7 +974,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" =
 	<form action="interfaces.php" method="post" name="iform" id="iform">
 		<?php if ($input_errors) print_input_errors($input_errors); ?>
 		<?php if (is_subsystem_dirty('interfaces')): ?><p>
-		<?php print_info_box_np(printf(gettext("The '%s' configuration has been changed."),$wancfg['descr'])."<p>".gettext("You must apply the changes in order for them to take effect.")."<p>".gettext("Don't forget to adjust the DHCP Server range if needed after applying."));?><br />
+		<?php print_info_box_np(gettext("The {$wancfg['descr']} configuration has been changed.<p>You must apply the changes in order for them to take effect.<p>Don't forget to adjust the DHCP Server range if needed after applying."));?><br />
 		<?php endif; ?>
 		<?php if ($savemsg) print_info_box($savemsg); ?>
 		<table width="100%" border="0" cellpadding="6" cellspacing="0">
@@ -999,7 +999,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" =
 							<td width="22%" valign="top" class="vncell">Description</td>
 							<td width="78%" class="vtable">
 								<input name="descr" type="text" class="formfld unknown" id="descr" size="30" value="<?=htmlspecialchars($pconfig['descr']);?>">
-								<br><span class="vexpl"><?= gettext("Enter a description (name) for the interface here."); ?></span>
+								<br><span class="vexpl">Enter a description (name) for the interface here.</span>
 							</td>
 						</tr>
 						<tr>
@@ -1312,7 +1312,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" =
 									<tr>
 										<td width="22%" valign="top" class="vncell">Service name</td>
 										<td width="78%" class="vtable"><input name="provider" type="text" class="formfld unknown" id="provider" size="20" value="<?=htmlspecialchars($pconfig['provider']);?>">
-											<br> <span class="vexpl"><?= gettext("Hint: this field can usually be left empty"); ?></span>
+											<br> <span class="vexpl">Hint: this field can usually be left empty</span>
 										</td>
 									</tr>
 									<tr>
@@ -1354,7 +1354,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" =
 														<input name="pppoe_resetdate" type="text" class="w8em format-m-d-y highlight-days-67" id="pppoe_resetdate" maxlength="10" size="10" value="<?=htmlspecialchars($pconfig['pppoe_resetdate']);?>" /> 
 														<?= gettext("reset at a specific date (mm/dd/yyyy)"); ?>
 														<br />&nbsp;<br />
-														<span class="red"><strong><?= gettext("Note"); ?>: </strong></span>
+														<span class="red"><strong>Note: </strong></span>
 														<?= gettext("If you leave the date field empty, the reset will be executed each day at the time you did specify using the minutes and hour field."); ?>
 														</p>
 														<?php if ($pconfig['pppoe_pr_preset']): ?>
@@ -1824,7 +1824,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" =
 							<td class="vtable">
 								<input name="ieee8021x" type="checkbox" value="yes"  class="formfld" id="ieee8021x" <? if ($pconfig['ieee8021x']) echo "checked";?>>
 								<br/>Setting this option will enable 802.1x authentication.
-								<br/><span class="red"><strong><?= gettext("NOTE"); ?>:</strong</span> this option requires checking the "Enable WPA box".
+								<br/><span class="red"><strong>NOTE:</strong</span> this option requires checking the "Enable WPA box".
 							</td>
 						</tr>
 						<tr>
@@ -1889,7 +1889,7 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "ppp" =
 							</td>
 							<td>
 								<br/>
-								<input id="save" name="Submit" type="submit" class="formbtn" value="<?= gettext("Save"); ?>"> 
+								<input id="save" name="Submit" type="submit" class="formbtn" value="Save"> 
 								<input id="cancel" type="button" class="formbtn" value="Cancel" onclick="history.back()">
 								<input name="if" type="hidden" id="if" value="<?=$if;?>">
 								<?php if ($wancfg['if'] == $a_ppps[$pppid]['if']) : ?>
diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php
index 28349fa..2c38e80 100755
--- a/usr/local/www/interfaces_assign.php
+++ b/usr/local/www/interfaces_assign.php
@@ -40,7 +40,7 @@
 ##|*MATCH=interfaces_assign.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Interfaces"),gettext("Assign network ports"));
+$pgtitle = array("Interfaces", "Assign network ports");
 $statusurl = "status_interfaces.php";
 
 require("guiconfig.inc");
@@ -182,9 +182,9 @@ if ($_POST['apply']) {
 	/* Deliver error message for any port with more than one assignment */
 	foreach ($portifmap as $portname => $ifnames) {
 		if (count($ifnames) > 1) {
-			$errstr = sprintf(gettext("Port '%s' ".
-				" was assigned to '%s'" .
-				" interfaces:"), $portname, count($ifnames));
+			$errstr = "Port " . $portname .
+				" was assigned to " . count($ifnames) .
+				" interfaces:";
 				
 			foreach ($portifmap[$portname] as $ifn)
 				$errstr .= " " . $ifn;
@@ -246,11 +246,11 @@ if ($_GET['act'] == "del") {
 	$id = $_GET['id'];
 
 	if (link_interface_to_bridge($id))
-		$input_errors[] = gettext("The interface is part of a bridge. Please remove it from the bridge to continue");
+		$input_errors[] = "The interface is part of a bridge. Please remove it from the bridge to continue";
 	else if (link_interface_to_gre($id))
-		$input_errors[] = gettext("The interface is part of a gre tunnel. Please delete the tunnel to continue");
+		$input_errors[] = "The interface is part of a gre tunnel. Please delete the tunnel to continue";
 	else if (link_interface_to_gif($id))
-		$input_errors[] = gettext("The interface is part of a gif tunnel. Please delete the tunnel to continue");
+		$input_errors[] = "The interface is part of a gif tunnel. Please delete the tunnel to continue";
 	else {
 		unset($config['interfaces'][$id]['enable']);
 		$realid = get_real_interface($id);
@@ -300,15 +300,15 @@ if ($_GET['act'] == "del") {
 
 		link_interface_to_vlans($realid, "update");
 	
-		$savemsg = gettext("Interface has been deleted.");
+		$savemsg = "Interface has been deleted.";
 	}
 }
 
 if ($_GET['act'] == "add") {
 	/* find next free optional interface number */
 	if(!$config['interfaces']['lan']) {
-		$newifname = gettext("lan");
-		$descr = gettext("LAN");
+		$newifname = "lan";
+		$descr = "LAN";
 		$config['interfaces'][$newifname] = array();
 		$config['interfaces'][$newifname]['descr'] = $descr;
 	} else {
@@ -317,7 +317,7 @@ if ($_GET['act'] == "add") {
 				break;
 		}
 		$newifname = 'opt' . $i;
-		$descr = sprintf(gettext("OPT '%s'"),$i);
+		$descr = "OPT{$i}";
 		$config['interfaces'][$newifname] = array();
 		$config['interfaces'][$newifname]['descr'] = $descr;
 	}
@@ -348,7 +348,7 @@ if ($_GET['act'] == "add") {
 
 	write_config();
 
-	$savemsg = gettext("Interface has been added.");
+	$savemsg = "Interface has been added.";
 
 }
 
@@ -371,9 +371,9 @@ include("head.inc");
 
 if(file_exists("/var/run/interface_mismatch_reboot_needed")) 
 	if ($_POST)
-		$savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot.");
+		$savemsg = "Reboot is needed. Please apply the settings in order to reboot.";
 	else
-		$savemsg = gettext("Interface mismatch detected.  Please resolve the mismatch and click Save.  The firewall will reboot afterwards.");
+		$savemsg = "Interface mismatch detected.  Please resolve the mismatch and click Save.  The firewall will reboot afterwards.";
 
 ?>
 
@@ -429,7 +429,7 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
 		  <?php foreach ($portlist as $portname => $portinfo): ?>
 			<option value="<?=$portname;?>"  <?php if ($portname == $iface['if']) echo " selected";?>>
 				<?php if ($portinfo['isvlan']) {
-					$descr = sprintf(gettext("VLAN '%s' on '%s'"),$portinfo['tag'],$portinfo['if']);
+					$descr = "VLAN {$portinfo['tag']} on {$portinfo['if']}";
 				if ($portinfo['descr'])
 					$descr .= " (" . $portinfo['descr'] . ")";
 					echo htmlspecialchars($descr);
@@ -470,7 +470,7 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
 	</td>
 	<td valign="middle" class="list">
 		  <?php if ($ifname != 'wan'): ?>
-		  <a href="interfaces_assign.php?act=del&id=<?=$ifname;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title=<?=gettext("delete interface"); ?> width="17" height="17" border="0"></a> 
+		  <a href="interfaces_assign.php?act=del&id=<?=$ifname;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="delete interface" width="17" height="17" border="0"></a> 
 		  <?php endif; ?>
 		</td>
   </tr>
@@ -479,7 +479,7 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
   <tr>
 	<td class="list" colspan="2"></td>
 	<td class="list" nowrap>
-	<a href="interfaces_assign.php?act=add"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title=<?=gettext("add interface"); ?> width="17" height="17" border="0"></a>
+	<a href="interfaces_assign.php?act=add"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add interface" width="17" height="17" border="0"></a>
 	</td>
   </tr>
   <?php else: ?>
@@ -490,14 +490,14 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed"))
 </table>
 </div>
 <br/>
-<input name="Submit" type="submit" class="formbtn" value=<?=gettext("Save"); ?>><br><br>
+<input name="Submit" type="submit" class="formbtn" value="Save"><br><br>
 <p>
 </p>
 <ul>
-  <li><span class="vexpl"><?=gettext("change the IP address of your computer"); ?></span></li>
-  <li><span class="vexpl"><?=gettext("renew its DHCP lease"); ?></span></li>
-  <li><span class="vexpl"><?=gettext("access the webConfigurator with the new IP address"); ?></span></li>
-  <li><span class="vexpl"><?=gettext("interfaces that are configured as members of a lagg(4) interface will not be shown."); ?></span></li>
+  <li><span class="vexpl">change the IP address of your computer</span></li>
+  <li><span class="vexpl">renew its DHCP lease</span></li>
+  <li><span class="vexpl">access the webConfigurator with the new IP address</span></li>
+  <li><span class="vexpl">interfaces that are configured as members of a lagg(4) interface will not be shown.</span></li>
 </ul></td>
 	</tr>
 </table>
diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php
index 6679afb..1b2b304 100644
--- a/usr/local/www/interfaces_bridge_edit.php
+++ b/usr/local/www/interfaces_bridge_edit.php
@@ -104,45 +104,45 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "members");
-	$reqdfieldsn = array(gettext("Member Interfaces"));
+	$reqdfieldsn = explode(",", "Member Interfaces");
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if ($_POST['maxage'] && !is_numeric($_POST['maxage']))
-		$input_errors[] = gettext("Maxage needs to be an integer between 6 and 40.");
+		$input_errors[] = "Maxage needs to be an integer between 6 and 40.";
 	if ($_POST['maxaddr'] && !is_numeric($_POST['maxaddr']))
-		$input_errors[] = gettext("Maxaddr needs to be an integer.");
+		$input_errors[] = "Maxaddr needs to be an integer.";
 	if ($_POST['timeout'] && !is_numeric($_POST['timeout']))
-		$input_errors[] = gettext("Timeout needs to be an integer.");
+		$input_errors[] = "Timeout needs to be an integer.";
 	if ($_POST['fwdelay'] && !is_numeric($_POST['fwdelay']))
-		$input_errors[] = gettext("Forward Delay needs to be an integer between 4 and 30.");
+		$input_errors[] = "Forward Delay needs to be an integer between 4 and 30.";
 	if ($_POST['hellotime'] && !is_numeric($_POST['hellotime']))
-		$input_errors[] = gettext("Hello time for STP needs to be an integer between 1 and 2.");
+		$input_errors[] = "Hello time for STP needs to be an integer between 1 and 2.";
 	if ($_POST['priority'] && !is_numeric($_POST['priority']))
-		$input_errors[] = gettext("Priority for STP needs to be an integer between 0 and 61440.");
+		$input_errors[] = "Priority for STP needs to be an integer between 0 and 61440.";
 	if ($_POST['holdcnt'] && !is_numeric($_POST['holdcnt']))
-		$input_errors[] = gettext("Transmit Hold Count for STP needs to be an integer between 1 and 10.");
+		$input_errors[] = "Transmit Hold Count for STP needs to be an integer between 1 and 10.";
 	foreach ($ifacelist as $ifn => $ifdescr) {
 		if ($_POST[$ifn] <> "" && !is_numeric($_POST[$ifn]))
-			$input_errors[] = "{$ifdescr} " . gettext("interface priority for STP needs to be an integer between 0 and 240.");
+			$input_errors[] = "{$ifdescr} interface priority for STP needs to be an integer between 0 and 240.";
 	}
 	$i = 0;
 	foreach ($ifacelist as $ifn => $ifdescr) {
 		if ($_POST["{$ifn}{$i}"] <> "" && !is_numeric($_POST["{$ifn}{$i}"]))
-			$input_errors[] = "{$ifdescr} " . gettext("interface path cost for STP needs to be an integer between 1 and 200000000.");
+			$input_errors[] = "{$ifdescr} interface path cost for STP needs to be an integer between 1 and 200000000.";
 		$i++;
 	}
 
 	if (!is_array($_POST['members']) || count($_POST['members']) < 2)
-		$input_errors[] = gettext("You must select at least 2 member interfaces for a bridge.");
+		$input_errors[] = "You must select at least 2 member interfaces for a bridge.";
 
 	if (is_array($_POST['members'])) {
 		foreach($_POST['members'] as $ifmembers) {
 			if (is_array($config['interfaces'][$ifmembers]['wireless']) &&
 				$config['interfaces'][$ifmembers]['wireless']['mode'] != "hostap")
-				$input_errors[] = gettext("Bridging a wireless interface is only possible in hostap mode.");
+				$input_errors[] = "Bridging a wireless interface is only possible in hostap mode.";
 			if ($_POST['span'] != "none" && $_POST['span'] == $ifmembers)
-				$input_errors[] = gettext("Span interface cannot be part of the bridge. Remove the span interface from bridge members to continue.");
+				$input_errors[] = "Span interface cannot be part of the bridge. Remove the span interface from bridge members to continue.";
 		}
 	}
 
@@ -199,7 +199,7 @@ if ($_POST) {
 		$bridge['bridgeif'] = $_POST['bridgeif'];
                 $bridge['bridgeif'] = interface_bridge_configure($bridge);
                 if ($bridge['bridgeif'] == "" || !stristr($bridge['bridgeif'], "bridge"))
-                        $input_errors[] = gettext("Error occured creating interface, please retry.");
+                        $input_errors[] = "Error occured creating interface, please retry.";
                 else {
                         if (isset($id) && $a_bridges[$id])
                                 $a_bridges[$id] = $bridge;
@@ -219,7 +219,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Firewall"),gettext("Bridge"),gettext("Edit"));
+$pgtitle = array("Firewall","Bridge","Edit");
 include("head.inc");
 
 ?>
@@ -246,10 +246,10 @@ function show_source_port_range() {
             <form action="interfaces_bridge_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("Bridge configuration"); ?></td>
+					<td colspan="2" valign="top" class="listtopic">Bridge configuration</td>
 				</tr>
 				<tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Member interfaces"); ?></td>
+                  <td width="22%" valign="top" class="vncellreq">Member interfaces</td>
                   <td width="78%" class="vtable">
 				  <select name="members[]" multiple="true" class="formselect" size="3">
                       <?php
@@ -262,11 +262,11 @@ function show_source_port_range() {
 		      		?>
                     </select>
 			<br/>
-			<span class="vexpl"><?=gettext("Interfaces participating in the bridge."); ?></span>
+			<span class="vexpl">Interfaces participating in the bridge.</span>
 			</td>
             </tr>
 			<tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
+                  <td width="22%" valign="top" class="vncell">Description</td>
                   <td width="78%" class="vtable">
 				  <input type="text" name="descr" id="descr" class="formfld unknown" size="50" value="<?=$pconfig['descr'];?>">
 				 	</td>
@@ -281,10 +281,10 @@ function show_source_port_range() {
                   <td valign="top" class="vncell" align="middle">RSTP/STP  </td>
                   <td class="vtable">
 					<input type="checkbox" name="enablestp" id="enablestp" <?php if ($pconfig['enablestp']) echo "checked";?>>
-					<span class="vexpl"><strong><?=gettext("Enable spanning tree options for this bridge."); ?> </strong></span>
+					<span class="vexpl"><strong>Enable spanning tree options for this bridge. </strong></span>
 					<br/><br/>
 				  	<table id="stpoptions" name="stpoptions" border="0" cellpadding="6" cellspacing="0">
-					<tr><td valign="top" class="vncell" width="20%"><?=gettext("Protocol"); ?></td>
+					<tr><td valign="top" class="vncell" width="20%">Protocol</td>
 					<td class="vtable" width="80%">
 				  	<select name="proto" id="proto">
 						<?php 
@@ -297,9 +297,9 @@ function show_source_port_range() {
 						?>
 					</select>
                     <br/>
-                    <span class="vexpl"><?=gettext("Protocol used for spanning tree."); ?> </span></td>
+                    <span class="vexpl">Protocol used for spanning tree. </span></td>
 					</td></tr>
-					<tr> <td valign="top" class="vncell" width="20%"><?=gettext("STP interfaces"); ?></td>
+					<tr> <td valign="top" class="vncell" width="20%">STP interfaces</td>
 					<td class="vtable" width="80%">
 				  	<select name="stp[]" class="formselect" multiple="true" size="3">
 						<?php 
@@ -312,61 +312,61 @@ function show_source_port_range() {
 						?>
 					</select>
 					<br/>
-					<span class="vexpl" >
-	     <?=gettext("Enable Spanning Tree Protocol on interface.  The if_bridge(4) " .
-	     "driver has support for the IEEE 802.1D Spanning Tree Protocol " .
-	     "(STP).  STP is used to detect and remove loops in a " .
-	     "network topology."); ?>
+					<span class="vexpl" > 
+	     Enable Spanning Tree Protocol on interface.  The if_bridge(4)
+	     driver has support for the IEEE 802.1D Spanning Tree Protocol
+	     (STP).  STP is used to detect and remove loops in a
+	     network topology.
 					</span>
 					</td></tr>
-					<tr><td valign="top" class="vncell" width="20%"><?=gettext("Valid time"); ?></td>
+					<tr><td valign="top" class="vncell" width="20%">Valid time</td>
 					<td class="vtable" width="80%">
-					<input name="maxage" type="text" class="formfld unkown" id="maxage" size="8" value="<?=$pconfig['maxage'];?>"> <?=gettext("seconds"); ?>
+					<input name="maxage" type="text" class="formfld unkown" id="maxage" size="8" value="<?=$pconfig['maxage'];?>"> seconds
 					<br/>
 					<span class="vexpl">
-	     <?=gettext("Set the time that a Spanning Tree Protocol configuration is " .
-	     "valid.  The default is 20 seconds.  The minimum is 6 seconds and " .
-	     "the maximum is 40 seconds."); ?>
+	     Set the time that a Spanning Tree Protocol configuration is
+	     valid.  The default is 20 seconds.  The minimum is 6 seconds and
+	     the maximum is 40 seconds.
 					</span>
 					</td></tr>
-					<tr><td valign="top" class="vncell" width="20%"><?=gettext("Forward time"); ?> </td>
+					<tr><td valign="top" class="vncell" width="20%">Forward time </td>
 					<td class="vtable" width="80%">
-					<input name="fwdelay" type="text" class="formfld unkown" id="fwdelay" size="8" value="<?=$pconfig['fwdelay'];?>"> <?=gettext("seconds"); ?>
+					<input name="fwdelay" type="text" class="formfld unkown" id="fwdelay" size="8" value="<?=$pconfig['fwdelay'];?>"> seconds
 					<br/>
 					<span class="vexpl">
-	     <?=gettext("Set the time that must pass before an interface begins forwarding " .
-	     "packets when Spanning Tree is enabled.  The default is 15 seconds.  The minimum is 4 seconds and the maximum is 30 seconds."); ?>		
+	     Set the time that must pass before an interface begins forwarding
+	     packets when Spanning Tree is enabled.  The default is 15 seconds.  The minimum is 4 seconds and the maximum is 30 seconds.		
 					</span>
 					</td></tr>
-					<tr><td valign="top" class="vncell" width="20%"><?=gettext("Hello time"); ?></td>
+					<tr><td valign="top" class="vncell" width="20%">Hello time</td>
 					<td class="vtable" width="80%">
-					<input name="hellotime" type="text" class="formfld unkown" size="8" id="hellotime" value="<?=$pconfig['hellotime'];?>"> <?=gettext("seconds"); ?>
+					<input name="hellotime" type="text" class="formfld unkown" size="8" id="hellotime" value="<?=$pconfig['hellotime'];?>"> seconds
 					<br/>
 					<span class="vexpl">
-	     <?=gettext("Set the time between broadcasting of Spanning Tree Protocol configuration messages.  The hello time may only be changed when " .
-	     "operating in legacy STP mode.  The default is 2 seconds.  The minimum is 1 second and the maximum is 2 seconds."); ?>		
+	     Set the time between broadcasting of Spanning Tree Protocol configuration messages.  The hello time may only be changed when
+	     operating in legacy STP mode.  The default is 2 seconds.  The minimum is 1 second and the maximum is 2 seconds.		
 					</span>
 					</td></tr>
-					<tr><td valign="top" class="vncell" width="20%"><?=gettext("Priority"); ?></td>
+					<tr><td valign="top" class="vncell" width="20%">Priority</td>
 					<td class="vtable" width="80%">
 					<input name="priority" type="text" class="formfld unkown" id="priority" value="<?=$pconfig['priority'];?>">
 					<br/>
 					<span class="vexpl">
-	     <?=gettext("Set the bridge priority for Spanning Tree.  The default is 32768. " .
-	     "The minimum is 0 and the maximum is 61440."); ?>		
+	     Set the bridge priority for Spanning Tree.  The default is 32768.
+	     The minimum is 0 and the maximum is 61440.		
 					</span>
 					</td></tr>
-					<tr><td valign="top" class="vncell" width="20%"><?=gettext("Hold count"); ?></td>
+					<tr><td valign="top" class="vncell" width="20%">Hold count</td>
 					<td class="vtable" width="80%">
 					<input name="holdcnt" type="text" class="formfld unkown" id="holdcnt" value="<?=$pconfig['holdcnt'];?>">
 					<br/>
 					<span class="vexpl">
-	     <?=gettext("Set the transmit hold count for Spanning Tree.  This is the num- " .
-	     "ber of packets transmitted before being rate limited.  The " .
-	     "default is 6.  The minimum is 1 and the maximum is 10."); ?>		
+	     Set the transmit hold count for Spanning Tree.  This is the num-
+	     ber of packets transmitted before being rate limited.  The
+	     default is 6.  The minimum is 1 and the maximum is 10.		
 					</span>
 					</td></tr>
-					<tr><td valign="top" class="vncell" width="20%"><?=gettext("Priority"); ?></td>
+					<tr><td valign="top" class="vncell" width="20%">Priority</td>
 					<td class="vtable" width="80%">
 					<table>
 					<?php foreach ($ifacelist as $ifn => $ifdescr) 
@@ -375,11 +375,11 @@ function show_source_port_range() {
 					</table>
 					<br/>
 					<span class="vexpl" > 
-	     <?=gettext("Set the Spanning Tree priority of interface to value.  The " .
-	     "default is 128.  The minimum is 0 and the maximum is 240."); ?>		
+	     Set the Spanning Tree priority of interface to value.  The
+	     default is 128.  The minimum is 0 and the maximum is 240.		
 					</span>
 					</td></tr>
-					<tr><td valign="top" class="vncell" width="20%"><?=gettext("Path cost"); ?></td>
+					<tr><td valign="top" class="vncell" width="20%">Path cost</td>
 					<td class="vtable" width="80%">
 					<table>
 					<?php $i = 0; foreach ($ifacelist as $ifn => $ifdescr)
@@ -388,40 +388,40 @@ function show_source_port_range() {
 					</table>
 					<br/>
 					<span class="vexpl" > 
-	     <?=gettext("Set the Spanning Tree path cost of interface to value.  The " .
-	     "default is calculated from the link speed.  To change a previously selected path cost back to automatic, set the cost to 0. ".
-	     "The minimum is 1 and the maximum is 200000000."); ?>		
+	     Set the Spanning Tree path cost of interface to value.  The
+	     default is calculated from the link speed.  To change a previously selected path cost back to automatic, set the cost to 0.
+	     The minimum is 1 and the maximum is 200000000.		
 					</span>
 					</td></tr>
 
 			    </table>
 				</tr>
                 <tr style="display:none" id="sprtable2" name="sprtable2">
-                  <td valign="top" class="vncell"><?=gettext("Cache size"); ?></td>
+                  <td valign="top" class="vncell">Cache size</td>
 					<td class="vtable">
 						<input name="maxaddr" size="10" type="text" class="formfld unkown" id="maxaddr" value="<?=$pconfig['maxaddr'];?>"> entries
 					<br/><span class="vexpl">		
-<?=gettext("Set the size of the bridge address cache to size.	The default is " .
-	     ".100 entries."); ?>
+Set the size of the bridge address cache to size.	The default is
+	     100 entries.
 					</span>					
 					</td>
 				</tr>
                 <tr style="display:none" id="sprtable3" name="sprtable3">
-                  <td valign="top" class="vncell"><?=gettext("Cache entry expire time"); ?></td>
+                  <td valign="top" class="vncell">Cache entry expire time</td>
 				  <td>
 					<input name="timeout" type="text" class="formfld unkown" id="timeout" size="10" value="<?=$pconfig['timeout'];?>"> seconds
 					<br/><span class="vexpl">		
-	     <?=gettext("Set the timeout of address cache entries to this number of seconds.  If " .
-	     "seconds is zero, then address cache entries will not be expired. " .
-	     "The default is 240 seconds."); ?>
+	     Set the timeout of address cache entries to this number of seconds.  If
+	     seconds is zero, then address cache entries will not be expired.
+	     The default is 240 seconds.
 					</span>					
 					</td>
 				</tr>
                 <tr style="display:none" id="sprtable4" name="sprtable4">
-                  <td valign="top" class="vncell"><?=gettext("Span port"); ?></td>
+                  <td valign="top" class="vncell">Span port</td>
 					<td class="vtable">
 				  	<select name="span" class="formselect" id="span">
-						<option value="none" selected><?=gettext("None"); ?></option>
+						<option value="none" selected>None</option>
 						<?php 
 							foreach ($ifacelist as $ifn => $ifdescr) {
 								echo "<option value=\"{$ifn}\"";
@@ -432,21 +432,21 @@ function show_source_port_range() {
 						?>
 					</select>
 					<br/><span class="vexpl">		
-	     <?=gettext("Add the interface named by interface as a span port on the " .
-	     "bridge.  Span ports transmit a copy of every frame received by " .
-	     "the bridge.  This is most useful for snooping a bridged network " .
-	     "passively on another host connected to one of the span ports of " .
-	     "the bridge."); ?>		
+	     Add the interface named by interface as a span port on the
+	     bridge.  Span ports transmit a copy of every frame received by
+	     the bridge.  This is most useful for snooping a bridged network
+	     passively on another host connected to one of the span ports of
+	     the bridge.		
 					</span>
 		<p class="vexpl"><span class="red"><strong>
-					 <?=gettext("Note:"); ?><br>
+					 Note:<br>
                                   </strong></span>
-                 <?=gettext("The span interface cannot be part of the bridge member interfaces."); ?>
+                 The span interface cannot be part of the bridge member interfaces.
                                         </span>
 					</td>
 				</tr>
                 <tr style="display:none" id="sprtable5" name="sprtable5">
-                  <td valign="top" class="vncell"><?=gettext("Edge ports"); ?></td>
+                  <td valign="top" class="vncell">Edge ports</td>
                   <td class="vtable">
 				  	<select name="edge[]" class="formselect" multiple="true" size="3">
 						<?php 
@@ -460,13 +460,13 @@ function show_source_port_range() {
 					</select>
                     <br>
                     <span class="vexpl">
-	     <?=gettext("Set interface as an edge port.  An edge port connects directly to " .
-	     "end stations and cannot create bridging loops in the network; this " .
-	     "allows it to transition straight to forwarding."); ?>			
+	     Set interface as an edge port.  An edge port connects directly to
+	     end stations and cannot create bridging loops in the network; this
+	     allows it to transition straight to forwarding.			
 					</span></td>
 			    </tr>
                 <tr style="display:none" id="sprtable6" name="sprtable6">
-                  <td valign="top" class="vncell"><?=gettext("Auto Edge ports"); ?></td>
+                  <td valign="top" class="vncell">Auto Edge ports</td>
                   <td class="vtable">
 				  	<select name="autoedge[]" class="formselect" multiple="true" size="3">
 						<?php 
@@ -480,16 +480,16 @@ function show_source_port_range() {
 					</select>
                     <br>
                     <span class="vexpl">
-	     <?=gettext("Allow interface to automatically detect edge status.  This is the " .
-	     "default for all interfaces added to a bridge."); ?>
+	     Allow interface to automatically detect edge status.  This is the
+	     default for all interfaces added to a bridge.
 		 <p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note:"); ?><br>
+				  Note:<br>
 				  </strong></span>
-		 <?=gettext("This will disable the autoedge status of interfaces."); ?>
+		 This will disable the autoedge status of interfaces.
 					</span></td>
 			    </tr>
                 <tr style="display:none" id="sprtable7" name="sprtable7">
-                  <td valign="top" class="vncell"><?=gettext("PTP ports"); ?></td>
+                  <td valign="top" class="vncell">PTP ports</td>
                   <td class="vtable">
 				  	<select name="ptp[]" class="formselect" multiple="true" size="3">
 						<?php 
@@ -503,13 +503,13 @@ function show_source_port_range() {
 					</select>
                     <br>
                     <span class="vexpl">
-	     <?=gettext("Set the interface as a point-to-point link.  This is required for " .
-	     "straight transitions to forwarding and should be enabled on a " .
-	     "direct link to another RSTP-capable switch."); ?>
+	     Set the interface as a point-to-point link.  This is required for
+	     straight transitions to forwarding and should be enabled on a
+	     direct link to another RSTP-capable switch.
 					</span></td>
 			    </tr>
                 <tr style="display:none" id="sprtable8" name="sprtable8">
-                  <td valign="top" class="vncell"><?=gettext("Auto PTP ports"); ?></td>
+                  <td valign="top" class="vncell">Auto PTP ports</td>
                   <td class="vtable">
 				  	<select name="autoptp[]" class="formselect" multiple="true" size="3">
 						<?php 
@@ -523,17 +523,17 @@ function show_source_port_range() {
 					</select>
                     <br>
                     <span class="vexpl">
-	     <?=gettext("Automatically detect the point-to-point status on interface by " .
-	     "checking the full duplex link status.  This is the default for " .
-	     "interfaces added to the bridge."); ?>
+	     Automatically detect the point-to-point status on interface by
+	     checking the full duplex link status.  This is the default for
+	     interfaces added to the bridge.
 		 		 <p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note:"); ?><br>
+				  Note:<br>
 				  </strong></span>
-		 <?=gettext("The interfaces selected here will be removed from default autoedge status."); ?>
+		 The interfaces selected here will be removed from default autoedge status.
 					</span></td>
 			    </tr>
                 <tr style="display:none" id="sprtable9" name="sprtable9">
-                  <td valign="top" class="vncell"><?=gettext("Sticky ports"); ?></td>
+                  <td valign="top" class="vncell">Sticky ports</td>
                   <td class="vtable">
 				  	<select name="static[]" class="formselect" multiple="true" size="3">
 						<?php 
@@ -547,14 +547,14 @@ function show_source_port_range() {
 					</select>
                     <br>
                     <span class="vexpl">
-	     <?=gettext("Mark an interface as a \"sticky\" interface.  Dynamically learned " .
-	     "address entries are treated as static once entered into the " .
-	     "cache.  Sticky entries are never aged out of the cache or " .
-	     "replaced, even if the address is seen on a different interface."); ?>		
+	     Mark an interface as a "sticky" interface.  Dynamically learned
+	     address entries are treated as static once entered into the
+	     cache.  Sticky entries are never aged out of the cache or
+	     replaced, even if the address is seen on a different interface.		
 					</span></td>
 			    </tr>
                 <tr style="display:none" id="sprtable10" name="sprtable10">
-                  <td valign="top" class="vncell"><?=gettext("Private ports"); ?></td>
+                  <td valign="top" class="vncell">Private ports</td>
                   <td class="vtable">
 				  	<select name="private[]" class="formselect" multiple="true" size="3">
 						<?php 
@@ -568,15 +568,15 @@ function show_source_port_range() {
 					</select>
                     <br>
                     <span class="vexpl">
-	     <?=gettext("Mark an interface as a \"private\" interface.  A private interface does not forward any traffic to any other port that is also " .
-	     "a private interface."); ?>
+	     Mark an interface as a "private" interface.  A private interface does not forward any traffic to any other port that is also
+	     a private interface.
 					</span></td>
 			    </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
 		    <input type="hidden" name="bridgeif" value="<?=$pconfig['bridgeif']; ?>">
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> <input type="button" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" value="Cancel" onclick="history.back()">
                     <?php if (isset($id) && $a_bridges[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
diff --git a/usr/local/www/interfaces_gif_edit.php b/usr/local/www/interfaces_gif_edit.php
index 742b00e..908277f 100644
--- a/usr/local/www/interfaces_gif_edit.php
+++ b/usr/local/www/interfaces_gif_edit.php
@@ -69,13 +69,13 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "if tunnel-remote-addr tunnel-remote-net tunnel-local-addr");
-	$reqdfieldsn = array(gettext("Parent interface,Local address, Remote tunnel address, Remote tunnel network, Local tunnel address"));
+	$reqdfieldsn = explode(",", "Parent interface,Local address, Remote tunnel address, Remote tunnel network, Local tunnel address");
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if ((!is_ipaddr($_POST['tunnel-local-addr'])) || (!is_ipaddr($_POST['tunnel-remote-addr'])) ||
 			(!is_ipaddr($_POST['remote-addr']))) {
-		$input_errors[] = gettext("The tunnel local and tunnel remote fields must have valid IP addresses.");
+		$input_errors[] = "The tunnel local and tunnel remote fields must have valid IP addresses.";
 	}
 
 	foreach ($a_gifs as $gif) {
@@ -83,7 +83,7 @@ if ($_POST) {
 			continue;
 
 		if (($gif['if'] == $_POST['if']) && ($gif['tunnel-remote-net'] == $_POST['tunnel-remote-net'])) {
-			$input_errors[] = gettext("A gif with the network {$gif['remote-network']} is already defined.");
+			$input_errors[] = "A gif with the network {$gif['remote-network']} is already defined.";
 			break;
 		}
 	}
@@ -102,7 +102,7 @@ if ($_POST) {
 
                 $gif['gifif'] = interface_gif_configure($gif);
                 if ($gif['gifif'] == "" || !stristr($gif['gifif'], "gif"))
-                        $input_errors[] = gettext("Error occured creating interface, please retry.");
+                        $input_errors[] = "Error occured creating interface, please retry.";
                 else {
                         if (isset($id) && $a_gifs[$id])
                                 $a_gifs[$id] = $gif;
@@ -117,7 +117,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Firewall"),gettext("GIF"),gettext("Edit"));
+$pgtitle = array("Firewall","GIF","Edit");
 include("head.inc");
 
 ?>
@@ -128,10 +128,10 @@ include("head.inc");
             <form action="interfaces_gif_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("GIF configuration"); ?></td>
+					<td colspan="2" valign="top" class="listtopic">GIF configuration</td>
 				</tr>
 				<tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface"); ?></td>
+                  <td width="22%" valign="top" class="vncellreq">Parent interface</td>
                   <td width="78%" class="vtable">
                     <select name="if" class="formselect">
                       <?php
@@ -145,24 +145,24 @@ include("head.inc");
 		      		?>
                     </select>
 			<br/>
-			<span class="vexpl"><?=gettext("The interface here servers as the local address to be used for the gif tunnel."); ?></span></td>
+			<span class="vexpl">The interface here servers as the local address to be used for the gif tunnel.</span></td>
                 </tr>
 				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("gif remote address"); ?></td>
+                  <td valign="top" class="vncellreq">gif remote address</td>
                   <td class="vtable">
                     <input name="remote-addr" type="text" class="formfld unknown" id="remote-addr" size="16" value="<?=$pconfig['remote-addr'];?>">
                     <br>
-                    <span class="vexpl"><?=gettext("Peer address where encapsulated gif packets will be sent. "); ?></span></td>
+                    <span class="vexpl">Peer address where encapsulated gif packets will be sent. </span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("gif tunnel local address"); ?></td>
+                  <td valign="top" class="vncellreq">gif tunnel local address</td>
                   <td class="vtable">
                     <input name="tunnel-local-addr" type="text" class="formfld unknown" id="tunnel-local-addr" size="16" value="<?=$pconfig['tunnel-local-addr'];?>">
                     <br>
-                    <span class="vexpl"><?=gettext("Local gif tunnel endpoint"); ?></span></td>
+                    <span class="vexpl">Local gif tunnel endpoint</span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("gif tunnel remote address "); ?></td>
+                  <td valign="top" class="vncellreq">gif tunnel remote address </td>
                   <td class="vtable">
                     <input name="tunnel-remote-addr" type="text" class="formfld unknown" id="tunnel-remote-addr" size="16" value="<?=$pconfig['tunnel-remote-addr'];?>">
                     <select name="tunnel-remote-net" class="formselect" id="tunnel-remote-net">
@@ -177,37 +177,37 @@ include("head.inc");
                                         ?>
                     </select>					
                     <br/>
-                    <span class="vexpl"><?=gettext("Remote gif address endpoint. The subnet part is used for the determinig the network that is tunneled."); ?></span></td>
+                    <span class="vexpl">Remote gif address endpoint. The subnet part is used for the determinig the network that is tunneled.</span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncell"><?=gettext("Route caching  "); ?></td>
+                  <td valign="top" class="vncell">Route caching  </td>
                   <td class="vtable">
                     <input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked";?>>
                     <br>
-                    <span class="vexpl"><?=gettext("Specify if route caching can be enabled. Be careful with these settings on dynamic networks. "); ?></span></td>
+                    <span class="vexpl">Specify if route caching can be enabled. Be careful with these settings on dynamic networks. </span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncell"><?=gettext("ECN friendly behaviour"); ?></td>
+                  <td valign="top" class="vncell">ECN friendly behaviour</td>
                   <td class="vtable">
                     <input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked";?>>
                     <br>
                     <span class="vexpl">
-     <?=gettext("Note that the ECN friendly behavior violates RFC2893.  This should be" .
-     "used in mutual agreement with the peer."); ?>					
+     Note that the ECN friendly behavior violates RFC2893.  This should be
+     used in mutual agreement with the peer.					
 					 </span></td>
 			    </tr>
 				<tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
+                  <td width="22%" valign="top" class="vncell">Description</td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here" .
-                    "for your reference (not parsed)."); ?></span></td>
+                    <br> <span class="vexpl">You may enter a description here
+                    for your reference (not parsed).</span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
 		    <input type="hidden" name="gifif" value="<?=$pconfig['gifif']; ?>">
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> <input type="button" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" value="Cancel" onclick="history.back()">
                     <?php if (isset($id) && $a_gifs[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
diff --git a/usr/local/www/interfaces_gre.php b/usr/local/www/interfaces_gre.php
index af10a52..a1a959e 100644
--- a/usr/local/www/interfaces_gre.php
+++ b/usr/local/www/interfaces_gre.php
@@ -61,7 +61,7 @@ function gre_inuse($num) {
 if ($_GET['act'] == "del") {
 	/* check if still in use */
 	if (gre_inuse($_GET['id'])) {
-		$input_errors[] = gettext("This GRE tunnel cannot be deleted because it is still being used as an interface.");
+		$input_errors[] = "This GRE tunnel cannot be deleted because it is still being used as an interface.";
 	} else {
 		mwexec("/sbin/ifconfig " . $a_gres[$_GET['id']]['greif'] . " destroy");
 		unset($a_gres[$_GET['id']]);
@@ -73,7 +73,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = array(gettext("Interfaces"),gettext("GRE"));
+$pgtitle = array("Interfaces","GRE");
 include("head.inc");
 
 ?>
@@ -85,16 +85,16 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
-	$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
-	$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
-	$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
-	$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
-	$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
-	$tab_array[6] = array(gettext("GRE"), true, "interfaces_gre.php");
-	$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
-	$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
-	$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
+	$tab_array[0] = array("Interface assignments", false, "interfaces_assign.php");
+	$tab_array[1] = array("Interface Groups", false, "interfaces_groups.php");
+	$tab_array[2] = array("Wireless", false, "interfaces_wireless.php");
+	$tab_array[3] = array("VLANs", false, "interfaces_vlan.php");
+	$tab_array[4] = array("QinQs", false, "interfaces_qinq.php");
+	$tab_array[5] = array("PPPs", false, "interfaces_ppps.php");
+	$tab_array[6] = array("GRE", true, "interfaces_gre.php");
+	$tab_array[7] = array("GIF", false, "interfaces_gif.php");
+	$tab_array[8] = array("Bridges", false, "interfaces_bridge.php");
+	$tab_array[9] = array("LAGG", false, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -103,9 +103,9 @@ include("head.inc");
 	<div id="mainarea">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                  <td width="20%" class="listhdrr"><?=gettext("Interface");?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("Tunnel to...");?></td>
-                  <td width="50%" class="listhdr"><?=gettext("Description");?></td>
+                  <td width="20%" class="listhdrr">Interface</td>
+                  <td width="20%" class="listhdrr">Tunnel to...</td>
+                  <td width="50%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
 				</tr>
 			  <?php $i = 0; foreach ($a_gres as $gre): ?>
@@ -120,7 +120,7 @@ include("head.inc");
                     <?=htmlspecialchars($gre['descr']);?>&nbsp;
                   </td>
                   <td valign="middle" nowrap class="list"> <a href="interfaces_gre_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
-                     &nbsp;<a href="interfaces_gre.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext("Do you really want to delete this GRE tunnel?");?>)"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                     &nbsp;<a href="interfaces_gre.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this GRE tunnel?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 			  <?php $i++; endforeach; ?>
                 <tr>
@@ -129,7 +129,7 @@ include("head.inc");
 				</tr>
         <tr>
                 <td class="tabcont" colspan="3">
-                    <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br></strong></span><?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?></span></p>
+                    <p><span class="vexpl"><span class="red"><strong>Note:<br></strong></span>Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.</span></p>
                     </td>
                 </tr>
               </table>
diff --git a/usr/local/www/interfaces_gre_edit.php b/usr/local/www/interfaces_gre_edit.php
index 271b831..1144bcd 100644
--- a/usr/local/www/interfaces_gre_edit.php
+++ b/usr/local/www/interfaces_gre_edit.php
@@ -70,7 +70,7 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "if tunnel-remote-addr tunnel-remote-net tunnel-local-addr");
-	$reqdfieldsn = array(gettext("Parent interface"),gettext("Local address"),gettext("Remote tunnel address"),gettext("Remote tunnel network"), gettext("Local tunnel address"));
+	$reqdfieldsn = explode(",", "Parent interface,Local address, Remote tunnel address, Remote tunnel network, Local tunnel address");
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
@@ -84,7 +84,7 @@ if ($_POST) {
 			continue;
 
 		if (($gre['if'] == $_POST['if']) && ($gre['tunnel-remote-net'] == $_POST['tunnel-remote-net'])) {
-			$input_errors[] = sprintf(gettext("A gre with the network %s is already defined."),$gre['remote-network']);
+			$input_errors[] = "A gre with the network {$gre['remote-network']} is already defined.";
 			break;
 		}
 	}
@@ -104,7 +104,7 @@ if ($_POST) {
 
                 $gre['greif'] = interface_gre_configure($gre);
                 if ($gre['greif'] == "" || !stristr($gre['greif'], "gre"))
-                        $input_errors[] = gettext("Error occured creating interface, please retry.");
+                        $input_errors[] = "Error occured creating interface, please retry.";
                 else {
                         if (isset($id) && $a_gres[$id])
                                 $a_gres[$id] = $gre;
@@ -119,7 +119,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Firewall"),gettext("GRE"),gettext("Edit"));
+$pgtitle = array("Firewall","GRE","Edit");
 include("head.inc");
 
 ?>
@@ -130,10 +130,10 @@ include("head.inc");
             <form action="interfaces_gre_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("GRE configuration");?></td>
+					<td colspan="2" valign="top" class="listtopic">GRE configuration</td>
 				</tr>
 				<tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td>
+                  <td width="22%" valign="top" class="vncellreq">Parent interface</td>
                   <td width="78%" class="vtable">
                     <select name="if" class="formselect">
                       <?php
@@ -147,24 +147,24 @@ include("head.inc");
 		      		?>
                     </select>
 			<br/>
-			<span class="vexpl"><?=gettext("The interface here serves as the local address to be used for the GRE tunnel.");?></span></td>
+			<span class="vexpl">The interface here serves as the local address to be used for the GRE tunnel.</span></td>
                 </tr>
 				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("GRE remote address");?></td>
+                  <td valign="top" class="vncellreq">GRE remote address</td>
                   <td class="vtable">
                     <input name="remote-addr" type="text" class="formfld unknown" id="remote-addr" size="16" value="<?=$pconfig['remote-addr'];?>">
                     <br>
-                    <span class="vexpl"><?=gettext("Peer address where encapsulated GRE packets will be sent ");?></span></td>
+                    <span class="vexpl">Peer address where encapsulated GRE packets will be sent </span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("GRE tunnel local address ");?></td>
+                  <td valign="top" class="vncellreq">GRE tunnel local address </td>
                   <td class="vtable">
                     <input name="tunnel-local-addr" type="text" class="formfld unknown" id="tunnel-local-addr" size="16" value="<?=$pconfig['tunnel-local-addr'];?>">
                     <br>
-                    <span class="vexpl"><?=gettext("Local GRE tunnel endpoint");?></span></td>
+                    <span class="vexpl">Local GRE tunnel endpoint</span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("GRE tunnel remote address ");?></td>
+                  <td valign="top" class="vncellreq">GRE tunnel remote address </td>
                   <td class="vtable">
                     <input name="tunnel-remote-addr" type="text" class="formfld unknown" id="tunnel-remote-addr" size="16" value="<?=$pconfig['tunnel-remote-addr'];?>">
                     <select name="tunnel-remote-net" class="formselect" id="tunnel-remote-net">
@@ -179,46 +179,46 @@ include("head.inc");
                                         ?>
                     </select>					
                     <br/>
-                    <span class="vexpl"><?=gettext("Remote GRE address endpoint. The subnet part is used for the determining the network that is tunneled.");?></span></td>
+                    <span class="vexpl">Remote GRE address endpoint. The subnet part is used for the determining the network that is tunneled.</span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncell"><?=gettext("Mobile tunnel");?></td>
+                  <td valign="top" class="vncell">Mobile tunnel</td>
                   <td class="vtable">
                     <input name="link0" type="checkbox" id="link0" <?if ($pconfig['link0']) echo "checked";?>>
                     <br>
-                    <span class="vexpl"><?=gettext("Specify which encapsulation method the tunnel should use. ");?></span></td>
+                    <span class="vexpl">Specify which encapsulation method the tunnel should use. </span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncell"><?=gettext("Route search type");?></td>
+                  <td valign="top" class="vncell">Route search type</td>
                   <td class="vtable">
                     <input name="link1" type="checkbox" id="link1" <?if ($pconfig['link1']) echo "checked";?>>
                     <br>
                     <span class="vexpl">
-     <?=gettext("For correct operation, the GRE device needs a route to the destination".
-    " that is less specific than the one over the tunnel.  (Basically, there".
-    " needs to be a route to the decapsulating host that does not run over the".
-    " tunnel, as this would be a loop.");?>
+     For correct operation, the GRE device needs a route to the destination
+     that is less specific than the one over the tunnel.  (Basically, there
+     needs to be a route to the decapsulating host that does not run over the
+     tunnel, as this would be a loop.)
 					 </span></td>
 			    </tr>
 				<tr>
-                  <td valign="top" class="vncell"><?=gettext("WCCP version");?></td>
+                  <td valign="top" class="vncell">WCCP version</td>
                   <td class="vtable">
                     <input name="link2" type="checkbox" id="link2" <?if ($pconfig['link2']) echo "checked";?>>
                     <br>
-                    <span class="vexpl"><?=gettext("Specify which WCCP encapsulation(version 1 or 2) method the tunnel should use");?></span></td>
+                    <span class="vexpl">Specify which WCCP encapsulation(version 1 or 2) method the tunnel should use</span></td>
 			    </tr>
 				<tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+                  <td width="22%" valign="top" class="vncell">Description</td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here".
-                    " for your reference (not parsed).");?></span></td>
+                    <br> <span class="vexpl">You may enter a description here
+                    for your reference (not parsed).</span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
 		    <input type="hidden" name="greif" value="<?=$pconfig['greif']; ?>">
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input type="button" value="<?=gettext("Cancel");?>" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" value="Cancel" onclick="history.back()">
                     <?php if (isset($id) && $a_gres[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
diff --git a/usr/local/www/interfaces_groups.php b/usr/local/www/interfaces_groups.php
index 954bcf6..27a088a 100755
--- a/usr/local/www/interfaces_groups.php
+++ b/usr/local/www/interfaces_groups.php
@@ -59,7 +59,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = array(gettext("Interfaces"),gettext("Groups"));
+$pgtitle = array("Interfaces","Groups");
 include("head.inc");
 
 ?>
@@ -71,16 +71,16 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
-	$tab_array[1] = array(gettext("Interface Groups"), true, "interfaces_groups.php");
-	$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
-	$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
-	$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
-	$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
-	$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
-	$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
-	$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
-	$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
+	$tab_array[0] = array("Interface assignments", false, "interfaces_assign.php");
+	$tab_array[1] = array("Interface Groups", true, "interfaces_groups.php");
+	$tab_array[2] = array("Wireless", false, "interfaces_wireless.php");
+	$tab_array[3] = array("VLANs", false, "interfaces_vlan.php");
+	$tab_array[4] = array("QinQs", false, "interfaces_qinq.php");
+	$tab_array[5] = array("PPPs", false, "interfaces_ppps.php");
+	$tab_array[6] = array("GRE", false, "interfaces_gre.php");
+	$tab_array[7] = array("GIF", false, "interfaces_gif.php");
+	$tab_array[8] = array("Bridges", false, "interfaces_bridge.php");
+	$tab_array[9] = array("LAGG", false, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -90,9 +90,9 @@ include("head.inc");
         <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
 
 <tr>
-  <td width="15%" class="listhdrr"><?=gettext("Name");?></td>
-  <td width="35%" class="listhdrr"><?=gettext("Members");?></td>
-  <td width="25%" class="listhdr"><?=gettext("Description");?></td>
+  <td width="15%" class="listhdrr">Name</td>
+  <td width="35%" class="listhdrr">Members</td>
+  <td width="25%" class="listhdr">Description</td>
   <td width="5%" class="list"></td>
 </tr>
 	  <?php if (count ($a_ifgroups)):
@@ -123,8 +123,8 @@ include("head.inc");
   <td valign="middle" nowrap class="list">
     <table border="0" cellspacing="0" cellpadding="1">
       <tr>
-        <td valign="middle"><a href="interfaces_groups_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit group");?>"></a></td>
-        <td><a href="interfaces_groups.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext("Do you really want to delete this group? All elements that still use it will become invalid (e.g. filter rules)!");?>)"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete ifgroupentry");?>"></a></td>
+        <td valign="middle"><a href="interfaces_groups_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="edit group"></a></td>
+        <td><a href="interfaces_groups.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this group? All elements that still use it will become invalid (e.g. filter rules)!')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="delete ifgroupentry"></a></td>
       </tr>
     </table>
   </td>
@@ -136,7 +136,7 @@ include("head.inc");
     <table border="0" cellspacing="0" cellpadding="1">
       <tr>
 	<td valign="middle" width="17">&nbsp;</td>
-        <td valign="middle"><a href="interfaces_groups_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add a new group");?>"></a></td>
+        <td valign="middle"><a href="interfaces_groups_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add a new group"></a></td>
         </td>
       </tr>
     </table>
@@ -144,7 +144,7 @@ include("head.inc");
 </tr>
 <tr>
   <td class="tabcont" colspan="3">
-	<p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br></strong></span><?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?></span></p>
+	<p><span class="vexpl"><span class="red"><strong>Note:<br></strong></span>Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.</span></p>
 	</td>
 </tr>
 	</table>
diff --git a/usr/local/www/interfaces_groups_edit.php b/usr/local/www/interfaces_groups_edit.php
index 7525945..51feffd 100755
--- a/usr/local/www/interfaces_groups_edit.php
+++ b/usr/local/www/interfaces_groups_edit.php
@@ -37,7 +37,7 @@
 ##|*MATCH=interfaces_groups_edit.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Interfaces"),gettext("Groups"),gettext("Edit"));
+$pgtitle = array("Interfaces","Groups", "Edit");
 
 require("guiconfig.inc");
 
@@ -69,7 +69,7 @@ if ($_POST) {
 				$input_errors[] = "Group name already exists!";
 	}
 	if (preg_match("/([^a-zA-Z])+/", $_POST['ifname'], $match))
-		$input_errors[] = gettext("Only letters A-Z are allowed as the group name.");
+		$input_errors[] = "Only letters A-Z are allowed as the group name.";
 
 	$ifgroupentry = array();
 	$ifgroupentry['ifname'] = $_POST['ifname'];
@@ -200,33 +200,33 @@ function removeRow(el) {
 <form action="interfaces_groups_edit.php" method="post" name="iform" id="iform">
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
   <tr>
-	<td colspan="2" valign="top" class="listtopic"><?=gettext("Interface Groups Edit");?></td>
+	<td colspan="2" valign="top" class="listtopic">Interface Groups Edit</td>
   </tr>
   <tr>
-    <td valign="top" class="vncellreq"><?=gettext("Group Name");?></td>
+    <td valign="top" class="vncellreq">Group Name</td>
     <td class="vtable">
 	<input class="formfld unknown" name="ifname" id="ifname" value="<?=$pconfig['ifname'];?>" />
 	<br />
-	<?=gettext("No numbers or spaces are allowed. Only characters in a-zA-Z");?>
+	No numbers or spaces are allowed. Only characters in a-zA-Z
     </td>
   </tr>
   <tr>
-    <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+    <td width="22%" valign="top" class="vncell">Description</td>
     <td width="78%" class="vtable">
       <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
       <br />
       <span class="vexpl">
-        <?=gettext("You may enter a description here for your reference (not parsed).");?>
+        You may enter a description here for your reference (not parsed).
       </span>
     </td>
   </tr>
   <tr>
-    <td width="22%" valign="top" class="vncellreq"><div id="membersnetworkport"><?=gettext("Member (s)");?></div></td>
+    <td width="22%" valign="top" class="vncellreq"><div id="membersnetworkport">Member (s)</div></td>
     <td width="78%" class="vtable">
       <table id="maintable">
         <tbody>
           <tr>
-            <td><div id="onecolumn"><?=gettext("Interface");?></div></td>
+            <td><div id="onecolumn">Interface</div></td>
           </tr>
 
 	<?php
@@ -252,7 +252,7 @@ function removeRow(el) {
                         </select>
 	</td>
         <td>
-	<input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" />
+	<input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="Delete" />
 	      </td>
           </tr>
 <?php
@@ -267,15 +267,15 @@ function removeRow(el) {
         </tfoot>
 		  </table>
 			<a onclick="javascript:addRowTo('maintable'); return false;" href="#">
-        <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
+        <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="add another entry" />
       </a>
 		</td>
   </tr>
   <tr>
     <td width="22%" valign="top">&nbsp;</td>
     <td width="78%">
-      <input id="submit" name="submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
-      <a href="interfaces_groups.php"><input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="<?=gettext("Cancel");?>" /></a>
+      <input id="submit" name="submit" type="submit" class="formbtn" value="Save" />
+      <a href="interfaces_groups.php"><input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" /></a>
       <?php if (isset($id) && $a_ifgroups[$id]): ?>
       <input name="id" type="hidden" value="<?=$id;?>" />
       <?php endif; ?>
diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php
index 190c787..f09c59e 100644
--- a/usr/local/www/interfaces_lagg.php
+++ b/usr/local/www/interfaces_lagg.php
@@ -67,7 +67,7 @@ function lagg_inuse($num) {
 if ($_GET['act'] == "del") {
 	/* check if still in use */
 	if (lagg_inuse($_GET['id'])) {
-		$input_errors[] = gettext("This LAGG interface cannot be deleted because it is still being used.");
+		$input_errors[] = "This LAGG interface cannot be deleted because it is still being used.";
 	} else {
 		mwexec_bg("/sbin/ifconfig " . $a_laggs[$_GET['id']]['laggif'] . " destroy");
 		unset($a_laggs[$_GET['id']]);
@@ -79,7 +79,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = array(gettext("Interfaces"),gettext("LAGG"));
+$pgtitle = array("Interfaces","LAGG");
 include("head.inc");
 
 ?>
@@ -91,15 +91,15 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
-	$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
-	$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
+	$tab_array[0] = array("Interface assignments", false, "interfaces_assign.php");
+	$tab_array[1] = array("Interface Groups", false, "interfaces_groups.php");
+	$tab_array[2] = array("Wireless", false, "interfaces_wireless.php");
 	$tab_array[3] = array("VLANs", false, "interfaces_vlan.php");
 	$tab_array[4] = array("QinQs", false, "interfaces_qinq.php");
 	$tab_array[5] = array("PPPs", false, "interfaces_ppps.php");
 	$tab_array[6] = array("GRE", false, "interfaces_gre.php");
 	$tab_array[7] = array("GIF", false, "interfaces_gif.php");
-	$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
+	$tab_array[8] = array("Bridges", false, "interfaces_bridge.php");
 	$tab_array[9] = array("LAGG", true, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>
@@ -109,9 +109,9 @@ include("head.inc");
 	<div id="mainarea">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                  <td width="20%" class="listhdrr"><?=gettext("Interface"); ?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("Members"); ?></td>
-                  <td width="50%" class="listhdr"><?=gettext("Description"); ?></td>
+                  <td width="20%" class="listhdrr">Interface</td>
+                  <td width="20%" class="listhdrr">Members</td>
+                  <td width="50%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
 				</tr>
 			  <?php $i = 0; foreach ($a_laggs as $lagg): ?>
@@ -135,9 +135,9 @@ include("head.inc");
 				</tr>
 				<tr>
 				<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note"); ?>:<br>
+				  Note:<br>
 				  </strong></span>
-				  <?=gettext("LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG"); ?>.
+				  LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG.
 				  </td>
 				<td class="list">&nbsp;</td>
 				</tr>
diff --git a/usr/local/www/interfaces_lagg_edit.php b/usr/local/www/interfaces_lagg_edit.php
index d507c22..8b67ab6 100644
--- a/usr/local/www/interfaces_lagg_edit.php
+++ b/usr/local/www/interfaces_lagg_edit.php
@@ -76,7 +76,7 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "members proto");
-	$reqdfieldsn = array(",", gettext("Member interfaces"), gettext("Lagg protocol"));
+	$reqdfieldsn = explode(",", "Member interfaces, Lagg protocol");
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
@@ -89,7 +89,7 @@ if ($_POST) {
 
                 $lagg['laggif'] = interface_lagg_configure($lagg);
                 if ($lagg['laggif'] == "" || !stristr($lagg['laggif'], "lagg"))
-                        $input_errors[] = gettext("Error occured creating interface, please retry.");
+                        $input_errors[] = "Error occured creating interface, please retry.";
                 else {
                         if (isset($id) && $a_laggs[$id])
                                 $a_laggs[$id] = $lagg;
@@ -108,7 +108,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Firewall"),"LAGG",gettext("Edit"));
+$pgtitle = array("Firewall","LAGG","Edit");
 include("head.inc");
 
 ?>
@@ -119,10 +119,10 @@ include("head.inc");
             <form action="interfaces_lagg_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic">LAGG <?=gettext("configuration"); ?></td>
+					<td colspan="2" valign="top" class="listtopic">LAGG configuration</td>
 				</tr>
 				<tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface"); ?></td>
+                  <td width="22%" valign="top" class="vncellreq">Parent interface</td>
                   <td width="78%" class="vtable">
                     <select name="members[]" multiple="true" size="4" class="formselect">
                       <?php
@@ -137,10 +137,10 @@ include("head.inc");
 		      		?>
                     </select>
 			<br/>
-			<span class="vexpl"><?=gettext("Choose the members that will be used for the link aggregation"); ?>.</span></td>
+			<span class="vexpl">Choose the members that will be used for the link aggregation.</span></td>
                 </tr>
 		<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("Lag proto"); ?></td>
+                  <td valign="top" class="vncellreq">Lag proto</td>
                   <td class="vtable">
                     <select name="proto" class="formselect" id="proto">
 		<?php
@@ -156,57 +156,57 @@ include("head.inc");
                     <span class="vexpl">
 		   <ul>
 		<li>
-		    <b><?=gettext("failover"); ?></b><br/>      
-			<?=gettext("Sends and receives traffic only through the master port.  If " .
-                  "the master port becomes unavailable, the next active port is " .
-                  "used.  The first interface added is the master port; any " .
-                  "interfaces added after that are used as failover devices."); ?>
+		    <b>failover</b><br/>      
+			Sends and receives traffic only through the master port.  If
+                  the master port becomes unavailable, the next active port is
+                  used.  The first interface added is the master port; any
+                  interfaces added after that are used as failover devices.
 		</li><li>
-     <b><?=gettext("fec"); ?></b><br/>          <?=gettext("Supports Cisco EtherChannel.  This is a static setup and " .
-                  "does not negotiate aggregation with the peer or exchange " .
-                  "frames to monitor the link."); ?>
+     <b>fec</b><br/>          Supports Cisco EtherChannel.  This is a static setup and
+                  does not negotiate aggregation with the peer or exchange
+                  frames to monitor the link.
 		</li><li>
-     <b><?=gettext("lacp"); ?></b><br/>         <?=gettext("Supports the IEEE 802.3ad Link Aggregation Control Protocol " .
-                  "(LACP) and the Marker Protocol.  LACP will negotiate a set " .
-                  "of aggregable links with the peer in to one or more Link " .
-                  "Aggregated Groups.  Each LAG is composed of ports of the " .
-                  "same speed, set to full-duplex operation.  The traffic will " .
-                  "be balanced across the ports in the LAG with the greatest " .
-                  "total speed, in most cases there will only be one LAG which " .
-                  "contains all ports.  In the event of changes in physical " .
-                  "connectivity, Link Aggregation will quickly converge to a " .
-                  "new configuration."); ?>
+     <b>lacp</b><br/>         Supports the IEEE 802.3ad Link Aggregation Control Protocol
+                  (LACP) and the Marker Protocol.  LACP will negotiate a set
+                  of aggregable links with the peer in to one or more Link
+                  Aggregated Groups.  Each LAG is composed of ports of the
+                  same speed, set to full-duplex operation.  The traffic will
+                  be balanced across the ports in the LAG with the greatest
+                  total speed, in most cases there will only be one LAG which
+                  contains all ports.  In the event of changes in physical
+                  connectivity, Link Aggregation will quickly converge to a
+                  new configuration.
 		</li><li>
-     <b><?=gettext("loadbalance"); ?></b><br/>  <?=gettext("Balances outgoing traffic across the active ports based on " .
-                  "hashed protocol header information and accepts incoming " .
-                  "traffic from any active port.  This is a static setup and " .
-                  "does not negotiate aggregation with the peer or exchange " .
-                  "frames to monitor the link.  The hash includes the Ethernet " .
-                  "source and destination address, and, if available, the VLAN " .
-                  "tag, and the IP source and destination address") ?>.
+     <b>loadbalance</b><br/>  Balances outgoing traffic across the active ports based on
+                  hashed protocol header information and accepts incoming
+                  traffic from any active port.  This is a static setup and
+                  does not negotiate aggregation with the peer or exchange
+                  frames to monitor the link.  The hash includes the Ethernet
+                  source and destination address, and, if available, the VLAN
+                  tag, and the IP source and destination address.
 		</li><li>
-     <b><?=gettext("roundrobin"); ?></b><br/>   <?=gettext("Distributes outgoing traffic using a round-robin scheduler " .
-                  "through all active ports and accepts incoming traffic from " .
-                  "any active port"); ?>.
+     <b>roundrobin</b><br/>   Distributes outgoing traffic using a round-robin scheduler
+                  through all active ports and accepts incoming traffic from
+                  any active port.
 		</li><li>
-     <b><?=gettext("none"); ?></b><br/>         <?=gettext("This protocol is intended to do nothing: it disables any " .
-                  "traffic without disabling the lagg interface itself"); ?>.
+     <b>none</b><br/>         This protocol is intended to do nothing: it disables any
+                  traffic without disabling the lagg interface itself.
 		</li>
 	</ul>
 	          </span></td>
 	    </tr>
 		<tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
+                  <td width="22%" valign="top" class="vncell">Description</td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here " .
-                    "for your reference (not parsed)"); ?>.</span></td>
+                    <br> <span class="vexpl">You may enter a description here
+                    for your reference (not parsed).</span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
 		    <input type="hidden" name="laggif" value="<?=$pconfig['laggif']; ?>">
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> <input type="button" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" value="Cancel" onclick="history.back()">
                     <?php if (isset($id) && $a_laggs[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
diff --git a/usr/local/www/interfaces_ppps.php b/usr/local/www/interfaces_ppps.php
index 28a02d4..e6d4880 100644
--- a/usr/local/www/interfaces_ppps.php
+++ b/usr/local/www/interfaces_ppps.php
@@ -60,7 +60,7 @@ function ppp_inuse($num) {
 if ($_GET['act'] == "del") {
 	/* check if still in use */
 	if (ppp_inuse($_GET['id'])) {
-		$input_errors[] = gettext("This point-to-point link cannot be deleted because it is still being used as an interface.");
+		$input_errors[] = "This point-to-point link cannot be deleted because it is still being used as an interface.";
 	} else {
 		unset($a_ppps[$_GET['id']]['pppoe-reset-type']);
 		handle_pppoe_reset($a_ppps[$_GET['id']]);
@@ -71,7 +71,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = gettext("Interfaces: PPPs");
+$pgtitle = "Interfaces: PPPs";
 include("head.inc");
 
 ?>
@@ -83,16 +83,16 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
-	$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
-	$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
-	$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
-	$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
-	$tab_array[5] = array(gettext("PPPs"), true, "interfaces_ppps.php");
-	$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
-	$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
-	$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
-	$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
+	$tab_array[0] = array("Interface assignments", false, "interfaces_assign.php");
+	$tab_array[1] = array("Interface Groups", false, "interfaces_groups.php");
+	$tab_array[2] = array("Wireless", false, "interfaces_wireless.php");
+	$tab_array[3] = array("VLANs", false, "interfaces_vlan.php");
+	$tab_array[4] = array("QinQs", false, "interfaces_qinq.php");
+	$tab_array[5] = array("PPPs", true, "interfaces_ppps.php");
+	$tab_array[6] = array("GRE", false, "interfaces_gre.php");
+	$tab_array[7] = array("GIF", false, "interfaces_gif.php");
+	$tab_array[8] = array("Bridges", false, "interfaces_bridge.php");
+	$tab_array[9] = array("LAGG", false, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -101,9 +101,9 @@ include("head.inc");
 	<div id="mainarea">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                	<td width="20%" class="listhdrr"><?=gettext("Interface");?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("Interface(s)/Port(s)");?></td>
-                  <td width="40%" class="listhdr"><?=gettext("Description");?></td>
+                	<td width="20%" class="listhdrr">Interface</td>
+                  <td width="20%" class="listhdrr">Interface(s)/Port(s)</td>
+                  <td width="40%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
 				</tr>
 			  <?php $i = 0; foreach ($a_ppps as $id => $ppp): ?>
@@ -125,7 +125,7 @@ include("head.inc");
                     <?=htmlspecialchars($ppp['descr']);?>&nbsp;
                   </td>
                   <td valign="middle" nowrap class="list"> <a href="interfaces_ppps_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
-                     &nbsp;<a href="interfaces_ppps.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext("Do you really want to delete this PPP interface?");?>)"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                     &nbsp;<a href="interfaces_ppps.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this PPP interface?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 			  <?php $i++; endforeach; ?>
                 <tr>
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php
index 89a657c..f218f3c 100644
--- a/usr/local/www/interfaces_ppps_edit.php
+++ b/usr/local/www/interfaces_ppps_edit.php
@@ -175,17 +175,17 @@ if ($_POST) {
 	/* input validation */		
 	switch($_POST['type']) {
 		case "ppp":
-			$reqdfields = explode("interfaces phone");
-			$reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Phone Number"));
+			$reqdfields = explode(" ", "interfaces phone");
+			$reqdfieldsn = explode(",", "Link Interface(s),Phone Number");
 			do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 			break;
 		case "pppoe":
 			if ($_POST['ondemand']) {
 				$reqdfields = explode(" ", "interfaces username password ondemand idletimeout");
-				$reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Username"),gettext("Password"),gettext("Dial on demand"),gettext("Idle timeout value"));
+				$reqdfieldsn = explode(",", "Link Interface(s),Username,Password,Dial on demand,Idle timeout value");
 			} else {
 				$reqdfields = explode(" ", "interfaces username password");
-				$reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Username"),gettext("Password"));
+				$reqdfieldsn = explode(",", "Link Interface(s),Username,Password");
 			}
 			do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 			break;
@@ -193,23 +193,23 @@ if ($_POST) {
 		case "pptp":
 			if ($_POST['ondemand']) {
 				$reqdfields = explode(" ", "interfaces username password localip subnet gateway ondemand idletimeout");
-				$reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Username"),gettext("Password"),gettext("Local IP address"),gettext("Subnet"),gettext("Remote IP address"),gettext("Dial on demand"),gettext("Idle timeout value"));
+				$reqdfieldsn = explode(",", "Link Interface(s),Username,Password,Local IP address,Subnet,Remote IP address,Dial on demand,Idle timeout value");
 			} else {
 				$reqdfields = explode(" ", "interfaces username password localip subnet gateway");
-				$reqdfieldsn = array(gettext("Link Interface(s)"),gettext("Username"),gettext("Password"),gettext("Local IP address"),gettext("Subnet"),gettext("Remote IP address"));
+				$reqdfieldsn = explode(",", "Link Interface(s),Username,Password,Local IP address,Subnet,Remote IP address");
 			}
 			do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 			break;
 		default:
-			$input_errors[] = gettext("Please choose a Link Type.");
+			$input_errors[] = "Please choose a Link Type.";
 			break;
 	}
 	if ($_POST['type'] == "ppp" && count($_POST['interfaces']) > 1)
-		$input_errors[] = gettext("Multilink connections (MLPPP) using the PPP link type is not currently supported. Please select only one Link Interface.");
+		$input_errors[] = "Multilink connections (MLPPP) using the PPP link type is not currently supported. Please select only one Link Interface.";
 	if (($_POST['provider'] && !is_domain($_POST['provider']))) 
-		$input_errors[] = gettext("The service name contains invalid characters.");
+		$input_errors[] = "The service name contains invalid characters.";
 	if (($_POST['idletimeout'] != "") && !is_numericint($_POST['idletimeout'])) 
-		$input_errors[] = gettext("The idle timeout value must be an integer.");
+		$input_errors[] = "The idle timeout value must be an integer.";
 	if ($_POST['pppoe-reset-type'] == "custom" && $_POST['pppoe_resethour'] <> "" && !is_numericint($_POST['pppoe_resethour']) && 
 		$_POST['pppoe_resethour'] >= 0 && $_POST['pppoe_resethour'] <=23) 
 		$input_errors[] = gettext("A valid PPPoE reset hour must be specified (0-23).");
@@ -230,15 +230,15 @@ if ($_POST) {
 	
 	foreach($_POST['interfaces'] as $iface){
 		if ($_POST['localip'][$iface] && !is_ipaddr($_POST['localip'][$iface]))
-			$input_errors[] = sprintf(gettext("A valid local IP address must be specified for %s."),$iface);
+			$input_errors[] = "A valid local IP address must be specified for {$iface}.";
 		if ($_POST['gateway'][$iface] && !is_ipaddr($_POST['gateway'][$iface]) && !is_hostname($_POST['gateway'][$iface])) 
-			$input_errors[] = sprintf(gettext("A valid gateway IP address OR hostname must be specified for %s."),$iface);
+			$input_errors[] = "A valid gateway IP address OR hostname must be specified for {$iface}.";
 		if ($_POST['bandwidth'][$iface] && !is_numericint($_POST['bandwidth'][$iface])) 
-			$input_errors[] = sprintf(gettext("The bandwidth value for %s must be an integer."),$iface);
+			$input_errors[] = "The bandwidth value for {$iface} must be an integer.";
 		if ($_POST['mtu'][$iface] && ($_POST['mtu'][$iface] < 576)) 
-			$input_errors[] = sprintf(gettext("The MTU for %s must be greater than 576 bytes."),$iface);
+			$input_errors[] = "The MTU for {$iface} must be greater than 576 bytes.";
 		if ($_POST['mru'][$iface] && ($_POST['mru'][$iface] < 576)) 
-			$input_errors[] = sprintf(gettext("The MRU for %s must be greater than 576 bytes."),$iface);
+			$input_errors[] = "The MRU for {$iface} must be greater than 576 bytes.";
 	}
 
 /*
@@ -370,10 +370,10 @@ if ($_POST) {
 } // end if($_POST)
 
 $closehead = false;
-$pgtitle = array(gettext("Interfaces"),gettext("PPPs"),gettext("Edit"));
+$pgtitle = array("Interfaces","PPPs","Edit");
 include("head.inc");
 
-$types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" => "PPTP",  "l2tp" => "L2TP"/*, "tcp" => "TCP", "udp" => "UDP"*/  ); 
+$types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp" => "PPTP",  "l2tp" => "L2TP"/*, "tcp" => "TCP", "udp" => "UDP"*/  ); 
 
 ?>
 	<script type="text/javascript" src="/javascript/numericupdown/js/numericupdown.js"></script>
@@ -613,7 +613,7 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 										<input name="pppoe_resetdate" type="text" class="w8em format-m-d-y highlight-days-67" id="pppoe_resetdate" maxlength="10" size="10" value="<?=htmlspecialchars($pconfig['pppoe_resetdate']);?>" /> 
 										<?= gettext("reset at a specific date (mm/dd/yyyy)"); ?>
 										<br />&nbsp;<br />
-										<span class="red"><strong><?=gettext("Note: ");?></strong></span>
+										<span class="red"><strong>Note: </strong></span>
 										<?= gettext("If you leave the date field empty, the reset will be executed each day at the time you did specify using the minutes and hour field."); ?>
 										</p>
 										<?php if ($pconfig['pppoe_pr_preset']): ?>
@@ -682,32 +682,32 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 			<td valign="top" class="vncell"><?= gettext("Idle Timeout"); ?></td>
 			<td class="vtable">
 				<input name="idletimeout" type="text" class="formfld unknown" id="idletimeout" size="12" value="<?=htmlspecialchars($pconfig['idletimeout']);?>"> <?= gettext("(seconds) Default is 0, which disables the timeout feature."); ?>
-				<br/> <span class="vexpl"><?= gettext("If no incoming or outgoing packets are transmitted for the entered number of seconds the connection is brought down.");?>
-				<br/><?=gettext("When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?></span>
+				<br/> <span class="vexpl"><?= gettext("If no incoming or outgoing packets are transmitted for the entered number of seconds the connection is brought down.
+				<br/>When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?></span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
 			<td width="22%" valign="top" class="vncell"><?= gettext("Compression"); ?></td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="vjcomp" name="vjcomp" <?php if (isset($pconfig['vjcomp'])) echo "checked"; ?>>&nbsp;<?= gettext("Disable vjcomp(compression) (auto-negotiated by default)."); ?>
-				<br/> <span class="vexpl"><?=gettext("This option enables Van Jacobson TCP header compression, which saves several bytes per TCP data packet. 
+				<br/> <span class="vexpl">This option enables Van Jacobson TCP header compression, which saves several bytes per TCP data packet. 
 				You almost always want this option. This compression ineffective for TCP connections with enabled modern extensions like time 
-				stamping or SACK, which modify TCP options between sequential packets.");?></span>
+				stamping or SACK, which modify TCP options between sequential packets.</span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
 			<td width="22%" valign="top" class="vncell"><?= gettext("TCPmssFix"); ?></td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="tcpmssfix" name="tcpmssfix" <?php if (isset($pconfig['tcpmssfix'])) echo "checked"; ?>>&nbsp;<?= gettext("Disable tcpmssfix (enabled by default)."); ?>
-				<br/> <span class="vexpl"><?=gettext("This option causes mpd to adjust incoming and outgoing TCP SYN segments so that the requested maximum segment size is not greater than the amount ". 
-				"allowed by the interface MTU. This is necessary in many setups to avoid problems caused by routers that drop ICMP Datagram Too Big messages. Without these messages, ".
-				"the originating machine sends data, it passes the rogue router then hits a machine that has an MTU that is not big enough for the data. Because the IP Don't Fragment option is set, ".
-				"this machine sends an ICMP Datagram Too Big message back to the originator and drops the packet. The rogue router drops the ICMP message and the originator never ".
-				"gets to discover that it must reduce the fragment size or drop the IP Don't Fragment option from its outgoing data.");?></span>
+				<br/> <span class="vexpl">This option causes mpd to adjust incoming and outgoing TCP SYN segments so that the requested maximum segment size is not greater than the amount 
+				allowed by the interface MTU. This is necessary in many setups to avoid problems caused by routers that drop ICMP Datagram Too Big messages. Without these messages,
+				the originating machine sends data, it passes the rogue router then hits a machine that has an MTU that is not big enough for the data. Because the IP Don't Fragment option is set,
+				this machine sends an ICMP Datagram Too Big message back to the originator and drops the packet. The rogue router drops the ICMP message and the originator never 
+				gets to discover that it must reduce the fragment size or drop the IP Don't Fragment option from its outgoing data.</span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
-			<td width="22%" valign="top" class="vncell"><?=gettext("ShortSeq");?></td>
+			<td width="22%" valign="top" class="vncell">ShortSeq</td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="shortseq" name="shortseq" <?php if (isset($pconfig['shortseq'])) echo "checked"; ?>>&nbsp;<?= gettext("Disable shortseq (auto-negotiated by default)."); ?>
 				<br/> <span class="vexpl"><?= gettext("This option is only meaningful if multi-link PPP is negotiated. It proscribes shorter multi-link fragment headers, saving two bytes on every frame. 
@@ -739,28 +739,28 @@ $types = array("select" => gettext("Select"), "ppp" => "PPP", "pppoe" => "PPPoE"
 		<tr>
 		<?php for($i=0; $i < $port_count; $i++) : ?>
 		<tr style="display:none" id="link<?=$i;?>">
-			<td width="22%" valign="top" id="linklabel<?=$i;?>" class="vncell"><?=gettext(" Link Parameters");?></td>
+			<td width="22%" valign="top" id="linklabel<?=$i;?>" class="vncell"> Link Parameters</td>
 			<td class="vtable">
 				<table name="link_parameters" border="0" cellpadding="6" cellspacing="0">
 					<tr>
-						<td width="22%" id="bwlabel<?=$i;?>" valign="top"class="vncell"><?=gettext(" Bandwidth");?></td>
+						<td width="22%" id="bwlabel<?=$i;?>" valign="top"class="vncell"> Bandwidth</td>
 						<td width="78%" class="vtable">
 						<br/><input name="bandwidth[]" id="bandwidth<?=$i;?>" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['bandwidth'][$i]);?>">
-						<br/> <span class="vexpl"><?=gettext("Set Bandwidth for each link ONLY for MLPPP connections and ONLY when links have different bandwidths.");?></span>
+						<br/> <span class="vexpl">Set Bandwidth for each link ONLY for MLPPP connections and ONLY when links have different bandwidths.</span>
 					  </td>
 					</tr>
 					<tr>
 					  <td width="22%" id="mtulabel<?=$i;?>" valign="top" class="vncell"> MTU</td>
 					  <td width="78%" class="vtable">
 						<input name="mtu[]" id="mtu<?=$i;?>" type="text" class="formfld unknown" size="6" value="<?=htmlspecialchars($pconfig['mtu'][$i]);?>">
-						<br> <span class="vexpl"><?=gettext("MTU will default to 1492.");?></span>
+						<br> <span class="vexpl">MTU will default to 1492.</span>
 					  </td>
 					</tr>
 					<tr>
 					  <td width="22%" id="mrulabel<?=$i;?>" valign="top" class="vncell"> MRU</td>
 					  <td width="78%" class="vtable">
 						<input name="mru[]" id="mru<?=$i;?>" type="text" class="formfld unknown" size="6" value="<?=htmlspecialchars($pconfig['mru'][$i]);?>">
-						<br> <span class="vexpl"><?=gettext("MRU will default to 1492.");?></span>
+						<br> <span class="vexpl">MRU will default to 1492.</span>
 					  </td>
 					</tr>
 				</table
diff --git a/usr/local/www/interfaces_qinq.php b/usr/local/www/interfaces_qinq.php
index 34582d3..f25a5dc 100755
--- a/usr/local/www/interfaces_qinq.php
+++ b/usr/local/www/interfaces_qinq.php
@@ -60,7 +60,7 @@ function qinq_inuse($num) {
 if ($_GET['act'] == "del") {
 	/* check if still in use */
 	if (qinq_inuse($_GET['id'])) {
-		$input_errors[] = gettext("This QinQ cannot be deleted because it is still being used as an interface.");
+		$input_errors[] = "This QinQ cannot be deleted because it is still being used as an interface.";
 	} else {
 		$id = $_GET['id'];
 		$qinq =& $a_qinqs[$id];
@@ -81,7 +81,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = array(gettext("Interfaces"),gettext("QinQ"));
+$pgtitle = array("Interfaces","QinQ");
 include("head.inc");
 
 ?>
@@ -93,16 +93,16 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
-	$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
-	$tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php");
-	$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
-	$tab_array[4] = array(gettext("QinQs"), true, "interfaces_qinq.php");
-	$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
-	$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
-	$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
-	$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
-	$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
+	$tab_array[0] = array("Interface assignments", false, "interfaces_assign.php");
+	$tab_array[1] = array("Interface Groups", false, "interfaces_groups.php");
+	$tab_array[2] = array("Wireless", false, "interfaces_wireless.php");
+	$tab_array[3] = array("VLANs", false, "interfaces_vlan.php");
+	$tab_array[4] = array("QinQs", true, "interfaces_qinq.php");
+	$tab_array[5] = array("PPPs", false, "interfaces_ppps.php");
+	$tab_array[6] = array("GRE", false, "interfaces_gre.php");
+	$tab_array[7] = array("GIF", false, "interfaces_gif.php");
+	$tab_array[8] = array("Bridges", false, "interfaces_bridge.php");
+	$tab_array[9] = array("LAGG", false, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -111,10 +111,10 @@ include("head.inc");
 	<div id="mainarea">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                  <td width="15%" class="listhdrr"><?=gettext("Interface");?></td>
-                  <td width="10%" class="listhdrr"><?=gettext("Tag");?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("QinQ members");?></td>
-                  <td width="45%" class="listhdr"><?=gettext("Description");?></td>
+                  <td width="15%" class="listhdrr">Interface</td>
+                  <td width="10%" class="listhdrr">Tag</td>
+                  <td width="20%" class="listhdrr">QinQ members</td>
+                  <td width="45%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
 				</tr>
 			  <?php $i = 0; foreach ($a_qinqs as $qinq): ?>
@@ -137,7 +137,7 @@ include("head.inc");
                     <?=htmlspecialchars($qinq['descr']);?>&nbsp;
                   </td>
                   <td valign="middle" nowrap class="list"> <a href="interfaces_qinq_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
-                     &nbsp;<a href="interfaces_qinq.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext("Do you really want to delete this QinQ?");?>)"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                     &nbsp;<a href="interfaces_qinq.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this QinQ?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 			  <?php $i++; endforeach; ?>
                 <tr>
@@ -146,9 +146,9 @@ include("head.inc");
 				</tr>
 				<tr>
 				<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note:");?><br>
+				  Note:<br>
 				  </strong></span>
-				  <?php sprintf(gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."), $g['product_name']);?></p>
+				  Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems. See the <?=$g['product_name']?> handbook for information on supported cards. </p>
 				  </td>
 				<td class="list">&nbsp;</td>
 				</tr>
diff --git a/usr/local/www/interfaces_qinq_edit.php b/usr/local/www/interfaces_qinq_edit.php
index a820e14..1ea76e4 100755
--- a/usr/local/www/interfaces_qinq_edit.php
+++ b/usr/local/www/interfaces_qinq_edit.php
@@ -36,7 +36,7 @@
 ##|*MATCH=interfaces_qinq_edit.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Interfaces"),gettext("QinQ"), gettext("Edit"));
+$pgtitle = array("Interfaces","QinQ", "Edit");
 
 require("guiconfig.inc");
 
@@ -81,19 +81,19 @@ if ($_POST) {
 	$pconfig = $_POST;
 
 	if (empty($_POST['tag']))
-		$input_errors[] = gettext("First level tag cannot be empty.");
+		$input_errors[] = "First level tag cannot be empty.";
 	if (isset($id) && $a_qinqs[$id]['tag'] != $_POST['tag'])
-		$input_errors[] = gettext("You are editing an existing entry and modifying the first level tag is not allowed.");
+		$input_errors[] = "You are editing an existing entry and modifying the first level tag is not allowed.";
 	if (isset($id) && $a_qinqs[$id]['if'] != $_POST['if'])
-		$input_errors[] = gettext("You are editing an existing entry and modifying the interface is not allowed.");
+		$input_errors[] = "You are editing an existing entry and modifying the interface is not allowed.";
 	if (!isset($id)) {
 		foreach ($a_qinqs as $qinqentry)
 			if ($qinqentry['tag'] == $_POST['tag'] && $qinqentry['if'] == $_POST['if'])
-				$input_errors[] = gettext("QinQ level already exists for this interface, edit it!");
+				$input_errors[] = "QinQ level already exists for this interface, edit it!";
 		if (is_array($config['vlans']['vlan'])) {
 			foreach ($config['vlans']['vlan'] as $vlan)
 				if ($vlan['tag'] == $_POST['tag'] && $vlan['if'] == $_POST['if'])
-					$input_errors[] = gettext("A normal VLAN exists with this tag please remove it to use this tag for QinQ first level.");
+					$input_errors[] = "A normal VLAN exists with this tag please remove it to use this tag for QinQ first level.";
 		}
 	}
 
@@ -120,7 +120,7 @@ if ($_POST) {
 			if (count($member) > 1) {
 				if (preg_match("/([^0-9])+/", $member[0], $match)  ||
 					preg_match("/([^0-9])+/", $member[1], $match))
-					$input_errors[] = gettext("Tags can contain only numbers or a range in format #-#.");
+					$input_errors[] = "Tags can contain only numbers or a range in format #-#.";
 
 				for ($i = $member[0]; $i <= $member[1]; $i++) {
 					if ($isfirst > 0)
@@ -130,7 +130,7 @@ if ($_POST) {
 				}
 			} else {
 				if (preg_match("/([^0-9])+/", $_POST["members{$x}"], $match))
-					$input_errors[] = gettext("Tags can contain only numbers or a range in format #-#.");
+					$input_errors[] = "Tags can contain only numbers or a range in format #-#.";
 
 				if ($isfirst > 0)
 					$members .= " ";
@@ -190,7 +190,7 @@ if ($_POST) {
 				$gentry = array();
 				$gentry['ifname'] = "QinQ";
 				$gentry['members'] = "{$additions}";
-				$gentry['descr'] = gettext("QinQ VLANs group");
+				$gentry['descr'] = "QinQ VLANs group";
 				$config['ifgroups']['ifgroupentry'][] = $gentry;
 			}
 		}
@@ -266,11 +266,11 @@ function removeRow(el) {
     }
 }
 
-	rowname[0] = <?=gettext("members");?>;
+	rowname[0] = "members";
 	rowtype[0] = "textbox";
 	rowsize[0] = "30";
 
-	rowname[2] = <?=gettext("detail");?>;
+	rowname[2] = "detail";
 	rowtype[2] = "textbox";
 	rowsize[2] = "50";
 </script>
@@ -282,10 +282,10 @@ function removeRow(el) {
 <form action="interfaces_qinq_edit.php" method="post" name="iform" id="iform">
 <table width="100%" border="0" cellpadding="6" cellspacing="0">
   <tr>
-	<td colspan="2" valign="top" class="listtopic"><?=gettext("Interface QinQ Edit");?></td>
+	<td colspan="2" valign="top" class="listtopic">Interface QinQ Edit</td>
   </tr>
   <tr>
-    <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td>
+    <td width="22%" valign="top" class="vncellreq">Parent interface</td>
     <td width="78%" class="vtable">
     <select name="if" id="if" class="formselect">
     <?php
@@ -302,20 +302,20 @@ function removeRow(el) {
     ?>
     </select>
     <br/>
-    <span class="vexpl"><?=gettext("Only QinQ capable interfaces will be shown.");?></span></td>
+    <span class="vexpl">Only QinQ capable interfaces will be shown.</span></td>
   </tr>
   <tr>
-    <td width="22%" valign="top" class="vncellreq"><?=gettext("First level tag");?></td>
+    <td width="22%" valign="top" class="vncellreq">First level tag</td>
     <td width="78%" class="vtable">
       <input name="tag" type="text" class="formfld unknown" id="tag" size="10" value="<?=$pconfig['tag'];?>" />
       <br />
       <span class="vexpl">
-	<?=gettext("This is the first level VLAN tag. On top of this are stacked the member VLANs defined below.");?>
+	This is the first level VLAN tag. On top of this are stacked the member VLANs defined below.
       </span>
     </td>
   </tr>
   <tr>
-	<td width="22%" valign="top" class="vncell"><?=gettext("Options");?></td>
+	<td width="22%" valign="top" class="vncell">Options</td>
 	<td width="78%" class="vtable">
 <?php /* ?>
 		<br/>
@@ -330,30 +330,30 @@ function removeRow(el) {
 <?php */ ?>
 		<br/>
 		<input name="autogroup" type="checkbox" value="yes" id="autogroup" <? if ($pconfig['autogroup']) echo "checked";?>>
-		<span class="vexpl"><?=gettext("Adds interface to QinQ interface groups so you can write filter rules easily.");?></span>
+		<span class="vexpl"> Adds interface to QinQ interface groups so you can write filter rules easily.</span>
 	</td>
   </tr>
   <tr>
-    <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+    <td width="22%" valign="top" class="vncell">Description</td>
     <td width="78%" class="vtable">
       <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
       <br />
       <span class="vexpl">
-        <?=gettext("You may enter a description here for your reference (not parsed).");?>
+        You may enter a description here for your reference (not parsed).
       </span>
     </td>
   </tr>
   <tr>
-    <td width="22%" valign="top" class="vncellreq"><div id="membersnetworkport"><?=gettext("Member (s)");?></div></td>
+    <td width="22%" valign="top" class="vncellreq"><div id="membersnetworkport">Member (s)</div></td>
     <td width="78%" class="vtable">
 	<span vlass="vexpl">
-		<?=gettext("You can specify ranges in the input below. The format is pretty simple i.e 9-100 or 10.20...");?>
+		You can specify ranges in the input below. The format is pretty simple i.e 9-100 or 10.20...
 	</span>
 	<br/>
       <table id="maintable">
         <tbody>
           <tr>
-            <td><div id="onecolumn"><?=gettext("Tag");?></div></td>
+            <td><div id="onecolumn">Tag</div></td>
           </tr>
 
 	<?php
@@ -370,7 +370,7 @@ function removeRow(el) {
 	        <input name="members<?php echo $tracker; ?>" class="formselect" id="members<?php echo $tracker; ?>" value="<? echo $members;?>">
 	</td>
         <td>
-	<input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="<?=gettext("Delete");?>" />
+	<input type="image" src="/themes/<?echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow(this); return false;" value="Delete" />
 	      </td>
           </tr>
 <?php
@@ -385,15 +385,15 @@ function removeRow(el) {
         </tfoot>
 		  </table>
 			<a onclick="javascript:addRowTo('maintable'); return false;" href="#">
-        <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="<?=gettext("add another entry");?>" />
+        <img border="0" src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" alt="" title="add another entry" />
       </a>
 		</td>
   </tr>
   <tr>
     <td width="22%" valign="top">&nbsp;</td>
     <td width="78%">
-      <input id="submit" name="submit" type="submit" class="formbtn" value="<?=gettext("Save");?>" />
-      <a href="interfaces_qinq.php"><input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="<?=gettext("Cancel");?>" /></a>
+      <input id="submit" name="submit" type="submit" class="formbtn" value="Save" />
+      <a href="interfaces_qinq.php"><input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" /></a>
       <?php if (isset($id) && $a_qinqs[$id]): ?>
       <input name="id" type="hidden" value="<?=$id;?>" />
       <?php endif; ?>
diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php
index c75190f..cd8975c 100755
--- a/usr/local/www/interfaces_vlan.php
+++ b/usr/local/www/interfaces_vlan.php
@@ -62,7 +62,7 @@ function vlan_inuse($num) {
 if ($_GET['act'] == "del") {
 	/* check if still in use */
 	if (vlan_inuse($_GET['id'])) {
-		$input_errors[] = gettext("This VLAN cannot be deleted because it is still being used as an interface.");
+		$input_errors[] = "This VLAN cannot be deleted because it is still being used as an interface.";
 	} else {
 		mwexec("/sbin/ifconfig " . $a_vlans[$_GET['id']]['vlanif'] . " destroy");
 		unset($a_vlans[$_GET['id']]);
@@ -75,7 +75,7 @@ if ($_GET['act'] == "del") {
 }
 
 
-$pgtitle = array(gettext("Interfaces"),gettext("VLAN"));
+$pgtitle = array("Interfaces","VLAN");
 include("head.inc");
 
 ?>
@@ -87,16 +87,16 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
-	$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
-	$tab_array[2] = array(gettext("Wireless", false), "interfaces_wireless.php");
-	$tab_array[3] = array(gettext("VLANs"), true, "interfaces_vlan.php");
-	$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
-	$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
-	$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
-	$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
-	$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
-	$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
+	$tab_array[0] = array("Interface assignments", false, "interfaces_assign.php");
+	$tab_array[1] = array("Interface Groups", false, "interfaces_groups.php");
+	$tab_array[2] = array("Wireless", false, "interfaces_wireless.php");
+	$tab_array[3] = array("VLANs", true, "interfaces_vlan.php");
+	$tab_array[4] = array("QinQs", false, "interfaces_qinq.php");
+	$tab_array[5] = array("PPPs", false, "interfaces_ppps.php");
+	$tab_array[6] = array("GRE", false, "interfaces_gre.php");
+	$tab_array[7] = array("GIF", false, "interfaces_gif.php");
+	$tab_array[8] = array("Bridges", false, "interfaces_bridge.php");
+	$tab_array[9] = array("LAGG", false, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -105,9 +105,9 @@ include("head.inc");
 	<div id="mainarea">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                  <td width="20%" class="listhdrr"><?=gettext("Interface");?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("VLAN tag");?></td>
-                  <td width="50%" class="listhdr"><?=gettext("Description");?></td>
+                  <td width="20%" class="listhdrr">Interface</td>
+                  <td width="20%" class="listhdrr">VLAN tag</td>
+                  <td width="50%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
 				</tr>
 			  <?php $i = 0; foreach ($a_vlans as $vlan): ?>
@@ -122,18 +122,18 @@ include("head.inc");
                     <?=htmlspecialchars($vlan['descr']);?>&nbsp;
                   </td>
                   <td valign="middle" nowrap class="list"> <a href="interfaces_vlan_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
-                     &nbsp;<a href="interfaces_vlan.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext("Do you really want to delete this VLAN?");?>)"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                     &nbsp;<a href="interfaces_vlan.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this VLAN?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 			  <?php $i++; endforeach; ?>
                 <tr>
                   <td class="list" colspan="3">&nbsp;</td>
-                  <td class="list"> <a href="interfaces_vlan_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="<F12>17" border="0"></a></td>
+                  <td class="list"> <a href="interfaces_vlan_edit.php"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 				<tr>
 				<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note:");?><br>
+				  Note:<br>
 				  </strong></span>
-				  <?=gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the ");?><?=$g['product_name']?><?=gettext(" handbook for information on supported cards.");?> </p>
+				  Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the <?=$g['product_name']?> handbook for information on supported cards. </p>
 				  </td>
 				<td class="list">&nbsp;</td>
 				</tr>
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 8c37b75..db676f7 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -72,12 +72,12 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "if tag");
-	$reqdfieldsn = array(gettext("Parent interface"),gettext("VLAN tag"));
+	$reqdfieldsn = explode(",", "Parent interface,VLAN tag");
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if ($_POST['tag'] && (!is_numericint($_POST['tag']) || ($_POST['tag'] < '1') || ($_POST['tag'] > '4094'))) {
-		$input_errors[] = gettext("The VLAN tag must be an integer between 1 and 4094.");
+		$input_errors[] = "The VLAN tag must be an integer between 1 and 4094.";
 	}
 
 	foreach ($a_vlans as $vlan) {
@@ -85,14 +85,14 @@ if ($_POST) {
 			continue;
 
 		if (($vlan['if'] == $_POST['if']) && ($vlan['tag'] == $_POST['tag'])) {
-			$input_errors[] = sprintf(gettext("A VLAN with the tag %s is already defined on this interface."),$vlan['tag']);
+			$input_errors[] = "A VLAN with the tag {$vlan['tag']} is already defined on this interface.";
 			break;
 		}
 	}
 	if (is_array($config['qinqs']['qinqentry'])) {
 		foreach ($config['qinqs']['qinqentry'] as $qinq)
 			if ($qinq['tag'] == $_POST['tag'] && $qinq['if'] == $_POST['if'])
-				$input_errors[] = gettext("A QinQ VLAN exists with this tag please remove it to use this tag with.");
+				$input_errors[] = "A QinQ VLAN exists with this tag please remove it to use this tag with.";
 	}
 
 	if (!$input_errors) {
@@ -104,7 +104,7 @@ if ($_POST) {
 
 		$vlan['vlanif'] = interface_vlan_configure($vlan);
                 if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan"))
-                        $input_errors[] = gettext("Error occured creating interface, please retry.");
+                        $input_errors[] = "Error occured creating interface, please retry.";
                 else {
                         if (isset($id) && $a_vlans[$id])
                                 $a_vlans[$id] = $vlan;
@@ -123,7 +123,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Firewall"),gettext("VLAN"),gettext("Edit"));
+$pgtitle = array("Firewall","VLAN","Edit");
 include("head.inc");
 
 ?>
@@ -134,10 +134,10 @@ include("head.inc");
             <form action="interfaces_vlan_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic"><?=gettext("VLAN configuration");?></td>
+					<td colspan="2" valign="top" class="listtopic">VLAN configuration</td>
 				</tr>
 				<tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td>
+                  <td width="22%" valign="top" class="vncellreq">Parent interface</td>
                   <td width="78%" class="vtable">
                     <select name="if" class="formselect">
                       <?php
@@ -153,27 +153,27 @@ include("head.inc");
 		      ?>
                     </select>
 			<br/>
-			<span class="vexpl"><?=gettext("Only VLAN capable interfaces will be shown.");?></span></td>
+			<span class="vexpl">Only VLAN capable interfaces will be shown.</span></td>
                 </tr>
 				<tr>
-                  <td valign="top" class="vncellreq"><?=gettext("VLAN tag ");?></td>
+                  <td valign="top" class="vncellreq">VLAN tag </td>
                   <td class="vtable">
                     <input name="tag" type="text" class="formfld unknown" id="tag" size="6" value="<?=htmlspecialchars($pconfig['tag']);?>">
                     <br>
-                    <span class="vexpl"><?=gettext("802.1Q VLAN tag (between 1 and 4094) ");?></span></td>
+                    <span class="vexpl">802.1Q VLAN tag (between 1 and 4094) </span></td>
 			    </tr>
 				<tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+                  <td width="22%" valign="top" class="vncell">Description</td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here").
-                    ("for your reference (not parsed).");?></span></td>
+                    <br> <span class="vexpl">You may enter a description here
+                    for your reference (not parsed).</span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
 		    <input type="hidden" name="vlanif" value="<?=$pconfig['vlanif']; ?>">
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input type="button" value="<?=gettext("Cancel");?>" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" value="Cancel" onclick="history.back()">
                     <?php if (isset($id) && $a_vlans[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
diff --git a/usr/local/www/interfaces_wireless.php b/usr/local/www/interfaces_wireless.php
index e22a802..42fd149 100644
--- a/usr/local/www/interfaces_wireless.php
+++ b/usr/local/www/interfaces_wireless.php
@@ -60,7 +60,7 @@ function clone_inuse($num) {
 if ($_GET['act'] == "del") {
 	/* check if still in use */
 	if (clone_inuse($_GET['id'])) {
-		$input_errors[] = gettext("This wireless clone cannot be deleted because it is assigned as an interface.");
+		$input_errors[] = "This wireless clone cannot be deleted because it is assigned as an interface.";
 	} else {
 		mwexec("/sbin/ifconfig " . $a_clones[$_GET['id']]['cloneif'] . " destroy");
 		unset($a_clones[$_GET['id']]);
@@ -73,7 +73,7 @@ if ($_GET['act'] == "del") {
 }
 
 
-$pgtitle = array(gettext("Interfaces"),("Wireless"));
+$pgtitle = array("Interfaces","Wireless");
 include("head.inc");
 
 ?>
@@ -85,16 +85,16 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
-	$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
-	$tab_array[2] = array(gettext("Wireless"), true, "interfaces_wireless.php");
-	$tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php");
-	$tab_array[4] = array(gettext("QinQs"), false, "interfaces_qinq.php");
-	$tab_array[5] = array(gettext("PPPs"), false, "interfaces_ppps.php");
-	$tab_array[6] = array(gettext("GRE"), false, "interfaces_gre.php");
-	$tab_array[7] = array(gettext("GIF"), false, "interfaces_gif.php");
-	$tab_array[8] = array(gettext("Bridges"), false, "interfaces_bridge.php");
-	$tab_array[9] = array(gettext("LAGG"), false, "interfaces_lagg.php");
+	$tab_array[0] = array("Interface assignments", false, "interfaces_assign.php");
+	$tab_array[1] = array("Interface Groups", false, "interfaces_groups.php");
+	$tab_array[2] = array("Wireless", true, "interfaces_wireless.php");
+	$tab_array[3] = array("VLANs", false, "interfaces_vlan.php");
+	$tab_array[4] = array("QinQs", false, "interfaces_qinq.php");
+	$tab_array[5] = array("PPPs", false, "interfaces_ppps.php");
+	$tab_array[6] = array("GRE", false, "interfaces_gre.php");
+	$tab_array[7] = array("GIF", false, "interfaces_gif.php");
+	$tab_array[8] = array("Bridges", false, "interfaces_bridge.php");
+	$tab_array[9] = array("LAGG", false, "interfaces_lagg.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -103,9 +103,9 @@ include("head.inc");
 	<div id="mainarea">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-                  <td width="20%" class="listhdrr"><?=gettext("Interface");?></td>
-                  <td width="20%" class="listhdrr"><?=gettext("Mode");?></td>
-                  <td width="50%" class="listhdr"><?=gettext("Description");?></td>
+                  <td width="20%" class="listhdrr">Interface</td>
+                  <td width="20%" class="listhdrr">Mode</td>
+                  <td width="50%" class="listhdr">Description</td>
                   <td width="10%" class="list"></td>
 				</tr>
 			  <?php $i = 0;
@@ -121,7 +121,7 @@ include("head.inc");
                     <?=htmlspecialchars($clone['descr']);?>&nbsp;
                   </td>
                   <td valign="middle" nowrap class="list"> <a href="interfaces_wireless_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
-                     &nbsp;<a href="interfaces_wireless.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext("Do you really want to delete this wireless clone?");?>)"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                     &nbsp;<a href="interfaces_wireless.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this wireless clone?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
 				</tr>
 			  <?php $i++; endforeach; ?>
                 <tr>
@@ -130,9 +130,9 @@ include("head.inc");
 				</tr>
 				<tr>
 				<td colspan="3" class="list"><p class="vexpl"><span class="red"><strong>
-				  <?=gettext("Note:");?><br>
+				  Note:<br>
 				  </strong></span>
-				  <?=gettext("Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.");?>
+				  Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.
 				  </td>
 				<td class="list">&nbsp;</td>
 				</tr>
diff --git a/usr/local/www/interfaces_wireless_edit.php b/usr/local/www/interfaces_wireless_edit.php
index 1cb3906..1e9419e 100644
--- a/usr/local/www/interfaces_wireless_edit.php
+++ b/usr/local/www/interfaces_wireless_edit.php
@@ -81,7 +81,7 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "if mode");
-	$reqdfieldsn = array(gettext("Parent interface"),gettext("Mode"));
+	$reqdfieldsn = explode(",", "Parent interface,Mode");
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
@@ -113,14 +113,14 @@ if ($_POST) {
 		if (isset($id) && $a_clones[$id]) {
 			if (clone_inuse($id)) {
 				if ($clone['if'] != $a_clones[$id]['if'])
-					$input_errors[] = gettext("This wireless clone cannot be modified because it is still assigned as an interface.");
+					$input_errors[] = "This wireless clone cannot be modified because it is still assigned as an interface.";
 				else if ($clone['mode'] != $a_clones[$id]['mode'])
-					$input_errors[] = gettext("Use the configuration page for the assigned interface to change the mode.");
+					$input_errors[] = "Use the configuration page for the assigned interface to change the mode.";
 			}
 		}
 		if (!$input_errors) {
 			if (!interface_wireless_clone($clone['cloneif'], $clone)) {
-				$input_errors[] = sprintf(gettext("Error creating interface with mode %s.  The %s interface may not support creating more clones with the selected mode."), $wlan_modes[$clone['mode']], $clone['if']);
+				$input_errors[] = "Error creating interface with mode {$wlan_modes[$clone['mode']]}.  The {$clone['if']} interface may not support creating more clones with the selected mode.";
 			} else {
 				if (isset($id) && $a_clones[$id]) {
 					if ($clone['if'] != $a_clones[$id]['if'])
@@ -128,7 +128,7 @@ if ($_POST) {
 					$input_errors[] = "Created with id {$id}";
 					$a_clones[$id] = $clone;
 				} else {
-					$input_errors[] = gettext("Created without id");
+					$input_errors[] = "Created without id";
 					$a_clones[] = $clone;
 				}
 
@@ -142,7 +142,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Firewall"),gettext("Wireless"),gettext("Edit"));
+$pgtitle = array("Firewall","Wireless","Edit");
 include("head.inc");
 
 ?>
@@ -153,10 +153,10 @@ include("head.inc");
             <form action="interfaces_wireless_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="0">
                 <tr>
-                  <td colspan="2" valign="top" class="listtopic"><?=gettext("Wireless clone configuration");?></td>
+                  <td colspan="2" valign="top" class="listtopic">Wireless clone configuration</td>
                 </tr>
                 <tr>
-                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td>
+                  <td width="22%" valign="top" class="vncellreq">Parent interface</td>
                   <td width="78%" class="vtable">
                     <select name="if" class="formselect">
                       <?php
@@ -173,26 +173,26 @@ include("head.inc");
                     </select></td>
                 </tr>
                 <tr>
-                  <td valign="top" class="vncellreq"><?=gettext("Mode");?></td>
+                  <td valign="top" class="vncellreq">Mode</td>
                   <td class="vtable">
                     <select name="mode" class="formselect">
-                      <option <? if ($pconfig['mode'] == 'bss') echo "selected";?> value="bss"><?=gettext("Infrastructure (BSS)");?></option>
-                      <option <? if ($pconfig['mode'] == 'adhoc') echo "selected";?> value="adhoc"><?=gettext("Ad-hoc (IBSS)");?></option>
-                      <option <? if ($pconfig['mode'] == 'hostap') echo "selected";?> value="hostap"><?=gettext("Access Point");?></option>
+                      <option <? if ($pconfig['mode'] == 'bss') echo "selected";?> value="bss">Infrastructure (BSS)</option>
+                      <option <? if ($pconfig['mode'] == 'adhoc') echo "selected";?> value="adhoc">Ad-hoc (IBSS)</option>
+                      <option <? if ($pconfig['mode'] == 'hostap') echo "selected";?> value="hostap">Access Point</option>
                     </select></td>
                 </tr>
                 <tr>
-                  <td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
+                  <td width="22%" valign="top" class="vncell">Description</td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl"><?=gettext("You may enter a description here".
-                    "for your reference (not parsed).");?></span></td>
+                    <br> <span class="vexpl">You may enter a description here
+                    for your reference (not parsed).</span></td>
                 </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
                     <input type="hidden" name="cloneif" value="<?=$pconfig['cloneif']; ?>">
-                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save");?>"> <input type="button" value="<?=gettext("Cancel");?>" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" value="Cancel" onclick="history.back()">
                     <?php if (isset($id) && $a_clones[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>