diff options
Diffstat (limited to 'src')
47 files changed, 109 insertions, 110 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index d169740..9788fb4 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -2164,7 +2164,7 @@ function process_alias_urltable($name, $url, $freq, $forceupdate=false, $validat } // If the file doesn't exist or is older than update_freq days, fetch a new copy. - if (!file_exists($urltable_filename) || + if (!file_exists($urltable_filename) || (filesize($urltable_filename) == "0") || ((time() - filemtime($urltable_filename)) > ($freq * 86400 - 90)) || $forceupdate) { diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index 21bf0f4..2e01ea6 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -443,8 +443,8 @@ $priv_list['page-interfaces']['match'] = array(); $priv_list['page-interfaces']['match'][] = "interfaces.php*"; $priv_list['page-interfaces-assignnetworkports'] = array(); -$priv_list['page-interfaces-assignnetworkports']['name'] = gettext("WebCfg - Interfaces: Assign network ports"); -$priv_list['page-interfaces-assignnetworkports']['descr'] = gettext("Allow access to the 'Interfaces: Assign network ports' page."); +$priv_list['page-interfaces-assignnetworkports']['name'] = gettext("WebCfg - Interfaces: Interface Assignments"); +$priv_list['page-interfaces-assignnetworkports']['descr'] = gettext("Allow access to the 'Interfaces: Interface Assignments' page."); $priv_list['page-interfaces-assignnetworkports']['match'] = array(); $priv_list['page-interfaces-assignnetworkports']['match'][] = "interfaces_assign.php*"; @@ -725,8 +725,8 @@ $priv_list['page-services-dhcpserver']['match'] = array(); $priv_list['page-services-dhcpserver']['match'][] = "services_dhcp.php*"; $priv_list['page-services-dhcpserver-editstaticmapping'] = array(); -$priv_list['page-services-dhcpserver-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCP Server: Edit static mapping"); -$priv_list['page-services-dhcpserver-editstaticmapping']['descr'] = gettext("Allow access to the 'Services: DHCP Server: Edit static mapping' page."); +$priv_list['page-services-dhcpserver-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCP Server: Edit Static Mapping"); +$priv_list['page-services-dhcpserver-editstaticmapping']['descr'] = gettext("Allow access to the 'Services: DHCP Server: Edit Static Mapping' page."); $priv_list['page-services-dhcpserver-editstaticmapping']['match'] = array(); $priv_list['page-services-dhcpserver-editstaticmapping']['match'][] = "services_dhcp_edit.php*"; @@ -743,8 +743,8 @@ $priv_list['page-services-dhcpv6server']['match'] = array(); $priv_list['page-services-dhcpv6server']['match'][] = "services_dhcpv6.php*"; $priv_list['page-services-dhcpserverv6-editstaticmapping'] = array(); -$priv_list['page-services-dhcpserverv6-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCPv6 Server: Edit static mapping"); -$priv_list['page-services-dhcpserverv6-editstaticmapping']['descr'] = gettext("Allow access to the 'Services: DHCPv6 Server : Edit static mapping' page."); +$priv_list['page-services-dhcpserverv6-editstaticmapping']['name'] = gettext("WebCfg - Services: DHCPv6 Server: Edit Static Mapping"); +$priv_list['page-services-dhcpserverv6-editstaticmapping']['descr'] = gettext("Allow access to the 'Services: DHCPv6 Server : Edit Static Mapping' page."); $priv_list['page-services-dhcpserverv6-editstaticmapping']['match'] = array(); $priv_list['page-services-dhcpserverv6-editstaticmapping']['match'][] = "services_dhcpv6_edit.php*"; diff --git a/src/usr/local/www/interfaces_assign.php b/src/usr/local/www/interfaces_assign.php index 3c17dbe..8ffff9a 100644 --- a/src/usr/local/www/interfaces_assign.php +++ b/src/usr/local/www/interfaces_assign.php @@ -59,12 +59,12 @@ ##|+PRIV ##|*IDENT=page-interfaces-assignnetworkports -##|*NAME=Interfaces: Assign network ports -##|*DESCR=Allow access to the 'Interfaces: Assign network ports' page. +##|*NAME=Interfaces: Interface Assignments +##|*DESCR=Allow access to the 'Interfaces: Interface Assignments' page. ##|*MATCH=interfaces_assign.php* ##|-PRIV -$pgtitle = array(gettext("Interfaces"), gettext("Assign network ports")); +$pgtitle = array(gettext("Interfaces"), gettext("Interface Assignments")); $shortcut_section = "interfaces"; require("guiconfig.inc"); @@ -515,16 +515,16 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), true, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), true, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <form action="interfaces_assign.php" method="post"> diff --git a/src/usr/local/www/interfaces_bridge.php b/src/usr/local/www/interfaces_bridge.php index 3498713..f4ba575 100644 --- a/src/usr/local/www/interfaces_bridge.php +++ b/src/usr/local/www/interfaces_bridge.php @@ -106,7 +106,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"), gettext("Bridge")); +$pgtitle = array(gettext("Interfaces"), gettext("Bridges")); $shortcut_section = "interfaces"; include("head.inc"); if ($input_errors) { @@ -114,16 +114,16 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), true, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> diff --git a/src/usr/local/www/interfaces_gif.php b/src/usr/local/www/interfaces_gif.php index 5e939e6..ff12a8e 100644 --- a/src/usr/local/www/interfaces_gif.php +++ b/src/usr/local/www/interfaces_gif.php @@ -100,7 +100,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"), gettext("GIF")); +$pgtitle = array(gettext("Interfaces"), gettext("GIFs")); $shortcut_section = "interfaces"; include("head.inc"); @@ -109,16 +109,16 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), true, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), true, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> diff --git a/src/usr/local/www/interfaces_gre.php b/src/usr/local/www/interfaces_gre.php index a677a23..cfde1b7 100644 --- a/src/usr/local/www/interfaces_gre.php +++ b/src/usr/local/www/interfaces_gre.php @@ -101,7 +101,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"), gettext("GRE")); +$pgtitle = array(gettext("Interfaces"), gettext("GREs")); $shortcut_section = "interfaces"; include("head.inc"); if ($input_errors) { @@ -109,16 +109,16 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), true, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), true, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> diff --git a/src/usr/local/www/interfaces_groups.php b/src/usr/local/www/interfaces_groups.php index a4972b2..ccc78eb 100644 --- a/src/usr/local/www/interfaces_groups.php +++ b/src/usr/local/www/interfaces_groups.php @@ -85,22 +85,22 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"), gettext("Groups")); +$pgtitle = array(gettext("Interfaces"), gettext("Interface Groups")); $shortcut_section = "interfaces"; include("head.inc"); $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), true, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> diff --git a/src/usr/local/www/interfaces_groups_edit.php b/src/usr/local/www/interfaces_groups_edit.php index 3deecdc..5545f84 100644 --- a/src/usr/local/www/interfaces_groups_edit.php +++ b/src/usr/local/www/interfaces_groups_edit.php @@ -207,7 +207,7 @@ if ($input_errors) { <div id="inputerrors"></div> <?php $tab_array = array(); -$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[0] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[1] = array(gettext("Interface Groups"), true, "interfaces_groups.php"); $tab_array[2] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[3] = array(gettext("VLANs"), false, "interfaces_vlan.php"); diff --git a/src/usr/local/www/interfaces_lagg.php b/src/usr/local/www/interfaces_lagg.php index 2138cc6..40cbe84 100644 --- a/src/usr/local/www/interfaces_lagg.php +++ b/src/usr/local/www/interfaces_lagg.php @@ -107,7 +107,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"), gettext("LAGG")); +$pgtitle = array(gettext("Interfaces"), gettext("LAGGs")); $shortcut_section = "interfaces"; include("head.inc"); @@ -116,16 +116,16 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), true, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), true, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> diff --git a/src/usr/local/www/interfaces_ppps.php b/src/usr/local/www/interfaces_ppps.php index d30309c..f45ec5f 100644 --- a/src/usr/local/www/interfaces_ppps.php +++ b/src/usr/local/www/interfaces_ppps.php @@ -108,16 +108,16 @@ $shortcut_section = "interfaces"; include("head.inc"); $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), true, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> diff --git a/src/usr/local/www/interfaces_qinq.php b/src/usr/local/www/interfaces_qinq.php index 12289e9..f18c2b8 100644 --- a/src/usr/local/www/interfaces_qinq.php +++ b/src/usr/local/www/interfaces_qinq.php @@ -111,7 +111,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Interfaces"), gettext("QinQ")); +$pgtitle = array(gettext("Interfaces"), gettext("QinQs")); $shortcut_section = "interfaces"; include("head.inc"); @@ -120,16 +120,16 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), true, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/src/usr/local/www/interfaces_vlan.php b/src/usr/local/www/interfaces_vlan.php index 8c505e3..cb0b03f 100644 --- a/src/usr/local/www/interfaces_vlan.php +++ b/src/usr/local/www/interfaces_vlan.php @@ -106,23 +106,23 @@ if ($_POST['act'] == "del") { } -$pgtitle = array(gettext("Interfaces"), gettext("VLAN")); +$pgtitle = array(gettext("Interfaces"), gettext("VLANs")); $shortcut_section = "interfaces"; include('head.inc'); if ($input_errors) print_input_errors($input_errors); $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), false, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), true, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> diff --git a/src/usr/local/www/interfaces_wireless.php b/src/usr/local/www/interfaces_wireless.php index 616a762..ce7dd6d 100644 --- a/src/usr/local/www/interfaces_wireless.php +++ b/src/usr/local/www/interfaces_wireless.php @@ -111,16 +111,16 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); +$tab_array[] = array(gettext("Interface Assignments"), false, "interfaces_assign.php"); $tab_array[] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[] = array(gettext("Wireless"), true, "interfaces_wireless.php"); $tab_array[] = array(gettext("VLANs"), false, "interfaces_vlan.php"); $tab_array[] = array(gettext("QinQs"), false, "interfaces_qinq.php"); $tab_array[] = array(gettext("PPPs"), false, "interfaces_ppps.php"); -$tab_array[] = array(gettext("GRE"), false, "interfaces_gre.php"); -$tab_array[] = array(gettext("GIF"), false, "interfaces_gif.php"); +$tab_array[] = array(gettext("GREs"), false, "interfaces_gre.php"); +$tab_array[] = array(gettext("GIFs"), false, "interfaces_gif.php"); $tab_array[] = array(gettext("Bridges"), false, "interfaces_bridge.php"); -$tab_array[] = array(gettext("LAGG"), false, "interfaces_lagg.php"); +$tab_array[] = array(gettext("LAGGs"), false, "interfaces_lagg.php"); display_top_tabs($tab_array); ?> <div class="panel panel-default"> diff --git a/src/usr/local/www/load_balancer_monitor.php b/src/usr/local/www/load_balancer_monitor.php index bdcfac8..b2c1ecb 100644 --- a/src/usr/local/www/load_balancer_monitor.php +++ b/src/usr/local/www/load_balancer_monitor.php @@ -104,7 +104,7 @@ if ($_GET['act'] == "del") { } } -$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Monitor")); +$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Monitors")); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php index be02833..cdbd900 100644 --- a/src/usr/local/www/load_balancer_monitor_edit.php +++ b/src/usr/local/www/load_balancer_monitor_edit.php @@ -231,7 +231,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Monitor"), gettext("Edit")); +$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Monitors"), gettext("Edit")); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_pool.php b/src/usr/local/www/load_balancer_pool.php index 183775a..d2d2281 100644 --- a/src/usr/local/www/load_balancer_pool.php +++ b/src/usr/local/www/load_balancer_pool.php @@ -118,7 +118,7 @@ for ($i = 0; isset($config['load_balancer']['lbpool'][$i]); $i++) { $a_pool[$i]['monitor'] = "<a href=\"/load_balancer_monitor_edit.php?id={$mondex[$a_pool[$i]['monitor']]}\">" . htmlspecialchars($a_pool[$i]['monitor']) . "</a>"; } -$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Pool")); +$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Pools")); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_pool_edit.php b/src/usr/local/www/load_balancer_pool_edit.php index fa76681..c2c8730 100644 --- a/src/usr/local/www/load_balancer_pool_edit.php +++ b/src/usr/local/www/load_balancer_pool_edit.php @@ -216,7 +216,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Pool"), gettext("Edit")); +$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Pools"), gettext("Edit")); $shortcut_section = "relayd"; include("head.inc"); diff --git a/src/usr/local/www/load_balancer_virtual_server_edit.php b/src/usr/local/www/load_balancer_virtual_server_edit.php index d9b155f..adf1b6a 100644 --- a/src/usr/local/www/load_balancer_virtual_server_edit.php +++ b/src/usr/local/www/load_balancer_virtual_server_edit.php @@ -190,7 +190,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Virtual Server"), gettext("Edit")); +$pgtitle = array(gettext("Services"), gettext("Load Balancer"), gettext("Virtual Servers"), gettext("Edit")); $shortcut_section = "relayd-virtualservers"; include("head.inc"); diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php index c4d217d..e9c33e0 100644 --- a/src/usr/local/www/pkg_mgr_install.php +++ b/src/usr/local/www/pkg_mgr_install.php @@ -232,20 +232,20 @@ if ($_POST) { switch ($_GET['mode']) { case 'reinstallall': - $headline = gettext("Reinstall all packages"); + $headline = gettext("Reinstall all Packages"); + break; case 'reinstallpkg': if ($_GET['from'] && $_GET['to']) { - $headline = gettext("Upgrade package"); + $headline = gettext("Upgrade Package"); } else { - $headline = gettext("Reinstall package"); + $headline = gettext("Reinstall Package"); } - break; case 'delete': - $headline = gettext("Remove package"); + $headline = gettext("Remove Package"); break; default: - $headline = gettext("Install package"); + $headline = gettext("Install Package"); break; } } @@ -253,13 +253,12 @@ if ($_POST) { if ($_GET && $_GET['id'] == "firmware") { $firmwareupdate = true; $firmwareversion = get_system_pkg_version(); - $headline = gettext("System Update") ; } $tab_array = array(); if ($firmwareupdate || ($_POST['id'] == "firmware")) { - $pgtitle = array(gettext("System"), gettext("Update")); + $pgtitle = array(gettext("System"), gettext("Update"), gettext("System Update")); $tab_array[] = array(gettext("System Update"), true, ""); $tab_array[] = array(gettext("Update Settings"), false, "system_update_settings.php"); } else { diff --git a/src/usr/local/www/services_captiveportal.php b/src/usr/local/www/services_captiveportal.php index 68ade85..cdb5060 100644 --- a/src/usr/local/www/services_captiveportal.php +++ b/src/usr/local/www/services_captiveportal.php @@ -93,7 +93,7 @@ if (!is_array($config['captiveportal'])) { } $a_cp =& $config['captiveportal']; -$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone %s"), $a_cp[$cpzone]['zone']), gettext("Configuration")); +$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone: %s"), $a_cp[$cpzone]['zone']), gettext("Configuration")); $shortcut_section = "captiveportal"; if ($_GET['act'] == "viewhtml") { diff --git a/src/usr/local/www/services_captiveportal_filemanager.php b/src/usr/local/www/services_captiveportal_filemanager.php index 8827239..95a951b 100644 --- a/src/usr/local/www/services_captiveportal_filemanager.php +++ b/src/usr/local/www/services_captiveportal_filemanager.php @@ -96,7 +96,7 @@ if (!is_array($config['captiveportal'])) { } $a_cp =& $config['captiveportal']; -$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone %s"), $a_cp[$cpzone]['zone']), gettext("File Manager")); +$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone: %s"), $a_cp[$cpzone]['zone']), gettext("File Manager")); $shortcut_section = "captiveportal"; if (!is_array($a_cp[$cpzone]['element'])) { diff --git a/src/usr/local/www/services_captiveportal_hostname.php b/src/usr/local/www/services_captiveportal_hostname.php index 70dc3b7..8a21d12 100644 --- a/src/usr/local/www/services_captiveportal_hostname.php +++ b/src/usr/local/www/services_captiveportal_hostname.php @@ -92,7 +92,7 @@ if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid'])) { $cpzoneid = $a_cp[$cpzone]['zoneid']; } -$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone %s"), $a_cp[$cpzone]['zone']), gettext("Allowed Hostnames")); +$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone: %s"), $a_cp[$cpzone]['zone']), gettext("Allowed Hostnames")); $shortcut_section = "captiveportal"; if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) { diff --git a/src/usr/local/www/services_captiveportal_ip.php b/src/usr/local/www/services_captiveportal_ip.php index 9f90c9a..bd3b9f7 100644 --- a/src/usr/local/www/services_captiveportal_ip.php +++ b/src/usr/local/www/services_captiveportal_ip.php @@ -91,7 +91,7 @@ if (isset($cpzone) && !empty($cpzone) && isset($a_cp[$cpzone]['zoneid'])) { $cpzoneid = $a_cp[$cpzone]['zoneid']; } -$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone %s"), $a_cp[$cpzone]['zone']), gettext("Allowed IP Addresses")); +$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone: %s"), $a_cp[$cpzone]['zone']), gettext("Allowed IP Addresses")); $shortcut_section = "captiveportal"; if ($_GET['act'] == "del" && !empty($cpzone) && isset($cpzoneid)) { diff --git a/src/usr/local/www/services_captiveportal_mac.php b/src/usr/local/www/services_captiveportal_mac.php index b143190..3e1b093 100644 --- a/src/usr/local/www/services_captiveportal_mac.php +++ b/src/usr/local/www/services_captiveportal_mac.php @@ -88,7 +88,7 @@ if (!is_array($config['captiveportal'])) { } $a_cp =& $config['captiveportal']; -$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone %s"), $a_cp[$cpzone]['zone']), gettext("MAC")); +$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone: %s"), $a_cp[$cpzone]['zone']), gettext("MAC")); $shortcut_section = "captiveportal"; $actsmbl = array('pass' => '<font color="green" size="4">✔</font> ' . gettext("Pass"), diff --git a/src/usr/local/www/services_captiveportal_vouchers.php b/src/usr/local/www/services_captiveportal_vouchers.php index 392fbf4..a56faa3 100644 --- a/src/usr/local/www/services_captiveportal_vouchers.php +++ b/src/usr/local/www/services_captiveportal_vouchers.php @@ -108,7 +108,7 @@ if (empty($a_cp[$cpzone])) { exit; } -$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone %s"), $a_cp[$cpzone]['zone']), gettext("Vouchers")); +$pgtitle = array(gettext("Services"), gettext("Captive Portal"), sprintf(gettext("Zone: %s"), $a_cp[$cpzone]['zone']), gettext("Vouchers")); $shortcut_section = "captiveportal-vouchers"; if (!is_array($config['voucher'][$cpzone]['roll'])) { diff --git a/src/usr/local/www/services_dhcp_edit.php b/src/usr/local/www/services_dhcp_edit.php index dfc11fb..e5f9ab6 100644 --- a/src/usr/local/www/services_dhcp_edit.php +++ b/src/usr/local/www/services_dhcp_edit.php @@ -407,7 +407,7 @@ $ip = $_SERVER['REMOTE_ADDR']; $mymac = `/usr/sbin/arp -an | grep '('{$ip}')' | cut -d" " -f4`; $mymac = str_replace("\n", "", $mymac); -$pgtitle = array(gettext("Services"), gettext("DHCP"), gettext("Edit static mapping")); +$pgtitle = array(gettext("Services"), gettext("DHCP"), gettext("Edit Static Mapping")); $shortcut_section = "dhcp"; include("head.inc"); diff --git a/src/usr/local/www/services_dhcpv6_edit.php b/src/usr/local/www/services_dhcpv6_edit.php index c66ea60..1317937 100644 --- a/src/usr/local/www/services_dhcpv6_edit.php +++ b/src/usr/local/www/services_dhcpv6_edit.php @@ -214,7 +214,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Services"), gettext("DHCPv6"), gettext("Edit static mapping")); +$pgtitle = array(gettext("Services"), gettext("DHCPv6"), gettext("Edit Static Mapping")); $shortcut_section = "dhcp6"; include("head.inc"); diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php index e095cb2..a1e3fa6 100644 --- a/src/usr/local/www/services_dyndns.php +++ b/src/usr/local/www/services_dyndns.php @@ -97,7 +97,7 @@ if ($_GET['act'] == "del") { exit; } } -$pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Clients")); +$pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Dynamic DNS Clients")); include("head.inc"); if ($input_errors) { @@ -105,8 +105,8 @@ if ($input_errors) { } $tab_array = array(); -$tab_array[] = array(gettext("Dynamic DNS"), true, "services_dyndns.php"); -$tab_array[] = array(gettext("RFC 2136"), false, "services_rfc2136.php"); +$tab_array[] = array(gettext("Dynamic DNS Clients"), true, "services_dyndns.php"); +$tab_array[] = array(gettext("RFC 2136 Clients"), false, "services_rfc2136.php"); display_top_tabs($tab_array); ?> <form action="services_dyndns.php" method="post" name="iform" id="iform"> diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 9cdf20e..85e518c 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -270,7 +270,7 @@ function build_if_list() { return($list); } -$pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Dynamic DNS Client"), gettext("Edit")); +$pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("Dynamic DNS Clients"), gettext("Edit")); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php index 44bb1c5..f321949 100644 --- a/src/usr/local/www/services_rfc2136.php +++ b/src/usr/local/www/services_rfc2136.php @@ -93,8 +93,8 @@ $pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("RFC 2136 include("head.inc"); $tab_array = array(); -$tab_array[] = array(gettext("Dynamic DNS"), false, "services_dyndns.php"); -$tab_array[] = array(gettext("RFC 2136"), true, "services_rfc2136.php"); +$tab_array[] = array(gettext("Dynamic DNS Clients"), false, "services_dyndns.php"); +$tab_array[] = array(gettext("RFC 2136 Clients"), true, "services_rfc2136.php"); display_top_tabs($tab_array); if ($input_errors) { diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php index a529d41..08eb3df 100644 --- a/src/usr/local/www/services_rfc2136_edit.php +++ b/src/usr/local/www/services_rfc2136_edit.php @@ -179,7 +179,7 @@ function build_if_list() { return($list); } -$pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("RFC 2136 Client"), gettext("Edit")); +$pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("RFC 2136 Clients"), gettext("Edit")); include("head.inc"); if ($input_errors) { diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index 6e83dd0..40abcd0 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -263,7 +263,7 @@ function build_if_list($selectedifs) { return($iflist); } -$pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("General")); +$pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("General Settings")); $shortcut_section = "resolver"; include_once("head.inc"); @@ -281,8 +281,8 @@ if (is_subsystem_dirty('unbound')) { } $tab_array = array(); -$tab_array[] = array(gettext("General settings"), true, "services_unbound.php"); -$tab_array[] = array(gettext("Advanced settings"), false, "services_unbound_advanced.php"); +$tab_array[] = array(gettext("General Settings"), true, "services_unbound.php"); +$tab_array[] = array(gettext("Advanced Settings"), false, "services_unbound_advanced.php"); $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); display_top_tabs($tab_array, true); diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index 4702bab..09be702 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -222,8 +222,8 @@ if (is_subsystem_dirty('unbound')) { } $tab_array = array(); -$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("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); diff --git a/src/usr/local/www/services_unbound_advanced.php b/src/usr/local/www/services_unbound_advanced.php index 60c117f..f1730f1 100644 --- a/src/usr/local/www/services_unbound_advanced.php +++ b/src/usr/local/www/services_unbound_advanced.php @@ -218,7 +218,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("Advanced")); +$pgtitle = array(gettext("Services"), gettext("DNS Resolver"), gettext("Advanced Settings")); $shortcut_section = "resolver"; include_once("head.inc"); @@ -235,8 +235,8 @@ if (is_subsystem_dirty('unbound')) { } $tab_array = array(); -$tab_array[] = array(gettext("General settings"), false, "services_unbound.php"); -$tab_array[] = array(gettext("Advanced settings"), true, "services_unbound_advanced.php"); +$tab_array[] = array(gettext("General Settings"), false, "services_unbound.php"); +$tab_array[] = array(gettext("Advanced Settings"), true, "services_unbound_advanced.php"); $tab_array[] = array(gettext("Access Lists"), false, "/services_unbound_acls.php"); display_top_tabs($tab_array, true); diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 8087224..e56e630 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -326,7 +326,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), true, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall / NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index c3a3fd2..7fab70d 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -59,8 +59,8 @@ ##|+PRIV ##|*IDENT=page-system-advanced-firewall -##|*NAME=System: Advanced: Firewall and NAT -##|*DESCR=Allow access to the 'System: Advanced: Firewall and NAT' page. +##|*NAME=System: Advanced: Firewall & NAT +##|*DESCR=Allow access to the 'System: Advanced: Firewall & NAT' page. ##|*MATCH=system_advanced_firewall.php* ##|-PRIV @@ -401,7 +401,7 @@ if ($_POST) { } } -$pgtitle = array(gettext("System"), gettext("Advanced"), gettext("Firewall and NAT")); +$pgtitle = array(gettext("System"), gettext("Advanced"), gettext("Firewall & NAT")); include("head.inc"); if ($input_errors) { @@ -413,7 +413,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall / NAT"), true, "system_advanced_firewall.php"); +$tab_array[] = array(gettext("Firewall & NAT"), true, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php index f93d735..6506863 100644 --- a/src/usr/local/www/system_advanced_misc.php +++ b/src/usr/local/www/system_advanced_misc.php @@ -314,7 +314,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall / NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), true, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_network.php b/src/usr/local/www/system_advanced_network.php index 6b271e2..d6edc7d 100644 --- a/src/usr/local/www/system_advanced_network.php +++ b/src/usr/local/www/system_advanced_network.php @@ -182,7 +182,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall / NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), true, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php index 99bec31..d3c40c3 100644 --- a/src/usr/local/www/system_advanced_notifications.php +++ b/src/usr/local/www/system_advanced_notifications.php @@ -226,7 +226,7 @@ if ($savemsg) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall / NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), false, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_advanced_sysctl.php b/src/usr/local/www/system_advanced_sysctl.php index d1c38e0..a3c728f 100644 --- a/src/usr/local/www/system_advanced_sysctl.php +++ b/src/usr/local/www/system_advanced_sysctl.php @@ -180,7 +180,7 @@ if (is_subsystem_dirty('sysctl') && ($act != "edit" )) { $tab_array = array(); $tab_array[] = array(gettext("Admin Access"), false, "system_advanced_admin.php"); -$tab_array[] = array(gettext("Firewall / NAT"), false, "system_advanced_firewall.php"); +$tab_array[] = array(gettext("Firewall & NAT"), false, "system_advanced_firewall.php"); $tab_array[] = array(gettext("Networking"), false, "system_advanced_network.php"); $tab_array[] = array(gettext("Miscellaneous"), false, "system_advanced_misc.php"); $tab_array[] = array(gettext("System Tunables"), true, "system_advanced_sysctl.php"); diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 8f22868..33a3137 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -391,7 +391,7 @@ $tab_array = array(); $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php"); $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); -$tab_array[] = array(gettext("Servers"), true, "system_authservers.php"); +$tab_array[] = array(gettext("Authentication Servers"), true, "system_authservers.php"); display_top_tabs($tab_array); if (!($act == "new" || $act == "edit" || $input_errors)) { diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index 040e7f5..e8f69c9 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -67,7 +67,7 @@ require_once("vpn.inc"); global $openssl_crl_status; -$pgtitle = array(gettext("System"), gettext("Certificate Manager"), gettext("Certificate Revocation Lists")); +$pgtitle = array(gettext("System"), gettext("Certificate Manager"), gettext("Certificate Revocation")); $crl_methods = array( "internal" => gettext("Create an internal Certificate Revocation List"), diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index 4ae3170..4230f53 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -270,7 +270,7 @@ $tab_array = array(); $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); $tab_array[] = array(gettext("Groups"), true, "system_groupmanager.php"); $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); -$tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); +$tab_array[] = array(gettext("Authentication Servers"), false, "system_authservers.php"); display_top_tabs($tab_array); if (!($_GET['act'] == "new" || $_GET['act'] == "edit")) { diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php index a9daa47..69ee6c8 100644 --- a/src/usr/local/www/system_groupmanager_addprivs.php +++ b/src/usr/local/www/system_groupmanager_addprivs.php @@ -187,7 +187,7 @@ $tab_array = array(); $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); $tab_array[] = array(gettext("Groups"), true, "system_groupmanager.php"); $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); -$tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); +$tab_array[] = array(gettext("Authentication Servers"), false, "system_authservers.php"); display_top_tabs($tab_array); $form = new Form; diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 91cc4f6..94b7fe5 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -480,7 +480,7 @@ $tab_array = array(); $tab_array[] = array(gettext("Users"), true, "system_usermanager.php"); $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php"); $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); -$tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); +$tab_array[] = array(gettext("Authentication Servers"), false, "system_authservers.php"); display_top_tabs($tab_array); if (!($act == "new" || $act == "edit" || $input_errors)) { diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index 5811673..4889c91 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -172,7 +172,7 @@ $tab_array = array(); $tab_array[] = array(gettext("Users"), true, "system_usermanager.php"); $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php"); $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.php"); -$tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); +$tab_array[] = array(gettext("Authentication Servers"), false, "system_authservers.php"); display_top_tabs($tab_array); $form = new Form(); diff --git a/src/usr/local/www/system_usermanager_settings.php b/src/usr/local/www/system_usermanager_settings.php index 0d532d8..27c5855 100644 --- a/src/usr/local/www/system_usermanager_settings.php +++ b/src/usr/local/www/system_usermanager_settings.php @@ -143,7 +143,7 @@ $tab_array = array(); $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); $tab_array[] = array(gettext("Groups"), false, "system_groupmanager.php"); $tab_array[] = array(gettext("Settings"), true, "system_usermanager_settings.php"); -$tab_array[] = array(gettext("Servers"), false, "system_authservers.php"); +$tab_array[] = array(gettext("Authentication Servers"), false, "system_authservers.php"); display_top_tabs($tab_array); /* Default to pfsense backend type if none is defined */ |