diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index 08c6540df..ff9833248 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -677,87 +677,87 @@ function upgrade_040_to_041() {
 		$config['sysctl']['item'] = array();
 
 		$config['sysctl']['item'][0]['tunable'] = "net.inet.tcp.blackhole";
-		$config['sysctl']['item'][0]['descr'] =    gettext("Drop packets to closed TCP ports without returning a RST");
+		$config['sysctl']['item'][0]['descr'] =   "Drop packets to closed TCP ports without returning a RST";
 		$config['sysctl']['item'][0]['value'] =   "default";
 
 		$config['sysctl']['item'][1]['tunable'] = "net.inet.udp.blackhole";
-		$config['sysctl']['item'][1]['descr'] =    gettext("Do not send ICMP port unreachable messages for closed UDP ports");
+		$config['sysctl']['item'][1]['descr'] =   "Do not send ICMP port unreachable messages for closed UDP ports";
 		$config['sysctl']['item'][1]['value'] =   "default";
 
 		$config['sysctl']['item'][2]['tunable'] = "net.inet.ip.random_id";
-		$config['sysctl']['item'][2]['descr'] =    gettext("Randomize the ID field in IP packets (default is 0: sequential IP IDs)");
+		$config['sysctl']['item'][2]['descr'] =   "Randomize the ID field in IP packets (default is 0: sequential IP IDs)";
 		$config['sysctl']['item'][2]['value'] =   "default";
 
 		$config['sysctl']['item'][3]['tunable'] = "net.inet.tcp.drop_synfin";
-		$config['sysctl']['item'][3]['descr'] =    gettext("Drop SYN-FIN packets (breaks RFC1379, but nobody uses it anyway)");
+		$config['sysctl']['item'][3]['descr'] =   "Drop SYN-FIN packets (breaks RFC1379, but nobody uses it anyway)";
 		$config['sysctl']['item'][3]['value'] =   "default";
 
 		$config['sysctl']['item'][4]['tunable'] = "net.inet.ip.redirect";
-		$config['sysctl']['item'][4]['descr'] =    gettext("Sending of IPv4 ICMP redirects");
+		$config['sysctl']['item'][4]['descr'] =   "Sending of IPv4 ICMP redirects";
 		$config['sysctl']['item'][4]['value'] =   "default";
 
 		$config['sysctl']['item'][5]['tunable'] = "net.inet6.ip6.redirect";
-		$config['sysctl']['item'][5]['descr'] =    gettext("Sending of IPv6 ICMP redirects");
+		$config['sysctl']['item'][5]['descr'] =   "Sending of IPv6 ICMP redirects";
 		$config['sysctl']['item'][5]['value'] =   "default";
 
 		$config['sysctl']['item'][6]['tunable'] = "net.inet.tcp.syncookies";
-		$config['sysctl']['item'][6]['descr'] =    gettext("Generate SYN cookies for outbound SYN-ACK packets");
+		$config['sysctl']['item'][6]['descr'] =   "Generate SYN cookies for outbound SYN-ACK packets";
 		$config['sysctl']['item'][6]['value'] =   "default";
 
 		$config['sysctl']['item'][7]['tunable'] = "net.inet.tcp.recvspace";
-		$config['sysctl']['item'][7]['descr'] =    gettext("Maximum incoming TCP datagram size");
+		$config['sysctl']['item'][7]['descr'] =   "Maximum incoming TCP datagram size";
 		$config['sysctl']['item'][7]['value'] =   "default";
 
 		$config['sysctl']['item'][8]['tunable'] = "net.inet.tcp.sendspace";
-		$config['sysctl']['item'][8]['descr'] =    gettext("Maximum outgoing TCP datagram size");
+		$config['sysctl']['item'][8]['descr'] =   "Maximum outgoing TCP datagram size";
 		$config['sysctl']['item'][8]['value'] =   "default";
 
 		$config['sysctl']['item'][9]['tunable'] = "net.inet.ip.fastforwarding";
-		$config['sysctl']['item'][9]['descr'] =    gettext("Fastforwarding (see http://lists.freebsd.org/pipermail/freebsd-net/2004-January/002534.html)");
+		$config['sysctl']['item'][9]['descr'] =   "Fastforwarding (see http://lists.freebsd.org/pipermail/freebsd-net/2004-January/002534.html)";
 		$config['sysctl']['item'][9]['value'] =   "default";
 
 		$config['sysctl']['item'][10]['tunable'] = "net.inet.tcp.delayed_ack";
-		$config['sysctl']['item'][10]['descr'] =    gettext("Do not delay ACK to try and piggyback it onto a data packet");
+		$config['sysctl']['item'][10]['descr'] =   "Do not delay ACK to try and piggyback it onto a data packet";
 		$config['sysctl']['item'][10]['value'] =   "default";
 
 		$config['sysctl']['item'][11]['tunable'] = "net.inet.udp.maxdgram";
-		$config['sysctl']['item'][11]['descr'] =    gettext("Maximum outgoing UDP datagram size");
+		$config['sysctl']['item'][11]['descr'] =   "Maximum outgoing UDP datagram size";
 		$config['sysctl']['item'][11]['value'] =   "default";
 
 		$config['sysctl']['item'][12]['tunable'] = "net.link.bridge.pfil_onlyip";
-		$config['sysctl']['item'][12]['descr'] =    gettext("Handling of non-IP packets which are not passed to pfil (see if_bridge(4))");
+		$config['sysctl']['item'][12]['descr'] =   "Handling of non-IP packets which are not passed to pfil (see if_bridge(4))";
 		$config['sysctl']['item'][12]['value'] =   "default";
 
 		$config['sysctl']['item'][13]['tunable'] = "net.link.tap.user_open";
-		$config['sysctl']['item'][13]['descr'] =    gettext("Allow unprivileged access to tap(4) device nodes");
+		$config['sysctl']['item'][13]['descr'] =   "Allow unprivileged access to tap(4) device nodes";
 		$config['sysctl']['item'][13]['value'] =   "default";
 
 		$config['sysctl']['item'][15]['tunable'] = "kern.randompid";
-		$config['sysctl']['item'][15]['descr'] =    gettext("Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())");
+		$config['sysctl']['item'][15]['descr'] =   "Randomize PID's (see src/sys/kern/kern_fork.c: sysctl_kern_randompid())";
 		$config['sysctl']['item'][15]['value'] =   "default";
 
 		$config['sysctl']['item'][16]['tunable'] = "net.inet.tcp.inflight.enable";
-		$config['sysctl']['item'][16]['descr'] =    gettext("The system will attempt to calculate the bandwidth delay product for each connection and limit the amount of data queued to the network to just the amount required to maintain optimum throughput. ");
+		$config['sysctl']['item'][16]['descr'] =   "The system will attempt to calculate the bandwidth delay product for each connection and limit the amount of data queued to the network to just the amount required to maintain optimum throughput.";
 		$config['sysctl']['item'][16]['value'] =   "default";
 
 		$config['sysctl']['item'][17]['tunable'] = "net.inet.icmp.icmplim";
-		$config['sysctl']['item'][17]['descr'] =    gettext("Set ICMP Limits");
+		$config['sysctl']['item'][17]['descr'] =   "Set ICMP Limits";
 		$config['sysctl']['item'][17]['value'] =   "default";
 
 		$config['sysctl']['item'][18]['tunable'] = "net.inet.tcp.tso";
-		$config['sysctl']['item'][18]['descr'] =    gettext("TCP Offload engine");
+		$config['sysctl']['item'][18]['descr'] =   "TCP Offload engine";
 		$config['sysctl']['item'][18]['value'] =   "default";
 
 		$config['sysctl']['item'][19]['tunable'] = "net.inet.ip.portrange.first";
-		$config['sysctl']['item'][19]['descr'] =    "Set the ephemeral port range starting port";
+		$config['sysctl']['item'][19]['descr'] =   "Set the ephemeral port range starting port";
 		$config['sysctl']['item'][19]['value'] =   "default";
 
 		$config['sysctl']['item'][20]['tunable'] = "hw.syscons.kbd_reboot";
-		$config['sysctl']['item'][20]['descr'] =    "Enables ctrl+alt+delete";
+		$config['sysctl']['item'][20]['descr'] =   "Enables ctrl+alt+delete";
 		$config['sysctl']['item'][20]['value'] =   "default";
 
 		$config['sysctl']['item'][21]['tunable'] = "kern.ipc.maxsockbuf";
-		$config['sysctl']['item'][21]['descr'] =    "Maximum socket buffer size";
+		$config['sysctl']['item'][21]['descr'] =   "Maximum socket buffer size";
 		$config['sysctl']['item'][21]['value'] =   "default";
 
 	}
