diff --git a/src/www/firewall_nat_out_edit.php b/src/www/firewall_nat_out_edit.php
index 2817c60c2..7a4f63008 100644
--- a/src/www/firewall_nat_out_edit.php
+++ b/src/www/firewall_nat_out_edit.php
@@ -601,10 +601,9 @@ include("head.inc");
                       </table>
                       <div class="hidden" for="help_for_target">
                         <?=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 rather than the IP address of the interface chosen above, ".
-                                "select it here (you will need to define ");?>
-                                <a href="firewall_virtual_ip.php"><?=gettext("Virtual IP");?></a>
-                                <?=gettext("addresses on the interface first).");?>
+                        <?=sprintf(gettext("If you want this rule to apply to another IP address rather than the IP address of the interface chosen above, ".
+                                "select it here (you will need to define %sVirtual IP addresses%s on the interface first)."),'<a href="firewall_virtual_ip.php">','</a>')?>
+                                
                       </div>
                   </td>
                 </tr>
diff --git a/src/www/system_certmanager.php b/src/www/system_certmanager.php
index b7ec0af31..8785a060e 100644
--- a/src/www/system_certmanager.php
+++ b/src/www/system_certmanager.php
@@ -776,9 +776,7 @@ $( document ).ready(function() {
                   endforeach; ?>
                   </select>
                   <div class="hidden" id="no_caref">
-                    <?=gettext("No internal Certificate Authorities have been defined. You must");?>
-                    <a href="system_camanager.php?act=new&amp;method=internal"><?=gettext("create");?></a>
-                    <?=gettext("an internal CA before creating an internal certificate.");?>
+                    <?=sprintf(gettext("No internal Certificate Authorities have been defined. You must %screate%s an internal CA before creating an internal certificate."),'<a href="system_camanager.php?act=new&amp;method=internal">','</a>');?>
                   </div>
                 </td>
               </tr>
diff --git a/src/www/system_general.php b/src/www/system_general.php
index 07f1ec1ab..92eab7238 100644
--- a/src/www/system_general.php
+++ b/src/www/system_general.php
@@ -338,7 +338,7 @@ include("head.inc");
                 <div class="hidden" for="help_for_domain">
                   <?=gettext("Do not use 'local' as a domain name. It will cause local hosts running mDNS (avahi, bonjour, etc.) to be unable to resolve local hosts not running mDNS."); ?>
                   <br />
-                  <?=gettext("e.g."); ?> <em><?=gettext("mycorp.com, home, office, private, etc."); ?></em>
+                  <?=sprintf(gettext("e.g. %smycorp.com, home, office, private, etc.%s"),'<em>','</em>') ?>
                 </div>
               </td>
             </tr>
diff --git a/src/www/vpn_ipsec_keys_edit.php b/src/www/vpn_ipsec_keys_edit.php
index ab1e51c71..35b247da5 100644
--- a/src/www/vpn_ipsec_keys_edit.php
+++ b/src/www/vpn_ipsec_keys_edit.php
@@ -143,7 +143,7 @@ include("head.inc");
                     <td>
                       <input name="ident" type="text" class="formfld unknown" id="ident" size="30" value="<?=$pconfig['ident'];?>" />
                       <div class="hidden" for="help_for_ident">
-                        <?=gettext("This can be either an IP address, fully qualified domain name or an e-mail address"); ?>.
+                        <?=gettext("This can be either an IP address, fully qualified domain name or an e-mail address."); ?>
                       </div>
                     </td>
                   </tr>
diff --git a/src/www/vpn_ipsec_phase1.php b/src/www/vpn_ipsec_phase1.php
index d849ccbf6..d5fcf026b 100644
--- a/src/www/vpn_ipsec_phase1.php
+++ b/src/www/vpn_ipsec_phase1.php
@@ -598,7 +598,7 @@ function dpdchkbox_change() {
                       <div class="hidden" for="help_for_disabled">
                         <strong><?=gettext("Disable this phase1 entry"); ?></strong><br />
                         <?=gettext("Set this option to disable this phase1 without " .
-                                                "removing it from the list"); ?>.
+                                                "removing it from the list."); ?>
                       </div>
                     </td>
                   </tr>
@@ -633,7 +633,7 @@ function dpdchkbox_change() {
 ?>
                       </select>
                       <div class="hidden" for="help_for_iketype">
-                        <?=gettext("Select the KeyExchange Protocol version to be used. Usually known as IKEv1 or IKEv2."); ?>.
+                        <?=gettext("Select the KeyExchange Protocol version to be used. Usually known as IKEv1 or IKEv2."); ?>
                       </div>
                     </td>
                   </tr>
@@ -652,7 +652,7 @@ function dpdchkbox_change() {
 ?>
                       </select>
                       <div class="hidden" for="help_for_protocol">
-                        <?=gettext("Select the Internet Protocol family from this dropdown"); ?>.
+                        <?=gettext("Select the Internet Protocol family from this dropdown."); ?>
                       </div>
                     </td>
                   </tr>
@@ -692,7 +692,7 @@ function dpdchkbox_change() {
 ?>
                       </select>
                       <div class="hidden" for="help_for_interface">
-                        <?=gettext("Select the interface for the local endpoint of this phase1 entry"); ?>.
+                        <?=gettext("Select the interface for the local endpoint of this phase1 entry."); ?>
                       </div>
                     </td>
                   </tr>
@@ -716,7 +716,7 @@ function dpdchkbox_change() {
                       <input name="descr" type="text" id="descr" size="40" value="<?=$pconfig['descr'];?>" />
                       <div class="hidden" for="help_for_remotegw">
                         <?=gettext("You may enter a description here " .
-                                                "for your reference (not parsed)"); ?>.
+                                                "for your reference (not parsed)."); ?>
                       </div>
                     </td>
                   </tr>
@@ -750,7 +750,7 @@ function dpdchkbox_change() {
 ?>
                       </select>
                       <div class="hidden" for="help_for_authmethod">
-                        <?=gettext("Must match the setting chosen on the remote side"); ?>.
+                        <?=gettext("Must match the setting chosen on the remote side."); ?>
                       </div>
                     </td>
                   </tr>
@@ -769,7 +769,7 @@ function dpdchkbox_change() {
 ?>
                       </select>
                       <div class="hidden" for="help_for_mode">
-                        <?=gettext("Aggressive is more flexible, but less secure"); ?>.
+                        <?=gettext("Aggressive is more flexible, but less secure."); ?>
                       </div>
                     </td>
                   </tr>
@@ -827,7 +827,7 @@ endforeach; ?>
                       <input name="peerid_data" type="text" id="peerid_data" size="30" value="<?=$pconfig['peerid_data'];?>" />
 <?php if (!empty($pconfig['mobile'])) {
 ?>
-                      <small><?=gettext("NOTE: This is known as the \"group\" setting on some VPN client implementations"); ?>.</small>
+                      <small><?=gettext("NOTE: This is known as the \"group\" setting on some VPN client implementations."); ?></small>
                     <?php
 } ?>
                     </td>
@@ -838,7 +838,7 @@ endforeach; ?>
                       <input name="pre-shared-key" type="text" class="formfld unknown" id="pskey" size="40"
                              value="<?= $pconfig['authentication_method'] == "pre_shared_key" || $pconfig['authentication_method'] == "xauth_psk_server" ? $pconfig['pre-shared-key'] : "";?>" />
                       <div class="hidden" for="help_for_psk">
-                        <?=gettext("Input your Pre-Shared Key string"); ?>.
+                        <?=gettext("Input your Pre-Shared Key string."); ?>
                       </div>
                     </td>
                   </tr>
@@ -858,7 +858,7 @@ endforeach; ?>
 ?>
                       </select>
                       <div class="hidden" for="help_for_certref">
-                        <?=gettext("Select a certificate previously configured in the Certificate Manager"); ?>.
+                        <?=gettext("Select a certificate previously configured in the Certificate Manager."); ?>
                       </div>
                     </td>
                   </tr>
@@ -881,7 +881,7 @@ endforeach; ?>
 ?>
                       </select>
                       <div class="hidden" for="help_for_caref">
-                        <?=gettext("Select a certificate authority previously configured in the Certificate Manager"); ?>.
+                        <?=gettext("Select a certificate authority previously configured in the Certificate Manager."); ?>
                       </div>
                     </td>
                   </tr>
@@ -929,7 +929,7 @@ endforeach; ?>
 ?>
                       </select>
                       <div class="hidden" for="help_for_halgo">
-                        <?=gettext("Must match the setting chosen on the remote side"); ?>.
+                        <?=gettext("Must match the setting chosen on the remote side."); ?>
                       </div>
                     </td>
                   </tr>
@@ -960,7 +960,7 @@ endforeach; ?>
 ?>
                       </select>
                       <div class="hidden" for="help_for_dhgroup">
-                        <?=gettext("Must match the setting chosen on the remote side"); ?>.
+                        <?=gettext("Must match the setting chosen on the remote side."); ?>
                       </div>
                     </td>
                   </tr>
@@ -1010,7 +1010,7 @@ endforeach; ?>
                       </select>
                       <div class="hidden" for="help_for_nat_traversal">
                           <?=gettext("Set this option to enable the use of NAT-T (i.e. the encapsulation of ESP in UDP packets) if needed, " .
-                                                  "which can help with clients that are behind restrictive firewalls"); ?>.
+                                                  "which can help with clients that are behind restrictive firewalls."); ?>
                       </div>
                     </td>
                   </tr>
@@ -1026,13 +1026,13 @@ endforeach; ?>
                         <input name="dpd_delay" type="text" class="formfld unknown" id="dpd_delay" size="5" value="<?=$pconfig['dpd_delay'];?>" />
                         <?=gettext("seconds"); ?>
                         <div class="hidden" for="help_for_dpd_enable">
-                          <?=gettext("Delay between requesting peer acknowledgement"); ?>.
+                          <?=gettext("Delay between requesting peer acknowledgement."); ?>
                         </div>
                         <br />
                         <input name="dpd_maxfail" type="text" class="formfld unknown" id="dpd_maxfail" size="5" value="<?=$pconfig['dpd_maxfail'];?>" />
                         <?=gettext("retries"); ?>
                         <div class="hidden" for="help_for_dpd_enable">
-                          <?=gettext("Number of consecutive failures allowed before disconnect"); ?>.
+                          <?=gettext("Number of consecutive failures allowed before disconnect."); ?>
                         </div>
                       </div>
                     </td>
diff --git a/src/www/vpn_openvpn_client.php b/src/www/vpn_openvpn_client.php
index 34e9159c3..f9e490164 100644
--- a/src/www/vpn_openvpn_client.php
+++ b/src/www/vpn_openvpn_client.php
@@ -964,8 +964,7 @@ endif; ?>
 						<td>
 							<input name="route_no_pull" type="checkbox" value="yes" <?=!empty($pconfig['route_no_pull']) ? "checked=\"checked\"" : "" ;?> />
 							<div class="hidden" for="help_for_route_no_pull">
-								<?=gettext("Don't add or remove routes automatically. Instead pass routes to ");?>
-								<strong>--route-up</strong> <?=gettext("script using environmental variables"); ?>.
+								<?=sprintf(gettext("Don't add or remove routes automatically. Instead pass routes to %s--route-up%s script using environmental variables"),'<strong>','</strong>') ?>.
 							</div>
 						</td>
 					</tr>
@@ -1009,11 +1008,11 @@ endif; ?>
 							<?php endforeach; ?>
 							</select>
 							<div class="hidden" for="help_for_verbosity_level">
-								<?=gettext("Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what's happening without being swamped by output"); ?>.<br /> <br />
-								<strong>none</strong> -- <?=gettext("No output except fatal errors"); ?>. <br />
-								<strong>default</strong>-<strong>4</strong> -- <?=gettext("Normal usage range"); ?>. <br />
-								<strong>5</strong> -- <?=gettext("Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets"); ?>. <br />
-								<strong>6</strong>-<strong>11</strong> -- <?=gettext("Debug info range"); ?>.
+								<?=gettext("Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what's happening without being swamped by output.") ?> <br /> <br />
+								<?=sprintf(gettext("%snone%s -- No output except fatal errors."),'<strong>','</strong>') ?> <br />
+								<?=sprintf(gettext("%sdefault%s-%s4%s -- Normal usage range."),'<strong>','</strong>','<strong>','</strong>'); ?> <br />
+								<?=sprintf(gettext("%s5%s -- Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets."),'<strong>','</strong>') ?> <br />
+								<?=sprintf(gettext("%s6%s-%s11%s -- Debug info range."),'<strong>','</strong>','<strong>','</strong>') ?>
 							</div>
 							</td>
 					</tr>
diff --git a/src/www/vpn_pptp.php b/src/www/vpn_pptp.php
index ae6f36018..c81d0625f 100644
--- a/src/www/vpn_pptp.php
+++ b/src/www/vpn_pptp.php
@@ -515,10 +515,7 @@ function enable_change(enable_over) {
 						                </tr>
 						                <tr>
 						                  <td width="22%" valign="top">&nbsp;</td>
-						                  <td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Note");?>:<br />
-						                    </strong></span><?=gettext("don't forget to ");
-?><a href="firewall_rules.php?if=pptp"><?=gettext("add a firewall rule"); ?></a> <?=gettext("to permit ".
-                                            "traffic from PPTP clients");?>!</span></td>
+						                  <td width="78%"><?=sprintf(gettext("Note: don't forget to %sadd a firewall rule%s to permit traffic from PPTP clients!"),'<a href="firewall_rules.php?if=pptp">','</a>') ?></td>
 						                 </tr>
 						              </table>
 								</div>