From e4632c0b7631d04dd0eb520d98b9ac029d47b5fe Mon Sep 17 00:00:00 2001
From: Jeann <wjeann@gmail.com>
Date: Wed, 23 Jun 2010 23:39:09 -0300
Subject: Modified sintaxes on diag_dns.php and diag_dump_states.php

---
 usr/local/www/diag_dns.php         |  4 ++--
 usr/local/www/diag_dump_states.php | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php
index 9d5f51d..a82628d 100644
--- a/usr/local/www/diag_dns.php
+++ b/usr/local/www/diag_dns.php
@@ -124,7 +124,7 @@ include("head.inc"); ?>
 							<b><?=gettext("Server");?></b>
 						</td>
 						<td>
-							<b><?=gettext("Query time);></b>
+							<b><?=gettext("Query time");></b>
 						</td>
 					</tr>
 <?php
@@ -155,7 +155,7 @@ include("head.inc"); ?>
 				<p/>
 				<?=gettext("NOTE: The following links are to external services, so their reliability cannot be guaranteed.");?><br/><br/>
 				<a target="_new" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP WHOIS @ DNS Stuff");?></a><br />
-				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff);?></a>
+				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff");?></a>
 			</td>
 		</tr>
 		<?php } ?>
diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php
index 7e223c8..f0b9ba5 100755
--- a/usr/local/www/diag_dump_states.php
+++ b/usr/local/www/diag_dump_states.php
@@ -172,26 +172,26 @@ if(count($states) > 0) {
 		$parts = split(":", $ends[count($ends) - 1]);
 		$dstip = trim($parts[0]);
 
-		echo "<tr valign='top' name='r:{$srcip}:{$dstip}'>
+		echo "<tr valign='top' name='r:{$srcip}:{$dstip}'>"
 				<td class='listlr'>{$proto}</td>
 				<td class='listr'>{$info}</td>
 				<td class='listr'>{$state}</td>
 				<td class='list'>
 				  <img src='/themes/{$g['theme']}/images/icons/icon_x.gif' height='17' width='17' border='0'
-				  	   onclick=\"removeState('{$srcip}', '{$dstip}');\" style='cursor:pointer;'
+				  	   onclick="removeState('{$srcip}', '{$dstip}');" style='cursor:pointer;'
 				       name='i:{$srcip}:{$dstip}'
 				       title='" . gettext("Remove all state entries from") . " {$srcip} " . gettext("to") . " {$dstip}' alt='' />
 				</td>
-			  </tr>";
+			  </tr>;
 		$row++;
 	}
 }
 else {
-	echo "<tr>
+	echo "<tr>"
 			<td class='list' colspan='4' align='center' valign='top'>
 			  " . gettext("No states were found.") . "
 			</td>
-		  </tr>";
+		  </tr>;
 }
 ?>
 			</table>
-- 
cgit v1.1


From da652a469a957d82b8076b205e804d74ebeb7b4e Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 19:40:58 -0300
Subject: Fixing syntax errors

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php
index a82628d..081b765 100644
--- a/usr/local/www/diag_dns.php
+++ b/usr/local/www/diag_dns.php
@@ -68,7 +68,7 @@ if ($_POST) {
 		}
 	}
 
-	$type = gettext("unknown");
+	$type = "unknown";
 	$resolved = "";
 	$ipaddr = "";
 	$hostname = "";
@@ -106,7 +106,7 @@ include("head.inc"); ?>
 			<td colspan="2" valign="top" class="listtopic"> <?=gettext("Resolve DNS hostname or IP");?></td>
 		</tr>
         <tr>
-		  <td width="22%" valign="top" class="vncellreq">gettext("Hostname or IP");?></td>
+		  <td width="22%" valign="top" class="vncellreq"><?=gettext("Hostname or IP");?></td>
 		  <td width="78%" class="vtable">
             <?=$mandfldhtml;?><input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>">
 			<? if ($resolved && $type) { ?>
@@ -124,7 +124,7 @@ include("head.inc"); ?>
 							<b><?=gettext("Server");?></b>
 						</td>
 						<td>
-							<b><?=gettext("Query time");></b>
+							<b><?=gettext("Query time");?></b>
 						</td>
 					</tr>
 <?php
-- 
cgit v1.1


From eb56e9c3247d70b423484248c26604fbb4176453 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 19:57:32 -0300
Subject: Revert "Modified sintaxes on diag_dns.php and diag_dump_states.php"

This reverts commit e4632c0b7631d04dd0eb520d98b9ac029d47b5fe.

Conflicts:

	usr/local/www/diag_dns.php
---
 usr/local/www/diag_dns.php         |  2 +-
 usr/local/www/diag_dump_states.php | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php
index 081b765..afa7eb1 100644
--- a/usr/local/www/diag_dns.php
+++ b/usr/local/www/diag_dns.php
@@ -155,7 +155,7 @@ include("head.inc"); ?>
 				<p/>
 				<?=gettext("NOTE: The following links are to external services, so their reliability cannot be guaranteed.");?><br/><br/>
 				<a target="_new" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP WHOIS @ DNS Stuff");?></a><br />
-				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff");?></a>
+				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff);?></a>
 			</td>
 		</tr>
 		<?php } ?>
diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php
index f0b9ba5..7e223c8 100755
--- a/usr/local/www/diag_dump_states.php
+++ b/usr/local/www/diag_dump_states.php
@@ -172,26 +172,26 @@ if(count($states) > 0) {
 		$parts = split(":", $ends[count($ends) - 1]);
 		$dstip = trim($parts[0]);
 
-		echo "<tr valign='top' name='r:{$srcip}:{$dstip}'>"
+		echo "<tr valign='top' name='r:{$srcip}:{$dstip}'>
 				<td class='listlr'>{$proto}</td>
 				<td class='listr'>{$info}</td>
 				<td class='listr'>{$state}</td>
 				<td class='list'>
 				  <img src='/themes/{$g['theme']}/images/icons/icon_x.gif' height='17' width='17' border='0'
-				  	   onclick="removeState('{$srcip}', '{$dstip}');" style='cursor:pointer;'
+				  	   onclick=\"removeState('{$srcip}', '{$dstip}');\" style='cursor:pointer;'
 				       name='i:{$srcip}:{$dstip}'
 				       title='" . gettext("Remove all state entries from") . " {$srcip} " . gettext("to") . " {$dstip}' alt='' />
 				</td>
-			  </tr>;
+			  </tr>";
 		$row++;
 	}
 }
 else {
-	echo "<tr>"
+	echo "<tr>
 			<td class='list' colspan='4' align='center' valign='top'>
 			  " . gettext("No states were found.") . "
 			</td>
-		  </tr>;
+		  </tr>";
 }
 ?>
 			</table>
-- 
cgit v1.1


From 0912848815bfb63c7829dc6c6d7f494fcf67cc1d Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 20:01:50 -0300
Subject: Fixing syntax errors on diag_dns.php

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php
index afa7eb1..d1392d3 100644
--- a/usr/local/www/diag_dns.php
+++ b/usr/local/www/diag_dns.php
@@ -31,7 +31,7 @@
 	pfSense_MODULE:	dns
 */
 
-$pgtitle = array("Diagnostics","DNS Lookup");
+$pgtitle = array(gettext("Diagnostics"),gettext("DNS Lookup"));
 require("guiconfig.inc");
 
 /* Cheap hack to support both $_GET and $_POST */
@@ -155,7 +155,7 @@ include("head.inc"); ?>
 				<p/>
 				<?=gettext("NOTE: The following links are to external services, so their reliability cannot be guaranteed.");?><br/><br/>
 				<a target="_new" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP WHOIS @ DNS Stuff");?></a><br />
-				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff);?></a>
+				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff");?></a>
 			</td>
 		</tr>
 		<?php } ?>
-- 
cgit v1.1


From 9733b7bb2ea23168a88ac5d99768860efc1f185b Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 20:08:32 -0300
Subject: Fixing gettext implementation at diag_dump_states.php

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php
index 7e223c8..a98b943 100755
--- a/usr/local/www/diag_dump_states.php
+++ b/usr/local/www/diag_dump_states.php
@@ -64,7 +64,7 @@ else {
 	exec("/sbin/pfctl -s state", $states);
 }
 
-$pgtitle = array("Diagnostics","Show States");
+$pgtitle = array(gettext("Diagnostics"),gettext("Show States"));
 include("head.inc");
 
 ?>
@@ -134,7 +134,7 @@ include("head.inc");
 				<tr>
 					<td><?=gettext("Current state count");?>: <?=$current_statecount?></td>
 					<td style="font-weight:bold;" align="right">
-						<?=gettext("Filter expression:");?>
+						<?=gettext("Filter expression");?>:
 						<input type="text" name="filter" class="formfld search" value="<?=$_GET['filter'];?>" size="30" />
 						<input type="submit" class="formbtn" value="<?=gettext("Filter");?>" />
 					<td>