diff --git a/src/www/firewall_nat_1to1.php b/src/www/firewall_nat_1to1.php
index ee64ecbef..247de66a6 100644
--- a/src/www/firewall_nat_1to1.php
+++ b/src/www/firewall_nat_1to1.php
@@ -267,7 +267,7 @@ $main_buttons = array(
                       <a type="submit" id="move_<?=$i;?>" name="move_<?=$i;?>_x" data-toggle="tooltip" title="<?=gettext("move selected rules before this rule");?>" class="act_move btn btn-default btn-xs">
                         <span class="glyphicon glyphicon-arrow-left"></span>
                       </a>
-                      <a href="firewall_nat_1to1_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("edit rule ");?>">
+                      <a href="firewall_nat_1to1_edit.php?id=<?=$i;?>" class="btn btn-default btn-xs" data-toggle="tooltip" title="<?=gettext("edit rule");?>">
                         <span class="glyphicon glyphicon-pencil"></span>
                       </a>
                       <a id="del_<?=$i;?>" title="<?=gettext("delete rule"); ?>" data-toggle="tooltip"  class="act_delete btn btn-default btn-xs">
diff --git a/src/www/interfaces_gif_edit.php b/src/www/interfaces_gif_edit.php
index cfc0628f5..256bf85ef 100644
--- a/src/www/interfaces_gif_edit.php
+++ b/src/www/interfaces_gif_edit.php
@@ -246,11 +246,11 @@ include("head.inc");
                     </td>
                   </tr>
                   <tr>
-                    <td><a id="help_for_link0" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Route caching  "); ?></td>
+                    <td><a id="help_for_link0" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Route caching"); ?></td>
                     <td>
                       <input name="link0" type="checkbox" id="link0" <?=!empty($pconfig['link0']) ? "checked=\"checked\"" :"";?> />
                       <div class="hidden" for="help_for_link0">
-                        <?=gettext("Specify if route caching can be enabled. Be careful with these settings on dynamic networks. "); ?>
+                        <?=gettext("Specify if route caching can be enabled. Be careful with these settings on dynamic networks."); ?>
                       </div>
                     </td>
                   </tr>
@@ -259,8 +259,7 @@ include("head.inc");
                     <td>
                       <input name="link1" type="checkbox" id="link1" <?=!empty($pconfig['link1']) ? "checked=\"checked\"" : "";?> />
                       <div class="hidden" for="help_for_link1">
-                        <?=gettext("Note that the ECN friendly behavior violates RFC2893.  This should be " .
-                        "used in mutual agreement with the peer."); ?>
+                        <?=gettext("Note that the ECN friendly behavior violates RFC2893. This should be used in mutual agreement with the peer."); ?>
                       </div>
                     </td>
                   </tr>
@@ -269,8 +268,7 @@ include("head.inc");
                     <td>
                       <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
                       <div class="hidden" for="help_for_descr">
-                        <?=gettext("You may enter a description here " .
-                        "for your reference (not parsed)."); ?>
+                        <?=gettext("You may enter a description here for your reference (not parsed)."); ?>
                       </div>
                     </td>
                   </tr>
diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php
index c80d0eb7e..158ddf51d 100644
--- a/src/www/interfaces_gre_edit.php
+++ b/src/www/interfaces_gre_edit.php
@@ -183,12 +183,12 @@ include("head.inc");
                     <td>
                       <input name="remote-addr" type="text" value="<?=$pconfig['remote-addr'];?>" />
                       <div class="hidden" for="help_for_remote-addr">
-                        <?=gettext("Peer address where encapsulated GRE packets will be sent ");?>
+                        <?=gettext("Peer address where encapsulated GRE packets will be sent.");?>
                       </div>
                     </td>
                   </tr>
                   <tr>
-                    <td><a id="help_for_tunnel-local-addr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("GRE tunnel local address ");?></td>
+                    <td><a id="help_for_tunnel-local-addr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("GRE tunnel local address");?></td>
                     <td>
                       <input name="tunnel-local-addr" type="text" value="<?=$pconfig['tunnel-local-addr'];?>" />
                       <div class="hidden" for="help_for_tunnel-local-addr">
@@ -197,7 +197,7 @@ include("head.inc");
                     </td>
                   </tr>
                   <tr>
-                    <td><a id="help_for_tunnel-remote-addr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("GRE tunnel remote address ");?></td>
+                    <td><a id="help_for_tunnel-remote-addr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("GRE tunnel remote address");?></td>
                     <td>
                       <table class="table table-condensed">
                         <tr>
@@ -227,7 +227,7 @@ include("head.inc");
                     <td>
                       <input name="link0" type="checkbox" id="link0" <?= !empty($pconfig['link0']) ? "checked=\"checked\"" : "";?> />
                       <div class="hidden" for="help_for_link0">
-                        <?=gettext("Specify which encapsulation method the tunnel should use. ");?>
+                        <?=gettext("Specify which encapsulation method the tunnel should use.");?>
                       </div>
                     </td>
                   </tr>
@@ -236,10 +236,10 @@ include("head.inc");
                     <td>
                       <input name="link1" type="checkbox" id="link1" <?= !empty($pconfig['link1']) ? "checked=\"checked\"" : "";?> />
                       <div class="hidden" for="help_for_link1">
-                        <?=gettext("For correct operation, the GRE device needs a route to the destination".
-                       " that is less specific than the one over the tunnel.  (Basically, there".
-                       " needs to be a route to the decapsulating host that does not run over the".
-                       " tunnel, as this would be a loop.");?>
+                        <?=gettext("For correct operation, the GRE device needs a route to the destination ".
+                       "that is less specific than the one over the tunnel. (Basically, there ".
+                       "needs to be a route to the decapsulating host that does not run over the ".
+                       "tunnel, as this would be a loop.");?>
                       </div>
                     </td>
                   </tr>
@@ -257,8 +257,7 @@ include("head.inc");
                     <td>
                       <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
                       <div class="hidden" for="help_for_descr">
-                        <?=gettext("You may enter a description here " .
-                        "for your reference (not parsed)."); ?>
+                        <?=gettext("You may enter a description here for your reference (not parsed)."); ?>
                       </div>
                     </td>
                   </tr>
diff --git a/src/www/services_dhcp.php b/src/www/services_dhcp.php
index cfe573d34..c7fb321d6 100644
--- a/src/www/services_dhcp.php
+++ b/src/www/services_dhcp.php
@@ -952,10 +952,10 @@ include("head.inc");
                           <input type="button" onclick="show_maccontrol_config()" class="btn btn-default btn-xs" value="<?=gettext("Advanced");?>" /> - <?=gettext("Show MAC Address Control");?>
                         </div>
                         <div id="showmaccontrol" style="display:none">
-                          <?=gettext("Enter a list of partial MAC addresses to allow, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF
-                          <input name="mac_allow" type="text" id="mac_allow" value="<?=$pconfig['mac_allow'];?>" />
-                          <?=gettext("Enter a list of partial MAC addresses to deny access, comma separated, no spaces, such as ");?>00:00:00,01:E5:FF
-                          <input name="mac_deny" type="text" id="mac_deny" value="<?=$pconfig['mac_deny'];?>" /><br />
+                          <?= sprintf(gettext("Enter a list of partial MAC addresses to allow, comma separated, no spaces, such as %s"), '00:00:00,01:E5:FF') ?>
+                          <input name="mac_allow" type="text" id="mac_allow" value="<?= $pconfig['mac_allow'] ?>" />
+                          <?= sprintf(gettext("Enter a list of partial MAC addresses to deny access, comma separated, no spaces, such as %s"), '00:00:00,01:E5:FF') ?>
+                          <input name="mac_deny" type="text" id="mac_deny" value="<?= $pconfig['mac_deny'] ?>" /><br />
                         </div>
                       </td>
                     </tr>