src: reduce diff against master

src/pkg/miniupnpd.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <packagegui>
-	<title>Services: Universal Plug and Play</title>
+	<title>Services: Universal Plug and Play: Settings</title>
 	<name>miniupnpd</name>
 	<version>20100712</version>
 	<service>

src/www/diag_authentication.php

 <?php
+
 /*
-    Copyright (C) 2014 Deciso B.V.
+	Copyright (C) 2014 Deciso B.V.
 	Copyright (C) 2010 Ermal Luçi
 	All rights reserved.
 
@@ -28,7 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("PEAR.inc");
-require_once("radius.inc");
+require_once("interfaces.inc");
 
 function getUserGroups($username, $authcfg)
 {
@@ -101,7 +102,7 @@ include("head.inc");
                 <div class="content-box">
 
 					<header class="content-box-head container-fluid">
-				   <h3>Test a server</h3>
+				   <h3><?= gettext('Test a server') ?></h3>
 				</header>
 
 				    <div class="content-box-main">

src/www/diag_dns.php

@@ -78,7 +78,7 @@ if(isset($_POST['create_alias']) && (is_hostname($host) || is_ipaddr($host))) {
 			$newalias['name'] = $aliasname;
 			$newalias['type'] = "network";
 			$newalias['address'] = $addresses;
-			$newalias['descr'] = "Created from Diagnostics-> DNS Lookup";
+			$newalias['descr'] = gettext('Created from Diagnostics-> DNS Lookup');
 			if($override)
 				$a_aliases[$id] = $newalias;
 			else
@@ -208,14 +208,14 @@ include("head.inc"); ?>
 							          <td>
 								      <?php if($found > 0): ?>
 											  <?php	if($alias_exists): ?>
-												An alias already exists for the hostname <?= htmlspecialchars($host) ?>. <br />
+												<?= sprintf(gettext('An alias already exists for the hostname %s.'), htmlspecialchars($host)) ?>. <br />
 												<input type="hidden" name="override" value="true"/>
 												<input type="submit" class="btn btn-default" name="create_alias" value="Overwrite Alias"/>
 											  <?php else: ?>
 											  <?php if(!$createdalias): ?>
 												<input type="submit" class="btn btn-default" name="create_alias" value="Create Alias"/>
 											  <?php else: ?>
-											   Alias created with name <?= htmlspecialchars($newalias['name']) ?>
+											   <?= sprintf(gettext('Alias created with name %s.'), htmlspecialchars($newalias['name'])) ?>
 											  <?php endif; endif; endif; ?>
 											  </td>
 							          <?php else: ?>

src/www/diag_limiter_info.php

@@ -34,7 +34,7 @@ $shortcut_section = "trafficshaper-limiters";
 if(isset($_POST['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 $text;
 	$text = `/sbin/ipfw queue show`;

src/www/diag_logs_filter_plain.php

+<?php
+
+/*
+	Copyright (C) 2014 Deciso B.V.
+	Copyright (C) 2009-2010 Jim Pingle <jpingle@gmail.com>
+	Copyright (C) 2004-2009 Scott Ullrich
+	Copyright (C) 2003-2009 Manuel Kasper <mk@neon1.net>
+	Originally Sponsored By Anathematic @ pfSense Forums
+	All rights reserved.
+
+	Redistribution and use in source and binary forms, with or without
+	modification, are permitted provided that the following conditions are met:
+
+	1. Redistributions of source code must retain the above copyright notice,
+	   this list of conditions and the following disclaimer.
+
+	2. Redistributions in binary form must reproduce the above copyright
+	   notice, this list of conditions and the following disclaimer in the
+	   documentation and/or other materials provided with the distribution.
+
+	THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+	OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+	SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+	INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+	CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	POSSIBILITY OF SUCH DAMAGE.
+*/
+
+require_once("guiconfig.inc");
+require_once("filter.inc");
+require_once("filter_log.inc");
+require_once("system.inc");
+require_once("pfsense-utils.inc");
+require_once("interfaces.inc");
+
+$filter_logfile = '/var/log/filter.log';
+
+if (isset($config['syslog']['nentries'])) {
+	$nentries = $config['syslog']['nentries'];
+}  else {
+	$nentries = 50;
+}
+
+if (isset($_POST['clear'])) {
+	clear_clog($filter_logfile);
+}
+
+$pgtitle = array(gettext('Firewall'), gettext('Log Files'), gettext('Plain View'));
+$shortcut_section = "firewall";
+include("head.inc");
+
+?>
+
+<body>
+
+<?php include("fbegin.inc"); ?>
+
+	<section class="page-content-main">
+		<div class="container-fluid">
+			<div class="row">
+
+				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
+
+			     <section class="col-xs-12">
+
+					<div class="tab-content content-box col-xs-12">
+
+							<div class="table-responsive">
+								<table class="table table-striped table-sort">
+
+
+								  <tr>
+									<td colspan="2" class="listtopic">
+									  <strong><?php printf(gettext("Last %s firewall log entries"),$nentries);?></strong></td>
+								  </tr>
+								  <?php dump_clog($filter_logfile, $nentries); ?>
+								<tr><td colspan="2">
+								<form id="clearform" name="clearform" action="diag_logs_filter.php" method="post" style="margin-top: 14px;">
+									<input id="submit" name="clear" type="submit" class="btn btn-primary" value="<?=gettext("Clear log");?>" />
+								</form>
+								</td></tr>
+
+								</table>
+								</div>
+							</td>
+						  </tr>
+						</table>
+				    </div>
+			</section>
+			</div>
+		</div>
+	</section>
+
+<?php include("foot.inc"); ?>