-- 
cgit v1.1


From 68bfa0d700663a1f2fdae838889c3ba17f68fc13 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 20:13:30 -0300
Subject: Inserting gettext call

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
index 3af1e69..e0039ab 100755
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -130,7 +130,7 @@ if ($_GET['act'] == "del") {
 
 <span class="vexpl">
 <span class="red"><strong><?=gettext("Note");?>:<br></strong></span>
-<?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php">here</a>.
+<?=gettext("You can configure your IPsec");?> <a href="vpn_ipsec.php"><?=gettext("here");?></a>.
 </span>
 
 <?php include("fend.inc"); ?>
-- 
cgit v1.1


From 6475ac056d7de9881d2e786a09e2e1fb7129b2ec Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 20:38:11 -0300
Subject: Fixing syntax errors

---
 usr/local/www/diag_showbogons.php | 2 +-
 usr/local/www/diag_traceroute.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_showbogons.php b/usr/local/www/diag_showbogons.php
index ed93403..4c2464e 100644
--- a/usr/local/www/diag_showbogons.php
+++ b/usr/local/www/diag_showbogons.php
@@ -59,7 +59,7 @@ if($_POST['Download']) {
 }
 
 $bogons = file_get_contents(trim("/etc/bogons"));
-$pgtitle = array(gettext("Diagnostics:")gettext("Show Bogons"));
+$pgtitle = array(gettext("Diagnostics:"),gettext("Show Bogons"));
 
 include("head.inc");
 ?>
diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php
index 75ffadf..8012ae3 100755
--- a/usr/local/www/diag_traceroute.php
+++ b/usr/local/www/diag_traceroute.php
@@ -63,7 +63,7 @@ if ($_POST || $_REQUEST['host']) {
 	do_input_validation($_REQUEST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if (($_REQUEST['ttl'] < 1) || ($_REQUEST['ttl'] > MAX_TTL)) {
-		$input_errors[] = sprintf(gettext("Maximum number of hops must be between 1 and '%s'", MAX_TLL);
+		$input_errors[] = sprintf(gettext("Maximum number of hops must be between 1 and '%s'"), MAX_TLL);
 	}
 
 	if (!$input_errors) {
-- 
cgit v1.1


From 5f92825459b10647296f6ab40803f2d776336fd2 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 20:45:32 -0300
Subject: Changing string format

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index f4d20b2..98fe1bb 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -131,7 +131,7 @@ include("head.inc");
 		  </td></tr>
 		  <tr>
 		  <td colspan="4" class="listtopic">
-				<?=gettext("Last");?> <?=$nentries;?> <?=$vpns[$vpntype];?> <?=gettext("VPN log entries");?></td>
+				<?php printf(gettext("Last %s %s VPN log entries"),$nentries,$vpns[$vpntype]);?></td>
 			</tr>
 			<tr>
 			  <td class="listhdrr"><?=gettext("Time");?></td>
-- 
cgit v1.1


From 9d8eeb2f01829e17c25fafd04420f5c04c917698 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 21:00:23 -0300
Subject: Fixing syntax errors

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index a7bce2e..a814f2c 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -52,7 +52,7 @@ if ($_POST || $_REQUEST['host']) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "host count");
-	$reqdfieldsn = array(",", gettext("Host"),gettext("Count"));
+	$reqdfieldsn = array(gettext("Host"),gettext("Count"));
 	do_input_validation($_REQUEST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if (($_REQUEST['count'] < 1) || ($_REQUEST['count'] > MAX_COUNT)) {
-- 
cgit v1.1


From 36e1c979b89bcc855a0b34c6ecc382c9c9e3c4da Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 21:06:23 -0300
Subject: Fixed string format error

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php
index a7b65c9..bf7be9e 100755
--- a/usr/local/www/diag_pkglogs.php
+++ b/usr/local/www/diag_pkglogs.php
@@ -112,7 +112,7 @@ include("head.inc");
 		<table width="100%" border="0" cellspacing="0" cellpadding="0">
 		  <tr>
 			<td colspan="2" class="listtopic">
-			  <?= gettext("Last") $nentries $curtab gettext("log entries") ?></td>
+			  <?php printf(gettext("Last %s %s log entries"),$nentries,$curtab); ?></td>
 		  </tr>
 		  <?php
 			$package =& $config['installedpackages']['package'][$apkgid];
-- 
cgit v1.1


From f402ca20b57d65987730e390a1a9d269f229b9d2 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 21:12:22 -0300
Subject: Implementing gettext calls

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_showbogons.php b/usr/local/www/diag_showbogons.php
index 4c2464e..95f71ec 100644
--- a/usr/local/www/diag_showbogons.php
+++ b/usr/local/www/diag_showbogons.php
@@ -55,11 +55,11 @@ if($_POST['Download']) {
 		sleep(1);
 	}
 	if($maxtimetowait < 90)
-		$savemsg = "The bogons database has been updated.";
+		$savemsg = gettext("The bogons database has been updated.");
 }
 
 $bogons = file_get_contents(trim("/etc/bogons"));
-$pgtitle = array(gettext("Diagnostics:"),gettext("Show Bogons"));
+$pgtitle = array(gettext("Diagnostics"),gettext("Show Bogons"));
 
 include("head.inc");
 ?>
@@ -87,7 +87,7 @@ pre { font-size: 1.15em; }
 					<tr>
 						<td>
 							<font size="+1">
-								<b><?=gettext("Currently loaded bogons table:");?></b><p/>
+								<b><?=gettext("Currently loaded bogons table");?>:</b><p/>
 								<pre>
 <?php echo $bogons; ?>
 								</pre>
-- 
cgit v1.1


From 9049e088829e7c3c5a1783c9e5ca47c7fdfdf7e2 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 21:14:11 -0300
Subject: Fixing gettext call and syntax error

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_states_summary.php b/usr/local/www/diag_states_summary.php
index 32290bb..cb0807a 100644
--- a/usr/local/www/diag_states_summary.php
+++ b/usr/local/www/diag_states_summary.php
@@ -122,9 +122,9 @@ function print_summary_table($label, $iparr, $sort = TRUE) { ?>
 <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
 	<tr>
 		<td class="listhdrr"><?=gettext("IP");?></td>
-		<td class="listhdrr"><?=gettext("# States");?></td>
+		<td class="listhdrr"># <?=gettext("States");?></td>
 		<td class="listhdrr"><?=gettext("Proto");?></td>
-		<td class="listhdrr"><?=gettext"(# States");?></td>
+		<td class="listhdrr"># <?=gettext("States");?></td>
 		<td class="listhdrr"><?=gettext("Src Ports");?></td>
 		<td class="listhdrr"><?=gettext("Dst Ports");?></td>
 	</tr>
-- 
cgit v1.1


From 42f9d20f1eb4c105b9bf20fdc94896f61a7212d1 Mon Sep 17 00:00:00 2001
From: Vinicius Coque <vinicius.coque@bluepex.com>
Date: Tue, 29 Jun 2010 21:18:40 -0300
Subject: Fixing string syntax

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php
index 8012ae3..62b42e5 100755
--- a/usr/local/www/diag_traceroute.php
+++ b/usr/local/www/diag_traceroute.php
@@ -114,7 +114,7 @@ if (!isset($do_traceroute)) {
 				</tr>
 				<tr>
 				<td valign="top" colspan="2">
-				<p><span class="vexpl"><span class="red"><b><?=gettext("Note");?>:</b></span><?=gettext("Traceroute may take a while to complete.".      "You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?><p>
+				<p><span class="vexpl"><span class="red"><b><?=gettext("Note");?>:</b></span><?=gettext("Traceroute may take a while to complete. You may hit the Stop button on your browser at any time to see the progress of failed traceroutes.");?><p>
 				<? if ($do_traceroute) {
 					echo "<font face='terminal' size='2'>";
 					echo("<br><strong>Traceroute output:</strong><br>");
-- 
cgit v1.1


From 7728ad5816d0d18cf548bf450fd6c6c3ddc785a6 Mon Sep 17 00:00:00 2001
From: "Neriberto C.Prado" <neriberto@gmail.com>
Date: Wed, 30 Jun 2010 07:09:22 -0300
Subject: Review of diag_ping.php

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index a814f2c..3c0b0ad 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -121,7 +121,7 @@ include("head.inc"); ?>
 				<td valign="top" colspan="2">
 				<? if ($do_ping) {
 					echo "<font face='terminal' size='2'>";
-					echo "<strong>" . gettext("Ping output") . ":</strong><br>");
+					echo "<strong>" . gettext("Ping output") . ":</strong><br>";
 					echo('<pre>');
 					$ifaddr = get_interface_ip($interface);
 					if ($ifaddr)
-- 
cgit v1.1


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

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 6ce7b8d..815de1b 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -641,7 +641,7 @@ function backuparea_change(obj) {
 								</td>
 							</tr>
 						</table>
-						<p><input name="Submit" type="submit" class="formbtn" id="restore" value="Restore configuration"></p>
+						<p><input name="Submit" type="submit" class="formbtn" id="restore" value="<?=gettext("Restore configuration"); ?>"></p>
                       	<p><strong><span class="red">Note:</span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p>
 					</td>
 				</tr>
-- 
cgit v1.1


From 42aa088edc605a8d25a1912ae78d21d628535ed2 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 09:03:05 -0300
Subject: Corrections gettext implementation on diag_backup.php

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 815de1b..f4f045b 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -599,7 +599,7 @@ function backuparea_change(obj) {
 								</td>
 							</tr>
 						</table>
-						<p><input name="Submit" type="submit" class="formbtn" id="download" value="Download configuration"></p>
+						<p><input name="Submit" type="submit" class="formbtn" id="download" value="<?=gettext("Download configuration"); ?>"></p>
 					</td>
 				</tr>
 				<tr>
-- 
cgit v1.1


From e085ff29fa67f25a66f9029bce6b26e9e73ba23d Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Thu, 8 Jul 2010 10:35:30 -0300
Subject: Corrections gettext implementation on diag_backup.php

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index f4f045b..30405a5 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -126,7 +126,7 @@ function spit_out_select_items($area, $showall) {
 	if ($area == "backuparea")
 		$select .= " onChange=backuparea_change(this)";
 	$select .= " >\n";
-	$select .= "<option VALUE=\"\">ALL</option>";
+	$select .= "<option VALUE=\"\">" . gettext("ALL") . "</option>";
 
 	if($showall == true)
 		foreach($areas as $area => $areaname)
@@ -656,7 +656,7 @@ function backuparea_change(obj) {
 					<td width="22%" valign="baseline" class="vncell">&nbsp;</td>
 					<td width="78%" class="vtable">
 						<p><?=gettext("Click this button to reinstall all system packages.  This may take a while."); ?> <br /><br />
-		  				<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="Reinstall packages">
+		  				<input name="Submit" type="submit" class="formbtn" id="reinstallpackages" value="<?=gettext("Reinstall packages"); ?>">
 					</td>
 				</tr>
 				<?php } ?>
-- 
cgit v1.1


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

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php
index 4ff5cec..4818534 100644
--- a/usr/local/www/diag_system_pftop.php
+++ b/usr/local/www/diag_system_pftop.php
@@ -48,7 +48,7 @@ if($_REQUEST['getactivity']) {
 	if($_REQUEST['sorttype'])
 		$sorttype = escapeshellarg($_REQUEST['sorttype']);
 	else
-		$sorttype = "bytes";	
+		$sorttype = gettext("bytes");	
 	$text = `pftop -b -a -o {$sorttype}`;
 	echo $text;
 	exit;
@@ -59,7 +59,7 @@ include("head.inc");
 if($_REQUEST['sorttype'])
 	$sorttype = htmlentities($_REQUEST['sorttype']);
 else
-	$sorttype = "bytes";
+	$sorttype = gettext("bytes");
 
 ?>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
@@ -96,7 +96,7 @@ else
 		print_input_errors($input_errors);
 ?>
 	<form method="post">
-	Sort type: 
+	<?=gettext("Sort type"); ?>: 
 	<select name='sorttype' id='sorttype' onChange='this.form.submit();'>
 		<option value='<?=$sorttype?>'><?=$sorttype?></option>
 		<option value='age'><?=gettext("age");?></option>
-- 
cgit v1.1


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

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index 3c0b0ad..7ab4114 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -85,12 +85,12 @@ include("head.inc"); ?>
 					<td colspan="2" valign="top" class="listtopic">Ping</td>
 				</tr>
                 <tr>
-				  <td width="22%" valign="top" class="vncellreq">Host</td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Host"); ></td>
 				  <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>"></td>
 				</tr>
 				<tr>
-				  <td width="22%" valign="top" class="vncellreq">Interface</td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Interface"); ?></td>
 				  <td width="78%" class="vtable">
 				  <select name="interface" class="formfld">
                       <?php $interfaces = get_configured_interface_with_descr();
@@ -114,7 +114,7 @@ include("head.inc"); ?>
 				<tr>
 				  <td width="22%" valign="top">&nbsp;</td>
 				  <td width="78%"> 
-                    <input name="Submit" type="submit" class="formbtn" value="Ping">
+                    <input name="Submit" type="submit" class="formbtn" value="<?=gettext("Ping"); ?>">
 				</td>
 				</tr>
 				<tr>
-- 
cgit v1.1


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

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php
index efc9c69..5adc7b3 100644
--- a/usr/local/www/diag_routes.php
+++ b/usr/local/www/diag_routes.php
@@ -66,7 +66,7 @@ include('head.inc');
 <tr>
 <td class="vncellreq" width="22%">&nbsp;</td>
 <td class="vtable" width="78%">
-<input type="submit" class="formbtn" name="submit" value="Show" />
+<input type="submit" class="formbtn" name="submit" value="<?=gettext("Show"); ?>" />
 <br />
 <br />
 <span class="vexpl"><span class="red"><strong><?=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>
-- 
cgit v1.1


From 478877e2396a9d6bf1677361b4b91efdc7fb2d8e Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 10:18:34 -0300
Subject: Checked gettext() implementation on diag_ping.php

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index 7ab4114..956ca36 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -85,7 +85,7 @@ include("head.inc"); ?>
 					<td colspan="2" valign="top" class="listtopic">Ping</td>
 				</tr>
                 <tr>
-				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Host"); ></td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Host"); ?>></td>
 				  <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>"></td>
 				</tr>
-- 
cgit v1.1


From 486c214d8325268cda4ed1ade460f37eb8f31bc1 Mon Sep 17 00:00:00 2001
From: Carlos Eduardo Ramos <carlos.ramos@bluepex.com>
Date: Mon, 12 Jul 2010 10:22:31 -0300
Subject: Checked gettext() implementation on diag_backup.php

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 30405a5..2e9e8b2 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -642,7 +642,7 @@ function backuparea_change(obj) {
 							</tr>
 						</table>
 						<p><input name="Submit" type="submit" class="formbtn" id="restore" value="<?=gettext("Restore configuration"); ?>"></p>
-                      	<p><strong><span class="red">Note:</span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p>
+                      	<p><strong><span class="red"><?=gettext("Note"); ?>:</span></strong><br /><?=gettext("The firewall will reboot after restoring the configuration."); ?><br /></p>
 					</td>
 				</tr>
 				<?php if($config['installedpackages']['package'] != "") { ?>
-- 
cgit v1.1


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

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

(limited to 'usr/local/www')

diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index 956ca36..489cab6 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -40,7 +40,7 @@
 ##|*MATCH=diag_ping.php*
 ##|-PRIV
 
-$pgtitle = array(gettext("Diagnostics"), "Ping");
+$pgtitle = array(gettext("Diagnostics"), gettext("Ping"));
 require("guiconfig.inc");
 
 define('MAX_COUNT', 10);
@@ -82,10 +82,10 @@ include("head.inc"); ?>
 			<form action="diag_ping.php" method="post" name="iform" id="iform">
 			  <table width="100%" border="0" cellpadding="6" cellspacing="0">
 				<tr>
-					<td colspan="2" valign="top" class="listtopic">Ping</td>
+					<td colspan="2" valign="top" class="listtopic"><?=gettext("Ping"); ?></td>
 				</tr>
                 <tr>
-				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Host"); ?>></td>
+				  <td width="22%" valign="top" class="vncellreq"><?=gettext("Host"); ?></td>
 				  <td width="78%" class="vtable"> 
                     <?=$mandfldhtml;?><input name="host" type="text" class="formfld" id="host" size="20" value="<?=htmlspecialchars($host);?>"></td>
 				</tr>
-- 
cgit v1.1


From 0ddddb7a8bf62131e243d9c970a6b39f6ee96d65 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Mon, 12 Jul 2010 12:43:24 -0300
Subject: Do not call gettext() to print vars

---
 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 277ad26..0823aec 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -647,7 +647,7 @@ include("head.inc");
 						$interfaces["openvpn"] = "OpenVPN";
 					$selected_interfaces = explode(",", $pconfig['interface']);
 					foreach ($interfaces as $iface => $ifacename): ?>
-						<option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && ( strcasecmp($pconfig['interface'], $iface) == 0 || in_array($iface, $selected_interfaces) )) echo "selected"; ?>><?=gettext($ifacename);?></option>
+						<option value="<?=$iface;?>" <?php if ($pconfig['interface'] <> "" && ( strcasecmp($pconfig['interface'], $iface) == 0 || in_array($iface, $selected_interfaces) )) echo "selected"; ?>><?=$ifacename?></option>
 <?php 				endforeach; ?>
 				</select>
 				<br />
-- 
cgit v1.1