From 808614b15380f6e4129ee0737b4f628688a0003f Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 19:30:58 -0300
Subject: Review firewall_aliases.php

---
 usr/local/www/firewall_aliases.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index 1e69efd..910cf43 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -147,7 +147,7 @@ if ($_GET['act'] == "del") {
 			}
 		}
 		if($is_alias_referenced == true) {
-			$savemsg = sprintf(gettext("Cannot delete rule.  Currently in use by %s"), $referenced_by);
+			$savemsg = sprintf(gettext("Cannot delete rule. Currently in use by %s"), $referenced_by);
 		} else {
 			unset($a_aliases[$_GET['id']]);
 			write_config();
@@ -169,7 +169,7 @@ include("head.inc");
 <form action="firewall_aliases.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('aliases')): ?><p>
-<?php print_info_box_np gettext("The alias list has been changed.<br>You must apply the changes in order for them to take effect.");?>
+<?php print_info_box_np(gettext("The alias list has been changed.") . "<br>" . gettext("You must apply the changes in order for them to take effect."));?>
 <?php endif; ?>
 
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -214,7 +214,7 @@ include("head.inc");
     <table border="0" cellspacing="0" cellpadding="1">
       <tr>
         <td valign="middle"><a href="firewall_aliases_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit alias"); ?>"></a></td>
-        <td><a href="firewall_aliases.php?act=del&id=<?=$i;?>" onclick="return confirm(gettext('Do you really want to delete this alias? 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 alias"); ?>"></a></td>
+	<td><a href="firewall_aliases.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext('Do you really want to delete this alias? 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 alias"); ?>"></a></td>
       </tr>
     </table>
   </td>
-- 
cgit v1.1


From bd413d7682da8d97f6d9616a3725eb96d9cb1eb4 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 19:38:18 -0300
Subject: Review firewall_aliases_edit.php

---
 usr/local/www/firewall_aliases_edit.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index a7e50b6..43a8f4e 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -130,7 +130,7 @@ if ($_POST) {
 	/* input validation */
 
 	$reqdfields = explode(" ", "name");
-	$reqdfieldsn = array(",", gettext("Name"));
+	$reqdfieldsn = array(gettext("Name"));
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
@@ -138,10 +138,10 @@ if ($_POST) {
 	if (!isset($x)) {
 		$input_errors[] = gettext("Reserved word used for alias name.");
 	} else if ($_POST['type'] == "port" && (getservbyname($_POST['name'], "tcp") || getservbyname($_POST['name'], "udp"))) {
-		$input_errors[] = gettext("Reserved word used for alias name.)";
+		$input_errors[] = gettext("Reserved word used for alias name.");
 	} else {
 		if (is_validaliasname($_POST['name']) == false)
-			$input_errors[] = gettext("The alias name may only consist of the characters a-z, A-Z, 0-9, _.");
+			$input_errors[] = gettext("The alias name may only consist of the characters") . " a-z, A-Z, 0-9, _.";
 	}
 	/* check for name conflicts */
 	if (empty($a_aliases[$id])) {
@@ -450,7 +450,7 @@ $urltable_help = sprintf(gettext("Enter a single URL containing a large number o
 $openvpn_str = gettext("Username");
 $openvpn_user_str = gettext("OpenVPN Users");
 $openvpn_help = gettext("Enter as many usernames as you wish.");
-$openvpn_freq = gettext("");
+$openvpn_freq = "";
 
 $jscriptstr .= <<<EOD
 
@@ -561,7 +561,7 @@ EOD;
       <?php endif; ?>
       <br />
       <span class="vexpl">
-        <?=gettext("The name of the alias may only consist of the characters a-z, A-Z and 0-9."); ?>
+        <?=gettext("The name of the alias may only consist of the characters") . " a-z, A-Z and 0-9."; ?>
       </span>
     </td>
   </tr>
@@ -583,7 +583,7 @@ EOD;
         <option value="network" <?php if ($pconfig['type'] == "network") echo "selected"; ?>><?=gettext("Network(s)"); ?></option>
         <option value="port" <?php if ($pconfig['type'] == "port") echo "selected"; ?>><?=gettext("Port(s)"); ?></option>
         <option value="openvpn" <?php if ($pconfig['type'] == "openvpn") echo "selected"; ?>><?=gettext("OpenVPN Users"); ?></option>
-        <option value="url" <?php if ($pconfig['type'] == "url") echo "selected"; ?>>URL</option>
+	<option value="url" <?php if ($pconfig['type'] == "url") echo "selected"; ?>><?=gettext("URL");?></option>
         <option value="urltable" <?php if ($pconfig['type'] == "urltable") echo "selected"; ?>><?=gettext("URL Table"); ?></option>
       </select>
     </td>
-- 
cgit v1.1


From 7e3e8416ecd553e4b3516529131d609ba6ee54dd Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 19:41:17 -0300
Subject: Review firewall_aliases_import.php

---
 usr/local/www/firewall_aliases_import.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php
index 47a22d0..e23c78c 100755
--- a/usr/local/www/firewall_aliases_import.php
+++ b/usr/local/www/firewall_aliases_import.php
@@ -55,12 +55,12 @@ $a_aliases = &$config['aliases']['alias'];
 
 if($_POST['aliasimport'] <> "") {
 	$reqdfields = explode(" ", "name aliasimport");
-	$reqdfieldsn = array(",", gettext("Name,Aliases"));
+	$reqdfieldsn = array(gettext("Name"),gettext("Aliases"));
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 		
 	if (is_validaliasname($_POST['name']) == false)
-		$input_errors[] = gettext("The alias name may only consist of the characters a-z, A-Z, 0-9, _.");
+		$input_errors[] = gettext("The alias name may only consist of the characters") . " a-z, A-Z, 0-9, _.";
 
 	/* check for name duplicates */
 	if (is_alias($_POST['name']))
@@ -133,7 +133,7 @@ include("head.inc");
 	  <td valign="top" class="vncellreq"><?=gettext("Alias Name"); ?></td>
 	  <td class="vtable"> <input name="name" type="text" class="formfld unknown" id="name" size="40" value="<?=htmlspecialchars($_POST['name']);?>" />
 	    <br /> <span class="vexpl">
-	    <?=gettext("The name of the alias may only consist of the characters a-z, A-Z and 0-9."); ?></span></td>
+	    <?=gettext("The name of the alias may only consist of the characters") . " a-z, A-Z and 0-9."; ?></span></td>
 	</tr>
 	<tr>
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
-- 
cgit v1.1


From 3337063da2fcaa9494c1813bbd1147816ab44880 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 19:49:47 -0300
Subject: Review firewall_aliases_edit.php - part 2

---
 usr/local/www/firewall_aliases_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 43a8f4e..7e67c4d 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -259,7 +259,7 @@ if ($_POST) {
 					if (!is_ipaddr($_POST["address{$x}"])
 					 && !is_hostname($_POST["address{$x}"])
 					 && !is_iprange($_POST["address{$x}"]))
-						$input_errors[] = sprintf(gettext("%s is not a valid %s alias."), $_POST["address{$x}"], $_POST['type'];
+						$input_errors[] = sprintf(gettext("%s is not a valid %s alias."), $_POST["address{$x}"], $_POST['type']);
 				}
 				if (is_iprange($_POST["address{$x}"])) {
 					list($startip, $endip) = explode('-', $_POST["address{$x}"]);
-- 
cgit v1.1


From 7fcd0934b9ab90b08e483a77182ac904e68dad22 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 19:50:46 -0300
Subject: Review firewall_nat.php

---
 usr/local/www/firewall_nat.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 55e73df..8d3a1fb 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -158,7 +158,7 @@ if (isset($_POST['del_x'])) {
         }
 }
 
-$pgtitle = array(gettext("Firewall","NAT","Port Forward"));
+$pgtitle = array(gettext("Firewall"),gettext("NAT"),gettext("Port Forward"));
 include("head.inc");
 
 echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript/domTT/domLib.js\"></script>";
@@ -174,7 +174,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 <?php if (is_subsystem_dirty('natconf')): ?><p>
 <?php
 	if($savemsg)
-		print_info_box_np("{$savemsg}<br>" .  gettext("The NAT configuration has been changed") . ".<br>" .  gettext("You must apply the changes in order for them to take effect.") );
+		print_info_box_np("{$savemsg}<br>" .  gettext("The NAT configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect.") );
    else
 		print_info_box_np( gettext("The NAT configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect.") );
 ?>
@@ -184,7 +184,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 <?php
 	$tab_array = array();
 	$tab_array[] = array(gettext("Port Forward"), true, "firewall_nat.php");
-	$tab_array[] = array("1:1", false, "firewall_nat_1to1.php");
+	$tab_array[] = array(gettext("1:1"), false, "firewall_nat_1to1.php");
 	$tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
 	display_top_tabs($tab_array);
 ?>
@@ -196,21 +196,21 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                 <tr id="frheader">
 		  <td width="3%" class="list">&nbsp;</td>
                   <td width="3%" class="list">&nbsp;</td>
-                  <td width="5%" class="listhdrr">If</td>
-                  <td width="5%" class="listhdrr">Proto</td>
-                  <td width="11%" class="listhdrr">Src. addr</td>
-                  <td width="11%" class="listhdrr">Src. ports</td>
-                  <td width="11%" class="listhdrr">Dest. addr</td>
-                  <td width="11%" class="listhdrr">Dest. ports</td>
-                  <td width="11%" class="listhdrr">NAT IP</td>
-                  <td width="11%" class="listhdrr">NAT Ports</td>
-                  <td width="11%" class="listhdr">Description</td>
+		  <td width="5%" class="listhdrr"><?=gettext("If");?></td>
+		  <td width="5%" class="listhdrr"><?=gettext("Proto");?></td>
+		  <td width="11%" class="listhdrr"><?=gettext("Src. addr");?></td>
+		  <td width="11%" class="listhdrr"><?=gettext("Src. ports");?></td>
+		  <td width="11%" class="listhdrr"><?=gettext("Dest. addr");?></td>
+		  <td width="11%" class="listhdrr"><?=gettext("Dest. ports");?></td>
+		  <td width="11%" class="listhdrr"><?=gettext("NAT IP");?></td>
+		  <td width="11%" class="listhdrr"><?=gettext("NAT Ports");?></td>
+		  <td width="11%" class="listhdr"><?=gettext("Description");?></td>
                   <td width="5%" class="list">
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
 			<td width="17">
 			<?php if (count($a_nat) == 0): ?>
-				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title=gettext("delete selected rules") border="0">
+				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0">
 			<?php else: ?>
 				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected rules" onclick="return confirm('Do you really want to delete the selected rules?')">
 			<?php endif; ?>
@@ -312,12 +312,12 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td valign="middle" class="list" nowrap>
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
-                        <td><input onmouseover="fr_insline(<?=$nnats;?>, true)" onmouseout="fr_insline(<?=$nnats;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title=gettext("move selected rules before this rule") height="17" type="image" width="17" border="0"></td>
+			<td><input onmouseover="fr_insline(<?=$nnats;?>, true)" onmouseout="fr_insline(<?=$nnats;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="<?=gettext("move selected rules before this rule");?>" height="17" type="image" width="17" border="0"></td>
                         <td><a href="firewall_nat_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="edit rule"></a></td>
                       </tr>
                       <tr>
-					    <td align="center" valign="middle"><a href="firewall_nat.php?act=del&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title=gettext("delete rule") onclick="return confirm(gettext('Do you really want to delete this rule?'))"></a></td>
-                        <td><a href="firewall_nat_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title=gettext("add a new nat based on this one") width="17" height="17" border="0"></a></td>
+					    <td align="center" valign="middle"><a href="firewall_nat.php?act=del&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete rule");?> onclick="return confirm(<?=gettext('Do you really want to delete this rule?');?>)"></a></td>
+			<td><a href="firewall_nat_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add a new nat based on this one");?>" width="17" height="17" border="0"></a></td>
                       </tr>
                     </table>
 		</tr>
@@ -330,14 +330,14 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td class="list" valign="middle" nowrap>
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
-                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="move selected rules to end" border="0"><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title=gettext("move selected rules to end") border="0"><?php endif; ?></td>
+			<td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="move selected rules to end" border="0"><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="<?=gettext("move selected rules to end");?>" border="0"><?php endif; ?></td>
                       </tr>
                       <tr>
 			<td width="17">
 			<?php if (count($a_nat) == 0): ?>
-				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title=gettext("delete selected rules") border="0">
+				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0">
 			<?php else: ?>
-				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected rules" onclick="return confirm(gettext('Do you really want to delete the selected rules?'))">
+				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected rules" onclick="return confirm(<?=gettext('Do you really want to delete the selected rules?');?>)">
 			<?php endif; ?>
 			</td>
                         <td><a href="firewall_nat_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
@@ -352,7 +352,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 			</tr>
 		   <tr>
             <td width="14"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_chain.png" width="11" height="11"></td>
-            <td colspan="3">gettext("linked rule")</td>
+	    <td colspan="3"><?=gettext("linked rule");?></td>
           </tr>
     </table>
 	</div>
-- 
cgit v1.1


From 9eae66813c1071dd323f8efe5dd2208879f4f1ac Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 19:56:20 -0300
Subject: Implement gettext() calls on firewall_shaper_wizards.php

Conflicts:

	usr/local/www/firewall_shaper_wizards.php
---
 usr/local/www/firewall_shaper_wizards.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper_wizards.php b/usr/local/www/firewall_shaper_wizards.php
index 1631e13..8f93b86 100755
--- a/usr/local/www/firewall_shaper_wizards.php
+++ b/usr/local/www/firewall_shaper_wizards.php
@@ -70,14 +70,14 @@ if ($_POST['apply']) {
 		clear_subsystem_dirty('shaper');
 }
 
-$pgtitle = array("Firewall", "Traffic Shaper", "Wizards");
+$pgtitle = array(gettext("Firewall"),gettext("Traffic Shaper"),gettext("Wizards"));
 $statusurl = "status_queues.php";
 
-$wizards = array(gettext("Single Lan multi Wan") => "traffic_shaper_wizard.xml",
-									gettext("Single Wan multi Lan") => "traffic_shaper_wizard_multi_lan.xml",
-									gettext("Multiple Lan/Wan") => "traffic_shaper_wizard_multi_all.xml",
-									gettext("Dedicated Links") => "traffic_shaper_wizard_dedicated.xml",
-								);
+$wizards = array(gettext("Single Lan multi Wan")) => "traffic_shaper_wizard.xml",
+                gettext("Single Wan multi Lan") => "traffic_shaper_wizard_multi_lan.xml",
+				gettext("Multiple Lan/Wan") => "traffic_shaper_wizard_multi_all.xml",
+				gettext("Dedicated Links") => "traffic_shaper_wizard_dedicated.xml",
+				;
 
 include("head.inc");
 ?>
@@ -93,17 +93,17 @@ include("fbegin.inc");
 
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('shaper')): ?><p>
-<?php print_info_box_np("The traffic shaper configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
+<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")<br>gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("By Interface", false, "firewall_shaper.php");
-	$tab_array[1] = array("By Queue", false, "firewall_shaper_queues.php");
-	$tab_array[2] = array("Limiter", false, "firewall_shaper_vinterface.php");
-	$tab_array[3] = array("Layer7", false, "firewall_shaper_layer7.php");
-	$tab_array[4] = array("Wizards", true, "firewall_shaper_wizards.php");
+	$tab_array[0] = array(gettext("By Interface")), false, "firewall_shaper.php");
+	$tab_array[1] = array(gettext("By Queue")), false, "firewall_shaper_queues.php");
+	$tab_array[2] = array(gettext("Limiter")), false, "firewall_shaper_vinterface.php");
+	$tab_array[3] = array(gettext("Layer7")), false, "firewall_shaper_layer7.php");
+	$tab_array[4] = array(gettext("Wizards")), true, "firewall_shaper_wizards.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
-- 
cgit v1.1


From a389635bcee38a95e643254325935bf7e6430206 Mon Sep 17 00:00:00 2001
From: "heitor.lessa" <heitor.lessa@hotmail.com>
Date: Wed, 30 Jun 2010 19:45:46 -0300
Subject: Review gettext() calls on firewall_shaper_wizards.php

---
 usr/local/www/firewall_shaper_wizards.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper_wizards.php b/usr/local/www/firewall_shaper_wizards.php
index 8f93b86..a2a9f09 100755
--- a/usr/local/www/firewall_shaper_wizards.php
+++ b/usr/local/www/firewall_shaper_wizards.php
@@ -73,11 +73,11 @@ if ($_POST['apply']) {
 $pgtitle = array(gettext("Firewall"),gettext("Traffic Shaper"),gettext("Wizards"));
 $statusurl = "status_queues.php";
 
-$wizards = array(gettext("Single Lan multi Wan")) => "traffic_shaper_wizard.xml",
+$wizards = array(gettext("Single Lan multi Wan") => "traffic_shaper_wizard.xml",
                 gettext("Single Wan multi Lan") => "traffic_shaper_wizard_multi_lan.xml",
 				gettext("Multiple Lan/Wan") => "traffic_shaper_wizard_multi_all.xml",
 				gettext("Dedicated Links") => "traffic_shaper_wizard_dedicated.xml",
-				;
+				);
 
 include("head.inc");
 ?>
@@ -93,7 +93,7 @@ include("fbegin.inc");
 
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('shaper')): ?><p>
-<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")<br>gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.").<br>.gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td>
-- 
cgit v1.1


From cb42b4f795f242e9aa18951f651b878536dc4442 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 20:34:53 -0300
Subject: Review firewall_nat_1to1.php

---
 usr/local/www/firewall_nat_1to1.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php
index 96a29e1..b2252ae 100755
--- a/usr/local/www/firewall_nat_1to1.php
+++ b/usr/local/www/firewall_nat_1to1.php
@@ -84,13 +84,13 @@ include("head.inc");
 <form action="firewall_nat_1to1.php" method="post">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('natconf')): ?><p>
-<?php print_info_box_np(gettext("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The NAT configuration has been changed") . ".<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <tr><td>
 <?php
 	$tab_array = array();
 	$tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
-	$tab_array[] = array("1:1", true, "firewall_nat_1to1.php");
+	$tab_array[] = array(gettext("1:1"), true, "firewall_nat_1to1.php");
 	$tab_array[] = array(gettext("Outbound"), false, "firewall_nat_out.php");
 	display_top_tabs($tab_array);
 ?>
@@ -100,7 +100,7 @@ include("head.inc");
 	<div id="mainarea">
               <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
                 <tr>
-		  <td width="10%" class="listhdrr">Interface</td>
+		  <td width="10%" class="listhdrr"><?=gettext("Interface"); ?></td>
                   <td width="20%" class="listhdrr"><?=gettext("External IP"); ?></td>
                   <td width="20%" class="listhdrr"><?=gettext("Internal IP"); ?></td>
                   <td width="40%" class="listhdr"><?=gettext("Description"); ?></td>
@@ -138,7 +138,7 @@ include("head.inc");
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
                         <td valign="middle"><a href="firewall_nat_1to1_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit rule"); ?>"></a></td>
-                        <td valign="middle"><a href="firewall_nat_1to1.php?act=del&id=<?=$i;?>" onclick="return confirm(gettext('Do you really want to delete this mapping?'))"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete rule"); ?>"></a></td>
+			<td valign="middle"><a href="firewall_nat_1to1.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext('Do you really want to delete this mapping?');?>)"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete rule"); ?>"></a></td>
                       </tr>
                     </table>
                   </td>
-- 
cgit v1.1


From c340a4a8c7720173baa6c09253bb44cbf7b6a8c1 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 20:38:46 -0300
Subject: Review firewall_nat_1to1_edit.php

---
 usr/local/www/firewall_nat_1to1_edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index dde6e4b..5bbcb2b 100755
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -89,7 +89,7 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "interface external internal");
-	$reqdfieldsn = array(",", gettext("Interface,External subnet,Internal subnet"));
+	$reqdfieldsn = array(gettext("Interface"),gettext("External subnet"),gettext("Internal subnet"));
 	
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
@@ -138,7 +138,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array("Firewall","NAT","1:1",gettext("Edit"));
+$pgtitle = array(gettext("Firewall"),gettext("NAT"),gettext("1:1"),gettext("Edit"));
 include("head.inc");
 
 ?>
-- 
cgit v1.1


From ba1a0433c4fa061bf8f7ce29d2572accef8e28d3 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Wed, 30 Jun 2010 20:59:17 -0300
Subject: Review firewall_nat_edit.php

