diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 12:45:35 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 12:45:35 -0300 |
commit | ab07ca181d1223de148838a087d926f050d6f49b (patch) | |
tree | 43c8cdaa1b8e58919ce562ac079dbc9369aeab0f /usr/local/www/diag_nanobsd.php | |
parent | 6896444b50b50c187c69fedc511264cff5df1c44 (diff) | |
parent | 111887664a131d3fa1b45e089676802ef71efcf7 (diff) | |
download | pfsense-ab07ca181d1223de148838a087d926f050d6f49b.zip pfsense-ab07ca181d1223de148838a087d926f050d6f49b.tar.gz |
Merge remote branch 'mainline/master' into 3_interfaces
Conflicts:
usr/local/www/firewall_aliases.php
usr/local/www/firewall_aliases_edit.php
usr/local/www/firewall_aliases_import.php
usr/local/www/firewall_nat.php
usr/local/www/firewall_nat_1to1.php
usr/local/www/firewall_nat_1to1_edit.php
usr/local/www/firewall_nat_edit.php
usr/local/www/firewall_nat_out.php
usr/local/www/firewall_nat_out_edit.php
usr/local/www/firewall_rules.php
usr/local/www/firewall_rules_edit.php
usr/local/www/firewall_schedule.php
usr/local/www/firewall_schedule_edit.php
usr/local/www/firewall_shaper.php
usr/local/www/firewall_shaper_layer7.php
usr/local/www/firewall_shaper_vinterface.php
usr/local/www/firewall_shaper_wizards.php
usr/local/www/firewall_virtual_ip.php
usr/local/www/firewall_virtual_ip_edit.php
Diffstat (limited to 'usr/local/www/diag_nanobsd.php')
-rwxr-xr-x | usr/local/www/diag_nanobsd.php | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php index 4e64c8f..db96484 100755 --- a/usr/local/www/diag_nanobsd.php +++ b/usr/local/www/diag_nanobsd.php @@ -46,7 +46,7 @@ ini_set('max_input_time', '9999'); require_once("guiconfig.inc"); require_once("config.inc"); -$pgtitle = array("Diagnostics","NanoBSD"); +$pgtitle = array(gettext("Diagnostics"), gettext("NanoBSD")); include("head.inc"); // Survey slice info @@ -76,7 +76,7 @@ if($_POST['bootslice']) { </div> EOF; nanobsd_switch_boot_slice(); - $savemsg = "The boot slice has been set to " . nanobsd_get_active_slice(); + $savemsg = gettext("The boot slice has been set to") . " " . nanobsd_get_active_slice(); // Survey slice info nanobsd_detect_slice_info(); @@ -92,9 +92,9 @@ echo <<<EOF </div> EOF; if(nanobsd_clone_slice($_POST['destslice'])) { - $savemsg = "The slice has been duplicated.<p/>If you would like to boot from this newly duplicated slice please set it using the bootup information area."; + $savemsg = gettext("The slice has been duplicated.") . "<p/>" . gettext("If you would like to boot from this newly duplicated slice please set it using the bootup information area."); } else { - $savemsg = "There was an error while duplicating the slice. Operation aborted."; + $savemsg = gettext("There was an error while duplicating the slice. Operation aborted."); } // Re-Survey slice info nanobsd_detect_slice_info(); @@ -115,28 +115,28 @@ if ($savemsg) <div class="tabcont"> <span class="vexpl"> <span class="red"> - <strong>NOTE: </strong> + <strong><?=gettext("NOTE") . ":"?> </strong> </span> - The options on this page are intended for use by advanced users only. + <?=gettext("The options on this page are intended for use by advanced users only.")?> <br/> </span> <p/> <table width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td colspan="2" valign="top" class="listtopic">Bootup information</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Bootup information");?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">NanoBSD Image size</td> + <td width="22%" valign="top" class="vncell"><?=gettext("NanoBSD Image size");?></td> <td width="78%" class="vtable"> <?php echo $NANOBSD_SIZE; ?> </td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Bootup</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Bootup");?></td> <td width="78%" class="vtable"> <form action="diag_nanobsd.php" method="post" name="iform"> - Bootup slice is currently: <?php echo $ACTIVE_SLICE; ?> - <br/><br/>This will switch the bootup slice to the alternate slice. + <?=gettext("Bootup slice is currently");?>: <?php echo $ACTIVE_SLICE; ?> + <br/><br/><?=gettext("This will switch the bootup slice to the alternate slice.");?> <br/> <input type='hidden' name='bootslice' value='switch'> <input type='submit' value='Switch Slice'></form> @@ -146,20 +146,20 @@ if ($savemsg) <td colspan="2" valign="top" class=""> </td> </tr> <tr> - <td colspan="2" valign="top" class="listtopic">Duplicate bootup slice to alternate</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("Duplicate bootup slice to alternate");?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">Duplicate bootup slice</td> + <td width="22%" valign="top" class="vncell"><?=gettext("Duplicate bootup slice");?></td> <td width="78%" class="vtable"> <form action="diag_nanobsd.php" method="post" name="iform"> - Destination slice: + <?=gettext("Destination slice");?>: <select name='destslice'> <option value='<?php echo $COMPLETE_PATH; ?>'> <?php echo "{$COMPLETE_BOOT_PATH} -> {$TOFLASH}"; ?> </option> </select> <br/> - This will duplicate the bootup slice to the alternate slice. Use this if you would like to duplicate the known good working boot partition to the alternate. + <?=gettext("This will duplicate the bootup slice to the alternate slice. Use this if you would like to duplicate the known good working boot partition to the alternate.");?> </td> </tr> <tr> @@ -170,10 +170,10 @@ if ($savemsg) <td colspan="2" valign="top" class=""> </td> </tr> <tr> - <td colspan="2" valign="top" class="listtopic">View upgrade log</td> + <td colspan="2" valign="top" class="listtopic"><?=gettext("View upgrade log");?></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">View previous upgrade log</td> + <td width="22%" valign="top" class="vncell"><?=gettext("View previous upgrade log");?></td> <td width="78%" class="vtable"> <?php if($_POST['viewupgradelog']) { |