diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php
index 9d5f51d9b3..a82628dfa6 100644
--- a/usr/local/www/diag_dns.php
+++ b/usr/local/www/diag_dns.php
@@ -124,7 +124,7 @@ include("head.inc"); ?>
 							<b><?=gettext("Server");?></b>
 						</td>
 						<td>
-							<b><?=gettext("Query time);></b>
+							<b><?=gettext("Query time");></b>
 						</td>
 					</tr>
 <?php
@@ -155,7 +155,7 @@ include("head.inc"); ?>
 				<p/>
 				<?=gettext("NOTE: The following links are to external services, so their reliability cannot be guaranteed.");?><br/><br/>
 				<a target="_new" href="http://private.dnsstuff.com/tools/whois.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP WHOIS @ DNS Stuff");?></a><br />
-				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff);?></a>
+				<a target="_new" href="http://private.dnsstuff.com/tools/ipall.ch?ip=<?php echo $ipaddr; ?>"><?=gettext("IP Info @ DNS Stuff");?></a>
 			</td>
 		</tr>
 		<?php } ?>
diff --git a/usr/local/www/firewall_nat.php b/usr/local/www/firewall_nat.php
index ccc524bf3f..b66987d9b6 100755
--- a/usr/local/www/firewall_nat.php
+++ b/usr/local/www/firewall_nat.php
@@ -174,7 +174,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 <?php if (is_subsystem_dirty('natconf')): ?><p>
 <?php
 	if($savemsg)