---
 usr/local/www/firewall_nat_edit.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index 93210e9..b15a3ea 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -178,10 +178,10 @@ if ($_POST) {
 	/* input validation */
 	if(strtoupper($_POST['proto']) == "TCP" or strtoupper($_POST['proto']) == "UDP" or strtoupper($_POST['proto']) == "TCP/UDP") {
 		$reqdfields = explode(" ", "interface proto dstbeginport dstendport localip");
-		$reqdfieldsn = array(",", gettext("Interface,Protocol,Destination port from,Destination port to,NAT IP"));
+		$reqdfieldsn = array(gettext("Interface"),gettext("Protocol"),gettext("Destination port from"),gettext("Destination port to"),gettext("NAT IP"));
 	} else {
 		$reqdfields = explode(" ", "interface proto localip");
-		$reqdfieldsn = array(",", gettext("Interface,Protocol,NAT IP"));
+		$reqdfieldsn = array(gettext("Interface"),gettext("Protocol"),gettext("NAT IP"));
 	}
 
 	if ($_POST['srctype'] == "single" || $_POST['srctype'] == "network") {
@@ -415,7 +415,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array("Firewall","NAT",gettext("Port Forward: Edit"));
+$pgtitle = array(gettext("Firewall"),gettext("NAT"),gettext("Port Forward"),gettext("Edit"));
 include("head.inc");
 
 ?>
@@ -498,7 +498,7 @@ include("fbegin.inc"); ?>
 		<tr style="display: none;" id="srctable" name="srctable">
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Source"); ?></td>
 			<td width="78%" class="vtable">
-				<input name="srcnot" type="checkbox" id="srcnot" value="<?=gettext("yes"); ?>" <?php if ($pconfig['srcnot']) echo "checked"; ?>>
+				<input name="srcnot" type="checkbox" id="srcnot" value="yes" <?php if ($pconfig['srcnot']) echo "checked"; ?>>
 				<strong><?=gettext("not"); ?></strong>
 				<br />
 				<?=gettext("Use this option to invert the sense of the match"); ?>.
@@ -515,20 +515,20 @@ include("fbegin.inc"); ?>
 								<option value="single"  <?php if (($pconfig['srcmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>><?=gettext("Single host or alias"); ?></option>
 								<option value="network" <?php if (!$sel) echo "selected"; ?>><?=gettext("Network"); ?></option>
 								<?php if(have_ruleint_access("pptp")): ?>
-								<option value="pptp"    <?php if ($pconfig['src'] == "pptp") { echo gettext("selected"); } ?>>PPTP <?=gettext("clients"); ?></option>
+								<option value="pptp"    <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>><?=gettext("PPTP clients"); ?></option>
 								<?php endif; ?>
 								<?php if(have_ruleint_access("pppoe")): ?>
-								<option value="pppoe"   <?php if ($pconfig['src'] == "pppoe") { echo gettext("selected"); } ?>>PPPoE <?=gettext("clients"); ?></option>
+								<option value="pppoe"   <?php if ($pconfig['src'] == "pppoe") { echo "selected"; } ?>><?=gettext("PPPoE clients"); ?></option>
 								<?php endif; ?>
 								 <?php if(have_ruleint_access("l2tp")): ?>
-                                                                <option value="l2tp"   <?php if ($pconfig['src'] == "l2tp") { echo gettext("selected"); } ?>>L2TP <?=gettext("clients"); ?></option>
+                                                                <option value="l2tp"   <?php if ($pconfig['src'] == "l2tp") { echo "selected"; } ?>><?=gettext("L2TP clients"); ?></option>
                                                                 <?php endif; ?>
 <?php
 								foreach ($ifdisp as $ifent => $ifdesc): ?>
 								<?php if(have_ruleint_access($ifent)): ?>
 									<option value="<?=$ifent;?>" <?php if ($pconfig['src'] == $ifent) { echo "selected"; } ?>><?=htmlspecialchars($ifdesc);?> <?=gettext("subnet"); ?></option>
 									<option value="<?=$ifent;?>ip"<?php if ($pconfig['src'] ==  $ifent . "ip") { echo "selected"; } ?>>
-										<?=$ifdesc?> address
+										<?=$ifdesc?> <?=gettext("address");?>
 									</option>
 								<?php endif; ?>
 <?php 							endforeach; ?>
@@ -604,20 +604,20 @@ include("fbegin.inc"); ?>
 								<option value="single" <?php if (($pconfig['dstmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>><?=gettext("Single host or alias"); ?></option>
 								<option value="network" <?php if (!$sel) echo "selected"; ?>><?=gettext("Network"); ?></option>
 								<?php if(have_ruleint_access("pptp")): ?>
-								<option value="pptp" <?php if ($pconfig['dst'] == "pptp") { echo "selected"; } ?>>PPTP <?=gettext("clients"); ?></option>
+								<option value="pptp" <?php if ($pconfig['dst'] == "pptp") { echo "selected"; } ?>><?=gettext("PPTP clients"); ?></option>
 								<?php endif; ?>
 								<?php if(have_ruleint_access("pppoe")): ?>
-								<option value="pppoe" <?php if ($pconfig['dst'] == "pppoe") { echo "selected"; } ?>>PPPoE <?=gettext("clients"); ?></option>
+								<option value="pppoe" <?php if ($pconfig['dst'] == "pppoe") { echo "selected"; } ?>><?=gettext("PPPoE clients"); ?></option>
 								<?php endif; ?>
 								<?php if(have_ruleint_access("l2tp")): ?>
-                                                                <option value="l2tp" <?php if ($pconfig['dst'] == "l2tp") { echo "selected"; } ?>>L2TP <?=gettext("clients"); ?></option>
+                                                                <option value="l2tp" <?php if ($pconfig['dst'] == "l2tp") { echo "selected"; } ?>><?=gettext("L2TP clients"); ?></option>
                                                                 <?php endif; ?>
 
 <?php 							foreach ($ifdisp as $if => $ifdesc): ?>
 								<?php if(have_ruleint_access($if)): ?>
 									<option value="<?=$if;?>" <?php if ($pconfig['dst'] == $if) { echo "selected"; } ?>><?=htmlspecialchars($ifdesc);?> <?=gettext("subnet"); ?></option>
 									<option value="<?=$if;?>ip"<?php if ($pconfig['dst'] == $if . "ip") { echo "selected"; } ?>>
-										<?=$ifdesc;?> address
+										<?=$ifdesc;?> <?=gettext("address");?>
 									</option>
 								<?php endif; ?>
 <?php 							endforeach; ?>
@@ -737,7 +737,7 @@ include("fbegin.inc"); ?>
 				<tr>
 					<td width="22%" valign="top" class="vncell"><?=gettext("No XMLRPC Sync"); ?></td>
 					<td width="78%" class="vtable">
-						<input type="checkbox" value="<?=gettext("yes"); ?>" name="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br>
+						<input type="checkbox" value="yes" name="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br>
 						<?=gettext("HINT: This prevents the rule from automatically syncing to other CARP members"); ?>.
 					</td>
 				</tr>
-- 
cgit v1.1


From 79a5a0518fd35c6330d4346aba0b8f047ab2785a Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Thu, 1 Jul 2010 08:21:14 -0300
Subject: Pick some fixes from master

---
 usr/local/www/firewall_virtual_ip.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 91f1939..69b44e3 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -200,7 +200,7 @@ include("head.inc");
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
                         <td valign="middle"><a href="firewall_virtual_ip_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-                        <td valign="middle"><a href="firewall_virtual_ip.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext("Do you really want to delete this entry?");?>)"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                        <td valign="middle"><a href="firewall_virtual_ip.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext('Do you really want to delete this entry?');?>)"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
                       </tr>
                     </table>
                   </td>
@@ -220,9 +220,9 @@ include("head.inc");
                 </tr>
 		<tr>
 		  <td colspan="4">
-		      <p><span class="vexpl"><span class="red"><b><?=gettext("Note:");?><br>
-                      </b></span><?=gettext("The virtual IP addresses defined on this page may be used in ");?><a href="firewall_nat.php">NAT</a><?=gettext ("mappings.");?><br>
-                      <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php"><?=gettext("here");?></a>.</span></p>
+		      <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
+                      </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in ");?><a href="firewall_nat.php">NAT</a><?=gettext(" mappings.");?><br>
+                      <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php">here</a>.</span></p>
 		  </td>
 		</tr>
               </table>
-- 
cgit v1.1


From d281f5579da79d11fb9f64a0a921418ae5b7ec07 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 15:16:23 -0300
Subject: Fixing gettext calls on firewall_rules.php

---
 usr/local/www/firewall_rules.php | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 4809d2f..af7af41 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -146,7 +146,7 @@ if ($_POST) {
 
 		clear_subsystem_dirty('filter');
 
-		$savemsg = gettext("The settings have been applied").". ".gettext("The firewall rules are now reloading in the background").". ".gettext("You can also ")."<a href='status_filter_reload.php'>".gettext("monitor")."</a>".gettext("the reload progress").".";
+		$savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background. You can also %s monitor %s the reload progress"),"<a href='status_filter_reload.php'>","</a>");
 	}
 }
 
@@ -249,7 +249,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 </script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('filter')): ?><p>
-<?php print_info_box_np(gettext("The firewall rule configuration has been changed").".<br>".gettext("You must apply the changes in order for them to take effect").".");?><br>
+<?php print_info_box_np(gettext("The firewall rule configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td class="tabnavtbl">
@@ -305,7 +305,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 				<td>
 				<?php if ($nrules == 0): ?>
 				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?>
-				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" onclick="return confirm(<?=gettext('Do you really want to delete the selected rules?');?>)"><?php endif; ?>
+				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" onclick="return confirm('<?=gettext('Do you really want to delete the selected rules?');?>')"><?php endif; ?>
 				</td>
 				<td align="center" valign="middle"><a href="firewall_rules_edit.php?if=<?=$if;?>&after=-1"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0"></a></td>
 			   </tr>
@@ -317,13 +317,13 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td class="list">&nbsp;</td>
                   <td class="listt" align="center"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11" border="0"></td>
                   <td class="listlr" style="background-color: #e0e0e0"></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
                   <td class="listr" style="background-color: #e0e0e0"><?=gettext("RFC 1918 networks");?></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
-		<td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
+		<td class="listr" style="background-color: #e0e0e0">*</td>
 	 		 <td class="listr" style="background-color: #e0e0e0"></td>
                   <td class="listbg"><?=gettext("Block private networks");?></td>
                   <td valign="middle" nowrap class="list">
@@ -345,13 +345,13 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td class="list">&nbsp;</td>
                   <td class="listt" align="center"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_block.gif" width="11" height="11" border="0"></td>
                   <td class="listlr" style="background-color: #e0e0e0"></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
                   <td class="listr" style="background-color: #e0e0e0"><?=gettext("Reserved/not assigned by IANA");?></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
-                  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
-				  <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
-				   <td class="listr" style="background-color: #e0e0e0"><?=gettext("*");?></td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
+                  <td class="listr" style="background-color: #e0e0e0">*</td>
+				  <td class="listr" style="background-color: #e0e0e0">*</td>
+				   <td class="listr" style="background-color: #e0e0e0">*</td>
 		  <td class="listr" style="background-color: #e0e0e0">*</td>
                   <td class="listbg"><?=gettext("Block bogon networks");?></td>
                   <td valign="middle" nowrap class="list">
@@ -627,8 +627,8 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 			  <td class="listt"></td>
 			  <td class="listlr" colspan="10" align="center" valign="middle">
 			  <span class="gray">
-			  <?=gettext("No rules are currently defined for this interface"."<br>".
-			  "All incoming connections on this interface will be blocked until you add pass rules.<br><br>");?>
+			  <?=gettext("No rules are currently defined for this interface")."<br>".
+			  gettext("All incoming connections on this interface will be blocked until you add pass rules.")."<br><br>";?>
 			  Click the <a href="firewall_rules_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" border="0" width="17" height="17" align="absmiddle"></a><?=gettext(" button to add a new rule.");?></span>
 			  </td>
 			  <?php endif; ?>
@@ -656,7 +656,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 					  <td>
 					  <?php if ($nrules == 0): ?>
 					  <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0"><?php else: ?>
-					  <input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title=<?=gettext("delete selected rules");?>" onclick="return confirm(<?=gettext('Do you really want to delete the selected rules?');?>)"><?php endif; ?>
+					  <input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" onclick="return confirm('<?=gettext('Do you really want to delete the selected rules?');?>')"><?php endif; ?>
 					  </td>
 			                  <td><a href="firewall_rules_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0"></a></td>
 					</tr>
@@ -694,7 +694,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 		<tr>
 		  <td colspan="10">
   <p>
-  <strong><span class="red"><?=gettext("Hint:");?><br>
+  <strong><span class="red"><?=gettext("Hint").":";?><br>
   </span></strong><?=gettext("Rules are evaluated on a first-match basis (i.e.".
   "the action of the first rule to match a packet will be executed).".
   "This means that if you use block rules, you'll have to pay attention".
-- 
cgit v1.1


From e5e5ba517ef3424c86624f7b6e285b5d8d91702e Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 15:36:16 -0300
Subject: Fixing gettext calls on firewall_rules_edit.php

---
 usr/local/www/firewall_rules_edit.php | 58 +++++++++++++++++------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 067098c..6e9d453 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -45,7 +45,7 @@ require("guiconfig.inc");
 require("filter.inc");
 require("shaper.inc");
 
-$specialsrcdst = explode(" ", gettext("any pptp pppoe l2tp openvpn"););
+$specialsrcdst = explode(" ", "any pptp pppoe l2tp openvpn");
 $ifdisp = get_configured_interface_with_descr();
 foreach ($ifdisp as $kif => $kdescr) {
 	$specialsrcdst[] = "{$kif}";
@@ -174,9 +174,9 @@ if (isset($id) && $a_filter[$id]) {
 	/* defaults */
 	if ($_GET['if'])
 		$pconfig['interface'] = $_GET['if'];
-	$pconfig['type'] = gettext("pass");
-	$pconfig['src'] = gettext("any");
-	$pconfig['dst'] = gettext("any");
+	$pconfig['type'] = "pass";
+	$pconfig['src'] = "any";
+	$pconfig['dst'] = "any";
 }
 /* Allow the FlotingRules to work */
 $if = $pconfig['interface'];
@@ -576,7 +576,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Action");?></td>
 			<td width="78%" class="vtable">
 				<select name="type" class="formselect">
-					<?php $types = explode(" ", gettext("Pass Block Reject")); foreach ($types as $type): ?>
+					<?php $types = explode(" ", "Pass Block Reject"); foreach ($types as $type): ?>
 					<option value="<?=strtolower($type);?>" <?php if (strtolower($type) == strtolower($pconfig['type'])) echo "selected"; ?>>
 					<?=htmlspecialchars($type);?>
 					</option>
@@ -645,7 +645,7 @@ include("head.inc");
 					if  ($config['openvpn']["openvpn-server"] || $config['openvpn']["openvpn-client"])
        					$interfaces["openvpn"] = "OpenVPN";
 					foreach ($interfaces as $iface => $ifacename): ?>
-						<option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && (strcasecmp($pconfig['interface'], $iface) == 0)) echo "selected"; ?>><?=gettext($ifacename);?></option>
+						<option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && (strcasecmp($pconfig['interface'], $iface) == 0)) echo "selected"; ?>><?=$ifacename?></option>
 <?php 				endforeach; ?>
 				</select>
 				<br />
@@ -659,7 +659,7 @@ include("head.inc");
 			</td>
 			<td width="78%" class="vtable">
 				<select name="direction" class="formselect">
-					<?php      $directions = array(gettext('any'),gettext('in'),gettext('out'));
+					<?php      $directions = array('any','in','out');
 				foreach ($directions as $direction): ?>
 				<option value="<?=$direction;?>"
 					<?php if ($direction == $pconfig['direction']): ?>
@@ -677,7 +677,7 @@ include("head.inc");
 			<td width="78%" class="vtable">
 				<select name="proto" class="formselect" onchange="proto_change()">
 <?php
-				$protocols = explode(" ", gettext("TCP UDP TCP/UDP ICMP ESP AH GRE IGMP any carp pfsync"));
+				$protocols = explode(" ", "TCP UDP TCP/UDP ICMP ESP AH GRE IGMP any carp pfsync");
 				foreach ($protocols as $proto): ?>
 					<option value="<?=strtolower($proto);?>" <?php if (strtolower($proto) == $pconfig['proto']) echo "selected"; ?>><?=htmlspecialchars($proto);?></option>
 <?php 			endforeach; ?>
@@ -751,7 +751,7 @@ include("head.inc");
 				<br />
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
-						<td><?=gettext("Type:");?>&nbsp;&nbsp;</td>
+						<td><?=gettext("Type");?>:&nbsp;&nbsp;</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="srctype" class="formselect" onChange="typesel_change()">
 <?php
@@ -781,7 +781,7 @@ include("head.inc");
 						</td>
 					</tr>
 					<tr>
-						<td><?=gettext("Address:");?>&nbsp;&nbsp;</td>
+						<td><?=gettext("Address");?>:&nbsp;&nbsp;</td>
 						<td>
 							<input<?php echo ($edit_disabled===true?' DISABLED':''); ?> autocomplete='off' name="src" type="text" class="formfldalias" id="src" size="20" value="<?php if (!is_specialnet($pconfig['src'])) echo htmlspecialchars($pconfig['src']);?>"> /
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="srcmask" class="formselect" id="srcmask">
@@ -794,7 +794,7 @@ include("head.inc");
 				</table>
 				<div id="showadvancedboxspr">
 					<p>
-					<input<?php echo ($edit_disabled===true?' DISABLED':''); ?> type="button" onClick="show_source_port_range()" value="Advanced"></input><?=gettext(" - Show source port range");?></a>
+					<input<?php echo ($edit_disabled===true?' DISABLED':''); ?> type="button" onClick="show_source_port_range()" value="Advanced"></input> - <?=gettext("Show source port range");?></a>
 				</div>
 			</td>
 		</tr>
@@ -803,7 +803,7 @@ include("head.inc");
 			<td width="78%" class="vtable">
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
-						<td><?=gettext("from:");?>&nbsp;&nbsp;</td>
+						<td><?=gettext("from");?>:&nbsp;&nbsp;</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="srcbeginport" class="formselect" onchange="src_rep_change();ext_change()">
 								<option value=""><?=gettext("(other)");?></option>
@@ -816,7 +816,7 @@ include("head.inc");
 						</td>
 					</tr>
 					<tr>
-						<td><?=gettext("to:");?></td>
+						<td><?=gettext("to");?>:</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="srcendport" class="formselect" onchange="ext_change()">
 								<option value=""><?=gettext("(other)");?></option>
@@ -844,7 +844,7 @@ include("head.inc");
 					<br />
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
-						<td><?=gettext("Type:");?>&nbsp;&nbsp;</td>
+						<td><?=gettext("Type");?>:&nbsp;&nbsp;</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="dsttype" class="formselect" onChange="typesel_change()">
 <?php
@@ -874,7 +874,7 @@ include("head.inc");
 						</td>
 					</tr>
 					<tr>
-						<td><?=gettext("Address:");?>&nbsp;&nbsp;</td>
+						<td><?=gettext("Address");?>:&nbsp;&nbsp;</td>
 						<td>
 							<input<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="dst" type="text" class="formfldalias" id="dst" size="20" value="<?php if (!is_specialnet($pconfig['dst'])) echo htmlspecialchars($pconfig['dst']);?>">
 							/
@@ -894,7 +894,7 @@ include("head.inc");
 			<td width="78%" class="vtable">
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
-						<td><?=gettext("from:");?>&nbsp;&nbsp;</td>
+						<td><?=gettext("from");?>:&nbsp;&nbsp;</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="dstbeginport" class="formselect" onchange="dst_rep_change();ext_change()">
 								<option value=""><?=gettext("(other)");?></option>
@@ -907,7 +907,7 @@ include("head.inc");
 						</td>
 					</tr>
 					<tr>
-						<td><?=gettext("to:");?></td>
+						<td><?=gettext("to");?>:</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="dstendport" class="formselect" onchange="ext_change()">
 								<option value=""><?=gettext("(other)"?></option>
@@ -966,10 +966,10 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Source OS");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvsourceosbox" <? if ($pconfig['os']) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_sourceos()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_sourceos()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showsourceosadv" <? if (empty($pconfig['os'])) echo "style='display:none'"; ?>>
-					<?=gettext("OS Type:");?>&nbsp;
+					<?=gettext("OS Type");?>:&nbsp;
 					<select name="os" id="os" class="formselect">
 <?php
 						$ostypes = array(
@@ -1000,7 +1000,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Diffserv Code Point");?></td>
 			<td width="78%" class="vtable">
 				<div id="dsadv" name="dsadv" <? if ($pconfig['dscp']) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_dsdiv();" value="Advanced"><?=gettext(" - Show advanced option");?>
+					<input type="button" onClick="show_dsdiv();" value="Advanced"> - <?=gettext("Show advanced option");?>
 				</div>
 				<div id="dsdivmain" name="dsdivmain" <? if (empty($pconfig['dscp'])) echo "style='display:none'"; ?>>
 					<select name="dscp" id="dscp">
@@ -1016,7 +1016,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Advanced Options");?></td>
 			<td width="78%" class="vtable">
 			<div id="aoadv" name="aoadv">
-				<input type="button" onClick="show_aodiv();" value="Advanced"><?=gettext(" - Show advanced option");?>
+				<input type="button" onClick="show_aodiv();" value="Advanced"> - <?=gettext("Show advanced option");?>
 			</div>
 			<div id="aodivmain" name="aodivmain" style="display:none">
 				<input type="checkbox" id="allowopts" value="yes" name="allowopts"<?php if($pconfig['allowopts'] == true) echo " checked"; ?>>
@@ -1058,7 +1058,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("TCP flags");?></td>
 			<td width="78%" class="vtable">
 			<div id="showtcpflagsbox" <? if ($pconfig['tcpflags_any'] || $pconfig['tcpflags1'] || $pconfig['tcpflags2']) echo "style='display:none'"; ?>>
-                        	<input type="button" onClick="show_advanced_tcpflags()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+                        	<input type="button" onClick="show_advanced_tcpflags()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
                         </div>
                         <div id="showtcpflagsadv" <? if (empty($pconfig['tcpflags_any']) && empty($pconfig['tcpflags1']) && empty($pconfig['tcpflags2'])) echo "style='display:none'"; ?>>
 			<div id="tcpheader" name="tcpheader">
@@ -1100,7 +1100,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("State Type");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvstatebox" <? if (!empty($pconfig['statetype']) && $pconfig['statetype'] != "keep state") echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_state()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_state()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showstateadv" <? if (empty($pconfig['statetype']) || $pconfig['statetype'] == "keep state") echo "style='display:none'"; ?>>
 					<select name="statetype">
@@ -1124,7 +1124,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("No XMLRPC Sync");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvnoxmlrpcsyncbox" <? if ($pconfig['nosync']) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_noxmlrpc()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_noxmlrpc()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="shownoxmlrpcadv" <? if (empty($pconfig['nosync'])) echo "style='display:none'"; ?>>
 					<input type="checkbox" name="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br>
@@ -1147,7 +1147,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Schedule");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvschedulebox" <? if (!empty($pconfig['sched'])) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_schedule()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_schedule()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showscheduleadv" <? if (empty($pconfig['sched'])) echo "style='display:none'"; ?>>
 					<select name='sched'>
@@ -1174,7 +1174,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvgatewaybox" <? if (!empty($pconfig['gateway'])) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_gateway()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_gateway()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showgatewayadv" <? if (empty($pconfig['gateway'])) echo "style='display:none'"; ?>>
 					<select name='gateway'>
@@ -1215,7 +1215,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("In/Out");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvinoutbox" <? if (!empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_inout()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_inout()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showinoutadv" <? if (empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>>
 					<select name="dnpipe">
@@ -1265,7 +1265,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Ackqueue/Queue");?></td>
 			<td width="78%" class="vtable">
 			<div id="showadvackqueuebox" <? if (!empty($pconfig['defaultqueue'])) echo "style='display:none'"; ?>>
-				<input type="button" onClick="show_advanced_ackqueue()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+				<input type="button" onClick="show_advanced_ackqueue()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
 			</div>
 			<div id="showackqueueadv" <? if (empty($pconfig['defaultqueue'])) echo "style='display:none'"; ?>>
 				<select name="ackqueue">
@@ -1313,7 +1313,7 @@ include("head.inc");
 				<td width="22%" valign="top" class="vncell"><?=gettext("Layer7");?></td>
 				<td width="78%" class="vtable">
 					<div id="showadvlayer7box" <? if (!empty($pconfig['l7container'])) echo "style='display:none'"; ?>>
-						<input type="button" onClick="show_advanced_layer7()" value="Advanced"></input><?=gettext(" - Show advanced option");?></a>
+						<input type="button" onClick="show_advanced_layer7()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
 					</div>
 					<div id="showlayer7adv" <? if (empty($pconfig['l7container'])) echo "style='display:none'"; ?>>
 				<select name="l7container">
-- 
cgit v1.1


From 2db2df36e92bbf241aeb8005110149986b39df95 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 15:39:09 -0300
Subject: Fixing gettext calls on firewall_schedule.php

---
 usr/local/www/firewall_schedule.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php
index 51df38a..60ee732 100644
--- a/usr/local/www/firewall_schedule.php
+++ b/usr/local/www/firewall_schedule.php
@@ -92,9 +92,9 @@ include("head.inc");
 <form action="firewall_schedule.php" method="post">
 	<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
 	<tr>
-	  <td width="25%" class="listhdrr">Name</td>
-	  <td width="35%" class="listhdrr">Time Range(s)</td>
-	  <td width="35%" class="listhdr">Description</td>
+	  <td width="25%" class="listhdrr"><?=gettext("Name");?></td>
+	  <td width="35%" class="listhdrr"><?=gettext("Time Range(s)");?></td>
+	  <td width="35%" class="listhdr"><?=gettext("Description");?></td>
 	  <td width="5%" class="list sort_ignore">
 	    <table border="0" cellspacing="0" cellpadding="1">
 	      <tr>
@@ -216,7 +216,7 @@ include("head.inc");
     <table border="0" cellspacing="0" cellpadding="1">
       <tr>
         <td valign="middle"><a href="firewall_schedule_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit alias");?>"></a></td>
-        <td><a href="firewall_schedule.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext('Do you really want to delete this schedule?');?>)"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete alias");?>"></a></td>
+        <td><a href="firewall_schedule.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext('Do you really want to delete this schedule?');?>')"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete alias");?>"></a></td>
       </tr>
     </table>
   </td>
@@ -235,7 +235,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("Schedules act as placeholders for time ranges to be used in Firewall Rules.");?></span></p>
+   <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br></strong></span><?=gettext("Schedules act as placeholders for time ranges to be used in Firewall Rules.");?></span></p>
   </td>
 </tr>
 </table>
-- 
cgit v1.1


From 4f65a1d5a2b75acc8c933e4186afd4ff91b09bf6 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 15:47:12 -0300
Subject: Fixing gettext calls on firewall_schedule_edit.php

---
 usr/local/www/firewall_schedule_edit.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php
index cfbf7d9..5c2761a 100644
--- a/usr/local/www/firewall_schedule_edit.php
+++ b/usr/local/www/firewall_schedule_edit.php
@@ -186,7 +186,7 @@ if ($_POST) {
 		
 		filter_configure();
 			
-		header(gettext("Location: firewall_schedule.php"));
+		header("Location: firewall_schedule.php");
 		exit;
 		
 	}
@@ -902,7 +902,7 @@ EOD;
 					} //end for loop
 					?>
 							<br/>
-					<?=gettext)"Click individual date to select that date only. Click the appropriate weekday Header to select all occurences of that weekday.");?>
+					<?=gettext("Click individual date to select that date only. Click the appropriate weekday Header to select all occurences of that weekday.");?>
 	                 </td>
 				</tr>
 				<tr>
@@ -948,14 +948,14 @@ EOD;
 				  							echo "</option>";
 				  						}
 				  					?>
-				  				</select>&nbsp;Hr&nbsp;&nbsp;
+				  				</select>&nbsp;<?=gettext("Hr");?>&nbsp;&nbsp;
 				  				<select name="stoptimemin" class="formselect" id="stoptimemin">
 				  					<option value="00">00</option>
 				  					<option value="15">15</option>
 				  					<option value="30">30</option>
 				  					<option value="45">45</option>
 				  					<option value="59" SELECTED>59</option>
-				  				</select>&nbsp;Min
+				  				</select>&nbsp;<?=gettext("Min");?>
 				  			</td>
 				  		</tr>
 				  	</table><br>
@@ -973,8 +973,8 @@ EOD;
 				<tr>
 				  <td width="22%" valign="top">&nbsp;</td>
 				  <td width="78%">
-				  	<input type="button" value="Add Time"  class="formbtn"  onclick="javascript:processEntries();">&nbsp;&nbsp;&nbsp;
-				  	<input type="button" value="Clear Selection" class="formbtn" onclick="javascript:clearCalendar(); clearTime(); clearDescr();">
+				  	<input type="button" value="<?=gettext("Add Time");?>"  class="formbtn"  onclick="javascript:processEntries();">&nbsp;&nbsp;&nbsp;
+				  	<input type="button" value="<?=gettext("Clear Selection");?>" class="formbtn" onclick="javascript:clearCalendar(); clearTime(); clearDescr();">
                     </td>
 				</tr>
 				<tr>
-- 
cgit v1.1


From bb78a6fe0af8121938505714ecacdb505ee12b26 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 15:51:25 -0300
Subject: Fixing gettext calls on firewall_shaper_layer7.php

---
 usr/local/www/firewall_shaper_layer7.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
index 368fd7a..2415fbd 100755
--- a/usr/local/www/firewall_shaper_layer7.php
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -56,7 +56,7 @@ $avail_behaviours_limiter = get_dummynet_name_list();
 $show_proto_form = false;
 
 //More variables
-$pgtitle = array("Firewall",gettext("Traffic Shaper"), "Layer7");
+$pgtitle = array(gettext("Firewall"),gettext("Traffic Shaper"), gettext("Layer7"));
 $statusurl = "status_queues.php";
 
 $output_form = "";
@@ -159,7 +159,7 @@ else if ($_POST) {
 		}
 		else {
 			if(sizeof($dupes) > 0) {
-				$dupe_error = gettext("Found the following repeated protocol definitions: ");
+				$dupe_error = gettext("Found the following repeated protocol definitions") . ": ";
 				foreach($dupes as $dupe)
 					$dupe_error .= "$dupe ";
 				$input_errors[] .= $dupe_error;
-- 
cgit v1.1


From c59639d1aa9efcbfe98095079596adec70698379 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 15:55:00 -0300
Subject: Fixing gettext calls on firewall_virtual_ip.php

---
 usr/local/www/firewall_virtual_ip.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 69b44e3..541a6ed 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -200,7 +200,7 @@ include("head.inc");
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
                         <td valign="middle"><a href="firewall_virtual_ip_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a></td>
-                        <td valign="middle"><a href="firewall_virtual_ip.php?act=del&id=<?=$i;?>" onclick="return confirm(<?=gettext('Do you really want to delete this entry?');?>)"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+                        <td valign="middle"><a href="firewall_virtual_ip.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext('Do you really want to delete this entry?');?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
                       </tr>
                     </table>
                   </td>
@@ -220,9 +220,9 @@ include("head.inc");
                 </tr>
 		<tr>
 		  <td colspan="4">
-		      <p><span class="vexpl"><span class="red"><strong><?=gettext("Note:");?><br>
+		      <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br>
                       </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in ");?><a href="firewall_nat.php">NAT</a><?=gettext(" mappings.");?><br>
-                      <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php">here</a>.</span></p>
+                      <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php"><?=gettext("here");?></a>.</span></p>
 		  </td>
 		</tr>
               </table>
-- 
cgit v1.1


From ab1f455639050930d4c35f267bee49490612dfed Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 15:58:43 -0300
Subject: Fixing gettext calls on firewall_virtual_ip_edit.php

---
 usr/local/www/firewall_virtual_ip_edit.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index 44612c5..912cdbd 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -100,8 +100,8 @@ if ($_POST) {
 	$pconfig = $_POST;
 
 	/* input validation */
-	$reqdfields = explode(" ", gettext("mode"));
-	$reqdfieldsn = explode(",", gettext("Type"));
+	$reqdfields = explode(" ", "mode");
+	$reqdfieldsn = array(gettext("Type"));
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
@@ -145,7 +145,7 @@ if ($_POST) {
 		$parent_sn = get_interface_subnet($_POST['interface']);
 		if (!ip_in_subnet($_POST['subnet'], gen_subnet($parent_ip, $parent_sn) . "/" . $parent_sn)) {
 			$cannot_find = $_POST['subnet'] . "/" . $_POST['subnet_bits'] ;
-			$input_errors[] = gettext("Sorry, we could not locate an interface with a matching subnet for {$cannot_find}.  Please add an IP alias in this subnet on this interface.");
+			$input_errors[] = sprintf(gettext("Sorry, we could not locate an interface with a matching subnet for %s.  Please add an IP alias in this subnet on this interface."),$cannot_find);
 		} else if ($parent_sn != $_POST['subnet_bits'])
 			$input_errors[] = gettext("Subnet bits needs to be the same as the parent interface.");
 
@@ -229,7 +229,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Firewall"),gettext("Virtual IP Address","Edit"));
+$pgtitle = array(gettext("Firewall"),gettext("Virtual IP Address"),gettext("Edit"));
 include("head.inc");
 
 ?>
@@ -248,9 +248,9 @@ function get_radio_value(obj)
 }
 function enable_change(enable_over) {
 		var note = document.getElementById("typenote");
-		var carpnote = document.createTextNode(<?=gettext("This must be the network's subnet mask. It does not specify a CIDR range.");?>);
-		var proxyarpnote = document.createTextNode(<?=gettext("This is a CIDR block of proxy ARP addresses.");?>);
-		var ipaliasnote = document.createTextNode(<?=gettext("This must be the network's subnet mask. It does not specify a CIDR range.");?>);
+		var carpnote = document.createTextNode('<?=gettext("This must be the network's subnet mask. It does not specify a CIDR range.");?>');
+		var proxyarpnote = document.createTextNode('<?=gettext("This is a CIDR block of proxy ARP addresses.");?>');
+		var ipaliasnote = document.createTextNode('<?=gettext("This must be the network's subnet mask. It does not specify a CIDR range.");?>');
         if ((get_radio_value(document.iform.mode) == "carp") || enable_over) {
                 document.iform.vhid.disabled = 0;
                 document.iform.password.disabled = 0;
@@ -379,7 +379,7 @@ function typesel_change() {
                   <td class="vtable">
                     <table border="0" cellspacing="0" cellpadding="0">
                       <tr>
-                        <td><?=gettext("Type:");?>&nbsp;&nbsp;</td>
+                        <td><?=gettext("Type");?>:&nbsp;&nbsp;</td>
                         <td><select name="type" class="formselect" onChange="typesel_change()">
                             <option value="single" <?php if ((!$pconfig['range'] && $pconfig['subnet_bits'] == 32) || (!isset($pconfig['subnet']))) echo "selected"; ?>>
                             <?=gettext("Single address");?></option>
@@ -390,7 +390,7 @@ function typesel_change() {
                           </select></td>
                       </tr>
                       <tr>
-                        <td><?=gettext("Address:");?>&nbsp;&nbsp;</td>
+                        <td><?=gettext("Address");?>:&nbsp;&nbsp;</td>
                         <td><input name="subnet" type="text" class="formfld unknown" id="subnet" size="20" value="<?=htmlspecialchars($pconfig['subnet']);?>">
                           /<select name="subnet_bits" class="formselect" id="select">
                             <?php for ($i = 32; $i >= 1; $i--): ?>
@@ -465,7 +465,7 @@ function typesel_change() {
 				      <p>
 				      	<span class="vexpl">
 				      		<span class="red">
-				      			<b><?=gettext("Note:");?><br></b>
+				      			<b><?=gettext("Note");?>:<br></b>
 				      		</span>&nbsp;&nbsp;
 				      		<?=gettext("ProxyARP type IP addresses *DO NOT* work with add on packages such as Squid.  Use a CARP or IP Alias type address for these cases.");?>
 				      		<p>&nbsp;&nbsp;&nbsp;<?=gettext("For more information on CARP and the above values, visit the OpenBSD ");?><a href='http://www.openbsd.org/faq/pf/carp.html'>CARP FAQ</A>.
-- 
cgit v1.1


From c056f6250ef453546c6941de6c6ceb06c49635ea Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 16:09:36 -0300
Subject: Fixing gettext calls on firewall_shaper_wizards.php

---
 usr/local/www/firewall_shaper_wizards.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper_wizards.php b/usr/local/www/firewall_shaper_wizards.php
index a2a9f09..ac6d00a 100755
--- a/usr/local/www/firewall_shaper_wizards.php
+++ b/usr/local/www/firewall_shaper_wizards.php
@@ -93,17 +93,17 @@ include("fbegin.inc");
 
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('shaper')): ?><p>
-<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.").<br>.gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array(gettext("By Interface")), false, "firewall_shaper.php");
-	$tab_array[1] = array(gettext("By Queue")), false, "firewall_shaper_queues.php");
-	$tab_array[2] = array(gettext("Limiter")), false, "firewall_shaper_vinterface.php");
-	$tab_array[3] = array(gettext("Layer7")), false, "firewall_shaper_layer7.php");
-	$tab_array[4] = array(gettext("Wizards")), true, "firewall_shaper_wizards.php");
+	$tab_array[0] = array(gettext("By Interface"), false, "firewall_shaper.php");
+	$tab_array[1] = array(gettext("By Queue"), false, "firewall_shaper_queues.php");
+	$tab_array[2] = array(gettext("Limiter"), false, "firewall_shaper_vinterface.php");
+	$tab_array[3] = array(gettext("Layer7"), false, "firewall_shaper_layer7.php");
+	$tab_array[4] = array(gettext("Wizards"), true, "firewall_shaper_wizards.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -112,8 +112,8 @@ include("fbegin.inc");
 	<div id="mainarea">
               <table  width="100%" border="0" cellpadding="0" cellspacing="0">
 			  <tr>
-			  		<td class="listhdrr" width="25%" align="center" >Wizard function</td>
-			  		<td class="listhdrr" width="75%" align="center">Wizard Link</td>
+			  		<td class="listhdrr" width="25%" align="center" ><?=gettext("Wizard function");?></td>
+			  		<td class="listhdrr" width="75%" align="center"><?=gettext("Wizard Link");?></td>
 			  </tr>
 			  <?php	foreach ($wizards as $key => $wizard):  ?>
                         <tr class="tabcont"><td class="listlr" style="background-color: #e0e0e0" width="25%" align="center">
-- 
cgit v1.1


From 34f79120e45e1bd0e867a92c8dfe90e8f9fcd5cd Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 16:15:39 -0300
Subject: Fixing gettext calls on firewall_shaper.php

---
 usr/local/www/firewall_shaper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index 7d47eb4..3365a08 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -363,9 +363,9 @@ if ($can_add || $addnewaltq) {
 	$output_form .= "&action=delete\">";
 	$output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\"";
 	if ($queue)
-		$output_form .= " value=\gettext("Delete this queue\")>";
+		$output_form .= " value=\"" . gettext("Delete this queue") . "\">";
 	else
-		$output_form .= " value=\gettext("Disable shaper on interface\")>";
+		$output_form .= " value=\"" . gettext("Disable shaper on interface") . "\">";
 	$output_form .= "</a>";  
 }
 $output_form .= "</td></tr>";
@@ -423,7 +423,7 @@ include("fbegin.inc");
 <?php if (count($altq_list_queues) > 0): ?>
                         <tr class="tabcont"><td width="25%" align="left">
                                 <a href="firewall_shaper.php?action=resetall" >
-                                        <input type="button" value=gettext("Remove Shaper") class="formbtn">
+                                        <input type="button" value="<?=gettext("Remove Shaper")?>" class="formbtn">
                                 </a>
                         </td><td width="75%"> </td></tr>
 <? endif; ?>
-- 
cgit v1.1


From 37261752cb3db01135ffb3668337c6b5c1d09e26 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 16:25:17 -0300
Subject: Revert "Implemment gettext()"

This reverts commit 1baff2e5d32ebb5a71b07f38d9f97e3c4788e3be.

Lot of syntax errors

Conflicts:

	usr/local/www/firewall_nat_edit.php
---
 usr/local/www/firewall_nat_edit.php     | 10 +++++
 usr/local/www/firewall_nat_out.php      | 60 ++++++++++++-------------
 usr/local/www/firewall_nat_out_edit.php | 78 ++++++++++++++++-----------------
 3 files changed, 79 insertions(+), 69 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index b15a3ea..48a1686 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -515,6 +515,7 @@ include("fbegin.inc"); ?>
 								<option value="single"  <?php if (($pconfig['srcmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>><?=gettext("Single host or alias"); ?></option>
 								<option value="network" <?php if (!$sel) echo "selected"; ?>><?=gettext("Network"); ?></option>
 								<?php if(have_ruleint_access("pptp")): ?>
+<<<<<<< HEAD
 								<option value="pptp"    <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>><?=gettext("PPTP clients"); ?></option>
 								<?php endif; ?>
 								<?php if(have_ruleint_access("pppoe")): ?>
@@ -522,6 +523,15 @@ include("fbegin.inc"); ?>
 								<?php endif; ?>
 								 <?php if(have_ruleint_access("l2tp")): ?>
                                                                 <option value="l2tp"   <?php if ($pconfig['src'] == "l2tp") { echo "selected"; } ?>><?=gettext("L2TP clients"); ?></option>
+=======
+								<option value="pptp"    <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>>PPTP <?=gettext("clients"); ?></option>
+								<?php endif; ?>
+								<?php if(have_ruleint_access("pppoe")): ?>
+								<option value="pppoe"   <?php if ($pconfig['src'] == "pppoe") { echo "selected"; } ?>>PPPoE <?=gettext("clients"); ?></option>
+								<?php endif; ?>
+								 <?php if(have_ruleint_access("l2tp")): ?>
+                                                                <option value="l2tp"   <?php if ($pconfig['src'] == "l2tp") { echo "selected"; } ?>>L2TP <?=gettext("clients"); ?></option>
+>>>>>>> parent of 1baff2e... Implemment gettext()
                                                                 <?php endif; ?>
 <?php
 								foreach ($ifdisp as $ifent => $ifdesc): ?>
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 9017bee..c4f21c1 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -108,7 +108,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 					$natent = array();
 					$natent['source']['network'] = "{$osn}/{$ossubnet}";
 					$natent['dstport'] = "500";
-					$natent['descr'] = gettext("Auto created rule for ISAKMP - {$ifdesc} to {$ifdesc2}");
+					$natent['descr'] = "Auto created rule for ISAKMP - {$ifdesc} to {$ifdesc2}";
 					$natent['target'] = "";
 					$natent['interface'] = $if2;
 					$natent['destination']['any'] = true;
@@ -118,7 +118,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 					$natent = array();
 					$natent['source']['network'] = "{$osn}/{$ossubnet}";
                                         $natent['dstport'] = "5060";
-                                        $natent['descr'] = gettext("Auto created rule for SIP - {$ifdesc} to {$ifdesc2}");
+                                        $natent['descr'] = "Auto created rule for SIP - {$ifdesc} to {$ifdesc2}";
                                         $natent['target'] = "";
                                         $natent['interface'] = $if2;
                                         $natent['destination']['any'] = true;
@@ -128,7 +128,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 					$natent = array();
                                         $natent['source']['network'] = "{$osn}/{$ossubnet}";
                                         $natent['sourceport'] = "";
-                                        $natent['descr'] = gettext("Auto created rule for {$ifdesc} to {$ifdesc2}");
+                                        $natent['descr'] = "Auto created rule for {$ifdesc} to {$ifdesc2}";
                                         $natent['target'] = "";
                                         $natent['interface'] = $if2;
                                         $natent['destination']['any'] = true;
@@ -146,7 +146,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 							$natent = array();
 							$natent['source']['network'] = "{$osn}/{$ossubnet}";
 							$natent['sourceport'] = "";
-							$natent['descr'] = gettext("Auto created rule for PPTP server");
+							$natent['descr'] = "Auto created rule for PPTP server";
 							$natent['target'] = "";
 							$natent['interface'] = $if2;
 							$natent['destination']['any'] = true;
@@ -165,7 +165,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 							$natent = array();
 							$natent['source']['network'] = "{$osn}/{$ossubnet}";
 							$natent['sourceport'] = "";
-							$natent['descr'] = gettext("Auto created rule for PPPoE server");
+							$natent['descr'] = "Auto created rule for PPPoE server";
 							$natent['target'] = "";
 							$natent['interface'] = $if2;
 							$natent['destination']['any'] = true;
@@ -184,7 +184,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 							$natent = array();
 							$natent['source']['network'] = "{$osn}/{$ossubnet}";
 							$natent['sourceport'] = "";
-							$natent['descr'] = gettext("Auto created rule for L2TP server");
+							$natent['descr'] = "Auto created rule for L2TP server";
 							$natent['target'] = "";
 							$natent['interface'] = $if2;
 							$natent['destination']['any'] = true;
@@ -198,7 +198,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 							$natent = array();
 							$natent['source']['network'] = $ovpnsrv['tunnel_network'];
 							$natent['sourceport'] = "";
-							$natent['descr'] = gettext("Auto created rule for OpenVPN server");
+							$natent['descr'] = "Auto created rule for OpenVPN server";
 							$natent['target'] = "";
 							$natent['interface'] = $if2;
 							$natent['destination']['any'] = true;
@@ -209,7 +209,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 				}	
 			}
 
-			$savemsg = gettext("Default rules for each interface have been created.");
+			$savemsg = "Default rules for each interface have been created.";
 		}
 		break;
 	}
@@ -291,14 +291,14 @@ include("head.inc");
 </script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('natconf')): ?><p>
-<?php print_info_box_np gettext(("The NAT configuration has been changed.")<br>gettext("You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
+	$tab_array[] = array("Port Forward", false, "firewall_nat.php");
 	$tab_array[] = array("1:1", false, "firewall_nat_1to1.php");
-	$tab_array[] = array(gettext("Outbound"), true, "firewall_nat_out.php");
+	$tab_array[] = array("Outbound", true, "firewall_nat_out.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -323,15 +323,15 @@ include("head.inc");
                 </tr>
                 <tr>
                   <td colspan="2"><p><span class="vexpl"><span class="red"><strong>Note:<br>
-                      </strong></span>gettext("If advanced outbound NAT is enabled, no outbound NAT
-                      rules will be automatically generated any longer.") gettext("Instead, only the mappings
-                      you specify below will be used.") gettext("With advanced outbound NAT disabled,
+                      </strong></span>If advanced outbound NAT is enabled, no outbound NAT
+                      rules will be automatically generated any longer. Instead, only the mappings
+                      you specify below will be used. With advanced outbound NAT disabled,
                       a mapping is automatically created for each interface's subnet
-                      (except WAN).") gettext("If you use target addresses other than the WAN interface's
+                      (except WAN).  If you use target addresses other than the WAN interface's
 		      IP address, then depending on the way your WAN connection is setup, you
-	              may also need a") <a href="firewall_virtual_ip.php">gettext("Virtual IP")</a>.</span><br>
+	              may also need a <a href="firewall_virtual_ip.php">Virtual IP</a>.</span><br>
                       <br>
-                      gettext("You may enter your own mappings below.")</p>
+                      You may enter your own mappings below.</p>
                     </td>
                 </tr>
               </table>
@@ -339,20 +339,20 @@ include("head.inc");
                 <tr id="frheader">
                   <td width="3%" class="list">&nbsp;</td>
                   <td width="3%" class="list">&nbsp;</td>
-                  <td width="10%" class="listhdrr">gettext("Interface")</td>
-                  <td width="15%" class="listhdrr">gettext("Source")</td>
-                  <td width="10%" class="listhdrr">gettext("Source Port")</td>
-                  <td width="15%" class="listhdrr">gettext("Destination")</td>
-                  <td width="10%" class="listhdrr">gettext("Destination Port")</td>
-                  <td width="15%" class="listhdrr">gettext("NAT Address")</td>
-                  <td width="10%" class="listhdrr">gettext("NAT Port")</td>
-		  <td width="10%" class="listhdrr">gettext("Static Port")</td>
-                  <td width="25%" class="listhdr">gettext("Description")</td>
+                  <td width="10%" class="listhdrr">Interface</td>
+                  <td width="15%" class="listhdrr">Source</td>
+                  <td width="10%" class="listhdrr">Source Port</td>
+                  <td width="15%" class="listhdrr">Destination</td>
+                  <td width="10%" class="listhdrr">Destination Port</td>
+                  <td width="15%" class="listhdrr">NAT Address</td>
+                  <td width="10%" class="listhdrr">NAT Port</td>
+		  <td width="10%" class="listhdrr">Static Port</td>
+                  <td width="25%" class="listhdr">Description</td>
                   <td width="5%" class="list">
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
 			<td width="17"></td>
-                        <td><a href="firewall_nat_out_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title=gettext("add new mapping")></a></td>
+                        <td><a href="firewall_nat_out_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add new mapping"></a></td>
                       </tr>
                     </table>
 		  </td>
@@ -437,7 +437,7 @@ include("head.inc");
                         <td><a href="firewall_nat_out_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="edit mapping"></a></td>
                       </tr>
                       <tr>
-                        <td><input onmouseover="fr_insline(<?=$nnats;?>, true)" onmouseout="fr_insline(<?=$nnats;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title=gettext("move selected rules before this rule") height="17" type="image" width="17" border="0"></td>
+                        <td><input onmouseover="fr_insline(<?=$nnats;?>, true)" onmouseout="fr_insline(<?=$nnats;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="move selected rules before this rule" height="17" type="image" width="17" border="0"></td>
                         <td><a href="firewall_nat_out_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add a new nat based on this one" width="17" height="17" border="0"></a></td>
                       </tr>
                     </table>
@@ -447,11 +447,11 @@ include("head.inc");
                   <td class="list" valign="middle" nowrap>
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
-                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title=gettext("move selected mappings to end") border="0"><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title=gettext("move selected mappings to end") border="0"><?php endif; ?></td>
+                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="move selected mappings to end" border="0"><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="move selected mappings to end" border="0"><?php endif; ?></td>
                         <td><a href="firewall_nat_out_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add new mapping"></a></td>
                       </tr>
                       <tr>
-                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?><input name="del" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title=gettext("delete selected mappings") onclick="return confirm(gettext('Do you really want to delete the selected mappings?'))"><?php endif; ?></td>
+                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?><input name="del" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected mappings" onclick="return confirm('Do you really want to delete the selected mappings?')"><?php endif; ?></td>
                       </tr>
                     </table></td>
                 </tr>
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index 5b22a00..df0487f 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -108,51 +108,51 @@ if ($_POST) {
 	$pconfig = $_POST;
 
 	/* input validation */
-	$reqdfields = explode(" ", gettext("interface protocol source source_subnet destination destination_subnet"));
-	$reqdfieldsn = explode(",", gettext("Interface,Protocol,Source,Source bit count,Destination,Destination bit count"));
+	$reqdfields = explode(" ", "interface protocol source source_subnet destination destination_subnet");
+	$reqdfieldsn = explode(",", "Interface,Protocol,Source,Source bit count,Destination,Destination bit count");
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if($_POST['sourceport'] <> "" && !is_port($_POST['sourceport']))
-		$input_errors[] = gettext("You must supply either a valid port for the source port entry.");
+		$input_errors[] = "You must supply either a valid port for the source port entry.";
 
 	if($_POST['dstport'] <> "" and !is_port($_POST['dstport']))
-		$input_errors[] = gettext("You must supply either a valid port for the destination port entry.");
+		$input_errors[] = "You must supply either a valid port for the destination port entry.";
 
 	if($_POST['natport'] <> "" and !is_port($_POST['natport']))
-		$input_errors[] = gettext("You must supply either a valid port for the nat port entry.");
+		$input_errors[] = "You must supply either a valid port for the nat port entry.";
 
 	if ($_POST['source_type'] != "any") {
 		if ($_POST['source'] && !is_ipaddr($_POST['source']) && $_POST['source'] <> "any") {
-			$input_errors[] = gettext("A valid source must be specified.");
+			$input_errors[] = "A valid source must be specified.";
 		}
 	}
 	if ($_POST['source_subnet'] && !is_numericint($_POST['source_subnet'])) {
-		$input_errors[] = gettext("A valid source bit count must be specified.");
+		$input_errors[] = "A valid source bit count must be specified.";
 	}
 	if ($_POST['sourceport'] && !is_numericint($_POST['sourceport'])) {
-		$input_errors[] = gettext("A valid source port must be specified.");
+		$input_errors[] = "A valid source port must be specified.";
 	}
 	if ($_POST['destination_type'] != "any") {
         	if ($_POST['destination'] && !is_ipaddr($_POST['destination'])) {
-			$input_errors[] = gettext("A valid destination must be specified.");
+			$input_errors[] = "A valid destination must be specified.";
 		}
 	}
         if ($_POST['destination_subnet'] && !is_numericint($_POST['destination_subnet'])) {
-            $input_errors[] = gettext("A valid destination bit count must be specified.");
+            $input_errors[] = "A valid destination bit count must be specified.";
         }
 	if ($_POST['destination_type'] == "any") {
 		if ($_POST['destination_not']) {
-			$input_errors[] = gettext("Negating destination address of \"any\" is invalid.");
+			$input_errors[] = "Negating destination address of \"any\" is invalid.";
 		}
 	}
 
 	if ($_POST['nonat'] && $_POST['staticnatport']) {
-		$input_errors[] = gettext("Static port cannot be used with No NAT.");
+		$input_errors[] = "Static port cannot be used with No NAT.";
 	}
 
 	if ($_POST['target'] && !is_ipaddr($_POST['target'])) {
-		$input_errors[] = gettext("A valid target IP address must be specified.");
+		$input_errors[] = "A valid target IP address must be specified.";
 	}
 
 	/* if user has selected any as source, set it here */
@@ -249,7 +249,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Firewall","NAT","Outbound","Edit"));
+$pgtitle = array("Firewall","NAT","Outbound","Edit");
 $closehead = false;
 include("head.inc");
 
@@ -304,14 +304,14 @@ function sourcesel_change() {
             <form action="firewall_nat_out_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="1">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic">gettext("Edit Advanced Outbound NAT entry")</td>
+					<td colspan="2" valign="top" class="listtopic">Edit Advanced Outbound NAT entry</td>
 				</tr>
 	        <tr>
                   <td width="22%" valign="top" class="vncell">Do not NAT</td>
                   <td width="78%" class="vtable">
 			<input type="checkbox" name="nonat"<?php if(isset($pconfig['nonat'])) echo " CHECKED"; ?>>
-                     <span class="vexpl">gettext("Enabling this option will disable NAT for traffic matching this rule and stop processing Outbound NAT rules.")
-		     <br>gettext("Hint: in most cases, you won't use this option.")</span></td>
+                     <span class="vexpl">Enabling this option will disable NAT for traffic matching this rule and stop processing Outbound NAT rules.
+		     <br>Hint: in most cases, you won't use this option.</span></td>
                 </tr>
 	        <tr>
                   <td width="22%" valign="top" class="vncellreq">Interface</td>
@@ -325,8 +325,8 @@ function sourcesel_change() {
 				</option>
 				<?php endforeach; ?>
 			</select><br>
-                     <span class="vexpl">gettext("Choose which interface this rule applies to.")<br>
-                     gettext("Hint: in most cases, you'll want to use WAN here.")</span></td>
+                     <span class="vexpl">Choose which interface this rule applies to.<br>
+                     Hint: in most cases, you'll want to use WAN here.</span></td>
                 </tr>
 		<tr>
 			<td width="22%" valign="top" class="vncellreq">Protocol</td>
@@ -336,8 +336,8 @@ function sourcesel_change() {
                                 foreach ($protocols as $proto): ?>
                                         <option value="<?=strtolower($proto);?>" <?php if (strtolower($proto) == $pconfig['protocol']) echo "selected"; ?>><?=htmlspecialchars($proto);?></option>
 				<?php endforeach; ?>
-				 </select> <br> <span class="vexpl">gettext("Choose which protocol this rule should match.")<br />
-				 gettext("Hint: in most cases, you should specify <em>any</em> &nbsp;here.")</span>
+				 </select> <br> <span class="vexpl">Choose which protocol this rule should match.<br />
+				 Hint: in most cases, you should specify <em>any</em> &nbsp;here.</span>
 			</td>
 		</tr>
                 <tr>
@@ -355,13 +355,13 @@ function sourcesel_change() {
                         <td>Address:&nbsp;&nbsp;</td>
                         <td><input name="source" type="text" class="formfld unknown" id="source" size="20" value="<?=htmlspecialchars($pconfig['source']);?>">/<select name="source_subnet" class="formfld" id="source_subnet">
 <?php for ($i = 32; $i >= 0; $i--): ?>
-                          <option value="<?=$i;?>"<?php if ($i == $pconfig['source_subnet']) echo "selected"; ?>><?=$i;?></option>
+                          <option value="<?=$i;?>"<?php if ($i == $pconfig['source_subnet']) echo " selected"; ?>><?=$i;?></option>
 <?php endfor; ?>
                           </select></td>
                       </tr>
                       <tr>
                         <td>&nbsp;</td>
-                        <td><span class="vexpl">gettext("Enter the source network for the outbound NAT mapping.")</span></td>
+                        <td><span class="vexpl">Enter the source network for the outbound NAT mapping.</span></td>
                       </tr>
                       <tr>
                         <td>Source port:&nbsp;&nbsp;</td>
@@ -371,11 +371,11 @@ blank for any)</td>
                     </table></td>
                 </tr>
                 <tr>
-                  <td width="22%" valign="top" class="vncellreq">gettext("Destination")</td>
+                  <td width="22%" valign="top" class="vncellreq">Destination</td>
                   <td width="78%" class="vtable">
 <input name="destination_not" type="checkbox" id="destination_not" value="yes" <?php if ($pconfig['destination_not']) echo "checked"; ?>>
                     <strong>not</strong><br>
-                    gettext("Use this option to invert the sense of the match.")<br>
+                    Use this option to invert the sense of the match.<br>
                     <br>
                     <table border="0" cellspacing="1" cellpadding="1">
                       <tr>
@@ -399,8 +399,8 @@ blank for any)</td>
                       </tr>
                       <tr>
                         <td>&nbsp;</td>
-                        <td><span class="vexpl">gettext("Enter the destination network for
-                          the outbound NAT mapping.")</span></td>
+                        <td><span class="vexpl">Enter the destination network for
+                          the outbound NAT mapping.</span></td>
                       </tr>
                       <tr>
                         <td>Destination port:&nbsp;&nbsp;</td>
@@ -411,13 +411,13 @@ any)</td>
 		  </td>
                 </tr>
                 <tr>
-                  <td width="22%" valign="top" class="vncell">gettext("Translation")</td>
+                  <td width="22%" valign="top" class="vncell">Translation</td>
                   <td width="78%" class="vtable">
 			<table border="0" cellspacing="1" cellpadding="1">
 			<tr>
 			  <td>Address:&nbsp;&nbsp;</td>
 			  <td><select name="target" class="formselect">
-				<option value=""<?php if (!$pconfig['target']) echo " selected"; ?>>gettext("Interface address")</option>
+				<option value=""<?php if (!$pconfig['target']) echo " selected"; ?>>Interface address</option>
 <?php	if (is_array($config['virtualip']['vip'])):
 		foreach ($config['virtualip']['vip'] as $sn):
 			if ($sn['mode'] == "proxyarp" && $sn['type'] == "network"):
@@ -440,10 +440,10 @@ any)</td>
 			  </td>
 			</tr>
 			<tr><td>&nbsp;</td><td>
-                     <span class="vexpl">gettext("Packets matching this rule will be mapped to the IP address given here.")<br>
-			gettext("If you want this rule to apply to another IP address than the IP address of the interface chosen above,
-			select it here (you need to define <a href="firewall_virtual_ip.php">Virtual IP</a> addresses on the first)").
-			 gettext("Also note that if you are trying to redirect connections on the LAN select the "any" option.")
+                     <span class="vexpl">Packets matching this rule will be mapped to the IP address given here.<br>
+			If you want this rule to apply to another IP address than the IP address of the interface chosen above,
+			select it here (you need to define <a href="firewall_virtual_ip.php">Virtual IP</a> addresses on the first).
+			 Also note that if you are trying to redirect connections on the LAN select the "any" option.
 			</span>
 			</td></tr>
 			<tr>
@@ -451,7 +451,7 @@ any)</td>
                           <td><input name="natport" type="text" class="formfld unknown" id="natport" size="5" value="<?=htmlspecialchars($pconfig['natport']);?>"></td>
 			</tr>
 			<tr><td>&nbsp;</td><td>
-                        <span class="vexpl">gettext("Enter the source port for the outbound NAT mapping.")</span>
+                        <span class="vexpl">Enter the source port for the outbound NAT mapping.</span>
 			</td></tr>
                         <tr>
                           <td>Static-port:&nbsp;&nbsp;</td>
@@ -461,18 +461,18 @@ any)</td>
 		  </td>
                 </tr>
 				<tr>
-				  <td width="22%" valign="top" class="vncell">gettext("No XMLRPC Sync")</td>
+				  <td width="22%" valign="top" class="vncell">No XMLRPC Sync</td>
 				  <td width="78%" class="vtable">
 					<input value="yes" name="nosync" type="checkbox" class="formfld" id="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br>
-				   			 gettext("HINT: This prevents the rule from automatically syncing to other CARP members.")
+				   			 HINT: This prevents the rule from automatically syncing to other CARP members.
 				  </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>
-- 
cgit v1.1


From ff01cbffcfd663ad7485c889848563d01c0a38c7 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 16:43:56 -0300
Subject: Implement gettext() calls on firewall_nat_out.php

---
 usr/local/www/firewall_nat_out.php | 78 +++++++++++++++++++-------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index c4f21c1..efa49d3 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -108,7 +108,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 					$natent = array();
 					$natent['source']['network'] = "{$osn}/{$ossubnet}";
 					$natent['dstport'] = "500";
-					$natent['descr'] = "Auto created rule for ISAKMP - {$ifdesc} to {$ifdesc2}";
+					$natent['descr'] = sprintf(gettext("Auto created rule for ISAKMP - %s to %s"),$ifdesc,$ifdesc2);
 					$natent['target'] = "";
 					$natent['interface'] = $if2;
 					$natent['destination']['any'] = true;
@@ -118,7 +118,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 					$natent = array();
 					$natent['source']['network'] = "{$osn}/{$ossubnet}";
                                         $natent['dstport'] = "5060";
-                                        $natent['descr'] = "Auto created rule for SIP - {$ifdesc} to {$ifdesc2}";
+                                        $natent['descr'] = sprintf(gettext("Auto created rule for SIP - %s to %s"),$ifdesc,$ifdesc2);
                                         $natent['target'] = "";
                                         $natent['interface'] = $if2;
                                         $natent['destination']['any'] = true;
@@ -128,7 +128,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 					$natent = array();
                                         $natent['source']['network'] = "{$osn}/{$ossubnet}";
                                         $natent['sourceport'] = "";
-                                        $natent['descr'] = "Auto created rule for {$ifdesc} to {$ifdesc2}";
+                                        $natent['descr'] = sprintf(gettext("Auto created rule for %s to %s"),$ifdesc,$ifdesc2);
                                         $natent['target'] = "";
                                         $natent['interface'] = $if2;
                                         $natent['destination']['any'] = true;
@@ -146,7 +146,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 							$natent = array();
 							$natent['source']['network'] = "{$osn}/{$ossubnet}";
 							$natent['sourceport'] = "";
-							$natent['descr'] = "Auto created rule for PPTP server";
+							$natent['descr'] = gettext("Auto created rule for PPTP server");
 							$natent['target'] = "";
 							$natent['interface'] = $if2;
 							$natent['destination']['any'] = true;
@@ -165,7 +165,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 							$natent = array();
 							$natent['source']['network'] = "{$osn}/{$ossubnet}";
 							$natent['sourceport'] = "";
-							$natent['descr'] = "Auto created rule for PPPoE server";
+							$natent['descr'] = gettext("Auto created rule for PPPoE server");
 							$natent['target'] = "";
 							$natent['interface'] = $if2;
 							$natent['destination']['any'] = true;
@@ -184,7 +184,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 							$natent = array();
 							$natent['source']['network'] = "{$osn}/{$ossubnet}";
 							$natent['sourceport'] = "";
-							$natent['descr'] = "Auto created rule for L2TP server";
+							$natent['descr'] = gettext("Auto created rule for L2TP server");
 							$natent['target'] = "";
 							$natent['interface'] = $if2;
 							$natent['destination']['any'] = true;
@@ -198,7 +198,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 							$natent = array();
 							$natent['source']['network'] = $ovpnsrv['tunnel_network'];
 							$natent['sourceport'] = "";
-							$natent['descr'] = "Auto created rule for OpenVPN server";
+							$natent['descr'] = gettext("Auto created rule for OpenVPN server");
 							$natent['target'] = "";
 							$natent['interface'] = $if2;
 							$natent['destination']['any'] = true;
@@ -209,7 +209,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") {
 				}	
 			}
 
-			$savemsg = "Default rules for each interface have been created.";
+			$savemsg = gettext("Default rules for each interface have been created.");
 		}
 		break;
 	}
@@ -280,7 +280,7 @@ if (isset($_POST['del_x'])) {
 }
 
 
-$pgtitle = array("Firewall","NAT","Outbound");
+$pgtitle = array(gettext("Firewall"),gettext("NAT"),gettext("Outbound"));
 include("head.inc");
 
 ?>
@@ -291,14 +291,14 @@ include("head.inc");
 </script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('natconf')): ?><p>
-<?php print_info_box_np("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect.");?><br>
+<?php print_info_box_np(gettext("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("Port Forward", false, "firewall_nat.php");
+	$tab_array[] = array(gettext("Port Forward"), false, "firewall_nat.php");
 	$tab_array[] = array("1:1", false, "firewall_nat_1to1.php");
-	$tab_array[] = array("Outbound", true, "firewall_nat_out.php");
+	$tab_array[] = array(gettext("Outbound"), true, "firewall_nat_out.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -318,20 +318,20 @@ include("head.inc");
                       <strong><?=gettext("Manual Outbound NAT rule generation (Advanced Outbound NAT (AON))");?></strong></p></td>
                 </tr>
                 <tr>
-                  <td> <input name="save" type="submit" class="formbtn" value="Save">
+                  <td> <input name="save" type="submit" class="formbtn" value="<?=gettext("Save");?>">
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2"><p><span class="vexpl"><span class="red"><strong>Note:<br>
-                      </strong></span>If advanced outbound NAT is enabled, no outbound NAT
-                      rules will be automatically generated any longer. Instead, only the mappings
-                      you specify below will be used. With advanced outbound NAT disabled,
-                      a mapping is automatically created for each interface's subnet
-                      (except WAN).  If you use target addresses other than the WAN interface's
-		      IP address, then depending on the way your WAN connection is setup, you
-	              may also need a <a href="firewall_virtual_ip.php">Virtual IP</a>.</span><br>
+                      </strong></span><?=gettext("If advanced outbound NAT is enabled, no outbound NAT ".
+                      "rules will be automatically generated any longer. Instead, only the mappings ".
+                      "you specify below will be used. With advanced outbound NAT disabled, ".
+                      "a mapping is automatically created for each interface's subnet ".
+                      "(except WAN).  If you use target addresses other than the WAN interface's ".
+		      "IP address, then depending on the way your WAN connection is setup, you ".
+	              "may also need a ");?><a href="firewall_virtual_ip.php"><?=gettext("Virtual IP");?></a>.</span><br>
                       <br>
-                      You may enter your own mappings below.</p>
+                      <?=gettext("You may enter your own mappings below.");?></p>
                     </td>
                 </tr>
               </table>
@@ -339,20 +339,20 @@ include("head.inc");
                 <tr id="frheader">
                   <td width="3%" class="list">&nbsp;</td>
                   <td width="3%" class="list">&nbsp;</td>
-                  <td width="10%" class="listhdrr">Interface</td>
-                  <td width="15%" class="listhdrr">Source</td>
-                  <td width="10%" class="listhdrr">Source Port</td>
-                  <td width="15%" class="listhdrr">Destination</td>
-                  <td width="10%" class="listhdrr">Destination Port</td>
-                  <td width="15%" class="listhdrr">NAT Address</td>
-                  <td width="10%" class="listhdrr">NAT Port</td>
-		  <td width="10%" class="listhdrr">Static Port</td>
-                  <td width="25%" class="listhdr">Description</td>
+                  <td width="10%" class="listhdrr"><?=gettext("Interface");?></td>
+                  <td width="15%" class="listhdrr"><?=gettext("Source");?></td>
+                  <td width="10%" class="listhdrr"><?=gettext("Source Port");?></td>
+                  <td width="15%" class="listhdrr"><?=gettext("Destination");?></td>
+                  <td width="10%" class="listhdrr"><?=gettext("Destination Port");?></td>
+                  <td width="15%" class="listhdrr"><?=gettext("NAT Address");?></td>
+                  <td width="10%" class="listhdrr"><?=gettext("NAT Port");?></td>
+		  <td width="10%" class="listhdrr"><?=gettext("Static Port");?></td>
+                  <td width="25%" class="listhdr"><?=gettext("Description");?></td>
                   <td width="5%" class="list">
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
 			<td width="17"></td>
-                        <td><a href="firewall_nat_out_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add new mapping"></a></td>
+                        <td><a href="firewall_nat_out_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add new mapping");?>"></a></td>
                       </tr>
                     </table>
 		  </td>
@@ -423,9 +423,9 @@ include("head.inc");
                   <td class="listr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_out_edit.php?id=<?=$nnats;?>';">
                     <?php
 			if(isset($natent['staticnatport']))
-			    echo "<CENTER>YES</CENTER>";
+			    echo "<CENTER>" . gettext("YES") . "</CENTER>";
 			else
-			    echo "<CENTER>NO</CENTER>";
+			    echo "<CENTER>" . gettext("NO") . "</CENTER>";
                     ?>		    
                   </td>
                   <td class="listbg"  onClick="fr_toggle(<?=$nnats;?>)" ondblclick="document.location='firewall_nat_out_edit.php?id=<?=$nnats;?>';">
@@ -434,11 +434,11 @@ include("head.inc");
                   <td class="list" valign="middle" nowrap>
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
-                        <td><a href="firewall_nat_out_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="edit mapping"></a></td>
+                        <td><a href="firewall_nat_out_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit mapping");?>"></a></td>
                       </tr>
                       <tr>
-                        <td><input onmouseover="fr_insline(<?=$nnats;?>, true)" onmouseout="fr_insline(<?=$nnats;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="move selected rules before this rule" height="17" type="image" width="17" border="0"></td>
-                        <td><a href="firewall_nat_out_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add a new nat based on this one" width="17" height="17" border="0"></a></td>
+                        <td><input onmouseover="fr_insline(<?=$nnats;?>, true)" onmouseout="fr_insline(<?=$nnats;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="<?=gettext("move selected rules before this rule");?>" height="17" type="image" width="17" border="0"></td>
+                        <td><a href="firewall_nat_out_edit.php?dup=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add a new nat based on this one");?>" width="17" height="17" border="0"></a></td>
                       </tr>
                     </table>
               <?php $i++; $nnats++; endforeach; ?>
@@ -447,11 +447,11 @@ include("head.inc");
                   <td class="list" valign="middle" nowrap>
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
-                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="move selected mappings to end" border="0"><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="move selected mappings to end" border="0"><?php endif; ?></td>
-                        <td><a href="firewall_nat_out_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="add new mapping"></a></td>
+                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected mappings to end");?>" border="0"><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="<?=gettext("move selected mappings to end");?>" border="0"><?php endif; ?></td>
+                        <td><a href="firewall_nat_out_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add new mapping");?>"></a></td>
                       </tr>
                       <tr>
-                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?><input name="del" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected mappings" onclick="return confirm('Do you really want to delete the selected mappings?')"><?php endif; ?></td>
+                        <td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0"><?php else: ?><input name="del" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected mappings");?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected mappings?");?>')"><?php endif; ?></td>
                       </tr>
                     </table></td>
                 </tr>
-- 
cgit v1.1


From 72fae0711454187cf50b7e73c35f8e0df234129a Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 17:39:54 -0300
Subject: Implement gettext() calls on firewall_nat_out_edit.php

---
 usr/local/www/firewall_nat_out_edit.php | 122 ++++++++++++++++----------------
 1 file changed, 61 insertions(+), 61 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index df0487f..312af25 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -109,50 +109,50 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "interface protocol source source_subnet destination destination_subnet");
-	$reqdfieldsn = explode(",", "Interface,Protocol,Source,Source bit count,Destination,Destination bit count");
+	$reqdfieldsn = array(gettext("Interface"),gettext("Protocol"),gettext("Source"),gettext("Source bit count"),gettext("Destination"),gettext("Destination bit count"));
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if($_POST['sourceport'] <> "" && !is_port($_POST['sourceport']))
-		$input_errors[] = "You must supply either a valid port for the source port entry.";
+		$input_errors[] = gettext("You must supply either a valid port for the source port entry.");
 
 	if($_POST['dstport'] <> "" and !is_port($_POST['dstport']))
-		$input_errors[] = "You must supply either a valid port for the destination port entry.";
+		$input_errors[] = gettext("You must supply either a valid port for the destination port entry.");
 
 	if($_POST['natport'] <> "" and !is_port($_POST['natport']))
-		$input_errors[] = "You must supply either a valid port for the nat port entry.";
+		$input_errors[] = gettext("You must supply either a valid port for the nat port entry.");
 
 	if ($_POST['source_type'] != "any") {
 		if ($_POST['source'] && !is_ipaddr($_POST['source']) && $_POST['source'] <> "any") {
-			$input_errors[] = "A valid source must be specified.";
+			$input_errors[] = gettext("A valid source must be specified.");
 		}
 	}
 	if ($_POST['source_subnet'] && !is_numericint($_POST['source_subnet'])) {
-		$input_errors[] = "A valid source bit count must be specified.";
+		$input_errors[] = gettext("A valid source bit count must be specified.");
 	}
 	if ($_POST['sourceport'] && !is_numericint($_POST['sourceport'])) {
-		$input_errors[] = "A valid source port must be specified.";
+		$input_errors[] = gettext("A valid source port must be specified.");
 	}
 	if ($_POST['destination_type'] != "any") {
         	if ($_POST['destination'] && !is_ipaddr($_POST['destination'])) {
-			$input_errors[] = "A valid destination must be specified.";
+			$input_errors[] = gettext("A valid destination must be specified.");
 		}
 	}
         if ($_POST['destination_subnet'] && !is_numericint($_POST['destination_subnet'])) {
-            $input_errors[] = "A valid destination bit count must be specified.";
+            $input_errors[] = gettext("A valid destination bit count must be specified.");
         }
 	if ($_POST['destination_type'] == "any") {
 		if ($_POST['destination_not']) {
-			$input_errors[] = "Negating destination address of \"any\" is invalid.";
+			$input_errors[] = gettext("Negating destination address of \"any\" is invalid.");
 		}
 	}
 
 	if ($_POST['nonat'] && $_POST['staticnatport']) {
-		$input_errors[] = "Static port cannot be used with No NAT.";
+		$input_errors[] = gettext("Static port cannot be used with No NAT.");
 	}
 
 	if ($_POST['target'] && !is_ipaddr($_POST['target'])) {
-		$input_errors[] = "A valid target IP address must be specified.";
+		$input_errors[] = gettext("A valid target IP address must be specified.");
 	}
 
 	/* if user has selected any as source, set it here */
@@ -249,7 +249,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array("Firewall","NAT","Outbound","Edit");
+$pgtitle = array(gettext("Firewall"),gettext("NAT"),gettext("Outbound"),gettext("Edit"));
 $closehead = false;
 include("head.inc");
 
@@ -304,17 +304,17 @@ function sourcesel_change() {
             <form action="firewall_nat_out_edit.php" method="post" name="iform" id="iform">
               <table width="100%" border="0" cellpadding="6" cellspacing="1">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic">Edit Advanced Outbound NAT entry</td>
+					<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit Advanced Outbound NAT entry");?></td>
 				</tr>
 	        <tr>
-                  <td width="22%" valign="top" class="vncell">Do not NAT</td>
+                  <td width="22%" valign="top" class="vncell"><?=gettext("Do not NAT");?></td>
                   <td width="78%" class="vtable">
 			<input type="checkbox" name="nonat"<?php if(isset($pconfig['nonat'])) echo " CHECKED"; ?>>
-                     <span class="vexpl">Enabling this option will disable NAT for traffic matching this rule and stop processing Outbound NAT rules.
-		     <br>Hint: in most cases, you won't use this option.</span></td>
+                     <span class="vexpl"><?=gettext("Enabling this option will disable NAT for traffic matching this rule and stop processing Outbound NAT rules.");?>
+		     <br><?=gettext("Hint: in most cases, you won't use this option.");?></span></td>
                 </tr>
 	        <tr>
-                  <td width="22%" valign="top" class="vncellreq">Interface</td>
+                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Interface");?></td>
                   <td width="78%" class="vtable">
 			<select name="interface" class="formselect">
 				<?php
@@ -325,34 +325,34 @@ function sourcesel_change() {
 				</option>
 				<?php endforeach; ?>
 			</select><br>
-                     <span class="vexpl">Choose which interface this rule applies to.<br>
-                     Hint: in most cases, you'll want to use WAN here.</span></td>
+                     <span class="vexpl"><?=gettext("Choose which interface this rule applies to.");?><br>
+                     <?=gettext("Hint: in most cases, you'll want to use WAN here.");?></span></td>
                 </tr>
 		<tr>
-			<td width="22%" valign="top" class="vncellreq">Protocol</td>
+			<td width="22%" valign="top" class="vncellreq"><?=gettext("Protocol");?></td>
 			<td width="78%" class="vtable">
 				<select name="protocol" class="formselect">
 				<?php $protocols = explode(" ", "any TCP UDP TCP/UDP ICMP ESP AH GRE IGMP carp pfsync");
                                 foreach ($protocols as $proto): ?>
                                         <option value="<?=strtolower($proto);?>" <?php if (strtolower($proto) == $pconfig['protocol']) echo "selected"; ?>><?=htmlspecialchars($proto);?></option>
 				<?php endforeach; ?>
-				 </select> <br> <span class="vexpl">Choose which protocol this rule should match.<br />
-				 Hint: in most cases, you should specify <em>any</em> &nbsp;here.</span>
+				 </select> <br> <span class="vexpl"><?=gettext("Choose which protocol this rule should match.");?><br />
+				 <?php printf(gettext("Hint: in most cases, you should specify %s any %s here."),"<em>","</em>&nbsp");?></span>
 			</td>
 		</tr>
                 <tr>
-                  <td width="22%" valign="top" class="vncellreq">Source</td>
+                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Source");?></td>
                   <td width="78%" class="vtable">
                     <table border="0" cellspacing="1" cellpadding="1">
                       <tr>
-		        <td>Type:&nbsp;&nbsp;</td>
+		        <td><?=gettext("Type");?>:&nbsp;&nbsp;</td>
 			<td>
 			    <select name="source_type" class="formselect" onChange="sourcesel_change()">
-                              <option value="any" <?php if ($pconfig['source'] == "any") echo "selected"; ?>>any</option>
-                              <option value="network" <?php if ($pconfig['source'] != "any") echo "selected"; ?>>Network</option>
+                              <option value="any" <?php if ($pconfig['source'] == "any") echo "selected"; ?>><?=gettext("any");?></option>
+                              <option value="network" <?php if ($pconfig['source'] != "any") echo "selected"; ?>><?=gettext("Network");?></option>
                             </select>
 			</td></tr>
-                        <td>Address:&nbsp;&nbsp;</td>
+                        <td><?=gettext("Address");?>:&nbsp;&nbsp;</td>
                         <td><input name="source" type="text" class="formfld unknown" id="source" size="20" value="<?=htmlspecialchars($pconfig['source']);?>">/<select name="source_subnet" class="formfld" id="source_subnet">
 <?php for ($i = 32; $i >= 0; $i--): ?>
                           <option value="<?=$i;?>"<?php if ($i == $pconfig['source_subnet']) echo " selected"; ?>><?=$i;?></option>
@@ -361,34 +361,34 @@ function sourcesel_change() {
                       </tr>
                       <tr>
                         <td>&nbsp;</td>
-                        <td><span class="vexpl">Enter the source network for the outbound NAT mapping.</span></td>
+                        <td><span class="vexpl"><?=gettext("Enter the source network for the outbound NAT mapping.");?></span></td>
                       </tr>
                       <tr>
-                        <td>Source port:&nbsp;&nbsp;</td>
-                        <td><input name="sourceport" type="text" class="formfld unknown" id="sourceport" size="5" value="<?=htmlspecialchars($pconfig['sourceport']);?>"> (leave 
-blank for any)</td>
+                        <td><?=gettext("Source port");?>:&nbsp;&nbsp;</td>
+                        <td><input name="sourceport" type="text" class="formfld unknown" id="sourceport" size="5" value="<?=htmlspecialchars($pconfig['sourceport']);?>"> <?=gettext("(leave 
+blank for any)");?></td>
                       </tr>
                     </table></td>
                 </tr>
                 <tr>
-                  <td width="22%" valign="top" class="vncellreq">Destination</td>
+                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Destination");?></td>
                   <td width="78%" class="vtable">
 <input name="destination_not" type="checkbox" id="destination_not" value="yes" <?php if ($pconfig['destination_not']) echo "checked"; ?>>
-                    <strong>not</strong><br>
-                    Use this option to invert the sense of the match.<br>
+                    <strong><?=gettext("not");?></strong><br>
+                    <?=gettext("Use this option to invert the sense of the match.");?><br>
                     <br>
                     <table border="0" cellspacing="1" cellpadding="1">
                       <tr>
-                        <td>Type:&nbsp;&nbsp;</td>
+                        <td><?=gettext("Type");?>:&nbsp;&nbsp;</td>
                         <td><select name="destination_type" class="formselect" onChange="typesel_change()">
                             <option value="any"<?php if ($pconfig['destination'] == "any") echo " selected"; ?>>
-                            any</option>
+                            <?=gettext("any");?></option>
                             <option value="network"<?php if ($pconfig['destination'] != "any") echo " selected"; ?>>
-                            Network</option>
+                            <?=gettext("Network");?></option>
                           </select></td>
                       </tr>
                       <tr>
-                        <td>Address:&nbsp;&nbsp;</td>
+                        <td><?=gettext("Address");?>:&nbsp;&nbsp;</td>
                         <td><input name="destination" type="text" class="formfld unknown" id="destination" size="20" value="<?=htmlspecialchars($pconfig['destination']);?>">
                           /
                           <select name="destination_subnet" class="formselect" id="destination_subnet">
@@ -399,25 +399,25 @@ blank for any)</td>
                       </tr>
                       <tr>
                         <td>&nbsp;</td>
-                        <td><span class="vexpl">Enter the destination network for
-                          the outbound NAT mapping.</span></td>
+                        <td><span class="vexpl"><?=gettext("Enter the destination network for ".
+                          "the outbound NAT mapping.");?></span></td>
                       </tr>
                       <tr>
-                        <td>Destination port:&nbsp;&nbsp;</td>
-                        <td><input name="dstport" type="text" class="formfld unknown" id="dstport" size="5" value="<?=htmlspecialchars($pconfig['dstport']);?>"> (leave blank for 
-any)</td>
+                        <td><?=gettext("Destination port");?>:&nbsp;&nbsp;</td>
+                        <td><input name="dstport" type="text" class="formfld unknown" id="dstport" size="5" value="<?=htmlspecialchars($pconfig['dstport']);?>"> <?=gettext("(leave blank for 
+any)");?></td>
                       </tr>
                     </table>
 		  </td>
                 </tr>
                 <tr>
-                  <td width="22%" valign="top" class="vncell">Translation</td>
+                  <td width="22%" valign="top" class="vncell"><?=gettext("Translation");?></td>
                   <td width="78%" class="vtable">
 			<table border="0" cellspacing="1" cellpadding="1">
 			<tr>
-			  <td>Address:&nbsp;&nbsp;</td>
+			  <td><?=gettext("Address");?>:&nbsp;&nbsp;</td>
 			  <td><select name="target" class="formselect">
-				<option value=""<?php if (!$pconfig['target']) echo " selected"; ?>>Interface address</option>
+				<option value=""<?php if (!$pconfig['target']) echo " selected"; ?>><?=gettext("Interface address");?></option>
 <?php	if (is_array($config['virtualip']['vip'])):
 		foreach ($config['virtualip']['vip'] as $sn):
 			if ($sn['mode'] == "proxyarp" && $sn['type'] == "network"):
@@ -435,49 +435,49 @@ any)</td>
 <?php 		endif; endforeach;
 	endif;
 ?>
-				<option value=""<?php if($pconfig['target'] == "any") echo " selected"; ?>>any</option>
+				<option value=""<?php if($pconfig['target'] == "any") echo " selected"; ?>><?=gettext("any");?></option>
 			  </select>
 			  </td>
 			</tr>
 			<tr><td>&nbsp;</td><td>
-                     <span class="vexpl">Packets matching this rule will be mapped to the IP address given here.<br>
-			If you want this rule to apply to another IP address than the IP address of the interface chosen above,
-			select it here (you need to define <a href="firewall_virtual_ip.php">Virtual IP</a> addresses on the first).
-			 Also note that if you are trying to redirect connections on the LAN select the "any" option.
+                     <span class="vexpl"><?=gettext("Packets matching this rule will be mapped to the IP address given here.");?><br>
+			<?=gettext("If you want this rule to apply to another IP address than the IP address of the interface chosen above, ".
+			gettext("select it here (you need to define");?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP");?></a> <?=gettext("addresses on the first).");?>
+			 <?=gettext('Also note that if you are trying to redirect connections on the LAN select the "any" option.');?>
 			</span>
 			</td></tr>
 			<tr>
-                          <td>Port:&nbsp;&nbsp;</td>
+                          <td><?=gettext("Port");?>:&nbsp;&nbsp;</td>
                           <td><input name="natport" type="text" class="formfld unknown" id="natport" size="5" value="<?=htmlspecialchars($pconfig['natport']);?>"></td>
 			</tr>
 			<tr><td>&nbsp;</td><td>
-                        <span class="vexpl">Enter the source port for the outbound NAT mapping.</span>
+                        <span class="vexpl"><?=gettext("Enter the source port for the outbound NAT mapping.");?></span>
 			</td></tr>
                         <tr>
-                          <td>Static-port:&nbsp;&nbsp;</td>
+                          <td><?=gettext("Static-port");?>:&nbsp;&nbsp;</td>
                           <td><input onChange="staticportchange();" name="staticnatport" type="checkbox" class="formfld" id="staticnatport" size="5"<?php if($pconfig['staticnatport']) echo " CHECKED";?>></td>
 			</tr>
 			</table>
 		  </td>
                 </tr>
 				<tr>
-				  <td width="22%" valign="top" class="vncell">No XMLRPC Sync</td>
+				  <td width="22%" valign="top" class="vncell"><?=gettext("No XMLRPC Sync");?></td>
 				  <td width="78%" class="vtable">
 					<input value="yes" name="nosync" type="checkbox" class="formfld" id="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br>
-				   			 HINT: This prevents the rule from automatically syncing to other CARP members.
+				   			 <?=gettext("HINT: This prevents the rule from automatically syncing to other CARP members.");?>
 				  </td>
 				</tr>
                 <tr>
-                  <td width="22%" valign="top" class="vncell">Description</td>
+                  <td width="22%" valign="top" class="vncell"><?=gettext("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">You may enter a description here
-                    for your reference (not parsed).</span></td>
+                    <br> <span class="vexpl"><?=gettext("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 name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" class="formbtn" value="Cancel" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="history.back()">
                     <?php if (isset($id) && $a_out[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
-- 
cgit v1.1


From fe71087774f2178acfe70d5c7a1f15092fe9e519 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 17:55:08 -0300
Subject: Fixing gettext() calls on firewall_nat_out.php

---
 usr/local/www/firewall_nat_out.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index efa49d3..296fb4b 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -291,7 +291,7 @@ include("head.inc");
 </script>
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('natconf')): ?><p>
-<?php print_info_box_np(gettext("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The NAT configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  <tr><td>
 <?php
-- 
cgit v1.1


From 456d0175680374fac7bb8d677182869e520dd815 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 17:55:16 -0300
Subject: Fixing gettext() calls on firewall_rules_edit.php

---
 usr/local/www/firewall_rules_edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 6e9d453..e4e9312 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -830,7 +830,7 @@ include("head.inc");
 					</tr>
 				</table>
 				<br />
-				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule. <b>This is usually <em>random</em> and almost never equal to the destination port range (and should usually be &quot;any&quot;).</b> <br /> Hint: you can leave the <em>'to'</em> field empty if you only want to filter a single port.");?></span><br/>
+				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule. <b>This is usually <em>random</em> and almost never equal to the destination port range (and should usually be &quot;any&quot;).</b>")."<br />".gettext("Hint: you can leave the <em>'to'</em> field empty if you only want to filter a single port.");?></span><br/>
 			</td>
 		</tr>
 		<tr>
@@ -1256,7 +1256,7 @@ include("head.inc");
 ?>
 				</select>
 				<br />
-				<span class="vexpl"><?=gettext("Choose the Out queue/Virtual interface only if you have selected In too. <br/> The Out selection is applied to traffic going out the interface the rule is created, In is the incoming one. <br/> If you are creating a rule on the Floating tab if the direction is In then the same rules apply, if the direction is out the selections are reverted Out is for incoming and In is for outgoing and if you do not select any direction use only the In since the Out selection does not make sense in there to prevent oddities.");?></span>
+				<span class="vexpl"><?=gettext("Choose the Out queue/Virtual interface only if you have selected In too.")."<br/>".gettext("The Out selection is applied to traffic going out the interface the rule is created, In is the incoming one.")."<br/>".gettext("If you are creating a rule on the Floating tab if the direction is In then the same rules apply, if the direction is out the selections are reverted Out is for incoming and In is for outgoing and if you do not select any direction use only the In since the Out selection does not make sense in there to prevent oddities.");?></span>
 				</div>
 			</td>
 		</tr>
-- 
cgit v1.1


From e336a1956bd1216add980f6af8a50308ee6d1114 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 17:55:26 -0300
Subject: Fixing gettext() calls on firewall_shaper.php

---
 usr/local/www/firewall_shaper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index 3365a08..a7d2e88 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -402,7 +402,7 @@ include("fbegin.inc");
 
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('shaper')): ?><p>
-<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td>
-- 
cgit v1.1


From a38cb9d06504842bf28cde4f89fe6f16f7e83cc5 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 17:55:38 -0300
Subject: Fixing gettext() calls on firewall_shaper_vinterface.php

---
 usr/local/www/firewall_shaper_vinterface.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 3028e12..8405186 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -348,7 +348,7 @@ include("fbegin.inc");
 
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('shaper')): ?><p>
-<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.<br>You must apply the changes in order for them to take effect."));?><br>
+<?php print_info_box_np(gettext("The traffic shaper configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
   <tr><td>
-- 
cgit v1.1


From 3c7b2c1eb010d630b11826e98e8ca867ac257e35 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Fri, 2 Jul 2010 17:55:47 -0300
Subject: Fixing gettext() calls on firewall_virtual_ip.php

---
 usr/local/www/firewall_virtual_ip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 541a6ed..a4337b8 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -143,7 +143,7 @@ include("head.inc");
 		print_info_box($savemsg); 
 	else
 	if (is_subsystem_dirty('vip'))
-		print_info_box_np(gettext("The VIP configuration has been changed.<br>You must apply the changes in order for them to take effect."));
+		print_info_box_np(gettext("The VIP configuration has been changed.")."<br>".gettext("You must apply the changes in order for them to take effect."));
 ?>
 <br>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
-- 
cgit v1.1


From 731df1afc9743c31c7b8e9a88d69d3bf18ec9777 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 13:29:35 -0300
Subject: Corrections gettext implementation on firewall_aliases_edit.php

---
 usr/local/www/firewall_aliases_edit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 6bad83e..ebae16a 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -561,7 +561,7 @@ EOD;
       <?php endif; ?>
       <br />
       <span class="vexpl">
-        <?=gettext("The name of the alias may only consist of the characters") . " a-z, A-Z and 0-9."; ?>
+        <?=gettext("The name of the alias may only consist of the characters \"a-z, A-Z and 0-9\"."); ?>
       </span>
     </td>
   </tr>
@@ -579,7 +579,7 @@ EOD;
     <td valign="top" class="vncellreq"><?=gettext("Type"); ?></td>
     <td class="vtable">
       <select name="type" class="formselect" id="type" onchange="update_box_type(); typesel_change();">
-        <option value="host" <?php if ($pconfig['type'] == "host") echo "selected"; ?>>Host(s)</option>
+        <option value="host" <?php if ($pconfig['type'] == "host") echo "selected"; ?>><?=gettext("Host(s)"); ?></option>
         <option value="network" <?php if ($pconfig['type'] == "network") echo "selected"; ?>><?=gettext("Network(s)"); ?></option>
         <option value="port" <?php if ($pconfig['type'] == "port") echo "selected"; ?>><?=gettext("Port(s)"); ?></option>
         <option value="openvpn" <?php if ($pconfig['type'] == "openvpn") echo "selected"; ?>><?=gettext("OpenVPN Users"); ?></option>
@@ -589,7 +589,7 @@ EOD;
     </td>
   </tr>
   <tr>
-    <td width="22%" valign="top" class="vncellreq"><div id="addressnetworkport">Host(s)</div></td>
+    <td width="22%" valign="top" class="vncellreq"><div id="addressnetworkport"><?=gettext("Host(s)"); ?></div></td>
     <td width="78%" class="vtable">
       <table id="maintable">
         <tbody>
-- 
cgit v1.1


From 9dc65295522e548d02c6e2904aabc2d45056e652 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 13:33:55 -0300
Subject: Corrections gettext implementation on firewall_aliases.php

---
 usr/local/www/firewall_aliases.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index 910cf43..c06f6fa 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -159,7 +159,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = array("Firewall","Aliases");
+$pgtitle = array(gettext("Firewall"),gettext("Aliases"));
 include("head.inc");
 
 ?>
-- 
cgit v1.1


From 5e76292a1eca4fdcea18f495ad4895f0995cfe8f Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 13:37:36 -0300
Subject: Corrections gettext implementation on firewall_aliases_import.php

---
 usr/local/www/firewall_aliases_import.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php
index e23c78c..76246a6 100755
--- a/usr/local/www/firewall_aliases_import.php
+++ b/usr/local/www/firewall_aliases_import.php
@@ -133,7 +133,7 @@ include("head.inc");
 	  <td valign="top" class="vncellreq"><?=gettext("Alias Name"); ?></td>
 	  <td class="vtable"> <input name="name" type="text" class="formfld unknown" id="name" size="40" value="<?=htmlspecialchars($_POST['name']);?>" />
 	    <br /> <span class="vexpl">
-	    <?=gettext("The name of the alias may only consist of the characters") . " a-z, A-Z and 0-9."; ?></span></td>
+	    <?=gettext("The name of the alias may only consist of the characters \"a-z, A-Z and 0-9\"."); ?></span></td>
 	</tr>
 	<tr>
 	  <td width="22%" valign="top" class="vncell"><?=gettext("Description"); ?></td>
-- 
cgit v1.1


From ebe08ebe448249c6e6efd28550d506f7fbb58205 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 13:51:24 -0300
Subject: Corrections gettext implementation on firewall_nat.php

---
 usr/local/www/firewall_nat.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index 8d3a1fb..4cab5d6 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -212,7 +212,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 			<?php if (count($a_nat) == 0): ?>
 				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0">
 			<?php else: ?>
-				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected rules" onclick="return confirm('Do you really want to delete the selected rules?')">
+				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected rules"); ?>" onclick="return confirm('Do you really want to delete the selected rules?')">
 			<?php endif; ?>
 			</td>
                         <td><a href="firewall_nat_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
@@ -253,9 +253,9 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td class="listt"><input type="checkbox" id="frc<?=$nnats;?>" name="rule[]" value="<?=$i;?>" onClick="fr_bgcolor('<?=$nnats;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;"></td>
                   <td class="listt" align="center">
 					<?php if($natent['associated-rule-id'] == "pass"): ?>
-					<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" title="All traffic matching this NAT entry is passed" border="0">
+					<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" title="<?=gettext("All traffic matching this NAT entry is passed"); ?>" border="0">
 					<?php elseif (!empty($natent['associated-rule-id'])): ?>
-					<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_chain.png" width="17" height="17" title="Firewall rule ID <?=htmlspecialchars($nnatid); ?> is managed with this rule" border="0">
+					<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_chain.png" width="17" height="17" title="<?=gettext("Firewall rule ID"); ?> <?=htmlspecialchars($nnatid); ?> <?=gettext("is managed with this rule"); ?>" border="0">
 					<?php endif; ?>
 				  </td>
                   <td class="listlr" onClick="fr_toggle(<?=$nnats;?>)" id="frd<?=$nnats;?>" ondblclick="document.location='firewall_nat_edit.php?id=<?=$nnats;?>';">
@@ -313,7 +313,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
 			<td><input onmouseover="fr_insline(<?=$nnats;?>, true)" onmouseout="fr_insline(<?=$nnats;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="<?=gettext("move selected rules before this rule");?>" height="17" type="image" width="17" border="0"></td>
-                        <td><a href="firewall_nat_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="edit rule"></a></td>
+                        <td><a href="firewall_nat_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit rule"); ?>"></a></td>
                       </tr>
                       <tr>
 					    <td align="center" valign="middle"><a href="firewall_nat.php?act=del&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete rule");?> onclick="return confirm(<?=gettext('Do you really want to delete this rule?');?>)"></a></td>
@@ -330,14 +330,14 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
                   <td class="list" valign="middle" nowrap>
                     <table border="0" cellspacing="0" cellpadding="1">
                       <tr>
-			<td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="move selected rules to end" border="0"><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="<?=gettext("move selected rules to end");?>" border="0"><?php endif; ?></td>
+			<td><?php if ($nnats == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected rules to end"); ?>" border="0"><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="<?=gettext("move selected rules to end");?>" border="0"><?php endif; ?></td>
                       </tr>
                       <tr>
 			<td width="17">
 			<?php if (count($a_nat) == 0): ?>
 				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0">
 			<?php else: ?>
-				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="delete selected rules" onclick="return confirm(<?=gettext('Do you really want to delete the selected rules?');?>)">
+				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected rules"); ?>" onclick="return confirm(<?=gettext('Do you really want to delete the selected rules?');?>)">
 			<?php endif; ?>
 			</td>
                         <td><a href="firewall_nat_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0"></a></td>
@@ -348,7 +348,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 		<tr><td>&nbsp;</td></tr>
           <tr>
             <td width="16"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_pass.gif" width="11" height="11"></td>
-            <td colspan="3">pass</td>
+            <td colspan="3"><?=gettext("pass"); ?></td>
 			</tr>
 		   <tr>
             <td width="14"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_chain.png" width="11" height="11"></td>
-- 
cgit v1.1


From 3a92149ba2f922a179836d8f7aae4c38d71024ca Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 14:11:26 -0300
Subject: Corrections gettext implementation on firewall_nat_edit.php

---
 usr/local/www/firewall_nat_edit.php | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index a969e4c..4962466 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -452,7 +452,7 @@ include("fbegin.inc"); ?>
                   </td>
                 </tr>
 		<tr>
-                  <td width="22%" valign="top" class="vncellreq">Interface</td>
+                  <td width="22%" valign="top" class="vncellreq"><?=gettext("Interface"); ?></td>
                   <td width="78%" class="vtable">
 					<select name="interface" class="formselect" onChange="dst_change(this.value,iface_old,document.iform.dsttype.value);iface_old = document.iform.interface.value;typesel_change();">
 						<?php
@@ -506,7 +506,7 @@ include("fbegin.inc"); ?>
 		<tr id="showadvancedboxsrc" name="showadvancedboxsrc">
 			<td width="22%" valign="top" class="vncellreq"><?=gettext("Source"); ?></td>
 			<td width="78%" class="vtable">
-				<input type="button" onClick="show_source()" value="Advanced"></input> - <?=gettext("Show source address and port range"); ?></a>
+				<input type="button" onClick="show_source()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show source address and port range"); ?></a>
 			</td>
 		</tr>
 		<tr style="display: none;" id="srctable" name="srctable">
@@ -529,7 +529,6 @@ include("fbegin.inc"); ?>
 								<option value="single"  <?php if (($pconfig['srcmask'] == 32) && !$sel) { echo "selected"; $sel = 1; } ?>><?=gettext("Single host or alias"); ?></option>
 								<option value="network" <?php if (!$sel) echo "selected"; ?>><?=gettext("Network"); ?></option>
 								<?php if(have_ruleint_access("pptp")): ?>
-<<<<<<< HEAD
 								<option value="pptp"    <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>><?=gettext("PPTP clients"); ?></option>
 								<?php endif; ?>
 								<?php if(have_ruleint_access("pppoe")): ?>
@@ -537,16 +536,7 @@ include("fbegin.inc"); ?>
 								<?php endif; ?>
 								 <?php if(have_ruleint_access("l2tp")): ?>
                                                                 <option value="l2tp"   <?php if ($pconfig['src'] == "l2tp") { echo "selected"; } ?>><?=gettext("L2TP clients"); ?></option>
-=======
-								<option value="pptp"    <?php if ($pconfig['src'] == "pptp") { echo "selected"; } ?>>PPTP <?=gettext("clients"); ?></option>
-								<?php endif; ?>
-								<?php if(have_ruleint_access("pppoe")): ?>
-								<option value="pppoe"   <?php if ($pconfig['src'] == "pppoe") { echo "selected"; } ?>>PPPoE <?=gettext("clients"); ?></option>
-								<?php endif; ?>
-								 <?php if(have_ruleint_access("l2tp")): ?>
-                                                                <option value="l2tp"   <?php if ($pconfig['src'] == "l2tp") { echo "selected"; } ?>>L2TP <?=gettext("clients"); ?></option>
->>>>>>> parent of 1baff2e... Implemment gettext()
-                                                                <?php endif; ?>
+                                 <?php endif; ?>
 <?php
 								foreach ($ifdisp as $ifent => $ifdesc): ?>
 								<?php if(have_ruleint_access($ifent)): ?>
@@ -766,12 +756,12 @@ include("fbegin.inc"); ?>
 					</td>
 				</tr>
 				<tr>
-					<td width="22%" valign="top" class="vncell">NAT reflection</td>
+					<td width="22%" valign="top" class="vncell"><?=gettext("NAT reflection"); ?></td>
 					<td width="78%" class="vtable">
 						<select name="natreflection" class="formselect">
-						<option value="default" <?php if ($pconfig['natreflection'] != "enable" && $pconfig['natreflection'] != "disable") echo "selected"; ?>>use system default</option>
-						<option value="enable" <?php if ($pconfig['natreflection'] == "enable") echo "selected"; ?>>enable</option>
-						<option value="disable" <?php if ($pconfig['natreflection'] == "disable") echo "selected"; ?>>disable</option>
+						<option value="default" <?php if ($pconfig['natreflection'] != "enable" && $pconfig['natreflection'] != "disable") echo "selected"; ?>><?=gettext("use system default"); ?></option>
+						<option value="enable" <?php if ($pconfig['natreflection'] == "enable") echo "selected"; ?>><?=gettext("enable"); ?></option>
+						<option value="disable" <?php if ($pconfig['natreflection'] == "disable") echo "selected"; ?>><?=gettext("disable"); ?></option>
 						</select>
 					</td>
 				</tr>
@@ -816,7 +806,7 @@ include("fbegin.inc"); ?>
 						<option value=""><?=gettext("None"); ?></option>
 						<option value="add-associated" selected="selected"><?=gettext("Add associated filter rule"); ?></option>
 						<option value="add-unassociated"><?=gettext("Add unassociated filter rule"); ?></option>
-						<option value="pass">Pass</option>
+						<option value="pass"><?=gettext("Pass"); ?></option>
 					</select>
 				  </td>
                 </tr><?php endif; ?>
-- 
cgit v1.1


From abd67a31410c36d2743aeea21cc7cdff6c70f2c0 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 14:37:40 -0300
Subject: Corrections gettext implementation on firewall_rules_edit.php

---
 usr/local/www/firewall_rules_edit.php | 44 +++++++++++++++++------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index e4e9312..df1f087 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -692,23 +692,23 @@ include("head.inc");
 				<select name="icmptype" class="formselect">
 <?php
 				$icmptypes = array(
-				"" => "any",
-				"echorep" => "Echo reply",
-				"unreach" => "Destination unreachable",
-				"squench" => "Source quench",
-				"redir" => "Redirect",
-				"althost" => "Alternate Host",
-				"echoreq" => "Echo",
-				"routeradv" => "Router advertisement",
-				"routersol" => "Router solicitation",
-				"timex" => "Time exceeded",
-				"paramprob" => "Invalid IP header",
-				"timereq" => "Timestamp",
-				"timerep" => "Timestamp reply",
-				"inforeq" => "Information request",
-				"inforep" => "Information reply",
-				"maskreq" => "Address mask request",
-				"maskrep" => "Address mask reply"
+				"" => gettext("any"),
+				"echorep" => gettext("Echo reply"),
+				"unreach" => gettext("Destination unreachable"),
+				"squench" => gettext("Source quench"),
+				"redir" => gettext("Redirect"),
+				"althost" => gettext("Alternate Host"),
+				"echoreq" => gettext("Echo"),
+				"routeradv" => gettext("Router advertisement"),
+				"routersol" => gettext("Router solicitation"),
+				"timex" => gettext("Time exceeded"),
+				"paramprob" => gettext("Invalid IP header"),
+				"timereq" => gettext("Timestamp"),
+				"timerep" => gettext("Timestamp reply"),
+				"inforeq" => gettext("Information request"),
+				"inforep" => gettext("Information reply"),
+				"maskreq" => gettext("Address mask request"),
+				"maskrep" => gettext("Address mask reply")
 				);
 
 				foreach ($icmptypes as $icmptype => $descr): ?>
@@ -806,7 +806,7 @@ include("head.inc");
 						<td><?=gettext("from");?>:&nbsp;&nbsp;</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="srcbeginport" class="formselect" onchange="src_rep_change();ext_change()">
-								<option value=""><?=gettext("(other)");?></option>
+								<option value="">(<?=gettext("other"); ?>)</option>
 								<option value="any" <?php $bfound = 0; if ($pconfig['srcbeginport'] == "any") { echo "selected"; $bfound = 1; } ?>><?=gettext("any");?></option>
 <?php 							foreach ($wkports as $wkport => $wkportdesc): ?>
 									<option value="<?=$wkport;?>" <?php if ($wkport == $pconfig['srcbeginport']) { echo "selected"; $bfound = 1; } ?>><?=htmlspecialchars($wkportdesc);?></option>
@@ -819,7 +819,7 @@ include("head.inc");
 						<td><?=gettext("to");?>:</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="srcendport" class="formselect" onchange="ext_change()">
-								<option value=""><?=gettext("(other)");?></option>
+								<option value="">(<?=gettext("other"); ?>)</option>
 								<option value="any" <?php $bfound = 0; if ($pconfig['srcendport'] == "any") { echo "selected"; $bfound = 1; } ?>><?=gettext("any");?></option>
 <?php							foreach ($wkports as $wkport => $wkportdesc): ?>
 									<option value="<?=$wkport;?>" <?php if ($wkport == $pconfig['srcendport']) { echo "selected"; $bfound = 1; } ?>><?=htmlspecialchars($wkportdesc);?></option>
@@ -897,7 +897,7 @@ include("head.inc");
 						<td><?=gettext("from");?>:&nbsp;&nbsp;</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="dstbeginport" class="formselect" onchange="dst_rep_change();ext_change()">
-								<option value=""><?=gettext("(other)");?></option>
+								<option value="">(<?=gettext("other"); ?>)</option>
 								<option value="any" <?php $bfound = 0; if ($pconfig['dstbeginport'] == "any") { echo "selected"; $bfound = 1; } ?>><?=gettext("any");?></option>
 <?php 							foreach ($wkports as $wkport => $wkportdesc): ?>
 									<option value="<?=$wkport;?>" <?php if ($wkport == $pconfig['dstbeginport']) { echo "selected"; $bfound = 1; }?>><?=htmlspecialchars($wkportdesc);?></option>
@@ -910,7 +910,7 @@ include("head.inc");
 						<td><?=gettext("to");?>:</td>
 						<td>
 							<select<?php echo ($edit_disabled===true?' DISABLED':''); ?> name="dstendport" class="formselect" onchange="ext_change()">
-								<option value=""><?=gettext("(other)"?></option>
+								<option value="">(<?=gettext("other"); ?>)</option>
 								<option value="any" <?php $bfound = 0; if ($pconfig['dstendport'] == "any") { echo "selected"; $bfound = 1; } ?>><?=gettext("any");?></option>
 <?php							foreach ($wkports as $wkport => $wkportdesc): ?>
 									<option value="<?=$wkport;?>" <?php if ($wkport == $pconfig['dstendport']) { echo "selected"; $bfound = 1; } ?>><?=htmlspecialchars($wkportdesc);?></option>
@@ -973,7 +973,7 @@ include("head.inc");
 					<select name="os" id="os" class="formselect">
 <?php
 						$ostypes = array(
-							 "" => "any",
+							 "" => gettext("any"),
 							"AIX" => "AIX",
 							"Linux" => "Linux",
 							"FreeBSD" => "FreeBSD",
-- 
cgit v1.1


From 64b919effe8874db9f6dd13b0efad86edf27cf3d Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 14:51:02 -0300
Subject: Corrections gettext implementation on firewall_schedule_edit.php

---
 usr/local/www/firewall_schedule_edit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php
index 5c2761a..4f5264b 100644
--- a/usr/local/www/firewall_schedule_edit.php
+++ b/usr/local/www/firewall_schedule_edit.php
@@ -923,14 +923,14 @@ EOD;
 				  							echo "</option>";
 				  						}
 				  					?>
-				  				</select>&nbsp;Hr&nbsp;&nbsp;
+				  				</select>&nbsp;<?=gettext("Hr"); ?>&nbsp;&nbsp;
 				  				<select name="starttimemin" class="formselect" id="starttimemin">
 				  					<option value="00">00</option>
 				  					<option value="15">15</option>
 				  					<option value="30">30</option>
 				  					<option value="45">45</option>
 				  					<option value="59">59</option>
-				  				</select>&nbsp;Min
+				  				</select>&nbsp;<?=gettext("Min"); ?>
 				  			</td>
 				  			<td></td>
 				  			<td>
@@ -1152,8 +1152,8 @@ EOD;
 			 	<tr>
 				    <td width="15%" valign="top">&nbsp;</td>
 				    <td width="85%">
-				      <input id="submit" name="submit" type="submit" onclick="return checkForRanges();" class="formbtn" value="Save" />
-				      <input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="Cancel" onclick="history.back()" />
+				      <input id="submit" name="submit" type="submit" onclick="return checkForRanges();" class="formbtn" value="<?=gettext("Save"); ?>" />
+				      <input id="cancelbutton" name="cancelbutton" type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()" />
 				      <?php if (isset($id) && $a_schedules[$id]): ?>
 				      <input name="id" type="hidden" value="<?=$id;?>" />
 				      <?php endif; ?>
-- 
cgit v1.1


From 4e52fac4c87de2ac3d2da891cb1cd710f9f75eb2 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 14:57:38 -0300
Subject: Corrections gettext implementation on firewall_shaper.php

---
 usr/local/www/firewall_shaper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index a7d2e88..d20d022 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -51,7 +51,7 @@ if($_GET['reset'] <> "") {
 	exit;
 }
 
-$pgtitle = array("Firewall","Traffic Shaper");
+$pgtitle = array(gettext("Firewall"),gettext("Traffic Shaper"));
 $statusurl = "status_queues.php";
 
 $shaperIFlist = get_configured_interface_with_descr();
-- 
cgit v1.1


From a00665a60d0d5616c1cf02e839745a6b44ef8586 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 15:02:05 -0300
Subject: Corrections gettext implementation on firewall_virtual_ip.php

---
 usr/local/www/firewall_virtual_ip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index a4337b8..01889f9 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -221,7 +221,7 @@ include("head.inc");
 		<tr>
 		  <td colspan="4">
 		      <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br>
-                      </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in ");?><a href="firewall_nat.php">NAT</a><?=gettext(" mappings.");?><br>
+                      </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in");?><a href="firewall_nat.php"> NAT </a><?=gettext("mappings.");?><br>
                       <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php"><?=gettext("here");?></a>.</span></p>
 		  </td>
 		</tr>
-- 
cgit v1.1


From f9c81d5a1e68063112ad9a8fae11f56c9de2be5f Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 15:07:56 -0300
Subject: Corrections gettext implementation on firewall_virtual_ip_edit.php

---
 usr/local/www/firewall_virtual_ip_edit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index 912cdbd..198d563 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -344,9 +344,9 @@ function typesel_change() {
 		  		  <td width="22%" valign="top" class="vncellreq"><?=gettext("Type");?></td>
                   <td width="78%" class="vtable">
                     <input name="mode" type="radio" onclick="enable_change(false)" value="proxyarp"
-					<?php if ($pconfig['mode'] == "proxyarp" || $pconfig['type'] != "carp") echo "checked";?>> Proxy ARP
+					<?php if ($pconfig['mode'] == "proxyarp" || $pconfig['type'] != "carp") echo "checked";?>> <?=gettext("Proxy ARP"); ?>
 					<input name="mode" type="radio" onclick="enable_change(false)" value="carp"
-					<?php if ($pconfig['mode'] == "carp") echo "checked";?>> CARP
+					<?php if ($pconfig['mode'] == "carp") echo "checked";?>> <?=gettext("CARP"); ?>
 					<input name="mode" type="radio" onclick="enable_change(false)" value="other"
 					<?php if ($pconfig['mode'] == "other") echo "checked";?>> <?=gettext("Other");?>
 					<input name="mode" type="radio" onclick="enable_change(false)" value="ipalias"
@@ -454,7 +454,7 @@ function typesel_change() {
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
-                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" class="formbtn" value="Cancel" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
                     <?php if (isset($id) && $a_vip[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
@@ -468,7 +468,7 @@ function typesel_change() {
 				      			<b><?=gettext("Note");?>:<br></b>
 				      		</span>&nbsp;&nbsp;
 				      		<?=gettext("ProxyARP type IP addresses *DO NOT* work with add on packages such as Squid.  Use a CARP or IP Alias type address for these cases.");?>
-				      		<p>&nbsp;&nbsp;&nbsp;<?=gettext("For more information on CARP and the above values, visit the OpenBSD ");?><a href='http://www.openbsd.org/faq/pf/carp.html'>CARP FAQ</A>.
+				      		<p>&nbsp;&nbsp;&nbsp;<?=gettext("For more information on CARP and the above values, visit the OpenBSD ");?><a href='http://www.openbsd.org/faq/pf/carp.html'> CARP FAQ</A>.
 						</span>
 					  </p>
 				  </td>
-- 
cgit v1.1


From 1dc3df6223356540e0d5c5b6f9bdb1db5da417cb Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 12:42:54 -0300
Subject: Checked gettext() implementation on firewall_nat_out.php

---
 usr/local/www/firewall_nat_out.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 59d6cb4..7049134 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -306,7 +306,7 @@ include("head.inc");
     <td>
 	<div id="mainarea">
               <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr><td align="right"><b>Mode:</b></td>
+				<tr><td align="right"><b><?=gettext("Mode"); ?>:</b></td>
                   <td>
                       &nbsp;&nbsp;<input name="advancedoripsec" type="radio" id="ipsecpassthru" value="ipsecpassthru" <?php if (isset($config['nat']['ipsecpassthru']['enable'])) echo "checked";?>>
                       <strong><?=gettext("Automatic outbound NAT rule generation<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(IPsec passthrough included)");?></strong>
@@ -332,7 +332,7 @@ include("head.inc");
 				</tr>
               </table>
               <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
-				<tr><td colspan="5"><b>&nbsp;Mappings:</b></td></tr>
+				<tr><td colspan="5"><b>&nbsp;<?=gettext("Mappings"); ?>:</b></td></tr>
 				<tr><td>&nbsp;</td></tr>
                 <tr id="frheader">
                   <td width="3%" class="list">&nbsp;</td>
@@ -455,14 +455,14 @@ include("head.inc");
                 </tr>
                 <tr>
                   <td colspan="12">
-					<p><span class="vexpl"><span class="red"><strong>Note:<br>
-                      </strong></span>If advanced outbound NAT is enabled, no outbound NAT
-                      rules will be automatically generated any longer. Instead, only the mappings
-                      you specify below will be used. With advanced outbound NAT disabled,
-                      a mapping is automatically created for each interface's subnet
-                      (except WAN).  If you use target addresses other than the WAN interface's
-		      IP address, then depending on the way your WAN connection is setup, you
-	              may also need a <a href="firewall_virtual_ip.php">Virtual IP</a>.</span><br>
+					<p><span class="vexpl"><span class="red"><strong><?=gettext("Note"); ?>:<br>
+                      </strong></span><?=gettext("If advanced outbound NAT is enabled, no outbound NAT " .
+                      "rules will be automatically generated any longer. Instead, only the mappings " .
+                      "you specify below will be used. With advanced outbound NAT disabled, " .
+                      "a mapping is automatically created for each interface's subnet " .
+                      "(except WAN).  If you use target addresses other than the WAN interface's " .
+		      "IP address, then depending on the way your WAN connection is setup, you " .
+	              "may also need a"); ?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP"); ?></a>.</span><br>
                     </td>
                 </tr>
 
-- 
cgit v1.1


From ab8c1eaf32af55d1b18b8abf76bec6fca4d834cc Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 13:04:01 -0300
Subject: Checked gettext() implementation on firewall_nat_out_edit.php

---
 usr/local/www/firewall_nat_out_edit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index 4cafc89..e024de5 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -467,8 +467,8 @@ any)");?></td>
 			<tr><td>&nbsp;</td><td>
                      <span class="vexpl"><?=gettext("Packets matching this rule will be mapped to the IP address given here.");?><br>
 			<?=gettext("If you want this rule to apply to another IP address than the IP address of the interface chosen above, ".
-			gettext("select it here (you need to define");?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP");?></a> <?=gettext("addresses on the first).");?>
-			 <?=gettext('Also note that if you are trying to redirect connections on the LAN select the "any" option.');?>
+			"select it here (you need to define");?> <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP");?></a> <?=gettext("addresses on the first).");?>
+			 <?=gettext("Also note that if you are trying to redirect connections on the LAN select the \"any\" option.");?>
 			</span>
 			</td></tr>
 			<tr>
@@ -496,8 +496,8 @@ any)");?></td>
                   <td width="22%" valign="top" class="vncell"><?=gettext("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"><?=gettext("You may enter a description here " .
+                    "for your reference (not parsed).");?></span></td>
           </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
-- 
cgit v1.1


From e9792c700da173d7bc2e24797022de009f198c7f Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 13:10:03 -0300
Subject: Checked gettext() implementation on firewall_nat_out_edit.php

---
 usr/local/www/firewall_nat_out_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index e024de5..01af830 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -502,7 +502,7 @@ any)");?></td>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
-                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> <input type="button" class="formbtn" value="<?=gettext("Cancel");?>" onclick="history.back()">
                     <?php if (isset($id) && $a_out[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>">
                     <?php endif; ?>
-- 
cgit v1.1


From 157a691967684f24ab5feb0cc4758c39f0dcec37 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 13:39:38 -0300
Subject: Checked gettext() implementation on firewall_rules_edit.php

---
 usr/local/www/firewall_rules_edit.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index f5890c6..86dc3f5 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -796,7 +796,7 @@ include("head.inc");
 				</table>
 				<div id="showadvancedboxspr">
 					<p>
-					<input<?php echo ($edit_disabled===true?' DISABLED':''); ?> type="button" onClick="show_source_port_range()" value="Advanced"></input> - <?=gettext("Show source port range");?></a>
+					<input<?php echo ($edit_disabled===true?' DISABLED':''); ?> type="button" onClick="show_source_port_range()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show source port range");?></a>
 				</div>
 			</td>
 		</tr>
@@ -936,7 +936,7 @@ include("head.inc");
 				<input name="log" type="checkbox" id="log" value="yes" <?php if ($pconfig['log']) echo "checked"; ?>>
 				<strong><?=gettext("Log packets that are handled by this rule");?></strong>
 				<br />
-				<span class="vexpl"><?=gettext("Hint: the firewall has limited local log space. Don't turn on logging for everything. If you want to do a lot of logging, consider using a remote syslog server (see the <a href="diag_logs_settings.php">Diagnostics: System logs: Settings</a> page).");?></span>
+				<span class="vexpl"><?=gettext("Hint: the firewall has limited local log space. Don't turn on logging for everything. If you want to do a lot of logging, consider using a remote syslog server (see the"); ?> <a href="diag_logs_settings.php"><?=gettext("Diagnostics: System logs: Settings"); ?></a> <?=gettext("page).");?></span>
 			</td>
 		</tr>
 		<tr>
@@ -951,7 +951,7 @@ include("head.inc");
 			<td width="22%" valign="top">&nbsp;</td>
 			<td width="78%">
 				&nbsp;<br>&nbsp;
-				<input name="Submit" type="submit" class="formbtn" value="Save">  <input type="button" class="formbtn" value="Cancel" onclick="history.back()">
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
 <?php			if (isset($id) && $a_filter[$id]): ?>
 					<input name="id" type="hidden" value="<?=$id;?>">
 <?php 			endif; ?>
@@ -968,7 +968,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Source OS");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvsourceosbox" <? if ($pconfig['os']) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_sourceos()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_sourceos()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showsourceosadv" <? if (empty($pconfig['os'])) echo "style='display:none'"; ?>>
 					<?=gettext("OS Type");?>:&nbsp;
@@ -1345,7 +1345,7 @@ include("head.inc");
 			<td width="22%" valign="top">&nbsp;</td>
 			<td width="78%">
 				&nbsp;<br>&nbsp;
-				<input name="Submit" type="submit" class="formbtn" value="Save">  <input type="button" class="formbtn" value="Cancel" onclick="history.back()">
+				<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>">  <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
 <?php			if (isset($id) && $a_filter[$id]): ?>
 					<input name="id" type="hidden" value="<?=$id;?>">
 <?php 			endif; ?>
-- 
cgit v1.1


From 6a87dc9cc85ac99c03d49ab3c080a4315dd28352 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 13:46:31 -0300
Subject: Checked gettext() implementation on firewall_shaper_layer7.php

---
 usr/local/www/firewall_shaper_layer7.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
index 2415fbd..a69551a 100755
--- a/usr/local/www/firewall_shaper_layer7.php
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -62,7 +62,7 @@ $statusurl = "status_queues.php";
 $output_form = "";
 
 $default_layer7shaper_msg = "<tr><td colspan=\"4\">";
-$default_layer7shaper_msg .= "<p><span class=\"vexpl\"><span class=\"red\"><strong>Note:<br>";
+$default_layer7shaper_msg .= sprintf("<p><span class=\"vexpl\"><span class=\"red\"><strong>%s:<br>", gettext("Note"));
 $default_layer7shaper_msg .= "</strong></span>" . gettext("You can add new layer7 protocol patterns by simply uploading the file") . " <a href=\"diag_patterns.php\">" . gettext("here") . ".</a><br>";
 $default_layer7shaper_msg .= "</td></tr>";
 
-- 
cgit v1.1


From 2bc79e88e6defcc46ca18a94ec5f61d1ec350cef Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 13:53:25 -0300
Subject: Checked gettext() implementation on firewall_virtual_ip_edit.php

---
 usr/local/www/firewall_virtual_ip_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index 198d563..1781518 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -468,7 +468,7 @@ function typesel_change() {
 				      			<b><?=gettext("Note");?>:<br></b>
 				      		</span>&nbsp;&nbsp;
 				      		<?=gettext("ProxyARP type IP addresses *DO NOT* work with add on packages such as Squid.  Use a CARP or IP Alias type address for these cases.");?>
-				      		<p>&nbsp;&nbsp;&nbsp;<?=gettext("For more information on CARP and the above values, visit the OpenBSD ");?><a href='http://www.openbsd.org/faq/pf/carp.html'> CARP FAQ</A>.
+				      		<p>&nbsp;&nbsp;&nbsp;<?=gettext("For more information on CARP and the above values, visit the OpenBSD ");?><a href='http://www.openbsd.org/faq/pf/carp.html'> <?=gettext("CARP FAQ"); ?></A>.
 						</span>
 					  </p>
 				  </td>
-- 
cgit v1.1


From 345b97151e7a3369f7c03537c8755c66f7a0d158 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 14:24:19 -0300
Subject: Checked gettext() implementation on firewall_rules_edit.php

---
 usr/local/www/firewall_rules_edit.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 86dc3f5..dab9b45 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -832,7 +832,7 @@ include("head.inc");
 					</tr>
 				</table>
 				<br />
-				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule. <b>This is usually <em>random</em> and almost never equal to the destination port range (and should usually be &quot;any&quot;).</b>")."<br />".gettext("Hint: you can leave the <em>'to'</em> field empty if you only want to filter a single port.");?></span><br/>
+				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule."); ?> <b><?=gettext("This is usually"); ?> <em><?=gettext("random"); ?></em> <?=gettext("and almost never equal to the destination port range (and should usually be"); ?> &quot;<?=gettext("any"); ?>&quot;).</b>")."<br />".<?=gettext("Hint: you can leave the"); ?> <em><?=gettext("'to'"); ?></em> <?=gettext("field empty if you only want to filter a single port.");?></span><br/>
 			</td>
 		</tr>
 		<tr>
@@ -926,7 +926,7 @@ include("head.inc");
 				<span class="vexpl">
 					<?=gettext("Specify the port or port range for the destination of the packet for this rule.");?>
 					<br />
-					<?=gettext("Hint: you can leave the <em>'to'</em> field empty if you only want to filter a single port");?>
+					<?=gettext("Hint: you can leave the"); ?> <em><?=gettext("'to'"); ?></em> <?=gettext("field empty if you only want to filter a single port");?>
 				</span>
 			</td>
 		</tr>
@@ -1028,7 +1028,7 @@ include("head.inc");
 				<br/><span class="vexpl"><?=gettext("This will disable auto generated reply-to for this rule.");?>
 				</span><p>
 				<input name="tag" id="tag" value="<?=htmlspecialchars($pconfig['tag']);?>">
-				<br /><span class="vexpl"><?=gettext("You can mark a packet matching this rule and use this mark to match on other NAT/filter rules. It is called <b>Policy filtering</b>");?>
+				<br /><span class="vexpl"><?=gettext("You can mark a packet matching this rule and use this mark to match on other NAT/filter rules. It is called"); ?> <b><?=gettext("Policy filtering"); ?></b>
 				</span><p>
 				<input name="tagged" id="tagged" value="<?=htmlspecialchars($pconfig['tagged']);?>">
 				<br /><span class="vexpl"><?=gettext("You can match packet on a mark placed before on another rule.")?>
-- 
cgit v1.1


From bc381f9a1ec901b760ca9757a0bf8a0afef61c99 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 14:31:09 -0300
Subject: Checked gettext() implementation on firewall_nat_out.php

---
 usr/local/www/firewall_nat_out.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 7049134..7c248b7 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -309,7 +309,7 @@ include("head.inc");
 				<tr><td align="right"><b><?=gettext("Mode"); ?>:</b></td>
                   <td>
                       &nbsp;&nbsp;<input name="advancedoripsec" type="radio" id="ipsecpassthru" value="ipsecpassthru" <?php if (isset($config['nat']['ipsecpassthru']['enable'])) echo "checked";?>>
-                      <strong><?=gettext("Automatic outbound NAT rule generation<br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(IPsec passthrough included)");?></strong>
+                      <strong><?=gettext("Automatic outbound NAT rule generation"); ?><br/>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?=gettext("(IPsec passthrough included)");?></strong>
                   </td>
 
                   <td>
-- 
cgit v1.1


From 4fe84f510a1c933d783e2f4fc398774b740e5392 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 14:35:29 -0300
Subject: Checked gettext() implementation on firewall_rules_edit.php

---
 usr/local/www/firewall_rules_edit.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index dab9b45..dd4aa86 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -1335,8 +1335,8 @@ include("head.inc");
 				</select>			
 				<br/>
 				<span class="vexpl">
-					<?=gettext("Choose a Layer7 container to apply application protocol inspection rules.
-					These are valid for TCP and UDP protocols only.");?>
+					<?=gettext("Choose a Layer7 container to apply application protocol inspection rules. " .
+					"These are valid for TCP and UDP protocols only.");?>
 				</span>
 			  </div>
 			</td>
-- 
cgit v1.1


From 48ba486a7ec3b69947debfdb9763649097692387 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 14:43:55 -0300
Subject: Checked gettext() implementation on firewall_aliases_edit.php

---
 usr/local/www/firewall_aliases_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index ebae16a..6982673 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -278,7 +278,7 @@ if ($_POST) {
 			}
 		}
 		if ($wrongaliases <> "")
-			$input_errors[] = sprintf(gettext("The alias(es): %s \ncannot be nested cause they are not of the same type."), $wrongaliases);
+			$input_errors[] = sprintf(gettext("The alias(es): %s %scannot be nested cause they are not of the same type."), $wrongaliases, " \n");
 	}
 
 	if (!$input_errors) {
-- 
cgit v1.1


From 0fb885bcd52b0d7f95c0a09538c63cede56e2560 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 08:17:51 -0300
Subject: Checked gettext() implementation on firewall_rules_edit.php

---
 usr/local/www/firewall_rules_edit.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index dd4aa86..cbbf5f3 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -832,7 +832,7 @@ include("head.inc");
 					</tr>
 				</table>
 				<br />
-				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule."); ?> <b><?=gettext("This is usually"); ?> <em><?=gettext("random"); ?></em> <?=gettext("and almost never equal to the destination port range (and should usually be"); ?> &quot;<?=gettext("any"); ?>&quot;).</b>")."<br />".<?=gettext("Hint: you can leave the"); ?> <em><?=gettext("'to'"); ?></em> <?=gettext("field empty if you only want to filter a single port.");?></span><br/>
+				<span class="vexpl"><?=gettext("Specify the source port or port range for this rule."); ?> <b><?=gettext("This is usually"); ?> <em><?=gettext("random"); ?></em> <?=gettext("and almost never equal to the destination port range (and should usually be"); ?> &quot;<?=gettext("any"); ?>&quot;).</b>")."<br />".<?=gettext("Hint: you can leave the"); ?> <em><?=gettext("\"to\""); ?></em> <?=gettext("field empty if you only want to filter a single port.");?></span><br/>
 			</td>
 		</tr>
 		<tr>
@@ -936,7 +936,7 @@ include("head.inc");
 				<input name="log" type="checkbox" id="log" value="yes" <?php if ($pconfig['log']) echo "checked"; ?>>
 				<strong><?=gettext("Log packets that are handled by this rule");?></strong>
 				<br />
-				<span class="vexpl"><?=gettext("Hint: the firewall has limited local log space. Don't turn on logging for everything. If you want to do a lot of logging, consider using a remote syslog server (see the"); ?> <a href="diag_logs_settings.php"><?=gettext("Diagnostics: System logs: Settings"); ?></a> <?=gettext("page).");?></span>
+				<span class="vexpl"><?=gettext("Hint: the firewall has limited local log space. Don't turn on logging for everything. If you want to do a lot of logging, consider using a remote syslog server"); ?> (<?=gettext("see the"); ?> <a href="diag_logs_settings.php"><?=gettext("Diagnostics: System logs: Settings"); ?></a> <?=gettext("page"); ?>).</span>
 			</td>
 		</tr>
 		<tr>
@@ -1002,7 +1002,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Diffserv Code Point");?></td>
 			<td width="78%" class="vtable">
 				<div id="dsadv" name="dsadv" <? if ($pconfig['dscp']) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_dsdiv();" value="Advanced"> - <?=gettext("Show advanced option");?>
+					<input type="button" onClick="show_dsdiv();" value="<?=gettext("Advanced"); ?>"> - <?=gettext("Show advanced option");?>
 				</div>
 				<div id="dsdivmain" name="dsdivmain" <? if (empty($pconfig['dscp'])) echo "style='display:none'"; ?>>
 					<select name="dscp" id="dscp">
@@ -1018,7 +1018,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Advanced Options");?></td>
 			<td width="78%" class="vtable">
 			<div id="aoadv" name="aoadv">
-				<input type="button" onClick="show_aodiv();" value="Advanced"> - <?=gettext("Show advanced option");?>
+				<input type="button" onClick="show_aodiv();" value="<?=gettext("Advanced"); ?>"> - <?=gettext("Show advanced option");?>
 			</div>
 			<div id="aodivmain" name="aodivmain" style="display:none">
 				<input type="checkbox" id="allowopts" value="yes" name="allowopts"<?php if($pconfig['allowopts'] == true) echo " checked"; ?>>
@@ -1060,7 +1060,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("TCP flags");?></td>
 			<td width="78%" class="vtable">
 			<div id="showtcpflagsbox" <? if ($pconfig['tcpflags_any'] || $pconfig['tcpflags1'] || $pconfig['tcpflags2']) echo "style='display:none'"; ?>>
-                        	<input type="button" onClick="show_advanced_tcpflags()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+                        	<input type="button" onClick="show_advanced_tcpflags()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
                         </div>
                         <div id="showtcpflagsadv" <? if (empty($pconfig['tcpflags_any']) && empty($pconfig['tcpflags1']) && empty($pconfig['tcpflags2'])) echo "style='display:none'"; ?>>
 			<div id="tcpheader" name="tcpheader">
@@ -1102,7 +1102,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("State Type");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvstatebox" <? if (!empty($pconfig['statetype']) && $pconfig['statetype'] != "keep state") echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_state()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_state()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showstateadv" <? if (empty($pconfig['statetype']) || $pconfig['statetype'] == "keep state") echo "style='display:none'"; ?>>
 					<select name="statetype">
@@ -1126,7 +1126,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("No XMLRPC Sync");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvnoxmlrpcsyncbox" <? if ($pconfig['nosync']) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_noxmlrpc()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_noxmlrpc()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="shownoxmlrpcadv" <? if (empty($pconfig['nosync'])) echo "style='display:none'"; ?>>
 					<input type="checkbox" name="nosync"<?php if($pconfig['nosync']) echo " CHECKED"; ?>><br>
@@ -1149,7 +1149,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Schedule");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvschedulebox" <? if (!empty($pconfig['sched'])) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_schedule()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_schedule()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showscheduleadv" <? if (empty($pconfig['sched'])) echo "style='display:none'"; ?>>
 					<select name='sched'>
@@ -1176,7 +1176,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Gateway");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvgatewaybox" <? if (!empty($pconfig['gateway'])) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_gateway()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_gateway()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showgatewayadv" <? if (empty($pconfig['gateway'])) echo "style='display:none'"; ?>>
 					<select name='gateway'>
@@ -1217,7 +1217,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("In/Out");?></td>
 			<td width="78%" class="vtable">
 				<div id="showadvinoutbox" <? if (!empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>>
-					<input type="button" onClick="show_advanced_inout()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+					<input type="button" onClick="show_advanced_inout()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 				</div>
 				<div id="showinoutadv" <? if (empty($pconfig['dnpipe'])) echo "style='display:none'"; ?>>
 					<select name="dnpipe">
@@ -1267,7 +1267,7 @@ include("head.inc");
 			<td width="22%" valign="top" class="vncell"><?=gettext("Ackqueue/Queue");?></td>
 			<td width="78%" class="vtable">
 			<div id="showadvackqueuebox" <? if (!empty($pconfig['defaultqueue'])) echo "style='display:none'"; ?>>
-				<input type="button" onClick="show_advanced_ackqueue()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+				<input type="button" onClick="show_advanced_ackqueue()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 			</div>
 			<div id="showackqueueadv" <? if (empty($pconfig['defaultqueue'])) echo "style='display:none'"; ?>>
 				<select name="ackqueue">
@@ -1315,7 +1315,7 @@ include("head.inc");
 				<td width="22%" valign="top" class="vncell"><?=gettext("Layer7");?></td>
 				<td width="78%" class="vtable">
 					<div id="showadvlayer7box" <? if (!empty($pconfig['l7container'])) echo "style='display:none'"; ?>>
-						<input type="button" onClick="show_advanced_layer7()" value="Advanced"></input> - <?=gettext("Show advanced option");?></a>
+						<input type="button" onClick="show_advanced_layer7()" value="<?=gettext("Advanced"); ?>"></input> - <?=gettext("Show advanced option");?></a>
 					</div>
 					<div id="showlayer7adv" <? if (empty($pconfig['l7container'])) echo "style='display:none'"; ?>>
 				<select name="l7container">
-- 
cgit v1.1


From 7a808e01be2aa9b90ff2bbf676c32c613dd13f19 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 10:45:34 -0300
Subject: Checked gettext() implementation on firewall_rules.php

---
 usr/local/www/firewall_rules.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index f21ea30..045daa4 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -41,7 +41,6 @@
 ##|*MATCH=firewall_rules.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Firewall"),gettext("Rules"));
 $statusurl = "status_filter_reload.php";
 $logurl = "diag_logs_filter.php";
 
@@ -50,6 +49,8 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
 
+$pgtitle = array(gettext("Firewall"),gettext("Rules"));
+
 function check_for_advaned_options(&$item) {
 	$item_set = "";
 	if($item['max'])
@@ -364,7 +365,7 @@ if($_REQUEST['undodrag']) {
 				?>
 				<td>
 				<?php if ($nrules == 0): ?>
-				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="delete selected rules" border="0"><?php else: ?>
+				<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?gettext("delete selected rules"); ?>" border="0"><?php else: ?>
 				<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" onclick="return confirm('<?=gettext('Do you really want to delete the selected rules?');?>')"><?php endif; ?>
 				</td>
 				<td align="center" valign="middle"><a href="firewall_rules_edit.php?if=<?=$if;?>&after=-1"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0"></a></td>
@@ -437,7 +438,7 @@ if($_REQUEST['undodrag']) {
 						continue;
 					$isadvset = check_for_advaned_options($filterent);
 					if($isadvset)
-						$advanced_set = "<img src=\"./themes/{$g['theme']}/images/icons/icon_advanced.gif\" title=\"advanced settings set: $isadvset\" border=\"0\">";
+						$advanced_set = sprintf("<img src=\"./themes/%s/images/icons/icon_advanced.gif\" title=\"%s: %s\" border=\"0\">", $g['theme'], gettext("advanced settings set"), $isadvset);
 					else 
 						$advanced_set = ""
 				?>
@@ -461,7 +462,7 @@ if($_REQUEST['undodrag']) {
 							$textss = $textse = "";
 						}
 				  ?>
-				  <a href="?if=<?=$if;?>&act=toggle&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfn;?>.gif" width="11" height="11" border="0" title="<?=gettext("click to toggle enabled/disabled status");?>></a>
+				  <a href="?if=<?=$if;?>&act=toggle&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfn;?>.gif" width="11" height="11" border="0" title="<?=gettext("click to toggle enabled/disabled status");?>"></a>
 				  <?php if (isset($filterent['log'])):
 							$iconfnlog = "log_s";
 						if (isset($filterent['disabled']))
@@ -660,7 +661,7 @@ if($_REQUEST['undodrag']) {
 							} else if (isset($filterent['defaultqueue'])) {
 								$desc = $filterent['defaultqueue'];
 							    echo "<a href=\"firewall_shaper_queues.php?queue={$filterent['defaultqueue']}&action=show\">{$desc}</a>"; }
-							else echo "none";
+							else echo gettext("none");
 						  ?><?=$textse;?>
                         </td>
                   <td class="listr" onClick="fr_toggle(<?=$nrules;?>)" id="frd<?=$nrules;?>" ondblclick="document.location='firewall_rules_edit.php?id=<?=$i;?>';"><font color="black">
@@ -672,12 +673,12 @@ if($_REQUEST['undodrag']) {
                   <td valign="middle" nowrap class="list">
 				    <table border="0" cellspacing="0" cellpadding="1">
 					<tr>
-					  <td><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="move selected rules before this rule" onMouseOver="fr_insline(<?=$nrules;?>, true)" onMouseOut="fr_insline(<?=$nrules;?>, false)"></td>
-					  <td><a href="firewall_rules_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="edit rule" width="17" height="17" border="0"></a></td>
+					  <td><input name="move_<?=$i;?>" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="<?=gettext("move selected rules before this rule"); ?>" onMouseOver="fr_insline(<?=$nrules;?>, true)" onMouseOut="fr_insline(<?=$nrules;?>, false)"></td>
+					  <td><a href="firewall_rules_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" title="<?=gettext("edit rule"); ?>" width="17" height="17" border="0"></a></td>
 					</tr>
 					<tr>
-					  <td align="center" valign="middle"><a href="firewall_rules.php?act=del&if=<?=$if;?>&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="delete rule" onclick="return confirm('Do you really want to delete this rule?')"></a></td>
-					  <td><a href="firewall_rules_edit.php?dup=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="add a new rule based on this one" width="17" height="17" border="0"></a></td>
+					  <td align="center" valign="middle"><a href="firewall_rules.php?act=del&if=<?=$if;?>&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" title="<?=gettext("delete rule"); ?>" onclick="return confirm('Do you really want to delete this rule?')"></a></td>
+					  <td><a href="firewall_rules_edit.php?dup=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add a new rule based on this one"); ?>" width="17" height="17" border="0"></a></td>
 					</tr>
 					</table>
 				  </td>
-- 
cgit v1.1


From 5e04e6299fbf97548e1bcd189befbef753835261 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 13:01:48 -0300
Subject: Checked gettext() implementation on firewall_rules_edit.php

---
 usr/local/www/firewall_rules_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index cbbf5f3..c91b1a8 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -734,7 +734,7 @@ include("head.inc");
 						if (is_array($config['nat']['rule'])) {
 							foreach( $config['nat']['rule'] as $index => $nat_rule ) {
 								if( isset($nat_rule['associated-rule-id']) && $nat_rule['associated-rule-id']==$pconfig['associated-rule-id'] ) {
-									echo "<a href=\"firewall_nat_edit.php?id={$index}\">View the NAT rule</a><br>";
+									printf("<a href=\"firewall_nat_edit.php?id=%s\">%s</a><br>", $index, gettext("View the NAT rule"));
 									break;
 								}
 							}
-- 
cgit v1.1


From ad2fe9e60ab9b015f5b20838d739a542a32b8c6e Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 13:31:28 -0300
Subject: Checked gettext() implementation on firewall_nat_edit.php

---
 usr/local/www/firewall_nat_edit.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_edit.php b/usr/local/www/firewall_nat_edit.php
index 4962466..7a7b807 100755
--- a/usr/local/www/firewall_nat_edit.php
+++ b/usr/local/www/firewall_nat_edit.php
@@ -781,7 +781,7 @@ include("fbegin.inc"); ?>
 									echo "<option value=\"{$filter_rule['associated-rule-id']}\"";
 									if ($filter_rule['associated-rule-id']==$pconfig['associated-rule-id']) {
 										echo " SELECTED";
-										$linkedrule = "<br /><a href=\"firewall_rules_edit.php?id={$filter_id}\">View the filter rule</a><br/>";
+										$linkedrule = sprintf("<br /><a href=\"firewall_rules_edit.php?id=%s\">%s</a><br/>", $filter_id, gettext("View the filter rule"));
 									}
 									echo ">". htmlspecialchars('Rule ' . $filter_rule['descr']) . "</option>\n";
 
-- 
cgit v1.1


From 7102bd3ce9ac54c5359cbdb712af6d060606ba0c Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 13:36:22 -0300
Subject: Checked gettext() implementation on firewall_schedule.php

---
 usr/local/www/firewall_schedule.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php
index 60ee732..cfa160b 100644
--- a/usr/local/www/firewall_schedule.php
+++ b/usr/local/www/firewall_schedule.php
@@ -39,7 +39,6 @@
 ##|*MATCH=firewall_schedule.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Firewall"),gettext("Schedules"));
 
 $dayArray = array (gettext('Mon'),gettext('Tues'),gettext('Wed'),gettext('Thur'),gettext('Fri'),gettext('Sat'),gettext('Sun'));
 $monthArray = array (gettext('January'),gettext('February'),gettext('March'),gettext('April'),gettext('May'),gettext('June'),gettext('July'),gettext('August'),gettext('September'),gettext('October'),gettext('November'),gettext('December'));
@@ -48,6 +47,8 @@ require("guiconfig.inc");
 require("filter.inc");
 require("shaper.inc");
 
+$pgtitle = array(gettext("Firewall"),gettext("Schedules"));
+
 if (!is_array($config['schedules']['schedule']))
 	$config['schedules']['schedule'] = array();
 
-- 
cgit v1.1


From b5d84594e448e0072e59c4536f918b0ca8403cef Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 13:46:30 -0300
Subject: Checked gettext() implementation on firewall_schedule_edit.php

---
 usr/local/www/firewall_schedule_edit.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_schedule_edit.php b/usr/local/www/firewall_schedule_edit.php
index 4f5264b..74497c1 100644
--- a/usr/local/www/firewall_schedule_edit.php
+++ b/usr/local/www/firewall_schedule_edit.php
@@ -53,12 +53,13 @@ function schedule_sort(){
         usort($config['schedules']['schedule'], "schedulecmp");
 }
 
-$pgtitle = array(gettext("Firewall"),gettext("Schedules"),gettext("Edit"));
 require("guiconfig.inc");
 require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
 
+$pgtitle = array(gettext("Firewall"),gettext("Schedules"),gettext("Edit"));
+
 $starttimehr = 00;
 $starttimemin = 00;
 
-- 
cgit v1.1


From 0af92804de805eaea353209e75504a2fa5a93f0a Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 14:00:48 -0300
Subject: Checked gettext() implementation on firewall_shaper_vinterface.php

---
 usr/local/www/firewall_shaper_vinterface.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper_vinterface.php b/usr/local/www/firewall_shaper_vinterface.php
index 8405186..7ed4b02 100644
--- a/usr/local/www/firewall_shaper_vinterface.php
+++ b/usr/local/www/firewall_shaper_vinterface.php
@@ -297,7 +297,7 @@ if ($can_add || $addnewaltq) {
 		$output_form .= "&queue=" . $queue->GetQname();
 	}
 	$output_form .= "&action=add\">";
-	$output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"Add new queue\">";
+	$output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") ."\">";
 	$output_form .= "</a>";
 }
 $output_form .= "<a href=\"firewall_shaper_vinterface.php?pipe=";
@@ -308,9 +308,9 @@ if ($queue) {
 $output_form .= "&action=delete\">";
 $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\"";
 if ($queue)
-	$output_form .= " value=\"Delete this queue\">";
+	$output_form .= " value=\"" . gettext("Delete this queue") ."\">";
 else
-	$output_form .= " value=\"Delete virtual interface\">";
+	$output_form .= " value=\"" . gettext("Delete virtual interface") ."\">";
 $output_form .= "</a>";  
 $output_form .= "</td></tr>";
 $output_form .= "</div>";
-- 
cgit v1.1


From 4b368bb976855dd88df631d63994d26db420348a Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 14:05:44 -0300
Subject: Checked gettext() implementation on firewall_shaper_layer7.php

---
 usr/local/www/firewall_shaper_layer7.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper_layer7.php b/usr/local/www/firewall_shaper_layer7.php
index a69551a..7a58e12 100755
--- a/usr/local/www/firewall_shaper_layer7.php
+++ b/usr/local/www/firewall_shaper_layer7.php
@@ -540,7 +540,7 @@ include("fbegin.inc");
 							<? endif; ?>							
 						</td>
 						<td>
-							<input type="image" src="/themes/<? echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow('maintable',this.parentNode.parentNode); return false;" value="Delete" />
+							<input type="image" src="/themes/<? echo $g['theme'];?>/images/icons/icon_x.gif" onclick="removeRow('maintable',this.parentNode.parentNode); return false;" value="<?=gettext("Delete"); ?>" />
 						</td>
 						</tr>
 						
-- 
cgit v1.1


From e4fc92deb822bebe928351ca630b4a0920640b62 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 14:09:50 -0300
Subject: Checked gettext() implementation on firewall_virtual_ip.php

---
 usr/local/www/firewall_virtual_ip.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php
index 01889f9..f39fbe7 100755
--- a/usr/local/www/firewall_virtual_ip.php
+++ b/usr/local/www/firewall_virtual_ip.php
@@ -221,7 +221,7 @@ include("head.inc");
 		<tr>
 		  <td colspan="4">
 		      <p><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br>
-                      </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in");?><a href="firewall_nat.php"> NAT </a><?=gettext("mappings.");?><br>
+                      </strong></span><?=gettext("The virtual IP addresses defined on this page may be used in");?><a href="firewall_nat.php"> <?=gettext("NAT"); ?> </a><?=gettext("mappings.");?><br>
                       <?=gettext("You can check the status of your CARP Virtual IPs and interfaces ");?><a href="carp_status.php"><?=gettext("here");?></a>.</span></p>
 		  </td>
 		</tr>
-- 
cgit v1.1


From b13f7f804d0c3349f962eccb0d74501a88c5e319 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 14:14:28 -0300
Subject: Checked gettext() implementation on firewall_aliases_edit.php

---
 usr/local/www/firewall_aliases_edit.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 6982673..22479dc 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -44,7 +44,6 @@
 ##|*MATCH=firewall_aliases_edit.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Edit"));
 
 // Keywords not allowed in names
 $reserved_keywords = array("pass", "out", "queue", "max", "min", "pptp", "pppoe", "l2tp", "openvpn");
@@ -54,6 +53,8 @@ require_once("functions.inc");
 require_once("filter.inc");
 require_once("shaper.inc");
 
+$pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Edit"));
+
 $reserved_ifs = get_configured_interface_list(false, true);
 $reserved_keywords = array_merge($reserved_keywords, $reserved_ifs);
 
-- 
cgit v1.1


From 08c18f5d8c8391b9d010d74f2e7c37c4d1763cb9 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 14:19:15 -0300
Subject: Checked gettext() implementation on firewall_nat_1to1.php

---
 usr/local/www/firewall_nat_1to1.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_1to1.php b/usr/local/www/firewall_nat_1to1.php
index b2252ae..1472146 100755
--- a/usr/local/www/firewall_nat_1to1.php
+++ b/usr/local/www/firewall_nat_1to1.php
@@ -75,7 +75,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = array("Firewall","NAT","1:1");
+$pgtitle = array(gettext("Firewall"),gettext("NAT"),gettext("1:1"));
 include("head.inc");
 
 ?>
-- 
cgit v1.1


From d6da0705aee4c9bd8b6373d543bb416e3e0fc509 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 14:44:17 -0300
Subject: Checked gettext() implementation on firewall_nat_1to1_edit.php

---
 usr/local/www/firewall_nat_1to1_edit.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index 5c024b7..5057959 100755
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -158,7 +158,7 @@ include("head.inc");
 					<td colspan="2" valign="top" class="listtopic"><?=gettext("Edit NAT 1:1 entry"); ?></td>
 				</tr>	
 				<tr>
-				  <td width="22%" valign="top" class="vncellreq">Interface</td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Interface"); ?></td>
 				  <td width="78%" class="vtable">
 					<select name="interface" class="formselect">
 						<?php
@@ -227,19 +227,19 @@ include("head.inc");
                     "for your reference (not parsed)."); ?></span></td>
                 </tr>
 				<tr>
-					<td width="22%" valign="top" class="vncell">NAT reflection</td>
+					<td width="22%" valign="top" class="vncell"><?=gettext("NAT reflection"); ?></td>
 					<td width="78%" class="vtable">
 						<select name="natreflection" class="formselect">
-						<option value="default" <?php if ($pconfig['natreflection'] != "enable" && $pconfig['natreflection'] != "disable") echo "selected"; ?>>use system default</option>
-						<option value="enable" <?php if ($pconfig['natreflection'] == "enable") echo "selected"; ?>>enable</option>
-						<option value="disable" <?php if ($pconfig['natreflection'] == "disable") echo "selected"; ?>>disable</option>
+						<option value="default" <?php if ($pconfig['natreflection'] != "enable" && $pconfig['natreflection'] != "disable") echo "selected"; ?>><?=gettext("use system default"); ?></option>
+						<option value="enable" <?php if ($pconfig['natreflection'] == "enable") echo "selected"; ?>><?=gettext("enable"); ?></option>
+						<option value="disable" <?php if ($pconfig['natreflection'] == "disable") echo "selected"; ?>><?=gettext("disable"); ?></option>
 						</select>
 					</td>
 				</tr>
                 <tr> 
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="Save"> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
+                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Save"); ?>"> <input type="button" class="formbtn" value="<?=gettext("Cancel"); ?>" onclick="history.back()">
                     <?php if (isset($id) && $a_1to1[$id]): ?>
                     <input name="id" type="hidden" value="<?=$id;?>"> 
                     <?php endif; ?>
-- 
cgit v1.1


From 754ad306f3c66dea086d6882269d1ee7213a1ea5 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 14:47:42 -0300
Subject: Checked gettext() implementation on firewall_rules.php

---
 usr/local/www/firewall_rules.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 045daa4..0fb8aac 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -692,7 +692,7 @@ if($_REQUEST['undodrag']) {
 			  <span class="gray">
 			  <?=gettext("No rules are currently defined for this interface")."<br>".
 			  gettext("All incoming connections on this interface will be blocked until you add pass rules.")."<br><br>";?>
-			  Click the <a href="firewall_rules_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" border="0" width="17" height="17" align="absmiddle"></a><?=gettext(" button to add a new rule.");?></span>
+			  <?=gettext("Click the"); ?> <a href="firewall_rules_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" border="0" width="17" height="17" align="absmiddle"></a><?=gettext(" button to add a new rule.");?></span>
 			  </td>
 			  <?php endif; ?>
                 <tr id="fr<?=$nrules;?>">
-- 
cgit v1.1


From 8b6827a4f05e6bf9487d06caa080b30f49cfcd28 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Tue, 13 Jul 2010 16:26:31 -0300
Subject: Checked gettext() implementation on firewall_rules.php

---
 usr/local/www/firewall_rules.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 0fb8aac..19a6cdc 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -690,8 +690,8 @@ if($_REQUEST['undodrag']) {
 			  <td class="listt"></td>
 			  <td class="listlr" colspan="10" align="center" valign="middle">
 			  <span class="gray">
-			  <?=gettext("No rules are currently defined for this interface")."<br>".
-			  gettext("All incoming connections on this interface will be blocked until you add pass rules.")."<br><br>";?>
+			  <?=gettext("No rules are currently defined for this interface"); ?><br>
+			  <?=gettext("All incoming connections on this interface will be blocked until you add pass rules."); ?><br><br>
 			  <?=gettext("Click the"); ?> <a href="firewall_rules_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" border="0" width="17" height="17" align="absmiddle"></a><?=gettext(" button to add a new rule.");?></span>
 			  </td>
 			  <?php endif; ?>
-- 
cgit v1.1


From 2f8fe6af955025811fa393274928dda8dbe808cd Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 15 Jul 2010 09:39:54 -0300
Subject: Checked gettext() implementation on firewall_shaper.php

---
 usr/local/www/firewall_shaper.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php
index d20d022..7382c7e 100755
--- a/usr/local/www/firewall_shaper.php
+++ b/usr/local/www/firewall_shaper.php
@@ -267,7 +267,7 @@ if ($_GET) {
 			read_altq_config();
 			$output_form .= $tmp->build_form();			
 		} else
-			$input_errors[] = "Could not add new queue.";
+			$input_errors[] = gettext("Could not add new queue.");
 	} else if ($_POST['apply']) {
 			write_config();
 
@@ -342,7 +342,7 @@ $tree .= "</ul>";
 if (!$dontshow || $newqueue) {
 
 $output_form .= "<tr><td width=\"22%\" valign=\"top\" class=\"vncellreq\">";
-$output_form .= "Queue Actions";
+$output_form .= gettext("Queue Actions");
 $output_form .= "</td><td valign=\"top\" class=\"vncellreq\" width=\"78%\">";
 
 $output_form .= "<input type=\"submit\" name=\"Submit\" value=\"" . gettext("Save") . "\" class=\"formbtn\" />";
@@ -353,7 +353,7 @@ if ($can_add || $addnewaltq) {
 		$output_form .= "&queue=" . $queue->GetQname();
 	}
 	$output_form .= "&action=add\">";
-	$output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"Add new queue\">";
+	$output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"" . gettext("Add new queue") . "\">";
 	$output_form .= "</a>";
 	$output_form .= "<a href=\"firewall_shaper.php?interface=";
 	$output_form .= $interface . "&queue=";
-- 
cgit v1.1


From 635e3d3fd02f134f8bf6247ba0795cb6c3104213 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 15 Jul 2010 10:31:40 -0300
Subject: Checked gettext() implementation on firewall_aliases_import.php

---
 usr/local/www/firewall_aliases_import.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/firewall_aliases_import.php b/usr/local/www/firewall_aliases_import.php
index 76246a6..1902fd1 100755
--- a/usr/local/www/firewall_aliases_import.php
+++ b/usr/local/www/firewall_aliases_import.php
@@ -37,7 +37,6 @@
 ##|*MATCH=firewall_aliases_import.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Bulk import"));
 
 $reserved_keywords = array("pass", "out", "queue", "max", "min", "pptp");
 
@@ -46,6 +45,8 @@ require_once("util.inc");
 require("filter.inc");
 require("shaper.inc");
 
+$pgtitle = array(gettext("Firewall"),gettext("Aliases"),gettext("Bulk import"));
+
 $reserved_ifs = get_configured_interface_list(false, true);
 $reserved_keywords = array_merge($reserved_keywords, $reserved_ifs);
 
-- 
cgit v1.1


From 96aa8f6139f37c3b1d8746e1452d6fb7deacb672 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Tue, 3 Aug 2010 12:37:14 -0300
Subject: Reset diag_* files on this branch

---
 usr/local/www/diag_arp.php                 | 32 +++++------
 usr/local/www/diag_authentication.php      | 20 +++----
 usr/local/www/diag_confbak.php             | 45 ++++++++--------
 usr/local/www/diag_defaults.php            | 29 +++++-----
 usr/local/www/diag_dump_states.php         |  4 +-
 usr/local/www/diag_ipsec.php               | 26 ++++-----
 usr/local/www/diag_ipsec_spd.php           | 32 +++++------
 usr/local/www/diag_logs.php                | 28 +++++-----
 usr/local/www/diag_logs_auth.php           | 28 +++++-----
 usr/local/www/diag_logs_dhcp.php           | 28 +++++-----
 usr/local/www/diag_logs_filter.php         | 56 +++++++++----------
 usr/local/www/diag_logs_filter_dynamic.php | 40 +++++++-------
 usr/local/www/diag_logs_filter_summary.php | 48 ++++++++---------
 usr/local/www/diag_logs_ipsec.php          | 28 +++++-----
 usr/local/www/diag_logs_ntpd.php           | 26 ++++-----
 usr/local/www/diag_logs_openvpn.php        | 26 ++++-----
 usr/local/www/diag_logs_ppp.php            | 28 +++++-----
 usr/local/www/diag_logs_relayd.php         | 26 ++++-----
 usr/local/www/diag_logs_settings.php       | 86 +++++++++++++++---------------
 usr/local/www/diag_nanobsd.php             | 34 ++++++------
 usr/local/www/diag_overload_tables.php     | 10 ++--
 usr/local/www/diag_packet_capture.php      | 67 +++++++++++------------
 usr/local/www/diag_patterns.php            | 16 +++---
 usr/local/www/diag_resetstate.php          | 34 ++++++------
 usr/local/www/diag_routes.php              | 11 ++--
 usr/local/www/diag_system_activity.php     |  4 +-
 usr/local/www/diag_system_pftop.php        | 28 +++++-----
 27 files changed, 420 insertions(+), 420 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php
index 4a6e92c..3aff783 100755
--- a/usr/local/www/diag_arp.php
+++ b/usr/local/www/diag_arp.php
@@ -205,15 +205,15 @@ if(count($pools) > 0) {
 // Put this in an easy to use form
 $dhcpmac = array();
 $dhcpip = array();
-	
+
 foreach ($leases as $value) {
-	$dhcpmac[$value['mac']] = $value['hostname'];	
-	$dhcpip[$value['ip']] = $value['hostname'];	
+	$dhcpmac[$value['mac']] = $value['hostname'];
+	$dhcpip[$value['ip']] = $value['hostname'];
 }
 
 exec("/usr/sbin/arp -an",$rawdata);
 
-$i = 0; 
+$i = 0;
 
 /* if list */
 $ifdescrs = get_configured_interface_with_descr();
@@ -225,7 +225,7 @@ foreach ($ifdescrs as $key =>$interface) {
 $data = array();
 foreach ($rawdata as $line) {
 	$elements = explode(' ',$line);
-	
+
 	if ($elements[3] != "(incomplete)") {
 		$arpent = array();
 		$arpent['ip'] = trim(str_replace(array('(',')'),'',$elements[1]));
@@ -238,28 +238,28 @@ foreach ($rawdata as $line) {
 function getHostName($mac,$ip)
 {
 	global $dhcpmac, $dhcpip;
-	
+
 	if ($dhcpmac[$mac])
 		return $dhcpmac[$mac];
 	else if ($dhcpip[$ip])
 		return $dhcpip[$ip];
 	else if(gethostbyaddr($ip) <> "" and gethostbyaddr($ip) <> $ip)
 		return gethostbyaddr($ip);
-	else 
-		return "";	
+	else
+		return "";
 }
 
-$pgtitle = array("Diagnostics","ARP Table");
+$pgtitle = array(gettext("Diagnostics"),gettext("ARP Table"));
 include("head.inc");
 
 ?>
 
 <body link="#000000" vlink="#000000" alink="#000000">
-	
+
 <?php include("fbegin.inc"); ?>
 
 <div id="loading">
-	<img src="/themes/{$g['theme']}/images/misc/loader.gif"> Loading, please wait...
+	<img src="/themes/{$g['theme']}/images/misc/loader.gif"><?= gettext("Loading, please wait..."); ?>
 	<p/>&nbsp;
 </div>
 
@@ -276,7 +276,7 @@ foreach ($data as &$entry) {
 	$dns = trim(getHostName($entry['mac'], $entry['ip']));
 	if(trim($dns))
 		$entry['dnsresolve'] = "$dns";
-	else 
+	else
 		$entry['dnsresolve'] = "Z_ ";
 }
 
@@ -289,10 +289,10 @@ $data = msort($data, "dnsresolve");
 		<td>
 			<table class="tabcont sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
 				<tr>
-					<td class="listhdrr">IP address</td>
-					<td class="listhdrr">MAC address</td>
-					<td class="listhdrr">Hostname</td>
-					<td class="listhdr">Interface</td>
+					<td class="listhdrr"><?= gettext("IP address"); ?></td>
+					<td class="listhdrr"><?= gettext("MAC address"); ?></td>
+					<td class="listhdrr"><?= gettext("Hostname"); ?></td>
+					<td class="listhdr"><?= gettext("Interface"); ?></td>
 					<td class="list"></td>
 				</tr>
 				<?php foreach ($data as $entry): ?>
diff --git a/usr/local/www/diag_authentication.php b/usr/local/www/diag_authentication.php
index f6ed771..91874d4 100755
--- a/usr/local/www/diag_authentication.php
+++ b/usr/local/www/diag_authentication.php
@@ -49,30 +49,30 @@ if ($_POST) {
 
 	$authcfg = auth_get_authserver($_POST['authmode']);
 	if (!$authcfg)
-		$input_errors[] = "{$_POST['authmode']} is not a valid authentication server ";
+		$input_errors[] = $_POST['authmode'] . " " . gettext("is not a valid authentication server");
 
 	if (empty($_POST['username']) || empty($_POST['password']))
-		$input_errors[] = "A username and password must be specified.";
+		$input_errors[] = gettext("A username and password must be specified.");
 
 	if (!$input_errors) {
 		if (authenticate_user($_POST['username'], $_POST['password'], $authcfg)) {
-			$savemsg = "User: {$_POST['username']} authenticated sucessfully.";
+			$savemsg = gettext("User") . ": " . $_POST['username'] . " " . gettext("authenticated sucessfully.");
 			$groups = getUserGroups($_POST['username'], $authcfg);
-			$savemsg .= "<br />This user is member of this groups: <br />";
+			$savemsg .= "<br />" + gettext("This user is member of this groups") + ": <br />";
 			foreach ($groups as $group)
 				$savemsg .= "{$group} ";
 		} else {
-			$input_errors[] = "Authentication failed.";
+			$input_errors[] = gettext("Authentication failed.");
 		}
 	}
 }
-$pgtitle = array("Diagnostics","Authentication");
+$pgtitle = array(gettext("Diagnostics"),gettext("Authentication"));
 include("head.inc");
 
 ?>
 
 <body link="#000000" vlink="#000000" alink="#000000">
-	
+
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors);?>
 <?php if ($savemsg) print_info_box($savemsg);?>
@@ -87,7 +87,7 @@ include("head.inc");
 	<form id="iform" name="iform" action="diag_authentication.php" method="post">
 	<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
 	<tr>
-		<td width="22%" valign="top" class="vncell">Authentication Server</td>
+		<td width="22%" valign="top" class="vncell"><?=gettext("Authentication Server"); ?></td>
 		<td width="78%" class="vtable">
 			<select name='authmode' id='authmode' class="formselect" >
 			<?php
@@ -103,13 +103,13 @@ include("head.inc");
 		</td>
 	</tr>
 	<tr>
-		<td width="22%" valign="top" class="vncell">Username</td>
+		<td width="22%" valign="top" class="vncell"><?=gettext("Username"); ?></td>
 		<td width="78%" class="vtable">
 			<input class="formfld unknown" size='20' id='username' name='username' value='<?=$pconfig['username'];?>' />
 		</td>
 	</tr>
 	<tr>
-		<td width="22%" valign="top" class="vncell">Password</td>
+		<td width="22%" valign="top" class="vncell"><?=gettext("Password"); ?></td>
 		<td width="78%" class="vtable">
 			<input class="formfld pwd" type='password' size='20' id='password' name='password' value='<?=$pconfig['password'];?>' />
 		</td>
diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php
index 5d0458b..393f771 100755
--- a/usr/local/www/diag_confbak.php
+++ b/usr/local/www/diag_confbak.php
@@ -28,7 +28,7 @@
     POSSIBILITY OF SUCH DAMAGE.
 */
 
-/*	
+/*
 	pfSense_MODULE:	config
 */
 
@@ -45,9 +45,10 @@ if($_GET['newver'] != "") {
 	conf_mount_rw();
 	$confvers = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache'));
 	if(config_restore($g['conf_path'] . '/backup/config-' . $_GET['newver'] . '.xml') == 0)
-		$savemsg = "Successfully reverted to timestamp " . date("n/j/y H:i:s", $_GET['newver']) . " with description \"" . $confvers[$_GET['newver']]['description'] . "\".";
+
+	$savemsg = sprintf(gettext("Successfully reverted to timestamp %s with description \"%s\"."), date(gettext("n/j/y H:i:s"), $_GET['newver']), $confvers[$_GET['newver']]['description']);
 	else
-		$savemsg = "Unable to revert to the selected configuration.";
+		$savemsg = gettext("Unable to revert to the selected configuration.");
 	conf_mount_ro();
 }
 
@@ -55,7 +56,7 @@ if($_GET['rmver'] != "") {
 	conf_mount_rw();
 	$confvers = unserialize(file_get_contents($g['cf_conf_path'] . '/backup/backup.cache'));
 	unlink_if_exists($g['conf_path'] . '/backup/config-' . $_GET['rmver'] . '.xml');
-	$savemsg = "Deleted backup with timestamp " . date("n/j/y H:i:s", $_GET['rmver']) . " and description \"" . $confvers[$_GET['rmver']]['description'] . "\".";
+	$savemsg = sprintf(gettext("Deleted backup with timestamp %s and description \"%s\"."), date(gettext("n/j/y H:i:s"), $_GET['rmver']),$confvers[$_GET['rmver']]['description']);
 	conf_mount_ro();
 }
 
@@ -94,7 +95,7 @@ cleanup_backupcache();
 $confvers = get_backups();
 unset($confvers['versions']);
 
-$pgtitle = array("Diagnostics","Configuration History");
+$pgtitle = array(gettext("Diagnostics"),gettext("Configuration History"));
 include("head.inc");
 
 ?>
@@ -107,7 +108,7 @@ include("head.inc");
 	?>
 	<? if ($diff) { ?>
 	<table align="center" valign="middle" width="100%" border="0" cellspacing="0" style="padding-top: 4px; padding-bottom: 4px;">
-		<tr><td>Configuration diff from <?php echo date("n/j/y H:i:s", $oldtime); ?> to <?php echo date("n/j/y H:i:s", $newtime); ?></td></tr>
+		<tr><td><?=gettext("Configuration diff from");?> <?php echo date(gettext("n/j/y H:i:s"), $oldtime); ?> <?=gettext("to");?> <?php echo date(gettext("n/j/y H:i:s"), $newtime); ?></td></tr>
 		<?php foreach ($diff as $line) {
 			switch (substr($line, 0, 1)) {
 				case "+":
@@ -135,10 +136,10 @@ include("head.inc");
 			<td>
 			<?php
 				$tab_array = array();
-				$tab_array[0] = array("Config History", true, "diag_confbak.php");
-				$tab_array[1] = array("Backup/Restore", false, "diag_backup.php");
+				$tab_array[0] = array(gettext("Config History"), true, "diag_confbak.php");
+				$tab_array[1] = array(gettext("Backup/Restore"), false, "diag_backup.php");
 				display_top_tabs($tab_array);
-			?>			
+			?>
 			</td>
 		</tr>
 		<tr>
@@ -149,25 +150,25 @@ include("head.inc");
 						<?php if (is_array($confvers)): ?>
 						<tr>
 							<td colspan="2" valign="middle" align="center" class="list" nowrap><input type="submit" name="diff" value="Diff"></td>
-							<td width="30%" class="listhdrr">Date</td>
-							<td width="70%" class="listhdrr">Configuration Change</td>
+							<td width="30%" class="listhdrr"><?=gettext("Date");?></td>
+							<td width="70%" class="listhdrr"><?=gettext("Configuration Change");?></td>
 						</tr>
 						<tr valign="top">
 							<td valign="middle" class="list" nowrap></td>
 							<td class="list">
 								<input type="radio" name="newtime" value="current">
 							</td>
-							<td class="listlr"> <?= date("n/j/y H:i:s", $config['revision']['time']) ?></td>
+							<td class="listlr"> <?= date(gettext("n/j/y H:i:s"), $config['revision']['time']) ?></td>
 							<td class="listr"> <?= $config['revision']['description'] ?></td>
-							<td colspan="3" valign="middle" class="list" nowrap><b>Current</b></td>
+							<td colspan="3" valign="middle" class="list" nowrap><b><?=gettext("Current");?></b></td>
 						</tr>
 						<?php
 							$c = 0;
 							foreach($confvers as $version):
 								if($version['time'] != 0)
-									$date = date("n/j/y H:i:s", $version['time']);
+									$date = date(gettext("n/j/y H:i:s"), $version['time']);
 								else
-									$date = "Unknown";
+									$date = gettext("Unknown");
 								$desc = $version['description'];
 						?>
 						<tr valign="top">
@@ -179,24 +180,24 @@ include("head.inc");
 								<input type="radio" name="newtime" value="<?php echo $version['time'];?>">
 								<? } else { ?>
 								&nbsp;
-								<? } 
+								<? }
 								$c++; ?>
 							</td>
 							<td class="listlr"> <?= $date ?></td>
 							<td class="listr"> <?= $desc ?></td>
 							<td valign="middle" class="list" nowrap>
-								<a href="diag_confbak.php?newver=<?=$version['time'];?>" onclick="return confirm('Revert to this configuration?')">
-									<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="Revert to this configuration" title="Revert to this configuration">
+							<a href="diag_confbak.php?newver=<?=$version['time'];?>" onclick="return confirm('<?=gettext("Revert to this configuration?");?>'")>
+							<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" alt="<?=gettext("Revert to this configuration");?>" title="<?=gettext("Revert to this configuration");?>">
 								</a>
 							</td>
 							<td valign="middle" class="list" nowrap>
-								<a href="diag_confbak.php?rmver=<?=$version['time'];?>" onclick="return confirm('Delete this configuration backup?')">
-									<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="Remove this backup" title="Remove this backup">
+							<a href="diag_confbak.php?rmver=<?=$version['time'];?>" onclick="return confirm('<?=gettext("Delete this configuration backup?");?>')">
+							<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0" alt="<?=gettext("Remove this backup");?>" title="<?=gettext("Remove this backup");?>">
 								</a>
 							</td>
 							<td valign="middle" class="list" nowrap>
 								<a href="diag_confbak.php?getcfg=<?=$version['time'];?>">
-									<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_down.gif" width="17" height="17" border="0" alt="Download this backup" title="Download this backup">
+								<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_down.gif" width="17" height="17" border="0" alt="<?=gettext("Download this backup");?>" title="<?=gettext("Download this backup");?>">
 								</a>
 							</td>
 						</tr>
@@ -208,7 +209,7 @@ include("head.inc");
 						<?php else: ?>
 						<tr>
 							<td>
-								<?php print_info_box("No backups found."); ?>
+								<?php print_info_box(gettext("No backups found.")); ?>
 							</td>
 						</tr>
 						<?php endif; ?>
diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php
index c462abd..cde9d54 100755
--- a/usr/local/www/diag_defaults.php
+++ b/usr/local/www/diag_defaults.php
@@ -48,14 +48,14 @@ if ($_POST) {
 	if ($_POST['Submit'] != " No ") {
 		reset_factory_defaults();
 		system_reboot();
-		$rebootmsg = "The system has been reset to factory defaults and is now rebooting. This may take one minute.";
+		$rebootmsg = gettext("The system has been reset to factory defaults and is now rebooting. This may take one minute.");
 	} else {
 		header("Location: index.php");
 		exit;
 	}
 }
 
-$pgtitle = array("Diagnostics","Factory defaults");
+$pgtitle = array(gettext("Diagnostics"),gettext("Factory defaults"));
 include("head.inc");
 
 ?>
@@ -64,21 +64,22 @@ include("head.inc");
 <?php include("fbegin.inc"); ?>
 <?php if ($rebootmsg): echo print_info_box($rebootmsg); else: ?>
 <form action="diag_defaults.php" method="post">
-              <p><strong>If you click &quot;Yes&quot;, the firewall will: 
-	      
+              <p><strong> <?=gettext("If you click") . " &quot;" . gettext("Yes") . "&quot;, " . gettext("the firewall will")?>:
+
 		<ul>
-		  <li>Reset to factory defaults</li>
-		  <li>LAN IP address will be reset to 192.168.1.1</li>
-		  <li>System will be configured as a DHCP server on the default LAN interface</li>
-		  <li>Reboot after changes are installed</li>
-		  <li>WAN interface will be set to obtain an address automatically from a DHCP server</li>
-		  <li>webConfigurator admin username will be reset to 'admin'</li>
-		  <li>webConfigurator admin password will be reset to '<?=$g['product_name']?>'</li>
+		  <li><?=gettext("Reset to factory defaults");?></li>
+		  <li><?=gettext("LAN IP address will be reset to 192.168.1.1");?></li>
+		  <li><?=gettext("System will be configured as a DHCP server on the default LAN interface");?></li>
+		  <li><?=gettext("Reboot after changes are installed");?></li>
+		  <li><?=gettext("WAN interface will be set to obtain an address automatically from a DHCP server");?></li>
+		  <li><?=gettext("webConfigurator admin username will be reset to 'admin'");?></li>
+		  <li><?=gettext("webConfigurator admin password will be reset to");?> '<?=$g['product_name']?>'</li>
+
 		</ul>
-                Are you sure you want to proceed?</strong></p>
+                <?=gettext("Are you sure you want to proceed?");?></strong></p>
         <p>
-          <input name="Submit" type="submit" class="formbtn" value=" Yes ">
-          <input name="Submit" type="submit" class="formbtn" value=" No ">
+          <input name="Submit" type="submit" class="formbtn" value=" <?=gettext("Yes");?> ">
+          <input name="Submit" type="submit" class="formbtn" value=" <?=gettext("No");?> ">
         </p>
       </form>
 <?php endif; ?>
diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php
index 50cdb32..a98b943 100755
--- a/usr/local/www/diag_dump_states.php
+++ b/usr/local/www/diag_dump_states.php
@@ -50,7 +50,7 @@ if($_GET['action']) {
 			$retval = mwexec("/sbin/pfctl -k '{$srcip}' -k '{$dstip}'");
 			echo htmlentities("|{$srcip}|{$dstip}|{$retval}|");
 		} else {
-			echo "invalid input";
+			echo gettext("invalid input");
 		}
 		exit;
 	}
@@ -132,7 +132,7 @@ include("head.inc");
 			<form action="<?=$_SERVER['SCRIPT_NAME'];?>" method="get">
 			<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<td>Current state count: <?=$current_statecount?></td>
+					<td><?=gettext("Current state count");?>: <?=$current_statecount?></td>
 					<td style="font-weight:bold;" align="right">
 						<?=gettext("Filter expression");?>:
 						<input type="text" name="filter" class="formfld search" value="<?=$_GET['filter'];?>" size="30" />
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php
index a77d261..99b9864 100644
--- a/usr/local/www/diag_ipsec.php
+++ b/usr/local/www/diag_ipsec.php
@@ -45,7 +45,7 @@
 
 global $g;
 
-$pgtitle = array("Status","IPsec");
+$pgtitle = array(gettext("Status"),gettext("IPsec"));
 
 require("guiconfig.inc");
 include("head.inc");
@@ -69,10 +69,10 @@ $sad = ipsec_dump_sad();
 		<td>
 			<?php
 				$tab_array = array();
-				$tab_array[0] = array("Overview", true, "diag_ipsec.php");
-				$tab_array[1] = array("SAD", false, "diag_ipsec_sad.php");
-				$tab_array[2] = array("SPD", false, "diag_ipsec_spd.php");
-				$tab_array[3] = array("Logs", false, "diag_logs_ipsec.php");
+				$tab_array[0] = array(gettext("Overview"), true, "diag_ipsec.php");
+				$tab_array[1] = array(gettext("SAD"), false, "diag_ipsec_sad.php");
+				$tab_array[2] = array(gettext("SPD"), false, "diag_ipsec_spd.php");
+				$tab_array[3] = array(gettext("Logs"), false, "diag_logs_ipsec.php");
 				display_top_tabs($tab_array);
 			?>
 		</td>
@@ -82,12 +82,12 @@ $sad = ipsec_dump_sad();
 			<div id="mainarea">
 				<table width="100%" border="0" cellpadding="6" cellspacing="0" class="tabcont sortable">
 					<tr>
-						<td nowrap class="listhdrr">Local IP</td>
-						<td nowrap class="listhdrr">Remote IP</a></td>
-						<td nowrap class="listhdrr">Local Network</td>
-						<td nowrap class="listhdrr">Remote Network</a></td>
-						<td nowrap class="listhdrr">Description</a></td>
-						<td nowrap class="listhdrr">Status</td>
+						<td nowrap class="listhdrr"><?=gettext("Local IP");?></td>
+						<td nowrap class="listhdrr"><?=gettext("Remote IP");?></a></td>
+						<td nowrap class="listhdrr"><?=gettext("Local Network");?></td>
+						<td nowrap class="listhdrr"><?=gettext("Remote Network");?></a></td>
+						<td nowrap class="listhdrr"><?=gettext("Description");?></a></td>
+						<td nowrap class="listhdrr"><?=gettext("Status");?></td>
 					</tr>
 					<?php
 						foreach ($a_phase2 as $ph2ent) {
@@ -132,9 +132,9 @@ $sad = ipsec_dump_sad();
 
 <span class="vexpl">
 	<span class="red">
-		<strong>Note:<br /></strong>
+		<strong><?=gettext("Note");?>:<br /></strong>
 	</span>
-	You can configure your IPsec 
+	<?=gettext("You can configure your IPsec");?> 
 	<a href="vpn_ipsec.php">here</a>.
 </span>
 
diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php
index 3d44b62..8621e59 100755
--- a/usr/local/www/diag_ipsec_spd.php
+++ b/usr/local/www/diag_ipsec_spd.php
@@ -46,7 +46,7 @@
 require("guiconfig.inc");
 require("ipsec.inc");
 
-$pgtitle = array("Status","IPsec","SPD");
+$pgtitle = array(gettext("Status"),gettext("IPsec"),gettext("SPD"));
 include("head.inc");
 
 /* delete any SP? */
@@ -69,10 +69,10 @@ $spd = ipsec_dump_spd();
 			<td>
 				<?php
 					$tab_array = array();
-					$tab_array[0] = array("Overview", false, "diag_ipsec.php");
-					$tab_array[1] = array("SAD", false, "diag_ipsec_sad.php");
-					$tab_array[2] = array("SPD", true, "diag_ipsec_spd.php");
-					$tab_array[3] = array("Logs", false, "diag_logs_ipsec.php");
+					$tab_array[0] = array(gettext("Overview"), false, "diag_ipsec.php");
+					$tab_array[1] = array(gettext("SAD"), false, "diag_ipsec_sad.php");
+					$tab_array[2] = array(gettext("SPD"), true, "diag_ipsec_spd.php");
+					$tab_array[3] = array(gettext("Logs"), false, "diag_logs_ipsec.php");
 					display_top_tabs($tab_array);
 				?>
 			</td>
@@ -83,11 +83,11 @@ $spd = ipsec_dump_spd();
 					<table class="tabcont sortable" width="100%" border="0" cellpadding="6" cellspacing="0">
 						<?php if (count($spd)): ?>
 						<tr>
-							<td nowrap class="listhdrr">Source</td>
-							<td nowrap class="listhdrr">Destination</td>
-							<td nowrap class="listhdrr">Direction</td>
-							<td nowrap class="listhdrr">Protocol</td>
-							<td nowrap class="listhdrr">Tunnel endpoints</td>
+							<td nowrap class="listhdrr"><?= gettext("Source"); ?></td>
+							<td nowrap class="listhdrr"><?= gettext("Destination"); ?></td>
+							<td nowrap class="listhdrr"><?= gettext("Direction"); ?></td>
+							<td nowrap class="listhdrr"><?= gettext("Protocol"); ?></td>
+							<td nowrap class="listhdrr"><?= gettext("Tunnel endpoints"); ?></td>
 							<td nowrap class="list"></td>
 						</tr>
 						<?php foreach ($spd as $sp): ?>
@@ -105,7 +105,7 @@ $spd = ipsec_dump_spd();
 									$args .= "&dstid=".rawurlencode($sp['dstid']);
 									$args .= "&dir=".rawurlencode($sp['dir']);
 								?>
-								<a href="diag_ipsec_spd.php?act=del&<?=$args;?>" onclick="return confirm('Do you really want to delete this security policy?')">
+								<a href="diag_ipsec_spd.php?act=del&<?=$args;?>" onclick="return confirm('<?= gettext("Do you really want to delete this security policy?"); ?>')">
 									<img src="/themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0">
 								</a>
 							</td>
@@ -116,19 +116,19 @@ $spd = ipsec_dump_spd();
 					<table class="tabcont" border="0" cellspacing="0" cellpadding="6">
 						<tr>
 							<td width="16"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_in.gif" width="11" height="11"></td>
-							<td>incoming (as seen by firewall)</td>
+							<td><?= gettext("incoming (as seen by firewall)"); ?></td>
 						</tr>
 						<tr>
 							<td colspan="5" height="4"></td>
 						</tr>
 						<tr>
 							<td><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_out.gif" width="11" height="11"></td>
-							<td>outgoing (as seen by firewall)</td>
+							<td><?= gettext("outgoing (as seen by firewall)"); ?></td>
 						</tr>
 						<?php else: ?>
 						<tr>
 							<td>
-								<p><strong>No IPsec security policies.</strong></p>
+								<p><strong><?= gettext("No IPsec security policies."); ?></strong></p>
 							</td>
 						</tr>
 						<?php endif; ?>
@@ -140,8 +140,8 @@ $spd = ipsec_dump_spd();
 
 <p>
 <span class="vexpl">
-<span class="red"><strong>Note:<br></strong></span>
-You can configure your IPsec <a href="vpn_ipsec.php">here</a>.
+<span class="red"><strong><?= gettext("Note"); ?>:<br></strong></span>
+<?= gettext("You can configure your IPsec"); ?> <a href="vpn_ipsec.php"><?= gettext("here"); ?></a>.
 </span>
 
 <?php include("fend.inc"); ?>
diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php
index 85b61df..145d480 100755
--- a/usr/local/www/diag_logs.php
+++ b/usr/local/www/diag_logs.php
@@ -62,7 +62,7 @@ if ($_POST['filtertext'])
 if ($filtertext)
 	$filtertextmeta="?filtertext=$filtertext";
 
-$pgtitle = array("Status","System logs","System");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("System"));
 include("head.inc");
 
 ?>
@@ -74,17 +74,17 @@ include("head.inc");
 		<td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", true, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), true, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
 		</td>
@@ -94,7 +94,7 @@ include("head.inc");
 			<div id="mainarea">
 			<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<td colspan="2" class="listtopic">Last <?=$nentries;?> system log entries</td>
+					<td colspan="2" class="listtopic"><?php printf(gettext("Last %s system log entries"),$nentries); ?></td>
 				</tr>
 				<?php
 					if($filtertext)
@@ -110,7 +110,7 @@ include("head.inc");
 					</td>
 					<td align="right" valign="top" >
 						<form id="clearform" name="clearform" action="diag_logs.php" method="post" style="margin-top: 14px;">
-              				<input id="filtertext" name="filtertext" value="<?=gettext($filtertext);?>" />
+              				<input id="filtertext" name="filtertext" value="<?=$filtertext;?>" />
               				<input id="filtersubmit" name="filtersubmit" type="submit" class="formbtn" value="<?=gettext("Filter");?>" />
 						</form>
 					</td>
diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php
index 700b6dc..a6e9730 100755
--- a/usr/local/www/diag_logs_auth.php
+++ b/usr/local/www/diag_logs_auth.php
@@ -51,7 +51,7 @@ if (!$nentries)
 if ($_POST['clear']) 
 	clear_log_file($portal_logfile);
 
-$pgtitle = array("Status","System logs","Portal Auth");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Portal Auth"));
 include("head.inc");
 
 ?>
@@ -62,17 +62,17 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", true, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), true, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -82,11 +82,11 @@ include("head.inc");
 		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 		  <tr>
 			<td colspan="2" class="listtopic">
-			  Last <?=$nentries;?> Portal Auth log entries</td>
+			  <?php printf(gettext("Last %s Portal Auth log entries"),$nentries);?></td>
 		  </tr>
 		  <?php dump_clog($portal_logfile, $nentries, true); ?>
 		<tr><td><br><form action="diag_logs_auth.php" method="post">
-			<input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr>
+			<input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log"); ?>"></td></tr>
 		</table>
 	</div>
 	</form>
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
index b95b969..ffc51c4 100755
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -53,7 +53,7 @@ if (!$nentries)
 if ($_POST['clear']) 
 	clear_log_file($dhcpd_logfile);
 
-$pgtitle = array("Status","System logs","DHCP");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("DHCP"));
 include("head.inc");
 
 ?>
@@ -64,17 +64,17 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", true, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), true, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -84,11 +84,11 @@ include("head.inc");
 		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 		  <tr>
 			<td colspan="2" class="listtopic">
-			  Last <?=$nentries;?> DHCP service log entries</td>
+			  <?php printf(gettext("Last %s DHCP service log entries"), $nentries);?></td>
 		  </tr>
 		  <?php dump_clog($dhcpd_logfile, $nentries); ?>
 		<tr><td><br><form action="diag_logs_dhcp.php" method="post">
-			<input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr>
+			<input name="clear" type="submit" class="formbtn" value="<?= gettext("Clear log");?>"></td></tr>
 		</table>
 	</div>
 </form>
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index 9d8d9cd..02b2591 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -53,7 +53,7 @@ if($_GET['getrulenum'] or $_POST['getrulenum']) {
 		$rulenum = $_POST['getrulenum'];
 	list($rulenum, $type) = explode(',', $rulenum);
 	$rule = find_rule_by_number($rulenum, $type);
-	echo "The rule that triggered this action is:\n\n{$rule}";
+	echo gettext("The rule that triggered this action is") . ":\n\n{$rule}";
 	exit;
 }
 
@@ -87,7 +87,7 @@ if (!$nentries)
 if ($_POST['clear'])
 	clear_log_file($filter_logfile);
 
-$pgtitle = array("Status","System logs","Firewall");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Firewall"));
 include("head.inc");
 
 ?>
@@ -98,17 +98,17 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", true, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), true, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
  </td></tr>
@@ -117,7 +117,7 @@ include("head.inc");
 	<div id="mainarea">
 		<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
 		<tr><td colspan="6" align="left">
-			Normal View | <a href="diag_logs_filter_dynamic.php">Dynamic View</a> | <a href="diag_logs_filter_summary.php">Summary View</a><br/><br/>
+			<?=gettext("Normal View");?> | <a href="diag_logs_filter_dynamic.php"><?=gettext("Dynamic View");?></a> | <a href="diag_logs_filter_summary.php"><?=gettext("Summary View");?></a><br/><br/>
 		</td></tr>
 <?php if (!isset($config['syslog']['rawfilter'])):
 	$filterlog = conv_log_filter($filter_logfile, $nentries, $nentries + 100, $filtertext);
@@ -125,19 +125,19 @@ include("head.inc");
 		<tr>
 		  <td colspan="6" class="listtopic">
 				<?php if (!$filtertext) { ?>
-			    Last <?php echo count($filterlog);?> firewall log entries.
+				<?php printf(gettext("Last %s firewall log entries."),count($filterlog));?>
 				<?php } else { ?>
-				<?php echo count($filterlog);?> matched log entries.
+				<?php echo count($filterlog). ' ' . gettext("matched log entries."); ?>
 				<?php } ?>
-			    (Max <?php echo $nentries;?>)
+			    	<?php printf(gettext("Max(%s)"),$nentries);?>
 			</tr>
 			<tr>
-			  <td width="10%" class="listhdrr">Act</td>
-			  <td width="10%" class="listhdrr">Time</td>
-			  <td width="15%" class="listhdrr">If</td>
-			  <td width="25%" class="listhdrr">Source</td>
-			  <td width="25%" class="listhdrr">Destination</td>
-			  <td width="15%" class="listhdrr">Proto</td>
+			  <td width="10%" class="listhdrr"><?=gettext("Act");?></td>
+			  <td width="10%" class="listhdrr"><?=gettext("Time");?></td>
+			  <td width="15%" class="listhdrr"><?=gettext("If");?></td>
+			  <td width="25%" class="listhdrr"><?=gettext("Source");?></td>
+			  <td width="25%" class="listhdrr"><?=gettext("Destination");?></td>
+			  <td width="15%" class="listhdrr"><?=gettext("Proto");?></td>
 			</tr><?php foreach ($filterlog as $filterent): ?>
 			<tr>
 			  <td class="listlr" nowrap align="middle">
@@ -155,13 +155,13 @@ include("head.inc");
 			  $dststr = $filterent['dstip'] . get_port_with_service($filterent['dstport'], $proto);
 			  ?>
 			  <td class="listr" nowrap>
-				<a href="diag_dns.php?host=<?php echo $filterent['srcip']; ?>" title="Reverse Resolve with DNS"><img border="0" src="/themes/nervecenter/images/icons/icon_log.gif"></a>
-				<a href="easyrule.php?<?php echo "action=block&int={$int}&src={$filterent['srcip']}"; ?>" title="Easy Rule: Add to Block List" onclick="return confirm('Do you really want to add this BLOCK rule?\n\nEasy Rule is still experimental.\nContinue at risk of your own peril.\nBackups are also nice.')"><img border="0" src="/themes/nervecenter/images/icons/icon_block_add.gif"></a>
+				<a href="diag_dns.php?host=<?php echo $filterent['srcip']; ?>" title="<?=gettext("Reverse Resolve with DNS");?>"><img border="0" src="/themes/nervecenter/images/icons/icon_log.gif"></a>
+				<a href="easyrule.php?<?php echo "action=block&int={$int}&src={$filterent['srcip']}"; ?>" title="<?=gettext("Easy Rule: Add to Block List");?>" onclick="return confirm('<?=gettext("Do you really want to add this BLOCK rule?")."\n\n".gettext("Easy Rule is still experimental.")."\n".gettext("Continue at risk of your own peril.")."\n".gettext("Backups are also nice.")?>')"><img border="0" src="/themes/nervecenter/images/icons/icon_block_add.gif"></a>
 				<?php echo $srcstr;?>
 			  </td>
 			  <td class="listr" nowrap>
-				<a href="diag_dns.php?host=<?php echo $filterent['dstip']; ?>" title="Reverse Resolve with DNS"><img border="0" src="/themes/nervecenter/images/icons/icon_log.gif"></a>
-				<a href="easyrule.php?<?php echo "action=pass&int={$int}&proto={$proto}&src={$filterent['srcip']}&dst={$filterent['dstip']}&dstport={$filterent['dstport']}"; ?>" title="Easy Rule: Pass this traffic" onclick="return confirm('Do you really want to add this PASS rule?\n\nEasy Rule is still experimental.\nContinue at risk of your own peril.\nBackups are also nice.')"><img border="0" src="/themes/nervecenter/images/icons/icon_pass_add.gif"></a>
+				<a href="diag_dns.php?host=<?php echo $filterent['dstip']; ?>" title="<?=gettext("Reverse Resolve with DNS");?>"><img border="0" src="/themes/nervecenter/images/icons/icon_log.gif"></a>
+				<a href="easyrule.php?<?php echo "action=pass&int={$int}&proto={$proto}&src={$filterent['srcip']}&dst={$filterent['dstip']}&dstport={$filterent['dstport']}"; ?>" title="<?=gettext("Easy Rule: Pass this traffic");?>" onclick="return confirm('<?=gettext("Do you really want to add this PASS rule?")."\n\n".gettext("Easy Rule is still experimental.")."\n".gettext("Continue at risk of your own peril.")."\n".gettext("Backups are also nice.");?>')"><img border="0" src="/themes/nervecenter/images/icons/icon_pass_add.gif"></a>
 				<?php echo $dststr;?>
 			  </td>
 			  <?php
@@ -173,7 +173,7 @@ include("head.inc");
 <?php else: ?>
 		  <tr>
 			<td colspan="2" class="listtopic">
-			  Last <?php echo $nentries;?> firewall log entries</td>
+			  <?php printf(gettext("Last %s firewall log entries"),$nentries);?></td>
 		  </tr>
 		  <?php
 			if($filtertext)
diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php
index a07b52b..52a2076 100755
--- a/usr/local/www/diag_logs_filter_dynamic.php
+++ b/usr/local/www/diag_logs_filter_dynamic.php
@@ -58,7 +58,7 @@ if ($_POST['clear'])
 
 $filterlog = conv_log_filter($filter_logfile, $nentries, $nentries + 100);
 
-$pgtitle = array("Diagnostics","System logs","Firewall");
+$pgtitle = array(gettext("Diagnostics"),gettext("System logs"),gettext("Firewall"));
 include("head.inc");
 
 ?>
@@ -97,17 +97,17 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", true, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), true, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
  </td></tr>
@@ -115,19 +115,19 @@ include("head.inc");
      <td>
 	<div id="mainarea">
 		<div class="tabcont">
-			<a href="diag_logs_filter.php">Normal View</a> | Dynamic View | <a href="diag_logs_filter_summary.php">Summary View</a>
+			<a href="diag_logs_filter.php"><?=gettext("Normal View");?></a> | <?=gettext("Dynamic View");?> | <a href="diag_logs_filter_summary.php"><?=gettext("Summary View");?></a>
 		</div>
 		<div class="listtopic">
-			Last <?php echo $nentries; ?> records;   Pause:<input valign="middle" type="checkbox" onClick="javascript:toggle_pause();">
+			<?php printf(gettext("Last %s records"),$nentries);?>;   <?=gettext("Pause");?>:<input valign="middle" type="checkbox" onClick="javascript:toggle_pause();">
 		</div>
 		<div id="log">
 			<div class="log-header">
-                                <span class="log-action">Act</span>
-                                <span class="log-time">Time</span>
-                                <span class="log-interface">If</span>
-                                <span class="log-source">Source</span>
-                                <span class="log-destination">Destination</span>
-                                <span class="log-protocol">Proto</span>
+                                <span class="log-action"><?=gettext("Act");?></span>
+                                <span class="log-time"><?=gettext("Time");?></span>
+                                <span class="log-interface"><?=gettext("If");?></span>
+                                <span class="log-source"><?=gettext("Source");?></span>
+                                <span class="log-destination"><?=gettext("Destination");?></span>
+                                <span class="log-protocol"><?=gettext("Proto");?></span>
 			</div>
 			<?php $counter=0; foreach ($filterlog as $filterent): ?>
 			<div class="log-entry"<?php echo is_first_row($counter, count($filterlog)); ?>>
diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php
index 4904127..1171b89 100644
--- a/usr/local/www/diag_logs_filter_summary.php
+++ b/usr/local/www/diag_logs_filter_summary.php
@@ -31,7 +31,7 @@
 	pfSense_MODULE:	filter
 */
 
-$pgtitle = "Diagnostics: System logs: Firewall Log Summary";
+$pgtitle = gettext("Diagnostics").": ".gettext("System logs").": ".gettext("Firewall Log Summary");
 require_once("guiconfig.inc");
 include_once("filter_log.inc");
 
@@ -42,13 +42,13 @@ $entriesperblock = 5;
 $filterlog = conv_log_filter($filter_logfile, $lines, $lines);
 $gotlines = count($filterlog);
 $fields = array(
-	'act'       => "Actions",
-	'interface' => "Interfaces",
-	'proto'     => "Protocols",
-	'srcip'     => "Source IPs",
-	'dstip'     => "Destination IPs",
-	'srcport'   => "Source Ports",
-	'dstport'   => "Destination Ports");
+	'act'       => gettext("Actions"),
+	'interface' => gettext("Interfaces"),
+	'proto'     => gettext("Protocols"),
+	'srcip'     => gettext("Source IPs"),
+	'dstip'     => gettext("Destination IPs"),
+	'srcport'   => gettext("Source Ports"),
+	'dstport'   => gettext("Destination Ports"));
 
 $summary = array();
 foreach (array_keys($fields) as $f) {
@@ -68,7 +68,7 @@ function stat_block($summary, $stat, $num) {
 	global $gotlines, $fields;
 	uasort($summary[$stat] , 'cmp');
 	print '<table width="200px" cellpadding="3" cellspacing="0" border="1">';
-	print "<tr><th colspan='2'>{$fields[$stat]} data</th></tr>";
+	print "<tr><th colspan='2'>{$fields[$stat]} ".gettext("data")."</th></tr>";
 	$k = array_keys($summary[$stat]);
 	$total = 0;
 	$numentries = 0;
@@ -78,7 +78,7 @@ function stat_block($summary, $stat, $num) {
 			$numentries++;
 			$outstr = $k[$i];
 			if (is_ipaddr($outstr)) {
-				$outstr = "<a href=\"diag_dns.php?host={$outstr}\" title=\"Reverse Resolve with DNS\"><img border=\"0\" src=\"/themes/nervecenter/images/icons/icon_log.gif\"></a> {$outstr}";
+				$outstr = "<a href=\"diag_dns.php?host={$outstr}\" title=\"".gettext("Reverse Resolve with DNS")."\"><img border=\"0\" src=\"/themes/nervecenter/images/icons/icon_log.gif\"></a> {$outstr}";
 			} elseif (substr_count($outstr, '/') == 1) {
 				list($proto, $port) = explode('/', $outstr);
 				$service = getservbyport($port, strtolower($proto));
@@ -181,17 +181,17 @@ include("head.inc"); ?>
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", true, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), true, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
  </td></tr>
@@ -200,12 +200,12 @@ include("head.inc"); ?>
 	<div id="mainarea">
 		<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0" align="center">
 		<tr><td colspan="6" align="left">
-			<a href="diag_logs_filter.php">Normal View</a> | <a href="diag_logs_filter_dynamic.php">Dynamic View</a> | Summary View<br/><br/>
+			<a href="diag_logs_filter.php"><?=gettext("Normal View");?></a> | <a href="diag_logs_filter_dynamic.php"><?=gettext("Dynamic View");?></a> | <?=gettext("Summary View");?><br/><br/>
 		</td></tr>
 		<tr><td align="center">
 
-This is a firewall log summary, of the last <?php echo $gotlines; ?> lines of the firewall log (Max <?php echo $lines; ?>).<br />
-NOTE: IE8 users must enable compatibility view.
+<?php printf (gettext("This is a firewall log summary, of the last %s lines of the firewall log (Max %s)."), $gotlines, $lines)?><br />
+<?=gettext("NOTE: IE8 users must enable compatibility view.")?>
 
 <?php
 foreach(array_keys($fields) as $field) {
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
index 039193b..9de5494 100755
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -73,7 +73,7 @@ if ($_POST['clear'])
 
 $ipsec_logarr = return_clog($ipsec_logfile, $nentries);
 
-$pgtitle = array("Status","System logs","IPsec VPN");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("IPsec VPN"));
 include("head.inc");
 
 ?>
@@ -84,17 +84,17 @@ include("head.inc");
 		<td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", true, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), true, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   		</td>
@@ -104,7 +104,7 @@ include("head.inc");
 			<div id="mainarea">
 			<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 		  		<tr>
-					<td colspan="2" class="listtopic">Last <?=$nentries;?> IPsec log entries</td>
+					<td colspan="2" class="listtopic"><?php printf(gettext("Last %s  IPsec log entries"),$nentries);?></td>
 		  		</tr>
 				<?php
 				foreach($ipsec_logarr as $logent){
@@ -116,7 +116,7 @@ include("head.inc");
 						$logent = preg_replace($search, $replace, $logent);
 					} else {
 						$searchs = "/(racoon: )([A-Z:].*?)([0-9].+\.[0-9].+.[0-9].+.[0-9].+\[[0-9].+\])(.*)/i";
-						$replaces = "$1<strong><font color=red>[Unknown Gateway/Dynamic]</font></strong>: $2$3$4";
+						$replaces = "$1<strong><font color=red>[".gettext("Unknown Gateway/Dynamic")."]</font></strong>: $2$3$4";
 						$logent = preg_replace($searchs, $replaces, $logent);
 					}
 					$logent = preg_split("/\s+/", $logent, 6);
diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php
index d168f70..588c0e2 100644
--- a/usr/local/www/diag_logs_ntpd.php
+++ b/usr/local/www/diag_logs_ntpd.php
@@ -51,7 +51,7 @@ if (!$nentries)
 if ($_POST['clear']) 
 	clear_log_file($ntpd_logfile);
 
-$pgtitle = array("Status","System logs","OpenNTPD");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenNTPD"));
 include("head.inc");
 
 ?>
@@ -62,17 +62,17 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", true, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), true, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -82,7 +82,7 @@ include("head.inc");
 		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 		  <tr>
 			<td colspan="2" class="listtopic">
-			  Last <?=$nentries;?> OpenNTPD log entries</td>
+			  <?php printf(gettext("Last %s OpenNTPD log entries"), $nentries);?></td>
 		  </tr>
 		  <?php dump_clog($ntpd_logfile, $nentries); ?>
 		<tr><td><br>
diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php
index aa50856..f052ad9 100644
--- a/usr/local/www/diag_logs_openvpn.php
+++ b/usr/local/www/diag_logs_openvpn.php
@@ -42,7 +42,7 @@
 ##|*MATCH=diag_logs_openvpn.php*
 ##|-PRIV
 
-$pgtitle = array("Status","System logs","OpenVPN");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("OpenVPN"));
 
 require("guiconfig.inc");
 require_once("vpn.inc");
@@ -66,17 +66,17 @@ include("head.inc");
 		<td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", true, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), true, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   		</td>
@@ -86,7 +86,7 @@ include("head.inc");
 			<div id="mainarea">
 			<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 		  		<tr>
-					<td colspan="2" class="listtopic">Last <?=$nentries;?> OpenVPN log entries</td>
+					<td colspan="2" class="listtopic"><?php printf(gettext("Last %s OpenVPN log entries"),$nentries)?></td>
 		  		</tr>
 				<?php dump_clog($openvpn_logfile, $nentries); ?>
 				<tr>
diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php
index 470d33d..52eb40b 100755
--- a/usr/local/www/diag_logs_ppp.php
+++ b/usr/local/www/diag_logs_ppp.php
@@ -56,7 +56,7 @@ if ($_POST['clear'])
 
 $ppp_logarr = return_clog($ppp_logfile, $nentries);
 
-$pgtitle = array("Status","System logs","PPP");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("PPP"));
 include("head.inc");
 
 ?>
@@ -67,17 +67,17 @@ include("head.inc");
 		<td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", true, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), true, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   		</td>
@@ -87,7 +87,7 @@ include("head.inc");
 			<div id="mainarea">
 			<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 		  		<tr>
-					<td colspan="2" class="listtopic">Last <?=$nentries;?> PPP log entries</td>
+					<td colspan="2" class="listtopic"><?php printf (gettext("Last <?=$nentries;?> PPP log entries"),$nentries);?></td>
 		  		</tr>
 				<?php
 				foreach($ppp_logarr as $logent){
@@ -95,7 +95,7 @@ include("head.inc");
 						$logent = preg_replace($search, $replace, $logent);
 					} else {
 						$searchs = "/(racoon: )([A-Z:].*?)([0-9].+\.[0-9].+.[0-9].+.[0-9].+\[[0-9].+\])(.*)/i";
-						$replaces = "$1<strong><font color=red>[Unknown Gateway/Dynamic]</font></strong>: $2$3$4";
+						$replaces = "$1<strong><font color=red>[".gettext("Unknown Gateway/Dynamic")."]</font></strong>: $2$3$4";
 						$logent = preg_replace($searchs, $replaces, $logent);
 					}
 					$logent = preg_split("/\s+/", $logent, 6);
diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php
index 7bf67bf..57df0e1 100755
--- a/usr/local/www/diag_logs_relayd.php
+++ b/usr/local/www/diag_logs_relayd.php
@@ -52,7 +52,7 @@ if (!$nentries)
 if ($_POST['clear']) 
 	clear_log_file($relayd_logfile);
 
-$pgtitle = array("Status","System logs","Load Balancer");
+$pgtitle = array(gettext("Status"),gettext("System logs"),gettext("Load Balancer"));
 include("head.inc");
 
 ?>
@@ -63,17 +63,17 @@ include("head.inc");
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", true, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", false, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), true, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -83,7 +83,7 @@ include("head.inc");
 		<table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 		  <tr>
 			<td colspan="2" class="listtopic">
-			  Last <?=$nentries;?> Load Balancer log entries</td>
+			  <?php printf(gettext("Last %s Load Balancer log entries"),$nentries);?></td>
 		  </tr>
 		  <?php dump_clog($relayd_logfile, $nentries); ?>
 		<tr><td><br><form action="diag_logs_relayd.php" method="post">
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php
index f2b7861..b86da2c 100755
--- a/usr/local/www/diag_logs_settings.php
+++ b/usr/local/www/diag_logs_settings.php
@@ -73,20 +73,20 @@ if ($_POST) {
 
 	/* input validation */
 	if ($_POST['enable'] && !is_ipaddr($_POST['remoteserver'])) {
-		$input_errors[] = "A valid IP address must be specified for remote syslog server #1.";
+		$input_errors[] = gettext("A valid IP address must be specified for remote syslog server #1.");
 	}
 	if ($_POST['enable'] && $_POST['remoteserver2'] && !is_ipaddr($_POST['remoteserver2'])) {
-		$input_errors[] = "A valid IP address must be specified for remote syslog server #2.";
+		$input_errors[] = gettext("A valid IP address must be specified for remote syslog server #2.");
 	}
 	if ($_POST['enable'] && $_POST['remoteserver3'] && !is_ipaddr($_POST['remoteserver3'])) {
-		$input_errors[] = "A valid IP address must be specified for remote syslog server #3.";
+		$input_errors[] = gettext("A valid IP address must be specified for remote syslog server #3.");
 	}
 	if ($_POST['enable'] && !is_ipaddr($_POST['remoteserver'])) {
-		$input_errors[] = "A valid IP address must be specified.";
+		$input_errors[] = gettext("A valid IP address must be specified.");
 	}
 
 	if (($_POST['nentries'] < 5) || ($_POST['nentries'] > 2000)) {
-		$input_errors[] = "Number of log entries to show must be between 5 and 2000.";
+		$input_errors[] = gettext("Number of log entries to show must be between 5 and 2000.");
 	}
 
 	if (!$input_errors) {
@@ -123,7 +123,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array("Status","System logs","Settings");
+$pgtitle = array(gettext("Status"), gettext("System logs"), gettext("Settings"));
 include("head.inc");
 
 ?>
@@ -166,17 +166,17 @@ function enable_change(enable_over) {
   <tr><td>
 <?php
 	$tab_array = array();
-	$tab_array[] = array("System", false, "diag_logs.php");
-	$tab_array[] = array("Firewall", false, "diag_logs_filter.php");
-	$tab_array[] = array("DHCP", false, "diag_logs_dhcp.php");
-	$tab_array[] = array("Portal Auth", false, "diag_logs_auth.php");
-	$tab_array[] = array("IPsec", false, "diag_logs_ipsec.php");
-	$tab_array[] = array("PPP", false, "diag_logs_ppp.php");
-	$tab_array[] = array("VPN", false, "diag_logs_vpn.php");
-	$tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php");
-	$tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php");
-	$tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php");
-	$tab_array[] = array("Settings", true, "diag_logs_settings.php");
+	$tab_array[] = array(gettext("System"), false, "diag_logs.php");
+	$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php");
+	$tab_array[] = array(gettext("DHCP"), false, "diag_logs_dhcp.php");
+	$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs_auth.php");
+	$tab_array[] = array(gettext("IPsec"), false, "diag_logs_ipsec.php");
+	$tab_array[] = array(gettext("PPP"), false, "diag_logs_ppp.php");
+	$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php");
+	$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs_relayd.php");
+	$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs_openvpn.php");
+	$tab_array[] = array(gettext("OpenNTPD"), false, "diag_logs_ntpd.php");
+	$tab_array[] = array(gettext("Settings"), true, "diag_logs_settings.php");
 	display_top_tabs($tab_array);
 ?>
   </td></tr>
@@ -187,46 +187,44 @@ function enable_change(enable_over) {
                       <tr>
                         <td width="22%" valign="top" class="vtable">&nbsp;</td>
                         <td width="78%" class="vtable"> <input name="reverse" type="checkbox" id="reverse" value="yes" <?php if ($pconfig['reverse']) echo "checked"; ?>>
-                          <strong>Show log entries in reverse order (newest entries
-                          on top)</strong></td>
+			<strong><?=gettext("Show log entries in reverse order (newest entries on top)");?></strong></td>
                       </tr>
                       <tr>
                         <td width="22%" valign="top" class="vtable">&nbsp;</td>
-                        <td width="78%" class="vtable">Number of log entries to
-                          show:
+			<td width="78%" class="vtable"><?=gettext("Number of log entries to show") . ":"?>
                           <input name="nentries" id="nentries" type="text" class="formfld unknown" size="4" value="<?=htmlspecialchars($pconfig['nentries']);?>"></td>
                       </tr>
                       <tr>
                         <td valign="top" class="vtable">&nbsp;</td>
                         <td class="vtable"> <input name="logdefaultblock" type="checkbox" id="logdefaultblock" value="yes" <?php if ($pconfig['logdefaultblock']) echo "checked"; ?>>
-                          <strong>Log packets blocked by the default rule</strong><br>
-                          Hint: packets that are blocked by the
-                          implicit default block rule will not be logged anymore
-                          if you uncheck this option. Per-rule logging options are not affected.</td>
+			<strong><?=gettext("Log packets blocked by the default rule");?></strong><br>
+			  <?=gettext("Hint: packets that are blocked by the " .
+                          "implicit default block rule will not be logged anymore " .
+			  "if you uncheck this option. Per-rule logging options are not affected.");?></td>
                       </tr>
                       <tr>
                         <td valign="top" class="vtable">&nbsp;</td>
                         <td class="vtable"> <input name="rawfilter" type="checkbox" id="rawfilter" value="yes" <?php if ($pconfig['rawfilter']) echo "checked"; ?>>
-                          <strong>Show raw filter logs</strong><br>
-                          Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information. </td>
+			<strong><?=gettext("Show raw filter logs");?></strong><br>
+			  <?=gettext("Hint: If this is checked, filter logs are shown as generated by the packet filter, without any formatting. This will reveal more detailed information.");?></td>
                       </tr>
                       <tr>
                         <td width="22%" valign="top" class="vtable">&nbsp;</td>
                         <td width="78%" class="vtable"> <input name="disablelocallogging" type="checkbox" id="disablelocallogging" value="yes" <?php if ($pconfig['disablelocallogging']) echo "checked"; ?> onClick="enable_change(false)">
-                          <strong>Disable writing log files to the local RAM disk</strong></td>
+			  <strong><?=gettext("Disable writing log files to the local RAM disk");?></strong></td>
                        </tr>
                       <tr>
                         <td width="22%" valign="top" class="vtable">&nbsp;</td>
                         <td width="78%" class="vtable"> <input name="enable" type="checkbox" id="enable" value="yes" <?php if ($pconfig['enable']) echo "checked"; ?> onClick="enable_change(false)">
-                          <strong>Enable syslog'ing to remote syslog server</strong></td>
+			  <strong><?=gettext("Enable syslog'ing to remote syslog server");?></strong></td>
                       </tr>
                       <tr>
-                        <td width="22%" valign="top" class="vncell">Remote syslog servers</td>
+			<td width="22%" valign="top" class="vncell"><?=gettext("Remote syslog servers");?></td>
                         <td width="78%" class="vtable"> 
 							<table>
 								<tr>
 									<td>
-										Server 1
+										<?=gettext("Server") . " 1";?>
 									</td>
 									<td>
 										<input name="remoteserver" id="remoteserver" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver']);?>">
@@ -234,7 +232,7 @@ function enable_change(enable_over) {
 								</tr>
 								<tr>
 									<td>
-										Server 2
+										<?=gettext("Server") . " 2";?>
 									</td>
 									<td>
 										<input name="remoteserver2" id="remoteserver2" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver2']);?>">
@@ -242,7 +240,7 @@ function enable_change(enable_over) {
 								</tr>
 								<tr>
 									<td>
-										Server 3
+										<?=gettext("Server") . " 3";?>
 									</td>
 									<td>
 										<input name="remoteserver3" id="remoteserver3" type="text" class="formfld host" size="20" value="<?=htmlspecialchars($pconfig['remoteserver3']);?>">
@@ -253,17 +251,17 @@ function enable_change(enable_over) {
 										&nbsp;
 									</td>
 									<td>
-										IP addresses of remote syslog servers
+										<?=gettext("IP addresses of remote syslog servers");?>
 									</td>
 							</table>
 					 	  <input name="system" id="system" type="checkbox" value="yes" onclick="enable_change(false)" <?php if ($pconfig['system']) echo "checked"; ?>>
-                          system events <br> <input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked"; ?>>
-                          firewall events<br> <input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked"; ?>>
-                          DHCP service events<br> <input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked"; ?>>
-                          Portal Auth<br> <input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>>
-                          PPTP VPN events
+						  <?=gettext("system events");?><br> <input name="filter" id="filter" type="checkbox" value="yes" <?php if ($pconfig['filter']) echo "checked"; ?>>
+						  <?=gettext("firewall events");?><br> <input name="dhcp" id="dhcp" type="checkbox" value="yes" <?php if ($pconfig['dhcp']) echo "checked"; ?>>
+						  <?=gettext("DHCP service events");?><br> <input name="portalauth" id="portalauth" type="checkbox" value="yes" <?php if ($pconfig['portalauth']) echo "checked"; ?>>
+						  <?=gettext("Portal Auth");?><br> <input name="vpn" id="vpn" type="checkbox" value="yes" <?php if ($pconfig['vpn']) echo "checked"; ?>>
+						  <?=gettext("PPTP VPN events");?>
                           <br> <input name="logall" id="logall" type="checkbox" value="yes" <?php if ($pconfig['logall']) echo "checked"; ?>>
-                          Everything
+						  <?=gettext("Everything");?>
                         </td>
                       </tr>
                       <tr>
@@ -273,10 +271,10 @@ function enable_change(enable_over) {
                       </tr>
                       <tr>
                         <td width="22%" height="53" valign="top">&nbsp;</td>
-                        <td width="78%"><strong><span class="red">Note:</span></strong><br>
-                          syslog sends UDP datagrams to port 514 on the specified
-                          remote syslog server. Be sure to set syslogd on the
-                          remote server to accept syslog messages from <?=$g['product_name']?>.
+						<td width="78%"><strong><span class="red"><?=gettext("Note") . ":"?></span></strong><br>
+                          <?=gettext("syslog sends UDP datagrams to port 514 on the specified " .
+                          "remote syslog server. Be sure to set syslogd on the " .
+						  "remote server to accept syslog messages from");?> <?=$g['product_name']?>.
                         </td>
                       </tr>
                     </table>
diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php
index 4e64c8f..db96484 100755
--- a/usr/local/www/diag_nanobsd.php
+++ b/usr/local/www/diag_nanobsd.php
@@ -46,7 +46,7 @@ ini_set('max_input_time', '9999');
 require_once("guiconfig.inc");
 require_once("config.inc");
 
-$pgtitle = array("Diagnostics","NanoBSD");
+$pgtitle = array(gettext("Diagnostics"), gettext("NanoBSD"));
 include("head.inc");
 
 // Survey slice info
@@ -76,7 +76,7 @@ if($_POST['bootslice']) {
 		</div>
 EOF;
 	nanobsd_switch_boot_slice();
-	$savemsg = "The boot slice has been set to " . nanobsd_get_active_slice();
+	$savemsg = gettext("The boot slice has been set to") . " " . nanobsd_get_active_slice();
 	// Survey slice info
 	nanobsd_detect_slice_info();
 
@@ -92,9 +92,9 @@ echo <<<EOF
 	</div>
 EOF;
 	if(nanobsd_clone_slice($_POST['destslice'])) {
-		$savemsg = "The slice has been duplicated.<p/>If you would like to boot from this newly duplicated slice please set it using the bootup information area.";
+		$savemsg = gettext("The slice has been duplicated.") . "<p/>" . gettext("If you would like to boot from this newly duplicated slice please set it using the bootup information area.");
 	} else {
-		$savemsg = "There was an error while duplicating the slice.  Operation aborted.";
+		$savemsg = gettext("There was an error while duplicating the slice.  Operation aborted.");
 	}
 	// Re-Survey slice info
 	nanobsd_detect_slice_info();
@@ -115,28 +115,28 @@ if ($savemsg)
 			<div class="tabcont">
 				<span class="vexpl">
 					<span class="red">
-						<strong>NOTE:&nbsp</strong>
+						<strong><?=gettext("NOTE") . ":"?>&nbsp;</strong>
 					</span>
-					The options on this page are intended for use by advanced users only.
+					<?=gettext("The options on this page are intended for use by advanced users only.")?>
 					<br/>&nbsp;
 				</span>
 				<p/>
 				<table width="100%" border="0" cellpadding="6" cellspacing="0">
 					<tr>
-						<td colspan="2" valign="top" class="listtopic">Bootup information</td>
+						<td colspan="2" valign="top" class="listtopic"><?=gettext("Bootup information");?></td>
 					</tr>
 					<tr>						
-						<td width="22%" valign="top" class="vncell">NanoBSD Image size</td>
+						<td width="22%" valign="top" class="vncell"><?=gettext("NanoBSD Image size");?></td>
 						<td width="78%" class="vtable">
 							<?php echo $NANOBSD_SIZE; ?>
 						</td>
 					</tr>
 					<tr>
-						<td width="22%" valign="top" class="vncell">Bootup</td>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Bootup");?></td>
 						<td width="78%" class="vtable">
 							<form action="diag_nanobsd.php" method="post" name="iform">
-								Bootup slice is currently: <?php echo $ACTIVE_SLICE; ?>
-								<br/><br/>This will switch the bootup slice to the alternate slice.
+								<?=gettext("Bootup slice is currently");?>: <?php echo $ACTIVE_SLICE; ?>
+								<br/><br/><?=gettext("This will switch the bootup slice to the alternate slice.");?>
 								<br/>
 								<input type='hidden' name='bootslice' value='switch'>
 								<input type='submit' value='Switch Slice'></form>
@@ -146,20 +146,20 @@ if ($savemsg)
 						<td colspan="2" valign="top" class="">&nbsp;</td>
 					</tr>					
 					<tr>
-						<td colspan="2" valign="top" class="listtopic">Duplicate bootup slice to alternate</td>
+						<td colspan="2" valign="top" class="listtopic"><?=gettext("Duplicate bootup slice to alternate");?></td>
 					</tr>
 					<tr>
-						<td width="22%" valign="top" class="vncell">Duplicate bootup slice</td>
+						<td width="22%" valign="top" class="vncell"><?=gettext("Duplicate bootup slice");?></td>
 						<td width="78%" class="vtable">
 							<form action="diag_nanobsd.php" method="post" name="iform">						
-								Destination slice:							
+								<?=gettext("Destination slice");?>:							
 								<select name='destslice'>
 									<option value='<?php echo $COMPLETE_PATH; ?>'>
 										<?php echo "{$COMPLETE_BOOT_PATH} -> {$TOFLASH}"; ?>
 									</option>
 								</select>
 								<br/>
-								This will duplicate the bootup slice to the alternate slice.  Use this if you would like to duplicate the known good working boot partition to the alternate.
+								<?=gettext("This will duplicate the bootup slice to the alternate slice.  Use this if you would like to duplicate the known good working boot partition to the alternate.");?>
 						</td>
 					</tr>
 					<tr>
@@ -170,10 +170,10 @@ if ($savemsg)
 						<td colspan="2" valign="top" class="">&nbsp;</td>
 					</tr>					
 					<tr>
-						<td colspan="2" valign="top" class="listtopic">View upgrade log</td>
+						<td colspan="2" valign="top" class="listtopic"><?=gettext("View upgrade log");?></td>
 					</tr>
 					<tr>
-						<td width="22%" valign="top" class="vncell">View previous upgrade log</td>
+						<td width="22%" valign="top" class="vncell"><?=gettext("View previous upgrade log");?></td>
 						<td width="78%" class="vtable">
 						<?php
 							if($_POST['viewupgradelog']) {
diff --git a/usr/local/www/diag_overload_tables.php b/usr/local/www/diag_overload_tables.php
index 7b0ffe1..e4bba75 100644
--- a/usr/local/www/diag_overload_tables.php
+++ b/usr/local/www/diag_overload_tables.php
@@ -41,7 +41,7 @@
 ##|*MATCH=diag_overload_tables.php*
 ##|-PRIV
 
-$pgtitle = array("Diagnostics", "Overload tables");
+$pgtitle = array(gettext("Diagnostics"), gettext("Overload tables"));
 
 require_once("guiconfig.inc");
 
@@ -94,7 +94,7 @@ include("fbegin.inc");
 	}
 </script>
 	
-Table: 
+<?=gettext("Table");?>: 
 <select id='type' onChange='method_change($F("type"));' name='type'>
 	<?php foreach ($tables as $table) {
 		echo "<option name='{$table}' value='{$table}'";
@@ -109,7 +109,7 @@ Table:
 
 <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
-		<td class="listhdrr">IP Address</td>
+		<td class="listhdrr"><?=gettext("IP Address");?></td>
 	</tr>
 <?php $count = 0; foreach($entries as $entryA): ?>
 	<?php $entry = trim($entryA); ?>
@@ -126,14 +126,14 @@ Table:
 <?php $count++; endforeach; ?>
 <?php
 	if($count == 0)
-		echo "<tr><td>No entries exist in this table.</td></tr>";
+		echo "<tr><td>" . gettext("No entries exist in this table.") . "</td></tr>";
 ?>
 
 </table>
 
 <?php
 	if($count > 0)
-		echo "<p/>Delete <a href='diag_overload_tables.php?deleteall=true&type={$tablename}'>all</a> entries in this table."
+		echo "<p/>" . gettext("Delete") . " <a href='diag_overload_tables.php?deleteall=true&type={$tablename}'>" . gettext("all") . "</a> " . gettext("entries in this table.");
 
 ?>
 
diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php
index bfdb52d..de314a9 100644
--- a/usr/local/www/diag_packet_capture.php
+++ b/usr/local/www/diag_packet_capture.php
@@ -35,7 +35,7 @@
 ##|*MATCH=diag_packet_capture.php*
 ##|-PRIV
 
-$pgtitle = array("Diagnostics", "Packet Capture");
+$pgtitle = array(gettext("Diagnostics"), gettext("Packet Capture"));
 require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 
@@ -64,7 +64,7 @@ if ($_POST) {
 	}
 
 	if ($_POST['startbtn'] != "" ) {
-		$action = "Start";
+		$action = gettext("Start");
 		
 	 	//delete previous packet capture if it exists
 	 	if (file_exists($fp.$fn))
@@ -95,7 +95,6 @@ if ($_POST) {
 } else {
 	$do_tcpdump = false;
 }
-$pgtitle = "Diagnostics: Packet Capture";
 include("head.inc"); ?>
 
 <body link="#000000" vlink="#0000CC" alink="#0000CC">
@@ -110,10 +109,10 @@ include("fbegin.inc");
 			<form action="diag_packet_capture.php" method="post" name="iform" id="iform">
 			  <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic">Packet capture</td>
+					<td colspan="2" valign="top" class="listtopic"><?=gettext("Packet capture");?></td>
 				</tr>	
                	<tr>
-				  <td width="17%" valign="top" class="vncellreq">Interface</td>
+				  <td width="17%" valign="top" class="vncellreq"><?=gettext("Interface");?></td>
 				  <td width="83%" class="vtable">
 				<select name="interface">
 <?php 
@@ -129,52 +128,54 @@ include("fbegin.inc");
 				  </td>
 				</tr>
 			    <tr>
-				  <td width="17%" valign="top" class="vncellreq">Host Address</td>
+				  <td width="17%" valign="top" class="vncellreq"><?=gettext("Host Address");?></td>
 				  <td width="83%" class="vtable">
                     <input name="host" type="text" class="formfld host" id="host" size="20" value="<?=htmlspecialchars($host);?>">
-					<br/>This value is either the Source or Destination IP address. The packet capture will look for this address in either field.
-					<br/>This value can be a domain name or IP address.
-					<br/>If you leave this field blank, all packets on the specified interface will be captured. 
+					<br/><?=gettext("This value is either the Source or Destination IP address. The packet capture will look for this address in either field.");?>
+					<br/><?=gettext("This value can be a domain name or IP address.");?>
+					<br/><?=gettext("If you leave this field blank, all packets on the specified interface will be captured. ");?>
 					</td>
 				</tr>
 				<tr>
-				  <td width="17%" valign="top" class="vncellreq">Port</td>
+				  <td width="17%" valign="top" class="vncellreq"><?=gettext("Port");?></td>
 				  <td width="83%" class="vtable">
                     <input name="port" type="text" class="formfld unknown" id="port" size="5" value="<?=$port;?>">
-					<br/>The port can be either the source or destination port. The packet capture will look for this port in either field.
-					<br/>Leave blank if you do not want to filter by port.
+					<br/><?=gettext("The port can be either the source or destination port. The packet capture will look for this port in either field.");?>
+					<br/><?=gettext("Leave blank if you do not want to filter by port.");?>
 					</td>
 				</tr>
 				<tr>
-				  <td width="17%" valign="top" class="vncellreq">Packet Length</td>
+				  <td width="17%" valign="top" class="vncellreq"><?=gettext("Packet Length");?></td>
 				  <td width="83%" class="vtable">
                     <input name="snaplen" type="text" class="formfld unknown" id="snaplen" size="5" value="<?=$snaplen;?>">
 					<br/><?=gettext("The Packet length is the number of bytes of each packet that will be captured. Default value is 0, which will capture the entire frame regardless of its size.");?>
 					</td>
 				</tr>
 				<tr>
-				  <td width="17%" valign="top" class="vncellreq">Count</td>
+				  <td width="17%" valign="top" class="vncellreq"><?=gettext("Count");?></td>
 				  <td width="83%" class="vtable">
                     <input name="count" type="text" class="formfld unknown" id="count" size="5" value="<?=$count;?>">
-					<br/>This is the number of packets the packet capture will grab. Default value is 100. <br/>Enter 0 (zero) for no count limit.
+					<br/><?=gettext("This is the number of packets the packet capture will grab. Default value is 100.") . "<br/>" . gettext("Enter 0 (zero) for no count limit.");?>
 				</tr>
 				<tr>
-				  <td width="17%" valign="top" class="vncellreq">Level of Detail</td>
+				  <td width="17%" valign="top" class="vncellreq"><?=gettext("Level of Detail");?></td>
 				  <td width="83%" class="vtable">
                     <select name="detail" type="text" class="formselect" id="detail" size="1">
-						<option value="-q" <?php if ($detail == "-q") echo "selected"; ?>>Normal</option>
-						<option value="-v" <?php if ($detail == "-v") echo "selected"; ?>>Medium</option>
-						<option value="-vv" <?php if ($detail == "-vv") echo "selected"; ?>>High</option>
-						<option value="-vv -e" <?php if ($detail == "-vv -e") echo "selected"; ?>>Full</option>
+						<option value="-q" <?php if ($detail == "-q") echo "selected"; ?>><?=gettext("Normal");?></option>
+						<option value="-v" <?php if ($detail == "-v") echo "selected"; ?>><?=gettext("Medium");?></option>
+						<option value="-vv" <?php if ($detail == "-vv") echo "selected"; ?>><?=gettext("High");?></option>
+						<option value="-vv -e" <?php if ($detail == "-vv -e") echo "selected"; ?>><?=gettext("Full");?></option>
 					</select>
-					<br/>This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured. <br/><b>Note:</b> This option does not affect the level of detail when downloading the packet capture.
+					<br/><?=gettext("This is the level of detail that will be displayed after hitting 'Stop' when the packets have been captured.") .  "<br/><b>" .
+							gettext("Note") . ":</b> " .
+							gettext("This option does not affect the level of detail when downloading the packet capture.");?>
 				</tr>
 				<tr>
-				  <td width="17%" valign="top" class="vncellreq">Reverse DNS Lookup</td>
+				  <td width="17%" valign="top" class="vncellreq"><?=gettext("Reverse DNS Lookup");?></td>
 				  <td width="83%" class="vtable">
 					<input name="dnsquery" type="checkbox"<?php if($_POST['dnsquery']) echo " CHECKED"; ?>>
-					<br/>This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses.
-					<br/><b>Note: </b>This option can cause delays for large packet captures.
+					<br/><?=gettext("This check box will cause the packet capture to perform a reverse DNS lookup associated with all IP addresses.");?>
+					<br/><b><?=gettext("Note");?>: </b><?=gettext("This option can cause delays for large packet captures.");?>
 					</td>
 				</tr>
 				<tr>
@@ -190,14 +191,14 @@ include("fbegin.inc");
 					if ($processcheck != false)
 						$processisrunning = true;
 						
-					if (($action == "Stop" or $action == "") and $processisrunning != true)
-						echo "<input type=\"submit\" name=\"startbtn\" value=\"Start\">&nbsp;";
+					if (($action == gettext("Stop") or $action == "") and $processisrunning != true)
+						echo "<input type=\"submit\" name=\"startbtn\" value=\"" . gettext("Start") . "\">&nbsp;";
 				  	else {
-					  	echo "<input type=\"submit\" name=\"stopbtn\" value=\"Stop\">&nbsp;";
+					  	echo "<input type=\"submit\" name=\"stopbtn\" value=\"" . gettext("Stop") . "\">&nbsp;";
 				  	}
 					if (file_exists($fp.$fn) and $processisrunning != true) {
-						echo "<input type=\"submit\" name=\"downloadbtn\" value=\"Download Capture\">";
-						echo "&nbsp;&nbsp;(The packet capture file was last updated: " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)) . ")";
+						echo "<input type=\"submit\" name=\"downloadbtn\" value=\"" . gettext("Download Capture") . "\">";
+						echo "&nbsp;&nbsp;(" . gettext("The packet capture file was last updated") . ": " . date("F jS, Y g:i:s a.", filemtime($fp.$fn)) . ")";
 					}
 ?>
 				  </td>
@@ -207,7 +208,7 @@ include("fbegin.inc");
 <?php
 				echo "<font face='terminal' size='2'>";
 				if ($processisrunning == true)
-						echo("<strong>Packet Capture is running.</strong><br/>");
+						echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br/>");
 						
 				if ($do_tcpdump) {					
 
@@ -234,12 +235,12 @@ include("fbegin.inc");
 
 					$selectedif = convert_friendly_interface_to_real_interface_name($selectedif);
 	
-					if ($action == "Start") {
-						echo("<strong>Packet Capture is running.</strong><br/>");
+					if ($action == gettext("Start")) {
+						echo("<strong>" . gettext("Packet Capture is running.") . "</strong><br/>");
 					 	mwexec_bg ("/usr/sbin/tcpdump -i $selectedif $searchcount -s $packetlength -w $fp$fn $searchhost $searchport");
 					} else  {
 						//action = stop
-						echo("<strong>Packet Capture stopped. <br/><br/>Packets Captured:</strong><br/>");
+						echo("<strong>" . gettext("Packet Capture stopped.") . "<br/><br/>" . gettext("Packets Captured") . ":</strong><br/>");
 ?>
 						<textarea style="width:98%" name="code" rows="15" cols="66" wrap="off" readonly="readonly">
 <?php
diff --git a/usr/local/www/diag_patterns.php b/usr/local/www/diag_patterns.php
index 2e1d264..09f5472 100755
--- a/usr/local/www/diag_patterns.php
+++ b/usr/local/www/diag_patterns.php
@@ -40,13 +40,13 @@
 require("guiconfig.inc");
 
 //Move the upload file to /usr/local/share/protocols (is_uploaded_file must use tmp_name as argument)
-if (($_POST['submit'] == "Upload") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
+if (($_POST['submit'] == gettext("Upload")) && is_uploaded_file($_FILES['ulfile']['tmp_name'])) {
 	if(fileExtension($_FILES['ulfile']['name'])) {
 		move_uploaded_file($_FILES['ulfile']['tmp_name'], "/usr/local/share/protocols/" . $_FILES['ulfile']['name']);
-		$ulmsg = "Uploaded file to /usr/local/share/protocols/" . htmlentities($_FILES['ulfile']['name']);
+		$ulmsg = gettext("Uploaded file to") . " /usr/local/share/protocols/" . htmlentities($_FILES['ulfile']['name']);
 	}
 	else
-		$ulmsg = "Warning: You must upload a file with .pat extension.";
+		$ulmsg = gettext("Warning: You must upload a file with .pat extension.");
 }
 
 //Check if file has correct extension (.pat)
@@ -55,7 +55,7 @@ function fileExtension($nameFile) {
 	return ($format == ".pat");	
 }
 
-$pgtitle = array("Diagnostics","Add layer7 pattern");
+$pgtitle = array(gettext("Diagnostics"), gettext("Add layer7 pattern"));
 include("head.inc");
 ?>
 
@@ -95,24 +95,24 @@ pre {
 </head>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
-<p><strong>You can upload new layer7 patterns to your system!</strong></p>
+<p><strong><?=gettext("You can upload new layer7 patterns to your system!");?></strong></p>
 <?php if ($ulmsg) echo "<p class=\"red\"><strong>" . $ulmsg . "</strong></p>\n"; ?>
 <div id="niftyOutter">
 <form action="diag_patterns.php" method="POST" enctype="multipart/form-data" name="frmPattern">
   <table>
 	
   <tr>
-    <td colspan="2" valign="top" class="vnsepcell">Upload</td>
+    <td colspan="2" valign="top" class="vnsepcell"><?=gettext("Upload");?></td>
   </tr>    
     <tr>
-      <td align="right">File to upload:</td>
+      <td align="right"><?=gettext("File to upload");?>:</td>
       <td valign="top" class="label">
 	<input name="ulfile" type="file" class="formfld file" id="ulfile">
 	</td></tr>
     <tr>
       <td valign="top">&nbsp;&nbsp;&nbsp;</td>
       <td valign="top" class="label">	
-        <input name="submit" type="submit"  class="button" id="upload" value="Upload"></td>
+	<input name="submit" type="submit"  class="button" id="upload" value="<?=gettext("Upload");?>"></td>
     </tr>
 	<tr>
 	  <td colspan="2" valign="top" height="16"></td>
diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php
index 04819d0..f56a65b 100755
--- a/usr/local/www/diag_resetstate.php
+++ b/usr/local/www/diag_resetstate.php
@@ -51,11 +51,11 @@ if ($_POST) {
 		filter_flush_state_table();
 		if ($savemsg)
 			$savemsg .= " ";
-		$savemsg .= "The state table has been flushed successfully.";
+		$savemsg .= gettext("The state table has been flushed successfully.");
 	}
 }
 
-$pgtitle = array("Diagnostics","Reset state");
+$pgtitle = array(gettext("Diagnostics"), gettext("Reset state"));
 include("head.inc");
 
 ?>
@@ -68,8 +68,8 @@ include("head.inc");
 	<tr><td>
 	<?php
 		$tab_array = array();
-		$tab_array[0] = array("States", false, "diag_dump_states.php");
-		$tab_array[1] = array("Reset States", true, "diag_resetstate.php");
+		$tab_array[0] = array(gettext("States"), false, "diag_dump_states.php");
+		$tab_array[1] = array(gettext("Reset States"), true, "diag_resetstate.php");
 		display_top_tabs($tab_array);
 	?>
 	</td></tr>
@@ -80,27 +80,27 @@ include("head.inc");
                   <td width="22%" valign="top" class="vtable">&nbsp;</td>
                   <td width="78%" class="vtable"> <p>
                       <input name="statetable" type="checkbox" id="statetable" value="yes" checked>
-                      <strong>Firewall state table</strong><br>
+                      <strong><?= gettext("Firewall state table"); ?></strong><br>
                       <span class="vexpl"><br>
-                      Resetting the state tables will remove all entries from
-                      the corresponding tables. This means that all open connections
-                      will be broken and will have to be re-established. This
-                      may be necessary after making substantial changes to the
-                      firewall and/or NAT rules, especially if there are IP protocol
-                      mappings (e.g. for PPTP or IPv6) with open connections.<br>
+                      <?=gettext("Resetting the state tables will remove all entries from " .
+                      "the corresponding tables. This means that all open connections " .
+                      "will be broken and will have to be re-established. This " . 
+                      "may be necessary after making substantial changes to the " .
+                      "firewall and/or NAT rules, especially if there are IP protocol " .
+                      "mappings (e.g. for PPTP or IPv6) with open connections."); ?><br>
                       <br>
-                      </span><span class="vexpl">The firewall will normally leave
-                      the state tables intact when changing rules.<br>
+                      </span><span class="vexpl"><?=gettext("The firewall will normally leave " .
+                      "the state tables intact when changing rules."); ?><br>
                       <br>
-                      NOTE: If you reset the firewall state table, the browser
-                      session may appear to be hung after clicking &quot;Reset&quot;.
-                      Simply refresh the page to continue.</span></p>
+                      <?=gettext("NOTE: If you reset the firewall state table, the browser " .
+                      "session may appear to be hung after clicking &quot;Reset&quot;. " .
+                      "Simply refresh the page to continue."); ?></span></p>
                     </td>
 				</tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
                   <td width="78%">
-                    <input name="Submit" type="submit" class="formbtn" value="Reset">
+                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Reset"); ?>">
                   </td>
                 </tr>
               </table>
diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php
index 94b94fd..5adc7b3 100644
--- a/usr/local/www/diag_routes.php
+++ b/usr/local/www/diag_routes.php
@@ -33,7 +33,6 @@
 	pfSense_BUILDER_BINARIES:	/usr/bin/netstat	
 	pfSense_MODULE:	routing
 */
-
 ##|+PRIV
 ##|*IDENT=page-diagnostics-routingtables
 ##|*NAME=Diagnostics: Routing tables page
@@ -43,7 +42,7 @@
 
 include('guiconfig.inc');
 
-$pgtitle = array("Diagnostics","Routing tables");
+$pgtitle = array(gettext("Diagnostics"),gettext("Routing tables"));
 
 include('head.inc');
 
@@ -56,11 +55,11 @@ include('head.inc');
 <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="6">
 
 <tr>
-<td class="vncellreq" width="22%">Name resolution</td>
+<td class="vncellreq" width="22%"><?=gettext("Name resolution");?></td>
 <td class="vtable" width="78%">
-<input type="checkbox" class="formfld" name="resolve" value="yes" <?php if ($_POST['resolve'] == 'yes') echo 'checked'; ?>> Enable</input>
+<input type="checkbox" class="formfld" name="resolve" value="yes" <?php if ($_POST['resolve'] == 'yes') echo 'checked'; ?>><?=gettext("Enable");?></input>
 <br />
-<span class="expl">Enable this to attempt to resolve names when displaying the tables.</span>
+<span class="expl"><?=gettext("Enable this to attempt to resolve names when displaying the tables.");?></span>
 </td>
 </tr>
 
@@ -70,7 +69,7 @@ include('head.inc');
 <input type="submit" class="formbtn" name="submit" value="<?=gettext("Show"); ?>" />
 <br />
 <br />
-<span class="vexpl"><span class="red"><strong>Note:</strong></span> By enabling name resolution, the query should take a bit longer. You can stop it at any time by clicking the Stop button in your browser.</span>
+<span class="vexpl"><span class="red"><strong><?=gettext("Note")?>:</strong></span><?=gettext("By enabling name resolution, the query should take a bit longer. You can stop it at"."any time by clicking the Stop button in your browser");?>.</span>
 </td>
 </tr>
 
diff --git a/usr/local/www/diag_system_activity.php b/usr/local/www/diag_system_activity.php
index 18e6842..b94dc92 100644
--- a/usr/local/www/diag_system_activity.php
+++ b/usr/local/www/diag_system_activity.php
@@ -43,7 +43,7 @@ require("guiconfig.inc");
 
 $pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
 
-$pgtitle = "Diagnostics: System Activity";
+$pgtitle = gettext("Diagnostics: System Activity");
 
 if($_REQUEST['getactivity']) {
 	$text = `/usr/bin/top -HS`;
@@ -98,7 +98,7 @@ include("head.inc");
 				<table>
 					<tr><td>
 						<div name='cpuactivitydiv' id='cpuactivitydiv'>
-							<b>Gathering CPU activity, please wait...
+							<b><?=gettext("Gathering CPU activity, please wait...");?>
 						</div>
 					</td></tr>
 				</table>
diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php
index 9778e8a..4818534 100644
--- a/usr/local/www/diag_system_pftop.php
+++ b/usr/local/www/diag_system_pftop.php
@@ -42,7 +42,7 @@ require("guiconfig.inc");
 
 $pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
 
-$pgtitle = "Diagnostics: PFTop";
+$pgtitle = gettext("Diagnostics: PFTop");
 
 if($_REQUEST['getactivity']) {
 	if($_REQUEST['sorttype'])
@@ -99,18 +99,18 @@ else
 	<?=gettext("Sort type"); ?>: 
 	<select name='sorttype' id='sorttype' onChange='this.form.submit();'>
 		<option value='<?=$sorttype?>'><?=$sorttype?></option>
-		<option value='age'>age</option>
-		<option value='bytes'>bytes</option>
-		<option value='dest'>dest</option>
-		<option value='dport'>dport</option>
-		<option value='exp'>exp</option>
-		<option value='none'>none</option>
-		<option value='peak'>peak</option>
-		<option value='pkt'>pkt</option>
-		<option value='rate'>rate</option>
-		<option value='size'>size</option>
-		<option value='sport'>sport</option>
-		<option value='src'>src</option>														
+		<option value='age'><?=gettext("age");?></option>
+		<option value='bytes'><?=gettext("bytes");?></option>
+		<option value='dest'><?=gettext("dest");?></option>
+		<option value='dport'><?=gettext("dport");?></option>
+		<option value='exp'><?=gettext("exp");?></option>
+		<option value='none'><?=gettext("none");?></option>
+		<option value='peak'><?=gettext("peak");?></option>
+		<option value='pkt'><?=gettext("pkt");?></option>
+		<option value='rate'><?=gettext("rate");?></option>
+		<option value='size'><?=gettext("size");?></option>
+		<option value='sport'><?=gettext("sport");?></option>
+		<option value='src'><?=gettext("src");?></option>														
 	</select>
 	<p/>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">  
@@ -123,7 +123,7 @@ else
 				<table>
 					<tr><td>
 						<div name='cpuactivitydiv' id='cpuactivitydiv'>
-							<b>Gathering pfTOP activity, please wait...
+							<b><?=gettext("Gathering pfTOP activity, please wait...");?>
 						</div>
 					</td></tr>
 				</table>
-- 
cgit v1.1