Merge branch 'gettext' of rcs.pfsense.org:pfsense/bluepex-clone into gettext

3 files changed, 13 insertions, 13 deletions

diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php
index 6a9a609..5eedd80 100755
--- a/usr/local/www/system_firmware_auto.php
+++ b/usr/local/www/system_firmware_auto.php
@@ -51,7 +51,7 @@ if(isset($curcfg['alturl']['enable']))
 else
 	$updater_url = $g['update_url'];
 	
-$pgtitle = array("Diagnostics","Firmware","Auto Update");
+$pgtitle = array(gettext("Diagnostics"),gettext("Firmware"),gettext("Auto Update"));
 include("head.inc");
 
 ?>
@@ -70,9 +70,9 @@ include("head.inc");
 		<td>
 <?php
 	$tab_array = array();
-	$tab_array[0] = array("Manual Update", false, "system_firmware.php");
-	$tab_array[1] = array("Auto Update", true, "system_firmware_check.php");
-	$tab_array[2] = array("Updater Settings", false, "system_firmware_settings.php");
+	$tab_array[0] = array(gettext("Manual Update"), false, "system_firmware.php");
+	$tab_array[1] = array(gettext("Auto Update"), true, "system_firmware_check.php");
+	$tab_array[2] = array(gettext("Updater Settings"), false, "system_firmware_settings.php");
 	display_top_tabs($tab_array);
 ?>
 		</td>
@@ -104,7 +104,7 @@ include("head.inc");
 						</table>
 						<br>
 						<!-- status box -->
-						<textarea cols="60" rows="1" name="status" id="status" wrap="hard">Beginning firmware upgrade.</textarea>
+						<textarea cols="60" rows="1" name="status" id="status" wrap="hard"><?=gettext("Beginning firmware upgrade"); ?>.</textarea>
 						<!-- command output box -->
 						<textarea cols="60" rows="25" name="output" id="output" wrap="hard"></textarea>
 					</center>
diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php
index af69938..7a3b98c 100644
--- a/usr/local/www/system_groupmanager.php
+++ b/usr/local/www/system_groupmanager.php
@@ -427,8 +427,8 @@ function presubmit() {
 							</a>
 							&nbsp;
 							<?php if($group['scope'] != "system"): ?>
-							<a href="system_groupmanager.php?act=delgroup&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this group?')">
-								<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="delete group" width="17" height="17" border="0">
+							<a href="system_groupmanager.php?act=delgroup&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this group?"); ?>')">
+								<img src="/themes/<?=$g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete group"); ?>" width="17" height="17" border="0">
 							</a>
 							<?php endif; ?>
 						</td>
@@ -447,10 +447,10 @@ function presubmit() {
 					<tr>
 						<td colspan="3">
 							<p>
-								<?=gettext("Additional webConfigurator groups can be added here.");?>
-								<?=gettext("Group permissions can be assigned which are inherited by users who are members of the group.");?>
-								<?=gettext("An icon that appears grey indicates that it is a system defined object.");?>
-								<?=gettext("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_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php
index 8f13c55..1a3ef2c 100644
--- a/usr/local/www/system_usermanager_addprivs.php
+++ b/usr/local/www/system_usermanager_addprivs.php
@@ -81,7 +81,7 @@ if ($_POST) {
 
 	/* input validation */
 	$reqdfields = explode(" ", "sysprivs");
-	$reqdfieldsn = explode(",", "Selected priveleges");
+	$reqdfieldsn = array(gettext("Selected priveleges"));
 
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
@@ -195,7 +195,7 @@ function update_description() {
 						<tr height="60">
 							<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td>
 							<td width="78%" valign="top" class="vtable" id="pdesc">
-								<em>Select a privilege from the list above for a description</em>
+								<em><?=gettext("Select a privilege from the list above for a description"); ?></em>
 							</td>
 						</tr>
 						<tr>