Internationalization batch 1

7 files changed, 21 insertions, 21 deletions

diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php
index 9c5cd80..de3cb58 100644
--- a/src/usr/local/www/crash_reporter.php
+++ b/src/usr/local/www/crash_reporter.php
@@ -124,7 +124,7 @@ exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors);
 			print_r($resp);
 			echo "<p><a href=\"/\">" . gettext("Continue") . "</a>" . gettext(" and delete crash report files from local disk.") . "</p>";
 		} else {
-			echo "Could not find any crash files.";
+			echo gettext("Could not find any crash files.");
 		}
 	} else if (gettext($_POST['Submit']) == "No") {
 		array_map('unlink', glob("/var/crash/*"));
@@ -147,7 +147,7 @@ exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors);
 				}
 			}
 		} else {
-			echo "Could not locate any crash data.";
+			echo gettext("Could not locate any crash data.");
 		}
 ?>
 	<div class="panel panel-default">
diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php
index 4a9775b..0acf06f 100755
--- a/src/usr/local/www/diag_dns.php
+++ b/src/usr/local/www/diag_dns.php
@@ -212,11 +212,11 @@ include("head.inc");
 if ($input_errors) {
 	print_input_errors($input_errors);
 } else if (!$resolved && $type) {
-	print('<div class="alert alert-warning" role="alert">' . gettext("Host") .' "'. $host .'" '. gettext("could not be resolved") . '</div>');
+	print('<div class="alert alert-warning" role="alert">' . sprintf(gettext('Host "%s" could not be resolved'), $host) . '</div>');
 }
 
 if ($createdalias) {
-	print('<div class="alert alert-success" role="alert">'.gettext("Alias was created/updated successfully").'</div>');
+	print('<div class="alert alert-success" role="alert">' . gettext("Alias was created/updated successfully") . '</div>');
 }
 
 $form = new Form('Lookup');