src/www/diag_packet_capture.php

@@ -260,9 +260,9 @@ include("fbegin.inc");
 					          <td><?=gettext("Address Family");?></td>
 					          <td>
 						          <select name="fam" class="form-control">
-											<option value="">Any</option>
-											<option value="ip" <?php if ($fam == "ip") echo "selected=\"selected\""; ?>>IPv4 Only</option>
-											<option value="ip6" <?php if ($fam == "ip6") echo "selected=\"selected\""; ?>>IPv6 Only</option>
+											<option value=""><?=gettext('Any') ?></option>
+                      <option value="ip" <?php if ($fam == "ip") echo "selected=\"selected\""; ?>><?= gettext('IPv4 Only') ?></option>
+                      <option value="ip6" <?php if ($fam == "ip6") echo "selected=\"selected\""; ?>><?= gettext('IPv6 Only') ?></option>
 										</select>
 										<p class="text-muted"><em><small><?=gettext("Select the type of traffic to be captured, either Any, IPv4 only or IPv6 only.");?></small></em></p>
 									</td>
@@ -271,20 +271,20 @@ include("fbegin.inc");
 					          <td><?=gettext("Protocol");?></td>
 					          <td>
 						          <select name="proto" class="form-control">
-											<option value="">Any</option>
-											<option value="icmp" <?php if ($proto == "icmp") echo "selected=\"selected\""; ?>>ICMP</option>
-											<option value="!icmp" <?php if ($proto == "!icmp") echo "selected=\"selected\""; ?>>Exclude ICMP</option>
-											<option value="icmp6" <?php if ($proto == "icmp6") echo "selected=\"selected\""; ?>>ICMPv6</option>
-											<option value="!icmp6" <?php if ($proto == "!icmp6") echo "selected=\"selected\""; ?>>Exclude ICMPv6</option>
-											<option value="tcp" <?php if ($proto == "tcp") echo "selected=\"selected\""; ?>>TCP</option>
-											<option value="!tcp" <?php if ($proto == "!tcp") echo "selected=\"selected\""; ?>>Exclude TCP</option>
-											<option value="udp" <?php if ($proto == "udp") echo "selected=\"selected\""; ?>>UDP</option>
-											<option value="!udp" <?php if ($proto == "!udp") echo "selected=\"selected\""; ?>>Exclude UDP</option>
-											<option value="arp" <?php if ($proto == "arp") echo "selected=\"selected\""; ?>>ARP</option>
-											<option value="!arp" <?php if ($proto == "!arp") echo "selected=\"selected\""; ?>>Exclude ARP</option>
-											<option value="carp" <?php if ($proto == "carp") echo "selected=\"selected\""; ?>>CARP (VRRP)</option>
-											<option value="!carp" <?php if ($proto == "!carp") echo "selected=\"selected\""; ?>>Exclude CARP (VRRP)</option>
-											<option value="esp" <?php if ($proto == "esp") echo "selected=\"selected\""; ?>>ESP</option>
+											<option value=""><?=gettext('Any') ?></option>
+                      <option value="icmp" <?php if ($proto == "icmp") echo "selected=\"selected\""; ?>><?= gettext('ICMP') ?></option>
+                      <option value="!icmp" <?php if ($proto == "!icmp") echo "selected=\"selected\""; ?>><?= gettext('Exclude ICMP') ?></option>
+                      <option value="icmp6" <?php if ($proto == "icmp6") echo "selected=\"selected\""; ?>><?= gettext('ICMPv6') ?></option>
+                      <option value="!icmp6" <?php if ($proto == "!icmp6") echo "selected=\"selected\""; ?>><?= gettext('Exclude ICMPv6') ?></option>
+                      <option value="tcp" <?php if ($proto == "tcp") echo "selected=\"selected\""; ?>><?= gettext('TCP') ?></option>
+                      <option value="!tcp" <?php if ($proto == "!tcp") echo "selected=\"selected\""; ?>><?= gettext('Exclude TCP') ?></option>
+                      <option value="udp" <?php if ($proto == "udp") echo "selected=\"selected\""; ?>><?= gettext('UDP') ?></option>
+                      <option value="!udp" <?php if ($proto == "!udp") echo "selected=\"selected\""; ?>><?= gettext('Exclude UDP') ?></option>
+                      <option value="arp" <?php if ($proto == "arp") echo "selected=\"selected\""; ?>><?= gettext('ARP') ?></option>
+                      <option value="!arp" <?php if ($proto == "!arp") echo "selected=\"selected\""; ?>><?= gettext('Exclude ARP') ?></option>
+                      <option value="carp" <?php if ($proto == "carp") echo "selected=\"selected\""; ?>><?= gettext('CARP (VRRP)') ?></option>
+                      <option value="!carp" <?php if ($proto == "!carp") echo "selected=\"selected\""; ?>><?= gettext('Exclude CARP (VRRP)') ?></option>
+                      <option value="esp" <?php if ($proto == "esp") echo "selected=\"selected\""; ?>><?= gettext('ESP') ?></option>
 										</select>
 										<p class="text-muted"><em><small><?=gettext("Select the protocol to capture, or Any.");?></small></em></p>
 					          </td>

