Merge pull request #2841 from NOYB/System_-_Miscellaneous_-_Remove_Personalizations

(cherry picked from commit 3061702cce23fcc5259f7d6d119a6fe05de84149)

7 files changed, 14 insertions, 13 deletions

diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php
index dd44caf..109326e 100644
--- a/src/usr/local/www/system_advanced_sysctl.php
+++ b/src/usr/local/www/system_advanced_sysctl.php
@@ -179,7 +179,7 @@ if ($savemsg) {
 }
 
 if (is_subsystem_dirty('sysctl') && ($act != "edit" )) {
-	print_apply_box(gettext("The firewall tunables have changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
+	print_apply_box(gettext("The firewall tunables have changed.") . "<br />" . gettext("The changes must be applied for them to take effect."));
 }
 
 $tab_array = array();
diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php
index bfad6a2..51d3ed6 100644
--- a/src/usr/local/www/system_certmanager.php
+++ b/src/usr/local/www/system_certmanager.php
@@ -342,7 +342,7 @@ if ($_POST) {
 						break;
 					case "email":
 						if (empty($altname['value'])) {
-							array_push($input_errors, "You must provide an e-mail address for this type of subjectAltName");
+							array_push($input_errors, "An e-mail address must be provided for this type of subjectAltName");
 						}
 						if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $altname['value'])) {
 							array_push($input_errors, "The e-mail provided in a subjectAltName contains invalid characters.");
@@ -651,9 +651,10 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) {
 	if (!$internal_ca_count) {
 		$section->addInput(new Form_StaticText(
 			'Certificate authority',
-			gettext('No internal Certificate Authorities have been defined. You must ').
-			'<a href="system_camanager.php?act=new&amp;method=internal"> '. gettext(" create") .'</a>'.
-			gettext(' an internal CA before creating an internal certificate.')
+			gettext('No internal Certificate Authorities have been defined. ').
+			gettext('An internal CA must be defined in order to create an internal certificate. ').
+			'<a href="system_camanager.php?act=new&amp;method=internal"> '. gettext("Create") .'</a>'.
+			gettext(' an internal CA.')
 		));
 	} else {
 		$allCas = array();
@@ -926,14 +927,14 @@ if ($act == "new" || (($_POST['save'] == gettext("Save")) && $input_errors)) {
 		$pconfig['csr']
 	))->setReadonly()
 	  ->setWidth(7)
-	  ->setHelp('Copy the certificate signing data from here and forward it to your certificate authority for signing.');
+	  ->setHelp('Copy the certificate signing data from here and forward it to a certificate authority for signing.');
 
 	$section->addInput(new Form_Textarea(
 		'cert',
 		'Final certificate data',
 		$pconfig['cert']
 	))->setWidth(7)
-	  ->setHelp('Paste the certificate received from your certificate authority here.');
+	  ->setHelp('Paste the certificate received from the certificate authority here.');
 
 	 if (isset($id) && $a_cert[$id]) {
 		 $section->addInput(new Form_Input(
diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php
index 672b2a0..9ce2b21 100644
--- a/src/usr/local/www/system_gateway_groups.php
+++ b/src/usr/local/www/system_gateway_groups.php
@@ -145,7 +145,7 @@ if ($savemsg) {
 }
 
 if (is_subsystem_dirty('staticroutes')) {
-	print_apply_box(gettext("The gateway configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
+	print_apply_box(gettext("The gateway 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/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php
index f7a7a6a..d130a69 100644
--- a/src/usr/local/www/system_gateway_groups_edit.php
+++ b/src/usr/local/www/system_gateway_groups_edit.php
@@ -371,7 +371,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_gateway_groups[$id]){
 	$section->addInput(new Form_Input(
diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php
index 496e9d4..40ec957 100644
--- a/src/usr/local/www/system_routes.php
+++ b/src/usr/local/www/system_routes.php
@@ -255,7 +255,7 @@ if ($savemsg) {
 	print_info_box($savemsg, 'success');
 }
 if (is_subsystem_dirty('staticroutes')) {
-	print_apply_box(gettext("The static route configuration has been changed.") . "<br />" . gettext("You must apply the changes in order for them to take effect."));
+	print_apply_box(gettext("The static route 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/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php
index b8d9c3a..7db2e50 100644
--- a/src/usr/local/www/system_routes_edit.php
+++ b/src/usr/local/www/system_routes_edit.php
@@ -126,7 +126,7 @@ if ($_POST) {
 		if (!isset($a_gateways[$_POST['gateway']])) {
 			$input_errors[] = gettext("A valid gateway must be specified.");
 		} else if (isset($a_gateways[$_POST['gateway']]['disabled']) && !$_POST['disabled']) {
-			$input_errors[] = gettext("The gateway is disabled but the route is not. You must disable the route in order to choose a disabled gateway.");
+			$input_errors[] = gettext("The gateway is disabled but the route is not. The route must be disabled in order to choose a disabled gateway.");
 		} else {
 			// Note that the 3rd parameter "disabled" must be passed as explicitly true or false.
 			if (!validate_address_family($_POST['network'], $_POST['gateway'], $_POST['disabled'] ? true : false)) {
@@ -306,7 +306,7 @@ $section->addInput(new Form_Input(
 	'Description',
 	'text',
 	htmlspecialchars($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).');
 
 $form->add($section);
 
diff --git a/src/usr/local/www/system_usermanager_passwordmg.php b/src/usr/local/www/system_usermanager_passwordmg.php
index 8773a1f..378dc5b 100644
--- a/src/usr/local/www/system_usermanager_passwordmg.php
+++ b/src/usr/local/www/system_usermanager_passwordmg.php
@@ -121,7 +121,7 @@ if ($savemsg) {
 }
 
 if ($islocal == false) {
-	echo gettext("Sorry, you cannot change the password for a non-local user.");
+	echo gettext("The password cannot be changed for a non-local user.");
 	include("foot.inc");
 	exit;
 }