summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-04-04 09:29:51 -0400
committerStephen Beaver <sbeaver@netgate.com>2016-04-04 09:29:57 -0400
commit718694129cf5aec2be065efc94978cfbfd30276d (patch)
tree60e1a6ef2f3073f696ebb2e75e4a391dda832b5c /src
parent152d81c244fb8535132f0aef1d17a94c143bb2d6 (diff)
downloadpfsense-718694129cf5aec2be065efc94978cfbfd30276d.zip
pfsense-718694129cf5aec2be065efc94978cfbfd30276d.tar.gz
Merge pull request #2819 from NOYB/Services_/_Load_Balancer_-_Remove_Personalizations
(cherry picked from commit 6d105e8d5ded647dfc65cbc9625c41a3afc74a0e)
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/load_balancer_monitor.php2
-rw-r--r--src/usr/local/www/load_balancer_monitor_edit.php2
-rw-r--r--src/usr/local/www/load_balancer_pool.php2
-rw-r--r--src/usr/local/www/load_balancer_pool_edit.php6
-rw-r--r--src/usr/local/www/load_balancer_setting.php2
-rw-r--r--src/usr/local/www/load_balancer_virtual_server.php2
-rw-r--r--src/usr/local/www/load_balancer_virtual_server_edit.php12
7 files changed, 14 insertions, 14 deletions
diff --git a/src/usr/local/www/load_balancer_monitor.php b/src/usr/local/www/load_balancer_monitor.php
index d1a5d30..ea44692 100644
--- a/src/usr/local/www/load_balancer_monitor.php
+++ b/src/usr/local/www/load_balancer_monitor.php
@@ -118,7 +118,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('loadbalancer')) {
- print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
+ print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
/* active tabs */
diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php
index 53c6978..26cddcb 100644
--- a/src/usr/local/www/load_balancer_monitor_edit.php
+++ b/src/usr/local/www/load_balancer_monitor_edit.php
@@ -127,7 +127,7 @@ if ($_POST) {
}
if (preg_match('/[ \/]/', $_POST['name'])) {
- $input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field.");
+ $input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field.");
}
if (strlen($_POST['name']) > 16) {
diff --git a/src/usr/local/www/load_balancer_pool.php b/src/usr/local/www/load_balancer_pool.php
index 8e28e9a..d325498 100644
--- a/src/usr/local/www/load_balancer_pool.php
+++ b/src/usr/local/www/load_balancer_pool.php
@@ -132,7 +132,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('loadbalancer')) {
- print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
+ print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
/* active tabs */
diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php
index 6501335..551c3a0 100644
--- a/src/usr/local/www/load_balancer_pool_edit.php
+++ b/src/usr/local/www/load_balancer_pool_edit.php
@@ -116,7 +116,7 @@ if ($_POST) {
}
if (preg_match('/[ \/]/', $_POST['name'])) {
- $input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field.");
+ $input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field.");
}
if (strlen($_POST['name']) > 16) {
@@ -361,7 +361,7 @@ $section->addInput(new Form_Input(
'Port',
'text',
$pconfig['port']
-))->setHelp('This is the port your servers are listening on. You may also specify a port alias listed in Firewall -> Aliases here.');
+))->setHelp('This is the port the servers are listening on. A port alias listed in Firewall -> Aliases may also be specified here.');
$section->addInput(new Form_Input(
'retry',
@@ -391,7 +391,7 @@ if (count($config['load_balancer']['monitor_type'])) {
} else {
$section->addInput(new Form_StaticText(
'Monitor',
- 'Please add a monitor IP address on the monitors tab if you wish to use this feature."'
+ 'Please add a monitor IP address on the monitors tab to use this feature."'
));
}
diff --git a/src/usr/local/www/load_balancer_setting.php b/src/usr/local/www/load_balancer_setting.php
index 6e04d2b..8212407 100644
--- a/src/usr/local/www/load_balancer_setting.php
+++ b/src/usr/local/www/load_balancer_setting.php
@@ -131,7 +131,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('loadbalancer')) {
- print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
+ print_apply_box(gettext("The load balancer configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
/* active tabs */
diff --git a/src/usr/local/www/load_balancer_virtual_server.php b/src/usr/local/www/load_balancer_virtual_server.php
index 18c2407..c2296b4 100644
--- a/src/usr/local/www/load_balancer_virtual_server.php
+++ b/src/usr/local/www/load_balancer_virtual_server.php
@@ -132,7 +132,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('loadbalancer')) {
- print_apply_box(gettext("The virtual server configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
+ print_apply_box(gettext("The virtual server configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
}
/* active tabs */
diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php
index adf1b6a..bc80cb7 100644
--- a/src/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/src/usr/local/www/load_balancer_virtual_server_edit.php
@@ -120,7 +120,7 @@ if ($_POST) {
}
if (preg_match('/[ \/]/', $_POST['name'])) {
- $input_errors[] = gettext("You cannot use spaces or slashes in the 'name' field.");
+ $input_errors[] = gettext("Spaces or slashes cannot be used in the 'name' field.");
}
if (strlen($_POST['name']) > 32) {
@@ -142,7 +142,7 @@ if ($_POST) {
}
if ((strtolower($_POST['relay_protocol']) == "dns") && !empty($_POST['sitedown'])) {
- $input_errors[] = gettext("You cannot select a Fall Back Pool when using the DNS relay protocol.");
+ $input_errors[] = gettext("A Fall Back Pool cannot be selected when using the DNS relay protocol.");
}
if (!$input_errors) {
@@ -222,9 +222,9 @@ $section->addInput(new Form_IpAddress(
'ipaddr',
'IP Address',
$pconfig['ipaddr']
-))->setHelp('This is normally the WAN IP address that you would like the server to listen on. ' .
+))->setHelp('This is normally the WAN IP address for the server to listen on. ' .
'All connections to this IP and port will be forwarded to the pool cluster. ' .
- 'You may also specify a host alias listed in Firewall -&gt; Aliases here.');
+ 'A host alias listed in Firewall -&gt; Aliases may also be specified here.');
$section->addInput(new Form_Input(
'port',
@@ -233,7 +233,7 @@ $section->addInput(new Form_Input(
$pconfig['port']
))->setHelp('Port that the clients will connect to. All connections to this port will be forwarded to the pool cluster. ' .
'If left blank listening ports from the pool will be used.' .
- 'You may also specify a port alias listed in Firewall -&gt; Aliases here.');
+ 'A port alias listed in Firewall -&gt; Aliases may also be specified here.');
if (count($config['load_balancer']['lbpool']) == 0) {
$section->addInput(new Form_StaticText(
@@ -301,7 +301,7 @@ if (isset($id) && $a_vs[$id] && $_GET['act'] != 'dup') {
$form->add($section);
print($form);
-print_info_box(gettext('Don\'t forget to add a firewall rule for the virtual server/pool after you have finished setting it up.'));
+print_info_box(gettext('Don\'t forget to add a firewall rule for the virtual server/pool after finished setting it up.'));
?>
<script type="text/javascript">
//<![CDATA[
OpenPOWER on IntegriCloud