diff options
Diffstat (limited to 'src')
65 files changed, 111 insertions, 113 deletions
diff --git a/src/etc/inc/gmirror.inc b/src/etc/inc/gmirror.inc index a6e9d28..5520674 100644 --- a/src/etc/inc/gmirror.inc +++ b/src/etc/inc/gmirror.inc @@ -93,7 +93,7 @@ function gmirror_html_status() { $mirrors = gmirror_get_status(); $output = ""; if (count($mirrors) < 1) { - print_info_box(gettext("No Mirrors Found"), 'warning', false); + print_info_box(gettext("No mirrors found."), 'warning', false); return; } diff --git a/src/usr/local/www/diag_authentication.php b/src/usr/local/www/diag_authentication.php index 66e4106..6adb424 100644 --- a/src/usr/local/www/diag_authentication.php +++ b/src/usr/local/www/diag_authentication.php @@ -81,7 +81,7 @@ if ($_POST) { if (authenticate_user($_POST['username'], $_POST['password'], $authcfg, $attributes)) { $savemsg = gettext("User") . ": " . $_POST['username'] . " " . gettext("authenticated successfully."); $groups = getUserGroups($_POST['username'], $authcfg, $attributes); - $savemsg .= " " . gettext("This user is a member of groups") . ": <br />"; + $savemsg .= " " . gettext("This user is a member of groups") . ": <br /><br />"; $savemsg .= "<ul>"; foreach ($groups as $group) { $savemsg .= "<li>" . "{$group} " . "</li>"; diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index 5e42912..ea9bbb5 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -347,7 +347,7 @@ if ($_POST) { conf_mount_ro(); } filter_configure(); - $savemsg = gettext("The configuration area has been restored. You may need to reboot the firewall."); + $savemsg = gettext("The configuration area has been restored. You may need to reboot the firewall."); } } } else { @@ -527,7 +527,7 @@ if ($_POST) { exit; } else if ($mode == "clearpackagelock") { clear_subsystem_dirty('packagelock'); - $savemsg = "Package Lock Cleared"; + $savemsg = "Package lock cleared."; } else if ($mode == "restore_ver") { $input_errors[] = gettext("XXX - this feature may hose your config (do NOT backrev configs!) - billm"); if ($ver2restore <> "") { diff --git a/src/usr/local/www/diag_dns.php b/src/usr/local/www/diag_dns.php index 5be89d9..e74ebba 100755 --- a/src/usr/local/www/diag_dns.php +++ b/src/usr/local/www/diag_dns.php @@ -212,11 +212,11 @@ include("head.inc"); if ($input_errors) { print_input_errors($input_errors); } else if (!$resolved && $type) { - print_info_box(sprintf(gettext('Host "%s" could not be resolved'), $host), 'warning', false); + print_info_box(sprintf(gettext('Host "%s" could not be resolved.'), $host), 'warning', false); } if ($createdalias) { - print_info_box(gettext("Alias was created/updated successfully"), 'success', false); + print_info_box(gettext("Alias was created/updated successfully."), 'success', false); } $form = new Form('Lookup'); diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index 073a067..6e11e6e 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -289,9 +289,9 @@ print $form; if ($states == 0) { if (isset($_POST['filter']) && !empty($_POST['filter'])) { - $errmsg = gettext('No states were found that match the current filter'); + $errmsg = gettext('No states were found that match the current filter.'); } else { - $errmsg = gettext('No states were found'); + $errmsg = gettext('No states were found.'); } print_info_box($errmsg, 'warning', false); diff --git a/src/usr/local/www/diag_nanobsd.php b/src/usr/local/www/diag_nanobsd.php index 0183325..95b15c2 100644 --- a/src/usr/local/www/diag_nanobsd.php +++ b/src/usr/local/www/diag_nanobsd.php @@ -90,7 +90,7 @@ if ($_POST['bootslice']) { sleep(4); } - $savemsg = sprintf(gettext("The boot slice has been set to %s"), nanobsd_get_active_slice()); + $savemsg = sprintf(gettext("The boot slice has been set to %s."), nanobsd_get_active_slice()); $class = 'alert-success'; // Survey slice info nanobsd_detect_slice_info(); @@ -103,7 +103,7 @@ if ($_POST['destslice'] && $_POST['duplicateslice']) { $savemsg = gettext("The slice has been duplicated.") . "<p/>" . gettext("If you would like to boot from this newly duplicated slice please set it using the bootup information area."); $class = 'alert-success'; } else { - $savemsg = gettext("There was an error while duplicating the slice. Operation aborted."); + $savemsg = gettext("There was an error while duplicating the slice. Operation aborted."); $class = 'alert-danger'; } // Re-Survey slice info @@ -134,7 +134,7 @@ if ($_POST['setrw']) { write_config(gettext("Changed Permanent Read/Write Setting")); conf_mount_ro(); } else { - $savemsg = gettext('Saved r/w permanently'); + $savemsg = gettext('Saved read/write permanently.'); $class = 'alert-success'; } } diff --git a/src/usr/local/www/diag_packet_capture.php b/src/usr/local/www/diag_packet_capture.php index 29e434d..f938c08 100644 --- a/src/usr/local/www/diag_packet_capture.php +++ b/src/usr/local/www/diag_packet_capture.php @@ -463,7 +463,7 @@ if ($do_tcpdump) : if ($action == gettext("Start")) { $matchstr = implode($matches, " and "); - print_info_box(gettext('Packet Capture is running'), 'info'); + print_info_box(gettext('Packet capture is running.'), 'info'); $cmd = "/usr/sbin/tcpdump -i {$selectedif} {$disablepromiscuous} {$searchcount} -s {$snaplen} -w {$fp}{$fn} " . escapeshellarg($matchstr); // Debug diff --git a/src/usr/local/www/diag_reboot.php b/src/usr/local/www/diag_reboot.php index 6a5e1f9..be3a2dd 100755 --- a/src/usr/local/www/diag_reboot.php +++ b/src/usr/local/www/diag_reboot.php @@ -79,7 +79,7 @@ include("head.inc"); if ($_SERVER['REQUEST_METHOD'] == 'POST') { if (DEBUG) { - print_info_box(gettext("Not actually rebooting (DEBUG is set true)"), 'success'); + print_info_box(gettext("Not actually rebooting (DEBUG is set true)."), 'success'); } else { print('<div><pre>'); system_reboot(); diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php index d34d57c..8a160d3 100644 --- a/src/usr/local/www/diag_tables.php +++ b/src/usr/local/www/diag_tables.php @@ -169,9 +169,9 @@ if ($bogons || !empty($entries)) { <?php $last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename) . '|cut -d"(" -f2|tr -d ")" '); if ($last_updated != "") { - print_info_box(gettext("Table last updated on ") . $last_updated, 'info', false); + print_info_box(gettext("Table last updated on ") . $last_updated . ".", 'info', false); } else { - print_info_box(gettext("Date of last update of table is unknown"), 'info', false); + print_info_box(gettext("Date of last update of table is unknown."), 'info', false); } ?> </div> @@ -243,6 +243,6 @@ events.push(function() { <?php if (empty($entries)) { - print_info_box(gettext("No entries exist in this table"), 'warning', false); + print_info_box(gettext("No entries exist in this table."), 'warning', false); } include("foot.inc"); diff --git a/src/usr/local/www/edit.php b/src/usr/local/www/edit.php index 050afa9..6b78a83 100644 --- a/src/usr/local/www/edit.php +++ b/src/usr/local/www/edit.php @@ -70,21 +70,21 @@ if ($_POST['action']) { case 'load': if (strlen($_POST['file']) < 1) { print('|5|'); - print_info_box(gettext("No file name specified"), 'danger', false); + print_info_box(gettext("No file name specified."), 'danger', false); print('|'); } elseif (is_dir($_POST['file'])) { print('|4|'); - print_info_box(gettext("Loading a directory is not supported"), 'danger', false); + print_info_box(gettext("Loading a directory is not supported."), 'danger', false); print('|'); } elseif (!is_file($_POST['file'])) { print('|3|'); - print_info_box(gettext("File does not exist or is not a regular file"), 'danger', false); + print_info_box(gettext("File does not exist or is not a regular file."), 'danger', false); print('|'); } else { $data = file_get_contents(urldecode($_POST['file'])); if ($data === false) { print('|1|'); - print_info_box(gettext("Failed to read file"), 'danger', false); + print_info_box(gettext("Failed to read file."), 'danger', false); print('|'); } else { $data = base64_encode($data); @@ -96,7 +96,7 @@ if ($_POST['action']) { case 'save': if (strlen($_POST['file']) < 1) { print('|'); - print_info_box(gettext("No file name specified"), 'danger', false); + print_info_box(gettext("No file name specified."), 'danger', false); print('|'); } else { conf_mount_rw(); @@ -111,15 +111,15 @@ if ($_POST['action']) { } if ($ret === false) { print('|'); - print_info_box(gettext("Failed to write file"), 'danger', false); + print_info_box(gettext("Failed to write file."), 'danger', false); print('|'); } elseif ($ret != strlen($_POST['data'])) { print('|'); - print_info_box(gettext("Error while writing file"), 'danger', false); + print_info_box(gettext("Error while writing file."), 'danger', false); print('|'); } else { print('|'); - print_info_box(gettext("File saved successfully"), 'success', false); + print_info_box(gettext("File saved successfully."), 'success', false); print('|'); } } diff --git a/src/usr/local/www/exec.php b/src/usr/local/www/exec.php index 2e785f4..1b3f7aa 100644 --- a/src/usr/local/www/exec.php +++ b/src/usr/local/www/exec.php @@ -90,7 +90,7 @@ if (($_POST['submit'] == "DOWNLOAD") && file_exists($_POST['dlPath'])) { exit; } else if (($_POST['submit'] == "UPLOAD") && is_uploaded_file($_FILES['ulfile']['tmp_name'])) { move_uploaded_file($_FILES['ulfile']['tmp_name'], "/tmp/" . $_FILES['ulfile']['name']); - $ulmsg = sprintf(gettext('Uploaded file to /tmp/%s'), htmlentities($_FILES['ulfile']['name'])); + $ulmsg = sprintf(gettext('Uploaded file to /tmp/%s.'), htmlentities($_FILES['ulfile']['name'])); unset($_POST['txtCommand']); } diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index a07da68..88d0d43 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -130,7 +130,7 @@ if ($_GET['act'] == "del") { // Static routes find_alias_reference(array('staticroutes', 'route'), array('network'), $alias_name, $is_alias_referenced, $referenced_by); if ($is_alias_referenced == true) { - $savemsg = sprintf(gettext("Cannot delete alias. Currently in use by %s"), htmlspecialchars($referenced_by)); + $savemsg = sprintf(gettext("Cannot delete alias. Currently in use by %s."), htmlspecialchars($referenced_by)); } else { if (preg_match("/urltable/i", $a_aliases[$_GET['id']]['type'])) { // this is a URL table type alias, delete its file as well diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index ebf3e7b..c6c9206 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -213,7 +213,7 @@ if ($_POST) { clear_subsystem_dirty('filter'); - $savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />You can also %s monitor %s the reload progress"), + $savemsg = sprintf(gettext("The settings have been applied. The firewall rules are now reloading in the background.<br />You can also %s monitor %s the reload progress."), "<a href='status_filter_reload.php'>", "</a>"); } } diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index c44a53a..e531a80 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -99,7 +99,7 @@ if ($_GET['act'] == "del") { } if ($is_schedule_referenced == true) { - $savemsg = sprintf(gettext("Cannot delete Schedule. Currently in use by %s"), $referenced_by); + $savemsg = sprintf(gettext("Cannot delete schedule. Currently in use by %s."), $referenced_by); } else { unset($a_schedules[$_GET['id']]); write_config(); @@ -280,7 +280,7 @@ endforeach; </nav> <div class="infoblock"> - <?=print_info_box(gettext('Schedules act as placeholders for time ranges to be used in Firewall Rules.'), 'info', false)?> + <?=print_info_box(gettext('Schedules act as placeholders for time ranges to be used in firewall rules.'), 'info', false)?> </div> <?php diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index 9b4bbe9..37efc22 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -166,7 +166,7 @@ if ($_GET) { $class = 'warning'; } } else { - $savemsg = gettext("Unable to write config.xml (Access Denied?)"); + $savemsg = gettext("Unable to write config.xml (Access Denied?)."); $class = 'warning'; } diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index f50488c..1965b89 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -180,7 +180,7 @@ if ($_GET) { } } else { - $savemsg = gettext("Unable to write config.xml (Access Denied?)"); + $savemsg = gettext("Unable to write config.xml (Access Denied?)."); $class = 'danger'; } diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index f3a76ab..bbb8ea7 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -373,8 +373,8 @@ endforeach; </nav> <div class="infoblock"> - <?=print_info_box(sprintf(gettext('The virtual IP addresses defined on this page may be used in %1$sNAT%2$s mappings'), '<a href="firewall_nat.php">', '</a>') . '<br />' . - sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %1$shere%2$s'), '<a href="status_carp.php">', '</a>'), 'info', false)?> + <?=print_info_box(sprintf(gettext('The virtual IP addresses defined on this page may be used in %1$sNAT%2$s mappings.'), '<a href="firewall_nat.php">', '</a>') . '<br />' . + sprintf(gettext('You can check the status of your CARP Virtual IPs and interfaces %1$shere%2$s.'), '<a href="status_carp.php">', '</a>'), 'info', false)?> </div> <?php diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index 55de55e..4df74e9 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -107,7 +107,7 @@ if ($g['disablecrashreporter'] != true) { } if ($x > 0) { - $savemsg = sprintf(gettext("%s has detected a crash report or programming bug. Click <a href='crash_reporter.php'>here</a> for more information."), $g['product_name']); + $savemsg = sprintf(gettext("%s has detected a crash report or programming bug. Click <a href='crash_reporter.php'>here</a> for more information."), $g['product_name']); $class = "warning"; } } diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index cbc9fff..c6b730a 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -488,14 +488,14 @@ include("head.inc"); if (file_exists("/var/run/interface_mismatch_reboot_needed")) { if ($_POST) { if ($rebootingnow) { - $savemsg = gettext("The system is now rebooting. Please wait."); + $savemsg = gettext("The system is now rebooting. Please wait."); $class = "success"; } else { $savemsg = gettext("Reboot is needed. Please apply the settings in order to reboot."); $class = "warning"; } } else { - $savemsg = gettext("Interface mismatch detected. Please resolve the mismatch and click 'Apply changes'. The firewall will reboot afterwards."); + $savemsg = gettext("Interface mismatch detected. Please resolve the mismatch and click 'Apply Changes'. The firewall will reboot afterwards."); $class = "warning"; } } diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index cb0b03f..d4e3905 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -180,7 +180,7 @@ display_top_tabs($tab_array); </form> <div class="infoblock"> - <?=print_info_box(sprintf(gettext('NOTE: Not all drivers/NICs support 802.1Q '. + <?=print_info_box(sprintf(gettext('Not all drivers/NICs support 802.1Q '. 'VLAN tagging properly. <br />On cards that do not explicitly support it, VLAN '. 'tagging will still work, but the reduced MTU may cause problems.<br />See the '. '%s handbook for information on supported cards.'), $g['product_name']), 'info', false)?> diff --git a/src/usr/local/www/load_balancer_virtual_server.php b/src/usr/local/www/load_balancer_virtual_server.php index b361106..360cbcb 100644 --- a/src/usr/local/www/load_balancer_virtual_server.php +++ b/src/usr/local/www/load_balancer_virtual_server.php @@ -187,7 +187,7 @@ if (!empty($a_vs)) { } else { ?> <tr> <td colspan="8"> <?php - print_info_box(gettext('No virtual servers have been configured')); + print_info_box(gettext('No virtual servers have been configured.')); ?> </td> </tr> <?php } diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index ac4f532..c468319 100755 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -71,7 +71,7 @@ $xml = $_REQUEST['xml']; if ($xml == "") { include("head.inc"); - print_info_box(gettext("ERROR: No valid package defined.")); + print_info_box(gettext("No valid package defined."), 'danger', false); include("foot.inc"); exit; } else { @@ -79,14 +79,14 @@ if ($xml == "") { $pkg_full_path = "{$pkg_xml_prefix}/{$xml}"; $pkg_realpath = realpath($pkg_full_path); if (empty($pkg_realpath)) { - $path_error = sprintf(gettext("ERROR: Package path %s not found."), htmlspecialchars($pkg_full_path)); + $path_error = sprintf(gettext("Package path %s not found."), htmlspecialchars($pkg_full_path)); } else if (substr_compare($pkg_realpath, $pkg_xml_prefix, 0, strlen($pkg_xml_prefix))) { - $path_error = sprintf(gettext("ERROR: Invalid path %s specified."), htmlspecialchars($pkg_full_path)); + $path_error = sprintf(gettext("Invalid path %s specified."), htmlspecialchars($pkg_full_path)); } if (!empty($path_error)) { include("head.inc"); - print_info_box($path_error . "<br />" . gettext("Try reinstalling the package.")); + print_info_box($path_error . "<br />" . gettext("Try reinstalling the package."), 'danger', false); include("foot.inc"); die; } @@ -95,7 +95,7 @@ if ($xml == "") { $pkg = parse_xml_config_pkg($pkg_full_path, "packagegui"); } else { include("head.inc"); - print_info_box(sprintf(gettext("File not found %s"), htmlspecialchars($xml))); + print_info_box(sprintf(gettext("File not found %s."), htmlspecialchars($xml)), 'danger', false); include("foot.inc"); exit; } diff --git a/src/usr/local/www/pkg_edit.php b/src/usr/local/www/pkg_edit.php index 4694eea..8a1aae4 100644 --- a/src/usr/local/www/pkg_edit.php +++ b/src/usr/local/www/pkg_edit.php @@ -82,7 +82,7 @@ $xml_fullpath = realpath('/usr/local/pkg/' . $xml); if ($xml == "" || $xml_fullpath === false || substr($xml_fullpath, 0, strlen('/usr/local/pkg/')) != '/usr/local/pkg/') { include("head.inc"); - print_info_box(gettext("ERROR: No valid package defined.")); + print_info_box(gettext("No valid package defined."), 'danger', false); include("foot.inc"); die; } else { diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php index ecc4cad..04908c4 100644 --- a/src/usr/local/www/pkg_mgr.php +++ b/src/usr/local/www/pkg_mgr.php @@ -207,11 +207,11 @@ display_top_tabs($tab_array); <div class="panel-heading"><h2 class="panel-title"><?=gettext('Packages')?></h2></div> <div id="pkgtbl" class="panel-body table-responsive"> <div id="waitmsg"> - <?=print_info_box(gettext("Please wait while the list of packages is retrieved and formatted") . ' <i class="fa fa-cog fa-spin"></i>')?> + <?=print_info_box(gettext("Please wait while the list of packages is retrieved and formatted.") . ' <i class="fa fa-cog fa-spin"></i>')?> </div> <div id="errmsg" style="display: none;"> - <?=print_info_box("<ul><li>" . gettext("Error: Unable to retrieve package information.") . "</li></ul>", 'danger')?> + <?=print_info_box("<ul><li>" . gettext("Unable to retrieve package information.") . "</li></ul>", 'danger')?> </div> </div> </div> diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index e9c33e0..e8e9943 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -386,7 +386,7 @@ if ($input_errors) { <?php endif; if ($firmwareupdate && !$firmwareversion) { - print_info_box(gettext("Unable to retrieve system versions"), 'danger'); + print_info_box(gettext("Unable to retrieve system versions."), 'danger'); } if ($_POST) { diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 6a9f0c7..b635175 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -784,7 +784,7 @@ if (!is_numeric($pool) && !($act == "newpool")) { $pconfig['enable'] )); } else { - print_info_box(gettext('Editing Pool-Specific Options. To return to the Interface, click its tab above.'), 'info', false); + print_info_box(gettext('Editing pool-specific options. To return to the Interface, click its tab above.'), 'info', false); } $section->addInput(new Form_Checkbox( diff --git a/src/usr/local/www/services_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php index e7b6053..371cbd7 100644 --- a/src/usr/local/www/services_pppoe_edit.php +++ b/src/usr/local/www/services_pppoe_edit.php @@ -598,7 +598,7 @@ $form->add($section); print($form); -print_info_box(gettext('Don\'t forget to add a firewall rule to permit traffic from PPPoE clients')); +print_info_box(gettext('Don\'t forget to add a firewall rule to permit traffic from PPPoE clients.')); ?> <script type="text/javascript"> //<![CDATA[ diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php index c7a221b..1c33541 100644 --- a/src/usr/local/www/services_router_advertisements.php +++ b/src/usr/local/www/services_router_advertisements.php @@ -92,8 +92,8 @@ if ($config['installedpackages']['olsrd']) { } if (!$_GET['if']) { - $savemsg = "<p><b>" . gettext("The DHCPv6 Server can only be enabled on interfaces configured with static, non unique local IP addresses.") . "</b></p>" . - "<p><b>" . gettext("Only interfaces configured with a static IP will be shown.") . "</b></p>"; + $savemsg = gettext("The DHCPv6 Server can only be enabled on interfaces configured with static, non unique local IP addresses.") . "<br />" . + gettext("Only interfaces configured with a static IP will be shown."); } $iflist = get_configured_interface_with_descr(); diff --git a/src/usr/local/www/status.php b/src/usr/local/www/status.php index b4a8afc..bac5b59 100755 --- a/src/usr/local/www/status.php +++ b/src/usr/local/www/status.php @@ -284,10 +284,10 @@ $pgtitle = array("{$g['product_name']}", "Status"); include("head.inc"); print_info_box(gettext("Make sure all sensitive information is removed! (Passwords, etc.) before posting " . - "information from this page in public places (like mailing lists)") . '<br />' . + "information from this page in public places (like mailing lists).") . '<br />' . gettext("Common password fields in config.xml have been automatically redacted.") . '<br />' . gettext("When the page has finished loading, the output will be stored in {$output_file}. It may be downloaded via scp or ") . - "<a href=\"/exec.php?dlPath={$output_file}\">" . gettext("Diagnostics > Command Prompt") . '</a>'); + "<a href=\"/exec.php?dlPath={$output_file}\">" . gettext("Diagnostics > Command Prompt.") . '</a>'); listCmds(); execCmds(); diff --git a/src/usr/local/www/status_captiveportal.php b/src/usr/local/www/status_captiveportal.php index e2ede99..4262859 100644 --- a/src/usr/local/www/status_captiveportal.php +++ b/src/usr/local/www/status_captiveportal.php @@ -263,7 +263,7 @@ else: <div class="panel-heading"><h2 class="panel-title"><?=gettext("Captive Portal Status")?></h2></div> <div class="panel-body"><br /> <?php - print_info_box(sprintf(gettext('No captive portal zones have been configured. You may add new zones here: %1$sServices->Captive portal%2$s'), '<a href="services_captiveportal_zones.php">', '</a>')); + print_info_box(sprintf(gettext('No captive portal zones have been configured. You may add new zones here: %1$sServices->Captive Portal%2$s.'), '<a href="services_captiveportal_zones.php">', '</a>')); ?> </div> </div> diff --git a/src/usr/local/www/status_captiveportal_expire.php b/src/usr/local/www/status_captiveportal_expire.php index 9853287..9d89f2f 100644 --- a/src/usr/local/www/status_captiveportal_expire.php +++ b/src/usr/local/www/status_captiveportal_expire.php @@ -118,9 +118,9 @@ print($form); if ($_POST) { if ($_POST['vouchers']) { if (voucher_expire($_POST['vouchers'])) { - print_info_box(gettext('Voucher successfully marked'), 'success'); + print_info_box(gettext('Voucher successfully marked.'), 'success'); } else { - print_info_box(gettext('Error: Voucher could not be processed'), 'danger'); + print_info_box(gettext('Voucher could not be processed.'), 'danger'); } } } diff --git a/src/usr/local/www/status_carp.php b/src/usr/local/www/status_carp.php index 224ef6f..0cb8e49 100644 --- a/src/usr/local/www/status_carp.php +++ b/src/usr/local/www/status_carp.php @@ -177,7 +177,7 @@ if (is_array($config['virtualip']['vip'])) { if ($carpcount == 0) { print_info_box(gettext('No CARP interfaces have been defined.') . '<br />' . '<a href="system_hasync.php" class="alert-link">' . - gettext("You can configure high availability sync settings here") . + gettext("You can configure high availability sync settings here.") . '</a>'); } else { ?> @@ -199,7 +199,7 @@ if ($carpcount == 0) { sprintf(gettext('Search the %1$sSystem Log%2$s for CARP demotion-related events.'), "<a href=\"/status_logs.php?filtertext=carp%3A+demoted+by\">", "</a>") . "<br/><br/>" . '<input type="submit" class="btn btn-warning" name="resetdemotion" id="resetdemotion" value="' . - gettext("Reset CARP Demotion Status") . + gettext("Reset CARP Demotion Status.") . '" />', 'danger' ); diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php index 24c00ba..87c1ad4 100644 --- a/src/usr/local/www/status_dhcpv6_leases.php +++ b/src/usr/local/www/status_dhcpv6_leases.php @@ -439,7 +439,7 @@ if (count($pools) > 0) { } if (empty($leases)) { - print_info_box(gettext("No leases file found. Is the DHCP server active?"), 'warning', false); + print_info_box(gettext("No leases file found. Is the DHCPv6 server active?"), 'warning', false); } ?> diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php index 12a0477..5009a6e 100644 --- a/src/usr/local/www/status_ipsec.php +++ b/src/usr/local/www/status_ipsec.php @@ -528,7 +528,7 @@ if (ipsec_enabled()) { <div class="infoblock blockopen"> <?php } -print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); +print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_ipsec_leases.php b/src/usr/local/www/status_ipsec_leases.php index 10874d3..6c2426c 100644 --- a/src/usr/local/www/status_ipsec_leases.php +++ b/src/usr/local/www/status_ipsec_leases.php @@ -161,7 +161,7 @@ if (ipsec_enabled()) { <div class="infoblock blockopen"> <?php } -print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); +print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_ipsec_sad.php b/src/usr/local/www/status_ipsec_sad.php index 07af7c1..a831bb6 100644 --- a/src/usr/local/www/status_ipsec_sad.php +++ b/src/usr/local/www/status_ipsec_sad.php @@ -158,7 +158,7 @@ if (ipsec_enabled()) { <div class="infoblock blockopen"> <?php } -print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); +print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_ipsec_spd.php b/src/usr/local/www/status_ipsec_spd.php index 11698a3..574783d 100644 --- a/src/usr/local/www/status_ipsec_spd.php +++ b/src/usr/local/www/status_ipsec_spd.php @@ -142,7 +142,7 @@ if (ipsec_enabled()) { <div class="infoblock blockopen"> <?php } -print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); +print_info_box(sprintf(gettext('You can configure IPsec %1$shere%2$s.'), '<a href="vpn_ipsec.php">', '</a>'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_lb_vs.php b/src/usr/local/www/status_lb_vs.php index 6951861..057051d 100644 --- a/src/usr/local/www/status_lb_vs.php +++ b/src/usr/local/www/status_lb_vs.php @@ -91,7 +91,7 @@ $tab_array[] = array(gettext("Virtual Servers"), true, "status_lb_vs.php"); display_top_tabs($tab_array); if (empty($a_vs)) { - print_info_box(gettext("No load balancers have been configured!"), 'danger', false); + print_info_box(gettext("No load balancers have been configured."), 'danger', false); } else { ?> <div class="table-responsive"></div> diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php index 12a0166..6d8a81c 100755 --- a/src/usr/local/www/status_logs.php +++ b/src/usr/local/www/status_logs.php @@ -200,7 +200,7 @@ if (!$rawfilter) { </table> <?php if (count($filterlog) == 0) { - print_info_box(gettext('No logs to display')); + print_info_box(gettext('No logs to display.')); } ?> </div> @@ -248,7 +248,7 @@ events.push(function() { <?php if ($rows == 0) { - print_info_box(gettext('No logs to display')); + print_info_box(gettext('No logs to display.')); } ?> </div> diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index 76846b2..0b09961 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -304,7 +304,7 @@ if (!$rawfilter) { </table> <?php if (count($filterlog) == 0) { - print_info_box(gettext('No logs to display')); + print_info_box(gettext('No logs to display.')); } ?> </div> @@ -347,7 +347,7 @@ events.push(function() { <?php if ($rows == 0) { - print_info_box(gettext('No logs to display')); + print_info_box(gettext('No logs to display.')); } ?> </div> @@ -359,7 +359,7 @@ events.push(function() { <div class="infoblock"> <?php print_info_box('<a href="https://doc.pfsense.org/index.php/What_are_TCP_Flags%3F">' . - gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR' . '<br />' . + gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR.' . '<br />' . '<i class="fa fa-minus-square-o icon-primary"></i> = Add to block list., <i class="fa fa-plus-square-o icon-primary"></i> = Pass traffic, <i class="fa fa-info icon-primary"></i> = Resolve', 'info', false); ?> </div> diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index 49f21cf..03208b2 100755 --- a/src/usr/local/www/status_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -482,7 +482,7 @@ function toggleListDescriptions() { if (count($filterlog) == 0) { print '<tr class="text-nowrap"><td colspan=6>'; - print_info_box(gettext('No logs to display')); + print_info_box(gettext('No logs to display.')); print '</td></tr>'; } ?> @@ -507,7 +507,7 @@ if ($tcpcnt > 0) { <div class="infoblock"> <?php print_info_box('<a href="https://doc.pfsense.org/index.php/What_are_TCP_Flags%3F">' . - gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR', 'info', false); + gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR.', 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php index b2c647b..663cffc 100644 --- a/src/usr/local/www/status_logs_vpn.php +++ b/src/usr/local/www/status_logs_vpn.php @@ -240,7 +240,7 @@ if (!$rawfilter) { </table> <?php if (count($filterlog) == 0) { - print_info_box(gettext('No logs to display')); + print_info_box(gettext('No logs to display.')); } ?> </div> @@ -272,7 +272,7 @@ events.push(function() { <?php if ($rows == 0) { - print_info_box(gettext('No logs to display')); + print_info_box(gettext('No logs to display.')); } ?> </div> diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index 58e6d55..3274b17 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -356,7 +356,7 @@ if ($DisplayNote) { } if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) { - print_info_box(gettext("No OpenVPN instances defined")); + print_info_box(gettext("No OpenVPN instances defined.")); } ?> </form> diff --git a/src/usr/local/www/status_queues.php b/src/usr/local/www/status_queues.php index 9e70d80..15baf2d 100644 --- a/src/usr/local/www/status_queues.php +++ b/src/usr/local/www/status_queues.php @@ -84,7 +84,7 @@ if (!file_exists("{$g['varrun_path']}/qstats.pid") || !isvalidpid("{$g['varrun_p } $fd = @fsockopen("unix://{$g['varrun_path']}/qstats"); if (!$fd) { - $error = gettext("Something wrong happened during communication with stat gathering"); + $error = gettext("Something wrong happened during communication with stat gathering."); } else { $stats = ""; while (!feof($fd)) { @@ -217,7 +217,7 @@ else: ?> <br /> <div class="infoblock blockopen"> <?php - print_info_box(gettext("Queue graphs take 5 seconds to sample data"), 'info', false); + print_info_box(gettext("Queue graphs take 5 seconds to sample data."), 'info', false); ?> </div> </div> diff --git a/src/usr/local/www/status_services.php b/src/usr/local/www/status_services.php index 6f7cbb0..59bbd78 100755 --- a/src/usr/local/www/status_services.php +++ b/src/usr/local/www/status_services.php @@ -195,7 +195,7 @@ if (count($services) > 0) { </form> <?php } else { - print_info_box(gettext("No services found"), 'danger'); + print_info_box(gettext("No services found."), 'danger'); } ?> <script type="text/javascript"> diff --git a/src/usr/local/www/status_upnp.php b/src/usr/local/www/status_upnp.php index 9c63c66..961f29b 100644 --- a/src/usr/local/www/status_upnp.php +++ b/src/usr/local/www/status_upnp.php @@ -66,7 +66,7 @@ require("guiconfig.inc"); if ($_POST) { if ($_POST['clear']) { upnp_action('restart'); - $savemsg = gettext("Rules have been cleared and the daemon restarted"); + $savemsg = gettext("Rules have been cleared and the daemon restarted."); } } diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php index 4bcae6c..af2b6d7 100644 --- a/src/usr/local/www/status_wireless.php +++ b/src/usr/local/www/status_wireless.php @@ -244,9 +244,9 @@ display_top_tabs($tab_array); </form> <div class="infoblock"> <?php -print_info_box(gettext('<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power saving mode<br />' . +print_info_box(gettext('<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power saving mode.<br />' . '<b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES), ' . - 'S = Short preamble, s = Short slot time'), 'info', false); + 'S = Short preamble, s = Short slot time.'), 'info', false); ?> </div> <?php diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php index d3c40c3..6b36e72 100644 --- a/src/usr/local/www/system_advanced_notifications.php +++ b/src/usr/local/www/system_advanced_notifications.php @@ -209,7 +209,7 @@ if ($_POST) { if (file_exists("/var/db/notices_lastmsg.txt")) { unlink("/var/db/notices_lastmsg.txt"); } - $savemsg = notify_via_smtp(sprintf(gettext("This is a test message from %s. It is safe to ignore this message."), $g['product_name']), true); + $savemsg = notify_via_smtp(sprintf(gettext("This is a test message from %s. It is safe to ignore this message."), $g['product_name']), true); } } diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 33a3137..de192ed 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -111,7 +111,7 @@ if ($act == "del") { /* Remove server from temp list used later on this page. */ unset($a_server[$_GET['id']]); - $savemsg = sprintf(gettext("Authentication Server %s deleted"), htmlspecialchars($serverdeleted)); + $savemsg = sprintf(gettext("Authentication Server %s deleted."), htmlspecialchars($serverdeleted)); write_config($savemsg); } diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index e184779..cb7e952 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -128,7 +128,7 @@ if ($act == "del") { $name = $a_ca[$id]['descr']; unset($a_ca[$id]); write_config(); - $savemsg = sprintf(gettext("Certificate Authority %s and its CRLs (if any) successfully deleted"), htmlspecialchars($name)); + $savemsg = sprintf(gettext("Certificate Authority %s and its CRLs (if any) successfully deleted."), htmlspecialchars($name)); pfSenseHeader("system_camanager.php"); exit; } diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index 2544407..2e3a8c4 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -137,7 +137,7 @@ if ($act == "del") { unset($a_cert[$id]); write_config(); - $savemsg = sprintf(gettext("Certificate %s successfully deleted"), htmlspecialchars($a_cert[$id]['descr'])); + $savemsg = sprintf(gettext("Certificate %s successfully deleted."), htmlspecialchars($a_cert[$id]['descr'])); pfSenseHeader("system_certmanager.php"); exit; } diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index e8f69c9..15579a5 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -123,7 +123,7 @@ if (!$thiscrl && (($act != "") && ($act != "new"))) { if ($act == "del") { $name = htmlspecialchars($thiscrl['descr']); if (crl_in_use($id)) { - $savemsg = sprintf(gettext("Certificate Revocation List %s is in use and cannot be deleted"), $name); + $savemsg = sprintf(gettext("Certificate Revocation List %s is in use and cannot be deleted."), $name); } else { foreach ($a_crl as $cid => $acrl) { if ($acrl['refid'] == $thiscrl['refid']) { @@ -131,7 +131,7 @@ if ($act == "del") { } } write_config("Deleted CRL {$name}."); - $savemsg = sprintf(gettext("Certificate Revocation List %s successfully deleted"), $name); + $savemsg = sprintf(gettext("Certificate Revocation List %s successfully deleted."), $name); } } @@ -212,13 +212,13 @@ if ($act == "delcert") { $certname = htmlspecialchars($thiscert['descr']); $crlname = htmlspecialchars($thiscrl['descr']); if (cert_unrevoke($thiscert, $thiscrl)) { - $savemsg = sprintf(gettext("Deleted Certificate %s from CRL %s"), $certname, $crlname); + $savemsg = sprintf(gettext("Deleted Certificate %s from CRL %s."), $certname, $crlname); // refresh IPsec and OpenVPN CRLs openvpn_refresh_crls(); vpn_ipsec_configure(); write_config($savemsg); } else { - $savemsg = sprintf(gettext("Failed to delete Certificate %s from CRL %s"), $certname, $crlname); + $savemsg = sprintf(gettext("Failed to delete Certificate %s from CRL %s."), $certname, $crlname); } $act="edit"; } @@ -495,7 +495,7 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) { <div class="panel-body table-responsive"> <?php if (!is_array($crl['cert']) || (count($crl['cert']) == 0)) { - print_info_box(gettext("No Certificates Found for this CRL."), 'danger'); + print_info_box(gettext("No certificates found for this CRL."), 'danger'); } else { ?> <table class="table table-striped table-hover table-condensed"> @@ -548,7 +548,7 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) { } if (count($ca_certs) == 0) { - print_info_box(gettext("No Certificates Found for this CA."), 'danger'); + print_info_box(gettext("No certificates found for this CA."), 'danger'); } else { $section = new Form_Section('Choose a Certificate to Revoke'); $group = new Form_Group(null); diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index 4230f53..1cb6f2d 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -99,7 +99,7 @@ if ($act == "delgroup") { $groupdeleted = $a_group[$id]['name']; unset($a_group[$id]); write_config(); - $savemsg = sprintf(gettext("Group %s successfully deleted"), $groupdeleted); + $savemsg = sprintf(gettext("Group %s successfully deleted."), $groupdeleted); } if ($act == "delpriv") { @@ -123,7 +123,7 @@ if ($act == "delpriv") { write_config(); $act = "edit"; - $savemsg = sprintf(gettext("Privilege %s successfully deleted"), $privdeleted); + $savemsg = sprintf(gettext("Privilege %s successfully deleted."), $privdeleted); } if ($act == "edit") { @@ -150,7 +150,7 @@ if (isset($_GET['dellall_x'])) { unset($a_group[$groupid]); } } - $savemsg = gettext("Selected groups removed successfully!"); + $savemsg = gettext("Selected groups removed successfully."); write_config($savemsg); } } diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 94b7fe5..b92b873 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -118,7 +118,7 @@ if ($_GET['act'] == "deluser") { $userdeleted = $a_user[$id]['name']; unset($a_user[$id]); write_config(); - $savemsg = sprintf(gettext("User %s successfully deleted"), $userdeleted); + $savemsg = sprintf(gettext("User %s successfully deleted."), $userdeleted); } else if ($act == "new") { /* * set this value cause the text field is read only @@ -142,7 +142,7 @@ if (isset($_POST['dellall'])) { unset($a_user[$userid]); } } - $savemsg = gettext("Selected users removed successfully!"); + $savemsg = gettext("Selected users removed successfully."); write_config($savemsg); } } diff --git a/src/usr/local/www/system_usermanager_passwordmg.php b/src/usr/local/www/system_usermanager_passwordmg.php index 29d2dda..8773a1f 100644 --- a/src/usr/local/www/system_usermanager_passwordmg.php +++ b/src/usr/local/www/system_usermanager_passwordmg.php @@ -92,7 +92,7 @@ if (isset($_POST['save'])) { write_config(); - $savemsg = gettext("Password successfully changed"); + $savemsg = gettext("Password successfully changed."); } } diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index 27c5855..d4b6567 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -98,7 +98,7 @@ if ($_POST) { if ($authsrv['type'] == "ldap") { $save_and_test = true; } else { - $savemsg = gettext("Settings have been saved, but the test was not performed because it is supported only for ldap based backends."); + $savemsg = gettext("Settings have been saved, but the test was not performed because it is supported only for LDAP based backends."); } } } diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 1d8d5c1..289118e 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -557,9 +557,8 @@ display_top_tabs($tab_array); </form> <div class="infoblock"> - <?=print_info_box('<strong>' . gettext("Note:") . '</strong><br />' . - sprintf(gettext("You can check your IPsec status at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' . - sprintf(gettext("IPsec Debug Mode can be enabled at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>') . '<br />' . + <?=print_info_box(sprintf(gettext("You can check your IPsec status at %s%s%s."), '<a href="status_ipsec.php">', gettext("Status:IPsec"), '</a>') . '<br />' . + sprintf(gettext("IPsec debug mode can be enabled at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>') . '<br />' . sprintf(gettext("IPsec can be set to prefer older SAs at %s%s%s."), '<a href="vpn_ipsec_settings.php">', gettext("VPN:IPsec:Advanced Settings"), '</a>'), 'info', false)?> </div> diff --git a/src/usr/local/www/vpn_ipsec_mobile.php b/src/usr/local/www/vpn_ipsec_mobile.php index 21e365a..3040be6 100644 --- a/src/usr/local/www/vpn_ipsec_mobile.php +++ b/src/usr/local/www/vpn_ipsec_mobile.php @@ -445,7 +445,7 @@ foreach ($a_phase1 as $ph1ent) { } } if ($pconfig['enable'] && !$ph1found) { - print_info_box(gettext("Support for IPsec Mobile clients is enabled but a Phase1 definition was not found") . ".<br />" . gettext("Please click Create to define one."), "warning", "create", gettext("Create Phase1")); + print_info_box(gettext("Support for IPsec Mobile Clients is enabled but a Phase 1 definition was not found") . ".<br />" . gettext("Please click Create to define one."), "warning", "create", gettext("Create Phase 1")); } if ($input_errors) { diff --git a/src/usr/local/www/vpn_l2tp.php b/src/usr/local/www/vpn_l2tp.php index 5c13369..2541def 100644 --- a/src/usr/local/www/vpn_l2tp.php +++ b/src/usr/local/www/vpn_l2tp.php @@ -366,7 +366,7 @@ print($form); ?> <div class="infoblock blockopen"> <?php - print_info_box(gettext("Don't forget to add a firewall rule to permit traffic from L2TP clients!"), 'info', false); + print_info_box(gettext("Don't forget to add a firewall rule to permit traffic from L2TP clients."), 'info', false); ?> </div> diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index bc60d6c..96b4fc4 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -123,7 +123,7 @@ if ($_GET['act'] == "del") { } unset($a_client[$id]); write_config(); - $savemsg = gettext("Client successfully deleted"); + $savemsg = gettext("Client successfully deleted."); } if ($_GET['act'] == "new") { diff --git a/src/usr/local/www/vpn_openvpn_csc.php b/src/usr/local/www/vpn_openvpn_csc.php index 9df3510..d836f3b 100644 --- a/src/usr/local/www/vpn_openvpn_csc.php +++ b/src/usr/local/www/vpn_openvpn_csc.php @@ -97,7 +97,7 @@ if ($_GET['act'] == "del") { openvpn_delete_csc($a_csc[$id]); unset($a_csc[$id]); write_config(); - $savemsg = gettext("Client Specific Override successfully deleted"); + $savemsg = gettext("Client specific override successfully deleted."); } if ($_GET['act'] == "edit") { diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 23731d1..0a4234f 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -126,7 +126,7 @@ if ($_GET['act'] == "del") { } unset($a_server[$id]); write_config(); - $savemsg = gettext("Server successfully deleted"); + $savemsg = gettext("Server successfully deleted."); } if ($_GET['act'] == "new") { diff --git a/src/usr/local/www/widgets/widgets/installed_packages.widget.php b/src/usr/local/www/widgets/widgets/installed_packages.widget.php index d1948a9..2fa5d6f 100644 --- a/src/usr/local/www/widgets/widgets/installed_packages.widget.php +++ b/src/usr/local/www/widgets/widgets/installed_packages.widget.php @@ -73,8 +73,7 @@ if ($_REQUEST && $_REQUEST['ajax']) { }); if (empty($installed_packages)) { - print_info_box("<strong>". gettext("No packages installed.") . "</strong>\n" . " " . - gettext('You can install packages <a href="pkg_mgr.php" class="alert-link">here</a>.') . "\n", 'warning', false); + print_info_box(gettext("No packages installed.") . " " . gettext('You can install packages <a href="pkg_mgr.php" class="alert-link">here</a>.'), 'warning', false); exit; } diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php index b3eb88a..28a9216 100644 --- a/src/usr/local/www/wizard.php +++ b/src/usr/local/www/wizard.php @@ -89,25 +89,25 @@ if ($_POST['xml']) { if (empty($xml)) { $xml = "not_defined"; - print_info_box(sprintf(gettext("ERROR: Could not open %s."), $xml)); + print_info_box(sprintf(gettext("Could not open %s."), $xml), 'danger'); die; } else { $wizard_xml_prefix = "{$g['www_path']}/wizards"; $wizard_full_path = "{$wizard_xml_prefix}/{$xml}"; if (substr_compare(realpath($wizard_full_path), $wizard_xml_prefix, 0, strlen($wizard_xml_prefix))) { - print_info_box(gettext("ERROR: Invalid path specified.")); + print_info_box(gettext("Invalid path specified."), 'danger'); die; } if (file_exists($wizard_full_path)) { $pkg = parse_xml_config_pkg($wizard_full_path, "pfsensewizard"); } else { - print_info_box(sprintf(gettext("ERROR: Could not open %s."), $xml)); + print_info_box(sprintf(gettext("Could not open %s."), $xml), 'danger'); die; } } if (!is_array($pkg)) { - print_info_box(sprintf(gettext("ERROR: Could not parse %s/wizards/%s file."), $g['www_path'], $xml)); + print_info_box(sprintf(gettext("Could not parse %s/wizards/%s file."), $g['www_path'], $xml), 'danger'); die; } diff --git a/src/usr/local/www/wizards/setup_wizard.xml b/src/usr/local/www/wizards/setup_wizard.xml index 4914c89..ad807b7 100644 --- a/src/usr/local/www/wizards/setup_wizard.xml +++ b/src/usr/local/www/wizards/setup_wizard.xml @@ -621,7 +621,7 @@ <stepsubmitphpaction> <![CDATA[ if(empty($_POST['lanipaddress']) || !is_ipaddr($_POST['lanipaddress'])) { - print_info_box("Invalid LAN IP Address. Please press back in your browser window and correct."); + print_info_box("Invalid LAN IP address. Please press back in your browser window and correct."); die; } @@ -709,7 +709,7 @@ local_user_set($admin_user); write_config(); } else { - print_info_box("Passwords do not match! Please press back in your browser window and correct."); + print_info_box("Passwords do not match! Please press back in your browser window and correct."); die; } } |