diff options
| -rw-r--r-- | etc/inc/shaper.inc | 8 | ||||
| -rw-r--r-- | usr/local/www/interfaces_bridge_edit.php | 28 | ||||
| -rw-r--r-- | usr/local/www/interfaces_lagg.php | 6 | ||||
| -rwxr-xr-x | usr/local/www/system.php | 2 | ||||
| -rw-r--r-- | usr/local/www/system_advanced_admin.php | 4 | ||||
| -rw-r--r-- | usr/local/www/system_camanager.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/system_firmware_settings.php | 6 | ||||
| -rw-r--r-- | usr/local/www/upload_progress.php | 2 | ||||
| -rw-r--r-- | usr/local/www/vpn_openvpn_csc.php | 8 | ||||
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 8 |
10 files changed, 38 insertions, 38 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 96712bf..c6e19d3 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -599,7 +599,7 @@ class altq_root_queue { $form .= " <input type=\"checkbox\" id=\"enabled\" name=\"enabled\" value=\"on\""; if ($this->GetEnabled() == "on") $form .= " CHECKED"; - $form .= " ><span class=\"vexpl\"> Enable/Disable discipline and its childs</span>"; + $form .= " ><span class=\"vexpl\"> Enable/disable discipline and its children</span>"; $form .= "</td></tr>"; $form .= "<tr><td valign=\"top\" class=\"vncellreq\"><br><span class=\"vexpl\">Name</span></td>"; $form .= "<td class=\"vncellreq\">"; @@ -627,7 +627,7 @@ class altq_root_queue { $form .= ">PRIQ</option>"; $form .= "</select>"; $form .= "<br> <span class=\"vexpl\">"; - $form .= "NOTE: changing this changes all child queues!"; + $form .= "NOTE: Changing this changes all child queues!"; $form .= " Beware you can lose information."; $form .= "</span>"; $form .= "</td></tr>"; @@ -660,13 +660,13 @@ class altq_root_queue { $form .= $this->GetQlimit(); $form .= "\">"; $form .= "</td></tr>"; - $form .= "<tr><td valign=\"top\" class=\"vncellreq\">Tbr Size</td>"; + $form .= "<tr><td valign=\"top\" class=\"vncellreq\">TBR Size</td>"; $form .= "<td class=\"vncellreq\">"; $form .= "<input type=\"text\" id=\"tbrconfig\" name=\"tbrconfig\" value=\""; $form .= $this->GetTbrConfig(); $form .= "\">"; $form .= "<br> <span class=\"vexpl\">"; - $form .= "Adjusts the size, in bytes, of the token bucket regulator."; + $form .= "Adjusts the size, in bytes, of the token bucket regulator. "; $form .= "If not specified, heuristics based on the interface "; $form .= "bandwidth are used to determine the size."; $form .= "</span></td></tr>"; diff --git a/usr/local/www/interfaces_bridge_edit.php b/usr/local/www/interfaces_bridge_edit.php index 8e77a06..1b2b304 100644 --- a/usr/local/www/interfaces_bridge_edit.php +++ b/usr/local/www/interfaces_bridge_edit.php @@ -109,27 +109,27 @@ if ($_POST) { do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); if ($_POST['maxage'] && !is_numeric($_POST['maxage'])) - $input_errors[] = "Maxage needs to be an interger between 6 and 40."; + $input_errors[] = "Maxage needs to be an integer between 6 and 40."; if ($_POST['maxaddr'] && !is_numeric($_POST['maxaddr'])) - $input_errors[] = "Maxaddr needs to be an interger."; + $input_errors[] = "Maxaddr needs to be an integer."; if ($_POST['timeout'] && !is_numeric($_POST['timeout'])) - $input_errors[] = "Timeout needs to be an interger."; + $input_errors[] = "Timeout needs to be an integer."; if ($_POST['fwdelay'] && !is_numeric($_POST['fwdelay'])) - $input_errors[] = "Forward Delay needs to be an interger between 4 and 30."; + $input_errors[] = "Forward Delay needs to be an integer between 4 and 30."; if ($_POST['hellotime'] && !is_numeric($_POST['hellotime'])) - $input_errors[] = "Hello time for STP needs to be an interger between 1 and 2."; + $input_errors[] = "Hello time for STP needs to be an integer between 1 and 2."; if ($_POST['priority'] && !is_numeric($_POST['priority'])) - $input_errors[] = "Priority for STP needs to be an interger between 0 and 61440."; + $input_errors[] = "Priority for STP needs to be an integer between 0 and 61440."; if ($_POST['holdcnt'] && !is_numeric($_POST['holdcnt'])) - $input_errors[] = "Transmit Hold Count for STP needs to be an interger between 1 and 10."; + $input_errors[] = "Transmit Hold Count for STP needs to be an integer between 1 and 10."; foreach ($ifacelist as $ifn => $ifdescr) { if ($_POST[$ifn] <> "" && !is_numeric($_POST[$ifn])) - $input_errors[] = "{$ifdescr} interface priority for STP needs to be an interger between 0 and 240."; + $input_errors[] = "{$ifdescr} interface priority for STP needs to be an integer between 0 and 240."; } $i = 0; foreach ($ifacelist as $ifn => $ifdescr) { if ($_POST["{$ifn}{$i}"] <> "" && !is_numeric($_POST["{$ifn}{$i}"])) - $input_errors[] = "{$ifdescr} interface path cost for STP needs to be an interger between 1 and 200000000."; + $input_errors[] = "{$ifdescr} interface path cost for STP needs to be an integer between 1 and 200000000."; $i++; } @@ -461,7 +461,7 @@ Set the size of the bridge address cache to size. The default is <br> <span class="vexpl"> Set interface as an edge port. An edge port connects directly to - end stations cannot create bridging loops in the network, this + end stations and cannot create bridging loops in the network; this allows it to transition straight to forwarding. </span></td> </tr> @@ -503,9 +503,9 @@ Set the size of the bridge address cache to size. The default is </select> <br> <span class="vexpl"> - Set the interface as a point to point link. This is required for + Set the interface as a point-to-point link. This is required for straight transitions to forwarding and should be enabled on a - direct link to another RSTP capable switch. + direct link to another RSTP-capable switch. </span></td> </tr> <tr style="display:none" id="sprtable8" name="sprtable8"> @@ -523,7 +523,7 @@ Set the size of the bridge address cache to size. The default is </select> <br> <span class="vexpl"> - Automatically detect the point to point status on interface by + Automatically detect the point-to-point status on interface by checking the full duplex link status. This is the default for interfaces added to the bridge. <p class="vexpl"><span class="red"><strong> @@ -548,7 +548,7 @@ Set the size of the bridge address cache to size. The default is <br> <span class="vexpl"> Mark an interface as a "sticky" interface. Dynamically learned - address entries are treated at static once entered into the + address entries are treated as static once entered into the cache. Sticky entries are never aged out of the cache or replaced, even if the address is seen on a different interface. </span></td> diff --git a/usr/local/www/interfaces_lagg.php b/usr/local/www/interfaces_lagg.php index a8445e2..f09c59e 100644 --- a/usr/local/www/interfaces_lagg.php +++ b/usr/local/www/interfaces_lagg.php @@ -67,7 +67,7 @@ function lagg_inuse($num) { if ($_GET['act'] == "del") { /* check if still in use */ if (lagg_inuse($_GET['id'])) { - $input_errors[] = "This lagg interface cannot be deleted because it is still being used."; + $input_errors[] = "This LAGG interface cannot be deleted because it is still being used."; } else { mwexec_bg("/sbin/ifconfig " . $a_laggs[$_GET['id']]['laggif'] . " destroy"); unset($a_laggs[$_GET['id']]); @@ -126,7 +126,7 @@ include("head.inc"); <?=htmlspecialchars($lagg['descr']);?> </td> <td valign="middle" nowrap class="list"> <a href="interfaces_lagg_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0"></a> - <a href="interfaces_lagg.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this lagg interface?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td> + <a href="interfaces_lagg.php?act=del&id=<?=$i;?>" onclick="return confirm('Do you really want to delete this LAGG interface?')"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" border="0"></a></td> </tr> <?php $i++; endforeach; ?> <tr> @@ -137,7 +137,7 @@ include("head.inc"); <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> Note:<br> </strong></span> - Lagg allows for link aggregation, for bonding and fault tolerance. Only un-assigned interfaces can be added to lagg. + LAGG allows for link aggregation, bonding and fault tolerance. Only unassigned interfaces can be added to LAGG. </td> <td class="list"> </td> </tr> diff --git a/usr/local/www/system.php b/usr/local/www/system.php index f63b9eb..69a8f70 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -251,7 +251,7 @@ include("head.inc"); <td width="78%" class="vtable"> <input name="hostname" type="text" class="formfld unknown" id="hostname" size="40" value="<?=htmlspecialchars($pconfig['hostname']);?>"> <br/> <span class="vexpl"> - <?=gettext("name of the firewall host, without domain part"); ?> + <?=gettext("Name of the firewall host, without domain part"); ?> <br/> <?=gettext("e.g."); ?> <em>firewall</em> </span> diff --git a/usr/local/www/system_advanced_admin.php b/usr/local/www/system_advanced_admin.php index 8a6eae0..6f7a077 100644 --- a/usr/local/www/system_advanced_admin.php +++ b/usr/local/www/system_advanced_admin.php @@ -332,7 +332,7 @@ function prot_change() { <td width="22%" valign="top" class="vncell"><?=gettext("Authentication Method"); ?></td> <td width="78%" class="vtable"> <input name="sshdkeyonly" type="checkbox" id="sshdkeyonly" value="yes" <?php if ($pconfig['sshdkeyonly']) echo "checked"; ?> /> - <strong><?=gettext("Disable Password login for Secure Shell (rsa key only)"); ?></strong> + <strong><?=gettext("Disable password login for Secure Shell (RSA key only)"); ?></strong> <br/> <?=gettext("When enabled, authorized keys need to be configured for each"); ?> <a href="system_usermanager.php"><?=gettext("user"); ?></a> @@ -344,7 +344,7 @@ function prot_change() { <td width="78%" class="vtable"> <input name="sshport" type="text" id="sshport" value="<?php echo $pconfig['sshport']; ?>" /> <br/> - <span class="vexpl"><?=gettext("Note: Leave this blank for the default of 22"); ?></span> + <span class="vexpl"><?=gettext("Note: Leave this blank for the default of 22."); ?></span> </td> </tr> <tr> diff --git a/usr/local/www/system_camanager.php b/usr/local/www/system_camanager.php index 8c0417c..0ca9494 100644 --- a/usr/local/www/system_camanager.php +++ b/usr/local/www/system_camanager.php @@ -457,7 +457,7 @@ function method_change() { <a href="system_camanager.php?act=exp&id=<?=$i;?>")"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_down.gif" title="<?=gettext("export ca");?>" alt="<?=gettext("export ca");?>" width="17" height="17" border="0" /> </a> - <a href="system_camanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and all associated Certificates?");?>')"> + <a href="system_camanager.php?act=del&id=<?=$i;?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate Authority and all associated certificates?");?>')"> <img src="/themes/<?= $g['theme'];?>/images/icons/icon_x.gif" title="<?=gettext("delete ca");?>" alt="<?=gettext("delete ca"); ?>" width="17" height="17" border="0" /> </a> </td> @@ -477,7 +477,7 @@ function method_change() { <tr> <td colspan="5"> <p> - <?=gettext("Additional trusted certificate authorities can be added here.");?> + <?=gettext("Additional trusted Certificate Authorities can be added here.");?> </p> </td> </tr> diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index a16f9b8..d09934c 100755 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -131,14 +131,14 @@ function enable_altfirmwareurl(enable_over) { <tr> <td valign="top" class="vncell"><?=gettext("Firmware Auto Update URL"); ?></td> <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 different URL server for firmware upgrades other than") . " " . $g['product_website']; ?><br> + <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> </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> <?=gettext("When a custom URL is enabled, the system will not verify the digital signature from"); ?> <?php echo $g['product_website'] ?>. </span> </td> </tr> @@ -153,7 +153,7 @@ function enable_altfirmwareurl(enable_over) { <td width="78%" class="vtable"> <input name="allowinvalidsig" type="checkbox" id="allowinvalidsig" value="yes" <?php if (isset($curcfg['allowinvalidsig'])) echo "checked"; ?> /> <br /> - <?=gettext("Allow to update the system with auto-updater and images with no signature."); ?> + <?=gettext("Allow updating the system with auto-updater and images with no signature."); ?> </td> </tr> <script>enable_altfirmwareurl();</script> diff --git a/usr/local/www/upload_progress.php b/usr/local/www/upload_progress.php index 3559ac5..8a27b64 100644 --- a/usr/local/www/upload_progress.php +++ b/usr/local/www/upload_progress.php @@ -41,7 +41,7 @@ include("guiconfig.inc"); // sanitize the ID value $id = $_SESSION['uploadid']; if (!$id) { - echo "Sorry, we could not find a uploadid code."; + echo "Sorry, we could not find an uploadid code."; exit; } diff --git a/usr/local/www/vpn_openvpn_csc.php b/usr/local/www/vpn_openvpn_csc.php index 5a71121..0021acc 100644 --- a/usr/local/www/vpn_openvpn_csc.php +++ b/usr/local/www/vpn_openvpn_csc.php @@ -327,7 +327,7 @@ function netbios_change() { </td> </tr> </table> - Set this option to disable this client specific override without removing it from the list. + Set this option to disable this client-specific override without removing it from the list. </td> </tr> <tr> @@ -362,7 +362,7 @@ function netbios_change() { </td> </tr> </table> - Don't use this option to permenently disable a + Don't use this option to permanently disable a client due to a compromised key or password. Use a CRL (certificate revocation list) instead. </td> @@ -422,7 +422,7 @@ function netbios_change() { </td> <td> <span class="vexpl"> - Prevent this client from receiving any server defined client settings. + Prevent this client from receiving any server-defined client settings. </span> </td> </tr> @@ -558,7 +558,7 @@ function netbios_change() { </td> </tr> </table> - If this option is not set, all Netbios-over-TCP/IP options (includeing WINS) will be disabled. + If this option is not set, all NetBIOS-over-TCP/IP options (includeing WINS) will be disabled. <br/> <table border="0" cellpadding="2" cellspacing="0" id="netbios_data"> <tr> diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index de7320f..64ffef1 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -52,7 +52,7 @@ <step> <id>2</id> <title>General Information</title> - <description>On this screen you will set the General pfSense parameters.</description> + <description>On this screen you will set the general pfSense parameters.</description> <fields> <field> <name>Hostname</name> @@ -179,7 +179,7 @@ <name>MAC Address</name> <bindstofield>interfaces->wan->spoofmac</bindstofield> <type>input</type> - <description> This field can be used to modify ("spoof") the MAC address of the WAN interface (may be required with some cable connections) Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx or leave blank</description> + <description> This field can be used to modify ("spoof") the MAC address of the WAN interface (may be required with some cable connections). Enter a MAC address in the following format: xx:xx:xx:xx:xx:xx or leave blank.</description> </field> <field> <donotdisable>true</donotdisable> @@ -318,7 +318,7 @@ <field> <donotdisable>true</donotdisable> <name>Block bogon networks</name> - <description>Block bogon networks when set, this option blocks traffic from IP addresses that are reserved (but not RFC 1918) or not yet assigned by IANA. Bogons are prefixes that should never appear in the Internet routing table, and obviously should not appear as the source address in any packets you receive.</description> + <description>When set, this option blocks traffic from IP addresses that are reserved (but not RFC 1918) or not yet assigned by IANA. Bogons are prefixes that should never appear in the Internet routing table, and obviously should not appear as the source address in any packets you receive.</description> <type>checkbox</type> <bindstofield>interfaces->wan->blockbogons</bindstofield> <typehint>Block non-Internet routed networks from entering via WAN</typehint> @@ -376,7 +376,7 @@ <step> <id>6</id> <title>Set Admin WebGUI Password</title> - <description>On this screen we will set the Admin password which is used to access the WebGUI and also SSH services if you wish to enable.</description> + <description>On this screen we will set the admin password, which is used to access the WebGUI and also SSH services if you wish to enable them.</description> <fields> <field> <name>Admin Password</name> |
