Merge remote branch 'mainline/master'

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

1 files changed, 3 insertions, 3 deletions

diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php
index d8f5436..bf7be9e 100755
--- a/usr/local/www/diag_pkglogs.php
+++ b/usr/local/www/diag_pkglogs.php
@@ -77,7 +77,7 @@ if(!$apkg) { // If we aren't looking for a specific package, locate the first pa
 	$i = $apkgid;
 }
 
-$pgtitle = array("Status","Package logs");
+$pgtitle = array(gettext("Status"),gettext("Package logs"));
 include("head.inc");
 
 ?>
@@ -88,7 +88,7 @@ include("head.inc");
   <ul id="tabnav">
     <?php
 	if($pkgwithlogging == false) {
-		print_info_box("No packages with logging facilities are currently installed.");
+		print_info_box(gettext("No packages with logging facilities are currently installed."));
 		echo '</ul></td></tr></table>';
 		include("fend.inc");
 		exit;
@@ -112,7 +112,7 @@ include("head.inc");
 		<table width="100%" border="0" cellspacing="0" cellpadding="0">
 		  <tr>
 			<td colspan="2" class="listtopic">
-			  Last <?= $nentries ?> <?= $curtab ?> log entries</td>
+			  <?php printf(gettext("Last %s %s log entries"),$nentries,$curtab); ?></td>
 		  </tr>
 		  <?php
 			$package =& $config['installedpackages']['package'][$apkgid];