Merge pull request #2034 from phil-davis/r2

11 files changed, 22 insertions, 22 deletions

diff --git a/src/usr/local/www/firewall_shaper_queues.php b/src/usr/local/www/firewall_shaper_queues.php
index 190ca28..b28db83 100644
--- a/src/usr/local/www/firewall_shaper_queues.php
+++ b/src/usr/local/www/firewall_shaper_queues.php
@@ -220,7 +220,7 @@ if ($_POST['apply']) {
 	clear_subsystem_dirty('shaper');
 }
 
-$pgtitle = gettext("Firewall: Shaper: By Queues View");
+$pgtitle = array(gettext("Firewall"), gettext("Traffic Shaper"), gettext("Queues"));
 $shortcut_section = "trafficshaper";
 $closehead = false;
 
diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php
index 68d98b1..b038696 100644
--- a/src/usr/local/www/services_dnsmasq.php
+++ b/src/usr/local/www/services_dnsmasq.php
@@ -183,7 +183,7 @@ function build_if_list() {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("Services"), gettext("DNS forwarder"));
+$pgtitle = array(gettext("Services"), gettext("DNS Forwarder"));
 $shortcut_section = "forwarder";
 include("head.inc");
 
diff --git a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
index 0bd832f..ea1af7b 100644
--- a/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
+++ b/src/usr/local/www/services_dnsmasq_domainoverride_edit.php
@@ -125,7 +125,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Services"), gettext("DNS forwarder"), gettext("Edit Domain Override"));
+$pgtitle = array(gettext("Services"), gettext("DNS Forwarder"), gettext("Edit Domain Override"));
 $shortcut_section = "forwarder";
 include("head.inc");
 
diff --git a/src/usr/local/www/services_dnsmasq_edit.php b/src/usr/local/www/services_dnsmasq_edit.php
index bea2fc8..50910fc 100644
--- a/src/usr/local/www/services_dnsmasq_edit.php
+++ b/src/usr/local/www/services_dnsmasq_edit.php
@@ -203,7 +203,7 @@ if($_GET['act'] == "addopt") {
 	array_push($pconfig['aliases']['item'], array('host' => null, 'domain' => null, 'description' => null));
 }
 
-$pgtitle = array(gettext("Services"),gettext("DNS forwarder"),gettext("Edit host"));
+$pgtitle = array(gettext("Services"),gettext("DNS Forwarder"),gettext("Edit Host Override"));
 $shortcut_section = "forwarder";
 include("head.inc");
 
@@ -214,7 +214,7 @@ require_once('classes/Form.class.php');
 
 $form = new Form();
 
