-
+ "They may be referenced directly from the portal page HTML code using relative paths. " .
+ "Example: An image uploaded with the name 'captiveportal-test.jpg' using the " .
+ "file manager can then be included in the portal page like this:")?>
<img src="captiveportal-test.jpg" width=... height=...>
-
+
<a href="/captiveportal-aup.php?zone=$PORTAL_ZONE$&redirurl=$PORTAL_REDIRURL$"></a>
diff --git a/src/usr/local/www/services_captiveportal_hostname_edit.php b/src/usr/local/www/services_captiveportal_hostname_edit.php
index b98add5e7d..9ab00e558c 100644
--- a/src/usr/local/www/services_captiveportal_hostname_edit.php
+++ b/src/usr/local/www/services_captiveportal_hostname_edit.php
@@ -223,7 +223,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).');
$section->addInput(new Form_Input(
'bw_up',
diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php
index d07260ab2d..d80600b104 100644
--- a/src/usr/local/www/services_captiveportal_mac.php
+++ b/src/usr/local/www/services_captiveportal_mac.php
@@ -189,7 +189,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('passthrumac')) {
- print_apply_box(gettext("The Captive Portal MAC address configuration has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect."));
+ print_apply_box(gettext("The Captive Portal MAC address configuration has been changed.") . "
" . gettext("The changes must be applied for them to take effect."));
}
$tab_array = array();
diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php
index 5459e0067d..a838292a5a 100644
--- a/src/usr/local/www/services_captiveportal_mac_edit.php
+++ b/src/usr/local/www/services_captiveportal_mac_edit.php
@@ -139,7 +139,7 @@ if ($_POST) {
$iflist = get_interface_list();
foreach ($iflist as $if) {
if ($_POST['mac'] == strtolower($if['mac'])) {
- $input_errors[] = sprintf(gettext("The MAC address %s belongs to a local interface, you cannot use it here."), $_POST['mac']);
+ $input_errors[] = sprintf(gettext("The MAC address %s belongs to a local interface. It cannot be used here."), $_POST['mac']);
break;
}
}
@@ -264,7 +264,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)');
$section->addInput(new Form_Input(
'bw_up',
diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php
index 57eb862843..2fd9f83f2e 100644
--- a/src/usr/local/www/services_captiveportal_vouchers.php
+++ b/src/usr/local/www/services_captiveportal_vouchers.php
@@ -276,7 +276,7 @@ if ($_POST) {
$input_errors[] = gettext("This doesn't look like an RSA Private key.");
}
if ($_POST['vouchersyncdbip'] && (is_ipaddr_configured($_POST['vouchersyncdbip']))) {
- $input_errors[] = gettext("You cannot sync the voucher database to this host (itself).");
+ $input_errors[] = gettext("The voucher database cannot be sync'd to this host (itself).");
}
if ($_POST['vouchersyncpass'] != $_POST['vouchersyncpass_confirm']) {
$input_errors[] = gettext("Password and confirmed password must match.");
diff --git a/src/usr/local/www/services_captiveportal_zones.php b/src/usr/local/www/services_captiveportal_zones.php
index e388869576..334ac181f0 100644
--- a/src/usr/local/www/services_captiveportal_zones.php
+++ b/src/usr/local/www/services_captiveportal_zones.php
@@ -99,7 +99,7 @@ if ($savemsg) {
}
if (is_subsystem_dirty('captiveportal')) {
- print_apply_box(gettext("The Captive Portal entry list has been changed.") . "
" . gettext("You must apply the changes in order for them to take effect."));
+ print_apply_box(gettext("The Captive Portal entry list has been changed.") . "
" . gettext("The changes must be applied for them to take effect."));
}
?>