Merge pull request #2546 from phil-davis/gt15

4 files changed, 17 insertions, 16 deletions

diff --git a/src/usr/local/www/services_ntpd.php b/src/usr/local/www/services_ntpd.php
index ba54368..f87fa81 100644
--- a/src/usr/local/www/services_ntpd.php
+++ b/src/usr/local/www/services_ntpd.php
@@ -75,7 +75,7 @@ if (empty($config['ntpd']['interface'])) {
 	    is_array($config['installedpackages']['openntpd']['config'][0]) && !empty($config['installedpackages']['openntpd']['config'][0]['interface'])) {
 		$pconfig['interface'] = explode(",", $config['installedpackages']['openntpd']['config'][0]['interface']);
 		unset($config['installedpackages']['openntpd']);
-		write_config("Upgraded settings from openttpd");
+		write_config(gettext("Upgraded settings from openttpd"));
 	} else {
 		$pconfig['interface'] = array();
 	}
diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php
index 6456072..5b74e36 100644
--- a/src/usr/local/www/services_rfc2136_edit.php
+++ b/src/usr/local/www/services_rfc2136_edit.php
@@ -317,8 +317,8 @@ if (isset($id) && $a_rfc2136[$id]) {
 $form->add($section);
 print($form);
 
-print_info_box(sprintf('You must configure a DNS server in %sSystem: ' .
-					'General setup %sor allow the DNS server list to be overridden ' .
-					'by DHCP/PPP on WAN for dynamic DNS updates to work.','<a href="system.php">', '</a>'));
+print_info_box(sprintf(gettext('You must configure a DNS server in %1$sSystem: ' .
+					'General setup %2$sor allow the DNS server list to be overridden ' .
+					'by DHCP/PPP on WAN for dynamic DNS updates to work.'), '<a href="system.php">', '</a>'));
 
 include("foot.inc");
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index c841469..c43ddcd 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -92,8 +92,8 @@ if ($config['installedpackages']['olsrd']) {
 }
 
 if (!$_GET['if']) {
-	$savemsg = "<p><b>" . gettext("The DHCPv6 Server can only be enabled on interfaces configured with static, non unique local IP addresses") . ".</b></p>" .
-		"<p><b>" . gettext("Only interfaces configured with a static IP will be shown") . ".</b></p>";
+	$savemsg = "<p><b>" . gettext("The DHCPv6 Server can only be enabled on interfaces configured with static, non unique local IP addresses.") . "</b></p>" .
+		"<p><b>" . gettext("Only interfaces configured with a static IP will be shown.") . "</b></p>";
 }
 
 $iflist = get_configured_interface_with_descr();
@@ -142,11 +142,12 @@ $priority_modes = array(
 	"high" => 	gettext("High"));
 $carplist = get_configured_carp_interface_list();
 
-$subnets_help = '<span class="help-block">' . gettext("Subnets are specified in CIDR format.  " .
-	"Select the CIDR mask that pertains to each entry.	" .
-	"/128 specifies a single IPv6 host; /64 specifies a normal IPv6 network; etc.  " .
-	"If no subnets are specified here, the Router Advertisement (RA) Daemon will advertise to the subnet to which the router's interface is assigned." .
-	'</span>');
+$subnets_help = '<span class="help-block">' .
+	gettext("Subnets are specified in CIDR format.  " .
+		"Select the CIDR mask that pertains to each entry.	" .
+		"/128 specifies a single IPv6 host; /64 specifies a normal IPv6 network; etc.  " .
+		"If no subnets are specified here, the Router Advertisement (RA) Daemon will advertise to the subnet to which the router's interface is assigned.") .
+	'</span>';
 
 if ($_POST) {
 	unset($input_errors);
diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php
index be135cb..b23b81b 100644
--- a/src/usr/local/www/services_wol.php
+++ b/src/usr/local/www/services_wol.php
@@ -83,10 +83,10 @@ if ($_GET['wakeall'] != "") {
 		$bcip = gen_subnet_max($ipaddr, get_interface_subnet($if));
 		/* Execute wol command and check return code. */
 		if (!mwexec("/usr/local/bin/wol -i {$bcip} {$mac}")) {
-			$savemsg .= sprintf(gettext('Sent magic packet to %1$s (%2$s)%3$s'), $mac, $description, ".<br />");
+			$savemsg .= sprintf(gettext('Sent magic packet to %1$s (%2$s).'), $mac, $description) . "<br />";
 			$class = 'success';
 		} else {
-			$savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s (%4$s) did not complete successfully%5$s'), '<a href="/status_logs.php">', '</a>', $description, $mac, ".<br />");
+			$savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s (%4$s) did not complete successfully.'), '<a href="/status_logs.php">', '</a>', $description, $mac) . "<br />";
 			$class = 'warning';
 		}
 	}
@@ -127,7 +127,7 @@ if ($_POST || $_GET['mac']) {
 				$savemsg .= sprintf(gettext("Sent magic packet to %s."), $mac);
 				$class = 'success';
 			} else {
-				$savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s did not complete successfully%4$s'), '<a href="/status_logs.php">', '</a>', $mac, ".<br />");
+				$savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s did not complete successfully.'), '<a href="/status_logs.php">', '</a>', $mac) . "<br />";
 				$class = 'warning';
 			}
 		}
@@ -148,9 +148,9 @@ include("head.inc");
 ?>
 <div class="infoblock blockopen">
 <?php
-print_info_box(gettext('This service can be used to wake up (power on) computers by sending special') . ' "' . gettext('Magic Packets') . '"<br />' .
+print_info_box(gettext('This service can be used to wake up (power on) computers by sending special "Magic Packets".') . '<br />' .
 			   gettext('The NIC in the computer that is to be woken up must support Wake on LAN and must be properly configured (WOL cable, BIOS settings).'),
-			   'info');
+			   'info', false);
 
 ?>
 </div>