@@ -244,7 +244,7 @@ if (!$input_errors && $type) {
 	if ($resolved):
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title">Results</h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Results')?></h2></div>
 	<div class="panel-body">
 		<ul class="list-group">
 <?php
@@ -264,13 +264,13 @@ if (!$input_errors && $type) {
 
 <!-- Second table displays the server resolution times -->
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title">Timings</h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('Timings')?></h2></div>
 	<div class="panel-body">
 		<table class="table">
 		<thead>
 			<tr>
-				<th>Name server</th>
-				<th>Query time</th>
+				<th><?=gettext('Name server')?></th>
+				<th><?=gettext('Query time')?></th>
 			</tr>
 		</thead>
 
@@ -287,7 +287,7 @@ if (!$input_errors && $type) {
 
 <!-- Third table displays "More information" -->
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title">More information</h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext('More information')?></h2></div>
 	<div class="panel-body">
 		<ul class="list-group">
 			<li class="list-group-item"><a href="/diag_ping.php?host=<?=htmlspecialchars($host)?>&amp;count=3"><?=gettext("Ping")?></a></li>
diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php
index 5a9ab72..91e0f77 100755
--- a/src/usr/local/www/diag_dump_states.php
+++ b/src/usr/local/www/diag_dump_states.php
@@ -212,7 +212,7 @@ print $form;
 
 						<td>
 							<a class="btn fa fa-trash" data-entry="<?=$srcip?>|<?=$dstip?>"
-								title="<?=sprintf(gettext('Remove all state entries from %s to %s'), $srcip, $dstip);?>"></a>
+								title="<?=sprintf(gettext('Remove all state entries from %1$s to %2$s'), $srcip, $dstip);?>"></a>
 						</td>
 					</tr>
 <?php $row++; }
diff --git a/src/usr/local/www/diag_dump_states_sources.php b/src/usr/local/www/diag_dump_states_sources.php
index 5621f9a..6f8f5d7 100644
--- a/src/usr/local/www/diag_dump_states_sources.php
+++ b/src/usr/local/www/diag_dump_states_sources.php
@@ -137,7 +137,7 @@ print $form;
 
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title">Current source tracking entries</h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Current source tracking entries")?></h2></div>
 	<div class="panel-body">
 		<table class="table table-striped">
 			<thead>
@@ -176,7 +176,7 @@ if (count($sources) > 0) {
 
 					<td>
 						<a class="btn btn-xs btn-danger" data-entry="<?=$srcip?>|<?=$dstip?>"
-							title="<?=sprintf(gettext('Remove all source tracking entries from %s to %s'), $srcip, $dstip);?>">Remove</a>
+							title="<?=sprintf(gettext('Remove all source tracking entries from %1$s to %2$s'), $srcip, $dstip);?>"><?=gettext("Remove")?></a>
 					</td>
 				</tr>
 <?php
diff --git a/src/usr/local/www/diag_limiter_info.php b/src/usr/local/www/diag_limiter_info.php
index 4eebab3..93258fe 100644
--- a/src/usr/local/www/diag_limiter_info.php
+++ b/src/usr/local/www/diag_limiter_info.php
@@ -68,13 +68,13 @@ $shortcut_section = "trafficshaper-limiters";
 if ($_REQUEST['getactivity']) {
 	$text = `/sbin/ipfw pipe show`;
 	if ($text == "") {
-		$text = "We could not find any limiters on this system.";
+		$text = gettext("We could not find any limiters on this system.");
 	}
-	echo "Limiters:\n";
+	echo gettext("Limiters:") . "\n";
 	echo $text;
 	$text = `/sbin/ipfw queue show`;
 	if ($text != "") {
-		echo "\n\nQueues:\n";
+		echo "\n\n" . gettext("Queues") . ":\n";
 		echo $text;
 	}
 	exit;
@@ -111,7 +111,7 @@ if ($input_errors) {
 </script>
 
 <div class="panel panel-default">
-	<div class="panel-heading"><h2 class="panel-title">Limiter Information</h2></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("Limiter Information")?></h2></div>
 	<div class="panel-body">
 		<pre id="xhrOutput"><?=gettext("Gathering Limiter information, please wait...")?></pre>
 	</div>
diff --git a/src/usr/local/www/diag_nanobsd.php b/src/usr/local/www/diag_nanobsd.php
index 22bf0be..2ecc2a1 100644
--- a/src/usr/local/www/diag_nanobsd.php
+++ b/src/usr/local/www/diag_nanobsd.php
@@ -90,7 +90,7 @@ if ($_POST['bootslice']) {
 	   sleep(4);
 	}
 
-	$savemsg = gettext("The boot slice has been set to") . " " . nanobsd_get_active_slice();
+	$savemsg = sprintf(gettext("The boot slice has been set to %s"), nanobsd_get_active_slice());
 	$class = 'alert-success';
 	// Survey slice info
 	nanobsd_detect_slice_info();
@@ -139,7 +139,7 @@ if ($_POST['setrw']) {
 	}
 }
 
-print_info_box("The options on this page are intended for use by advanced users only.");
+print_info_box(gettext("The options on this page are intended for use by advanced users only."));
 
 if ($savemsg) {
 	print_info_box($savemsg, $class);
@@ -171,7 +171,7 @@ if (is_writable("/")) {
 	if ($refcount == 1 || $refcount == 0 || $refcount == -1) {
 		$refdisplay = "";
 	} else {
-		$refdisplay = " (Reference count " . $refcount . ")";
+		$refdisplay = " ". sprintf(gettext("(Reference count %s)"), $refcount);
 	}
 	$lbl = gettext("Read/Write") . $refdisplay;
 	$btnlbl = gettext("Switch to Read-Only");
diff --git a/src/usr/local/www/diag_ping.php b/src/usr/local/www/diag_ping.php
index d95fc54..b99f595 100644
--- a/src/usr/local/www/diag_ping.php
+++ b/src/usr/local/www/diag_ping.php
@@ -156,7 +156,7 @@ if ($do_ping) {
 	$result = shell_exec($cmd);
 
 	if (empty($result)) {
-		$input_errors[] = "Host \"" . $host . "\" did not respond or could not be resolved.";
+		$input_errors[] = sprintf(gettext('Host "%s" did not respond or could not be resolved.'), $host);
 	}
 
 }
@@ -207,7 +207,7 @@ if ($do_ping && !empty($result) && !$input_errors) {
 ?>
 	<div class="panel panel-default">
 		<div class="panel-heading">
-			<h2 class="panel-title">Results</h2>
+			<h2 class="panel-title"><?=gettext('Results')?></h2>
 		</div>
 
 		<div class="panel-body">