From 0e94685b3afa5ebec229976889d1e9030b3189d7 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato.botelho@bluepex.com>
Date: Thu, 29 Apr 2010 14:32:30 -0300
Subject: Fix gettext issues

---
 usr/local/www/system_firmware.php                         |  6 +++---
 usr/local/www/system_gateway_groups.php                   |  3 +--
 usr/local/www/system_gateway_groups_edit.php              | 11 +++++------
 usr/local/www/system_gateways.php                         | 10 ++++++----
 usr/local/www/system_gateways_edit.php                    | 15 +++++++--------
 usr/local/www/system_groupmanager.php                     |  8 ++++----
 usr/local/www/system_routes_edit.php                      |  5 ++---
 usr/local/www/system_usermanager.php                      |  8 ++++----
 usr/local/www/system_usermanager_settings.php             |  3 ++-
 .../www/system_usermanager_settings_ldapacpicker.php      |  2 +-
 10 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php
index 8acd25e..58c1caa 100755
--- a/usr/local/www/system_firmware.php
+++ b/usr/local/www/system_firmware.php
@@ -297,9 +297,9 @@ if(stristr($_FILES['ulfile']['name'],"nanobsd"))
 			<tr>
 				<td width="22%" valign="top">&nbsp;</td>
 				<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>
+				</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>
 			</table>
 		</div>
 	</tr>
diff --git a/usr/local/www/system_gateway_groups.php b/usr/local/www/system_gateway_groups.php
index a9bb475..3cd39c8 100755
--- a/usr/local/www/system_gateway_groups.php
+++ b/usr/local/www/system_gateway_groups.php
@@ -90,8 +90,7 @@ include("head.inc");
 <input type="hidden" name="y1" value="1">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('staticroutes')): ?><p>
