From 075c6dfa86306cb3edc61f326f373eb0b4a66e17 Mon Sep 17 00:00:00 2001
From: Stephen Beaver <sbeaver@netgate.com>
Date: Mon, 4 Apr 2016 09:16:59 -0400
Subject: Merge pull request #2812 from
 NOYB/Firewall_/_Virtual_IPs_-_Remove_Personalizations

(cherry picked from commit 70ecf3db0aa1c0ec04784a69942788f6fef29ec4)
---
 src/usr/local/www/firewall_virtual_ip.php      | 4 ++--
 src/usr/local/www/firewall_virtual_ip_edit.php | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php
index 9e24709..adf55df 100644
--- a/src/usr/local/www/firewall_virtual_ip.php
+++ b/src/usr/local/www/firewall_virtual_ip.php
@@ -276,7 +276,7 @@ if ($input_errors) {
 } else if ($savemsg) {
 	print_info_box($savemsg, 'success');
 } else if (is_subsystem_dirty('vip')) {
-	print_apply_box(gettext("The VIP configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
+	print_apply_box(gettext("The VIP configuration has been changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
 }
 
 /* active tabs
@@ -374,7 +374,7 @@ endforeach;
 
 <div class="infoblock">
 	<?php 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); ?>
+		sprintf(gettext('Check the status of 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/firewall_virtual_ip_edit.php b/src/usr/local/www/firewall_virtual_ip_edit.php
index a666c31..3e3c6cd 100644
--- a/src/usr/local/www/firewall_virtual_ip_edit.php
+++ b/src/usr/local/www/firewall_virtual_ip_edit.php
@@ -180,9 +180,9 @@ if ($_POST) {
 		}
 
 		if (isset($network_addr) && $_POST['subnet'] == $network_addr) {
-			$input_errors[] = gettext("You cannot use the network address for this VIP");
+			$input_errors[] = gettext("The network address cannot be used for this VIP");
 		} else if (isset($broadcast_addr) && $_POST['subnet'] == $broadcast_addr) {
-			$input_errors[] = gettext("You cannot use the broadcast address for this VIP");
+			$input_errors[] = gettext("The broadcast address cannot be used for this VIP");
 		}
 	}
 
@@ -201,7 +201,7 @@ if ($_POST) {
 			}
 
 			if (empty($_POST['password'])) {
-				$input_errors[] = gettext("You must specify a CARP password that is shared between the two VHID members.");
+				$input_errors[] = gettext("A CARP password that is shared between the two VHID members must be specified.");
 			}
 
 			if ($_POST['password'] != $_POST['password_confirm']) {
@@ -455,7 +455,7 @@ $section->addInput(new Form_Input(
 	'Description',
 	'text',
 	$pconfig['descr']
-))->setHelp('You may enter a description here for your reference (not parsed).');
+))->setHelp('A description may be entered here for administrative reference (not parsed).');
 
 if (isset($id) && $a_vip[$id]){
 	$section->addInput(new Form_Input(
-- 
cgit v1.1