src/www/diag_ping.php

@@ -98,14 +98,14 @@ include("head.inc"); ?>
 						        <tr>
 						          <td><?=gettext("IP Protocol"); ?></td>
 						          <td><select name="ipproto" class="form-control">
-			<option value="ipv4" <?php if ($ipproto == "ipv4") echo "selected=\"selected\"" ?>>IPv4</option>
-			<option value="ipv6" <?php if ($ipproto == "ipv6") echo "selected=\"selected\"" ?>>IPv6</option>
+                      <option value="ipv4" <?php if ($ipproto == "ipv4") echo "selected=\"selected\"" ?>><?= gettext('IPv4') ?></option>
+                      <option value="ipv6" <?php if ($ipproto == "ipv6") echo "selected=\"selected\"" ?>><?= gettext('IPv6') ?></option>
 		</select></td>
 						        </tr>
 						        <tr>
 						          <td><?=gettext("Source Address"); ?></td>
 						          <td><select name="sourceip" class="form-control">
-			<option value="">Default</option>
+                      <option value=""><?= gettext('Default') ?></option>
 		<?php $sourceips = get_possible_traffic_source_addresses(true);
 			foreach ($sourceips as $sip):
 				$selected = "";

src/www/diag_sockets.php

@@ -38,7 +38,7 @@ include('head.inc');
 <?php include("fbegin.inc");
 
 $showAll = isset($_GET['showAll']);
