diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2016-04-04 09:16:05 -0400 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2016-04-04 09:16:20 -0400 |
commit | 2a9559e1c06fc834f8e73717a5cc2200a75c27cf (patch) | |
tree | 4a3b793ac363e8346b353e9c5e7ca847ff4e0fc7 /src/usr/local | |
parent | a70ad883bb84a3bc9b498d30153642594a71373d (diff) | |
download | pfsense-2a9559e1c06fc834f8e73717a5cc2200a75c27cf.zip pfsense-2a9559e1c06fc834f8e73717a5cc2200a75c27cf.tar.gz |
Merge pull request #2811 from NOYB/Firewall_/_Traffic_Shaper_-_Remove_Personalizations
(cherry picked from commit 7f824121528288fdcc493f36da25c61982f4e320)
Diffstat (limited to 'src/usr/local')
-rw-r--r-- | src/usr/local/www/firewall_shaper.php | 4 | ||||
-rw-r--r-- | src/usr/local/www/firewall_shaper_queues.php | 2 | ||||
-rw-r--r-- | src/usr/local/www/firewall_shaper_vinterface.php | 6 | ||||
-rw-r--r-- | src/usr/local/www/firewall_shaper_wizards.php | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/usr/local/www/firewall_shaper.php b/src/usr/local/www/firewall_shaper.php index 64f9d0b..37d3754 100644 --- a/src/usr/local/www/firewall_shaper.php +++ b/src/usr/local/www/firewall_shaper.php @@ -200,7 +200,7 @@ if ($_GET) { } else if ($addnewaltq) { $q = new altq_root_queue(); } else { - $input_errors[] = gettext("Could not create new queue/discipline! Did you remember to apply any recent changes?"); + $input_errors[] = gettext("Could not create new queue/discipline! Any recent changes may need to be applied first."); } if ($q) { @@ -408,7 +408,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php index ce1f53f..283f776 100644 --- a/src/usr/local/www/firewall_shaper_queues.php +++ b/src/usr/local/www/firewall_shaper_queues.php @@ -236,7 +236,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php index 208d189..0830382 100644 --- a/src/usr/local/www/firewall_shaper_vinterface.php +++ b/src/usr/local/www/firewall_shaper_vinterface.php @@ -257,7 +257,7 @@ if ($_POST) { if ($addnewpipe) { if (!empty($dummynet_pipe_list[$qname])) { - $input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter"); + $input_errors[] = gettext("A child queue cannot be named the same as a parent limiter"); } else { $dnpipe =& new dnpipe_class(); @@ -283,7 +283,7 @@ if ($_POST) { } } else if ($parentqueue) { /* Add a new queue */ if (!empty($dummynet_pipe_list[$qname])) { - $input_errors[] = gettext("You cannot name a child queue with the same name as a parent limiter"); + $input_errors[] = gettext("A child queue cannot be named the same as a parent limiter"); } else if ($dnpipe) { $tmppath =& $dnpipe->GetLink(); array_push($tmppath, $qname); @@ -408,7 +408,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } $tab_array = array(); diff --git a/src/usr/local/www/firewall_shaper_wizards.php b/src/usr/local/www/firewall_shaper_wizards.php index 3e15bb7..662351a 100644 --- a/src/usr/local/www/firewall_shaper_wizards.php +++ b/src/usr/local/www/firewall_shaper_wizards.php @@ -119,7 +119,7 @@ if ($savemsg) { } if (is_subsystem_dirty('shaper')) { - print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect.")); + print_apply_box(gettext("The traffic shaper configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect.")); } ?> |