diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-04-04 09:51:57 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-04-04 09:52:02 -0400 |
commit | a592bb277478edcf420fda8a351920d65857f940 (patch) | |
tree | 01ded8f56a50626fda2eb822825833cd96b5542c /src/usr/local/www/vpn_openvpn_client.php | |
parent | cbcea7e182c5c19ddd13612000d5b22fbeb1ee5e (diff) | |
download | pfsense-a592bb277478edcf420fda8a351920d65857f940.zip pfsense-a592bb277478edcf420fda8a351920d65857f940.tar.gz |
Merge pull request #2826 from NOYB/VPN_/_OpenVPN_-_Remove_Personalizations
(cherry picked from commit 28ca20bb51fb3002f89c026f160e7d6ea0c4d310)
Diffstat (limited to 'src/usr/local/www/vpn_openvpn_client.php')
-rw-r--r-- | src/usr/local/www/vpn_openvpn_client.php | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index 6284c6f..9e90762 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -217,9 +217,9 @@ if ($_POST) { list($iv_iface, $iv_ip) = explode ("|", $pconfig['interface']); if (is_ipaddrv4($iv_ip) && (stristr($pconfig['protocol'], "6") !== false)) { - $input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv6 protocol and an IPv4 IP address."); + $input_errors[] = gettext("Protocol and IP address families do not match. An IPv6 protocol and an IPv4 IP address cannot be selected."); } elseif (is_ipaddrv6($iv_ip) && (stristr($pconfig['protocol'], "6") === false)) { - $input_errors[] = gettext("Protocol and IP address families do not match. You cannot select an IPv4 protocol and an IPv6 IP address."); + $input_errors[] = gettext("Protocol and IP address families do not match. An IPv4 protocol and an IPv6 IP address cannot be selected."); } elseif ((stristr($pconfig['protocol'], "6") === false) && !get_interface_ip($iv_iface) && ($pconfig['interface'] != "any")) { $input_errors[] = gettext("An IPv4 protocol was selected, but the selected interface has no IPv4 address."); } elseif ((stristr($pconfig['protocol'], "6") !== false) && !get_interface_ipv6($iv_iface) && ($pconfig['interface'] != "any")) { @@ -498,7 +498,7 @@ if ($act=="new" || $act=="edit"): 'number', $pconfig['local_port'], ['min' => '0'] - ))->setHelp('Set this option if you would like to bind to a specific port. Leave this blank or enter 0 for a random dynamic port.'); + ))->setHelp('Set this option to bind to a specific port. Leave this blank or enter 0 for a random dynamic port.'); $section->addInput(new Form_Input( 'server_addr', @@ -555,7 +555,7 @@ if ($act=="new" || $act=="edit"): 'Description', 'text', $pconfig['description'] - ))->setHelp('You may enter a description here for your reference (not parsed).'); + ))->setHelp('A description may be entered here for administrative reference (not parsed).'); $form->add($section); $section = new Form_Section('User Authentication Settings'); @@ -599,7 +599,7 @@ if ($act=="new" || $act=="edit"): 'tls', 'Key', $pconfig['tls'] - ))->setHelp('Paste your shared key here'); + ))->setHelp('Paste the shared key here'); if (count($a_ca)) { $list = array(); @@ -616,7 +616,7 @@ if ($act=="new" || $act=="edit"): } else { $section->addInput(new Form_StaticText( 'Peer Certificate Authority', - sprintf('No Certificate Authorities defined. You may create one here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>') + sprintf('No Certificate Authorities defined. One may be created here: %s', '<a href="system_camanager.php">System > Cert. Manager</a>') )); } @@ -630,7 +630,7 @@ if ($act=="new" || $act=="edit"): } else { $section->addInput(new Form_StaticText( 'Peer Certificate Revocation list', - sprintf('No Certificate Revocation Lists defined. You may create one here: %s', '<a href="system_crlmanager.php">System > Cert. Manager > Certificate Revocation</a>') + sprintf('No Certificate Revocation Lists defined. One may be created here: %s', '<a href="system_crlmanager.php">System > Cert. Manager > Certificate Revocation</a>') )); } @@ -645,7 +645,7 @@ if ($act=="new" || $act=="edit"): 'shared_key', 'Shared Key', $pconfig['shared_key'] - ))->setHelp('Paste your shared key here'); + ))->setHelp('Paste the shared key here'); $cl = openvpn_build_cert_list(true); @@ -706,7 +706,7 @@ if ($act=="new" || $act=="edit"): $pconfig['remote_network'] ))->setHelp('IPv4 networks that will be routed through the tunnel, so that a site-to-site VPN can be established without manually ' . 'changing the routing tables. Expressed as a comma-separated list of one or more CIDR ranges. ' . - 'If this is a site-to-site VPN, enter the remote LAN/s here. You may leave this blank if you don\'t want a site-to-site VPN.'); + 'If this is a site-to-site VPN, enter the remote LAN/s here. May be left blank for non site-to-site VPN.'); $section->addInput(new Form_Input( 'remote_networkv6', @@ -715,7 +715,7 @@ if ($act=="new" || $act=="edit"): $pconfig['remote_networkv6'] ))->setHelp('These are the IPv6 networks that will be routed through the tunnel, so that a site-to-site VPN can be established without manually ' . 'changing the routing tables. Expressed as a comma-separated list of one or more IP/PREFIX. ' . - 'If this is a site-to-site VPN, enter the remote LAN/s here. You may leave this blank if you don\'t want a site-to-site VPN.'); + 'If this is a site-to-site VPN, enter the remote LAN/s here. May be left blank for non site-to-site VPN.'); $section->addInput(new Form_Input( 'use_shaper', @@ -776,14 +776,14 @@ if ($act=="new" || $act=="edit"): 'custom_options', 'Custom options', $pconfig['custom_options'] - ))->setHelp('Enter any additional options you would like to add to the OpenVPN client configuration here, separated by semicolon'); + ))->setHelp('Enter any additional options to add to the OpenVPN client configuration here, separated by semicolon'); $section->addInput(new Form_Select( 'verbosity_level', 'Verbosity level', $pconfig['verbosity_level'], $openvpn_verbosity_level - ))->setHelp('Each level shows all info from the previous levels. Level 3 is recommended if you want a good summary of what\'s happening without being swamped by output' . '<br /><br />' . + ))->setHelp('Each level shows all info from the previous levels. Level 3 is recommended for a good summary of what\'s happening without being swamped by output' . '<br /><br />' . 'None: Only fatal errors' . '<br />' . 'Default through 4: Normal usage range' . '<br />' . '5: Output R and W characters to the console for each packet read and write, uppercase is used for TCP/UDP packets and lowercase is used for TUN/TAP packets' .'<br />' . |