From dbe87243ffef17cc41f7fe3bc5fa02ed1372059d Mon Sep 17 00:00:00 2001 From: NOYB Date: Fri, 1 Apr 2016 00:05:47 -0700 Subject: VPN / IPsec - Remove Personalizations Remove "you" personalizations. --- src/usr/local/www/vpn_ipsec.php | 4 ++-- src/usr/local/www/vpn_ipsec_keys.php | 2 +- src/usr/local/www/vpn_ipsec_mobile.php | 2 +- src/usr/local/www/vpn_ipsec_phase1.php | 12 ++++++------ src/usr/local/www/vpn_ipsec_phase2.php | 18 +++++++++--------- src/usr/local/www/vpn_ipsec_settings.php | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/usr/local/www') diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 93fc6d4..cafded4 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -266,7 +266,7 @@ display_top_tabs($tab_array); } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("The changes must be applied for them to take effect.")); } ?> @@ -557,7 +557,7 @@ display_top_tabs($tab_array);
- ', gettext("Status:IPsec"), '') . '
' . + ', gettext("Status:IPsec"), '') . '
' . sprintf(gettext("IPsec debug mode can be enabled at %s%s%s."), '', gettext("VPN:IPsec:Advanced Settings"), '') . '
' . sprintf(gettext("IPsec can be set to prefer older SAs at %s%s%s."), '', gettext("VPN:IPsec:Advanced Settings"), ''), 'info', false); ?>
diff --git a/src/usr/local/www/vpn_ipsec_keys.php b/src/usr/local/www/vpn_ipsec_keys.php index 00834c9..84649e8 100644 --- a/src/usr/local/www/vpn_ipsec_keys.php +++ b/src/usr/local/www/vpn_ipsec_keys.php @@ -112,7 +112,7 @@ if ($savemsg) { } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index dd113fe..6b03e17 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -437,7 +437,7 @@ if ($savemsg) { print_info_box($savemsg, 'success'); } if (is_subsystem_dirty('ipsec')) { - print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The IPsec tunnel configuration has been changed.") . "
" . gettext("The changes must be applied for them to take effect.")); } foreach ($a_phase1 as $ph1ent) { if (isset($ph1ent['mobile'])) { diff --git a/src/usr/local/www/vpn_ipsec_phase1.php b/src/usr/local/www/vpn_ipsec_phase1.php index fb19df5..29d521f 100644 --- a/src/usr/local/www/vpn_ipsec_phase1.php +++ b/src/usr/local/www/vpn_ipsec_phase1.php @@ -273,9 +273,9 @@ if ($_POST) { if (!is_ipaddr($pconfig['remotegw']) && !is_domain($pconfig['remotegw'])) { $input_errors[] = gettext("A valid remote gateway address or host name must be specified."); } elseif (is_ipaddrv4($pconfig['remotegw']) && ($pconfig['protocol'] != "inet")) { - $input_errors[] = gettext("A valid remote gateway IPv4 address must be specified or you need to change protocol to IPv6"); + $input_errors[] = gettext("A valid remote gateway IPv4 address must be specified or protocol needs to be changed to IPv6"); } elseif (is_ipaddrv6($pconfig['remotegw']) && ($pconfig['protocol'] != "inet6")) { - $input_errors[] = gettext("A valid remote gateway IPv6 address must be specified or you need to change protocol to IPv4"); + $input_errors[] = gettext("A valid remote gateway IPv6 address must be specified or protocol needs to be changed to IPv4"); } } @@ -296,11 +296,11 @@ if ($_POST) { foreach ($a_phase2 as $phase2) { if ($phase2['ikeid'] == $pconfig['ikeid']) { if (($pconfig['protocol'] == "inet") && ($phase2['mode'] == "tunnel6")) { - $input_errors[] = gettext("There is a Phase 2 using IPv6, you cannot use IPv4."); + $input_errors[] = gettext("There is a Phase 2 using IPv6, cannot use IPv4."); break; } if (($pconfig['protocol'] == "inet6") && ($phase2['mode'] == "tunnel")) { - $input_errors[] = gettext("There is a Phase 2 using IPv4, you cannot use IPv6."); + $input_errors[] = gettext("There is a Phase 2 using IPv4, cannot use IPv6."); break; } } @@ -729,7 +729,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).'); $form->add($section); @@ -795,7 +795,7 @@ $section->addInput(new Form_Input( 'Pre-Shared Key', 'text', $pconfig['pskey'] -))->setHelp('Enter your Pre-Shared Key string.'); +))->setHelp('Enter the Pre-Shared Key string.'); $section->addInput(new Form_Select( 'certref', diff --git a/src/usr/local/www/vpn_ipsec_phase2.php b/src/usr/local/www/vpn_ipsec_phase2.php index 553950a..ec7b96d 100644 --- a/src/usr/local/www/vpn_ipsec_phase2.php +++ b/src/usr/local/www/vpn_ipsec_phase2.php @@ -187,9 +187,9 @@ if ($_POST) { if (!$pconfig['localid_address'] || !is_ipaddr($pconfig['localid_address'])) { $input_errors[] = gettext("A valid local network IP address must be specified."); } elseif (is_ipaddrv4($pconfig['localid_address']) && ($pconfig['mode'] != "tunnel")) { - $input_errors[] = gettext("A valid local network IPv4 address must be specified or you need to change Mode to IPv6"); + $input_errors[] = gettext("A valid local network IPv4 address must be specified or Mode needs to be changed to IPv6"); } elseif (is_ipaddrv6($pconfig['localid_address']) && ($pconfig['mode'] != "tunnel6")) { - $input_errors[] = gettext("A valid local network IPv6 address must be specified or you need to change Mode to IPv4"); + $input_errors[] = gettext("A valid local network IPv6 address must be specified or Mode needs to be changed to IPv4"); } break; } @@ -211,15 +211,15 @@ if ($_POST) { $input_errors[] = gettext("A valid NAT local network bit count must be specified."); } if ($pconfig['localid_type'] == "address") { - $input_errors[] = gettext("You cannot configure a network type address for NAT while only an address type is selected for local source."); + $input_errors[] = gettext("A network type address cannot be configured for NAT while only an address type is selected for local source."); } case "address": if (!empty($pconfig['natlocalid_address']) && !is_ipaddr($pconfig['natlocalid_address'])) { $input_errors[] = gettext("A valid NAT local network IP address must be specified."); } elseif (is_ipaddrv4($pconfig['natlocalid_address']) && ($pconfig['mode'] != "tunnel")) { - $input_errors[] = gettext("A valid NAT local network IPv4 address must be specified or you need to change Mode to IPv6"); + $input_errors[] = gettext("A valid NAT local network IPv4 address must be specified or Mode needs to be changed to IPv6"); } elseif (is_ipaddrv6($pconfig['natlocalid_address']) && ($pconfig['mode'] != "tunnel6")) { - $input_errors[] = gettext("A valid NAT local network IPv6 address must be specified or you need to change Mode to IPv4"); + $input_errors[] = gettext("A valid NAT local network IPv6 address must be specified or Mode needs to be changed to IPv4"); } break; } @@ -244,9 +244,9 @@ if ($_POST) { if (!$pconfig['remoteid_address'] || !is_ipaddr($pconfig['remoteid_address'])) { $input_errors[] = gettext("A valid remote network IP address must be specified."); } elseif (is_ipaddrv4($pconfig['remoteid_address']) && ($pconfig['mode'] != "tunnel")) { - $input_errors[] = gettext("A valid remote network IPv4 address must be specified or you need to change Mode to IPv6"); + $input_errors[] = gettext("A valid remote network IPv4 address must be specified or Mode needs to be changed to IPv6"); } elseif (is_ipaddrv6($pconfig['remoteid_address']) && ($pconfig['mode'] != "tunnel6")) { - $input_errors[] = gettext("A valid remote network IPv6 address must be specified or you need to change Mode to IPv4"); + $input_errors[] = gettext("A valid remote network IPv6 address must be specified or Mode needs to be changed to IPv4"); } break; } @@ -619,7 +619,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).'); $form->add($section); @@ -667,7 +667,7 @@ foreach ($p2_ealgos as $algo => $algodata) { if ($i == $rows) { - $group->setHelp('Use 3DES for best compatibility or if you have a hardware crypto accelerator card. Blowfish is usually the fastest in software encryption.'); + $group->setHelp('Use 3DES for best compatibility or for a hardware crypto accelerator card. Blowfish is usually the fastest in software encryption.'); } $i++; diff --git a/src/usr/local/www/vpn_ipsec_settings.php b/src/usr/local/www/vpn_ipsec_settings.php index 768e7c9..ca33a7d 100644 --- a/src/usr/local/www/vpn_ipsec_settings.php +++ b/src/usr/local/www/vpn_ipsec_settings.php @@ -328,7 +328,7 @@ $section->addInput(new Form_Checkbox( 'Some implementations send the third Main Mode message unencrypted, probably to find the PSKs for the specified ID for authentication.' . 'This is very similar to Aggressive Mode, and has the same security implications: ' . 'A passive attacker can sniff the negotiated Identity, and start brute forcing the PSK using the HASH payload.' . - 'It is recommended to keep this option to no, unless you know exactly what the implications are and require compatibility to such devices (for example, some SonicWall boxes).' + 'It is recommended to keep this option to no, unless the exact implications are known and compatibility is required for such devices (for example, some SonicWall boxes).' ); $section->addInput(new Form_Checkbox( -- cgit v1.1