-$section = new Form_Section('Domain override options');
+$section = new Form_Section('Host override options');
 
 $section->addInput(new Form_Input(
 	'host',
@@ -278,7 +278,7 @@ if( $pconfig['aliases']['item']) {
 			null,
 			'text',
 			$item['domain']
-		))->setHelp($counter == $last ? 'Value':null);
+		))->setHelp($counter == $last ? 'Domain':null);
 
 		$group->add(new Form_Input(
 			'aliasdescription' . $counter,
@@ -302,7 +302,7 @@ if( $pconfig['aliases']['item']) {
 
 $btnaddopt = new Form_Button(
 	'btnaddopt',
-	'Add Option',
+	'Add Host name',
 	'services_dnsmasq_edit.php?act=addopt'
 );
 
diff --git a/src/usr/local/www/services_ntpd_gps.php b/src/usr/local/www/services_ntpd_gps.php
index 5453f63..30af57c 100644
--- a/src/usr/local/www/services_ntpd_gps.php
+++ b/src/usr/local/www/services_ntpd_gps.php
@@ -258,9 +258,9 @@ $section->addInput(new Form_Select(
 	'GPS',
 	$pconfig['type'],
 	array_combine($gpstypes, $gpstypes)
-))->setHelp('This option allows you to select a predefined configuration.' .
+))->setHelp('This option allows you to select a predefined configuration. ' .
 			'Default is the configuration of pfSense 2.1 and earlier (not recommended). Select Generic if your GPS is not listed.' . '<br /><br />' .
-			'The perdefined configurations assume your GPS has already been set to NMEA mode.');
+			'The predefined configurations assume your GPS has already been set to NMEA mode.');
 
 $serialports = glob("/dev/cua?[0-9]{,.[0-9]}", GLOB_BRACE);
 
@@ -276,7 +276,7 @@ if (!empty($serialports)) {
 		'gpsport',
 		'Serial port',
 		$pconfig['port'],
-			$splist
+		$splist
 	))->setHelp('All serial ports are listed, be sure to pick the port with the GPS attached. ');
 
 	$section->addInput(new Form_Select(
@@ -329,7 +329,7 @@ $section->addInput(new Form_Checkbox(
 $section->addInput(new Form_Checkbox(
 	'gpsselect',
 	null,
-	'NTP should not use this clock, it will be displayed for reference only(default: disabled).',
+	'NTP should not use this clock, it will be displayed for reference only (default: disabled).',
 	$pconfig['noselect']
 ));
 
diff --git a/src/usr/local/www/services_ntpd_pps.php b/src/usr/local/www/services_ntpd_pps.php
index 36172e7..f825324 100644
--- a/src/usr/local/www/services_ntpd_pps.php
+++ b/src/usr/local/www/services_ntpd_pps.php
@@ -161,7 +161,7 @@ $section = new Form_Section('NTP Serial PPS Configuration');
 
 $section->addInput(new Form_StaticText(
 	'Notes',
-	'Devices with a Pulse Per Second output such as radios that receive a time signal from DCF77 (DE), JJY (JP), MSF (GB) or WWVB (US) may be used as a PPS reference for NTP.' .
+	'Devices with a Pulse Per Second output such as radios that receive a time signal from DCF77 (DE), JJY (JP), MSF (GB) or WWVB (US) may be used as a PPS reference for NTP. ' .
 	'A serial GPS may also be used, but the serial GPS driver would usually be the better option. ' . 
 	'A PPS signal only provides a reference to the change of a second, so at least one other source to number the seconds is required.' . '<br /><br />' .
 	'At least 3 additional time sources should be configured under ' . 
diff --git a/src/usr/local/www/services_router_advertisements.php b/src/usr/local/www/services_router_advertisements.php
index e32733d..10c1dd1 100644
--- a/src/usr/local/www/services_router_advertisements.php
+++ b/src/usr/local/www/services_router_advertisements.php
@@ -229,7 +229,7 @@ if ($_POST) {
 	}
 }
 
-$pgtitle = array(gettext("Services"), gettext("Router advertisements"));
+$pgtitle = array(gettext("Services"), gettext("Router Advertisements"));
 
 include("head.inc");
 
diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php
index 62eed0d..76593e0 100644
--- a/src/usr/local/www/services_unbound_acls.php
+++ b/src/usr/local/www/services_unbound_acls.php
@@ -198,7 +198,7 @@ $actionHelp =
 
 
 $closehead = false;
-$pgtitle = "Services: DNS Resolver: Access Lists";
+$pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("Access Lists"));
 $shortcut_section = "resolver";
 include("head.inc");
 
@@ -212,7 +212,7 @@ if (is_subsystem_dirty('unbound'))
 	print_info_box_np(gettext("The configuration of the DNS Resolver, has been changed") . ".<br />" . gettext("You must apply the changes in order for them to take effect."));
 
 $tab_array = array();
-$tab_array[] = array(gettext("General Settings"), false, "/services_unbound.php");
+$tab_array[] = array(gettext("General settings"), false, "/services_unbound.php");
 $tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php");
 $tab_array[] = array(gettext("Access Lists"), true, "/services_unbound_acls.php");
 display_top_tabs($tab_array, true);
@@ -241,7 +241,7 @@ if($act=="new" || $act=="edit") {
 
 	$section->addInput(new Form_Input(
 		'aclname',
-		'Access LIst name',
+		'Access List name',
 		'text',
 		$pconfig['aclname']
 	))->setHelp('Provide an Access List name.');
diff --git a/src/usr/local/www/services_unbound_host_edit.php b/src/usr/local/www/services_unbound_host_edit.php
index d0f9b6d..756257a 100644
--- a/src/usr/local/www/services_unbound_host_edit.php
+++ b/src/usr/local/www/services_unbound_host_edit.php
@@ -205,7 +205,7 @@ if($_GET['act'] == "addopt") {
 	array_push($pconfig['aliases']['item'], array('host' => null, 'domain' => null, 'description' => null));
 }
 
-$pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Edit host"));
+$pgtitle = array(gettext("Services"),gettext("DNS Resolver"),gettext("Edit Host Override"));
 $shortcut_section = "resolver";
 include("head.inc");
 
@@ -213,7 +213,7 @@ require_once('classes/Form.class.php');
 
 $form = new Form();
 
-$section = new Form_Section('Edit DNS Rersolver Entry');
+$section = new Form_Section('Host override options');
 
 $section->addInput(new Form_Input(
 	'host',
@@ -277,7 +277,7 @@ if( $pconfig['aliases']['item']) {
 			null,
 			'text',
 			$item['domain']
-		))->setHelp($counter == $last ? 'Value':null);
+		))->setHelp($counter == $last ? 'Domain':null);
 
 		$group->add(new Form_Input(
 			'aliasdescription' . $counter,
@@ -301,7 +301,7 @@ if( $pconfig['aliases']['item']) {
 
 $btnaddopt = new Form_Button(
 	'btnaddopt',
-	'Add Option',
+	'Add Host name',
 	'services_unbound_host_edit.php?act=addopt'
 );
 
diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php
index d88fa73..bb14813 100644
--- a/src/usr/local/www/system_groupmanager.php
+++ b/src/usr/local/www/system_groupmanager.php
@@ -67,7 +67,7 @@
 
 require("guiconfig.inc");
 
-$pgtitle = array(gettext("System"), gettext("Group manager"));
+$pgtitle = array(gettext("System"), gettext("Group Manager"));
 
 if (!is_array($config['system']['group'])) {
 	$config['system']['group'] = array();
diff --git a/src/usr/local/www/vpn_pppoe.php b/src/usr/local/www/vpn_pppoe.php
index 50cd7be..3e2e833 100644
--- a/src/usr/local/www/vpn_pppoe.php
+++ b/src/usr/local/www/vpn_pppoe.php
@@ -116,7 +116,7 @@ if ($_GET['act'] == "del") {
 	}
 }
 
-$pgtitle = array(gettext("VPN"), gettext("PPPoE"));
+$pgtitle = array(gettext("Services"),gettext("PPPoE Server"));
 $shortcut_section = "pppoes";
 include("head.inc");