-		print_info_box_np("{$savemsg}<br>gettext("The NAT configuration has been changed.")<br>gettext ("You must apply the changes in order for them to take effect.");
+		print_info_box_np("{$savemsg}<br>gettext("The NAT configuration has been changed.")<br>gettext("You must apply the changes in order for them to take effect.")");
 	else
 		print_info_box_np(gettext("The NAT configuration has been changed.<br>You must apply the changes in order for them to take effect."));
 ?>
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php
index 9017beef21..bcde21b30b 100755
--- a/usr/local/www/firewall_nat_out.php
+++ b/usr/local/www/firewall_nat_out.php
@@ -323,13 +323,9 @@ include("head.inc");
                 </tr>
                 <tr>
                   <td colspan="2"><p><span class="vexpl"><span class="red"><strong>Note:<br>
-                      </strong></span>gettext("If advanced outbound NAT is enabled, no outbound NAT
-                      rules will be automatically generated any longer.") gettext("Instead, only the mappings
-                      you specify below will be used.") gettext("With advanced outbound NAT disabled,
-                      a mapping is automatically created for each interface's subnet
-                      (except WAN).") gettext("If you use target addresses other than the WAN interface's
-		      IP address, then depending on the way your WAN connection is setup, you
-	              may also need a") <a href="firewall_virtual_ip.php">gettext("Virtual IP")</a>.</span><br>
+                      </strong></span>gettext("If advanced outbound NAT is enabled, no outbound NAT rules will be automatically generated any longer.") 		gettext("Instead, only the mappings you specify below will be used.") 
+		gettext("With advanced outbound NAT disabled, a mapping is automatically created for each interface's subnet (except WAN).") 
+		gettext("If you use target addresses other than the WAN interface's IP address, then depending on the way your WAN connection is setup, you may also need a <a href="firewall_virtual_ip.php">Virtual IP")</a>.</span><br>
                       <br>
                       gettext("You may enter your own mappings below.")</p>
                     </td>
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index 5b22a00613..27c6c89f5e 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -399,13 +399,11 @@ blank for any)</td>
                       </tr>
                       <tr>
                         <td>&nbsp;</td>
-                        <td><span class="vexpl">gettext("Enter the destination network for
-                          the outbound NAT mapping.")</span></td>
+                        <td><span class="vexpl">gettext("Enter the destination network for the outbound NAT mapping.")</span></td>
                       </tr>
                       <tr>
-                        <td>Destination port:&nbsp;&nbsp;</td>
-                        <td><input name="dstport" type="text" class="formfld unknown" id="dstport" size="5" value="<?=htmlspecialchars($pconfig['dstport']);?>"> (leave blank for 
-any)</td>
+                        <td>gettext("Destination port:")&nbsp;&nbsp;</td>
+                        <td><input name="dstport" type="text" class="formfld unknown" id="dstport" size="5" value="<?=htmlspecialchars($pconfig['dstport']);?>"> (leave blank for any)</td>
                       </tr>
                     </table>
 		  </td>
@@ -441,8 +439,7 @@ any)</td>
 			</tr>
 			<tr><td>&nbsp;</td><td>
                      <span class="vexpl">gettext("Packets matching this rule will be mapped to the IP address given here.")<br>
-			gettext("If you want this rule to apply to another IP address than the IP address of the interface chosen above,
-			select it here (you need to define <a href="firewall_virtual_ip.php">Virtual IP</a> addresses on the first)").
+			gettext("If you want this rule to apply to another IP address than the IP address of the interface chosen above, 			select it here") gettext("(you need to define <a href="firewall_virtual_ip.php">Virtual IP</a> addresses on the first)").
 			 gettext("Also note that if you are trying to redirect connections on the LAN select the "any" option.")
 			</span>
 			</td></tr>
@@ -471,8 +468,7 @@ any)</td>
                   <td width="22%" valign="top" class="vncell">gettext("Description")</td>
                   <td width="78%" class="vtable">
                     <input name="descr" type="text" class="formfld unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>">
-                    <br> <span class="vexpl">gettext("You may enter a description here
-                    for your reference (not parsed).")</span></td>
+                    <br> <span class="vexpl">gettext("You may enter a description here for your reference (not parsed).")</span></td>
           </tr>
                 <tr>
                   <td width="22%" valign="top">&nbsp;</td>
diff --git a/usr/local/www/firewall_rules.php b/usr/local/www/firewall_rules.php
index 4809d2f7ab..310d1a177e 100755
--- a/usr/local/www/firewall_rules.php
+++ b/usr/local/www/firewall_rules.php
@@ -400,7 +400,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 							$textss = $textse = "";
 						}
 				  ?>
-				  <a href="?if=<?=$if;?>&act=toggle&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfn;?>.gif" width="11" height="11" border="0" title="<?=gettext("click to toggle enabled/disabled status");?>></a>
+				  <a href="<?if=<?=$if;?>&act=toggle&id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_<?=$iconfn;?>.gif" width="11" height="11" border="0" title="<?=gettext("click to toggle enabled/disabled status");?>"</a>
 				  <?php if (isset($filterent['log'])):
 							$iconfnlog = "log_s";
 						if (isset($filterent['disabled']))
@@ -656,7 +656,7 @@ echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript
 					  <td>
 					  <?php if ($nrules == 0): ?>
 					  <img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" border="0"><?php else: ?>
-					  <input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title=<?=gettext("delete selected rules");?>" onclick="return confirm(<?=gettext('Do you really want to delete the selected rules?');?>)"><?php endif; ?>
+					  <input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected rules");?>" onclick="return confirm(<?=gettext("'Do you really want to delete the selected rules?'");?>)"><?php endif; ?>
 					  </td>
 			                  <td><a href="firewall_rules_edit.php?if=<?=$if;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" title="<?=gettext("add new rule");?>" width="17" height="17" border="0"></a></td>
 					</tr>
diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php
index 067098cf3b..1f8dbbc3bd 100755
--- a/usr/local/www/firewall_rules_edit.php
+++ b/usr/local/www/firewall_rules_edit.php
@@ -1333,8 +1333,8 @@ include("head.inc");
 				</select>			
 				<br/>
 				<span class="vexpl">
-					<?=gettext("Choose a Layer7 container to apply application protocol inspection rules.
-					These are valid for TCP and UDP protocols only.");?>
+					<?=gettext("Choose a Layer7 container to apply application protocol inspection rules.")
+					gettext("These are valid for TCP and UDP protocols only.");?>
 				</span>
 			  </div>
 			</td>
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index ec3122e1c0..3143dd17a3 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -159,7 +159,7 @@ EOF;
 	}
 
 
-	## Find out whether there's hardware encryption or not
+/*	## Find out whether there's hardware encryption or not */
 	unset($hwcrypto);
 	$fd = @fopen("{$g['varlog_path']}/dmesg.boot", "r");
 	if ($fd) {
diff --git a/usr/local/www/interfaces_ppps_edit.php b/usr/local/www/interfaces_ppps_edit.php
index f218f3c6c8..ff1303b514 100644
--- a/usr/local/www/interfaces_ppps_edit.php
+++ b/usr/local/www/interfaces_ppps_edit.php
@@ -558,8 +558,7 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp"
 						<td width="22%" valign="top" class="vncell"><?= gettext("Init String"); ?></td>
 						<td width="78%" class="vtable">
 							<input type="text" size="40" class="formfld unknown" id="initstr" name="initstr" value="<?=htmlspecialchars($pconfig['initstr']);?>">
-							<br/><span class="vexpl"><?= gettext("Note: Enter the modem initialization string here. Do NOT include the \"AT\" 
-							string at the beginning of the command. Many modern USB 3G modems don't need an initialization string."); ?></span>
+							<br/><span class="vexpl"><?= gettext("Note: Enter the modem initialization string here. Do NOT include the \"AT\" string at the beginning of the command. Many modern USB 3G modems don't need an initialization string."); ?></span>
 						</td>
 					</tr>
 					<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
@@ -674,16 +673,16 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp"
 		<td valign="top" class="vncell"><?= gettext("Dial On Demand"); ?></td>
 			<td class="vtable">
 				<input type="checkbox" value="on" id="ondemand" name="ondemand" <?php if (isset($pconfig['ondemand'])) echo "checked"; ?>> <?= gettext("Enable Dial-on-Demand mode"); ?> 
-				<br/> <span class="vexpl"><?= gettext("This option causes the interface to operate in dial-on-demand mode, allowing you to have a virtual full time connection. 
-				The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected."); ?> </span>
+				<br/> <span class="vexpl"><?= gettext("This option causes the interface to operate in dial-on-demand mode, allowing you to have a virtual full time connection.")
+				gettext("The interface is configured, but the actual connection of the link is delayed until qualifying outgoing traffic is detected."); ?> </span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
 			<td valign="top" class="vncell"><?= gettext("Idle Timeout"); ?></td>
 			<td class="vtable">
 				<input name="idletimeout" type="text" class="formfld unknown" id="idletimeout" size="12" value="<?=htmlspecialchars($pconfig['idletimeout']);?>"> <?= gettext("(seconds) Default is 0, which disables the timeout feature."); ?>
-				<br/> <span class="vexpl"><?= gettext("If no incoming or outgoing packets are transmitted for the entered number of seconds the connection is brought down.
-				<br/>When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?></span>
+				<br/> <span class="vexpl"><?= gettext("If no incoming or outgoing packets are transmitted for the entered number of seconds the connection is brought down.")
+				<br/>gettext("When the idle timeout occurs, if the dial-on-demand option is enabled, mpd goes back into dial-on-demand mode. Otherwise, the interface is brought down and all associated routes removed."); ?></span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
@@ -699,19 +698,19 @@ $types = array("select" => "Select", "ppp" => "PPP", "pppoe" => "PPPoE", "pptp"
 			<td width="22%" valign="top" class="vncell"><?= gettext("TCPmssFix"); ?></td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="tcpmssfix" name="tcpmssfix" <?php if (isset($pconfig['tcpmssfix'])) echo "checked"; ?>>&nbsp;<?= gettext("Disable tcpmssfix (enabled by default)."); ?>
-				<br/> <span class="vexpl">This option causes mpd to adjust incoming and outgoing TCP SYN segments so that the requested maximum segment size is not greater than the amount 
-				allowed by the interface MTU. This is necessary in many setups to avoid problems caused by routers that drop ICMP Datagram Too Big messages. Without these messages,
-				the originating machine sends data, it passes the rogue router then hits a machine that has an MTU that is not big enough for the data. Because the IP Don't Fragment option is set,
-				this machine sends an ICMP Datagram Too Big message back to the originator and drops the packet. The rogue router drops the ICMP message and the originator never 
-				gets to discover that it must reduce the fragment size or drop the IP Don't Fragment option from its outgoing data.</span>
+				<br/> <span class="vexpl">gettext("This option causes mpd to adjust incoming and outgoing TCP SYN segments so that the requested maximum segment size is not greater than the amount allowed by the interface MTU.")
+				gettext("This is necessary in many setups to avoid problems caused by routers that drop ICMP Datagram Too Big messages.")
+				gettext("Without these messages, the originating machine sends data, it passes the rogue router then hits a machine that has an MTU that is not big enough for the data.")
+				gettext("Because the IP Don't Fragment option is set, this machine sends an ICMP Datagram Too Big message back to the originator and drops the packet.") 
+				gettext("The rogue router drops the ICMP message and the originator never gets to discover that it must reduce the fragment size or drop the IP Don't Fragment option from its outgoing data.")</span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">
 			<td width="22%" valign="top" class="vncell">ShortSeq</td>
 			<td width="78%" class="vtable">
 				<input type="checkbox" value="on" id="shortseq" name="shortseq" <?php if (isset($pconfig['shortseq'])) echo "checked"; ?>>&nbsp;<?= gettext("Disable shortseq (auto-negotiated by default)."); ?>
-				<br/> <span class="vexpl"><?= gettext("This option is only meaningful if multi-link PPP is negotiated. It proscribes shorter multi-link fragment headers, saving two bytes on every frame. 
-				It is not necessary to disable this for connections that are not multi-link."); ?></span>
+				<br/> <span class="vexpl"><?= gettext("This option is only meaningful if multi-link PPP is negotiated. It proscribes shorter multi-link fragment headers, saving two bytes on every frame.")
+				gettext("It is not necessary to disable this for connections that are not multi-link."); ?></span>
 			</td>
 		</tr>
 		<tr style="display:none" id="advanced_<?=$k;?>" name="advanced_<?=$k;$k++;?>">