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, 4 insertions, 4 deletions

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