diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-04-04 10:00:13 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-04-04 10:00:25 -0400 |
commit | 358b288458e6465fc73b836f4f84e0f0e10b329d (patch) | |
tree | 078acd81a32478b56b1f8e7fddafac8dfce97f37 /src/usr | |
parent | 1c92c5b1a42af43feafe7f4dab2e73a4aa17eec0 (diff) | |
download | pfsense-358b288458e6465fc73b836f4f84e0f0e10b329d.zip pfsense-358b288458e6465fc73b836f4f84e0f0e10b329d.tar.gz |
Merge pull request #2808 from NOYB/Firewall_/_NAT_-_Remove_Personalizations
(cherry picked from commit 4012d55c028ca1c4d449e7b80ba738d4dd5b2976)
Diffstat (limited to 'src/usr')
-rw-r--r-- | src/usr/local/www/firewall_nat.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_1to1.php | 12 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_1to1_edit.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_edit.php | 14 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_npt.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_npt_edit.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_out.php | 8 | ||||
-rw-r--r-- | src/usr/local/www/firewall_nat_out_edit.php | 14 |
8 files changed, 32 insertions, 32 deletions
diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index 8b15ffb..836bc65 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -212,7 +212,7 @@ if ($savemsg) { if (is_subsystem_dirty('natconf')) { print_apply_box(gettext('The NAT configuration has been changed.') . '<br />' . - gettext('You must apply the changes in order for them to take effect.')); + gettext('The changes must be applied for them to take effect.')); } $tab_array = array(); @@ -506,7 +506,7 @@ events.push(function() { // provide a warning message if the user tries to change page before saving $(window).bind('beforeunload', function(){ if (!saving && dirty) { - return ("<?=gettext('You have moved one or more Port Forward rules but have not yet saved')?>"); + return ("<?=gettext('One or more Port Forward rules have been moved but have not yet been saved')?>"); } else { return undefined; } diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index 2750da6..22aae72 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -161,7 +161,7 @@ if ($savemsg) { if (is_subsystem_dirty('natconf')) { print_apply_box(gettext('The NAT configuration has been changed.') . '<br />' . - gettext('You must apply the changes in order for them to take effect.')); + gettext('The changes must be applied for them to take effect.')); } $tab_array = array(); @@ -285,11 +285,11 @@ display_top_tabs($tab_array); </form> <div class="infoblock"> -<?php print_info_box(gettext('Depending on the way your WAN connection is setup, you may also need a ') . '<a href="firewall_virtual_ip.php">' . - gettext("Virtual IP.") . '</a>' . '<br />' . - gettext('If you add a 1:1 NAT entry for any of the interface IPs on this system, ' . +<?php print_info_box(gettext('Depending on the way the WAN connection is setup, this may also need a ') . '<a href="firewall_virtual_ip.php">' . + gettext("Virtual IP") . '</a>' . '<br />' . + gettext('If a 1:1 NAT entry is added for any of the interface IPs on this system, ' . 'it will make this system inaccessible on that IP address. i.e. if ' . - 'you use your WAN IP address, any services on this system (IPsec, OpenVPN server, etc.) ' . + 'the WAN IP address is used, any services on this system (IPsec, OpenVPN server, etc.) ' . 'using the WAN IP address will no longer function.'), 'info', false); ?> </div> @@ -322,7 +322,7 @@ events.push(function() { // provide a warning message if the user tries to change page before saving $(window).bind('beforeunload', function(){ if (!saving && dirty) { - return ("<?=gettext('You have moved one or more NAT 1:1 mappings but have not yet saved')?>"); + return ("<?=gettext('One or more NAT 1:1 mappings have been moved but have not yet been saved')?>"); } else { return undefined; } diff --git a/src/usr/local/www/firewall_nat_1to1_edit.php b/src/usr/local/www/firewall_nat_1to1_edit.php index 585d318..c76ef23 100644 --- a/src/usr/local/www/firewall_nat_1to1_edit.php +++ b/src/usr/local/www/firewall_nat_1to1_edit.php @@ -202,7 +202,7 @@ if ($_POST) { /* For dst, if user enters an alias and selects "network" then disallow. */ if ($_POST['dsttype'] == "network" && is_alias($_POST['dst'])) { - $input_errors[] = gettext("You must specify single host or alias for alias entries."); + $input_errors[] = gettext("Alias entries must specify a single host or alias."); } /* For src, user can enter only ip's or networks */ @@ -510,7 +510,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $section->addInput(new Form_Select( 'natreflection', diff --git a/src/usr/local/www/firewall_nat_edit.php b/src/usr/local/www/firewall_nat_edit.php index 383d026..0c0ca77 100644 --- a/src/usr/local/www/firewall_nat_edit.php +++ b/src/usr/local/www/firewall_nat_edit.php @@ -309,7 +309,7 @@ if ($_POST) { /* if user enters an alias and selects "network" then disallow. */ if (($_POST['srctype'] == "network" && is_alias($_POST['src'])) || ($_POST['dsttype'] == "network" && is_alias($_POST['dst']))) { - $input_errors[] = gettext("You must specify single host or alias for alias entries."); + $input_errors[] = gettext("Alias entries must specify a single host or alias."); } if (!is_specialnet($_POST['srctype'])) { @@ -673,7 +673,7 @@ $section->addInput(new Form_Checkbox( 'No RDR (NOT)', 'Disable redirection for traffic matching this rule', $pconfig['nordr'] -))->setHelp('This option is rarely needed, don\'t use this unless you know what you\'re doing.'); +))->setHelp('This option is rarely needed. Don\'t use this without thorough knowledge of the implications.'); $iflist = get_configured_interface_with_descr(false, true); @@ -796,8 +796,8 @@ $group->add(new Form_Input( ))->setPattern('[a-zA-Z0-9_]+')->setHelp('Custom'); $group->setHelp('Specify the source port or port range for this rule. This is usually random and almost never ' . - 'equal to the destination port range (and should usually be \'any\'). You can leave the \'to\' field ' . - 'empty if you only want to filter a single port.'); + 'equal to the destination port range (and should usually be \'any\'). The \'to\' field ' . + 'may be left empty if only filtering a single port.'); $section->add($group); @@ -857,7 +857,7 @@ $group->add(new Form_Input( ))->setPattern('[a-zA-Z0-9_]+')->setHelp('Custom'); $group->setHelp('Specify the port or port range for the destination of the packet for this mapping. ' . - 'You can leave the \'to\' field empty if you only want to map a single port '); + 'The \'to\' field may be left empty if only mapping a single port. '); $section->add($group); @@ -865,7 +865,7 @@ $section->addInput(new Form_IpAddress( 'localip', 'Redirect target IP', $pconfig['localip'] -))->setPattern('[.a-zA-Z0-9_:]+')->setHelp('Enter the internal IP address of the server on which you want to map the ports.' . '<br />' . +))->setPattern('[.a-zA-Z0-9_:]+')->setHelp('Enter the internal IP address of the server on which to map the ports.' . '<br />' . 'e.g.: 192.168.1.12'); $group = new Form_Group('Redirect target port'); @@ -896,7 +896,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); $section->addInput(new Form_Checkbox( diff --git a/src/usr/local/www/firewall_nat_npt.php b/src/usr/local/www/firewall_nat_npt.php index 2317dbd..0a1e0f8 100644 --- a/src/usr/local/www/firewall_nat_npt.php +++ b/src/usr/local/www/firewall_nat_npt.php @@ -161,7 +161,7 @@ if ($savemsg) { if (is_subsystem_dirty('natconf')) { print_apply_box(gettext('The NAT configuration has been changed.') . '<br />' . - gettext('You must apply the changes in order for them to take effect.')); + gettext('The changes must be applied for them to take effect.')); } $tab_array = array(); @@ -300,7 +300,7 @@ events.push(function() { // provide a warning message if the user tries to change page before saving $(window).bind('beforeunload', function(){ if (!saving && dirty) { - return ("<?=gettext('You have moved one or more NPt mappings but have not yet saved')?>"); + return ("<?=gettext('One or more NPt mappings have been moved but have not yet been saved')?>"); } else { return undefined; } diff --git a/src/usr/local/www/firewall_nat_npt_edit.php b/src/usr/local/www/firewall_nat_npt_edit.php index cd061be..907b55a 100644 --- a/src/usr/local/www/firewall_nat_npt_edit.php +++ b/src/usr/local/www/firewall_nat_npt_edit.php @@ -233,7 +233,7 @@ $section->addInput(new Form_Select( $pconfig['interface'], build_if_list() ))->setHelp('Choose which interface this rule applies to.' . '<br />' . - 'Hint: in most cases, you\'ll want to use "WAN" here.'); + 'Hint: Typically the "WAN" is used here.'); $section->addInput(new Form_Checkbox( 'srcnot', @@ -267,7 +267,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_npt[$id]) { $section->addInput(new Form_Input( diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index 07f9807..442bb12 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -245,7 +245,7 @@ if ($savemsg) { if (is_subsystem_dirty('natconf')) { print_apply_box(gettext('The NAT configuration has been changed.') . '<br />' . - gettext('You must apply the changes in order for them to take effect.')); + gettext('The changes must be applied for them to take effect.')); } $tab_array = array(); @@ -668,9 +668,9 @@ endif; <?php print_info_box(gettext('If automatic outbound NAT is selected, a mapping is automatically generated for each interface\'s subnet (except WAN-type connections) and the rules ' . 'on the "Mappings" section of this page are ignored.' . '<br />' . - 'If manual outbound NAT is selected, outbound NAT rules will not be automatically generated and only the mappings you specify on this page ' . + 'If manual outbound NAT is selected, outbound NAT rules will not be automatically generated and only the mappings specified on this page ' . 'will be used.' . '<br />' . - 'If hybrid outbound NAT is selected, mappings you specify on this page will be used, followed by the automatically generated ones.' . '<br />' . + 'If hybrid outbound NAT is selected, mappings specified on this page will be used, followed by the automatically generated ones.' . '<br />' . 'If disable outbound NAT is selected, no rules will be used.' . '<br />' . 'If a target address other than an interface\'s IP address is used, then depending on the way the WAN connection is setup, a ') . '<a href="firewall_virtual_ip.php">' . gettext("Virtual IP") . '</a>' . gettext(" may also be required."), @@ -706,7 +706,7 @@ events.push(function() { // provide a warning message if the user tries to change page before saving $(window).bind('beforeunload', function(){ if (!saving && dirty) { - return ("<?=gettext('You have moved one or more NAT outbound mappings but have not yet saved')?>"); + return ("<?=gettext('One or more NAT outbound mappings have been moved but have not yet been saved')?>"); } else { return undefined; } diff --git a/src/usr/local/www/firewall_nat_out_edit.php b/src/usr/local/www/firewall_nat_out_edit.php index d85b278..a19bde7 100644 --- a/src/usr/local/www/firewall_nat_out_edit.php +++ b/src/usr/local/www/firewall_nat_out_edit.php @@ -204,15 +204,15 @@ if ($_POST) { } if ($protocol_uses_ports && $_POST['sourceport'] <> "" && !(is_portoralias($_POST['sourceport']) || is_portrange($_POST['sourceport']))) { - $input_errors[] = gettext("You must supply either a valid port or port alias for the source port entry."); + $input_errors[] = gettext("A valid port or port alias must be supplied for the source port entry."); } if ($protocol_uses_ports && $_POST['dstport'] <> "" && !(is_portoralias($_POST['dstport']) || is_portrange($_POST['dstport']))) { - $input_errors[] = gettext("You must supply either a valid port or port alias for the destination port entry."); + $input_errors[] = gettext("A valid port or port alias must be supplied for the destination port entry."); } if ($protocol_uses_ports && $_POST['natport'] <> "" && !(is_portoralias($_POST['natport']) || is_portrange($_POST['natport'])) && !isset($_POST['nonat'])) { - $input_errors[] = gettext("You must supply a valid port for the NAT port entry."); + $input_errors[] = gettext("A valid port must be supplied for the NAT port entry."); } if (($_POST['source_type'] != "any") && ($_POST['source_type'] != "(self)")) { @@ -574,10 +574,10 @@ $section->addInput(new Form_IpAddress( $pconfig['targetip'] ))->addMask('targetip_subnet', $pconfig['targetip_subnet'])->addClass('othersubnet')->setHelp( 'Packets matching this rule will be mapped to the IP address given here.' . '<br />' . - 'If you want this rule to apply to another IP address rather than the IP address of the interface chosen above, ' . - 'select it here (you will need to define ' . + 'To apply this rule to a different IP address than the IP address of the interface chosen above, ' . + 'select it here (' . '<a href="firewall_virtual_ip.php">' . gettext("Virtual IP") . '</a> ' . - 'addresses on the interface first)'); + 'addresses need to be defined on the interface first)'); $section->addInput(new Form_Select( 'poolopts', @@ -637,7 +637,7 @@ $section->addInput(new Form_Input( 'Description', 'text', $pconfig['descr'] -))->setHelp('You may enter a description here for your reference (not parsed).'); +))->setHelp('A description may be entered here for administrative reference (not parsed).'); if (isset($id) && $a_out[$id]) { $section->addInput(new Form_Input( |