Merge pull request #1705 from phil-davis/wizard-text

5 files changed, 11 insertions, 11 deletions

diff --git a/usr/local/www/wizards/openvpn_wizard.inc b/usr/local/www/wizards/openvpn_wizard.inc
index 5b2b4c3..4603aa7 100644
--- a/usr/local/www/wizards/openvpn_wizard.inc
+++ b/usr/local/www/wizards/openvpn_wizard.inc
@@ -209,7 +209,7 @@ function step7_submitphpaction() {
 		$input_errors[] = "Please do not use special characters in Certificate field names.";
 	} elseif (in_array($_POST['descr'], $canames) || in_array($_POST['descr'], $cacns)) {
 		$stepid--;
-		$savemsg = "Please enter a different name for the Certicicate Authority. A Certificate Authority with that name already exists.";
+		$savemsg = "Please enter a different name for the Certificate Authority. A Certificate Authority with that name already exists.";
 	} elseif (strlen($_POST['country']) != 2) {
 		$stepid--;
 		$savemsg = "Please enter only a two-letter ISO country code";
@@ -481,7 +481,7 @@ function step12_submitphpaction() {
 		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}");
 		exit;
 	} else if (!($auth = auth_get_authserver($pconfig['step2']['authserv']))) {
-		$message = "Not a valid authentication server has been specified.";
+		$message = "An invalid authentication server has been specified.";
 		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=1&message={$message}");
 		exit;
 	}
@@ -508,7 +508,7 @@ function step12_submitphpaction() {
 		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5&message={$message}");
 		exit;
 	} else if (!($ca = lookup_ca($pconfig['step6']['authcertca']))) {
-		$message = "Not a valid Certificate Authority specified.";
+		$message = "An invalid Certificate Authority has been specified.";
 		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=5&message={$message}");
 		exit;
 	}
@@ -535,7 +535,7 @@ function step12_submitphpaction() {
 		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}");
 		exit;
 	} else if (!($cert = lookup_cert($pconfig['step9']['authcertname']))) {
-		$message = "Not a valid Certificate specified.";
+		$message = "An invalid Certificate has been specified.";
 		header("Location:wizard.php?xml=openvpn_wizard.xml&stepid=7&message={$message}");
 		exit;
 	}
diff --git a/usr/local/www/wizards/openvpn_wizard.xml b/usr/local/www/wizards/openvpn_wizard.xml
index b99eef7..6aea7fd 100644
--- a/usr/local/www/wizards/openvpn_wizard.xml
+++ b/usr/local/www/wizards/openvpn_wizard.xml
@@ -367,7 +367,7 @@
 		<field>
 			<name>keylength</name>
 			<displayname>Key length</displayname>
-			<description>&lt;br/&gt;Size of the key which will be generated. The larger the key, the more security is offers, but larger keys are generally slower to use.</description>
+			<description>&lt;br/&gt;Size of the key which will be generated. The larger the key, the more security it offers, but larger keys are generally slower to use.</description>
 			<type>select</type>
 			<value>2048</value>
 			<bindstofield>ovpnserver->step6->keylength</bindstofield>
@@ -498,7 +498,7 @@
 		<field>
 			<name>keylength</name>
 			<displayname>Key length</displayname>
-			<description>&lt;br/&gt;Size of the key which will be generated. The larger the key, the more security is offers, but larger keys are generally slower to use.</description>
+			<description>&lt;br/&gt;Size of the key which will be generated. The larger the key, the more security it offers, but larger keys are generally slower to use.</description>
 			<type>select</type>
 			<value>2048</value>
 			<bindstofield>ovpnserver->step9->keylength</bindstofield>
diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml
index da6c6d4..683e3f4 100644
--- a/usr/local/www/wizards/setup_wizard.xml
+++ b/usr/local/www/wizards/setup_wizard.xml
@@ -452,7 +452,7 @@
 			die;
 		}
 		if(!empty($_POST['pptpremoteipaddress']) && !is_ipaddr($_POST['pptpremoteipaddress'])) {
-			print_info_box_np("Invalid PPTP Remopte IP Address. Please press back in your browser window and correct.");
+			print_info_box_np("Invalid PPTP Remote IP Address. Please press back in your browser window and correct.");
 			die;
 		}
 		$type = $_POST['selectedtype'];
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
index 7c08636..c86a72a 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
@@ -170,7 +170,7 @@
 			<field>
 				<name>Address</name>
 				<type>inputalias</type>
-				<description>This allows you to just provide the IP address of the computer(s) or Penalize. NOTE: You can also use a Firewall Alias in this location.</description>
+				<description>This allows you to just provide the IP address of the computer(s) to penalize. NOTE: You can also use a Firewall Alias in this location.</description>
 				<bindstofield>ezshaper-&gt;step4-&gt;address</bindstofield>
 				<message>IP Address field is non-blank and doesn't look like an IP address.</message>
 			</field>
@@ -956,7 +956,7 @@
 						<value>L</value>
 					</option>
 				</options>
-				<typehint>Jabber instant messanger</typehint>
+				<typehint>Jabber instant messenger</typehint>
 			</field>
 			<field>
 				<name>GoogleHangouts</name>
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
index f8b17fa..e94256b 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
@@ -178,7 +178,7 @@
 			<field>
 				<name>Address</name>
 				<type>inputalias</type>
-				<description>This allows you to just provide the IP address of the computer(s) or Penalize. NOTE: You can also use a Firewall Alias in this location.</description>
+				<description>This allows you to just provide the IP address of the computer(s) to penalize. NOTE: You can also use a Firewall Alias in this location.</description>
 				<bindstofield>ezshaper-&gt;step4-&gt;address</bindstofield>
 				<message>IP Address field is non-blank and doesn't look like an IP address.</message>
 			</field>
@@ -964,7 +964,7 @@
 						<value>L</value>
 					</option>
 				</options>
-				<typehint>Jabber instant messanger</typehint>
+				<typehint>Jabber instant messenger</typehint>
 			</field>
 			<field>
 				<name>GoogleHangouts</name>