diff --git a/src/etc/inc/authgui.inc b/src/etc/inc/authgui.inc index e1289ace9d..cbaac9f07d 100644 --- a/src/etc/inc/authgui.inc +++ b/src/etc/inc/authgui.inc @@ -262,7 +262,7 @@ if (isset($config['system']['webgui']['webguicss'])) {
If you did not setup this forwarding, you may be the target of a man-in-the-middle attack.")); + print_info_box(gettext("The IP address being used to access this router is not configured locally, which may be forwarded by NAT or other means.

If this forwarding is unexpected, it should be verified that a man-in-the-middle attack is not taking place.")); } $loginautocomplete = isset($config['system']['webgui']['loginautocomplete']) ? '' : 'autocomplete="off"'; @@ -277,7 +277,7 @@ if (isset($config['system']['webgui']['webguicss'])) { - +
action="" class="form-horizontal">
diff --git a/src/etc/inc/config.console.inc b/src/etc/inc/config.console.inc index 54ad6c8516..75c8c74720 100644 --- a/src/etc/inc/config.console.inc +++ b/src/etc/inc/config.console.inc @@ -125,7 +125,7 @@ EOD; "If VLANs will not be used, or only for optional interfaces, it is typical to\n" . "say no here and use the webConfigurator to configure VLANs later, if required.") . "\n"; - echo "\n" . gettext("Do you want to set up VLANs now [y|n]?") . " "; + echo "\n" . gettext("Should VLANs be set up now [y|n]?") . " "; if ($auto_assign) { $key = timeout(); @@ -139,15 +139,14 @@ EOD; !!! Auto Assigning Interfaces !!! -For installation purposes, you must plug in at least one NIC -for the LAN connection. If you plug in a second NIC it will be -assigned to WAN. Otherwise, WAN will be temporarily assigned to the -next available NIC found regardless of activity. You should -assign and configure the WAN interface according to your requirements +For setup purposes, there must be at least one NIC connected for +the LAN. If a second NIC is connected, it will be assigned to the +WAN. Otherwise, WAN will be temporarily assigned to the next +available NIC found regardless of activity. The WAN interface +should then be assigned and configured as required. -If you haven't plugged in any network cables yet, -now is the time to do so. -The system will keep trying until you do. +Please make the pfSense NIC connections now. +The system will continue checking until they have been made. Searching for active interfaces... @@ -213,9 +212,9 @@ EOD; echo << - ')"> + ')"> diff --git a/src/usr/local/www/diag_halt.php b/src/usr/local/www/diag_halt.php index 3de8bb5022..39cdb554c3 100755 --- a/src/usr/local/www/diag_halt.php +++ b/src/usr/local/www/diag_halt.php @@ -96,7 +96,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-

+

diff --git a/src/usr/local/www/diag_reboot.php b/src/usr/local/www/diag_reboot.php index de9ef97118..88fc82bd7f 100755 --- a/src/usr/local/www/diag_reboot.php +++ b/src/usr/local/www/diag_reboot.php @@ -137,7 +137,7 @@ events.push(function() {
-

+

diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index dba62f07e3..2a34885e1a 100755 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -292,7 +292,7 @@ events.push(function() { function save_changes_to_xml(xml) { var ids = $('#mainarea table tbody').sortable('serialize', {key:"ids[]"}); var strloading=""; - if (confirm("")) { + if (confirm("")) { $.ajax({ type: 'get', cache: false, diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index c234385b9c..10d58f37ee 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -275,14 +275,14 @@ if ($input_errors) { switch ($pkgmode) { case 'reinstallpkg': - $pkgtxt = sprintf(gettext('Are you sure you want to reinstall package %s?'), $pkgname); + $pkgtxt = sprintf(gettext('Confirmation Required to reinstall package %s.'), $pkgname); break; case 'delete': - $pkgtxt = sprintf(gettext('Are you sure you want to remove package %s?'), $pkgname); + $pkgtxt = sprintf(gettext('Confirmation Required to remove package %s.'), $pkgname); break; case 'installed': default: - $pkgtxt = sprintf(gettext('Are you sure you want to install package %s?'), $pkgname); + $pkgtxt = sprintf(gettext('Confirmation Required to install package %s.'), $pkgname); break; } ?> @@ -292,15 +292,15 @@ if ($input_errors) { - + - + - + diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index 0b0996110d..8c7d6a2eb5 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -266,7 +266,7 @@ if (!$rawfilter) { ');" title=""> - " title="" onclick="return confirm('')"> + " title="" onclick="return confirm('')"> '?> @@ -275,7 +275,7 @@ if (!$rawfilter) { ');" title=""> - " title="" onclick="return confirm('')"> + " title="" onclick="return confirm('')"> '?> diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index cafded4857..8d2ad76ffc 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -577,13 +577,13 @@ events.push(function() { }); $('[id^=Xdel_]').click(function (event) { - if (confirm("")) { + if (confirm("")) { $('#' + event.target.id.slice(1)).click(); } }); $('[id^=Xdelp2_]').click(function (event) { - if (confirm("")) { + if (confirm("")) { $('#' + event.target.id.slice(1)).click(); } });