summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2014-12-26 16:49:18 -0600
committerChris Buechler <cmb@pfsense.org>2014-12-26 16:49:18 -0600
commitcccee755846ccfce15340e00cb3005ec3b90954f (patch)
treeef8686046a45b5795d98285bedb81635b4b3e8d3 /usr
parent02e4ee541ba8af0992c6cd3acd468d731369b287 (diff)
downloadpfsense-cccee755846ccfce15340e00cb3005ec3b90954f.zip
pfsense-cccee755846ccfce15340e00cb3005ec3b90954f.tar.gz
clarify message here after customer feedback, it wasn't meant to imply "only a reboot will re-enable" but that's how some people have read it.
Diffstat (limited to 'usr')
-rw-r--r--usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po2
-rw-r--r--usr/local/www/carp_status.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
index 7382dee..9207e62 100644
--- a/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
+++ b/usr/local/share/locale/pt_BR.ISO8859-1/LC_MESSAGES/pfSense.po
@@ -28565,7 +28565,7 @@ msgstr "Firefox 1.5 ou versão mais recente ou outro browser que suporte SVG é re
#: usr/local/www/carp_status.php:71 usr/local/www/carp_status.php:67
#, php-format
-msgid "%s IPs have been disabled. Please note that disabling does not survive a reboot."
+msgid "%s IPs have been disabled. Please note that disabling does not survive a reboot and some configuration changes will re-enable."
msgstr "%s IPs foram desabilitados. Por favor, estas alterações não estarão disponíveis no próximo boot."
#: usr/local/www/carp_status.php:73 usr/local/www/carp_status.php:69
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index ea56e13..83975b3 100644
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -70,7 +70,7 @@ if($_POST['disablecarp'] <> "") {
}
}
}
- $savemsg = sprintf(gettext("%s IPs have been disabled. Please note that disabling does not survive a reboot."), $carp_counter);
+ $savemsg = sprintf(gettext("%s IPs have been disabled. Please note that disabling does not survive a reboot and some configuration changes will re-enable."), $carp_counter);
$status = 0;
} else {
$savemsg = gettext("CARP has been enabled.");
OpenPOWER on IntegriCloud