-$showAllText = $showAll ? "Show only listening sockets" : "Show all socket connections";
+$showAllText = $showAll ? gettext("Show only listening sockets") : gettext("Show all socket connections");
 $showAllOption = $showAll ? "" : "?showAll";
 
 ?>
@@ -49,9 +49,9 @@ $showAllOption = $showAll ? "" : "?showAll";
 
 			<section class="col-xs-12">
 
-                <p>Information about listening sockets for both <a href="#IPv4">IPv4</a> and <a href="#IPv6">IPv6</a>.</p>
-                <p>For explanation about the meaning of the information listed for each socket click <a href="#about">here</a>.</p>
-                <p><input type="button" class="btn btn-default" value="<?=$showAllText?>" onclick="window.location.href='diag_sockets.php<?=$showAllOption?>'"/><br/>To show information about both listening and connected sockets click this.</p>
+      <p><?= sprintf(gettext('Information about listening sockets for both %sIPv4%s and %sIPv6%s.'), '<a href="#IPv4">','</a>','<a href="#IPv6">','</a>') ?></p>
+      <p><?= sprintf(gettext('For explanation about the meaning of the information listed for each socket click %shere%s.'),'<a href="#about">','</a>') ?></p>
+      <p><input type="button" class="btn btn-default" value="<?=$showAllText?>" onclick="window.location.href='diag_sockets.php<?=$showAllOption?>'"/><br/><?= gettext('To show information about both listening and connected sockets click this.') ?></p>
 
 				<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
 			</section>
@@ -120,21 +120,20 @@ $showAllOption = $showAll ? "" : "?showAll";
 				    </header>
 
 				    <div class="content-box-main col-xs-12">
-						<p>This page show the output for the commands: "sockstat -4lL" and "sockstat -6lL".<br />
-Or in case of showing all sockets the output for: "sockstat -4" and "sockstat -6".<br />
-<br />
-The information listed for each socket is:</p>
+            <p><?= sprintf(gettext('This page show the output for the commands: "sockstat -4lL" and "sockstat -6lL".%s' .
+                                    'Or in case of showing all sockets the output for: "sockstat -4" and "sockstat -6".%s%s' .
+                                    'The information listed for each socket is:'),'<br />','<br />','<br />') ?></p>
 				    </div>
 
 					<table class="table table-striped table-sort sortable __nomb" id="IPv4" summary="ipv4 routes">
-						<tr><td class="listlr">USER	      </td><td class="listr">The user who owns the socket.</td></tr>
-						<tr><td class="listlr">COMMAND	      </td><td class="listr">The command which holds the socket.</td></tr>
-						<tr><td class="listlr">PID	      </td><td class="listr">The process ID of the command which holds the socket.</td></tr>
-						<tr><td class="listlr">FD	      </td><td class="listr">The file descriptor number of the socket.</td></tr>
-						<tr><td class="listlr">PROTO	      </td><td class="listr">The transport protocol associated with the socket for Internet sockets, or the type of socket (stream or data-gram) for UNIX sockets.</td></tr>
-						<tr><td class="listlr">ADDRESS	      </td><td class="listr">(UNIX sockets only) For bound sockets, this is the file-name of the socket. <br />For other sockets, it is the name, PID and file descriptor number of the peer, or ``(none)'' if the socket is neither bound nor connected.</td></tr>
-						<tr><td class="listlr">LOCAL ADDRESS    </td><td class="listr">(Internet sockets only) The address the local end of the socket is bound to (see getsockname(2)).</td></tr>
-						<tr><td class="listlr">FOREIGN ADDRESS  </td><td class="listr">(Internet sockets only) The address the foreign end of the socket is bound to (see getpeername(2)).</td></tr>
+          <tr><td class="listlr">USER</td><td class="listr"><?= gettext('The user who owns the socket.') ?></td></tr>
+          <tr><td class="listlr">COMMAND</td><td class="listr"><?= gettext('The command which holds the socket.') ?></td></tr>
+          <tr><td class="listlr">PID</td><td class="listr"><?= gettext('The process ID of the command which holds the socket.') ?></td></tr>
+          <tr><td class="listlr">FD</td><td class="listr"><?= gettext('The file descriptor number of the socket.') ?></td></tr>
+          <tr><td class="listlr">PROTO</td><td class="listr"><?= gettext('The transport protocol associated with the socket for Internet sockets, or the type of socket (stream or data-gram) for UNIX sockets.') ?></td></tr>
+          <tr><td class="listlr">ADDRESS</td><td class="listr"><?= sprintf(gettext("(UNIX sockets only) For bound sockets, this is the file-name of the socket. %sFor other sockets, it is the name, PID and file descriptor number of the peer, or ``(none)'' if the socket is neither bound nor connected."),'<br />') ?></td></tr>
+          <tr><td class="listlr">LOCAL ADDRESS</td><td class="listr"><?= gettext('(Internet sockets only) The address the local end of the socket is bound to (see getsockname(2)).') ?></td></tr>
+          <tr><td class="listlr">FOREIGN ADDRESS</td><td class="listr"><?= gettext('(Internet sockets only) The address the foreign end of the socket is bound to (see getpeername(2)).') ?></td></tr>
 					</table>
 
                 </div>

