diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index e0e69a283a..52456945dc 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -240,7 +240,7 @@ function prot_change() {
 					<div class="tabcont">
 						<span class="vexpl">
 							<span class="red">
-								<strong><?=gettext("NOTE"); ?>:&nbsp</strong>
+								<strong><?=gettext("NOTE:"); ?>&nbsp</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only."); ?>
 							<br/>
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index 1fe923d928..0a944a9208 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -212,7 +212,7 @@ function update_description(itemnum) {
 					<div class="tabcont">
 						<span class="vexpl">
 							<span class="red">
-								<strong><?=gettext("NOTE");?>:&nbsp</strong>
+								<strong><?=gettext("NOTE:");?>&nbsp</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only.");?>
 							<br/>
@@ -289,7 +289,7 @@ function update_description(itemnum) {
 									<br/>
 									<strong><?=gettext("Maximum number of connections to hold in the firewall state table.");?></strong>
 									<br/>
-									<span class="vexpl"><?=gettext("Note:  Leave this blank for the default.  On your system the default size is");?>: <?= pfsense_default_state_size() ?></span>
+									<span class="vexpl"><?=gettext("Note:  Leave this blank for the default.  On your system the default size is:");?> <?= pfsense_default_state_size() ?></span>
 								</td>
 							</tr>
 							<tr>
@@ -302,7 +302,7 @@ function update_description(itemnum) {
 									<span class="vexpl">
 										<?=gettext("Note:  Leave this blank for the default.");?>
 										<?php if (empty($pconfig['maximumtableentries'])): ?>
-											<?= gettext("On your system the default size is");?>: <?= pfsense_default_table_entries_size(); ?>
+											<?= gettext("On your system the default size is:");?> <?= pfsense_default_table_entries_size(); ?>
 										<?php endif; ?>
 									</span>
 								</td>
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index 1bd5cbfb84..e17f7752ed 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -162,7 +162,7 @@ function maxmss_checked(obj) {
 					<div class="tabcont">
 						<span class="vexpl">
 							<span class="red">
-								<strong><?=gettext("NOTE"); ?>:&nbsp</strong>
+								<strong><?=gettext("NOTE:"); ?>&nbsp</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only."); ?>
 							<br/>
diff --git a/usr/local/www/system_advanced_network.php b/usr/local/www/system_advanced_network.php
index 88847973fd..e8a2b64bbd 100644
--- a/usr/local/www/system_advanced_network.php
+++ b/usr/local/www/system_advanced_network.php
@@ -194,7 +194,7 @@ function enable_change(enable_over) {
 					<div class="tabcont">
 						<span class="vexpl">
 		    	        	<span class="red">
-								<strong><?=gettext("NOTE"); ?>:&nbsp</strong>
+								<strong><?=gettext("NOTE:"); ?>&nbsp</strong>
 							</span>
 							<?=gettext("The options on this page are intended for use by advanced users only."); ?>
 							<br/>
diff --git a/usr/local/www/system_advanced_sysctl.php b/usr/local/www/system_advanced_sysctl.php
index 4e097ca6c3..fb200edf57 100644
--- a/usr/local/www/system_advanced_sysctl.php
+++ b/usr/local/www/system_advanced_sysctl.php
@@ -162,7 +162,7 @@ include("head.inc");
 				<div class="tabcont">
 					<span class="vexpl">
 						<span class="red">
-							<strong><?=gettext("NOTE"); ?>:&nbsp</strong>
+							<strong><?=gettext("NOTE:"); ?>&nbsp</strong>
 						</span>
 						<?=gettext("The options on this page are intended for use by advanced users only."); ?>
 						<br/>
diff --git a/usr/local/www/system_authservers.php b/usr/local/www/system_authservers.php
index 698a6bedb6..3aef95bb8d 100644
--- a/usr/local/www/system_authservers.php
+++ b/usr/local/www/system_authservers.php
@@ -511,7 +511,7 @@ function select_clicked() {
 							<td width="78%" class="vtable">
 								<table border="0" cellspacing="0" cellpadding="2">
 									<tr>
-										<td><?=gettext("Level");?>: &nbsp;</td>
+										<td><?=gettext("Level:");?> &nbsp;</td>
 										<td>
 											<select name='ldap_scope' id='ldap_scope' class="formselect">
 											<?php
@@ -526,7 +526,7 @@ function select_clicked() {
 										</td>
 									</tr>
 									<tr>
-										<td><?=gettext("Base DN");?>: &nbsp;</td>
+										<td><?=gettext("Base DN:");?> &nbsp;</td>
 										<td>
 											<input name="ldap_basedn" type="text" class="formfld unknown" id="ldap_basedn" size="40" value="<?=htmlspecialchars($pconfig['ldap_basedn']);?>"/>
 										</td>
@@ -540,7 +540,7 @@ function select_clicked() {
 							<td width="78%" class="vtable">
 								<table border="0" cellspacing="0" cellpadding="2">
 									<tr>
-										<td><?=gettext("Containers");?>: &nbsp;</td>
+										<td><?=gettext("Containers:");?> &nbsp;</td>
 										<td>
 											<input name="ldapauthcontainers" type="text" class="formfld unknown" id="ldapauthcontainers" size="40" value="<?=htmlspecialchars($pconfig['ldap_authcn']);?>"/>
 											<input type="button" onClick="select_clicked();" value="<?=gettext("Select");?>">
@@ -570,13 +570,13 @@ function select_clicked() {
 										<td colspan="2"></td>
 									</tr>
 									<tr>
-										<td><?=gettext("User DN");?>: &nbsp;</td>
+										<td><?=gettext("User DN:");?> &nbsp;</td>
 										<td>
 											<input name="ldap_binddn" type="text" class="formfld unknown" id="ldap_binddn" size="40" value="<?=htmlspecialchars($pconfig['ldap_binddn']);?>"/><br/>
 										</td>
 									</tr>
 									<tr>
-										<td><?=gettext("Password");?>: &nbsp;</td>
+										<td><?=gettext("Password:");?> &nbsp;</td>
 										<td>
 											<input name="ldap_bindpw" type="password" class="formfld pwd" id="ldap_bindpw" size="20" value="<?=htmlspecialchars($pconfig['ldap_bindpw']);?>"/><br/>
 										</td>
diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php
index 7aae43e5f7..369f7b6c0d 100644
--- a/usr/local/www/system_camanager.php
+++ b/usr/local/www/system_camanager.php
@@ -81,8 +81,7 @@ if ($act == "del") {
 	$name = $a_ca[$id]['name'];
 	unset($a_ca[$id]);
 	write_config();
-	$savemsg = gettext("Certificate Authority")." {$name} ".
-				gettext("successfully deleted")."<br/>";
+	$savemsg = sprintf(gettext("Certificate Authority %s successfully deleted"), $name) . "<br/>";
 }
 
 if ($act == "new") {
@@ -248,7 +247,7 @@ function method_change() {
 		<td id="mainarea">
 			<div class="tabcont">
 
-				<?php if ($act == "new" || $act == gettext("save") || $input_errors): ?>
+				<?php if ($act == "new" || $act == gettext("Save") || $input_errors): ?>
 
 				<form action="system_camanager.php" method="post" name="iform" id="iform">
 					<table width="100%" border="0" cellpadding="6" cellspacing="0">
@@ -323,14 +322,14 @@ function method_change() {
 									<option value="<?=$len;?>"<?=$selected;?>><?=$len;?></option>
 								<?php endforeach; ?>
 								</select>
-								<?=gettext(bits);?>
+								<?=gettext("bits");?>
 							</td>
 						</tr>
 						<tr>
 							<td width="22%" valign="top" class="vncellreq"><?=gettext("Lifetime");?></td>
 							<td width="78%" class="vtable">
 								<input name="lifetime" type="text" class="formfld unknown" id="lifetime" size="5" value="<?=htmlspecialchars($pconfig['lifetime']);?>"/>
-								<?=gettext(days);?>
+								<?=gettext("days");?>
 							</td>
 						</tr>
 						<tr>
@@ -342,7 +341,7 @@ function method_change() {
 										<td align="left">
 											<input name="dn_country" type="text" class="formfld unknown" maxlength="2" size="2" value="<?=htmlspecialchars($pconfig['dn_country']);?>"/>
 											&nbsp;
-											<em>ex:</em>
+											<em><?=gettext("ex:");?></em>
 											&nbsp;
 											<?=gettext("US");?>
 											<em><?=gettext("( two letters )");?></em>
@@ -353,7 +352,7 @@ function method_change() {
 										<td align="left">
 											<input name="dn_state" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_state']);?>"/>
 											&nbsp;
-											<em>ex:</em>
+											<em><?=gettext("ex:");?></em>
 											&nbsp;
 											<?=gettext("Texas");?>
 										</td>
@@ -363,7 +362,7 @@ function method_change() {
 										<td align="left">
 											<input name="dn_city" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_city']);?>"/>
 											&nbsp;
-											<em>ex:</em>
+											<em><?=gettext("ex:");?></em>
 											&nbsp;
 											<?=gettext("Austin");?>
 										</td>
@@ -373,7 +372,7 @@ function method_change() {
 										<td align="left">
 											<input name="dn_organization" type="text" class="formfld unknown" size="40" value="<?=htmlspecialchars($pconfig['dn_organization']);?>"/>
 											&nbsp;
-											<em>ex:</em>
+											<em><?=gettext("ex:");?></em>
 											&nbsp;
 											<?=gettext("My Company Inc.");?>
 										</td>
@@ -383,7 +382,7 @@ function method_change() {
 										<td align="left">
 											<input name="dn_email" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_email']);?>"/>
 											&nbsp;
-											<em>ex:</em>
+											<em><?=gettext("ex:");?></em>
 											&nbsp;
 											<?=gettext("admin@mycompany.com");?>
 										</td>
@@ -393,7 +392,7 @@ function method_change() {
 										<td align="left">
 											<input name="dn_commonname" type="text" class="formfld unknown" size="25" value="<?=htmlspecialchars($pconfig['dn_commonname']);?>"/>
 											&nbsp;
-											<em>ex:</em>
+											<em><?=gettext("ex:");?></em>
 											&nbsp;
 											<?=gettext("internal-ca");?>
 										</td>
diff --git a/usr/local/www/system_certmanager.php b/usr/local/www/system_certmanager.php
index 683bdebc84..4fd51e7842 100644
--- a/usr/local/www/system_certmanager.php
+++ b/usr/local/www/system_certmanager.php
@@ -82,8 +82,7 @@ if ($act == "del") {
 	$name = $a_cert[$id]['name'];
 	unset($a_cert[$id]);
 	write_config();
-	$savemsg = gettext("Certificate")." {$name} ".
-				gettext("successfully deleted")."<br/>";
+	$savemsg = sprintf(gettext("Certificate %s successfully deleted"), $name) . "<br/>";
 }
 
 if ($act == "new") {
@@ -754,10 +753,10 @@ function internalca_change() {
 						<td class="listr"><?=$caname;?>&nbsp;</td>
 						<td class="listr"><?=$subj;?>&nbsp;</td>
 						<td valign="middle" nowrap class="list">
-							<a href="system_certmanager.php?act=exp&id=<?=$i;?>")">
+							<a href="system_certmanager.php?act=exp&id=<?=$i;?>">
 								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export cert");?>" alt="<?=gettext("export ca");?>" width="17" height="17" border="0" />
 							</a>
-							<a href="system_certmanager.php?act=key&id=<?=$i;?>")">
+							<a href="system_certmanager.php?act=key&id=<?=$i;?>">
 								<img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export key");?>" alt="<?=gettext("export ca");?>" width="17" height="17" border="0" />
 							</a>
 							<a href="system_certmanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate?");?>')">
diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index eb8389f8c2..93b69978f0 100755
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -259,7 +259,7 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 						<?php else: ?>
 				  			<input name="Submit" type="submit" class="formbtn" value="<?=gettext("Disable firmware upload");?>">
 							<br><br>
-							<strong><?=gettext("Firmware image file");?>: </strong>&nbsp;
+							<strong><?=gettext("Firmware image file:");?> </strong>&nbsp;
 							<input name="ulfile" type="file" class="formfld">
 							<br><br>
 							<?php if ($g['platform'] == "nanobsd"): ?>
@@ -296,7 +296,7 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 			</tr>
 			<tr>
 				<td width="22%" valign="top">&nbsp;</td>
-				<td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Warning");?>:<br>
+				<td width="78%"><span class="vexpl"><span class="red"><strong><?=gettext("Warning:");?><br>
 				</strong></span><?=gettext("DO NOT abort the firmware upgrade once it " .
 				"has started. The firewall will reboot automatically after " .
 				"storing the new firmware. The configuration will be maintained.");?></span></td>
diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php
index d09934c6ff..e7c104e068 100755
--- a/usr/local/www/system_firmware_settings.php
+++ b/usr/local/www/system_firmware_settings.php
@@ -133,12 +133,12 @@ function enable_altfirmwareurl(enable_over) {
 		<td class="vtable">
 			<input name="alturlenable" type="checkbox" id="alturlenable" value="yes" onClick="enable_altfirmwareurl()" <?php if(isset($curcfg['alturl']['enable'])) echo "checked"; ?>> <?=gettext("Use a URL server for firmware upgrades other than") . " " . $g['product_website']; ?><br>
 			<table>
-			<tr><td><?=gettext("Base URL"); ?>:</td><td><input name="firmwareurl" type="input" class="formfld url" id="firmwareurl" size="64" value="<?php if($curcfg['alturl']['firmwareurl']) echo $curcfg['alturl']['firmwareurl']; else echo $g['']; ?>"></td></tr>
+			<tr><td><?=gettext("Base URL:"); ?></td><td><input name="firmwareurl" type="input" class="formfld url" id="firmwareurl" size="64" value="<?php if($curcfg['alturl']['firmwareurl']) echo $curcfg['alturl']['firmwareurl']; else echo $g['']; ?>"></td></tr>
 			</table>
 			<span class="vexpl">
 				<?=gettext("This is where"); ?> <?php echo $g['product_name'] ?> <?=gettext("will check for newer firmware versions when the"); ?> <a href="system_firmware_check.php"><?=gettext("System: Firmware: Auto Update"); ?></a> <?=gettext("page is viewed."); ?>
 				<p/>
-				<b><?=gettext("NOTE"); ?>:</b> <?=gettext("When a custom URL is enabled, the system will not verify the digital signature from"); ?> <?php echo $g['product_website'] ?>.
+				<b><?=gettext("NOTE:"); ?></b> <?=printf(gettext("When a custom URL is enabled, the system will not verify the digital signature from %s."), $g['product_website']) ?>
 				</span>
 				</td>
 	</tr>
diff --git a/usr/local/www/system_routes.php b/usr/local/www/system_routes.php
index 032a5c2140..454e613c5d 100755
--- a/usr/local/www/system_routes.php
+++ b/usr/local/www/system_routes.php
@@ -201,7 +201,7 @@ include("head.inc");
 		  </tr>
 		</table>
             </form>
-			<p><b><?=gettext("Note");?>:</b>  <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall.  Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?></p>
+			<p><b><?=gettext("Note:");?></b>  <?=gettext("Do not enter static routes for networks assigned on any interface of this firewall.  Static routes are only used for networks reachable via a different router, and not reachable via your default gateway.");?></p>
 <?php include("fend.inc"); ?>
 </body>
 </html>
diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php
index 313e7e16ea..345bf882e5 100755
--- a/usr/local/www/system_routes_edit.php
+++ b/usr/local/www/system_routes_edit.php
@@ -184,7 +184,7 @@ include("head.inc");
 			?>
                     </select> <br />
 			<div id='addgwbox'>
-				<?=gettext("Choose which gateway this route applies to or"); ?> <a OnClick="show_add_gateway();" href="#"><?=gettext("add a new one");?></a>.
+				<?=gettext("Choose which gateway this route applies to or"); ?> <a OnClick="show_add_gateway();" href="#"><?=gettext("add a new one.");?></a>
 								</div>
 								<div id='notebox'>
 								</div>
@@ -196,14 +196,14 @@ include("head.inc");
 										<table bgcolor="#990000" cellpadding="1" cellspacing="1">
 											<tr><td>&nbsp;</td>
 											<tr>
-												<td colspan="2"><center><b><font color="white"><?=gettext("Add new gateway"); ?>:</b></center></td>
+												<td colspan="2"><center><b><font color="white"><?=gettext("Add new gateway:"); ?></b></center></td>
 											</tr>
 											<tr><td>&nbsp;</td>
 											<tr>
-												<td width="45%" align="right"><font color="white"><?=gettext("Default gateway"); ?>:</td><td><input type="checkbox" id="defaultgw" name="defaultgw"<?=$checked?>></td>
+												<td width="45%" align="right"><font color="white"><?=gettext("Default gateway:"); ?></td><td><input type="checkbox" id="defaultgw" name="defaultgw"<?=$checked?>></td>
 											</tr>												
 											<tr>
-												<td width="45%" align="right"><font color="white"><?=gettext("Interface"); ?>:</td>
+												<td width="45%" align="right"><font color="white"><?=gettext("Interface:"); ?></td>
 												<td><select name="addinterfacegw" id="addinterfacegw">
 												<?php $gwifs = get_configured_interface_with_descr();
 													foreach($gwifs as $fif => $dif)
@@ -212,13 +212,13 @@ include("head.inc");
 												</select></td>
 											</tr>
 											<tr>
-												<td align="right"><font color="white"><?=gettext("Gateway Name"); ?>:</td><td><input id="name" name="name" value="GW"></td>
+												<td align="right"><font color="white"><?=gettext("Gateway Name:"); ?></td><td><input id="name" name="name" value="GW"></td>
 											</tr>
 											<tr>
-												<td align="right"><font color="white"><?=gettext("Gateway IP"); ?>:</td><td><input id="gatewayip" name="gatewayip"></td>
+												<td align="right"><font color="white"><?=gettext("Gateway IP:"); ?></td><td><input id="gatewayip" name="gatewayip"></td>
 											</tr>
 											<tr>
-												<td align="right"><font color="white"><?=gettext("Description"); ?>:</td><td><input id="gatewaydescr" name="gatewaydescr"></td>
+												<td align="right"><font color="white"><?=gettext("Description:"); ?></td><td><input id="gatewaydescr" name="gatewaydescr"></td>
 											</tr>
 											<tr><td>&nbsp;</td>
 											<tr>
@@ -242,7 +242,7 @@ include("head.inc");
                   <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>
@@ -304,10 +304,10 @@ include("head.inc");
 						optn.value = value;
 						selectbox.options.add(optn);
 						selectbox.selectedIndex = (selectbox.options.length-1);
-						$('notebox').innerHTML="<p/><strong>NOTE:</strong> <?=gettext("You can manage Gateways"); ?> <a target='_new' href='system_gateways.php'>here</a>.";
+						$('notebox').innerHTML="<p/><strong><?=gettext("NOTE:");?></strong> <?=printf(gettext("You can manage Gateways %shere%s."), "<a target='_new' href='system_gateways.php'>", "</a>");?>
 					}				
 					function report_failure() {
-						alert("<?=gettext("Sorry, we could not create your gateway at this time"); ?>.");
+						alert("<?=gettext("Sorry, we could not create your gateway at this time."); ?>");
 						hide_add_gateway();
 					}
 					function save_callback(transport) {
diff --git a/usr/local/www/system_usermanager_settings_ldapacpicker.php b/usr/local/www/system_usermanager_settings_ldapacpicker.php
index 7e656c5652..e6b38c3f77 100644
--- a/usr/local/www/system_usermanager_settings_ldapacpicker.php
+++ b/usr/local/www/system_usermanager_settings_ldapacpicker.php
@@ -96,7 +96,7 @@ function post_choices() {
 	<p><?=gettext("Could not connect to the LDAP server. Please check your LDAP configuration.");?></p>
 	<input type='button' value='<?=gettext("Close"); ?>' onClick="window.close();">
 <?php else: ?>
-	<b><?=gettext("Please select which containers to Authenticate against");?>:</b>
+	<b><?=gettext("Please select which containers to Authenticate against:");?></b>
 	<p/>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0">
   	 <tr>
diff --git a/usr/local/www/vpn_l2tp.php b/usr/local/www/vpn_l2tp.php
index 5d20383a2e..3cb6e4e9c9 100644
--- a/usr/local/www/vpn_l2tp.php
+++ b/usr/local/www/vpn_l2tp.php
@@ -321,7 +321,7 @@ function enable_change(enable_over) {
                      }
                     ?>
                     </select>
-                    <br><?=gettext("Hint"); ?>: 24 <?=gettext("is"); ?> 255.255.255.0
+                    <br><?=gettext("Hint:"); ?> 24 <?=gettext("is"); ?> 255.255.255.0
                   </td>
                 </tr>
                 <tr>
@@ -338,7 +338,7 @@ function enable_change(enable_over) {
                      }
                     ?>
                     </select>
-                    <br><?=gettext("Hint"); ?>: 10 <?=gettext("is ten L2TP clients"); ?>
+                    <br><?=gettext("Hint:"); ?> 10 <?=gettext("is ten L2TP clients"); ?>
                   </td>
                 </tr>
 		<tr>
@@ -402,7 +402,7 @@ function enable_change(enable_over) {
                 <tr>
                   <td colspan="2">
 			<span class="vexpl">
-				<strong class="red"><?=gettext("Note");?>:</strong><br />
+				<strong class="red"><?=gettext("Note:");?></strong><br />
 				<?=gettext("Don't forget to add a firewall rule to permit traffic from L2TP clients!");?>
 			</span>
                   </td>