-<?php print_info_box_np(sprintf(gettext("The gateway configuration has been changed.%sYou must apply the changes in order for them to take 
-effect."), "<br>"));?><br>
+<?php print_info_box_np(sprintf(gettext("The gateway configuration has been changed.%sYou must apply the changes in order for them to take effect."), "<br>"));?><br>
 <?php endif; ?>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0">
 		<tr>
diff --git a/usr/local/www/system_gateway_groups_edit.php b/usr/local/www/system_gateway_groups_edit.php
index 6fc035f..7807ccf 100755
--- a/usr/local/www/system_gateway_groups_edit.php
+++ b/usr/local/www/system_gateway_groups_edit.php
@@ -96,7 +96,7 @@ if ($_POST) {
 					continue;
 
 				if ($gateway_group['name'] == $_POST['name']) {
-					$input_errors[] = sprintf(gettext("A gateway group with this name \"%s\" already exists."), $_POST['name']);
+					$input_errors[] = sprintf(gettext('A gateway group with this name "%s" already exists.'), $_POST['name']);
 					break;
 				}
 			}
@@ -185,9 +185,9 @@ include("head.inc");
 		?>
 			<br/><span class="vexpl">
 			<strong><?=gettext("Link Priority"); ?></strong> <br />
-			<?=gettext("The priority selected here defines in what order failover and balancing of links will be done.
-			Multiple links of the same priority will balance connections until all links in the priority will be exhausted.
-			If all links in a priority level are exhausted we will use the next available link(s) in the next priority level.") ?>
+			<?=gettext("The priority selected here defines in what order failover and balancing of links will be done. " .
+			"Multiple links of the same priority will balance connections until all links in the priority will be exhausted. " .
+			"If all links in a priority level are exhausted we will use the next available link(s) in the next priority level.") ?>
 			</span><br />
 		   </td>
                 </tr>
@@ -212,8 +212,7 @@ include("head.inc");
                   <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/system_gateways.php b/usr/local/www/system_gateways.php
index 28a3fe5..d50665a 100755
--- a/usr/local/www/system_gateways.php
+++ b/usr/local/www/system_gateways.php
@@ -105,8 +105,7 @@ include("head.inc");
 <input type="hidden" name="y1" value="1">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <?php if (is_subsystem_dirty('staticroutes')): ?><p>
-<?php print_info_box_np(gettext("The gateway configuration has been changed.") . "<br>" . gettext("You must apply the changes in order for them to take 
-effect."));?><br>
+<?php print_info_box_np(gettext("The gateway configuration has been changed.") . "<br>" . gettext("You must apply the changes in order for them to take effect."));?><br>
 <?php endif; ?>
 	<table width="100%" border="0" cellpadding="0" cellspacing="0">
 		<tr>
@@ -191,8 +190,11 @@ effect."));?><br>
 				<td><a href="system_gateways_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a>
 				<?php
 				if ($gateway['attribute'] != "system") : ?>
-					<td><a href="system_gateways.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this 
-gateway?"); ?>')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td>
+					<td>
+						<a href="system_gateways.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this gateway?"); ?>')">
+							<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0">
+						</a>
+					</td>
 				<?php else : ?>
 					<td width='17'></td>
 				<?php endif; ?>
diff --git a/usr/local/www/system_gateways_edit.php b/usr/local/www/system_gateways_edit.php
index a51b1c4..ed8e4a7 100755
--- a/usr/local/www/system_gateways_edit.php
+++ b/usr/local/www/system_gateways_edit.php
@@ -126,19 +126,19 @@ if ($_POST) {
 			}
 			if($_POST['name'] <> "") {
 				if (($gateway['name'] <> "") && ($_POST['name'] == $gateway['name']) && ($gateway['attribute'] != "system")) {
-					$input_errors[] = sprintf(gettext("The gateway name \"%s\" already exists."), $_POST['name']);
+					$input_errors[] = sprintf(gettext('The gateway name "%s" already exists.'), $_POST['name']);
 					break;
 				}
 			}
 			if(is_ipaddr($_POST['gateway'])) {
 				if (($gateway['gateway'] <> "") && ($_POST['gateway'] == $gateway['gateway']) && ($gateway['attribute'] != "system")) {
-					$input_errors[] = sprintf(gettext("The gateway IP address \"%s\" already exists."), $_POST['gateway']);
+					$input_errors[] = sprintf(gettext('The gateway IP address "%s" already exists.'), $_POST['gateway']);
 					break;
 				}
 			}
 			if(is_ipaddr($_POST['monitor'])) {
 				if (($gateway['monitor'] <> "") && ($_POST['monitor'] == $gateway['monitor']) && ($gateway['attribute'] != "system")) {
-					$input_errors[] = sprintf(gettext("The monitor IP address \"%s\" is already in use. You must choose a different monitor IP."), $_POST['monitor']);
+					$input_errors[] = sprintf(gettext('The monitor IP address "%s" is already in use. You must choose a different monitor IP.'), $_POST['monitor']);
 					break;
 				}
 			}
@@ -301,9 +301,9 @@ function enable_change(obj) {
 			?>
 			<input name="monitor" type="text" id="monitor" value="<?php echo $monitor; ?>" />
 			<strong><?=gettext("Alternative monitor IP"); ?></strong> <br />
-			<?gettext("Enter an alternative address here to be used to monitor the link. This is used for the
-			quality RRD graphs as well as the load balancer entries. Use this if the gateway does not respond
-			to ICMP echo requests (pings)"); ?>.</strong>
+			<?gettext("Enter an alternative address here to be used to monitor the link. This is used for the " .
+			"quality RRD graphs as well as the load balancer entries. Use this if the gateway does not respond " .
+			"to ICMP echo requests (pings)"); ?>.</strong>
 			<br />
 		  </td>
 		</tr>
@@ -311,8 +311,7 @@ function enable_change(obj) {
                   <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/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index 7a3b98c..e3cd72b 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -447,10 +447,10 @@ function presubmit() {
 					<tr>
 						<td colspan="3">
 							<p>
-								<?=gettext("Additional webConfigurator groups can be added here.
-								Group permissions can be assigned which are inherited by users who are members of the group.
-								An icon that appears grey indicates that it is a system defined object.
-								Some system object properties can be modified but they cannot be deleted.");?>
+								<?=gettext("Additional webConfigurator groups can be added here. " .
+								"Group permissions can be assigned which are inherited by users who are members of the group. " .
+								"An icon that appears grey indicates that it is a system defined object. " .
+								"Some system object properties can be modified but they cannot be deleted.");?>
 							</p>
 						</td>
 					</tr>
diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php
index 3fce917..c4d027e 100755
--- a/usr/local/www/system_routes_edit.php
+++ b/usr/local/www/system_routes_edit.php
@@ -200,7 +200,7 @@ include("head.inc");
 											</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>
@@ -242,8 +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>
diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index cc8039d..f8cd440 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -806,10 +806,10 @@ function sshkeyClicked(obj) {
 					<tr>
 						<td colspan="4">
 							<p>
-								<?=gettext("Additional webConfigurator users can be added here.
-								User permissions can be assigned directly or inherited from group memberships.
-								An icon that appears grey indicates that it is a system defined object.
-								Some system object properties can be modified but they cannot be deleted."); ?>
+								<?=gettext("Additional webConfigurator users can be added here. " .
+								"User permissions can be assigned directly or inherited from group memberships. " .
+								"An icon that appears grey indicates that it is a system defined object. " .
+								"Some system object properties can be modified but they cannot be deleted."); ?>
 							</p>
 						</td>
 					</tr>
diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php
index 289d7fe..274a359 100755
--- a/usr/local/www/system_usermanager_settings.php
+++ b/usr/local/www/system_usermanager_settings.php
@@ -125,7 +125,8 @@ if(!$pconfig['backend'])
                         <td width="78%" class="vtable">
 				<input name="session_timeout" id="session_timeout" type="text" size="8" value="<?=htmlspecialchars($pconfig['session_timeout']);?>" />
                           	<br />
-                          	<?=gettext("Time in minutes to expire idle management sessions. The default is 4 hours (240 minutes). <br/> Enter 0 to never expire sessions. NOTE: This is a security risk!");?><br />
+				<?=gettext("Time in minutes to expire idle management sessions. The default is 4 hours (240 minutes).");?><br/>
+				<?=gettext("Enter 0 to never expire sessions. NOTE: This is a security risk!");?><br />
 			</td>
 		</tr>
 		<tr>
diff --git a/usr/local/www/system_usermanager_settings_ldapacpicker.php b/usr/local/www/system_usermanager_settings_ldapacpicker.php
index 05476ac..5e76fce 100644
--- a/usr/local/www/system_usermanager_settings_ldapacpicker.php
+++ b/usr/local/www/system_usermanager_settings_ldapacpicker.php
@@ -93,7 +93,7 @@ function post_choices() {
  <body link="#000000" vlink="#000000" alink="#000000" >
  <form method="post" action="system_usermanager_settings_ldapacpicker.php">	
 <?php if (empty($ous)): ?>
-	<p><?=gettext("Sorry, we could not connect to the LDAP server.  Please try later.");?></p>
+	<p><?=gettext("Sorry, we could not connect to the LDAP server. Please try later.");?></p>
 	<input type='button' value='<?=gettext("Close"); ?>' onClick="window.close();">
 <?php else: ?>
 	<b><?=gettext("Please select which containers to Authenticate against");?>:</b>
-- 
cgit v1.1