Fix gettext issues

6 files changed, 67 insertions, 67 deletions

diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index ec40663..eeadc2e 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -245,7 +245,7 @@ if ($_POST) {
 }
 
 if($pkg['title'] <> "") {
-	$edit = ($only_edit ? '' : ": " .  gettext(": Edit"));
+	$edit = ($only_edit ? '' : ": " .  gettext("Edit"));
 	$title = $pkg['title'] . $edit;
 }
 else
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index 05a8488..1445dcf 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -54,10 +54,10 @@ if($pkg_info) {
 	$using_cache = true;
 	$xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl'];
 	if(file_exists("{$g['tmp_path']}/pkg_info.cache")) {
-		$savemsg = sprintf(gettext("Unable to retrieve package info from '%s'. Cached data will be used."), $xmlrpc_base_url);
+		$savemsg = sprintf(gettext("Unable to retrieve package info from %s. Cached data will be used."), $xmlrpc_base_url);
 		$pkg_info = unserialize(@file_get_contents("{$g['tmp_path']}/pkg_info.cache"));
 	} else {
-		$savemsg = sprintf(gettext("Unable to communicate with '%s'. Please verify DNS and interface configuration, and that '%s' has functional Internet connectivity."), $xmlrpc_base_url, $g['product_name']);
+		$savemsg = sprintf(gettext("Unable to communicate with %s. Please verify DNS and interface configuration, and that %s has functional Internet connectivity."), $xmlrpc_base_url, $g['product_name']);
 	}
 }
 
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index 7344587..1e35dc8 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -319,27 +319,27 @@ include("head.inc");
 						</table>
 						<br>
 						<span class="vexpl">