src/www/diag_system_pftop.php

@@ -150,7 +150,7 @@ $( document ).ready(function() {
                       <option value='200' selected="selected">200</option>
                       <option value='500'>500</option>
                       <option value='1000'>1000</option>
-                      <option value='9999999999'>all</option>
+                      <option value='9999999999'><?= gettext('all') ?></option>
                     </select>
                   </div>
                 </td>

src/www/diag_tables.php

@@ -73,7 +73,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
     }
 }
 
-$pgtitle = array(gettext("Diagnostics"), gettext("Tables"));
+$pgtitle = array(gettext("Diagnostics"), gettext("pfTables"));
 $shortcut_section = "aliases";
 // fetch list of tables and content of selected table
 $tables = json_decode(configd_run("filter list tables json"));

src/www/diag_testport.php

@@ -131,7 +131,7 @@ include("head.inc"); ?>
 						        <tr>
 						          <td><?=gettext("Source Address"); ?></td>
 						          <td><select name="sourceip" class="form-control">
-											<option value="">Any</option>
+                      <option value=""><?= gettext('Any') ?></option>
 										<?php   $sourceips = get_possible_traffic_source_addresses(true);
 											foreach ($sourceips as $sip):
 												$selected = "";
@@ -150,7 +150,7 @@ include("head.inc"); ?>
 						          <td>
 							          <select name="ipprotocol" class="form-control">
 											<option value="any" <?php if ("any" == $ipprotocol) echo "selected=\"selected\""; ?>>
-												Any
+                        <?= gettext('Any') ?>
 											</option>
 											<option value="ipv4" <?php if ($ipprotocol == "ipv4") echo "selected=\"selected\""; ?>>
 												<?=gettext("IPv4");?>

src/www/diag_traceroute.php