-							<?=gettext("IP addresses; these are also used for the DHCP
-							service, DNS forwarder and for PPTP VPN clients."); ?>
+							<?=gettext("IP addresses; these are also used for the DHCP " .
+							"service, DNS forwarder and for PPTP VPN clients."); ?>
 							<br/>
 							<?php if($multiwan): ?>
 							<br/>
-							<?=gettext("In addition, select the gateway for each DNS server.
-							You should have a unique DNS server per gateway."); ?>
+							<?=gettext("In addition, select the gateway for each DNS server." .
+							"You should have a unique DNS server per gateway."); ?>
 							<br/>
 							<?php endif; ?>
 							<br/>
 							<input name="dnsallowoverride" type="checkbox" id="dnsallowoverride" value="yes" <?php if ($pconfig['dnsallowoverride']) echo "checked"; ?>>
 							<strong>
-								<?=gettext("Allow DNS server list to be overridden by DHCP/PPP
-								on WAN"); ?>
+								<?=gettext("Allow DNS server list to be overridden by DHCP/PPP " .
+								"on WAN"); ?>
 							</strong>
 							<br/>
-							<?= sprintf("If this option is set, '%s' will
-							use DNS servers assigned by a DHCP/PPP server on WAN
-							for its own purposes (including the DNS forwarder).
-							However, they will not be assigned to DHCP and PPTP
-							VPN	clients.", $g['product_name']); ?>
+							<?= sprintf("If this option is set, '%s' will " .
+							"use DNS servers assigned by a DHCP/PPP server on WAN " .
+							"for its own purposes (including the DNS forwarder). " .
+							"However, they will not be assigned to DHCP and PPTP " .
+							"VPN	clients.", $g['product_name']); ?>
 						</span>
 					</p>
 				</td>
@@ -380,9 +380,9 @@ include("head.inc");
 					<input name="timeservers" type="text" class="formfld unknown" id="timeservers" size="40" value="<?=htmlspecialchars($pconfig['timeservers']);?>">
 					<br/>
 					<span class="vexpl">
-						<?=gettext("Use a space to separate multiple hosts (only one
-						required). Remember to set up at least one DNS server
-						if you enter a host name here!"); ?>
+						<?=gettext("Use a space to separate multiple hosts (only one " .
+						"required). Remember to set up at least one DNS server " .
+						"if you enter a host name here!"); ?>
 					</span>
 				</td>
 			</tr>
diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php
index a5bedaa..39f4674 100644
--- a/usr/local/www/system_advanced_admin.php
+++ b/usr/local/www/system_advanced_admin.php
@@ -157,7 +157,7 @@ if ($_POST) {
 	    $savemsg = get_std_save_message($retval);
 
 		if ($restart_webgui)
-			$savemsg .= sprintf("<br />" . gettext("One moment...redirecting to '%s' in 20 seconds."),$url);
+			$savemsg .= sprintf("<br />" . gettext("One moment...redirecting to %s in 20 seconds."),$url);
 
 		conf_mount_rw();
 		setup_serial_port();
@@ -267,9 +267,9 @@ function prot_change() {
 									<input name="webguiport" type="text" class="formfld unknown" id="webguiport" "size="5" value="<?=htmlspecialchars($config['system']['webgui']['port']);?>">
 									<br>
 									<span class="vexpl">
-										<?=gettext("Enter a custom port number for the webConfigurator
-										above if you want to override the default (80 for HTTP, 443
-										for HTTPS). Changes will take effect immediately after save."); ?>
+										<?=gettext("Enter a custom port number for the webConfigurator " .
+										"above if you want to override the default (80 for HTTP, 443 " .
+										"for HTTPS). Changes will take effect immediately after save."); ?>
 									</span>
 								</td>
 							</tr>
@@ -285,13 +285,13 @@ function prot_change() {
 									<input name="noantilockout" type="checkbox" id="noantilockout" value="yes" <?php if ($pconfig['noantilockout']) echo "checked"; ?> />
 									<strong><?=gettext("Disable webConfigurator anti-lockout rule"); ?></strong>
 									<br/>
-									<?=gettext("When this is unchecked, access to the webConfigurator on the $lockout_interface
-									interface is always permitted, regardless of the user-defined firewall
-									rule set. Check this box to disable this automatically added rule, so access
-									to the webConfigurator is controlled by the user-defined firewall rules 
-									(ensure you have a firewall rule in place that allows you in, or you will"); ?>
-									<?=gettext("lock yourself out!)"); ?>. <em> <?=gettext("Hint: the &quot;Set interface(s) IP address&quot;
-									option in the console menu resets this setting as well."); ?> </em>
+									<?=gettext("When this is unchecked, access to the webConfigurator on the $lockout_interface " .
+									"interface is always permitted, regardless of the user-defined firewall " .
+									"rule set. Check this box to disable this automatically added rule, so access " .
+									"to the webConfigurator is controlled by the user-defined firewall rules  " .
+									"(ensure you have a firewall rule in place that allows you in, or you will"); ?>
+									<?=gettext("lock yourself out!)"); ?>. <em> <?=gettext("Hint: the &quot;Set interface(s) IP address&quot; " .
+									"option in the console menu resets this setting as well."); ?> </em>
 								</td>
 							</tr>
 							<tr>
diff --git a/usr/local/www/system_advanced_firewall.php b/usr/local/www/system_advanced_firewall.php
index 81a4b6b..7ed4383 100644
--- a/usr/local/www/system_advanced_firewall.php
+++ b/usr/local/www/system_advanced_firewall.php
@@ -213,10 +213,10 @@ function update_description(itemnum) {
 								<td width="78%" class="vtable">
 									<input name="scrubnodf" type="checkbox" id="scrubnodf" value="yes" <?php if (isset($config['system']['scrubnodf'])) echo "checked"; ?> />
 									<strong><?=gettext("Clear invalid DF bits instead of dropping the packets");?></strong><br/>
-									<?=gettext("This allows for communications with hosts that generate fragmented
-									packets with the don't fragment (DF) bit set. Linux NFS is known to
-									do this. This will cause the filter to not drop such packets but
-									instead clear the don't fragment bit.");?>
+									<?=gettext("This allows for communications with hosts that generate fragmented " .
+									"packets with the don't fragment (DF) bit set. Linux NFS is known to " .
+									"do this. This will cause the filter to not drop such packets but " .
+									"instead clear the don't fragment bit.");?>
 								</td>
 							</tr>
 							<tr>
@@ -224,10 +224,10 @@ function update_description(itemnum) {
 								<td width="78%" class="vtable">
 									<input name="scrubrnid" type="checkbox" id="scrubnodf" value="yes" <?php if (isset($config['system']['scrubrnid'])) echo "checked"; ?> />
 									<strong><?=gettext("Insert a stronger id into IP header of packets passing through the filter.");?></strong><br/>
-									<?=gettext("Replaces the IP identification field of packets with random values to
-									compensate for operating systems that use predicatable values.
-									This option only applies to packets that are not fragmented after the
-									optional packet reassembly.");?>
+									<?=gettext("Replaces the IP identification field of packets with random values to " .
+									"compensate for operating systems that use predicatable values. " .
+									"This option only applies to packets that are not fragmented after the " .
+									"optional packet reassembly.");?>
 								</td>
 							</tr>
 							<tr>
@@ -284,9 +284,9 @@ function update_description(itemnum) {
 									<input name="bypassstaticroutes" type="checkbox" id="bypassstaticroutes" value="yes" <?php if ($pconfig['bypassstaticroutes']) echo "checked"; ?> />
 									<strong><?=gettext("Bypass firewall rules for traffic on the same interface");?></strong>
 									<br/>
-									<?=gettext("This option only applies if you have defined one or more static routes. If it is enabled, traffic that enters and
-					 				leaves through the same interface will not be checked by the firewall. This may be desirable in some situations where
-									multiple subnets are connected to the same interface.");?>
+									<?=gettext("This option only applies if you have defined one or more static routes. If it is enabled, traffic that enters and " .
+					 				"leaves through the same interface will not be checked by the firewall. This may be desirable in some situations where " .
+									"multiple subnets are connected to the same interface.");?>
 									<br/>
 								</td>
 							</tr>
diff --git a/usr/local/www/system_advanced_misc.php b/usr/local/www/system_advanced_misc.php
index ae17972..7eaaf70 100644
--- a/usr/local/www/system_advanced_misc.php
+++ b/usr/local/www/system_advanced_misc.php
@@ -159,14 +159,14 @@ include("head.inc");
 								<td width="78%" class="vtable">
 									<input name="lb_use_sticky" type="checkbox" id="lb_use_sticky" value="yes" <?php if ($pconfig['lb_use_sticky']) echo "checked=\"checked\""; ?> />
 									<strong><?=gettext("Use sticky connections"); ?></strong><br/>
-									<?=gettext("Successive connections will be redirected to the servers
-									in a round-robin manner with connections from the same
-									source being sent to the same web server. This 'sticky
-									connection' will exist as long as there are states that
-									refer to this connection. Once the states expire, so will
-									the sticky connection. Further connections from that host
-									will be redirected to the next web server in the round
-									robin."); ?>
+									<?=gettext("Successive connections will be redirected to the servers " .
+									"in a round-robin manner with connections from the same " .
+									"source being sent to the same web server. This 'sticky " .
+									"connection' will exist as long as there are states that " .
+									"refer to this connection. Once the states expire, so will " .
+									"the sticky connection. Further connections from that host " .
+									"will be redirected to the next web server in the round " .
+									"robin."); ?>
 								</td>
 							</tr>
 							<tr>
@@ -181,16 +181,16 @@ include("head.inc");
 									<input name="powerd_enable" type="checkbox" id="powerd_enable" value="yes" <?php if ($pconfig['powerd_enable']) echo "checked"; ?> />
 									<strong><?=gettext("Use PowerD"); ?></strong><br/>
 									<br />
-								     <?=gettext("The powerd utility monitors the system state and sets various power control 
-								     options accordingly.	It offers three modes (maximum, minimum, and
-								     adaptive) that can be individually selected while on AC power or batteries.  
-								     The modes maximum, minimum, and adaptive may be abbreviated max,
-								     min, adp.   Maximum mode chooses the highest performance values.  Minimum 
-								     mode selects the lowest performance values to get the most power savings.
-								     Adaptive mode attempts to strike a balance by degrading performance when
-								     the system appears idle and increasing it when the system is busy.  It
-								     offers a good balance between a small performance loss for greatly
-								     increased power savings.  The default mode for pfSense is adaptive."); ?>
+								     <?=gettext("The powerd utility monitors the system state and sets various power control " .
+								     "options accordingly.	It offers three modes (maximum, minimum, and " .
+								     "adaptive) that can be individually selected while on AC power or batteries. " . 
+								     "The modes maximum, minimum, and adaptive may be abbreviated max, " .
+								     "min, adp.   Maximum mode chooses the highest performance values.  Minimum " .
+								     "mode selects the lowest performance values to get the most power savings. " .
+								     "Adaptive mode attempts to strike a balance by degrading performance when " .
+								     "the system appears idle and increasing it when the system is busy.  It " .
+								     "offers a good balance between a small performance loss for greatly " .
+								     "increased power savings.  The default mode for pfSense is adaptive."); ?>
 								</td>
 							</tr>
 							<tr>
@@ -205,14 +205,14 @@ include("head.inc");
 									<input name="glxsb_enable" type="checkbox" id="glxsb_enable" value="yes" <?php if ($pconfig['glxsb_enable']) echo "checked"; ?> />
 									<strong><?=gettext("Use glxsb"); ?></strong><br/>
 									<br />
-								     <?=gettext("The AMD Geode LX Security Block will accelerate some cryptographic functions
-								     on systems which have the chip. Do not enable this option if you have a
-								     Hifn cryptographic acceleration card, as this will take precedence and the
-								     Hifn card will not be used. Acceleration should be automatic for IPsec 
-								     when using Rijndael (AES). OpenVPN should be set for AES-128-CBC."); ?>
+								     <?=gettext("The AMD Geode LX Security Block will accelerate some cryptographic functions " .
+								     "on systems which have the chip. Do not enable this option if you have a " .
+								     "Hifn cryptographic acceleration card, as this will take precedence and the " .
+								     "Hifn card will not be used. Acceleration should be automatic for IPsec " .
+								     "when using Rijndael (AES). OpenVPN should be set for AES-128-CBC."); ?>
 								     <br/><br/>
-								     <?=gettext("If you do not have a glxsb chip in your system, this option will have no 
-								     effect. To unload the module, uncheck this option and then reboot."); ?>
+								     <?=gettext("If you do not have a glxsb chip in your system, this option will have no " .
+								     "effect. To unload the module, uncheck this option and then reboot."); ?>
 								</td>
 							</tr>
 							<tr>
@@ -227,9 +227,9 @@ include("head.inc");
 									<input name="preferoldsa_enable" type="checkbox" id="preferoldsa_enable" value="yes" <?php if ($pconfig['preferoldsa_enable']) echo "checked"; ?> />
 									<strong><?=gettext("Prefer older IPsec SAs"); ?></strong>
 									<br />
-									<?=gettext("By default, if several SAs match, the newest one is
-									preferred if it's at least 30 seconds old. Select this
-									option to always prefer old SAs over new ones."); ?>
+									<?=gettext("By default, if several SAs match, the newest one is " .
+									"preferred if it's at least 30 seconds old. Select this " .
+									"option to always prefer old SAs over new ones."); ?>
 								</td>
 							</tr>
                                                         <tr>