@@ -107,14 +107,14 @@ if (!isset($do_traceroute)) {
 						        <tr>
 						          <td><?=gettext("IP Protocol"); ?></td>
 						          <td><select name="ipproto" class="form-control">
-			<option value="ipv4" <?php if ($ipproto == "ipv4") echo "selected=\"selected\"" ?>>IPv4</option>
-			<option value="ipv6" <?php if ($ipproto == "ipv6") echo "selected=\"selected\"" ?>>IPv6</option>
+                      <option value="ipv4" <?php if ($ipproto == "ipv4") echo "selected=\"selected\"" ?>><?= gettext('IPv4') ?></option>
+                      <option value="ipv6" <?php if ($ipproto == "ipv6") echo "selected=\"selected\"" ?>><?= gettext('IPv6') ?></option>
 		</select></td>
 						        </tr>
 						        <tr>
 						          <td><?=gettext("Source Address"); ?></td>
 						          <td><select name="sourceip" class="form-control">
-											<option value="">Any</option>
+                      <option value=""><?= gettext('Any') ?></option>
 										<?php   $sourceips = get_possible_traffic_source_addresses(true);
 											foreach ($sourceips as $sip):
 												$selected = "";

src/www/reboot.php

 <?php
+
 /*
 	Copyright (C) 2014-2015 Deciso B.V.
 	Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
@@ -27,7 +28,6 @@
 */
 
 require_once("guiconfig.inc");
-require_once("captiveportal.inc");
 require_once("system.inc");
 
 $pgtitle = array(gettext("Diagnostics"),gettext("Reboot System"));

src/www/services_dhcp_edit.php

@@ -397,16 +397,16 @@ include("head.inc");
 							                </tr>
 							                <?php if($netboot_enabled) { ?>
 									<tr>
-									  <td width="22%" valign="top" class="vncell">Netboot Filename</td>
+                    <td width="22%" valign="top" class="vncell"><?= gettext('Netboot Filename') ?></td>
 									  <td width="78%" class="vtable">
 									    <input name="filename" type="text" class="formfld unknown" id="filename" size="20" value="<?=htmlspecialchars($pconfig['filename']);?>" />
-									    <br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
+                      <br /> <span class="vexpl"><?= gettext('Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.') ?></span></td>
 									</tr>
 									<tr>
-									  <td width="22%" valign="top" class="vncell">Root Path</td>
+                    <td width="22%" valign="top" class="vncell"><?= gettext('Root Path') ?></td>
 									  <td width="78%" class="vtable">
 										<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" />
-									    <br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td>
+                      <br /> <span class="vexpl"><?= gettext("Enter the root-path-string, overrides setting on main page.") ?></span></td>
 									</tr>
 									<?php } ?>
 							                <tr>

src/www/services_dhcp_relay.php

@@ -137,7 +137,7 @@ function enable_change(enable_over) {
                         <form action="services_dhcp_relay.php" method="post" name="iform" id="iform">
 
 				<?php if ($dhcpd_enabled): ?>
-								<p>DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.</p>
+                <p><?= gettext('DHCP Server is currently enabled. Cannot enable the DHCP Relay service while the DHCP Server is enabled on any interface.') ?></p>
 							<?php else: ?>
 
 							<header class="content-box-head container-fluid">
@@ -148,14 +148,14 @@ function enable_change(enable_over) {
 						  <div class="table-responsive">
 					<table class="table table-striped table-sort">
 									<tr>
-							                        <td width="22%" valign="top" class="vncellreq">Enable</td>
+                                      <td width="22%" valign="top" class="vncellreq"><?= gettext('Enable') ?></td>
 							                        <td width="78%" class="vtable">
 										<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
 							                          <strong><?php printf(gettext("Enable DHCP relay on interface"));?></strong>
 										</td>
 									</tr>
 									<tr>
-							                        <td width="22%" valign="top" class="vncellreq">Interface(s)</td>
+                                      <td width="22%" valign="top" class="vncellreq"><?= gettext('Interface(s)') ?></td>
 							                        <td width="78%" class="vtable">
 											<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3">
 										<?php
@@ -169,7 +169,7 @@ function enable_change(enable_over) {
 											}
 										?>
 							                                </select>
-											<br />Interfaces without an IP address will not be shown.
+                      <br /><?= gettext('Interfaces without an IP address will not be shown.') ?>
 										</td>
 									</tr>
 									<tr>

src/www/services_dhcpv6.php

@@ -508,7 +508,7 @@ include("head.inc");
                         <form action="services_dhcpv6.php" method="post" name="iform" id="iform">
 
 							<?php if ($dhcrelay_enabled): ?>
-								<p>DHCP Relay is currently enabled. Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface.</p>
+              <p><?= gettext('DHCP Relay is currently enabled. Cannot enable the DHCP Server service while the DHCP Relay is enabled on any interface.') ?></p>
 							<?php else: ?>
 
 						    <!--<ul class="nav nav-pills" role="tablist"><?php foreach ($tab_array as $tab): ?>

src/www/services_dhcpv6_edit.php

@@ -198,7 +198,7 @@ include("head.inc");
 					                    <input name="duid" type="text" class="formfld unknown" id="duid" size="40" value="<?=htmlspecialchars($pconfig['duid']);?>" />
 					                    <br />
 					                    <span class="vexpl"><?=gettext("Enter a DUID Identifier in the following format: ");?><br />
-					"DUID-LLT - ETH -- TIME --- ---- address ----" <br />
+          "<?= gettext('DUID-LLT - ETH -- TIME --- ---- ADDR ----') ?>" <br />
 					"xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx:xx"</span></td>
 					                </tr>
 					                <tr>
@@ -219,16 +219,16 @@ include("head.inc");
 					                </tr>
 					                <?php if($netboot_enabled) { ?>
 							<tr>
-							  <td width="22%" valign="top" class="vncell">Netboot filename</td>
+                <td width="22%" valign="top" class="vncell"><?= gettext('Netboot filename') ?></td>
 							  <td width="78%" class="vtable">
 							    <input name="filename" type="text" class="formfld unknown" id="filename" size="28" value="<?=htmlspecialchars($pconfig['filename']);?>" />
-							    <br /> <span class="vexpl">Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.</span></td>
+                  <br /> <span class="vexpl"><?= gettext('Name of the file that should be loaded when this host boots off of the network, overrides setting on main page.') ?></span></td>
 							</tr>
 							<tr>
-							  <td width="22%" valign="top" class="vncell">Root Path</td>
+                <td width="22%" valign="top" class="vncell"><?= gettext('Root Path') ?></td>
 							  <td width="78%" class="vtable">
 								<input name="rootpath" type="text" class="formfld unknown" id="rootpath" size="90" value="<?=htmlspecialchars($pconfig['rootpath']);?>" />
-							    <br /> <span class="vexpl"><?=gettext("Enter the"); ?> <b><?=gettext("root-path"); ?></b>-<?=gettext("string");?>, overrides setting on main page.</span></td>
+                  <br /> <span class="vexpl"><?= gettext('Enter the root-path-string, overrides setting on main page.') ?></span></td>
 							</tr>
 							<?php } ?>
 					                <tr>

src/www/services_dhcpv6_relay.php

@@ -133,7 +133,7 @@ function enable_change(enable_over) {
                         <form action="services_dhcpv6_relay.php" method="post" name="iform" id="iform">
 
 				<?php if ($dhcpd_enabled): ?>
-								<p>DHCPv6 Server is currently enabled.  Cannot enable the DHCPv6 Relay service while the DHCPv6 Server is enabled on any interface.</p>
+                <p><?= gettext('DHCPv6 Server is currently enabled.  Cannot enable the DHCPv6 Relay service while the DHCPv6 Server is enabled on any interface.') ?></p>
 							<?php else: ?>
 
 							<header class="content-box-head container-fluid">
@@ -145,14 +145,14 @@ function enable_change(enable_over) {
 					<table class="table table-striped table-sort">
 
 									<tr>
-							                        <td width="22%" valign="top" class="vncellreq">Enable</td>
+                                      <td width="22%" valign="top" class="vncellreq"><?= gettext('Enable') ?></td>
 							                        <td width="78%" class="vtable">
 										<input name="enable" type="checkbox" value="yes" <?php if ($pconfig['enable']) echo "checked=\"checked\""; ?> onclick="enable_change(false)" />
 							                          <strong><?php printf(gettext("Enable DHCPv6 relay on interface"));?></strong>
 										</td>
 									</tr>
 									<tr>
-							                        <td width="22%" valign="top" class="vncellreq">Interface(s)</td>
+                                      <td width="22%" valign="top" class="vncellreq"><?= gettext('Interface(s)') ?></td>
 							                        <td width="78%" class="vtable">
 											<select id="interface" name="interface[]" multiple="multiple" class="formselect" size="3">
 										<?php

src/www/widgets/widgets/system_log.widget.php

@@ -72,7 +72,7 @@ if(is_numeric($_POST['logfiltercount'])) {
 
 <div id="system_log-widgets" class="content-box" style="overflow:scroll;">
 	<table class="table table-striped" cellspacing="0" cellpadding="0">
-		<?php dump_clog($system_logfile, $syslogEntriesToFetch, true, array(), array("ppp")); ?>
+		<?php dump_clog($system_logfile, $syslogEntriesToFetch); ?>
 	</table>
 </div>