diff options
56 files changed, 2928 insertions, 2151 deletions
@@ -54,7 +54,7 @@ usage() { echo "Usage $0 [options] [ iso | nanobsd | ova | nanobsd-vga | memstick | memstickserial | memstickadi | fullupdate | all ]" echo " all = iso nanobsd nanobsd-vga memstick memstickserial memstickadi fullupdate" echo " [ options ]: " - echo " --flash-size|-f size(s) - a list of flash sizes to build with nanobsd i.e. '512m 1g'. Default: 512m" + echo " --flash-size|-f size(s) - a list of flash sizes to build with nanobsd i.e. '2g 4g'. Default: 2g" echo " --no-buildworld|-c - Will set NO_BUILDWORLD NO_BUILDKERNEL to not build kernel and world" echo " --no-cleanobjdir|--no-cleanrepos|-d - Will not clean FreeBSD object built dir to allow restarting a build with NO_CLEAN" echo " --resume-image-build|-r - Includes -c -d and also will just move directly to image creation using pre-staged data" diff --git a/src/conf.default/config.xml b/src/conf.default/config.xml index 0e067e7..d09cd06 100644 --- a/src/conf.default/config.xml +++ b/src/conf.default/config.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <pfsense> - <version>14.1</version> + <version>14.2</version> <lastchange/> <system> <optimization>normal</optimization> @@ -28,7 +28,7 @@ <descr><![CDATA[System Administrator]]></descr> <scope>system</scope> <groupname>admins</groupname> - <password>$1$dSJImFph$GvZ7.1UbuWu.Yb8etC0re.</password> + <bcrypt-hash>$2b$10$13u6qwCOwODv34GyCMgdWub6oQF3RX0rG7c3d3X4JvzuEmAXLYDd2</bcrypt-hash> <uid>0</uid> <priv>user-shell-access</priv> </user> diff --git a/src/etc/inc/config.lib.inc b/src/etc/inc/config.lib.inc index 41bc2af..d61cf17 100644 --- a/src/etc/inc/config.lib.inc +++ b/src/etc/inc/config.lib.inc @@ -624,6 +624,10 @@ function write_config($desc="Unknown", $backup = true, $write_config_only = fals function reset_factory_defaults($lock = false, $reboot_required = true) { global $g; + /* Remove all additional packages */ + + mwexec("/bin/sh /usr/local/sbin/{$g['product_name']}-upgrade -r ALL_PACKAGES"); + conf_mount_rw(); if (!$lock) { $lockkey = lock('config', LOCK_EX); diff --git a/src/etc/inc/dyndns.class b/src/etc/inc/dyndns.class index af89885..17c6af3 100644 --- a/src/etc/inc/dyndns.class +++ b/src/etc/inc/dyndns.class @@ -105,6 +105,8 @@ var $_dnsUser; var $_dnsPass; var $_dnsHost; + var $_dnsDomain; + var $_FQDN; var $_dnsIP; var $_dnsWildcard; var $_dnsMX; @@ -137,7 +139,7 @@ * - $dnsUser, and $dnsPass indicate HTTP Auth for custom DNS, if they are needed in the URL (GET Variables), include them in $dnsUpdateURL. * - $For custom requests, $dnsUpdateURL is parsed for '%IP%', which is replaced with the new IP. */ - function updatedns ($dnsService = '', $dnsHost = '', $dnsUser = '', $dnsPass = '', + function updatedns ($dnsService = '', $dnsHost = '', $dnsDomain = '', $dnsUser = '', $dnsPass = '', $dnsWildcard = 'OFF', $dnsMX = '', $dnsIf = '', $dnsBackMX = '', $dnsServer = '', $dnsPort = '', $dnsUpdateURL = '', $forceUpdate = false, $dnsZoneID ='', $dnsTTL='', $dnsResultMatch = '', $dnsRequestIf = '', @@ -145,9 +147,15 @@ global $config, $g; - $this->_cacheFile = "{$g['conf_path']}/dyndns_{$dnsIf}{$dnsService}" . escapeshellarg($dnsHost) . "{$dnsID}.cache"; - $this->_cacheFile_v6 = "{$g['conf_path']}/dyndns_{$dnsIf}{$dnsService}" . escapeshellarg($dnsHost) . "{$dnsID}_v6.cache"; - $this->_debugFile = "{$g['varetc_path']}/dyndns_{$dnsIf}{$dnsService}" . escapeshellarg($dnsHost) . "{$dnsID}.debug"; + if ($dnsService == "namecheap") { + $this->_FQDN = $dnsHost . "." . $dnsDomain; + } else { + $this->_FQDN = $dnsHost; + } + + $this->_cacheFile = "{$g['conf_path']}/dyndns_{$dnsIf}{$dnsService}" . escapeshellarg($this->_FQDN) . "{$dnsID}.cache"; + $this->_cacheFile_v6 = "{$g['conf_path']}/dyndns_{$dnsIf}{$dnsService}" . escapeshellarg($this->_FQDN) . "{$dnsID}_v6.cache"; + $this->_debugFile = "{$g['varetc_path']}/dyndns_{$dnsIf}{$dnsService}" . escapeshellarg($this->_FQDN) . "{$dnsID}.debug"; $this->_curlIpresolveV4 = $curlIpresolveV4; $this->_curlSslVerifypeer = $curlSslVerifypeer; @@ -166,6 +174,7 @@ case 'namecheap': if (!$dnsPass) $this->_error(4); if (!$dnsHost) $this->_error(5); + if (!$dnsDomain) $this->_error(5); break; case 'route53': if (!$dnsZoneID) $this->_error(8); @@ -193,6 +202,7 @@ $this->_dnsUser = $dnsUser; $this->_dnsPass = $dnsPass; $this->_dnsHost = $dnsHost; + $this->_dnsDomain = $dnsDomain; $this->_dnsServer = $dnsServer; $this->_dnsPort = $dnsPort; $this->_dnsWildcard = $dnsWildcard; @@ -205,7 +215,7 @@ $this->_dnsResultMatch = $dnsResultMatch; $this->_dnsRequestIf = get_failover_interface($dnsRequestIf); if ($this->_dnsVerboseLog) { - log_error("DynDNS ({$this->_dnsHost}): running get_failover_interface for {$dnsRequestIf}. found {$this->_dnsRequestIf}"); + log_error("DynDNS ({$this->_FQDN}): running get_failover_interface for {$dnsRequestIf}. found {$this->_dnsRequestIf}"); } $this->_dnsRequestIfIP = get_interface_ip($dnsRequestIf); $this->_dnsMaxCacheAgeDays = 25; @@ -214,7 +224,7 @@ // Ensure that we were able to lookup the IP if (!is_ipaddr($this->_dnsIP)) { - log_error("DynDNS ({$this->_dnsHost}) There was an error trying to determine the public IP for interface - {$dnsIf}({$this->_if}). Probably interface is not a WAN interface."); + log_error("DynDNS ({$this->_FQDN}) There was an error trying to determine the public IP for interface - {$dnsIf}({$this->_if}). Probably interface is not a WAN interface."); unlock($dyndnslck); return; } @@ -287,7 +297,7 @@ function _update() { if ($this->_dnsVerboseLog) { - log_error("DynDNS ({$this->_dnsHost}): DynDns _update() starting."); + log_error("DynDNS ({$this->_FQDN}): DynDns _update() starting."); } if (strstr($this->_dnsRequestIf, "_vip")) { @@ -315,11 +325,11 @@ case 'glesys': $needsIP = TRUE; if ($this->_dnsVerboseLog) { - log_error("DynDNS: ({$this->_dnsHost}) DNS update() starting."); + log_error("DynDNS: ({$this->_FQDN}) DNS update() starting."); } $server = 'https://api.glesys.com/domain/updaterecord/format/json'; curl_setopt($ch, CURLOPT_USERPWD, $this->_dnsUser.':'.$this->_dnsPass); - $post_data['recordid'] = $this->_dnsHost; + $post_data['recordid'] = $this->_FQDN; $post_data['data'] = $this->_dnsIP; curl_setopt($ch, CURLOPT_URL, $server); curl_setopt($ch, CURLOPT_POSTFIELDS, $post_data); @@ -329,7 +339,7 @@ case 'dyndns-custom': $needsIP = FALSE; if ($this->_dnsVerboseLog) { - log_error("DynDNS: ({$this->_dnsHost}) DNS update() starting."); + log_error("DynDNS: ({$this->_FQDN}) DNS update() starting."); } if (isset($this->_dnsWildcard) && $this->_dnsWildcard != "OFF") { $this->_dnsWildcard = "ON"; @@ -556,15 +566,10 @@ */ $needsIP = FALSE; if ($this->_dnsVerboseLog) { - log_error("Namecheap ({$this->_dnsHost}): DNS update() starting."); + log_error("Namecheap ({$this->_FQDN}): DNS update() starting."); } - $dparts = explode(".", trim($this->_dnsHost)); - $domain_part_count = ($dparts[count($dparts)-1] == "uk") ? 3 : 2; - $domain_offset = count($dparts) - $domain_part_count; - $hostname = implode(".", array_slice($dparts, 0, $domain_offset)); - $domain = implode(".", array_slice($dparts, $domain_offset)); $dnspass = trim($this->_dnsPass); - $server = "https://dynamicdns.park-your-domain.com/update?host={$hostname}&domain={$domain}&password={$dnspass}&ip={$this->_dnsIP}"; + $server = "https://dynamicdns.park-your-domain.com/update?host={$this->_dnsHost}&domain={$this->_dnsDomain}&password={$dnspass}&ip={$this->_dnsIP}"; curl_setopt($ch, CURLOPT_URL, $server); break; case 'he-net': @@ -859,8 +864,8 @@ */ function _checkStatus($ch, $data) { if ($this->_dnsVerboseLog) { - log_error("DynDNS ({$this->_dnsHost}): DynDns _checkStatus() starting."); - log_error("DynDNS ({$this->_dnsHost}): Current Service: {$this->_dnsService}"); + log_error("DynDNS ({$this->_FQDN}): DynDns _checkStatus() starting."); + log_error("DynDNS ({$this->_FQDN}): Current Service: {$this->_dnsService}"); } $successful_update = false; if ($this->_dnsService != 'ods' and $this->_dnsService != 'route53' && @curl_error($ch)) { @@ -1517,7 +1522,7 @@ $status = "Route 53: (Error) Invalid TTL"; break; case 10: - $error = "phpDynDNS ({$this->_dnsHost}): No change in my IP address and/or " . $this->_dnsMaxCacheAgeDays . " days has not passed. Not updating dynamic DNS entry."; + $error = "phpDynDNS ({$this->_FQDN}): No change in my IP address and/or " . $this->_dnsMaxCacheAgeDays . " days has not passed. Not updating dynamic DNS entry."; break; default: $error = "phpDynDNS: (ERROR!) Unknown Response."; @@ -1539,17 +1544,17 @@ global $debug; if ($debug) { - log_error("DynDns ({$this->_dnsHost}): _detectChange() starting."); + log_error("DynDns ({$this->_FQDN}): _detectChange() starting."); } $currentTime = time(); $wan_ip = $this->_checkIP(); if ($wan_ip == 0) { - log_error("DynDns ({$this->_dnsHost}): Current WAN IP could not be determined, skipping update process."); + log_error("DynDns ({$this->_FQDN}): Current WAN IP could not be determined, skipping update process."); return false; } - $log_error = "DynDns ({$this->_dnsHost}): Current WAN IP: {$wan_ip} "; + $log_error = "DynDns ({$this->_FQDN}): Current WAN IP: {$wan_ip} "; if ($this->_useIPv6 == true) { if (file_exists($this->_cacheFile_v6)) { @@ -1614,7 +1619,7 @@ */ if ($needs_updating == true) { if ($this->_dnsVerboseLog) { - log_error("DynDns ({$this->_dnsHost}): {$update_reason}"); + log_error("DynDns ({$this->_FQDN}): {$update_reason}"); } return true; } @@ -1645,7 +1650,7 @@ global $debug; if ($debug) { - log_error("DynDns ({$this->_dnsHost}): _checkIP() starting."); + log_error("DynDns ({$this->_FQDN}): _checkIP() starting."); } if ($this->_useIPv6 == true) { @@ -1670,7 +1675,7 @@ $try++; } if ($try >= 3) { - log_error("Dyndns debug information ({$this->_dnsHost}): Could not resolve {$hosttocheck} to IP using interface IP {$ip_address}."); + log_error("Dyndns debug information ({$this->_FQDN}): Could not resolve {$hosttocheck} to IP using interface IP {$ip_address}."); return 0; } $ip_ch = curl_init("http://{$checkip}"); @@ -1689,15 +1694,15 @@ $ip_address = trim($matches[1]); if (is_ipaddr($ip_address)) { if ($this->_dnsVerboseLog) { - log_error("DynDns ({$this->_dnsHost}): {$ip_address} extracted from {$hosttocheck}"); + log_error("DynDns ({$this->_FQDN}): {$ip_address} extracted from {$hosttocheck}"); } } else { - log_error("DynDns ({$this->_dnsHost}): IP address could not be extracted from {$hosttocheck}"); + log_error("DynDns ({$this->_FQDN}): IP address could not be extracted from {$hosttocheck}"); return 0; } } else { if ($this->_dnsVerboseLog) { - log_error("DynDns ({$this->_dnsHost}): {$ip_address} extracted from local system."); + log_error("DynDns ({$this->_FQDN}): {$ip_address} extracted from local system."); } } $this->_dnsIP = $ip_address; diff --git a/src/etc/inc/easyrule.inc b/src/etc/inc/easyrule.inc index 8597e7b..3ec6e5a 100644 --- a/src/etc/inc/easyrule.inc +++ b/src/etc/inc/easyrule.inc @@ -353,7 +353,8 @@ function easyrule_pass_rule_add($int, $proto, $srchost, $dsthost, $dstport, $ipp pconfig_to_address($filterent['source'], $srchost, $srcmask); pconfig_to_address($filterent['destination'], $dsthost, $dstmask, '', $dstport, $dstport); - $filterent['created'] = make_config_revision_entry(null, gettext("Easy Rule")); + /* Do not translate this, it's considered a username which cannot contain international characters */ + $filterent['created'] = make_config_revision_entry(null, "Easy Rule"); $a_filter[] = $filterent; write_config($filterent['descr']); diff --git a/src/etc/inc/globals.inc b/src/etc/inc/globals.inc index 550245f..bcb4043 100644 --- a/src/etc/inc/globals.inc +++ b/src/etc/inc/globals.inc @@ -99,7 +99,7 @@ $g = array( "disablecrashreporter" => false, "crashreporterurl" => "https://crashreporter.pfsense.org/crash_reporter.php", "debug" => false, - "latest_config" => "14.1", + "latest_config" => "14.2", "nopkg_platforms" => array("cdrom"), "minimum_ram_warning" => "101", "minimum_ram_warning_text" => "128 MB", diff --git a/src/etc/inc/gwlb.inc b/src/etc/inc/gwlb.inc index 383d082..b568b6f 100644 --- a/src/etc/inc/gwlb.inc +++ b/src/etc/inc/gwlb.inc @@ -64,7 +64,8 @@ function return_dpinger_defaults() { "interval" => "250", "loss_interval" => "1250", "time_period" => "30000", - "alert_interval" => "1000"); + "alert_interval" => "1000", + "data_payload" => "0"); } function running_dpinger_processes() { @@ -141,6 +142,12 @@ function start_dpinger($gateway) { $params .= "-u {$socket} "; /* Status Socket */ $params .= "-C \"{$alarm_cmd}\" "; /* Command to run on alarm */ + $params .= "-d " . + (isset($gateway['data_payload']) && is_numeric($gateway['data_payload']) + ? $gateway['data_payload'] + : $dpinger_defaults['data_payload'] + ) . " "; + $params .= "-s " . (isset($gateway['interval']) && is_numeric($gateway['interval']) ? $gateway['interval'] diff --git a/src/etc/inc/priv.defs.inc b/src/etc/inc/priv.defs.inc index 06d0418..21bf0f4 100644 --- a/src/etc/inc/priv.defs.inc +++ b/src/etc/inc/priv.defs.inc @@ -43,11 +43,11 @@ $priv_list['page-diagnostics-authentication']['descr'] = gettext("Allow access t $priv_list['page-diagnostics-authentication']['match'] = array(); $priv_list['page-diagnostics-authentication']['match'][] = "diag_authentication.php*"; -$priv_list['page-diagnostics-backup/restore'] = array(); -$priv_list['page-diagnostics-backup/restore']['name'] = gettext("WebCfg - Diagnostics: Backup/restore"); -$priv_list['page-diagnostics-backup/restore']['descr'] = gettext("Allow access to the 'Diagnostics: Backup/restore' page."); -$priv_list['page-diagnostics-backup/restore']['match'] = array(); -$priv_list['page-diagnostics-backup/restore']['match'][] = "diag_backup.php*"; +$priv_list['page-diagnostics-backup-restore'] = array(); +$priv_list['page-diagnostics-backup-restore']['name'] = gettext("WebCfg - Diagnostics: Backup/restore"); +$priv_list['page-diagnostics-backup-restore']['descr'] = gettext("Allow access to the 'Diagnostics: Backup/restore' page."); +$priv_list['page-diagnostics-backup-restore']['match'] = array(); +$priv_list['page-diagnostics-backup-restore']['match'][] = "diag_backup.php*"; $priv_list['page-diagnostics-configurationhistory'] = array(); $priv_list['page-diagnostics-configurationhistory']['name'] = gettext("WebCfg - Diagnostics: Configuration History"); @@ -430,11 +430,11 @@ $priv_list['page-xmlrpcinterfacestats']['descr'] = gettext("Allow access to the $priv_list['page-xmlrpcinterfacestats']['match'] = array(); $priv_list['page-xmlrpcinterfacestats']['match'][] = "ifstats.php*"; -$priv_list['page-system-login/logout'] = array(); -$priv_list['page-system-login/logout']['name'] = gettext("WebCfg - System: Login / Logout / Dashboard"); -$priv_list['page-system-login/logout']['descr'] = gettext("Allow access to the 'System: Login / Logout' page and Dashboard."); -$priv_list['page-system-login/logout']['match'] = array(); -$priv_list['page-system-login/logout']['match'][] = "index.php*"; +$priv_list['page-system-login-logout'] = array(); +$priv_list['page-system-login-logout']['name'] = gettext("WebCfg - System: Login / Logout / Dashboard"); +$priv_list['page-system-login-logout']['descr'] = gettext("Allow access to the 'System: Login / Logout' page and Dashboard."); +$priv_list['page-system-login-logout']['match'] = array(); +$priv_list['page-system-login-logout']['match'][] = "index.php*"; $priv_list['page-interfaces'] = array(); $priv_list['page-interfaces']['name'] = gettext("WebCfg - Interfaces: WAN"); diff --git a/src/etc/inc/priv.inc b/src/etc/inc/priv.inc index b834daa..6315f72 100644 --- a/src/etc/inc/priv.inc +++ b/src/etc/inc/priv.inc @@ -338,7 +338,7 @@ function getAllowedPages($username, &$attributes = array()) { function sort_user_privs($privs) { // Privileges to place first, to redirect properly. - $priority_privs = array("page-dashboard-all", "page-system-login/logout"); + $priority_privs = array("page-dashboard-all", "page-system-login-logout"); $fprivs = array_intersect($privs, $priority_privs); $sprivs = array_diff($privs, $priority_privs); diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index ccf38b0..17e583b 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -1920,6 +1920,7 @@ function services_dyndns_configure_client($conf) { $dns = new updatedns($dnsService = $conf['type'], $dnsHost = $conf['host'], + $dnsDomain = $conf['domainname'], $dnsUser = $conf['username'], $dnsPass = $conf['password'], $dnsWildcard = $conf['wildcard'], @@ -2449,11 +2450,12 @@ function services_dnsupdate_process($int = "", $updatehost = "", $forced = false /* Dynamic DNS updating active? */ if (is_array($config['dnsupdates']['dnsupdate'])) { $notify_text = ""; + $gwgroups = return_gateway_groups_array(); foreach ($config['dnsupdates']['dnsupdate'] as $i => $dnsupdate) { if (!isset($dnsupdate['enable'])) { continue; } - if (!empty($int) && $int != $dnsupdate['interface']) { + if (!empty($int) && ($int != $dnsupdate['interface']) && (!is_array($gwgroups[$dnsupdate['interface']]))) { continue; } if (!empty($updatehost) && ($updatehost != $dnsupdate['host'])) { @@ -2461,15 +2463,15 @@ function services_dnsupdate_process($int = "", $updatehost = "", $forced = false } /* determine interface name */ - $if = get_real_interface($dnsupdate['interface']); + $if = get_failover_interface($dnsupdate['interface']); if (isset($dnsupdate['usepublicip'])) { - $wanip = dyndnsCheckIP($dnsupdate['interface']); + $wanip = dyndnsCheckIP($if); } else { - $wanip = get_interface_ip($dnsupdate['interface']); + $wanip = get_interface_ip($if); } - $wanipv6 = get_interface_ipv6($dnsupdate['interface']); + $wanipv6 = get_interface_ipv6($if); $cacheFile = "{$g['conf_path']}/dyndns_{$dnsupdate['interface']}_rfc2136_" . escapeshellarg($dnsupdate['host']) . "_{$dnsupdate['server']}.cache"; $currentTime = time(); diff --git a/src/etc/inc/shaper.inc b/src/etc/inc/shaper.inc index bedebed..2f9eadc 100644 --- a/src/etc/inc/shaper.inc +++ b/src/etc/inc/shaper.inc @@ -3134,22 +3134,21 @@ class fairq_queue extends priq_queue { $section->add($group); + $section->addInput(new Form_Input( + 'buckets', + 'Scheduler specific options', + 'text', + $this->GetBuckets() + ))->setHelp('Number of buckets available'); - $form .= "<tr><td class=\"vncellreq\">" . gettext("Scheduler specific options") . "</td>"; - $form .= "<td class=\"vtable\"><table><tr><td>"; - $form .= "<input id=\"buckets\" name=\"buckets\" value=\""; - $tmpvalue = trim($this->GetBuckets()); - if (!empty($tmpvalue)) { - $form .= $this->GetBuckets(); - } - $form .= "\" /> " . gettext("Number of buckets available.") . "<br /></td></tr>"; - $form .= "<tr><td class=\"vtable\"><input id=\"hogs\" name=\"hogs\" value=\""; - $tmpvalue = trim($this->GetHogs()); - if (!empty($tmpvalue)) { - $form .= $this->GetHogs(); - } - $form .= "\" /> " . gettext("Bandwidth limit for hosts to not saturate link.") . "<br /></td></tr>"; - $form .= "</table></td></tr>"; + $section->addInput(new Form_Input( + 'hogs', + '', + 'text', + $this->GetHogs() + ))->setHelp('Bandwidth limit for hosts to not saturate link'); + + $form->add($section); return $form; } @@ -3820,7 +3819,7 @@ EOD; $form .= '<td class="col-xs-4">'; $form .= "<select id=\"bwtype{$bwidx}\" name=\"bwtype{$bwidx}\" class=\"form-control\">"; - foreach (array("Kb" => "Kbit/s", "Mb" => "Mbit/s", "Gb" => "Gbit/s", "b" => "Bit/s") as $bwsidx => $bwscale) { + foreach (array("Kb" => "Kbit/s", "Mb" => "Mbit/s", "b" => "Bit/s") as $bwsidx => $bwscale) { $form .= "<option value=\"{$bwsidx}\""; if ($bw['bwscale'] == $bwsidx) { diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc index 4806407..fbcb230 100644 --- a/src/etc/inc/system.inc +++ b/src/etc/inc/system.inc @@ -1344,6 +1344,7 @@ EOD; fastcgi_pass unix:{$g['varrun_path']}/php-fpm.socket; fastcgi_index index.php; fastcgi_param SCRIPT_FILENAME \$document_root\$fastcgi_script_name; + fastcgi_read_timeout 180; include /usr/local/etc/nginx/fastcgi_params; } } @@ -2090,6 +2091,7 @@ function system_check_reset_button() { *********************************************************************** * Reset button pressed - resetting configuration to factory defaults. * +* All additional packages installed will be removed * * The system will reboot after this completes. * *********************************************************************** diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index d64a3c9..0848d0e 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4377,4 +4377,37 @@ function upgrade_140_to_141() { } +function upgrade_141_to_142() { + global $config; + /* Convert Namecheap type DynDNS entries to the new split hostname and domain format */ + + if (!is_array($config['dyndnses'])) { + $config['dyndnses'] = array(); + } + if (!is_array($config['dyndnses']['dyndns'])) { + $config['dyndnses']['dyndns'] = array(); + } + $a_dyndns = &$config['dyndnses']['dyndns']; + + foreach ($a_dyndns as &$dyndns) { + if ($dyndns['type'] == "namecheap") { + /* Use the old style logic to split the host and domain one last time. */ + $dparts = explode(".", trim($dyndns['host'])); + $domain_part_count = ($dparts[count($dparts)-1] == "uk") ? 3 : 2; + $domain_offset = count($dparts) - $domain_part_count; + $dyndns['host'] = implode(".", array_slice($dparts, 0, $domain_offset)); + $dyndns['domainname'] = implode(".", array_slice($dparts, $domain_offset)); + } + } + + /* unset old pppoerestart cron job if it exists. redmine 1905 */ + if (is_array($config['cron']['item'])) { + foreach ($config['cron']['item'] as $idx => $cronitem) { + if ($cronitem['command'] == "/etc/pppoerestart") { + unset($config['cron']['item'][$idx]); + } + } + } +} + ?> diff --git a/src/etc/inc/vpn.inc b/src/etc/inc/vpn.inc index 97eea23..c79a761 100644 --- a/src/etc/inc/vpn.inc +++ b/src/etc/inc/vpn.inc @@ -1708,6 +1708,9 @@ EOD; EOD; } + if (isset($pppoecfg['radius']['nasip'])) { + $mpdconf .= "\tset radius me {$pppoecfg['radius']['nasip']}\n"; + } } fwrite($fd, $mpdconf); diff --git a/src/etc/inc/xmlrpc_client.inc b/src/etc/inc/xmlrpc_client.inc index 216be9f..b9f5ae9 100644 --- a/src/etc/inc/xmlrpc_client.inc +++ b/src/etc/inc/xmlrpc_client.inc @@ -932,7 +932,7 @@ class XML_RPC_Client extends XML_RPC_Base { $ctx = stream_context_create($ctx_options); - $fp = stream_socket_client("{$this->protocol}{$server}:{$port}", + $fp = @stream_socket_client("{$this->protocol}{$server}:{$port}", $this->errno, $this->errstr, ($timeout > 0 ? $timeout : ini_get("default_socket_timeout")), STREAM_CLIENT_CONNECT, $ctx); diff --git a/src/etc/rc.initial.defaults b/src/etc/rc.initial.defaults index c80a18d..3020cc2 100755 --- a/src/etc/rc.initial.defaults +++ b/src/etc/rc.initial.defaults @@ -38,6 +38,7 @@ echo "\n" . gettext("You are about to reset the firewall to factory defaults."); echo "\n" . gettext("The firewall will reboot after resetting the configuration."); + echo "\n" . gettext("All additional packages installed will be removed."); echo "\n" . gettext("Do you want to proceed [y|n]?") . " "; if (strcasecmp(chop(fgets($fp)), "y") == 0) { diff --git a/src/usr/local/sbin/pfSense-upgrade b/src/usr/local/sbin/pfSense-upgrade index 65a0e04..11f970d 100755 --- a/src/usr/local/sbin/pfSense-upgrade +++ b/src/usr/local/sbin/pfSense-upgrade @@ -176,8 +176,9 @@ pkg_with_pb() { fi pkg ${_event_pipe} $@ + local _pkg_result=$? nc_pid="" - return $? + return ${_pkg_result} } fetch_upgrade_packages() { @@ -618,10 +619,21 @@ pkg_install() { local _msg="Installing" fi - _exec "pkg_with_pb ${_cmd} ${_pkg_name}" "${_msg} ${_pkg_name}" + _exec "pkg_with_pb ${_cmd}${dry_run:+ }${dry_run} ${_pkg_name}" "${_msg} ${_pkg_name}" _exec "pkg clean" "Cleaning up cache" mute ignore_result } +# Reinstall every pfSense-pkg-* package +pkg_reinstall_all() { + for _pkg in $(pkg query -e '%a == 0' %n); do + case ${_pkg} in "${pkg_prefix}"* ) + _echo "Reinstalling ${_pkg}" + pkg_install ${_pkg} 1 + ;; + esac + done +} + pkg_delete() { local _pkg_name="${1}" @@ -635,16 +647,16 @@ pkg_delete() { _exit 1 fi - _exec "pkg_with_pb delete ${_pkg_name}" "Removing ${_pkg_name}" + _exec "pkg_with_pb delete${dry_run:+ }${dry_run} ${_pkg_name}" "Removing ${_pkg_name}" _exec "pkg autoremove" "Removing stale packages" mute ignore_result } -# Reinstall every pfSense-pkg-* package -pkg_reinstall_all() { +# Delete every pfSense-pkg-* package +pkg_delete_all() { for _pkg in $(pkg query -e '%a == 0' %n); do case ${_pkg} in "${pkg_prefix}"* ) - _echo "Reinstalling ${_pkg}" - pkg_install ${_pkg} 1 + _echo "Removing ${_pkg}" + pkg_delete ${_pkg} ;; esac done @@ -762,7 +774,7 @@ while getopts 46b:cdfi:hp:l:nr:Ruy opt; do fi ;; n) - dry_run=1 + dry_run="-n" ;; p) progress_socket="${OPTARG}" @@ -817,6 +829,10 @@ if [ -z "${booting}" -o "${boot_stage}" != "2" ]; then /etc/rc.conf_mount_rw fi +if [ -n "${booting}" ]; then + export REPO_AUTOUPDATE=false +fi + echo $$ > ${pid_file} trap _exit 1 2 15 EXIT @@ -849,7 +865,11 @@ case "${action}" in fi ;; delete) - pkg_delete ${action_pkg} + if [ ${action_pkg} == "ALL_PACKAGES" ] && [ -n ${force} ]; then + pkg_delete_all + else + pkg_delete ${action_pkg} + fi ;; *) _echo "ERROR: Invalid action!" diff --git a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot index d8df291..573e449 100644 --- a/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot +++ b/src/usr/local/share/locale/en/LC_MESSAGES/pfSense.pot @@ -5,14 +5,14 @@ # #: src/usr/local/www/diag_traceroute.php:194 #: src/usr/local/www/diag_traceroute.php:201 -#: src/usr/local/www/interfaces.php:3114 src/usr/local/www/interfaces.php:3124 +#: src/usr/local/www/interfaces.php:3118 src/usr/local/www/interfaces.php:3128 #: src/usr/local/www/vpn_ipsec_settings.php:285 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-26 16:04-0200\n" +"POT-Creation-Date: 2016-02-02 17:55-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -196,7 +196,7 @@ msgid "This device is currently being maintained by: %s." msgstr "" #: src/etc/inc/authgui.inc:245 -#: src/usr/local/www/services_captiveportal.php:1028 +#: src/usr/local/www/services_captiveportal.php:1039 msgid "Login" msgstr "" @@ -211,7 +211,7 @@ msgstr "" msgid "Your browser must support cookies to login." msgstr "" -#: src/etc/inc/captiveportal.inc:1558 +#: src/etc/inc/captiveportal.inc:1571 #, php-format msgid "Error: cannot open '%s' in captiveportal_write_elements()%s" msgstr "" @@ -491,43 +491,43 @@ msgstr "" msgid "Unable to open %s/config.xml for writing in write_config()%s" msgstr "" -#: src/etc/inc/config.lib.inc:689 +#: src/etc/inc/config.lib.inc:693 msgid "Reverted to" msgstr "" -#: src/etc/inc/config.lib.inc:706 +#: src/etc/inc/config.lib.inc:710 msgid "Installing configuration..." msgstr "" -#: src/etc/inc/config.lib.inc:708 +#: src/etc/inc/config.lib.inc:712 msgid "Installing configuration ...." msgstr "" -#: src/etc/inc/config.lib.inc:761 +#: src/etc/inc/config.lib.inc:765 msgid "XML error: unable to open file" msgstr "" -#: src/etc/inc/config.lib.inc:767 +#: src/etc/inc/config.lib.inc:771 #, php-format msgid "%1$s at line %2$d" msgstr "" -#: src/etc/inc/config.lib.inc:821 src/etc/inc/config.lib.inc:823 +#: src/etc/inc/config.lib.inc:825 src/etc/inc/config.lib.inc:827 #, php-format msgid "The backup cache file %s is corrupted. Unlinking." msgstr "" -#: src/etc/inc/config.lib.inc:980 +#: src/etc/inc/config.lib.inc:984 #, php-format msgid "%s made unknown change" msgstr "" -#: src/etc/inc/dyndns.class:1467 +#: src/etc/inc/dyndns.class:1472 #, php-format msgid "DynDNS updated IP Address on %s (%s) to %s" msgstr "" -#: src/etc/inc/dyndns.class:1475 +#: src/etc/inc/dyndns.class:1480 #, php-format msgid "DynDNS updated IPv6 Address on %s (%s) to %s" msgstr "" @@ -536,112 +536,108 @@ msgstr "" msgid "Easy Rule: Blocked from Firewall Log View" msgstr "" -#: src/etc/inc/easyrule.inc:145 src/etc/inc/easyrule.inc:355 -msgid "Easy Rule" -msgstr "" - -#: src/etc/inc/easyrule.inc:223 src/etc/inc/easyrule.inc:235 +#: src/etc/inc/easyrule.inc:224 src/etc/inc/easyrule.inc:236 msgid "Entry added" msgstr "" -#: src/etc/inc/easyrule.inc:232 +#: src/etc/inc/easyrule.inc:233 msgid "Hosts blocked from Firewall Log view" msgstr "" -#: src/etc/inc/easyrule.inc:314 +#: src/etc/inc/easyrule.inc:315 msgid "Easy Rule: Passed from Firewall Log View" msgstr "" -#: src/etc/inc/easyrule.inc:372 +#: src/etc/inc/easyrule.inc:374 msgid "Tried to block invalid IP:" msgstr "" -#: src/etc/inc/easyrule.inc:376 src/etc/inc/easyrule.inc:399 -#: src/etc/inc/easyrule.inc:456 +#: src/etc/inc/easyrule.inc:378 src/etc/inc/easyrule.inc:401 +#: src/etc/inc/easyrule.inc:458 msgid "Invalid interface for block rule:" msgstr "" -#: src/etc/inc/easyrule.inc:379 +#: src/etc/inc/easyrule.inc:381 msgid "Host added successfully" msgstr "" -#: src/etc/inc/easyrule.inc:381 +#: src/etc/inc/easyrule.inc:383 msgid "Failed to create block rule, alias, or add host." msgstr "" -#: src/etc/inc/easyrule.inc:384 +#: src/etc/inc/easyrule.inc:386 msgid "Tried to block but had no host IP or interface" msgstr "" -#: src/etc/inc/easyrule.inc:386 +#: src/etc/inc/easyrule.inc:388 msgid "Unknown block error." msgstr "" -#: src/etc/inc/easyrule.inc:395 +#: src/etc/inc/easyrule.inc:397 msgid "Tried to unblock invalid IP:" msgstr "" -#: src/etc/inc/easyrule.inc:405 src/etc/inc/easyrule.inc:463 +#: src/etc/inc/easyrule.inc:407 src/etc/inc/easyrule.inc:465 msgid "No block rules set on interface:" msgstr "" -#: src/etc/inc/easyrule.inc:440 +#: src/etc/inc/easyrule.inc:442 msgid "Host unblocked successfully" msgstr "" -#: src/etc/inc/easyrule.inc:443 +#: src/etc/inc/easyrule.inc:445 msgid "Host ist not on block list: " msgstr "" -#: src/etc/inc/easyrule.inc:447 +#: src/etc/inc/easyrule.inc:449 msgid "Tried to unblock but had no host IP or interface" msgstr "" -#: src/etc/inc/easyrule.inc:478 +#: src/etc/inc/easyrule.inc:480 msgid "Invalid interface for pass rule:" msgstr "" -#: src/etc/inc/easyrule.inc:481 +#: src/etc/inc/easyrule.inc:483 msgid "Invalid protocol for pass rule:" msgstr "" -#: src/etc/inc/easyrule.inc:484 +#: src/etc/inc/easyrule.inc:486 msgid "Tried to pass invalid source IP:" msgstr "" -#: src/etc/inc/easyrule.inc:487 +#: src/etc/inc/easyrule.inc:489 msgid "Tried to pass invalid destination IP:" msgstr "" -#: src/etc/inc/easyrule.inc:491 +#: src/etc/inc/easyrule.inc:493 msgid "Missing destination port:" msgstr "" -#: src/etc/inc/easyrule.inc:494 +#: src/etc/inc/easyrule.inc:496 msgid "Tried to pass invalid destination port:" msgstr "" -#: src/etc/inc/easyrule.inc:501 +#: src/etc/inc/easyrule.inc:503 msgid "Successfully added pass rule!" msgstr "" -#: src/etc/inc/easyrule.inc:503 +#: src/etc/inc/easyrule.inc:505 msgid "Failed to add pass rule." msgstr "" -#: src/etc/inc/easyrule.inc:506 +#: src/etc/inc/easyrule.inc:508 msgid "Missing parameters for pass rule." msgstr "" -#: src/etc/inc/easyrule.inc:508 +#: src/etc/inc/easyrule.inc:510 msgid "Unknown pass error." msgstr "" #: src/etc/inc/filter.inc:80 src/etc/inc/filter.inc:110 -#: src/usr/local/www/firewall_rules_edit.php:1162 -#: src/usr/local/www/firewall_rules_edit.php:1204 -#: src/usr/local/www/firewall_rules_edit.php:1255 -#: src/usr/local/www/firewall_rules_edit.php:1305 +#: src/usr/local/www/firewall_rules_edit.php:1174 +#: src/usr/local/www/firewall_rules_edit.php:1216 +#: src/usr/local/www/firewall_rules_edit.php:1267 +#: src/usr/local/www/firewall_rules_edit.php:1317 msgid "any" msgstr "" @@ -662,7 +658,7 @@ msgid "Source quench" msgstr "" #: src/etc/inc/filter.inc:85 src/etc/inc/filter.inc:127 -#: src/usr/local/www/services_unbound.php:314 +#: src/etc/inc/unbound.inc:805 msgid "Redirect" msgstr "" @@ -712,7 +708,7 @@ msgstr "" #: src/etc/inc/filter.inc:97 src/usr/local/www/diag_dns.php:294 #: src/usr/local/www/diag_traceroute.php:70 -#: src/usr/local/www/diag_traceroute.php:160 src/usr/local/www/head.inc:348 +#: src/usr/local/www/diag_traceroute.php:160 src/usr/local/www/head.inc:356 msgid "Traceroute" msgstr "" @@ -824,48 +820,48 @@ msgstr "" msgid "mtrace messages" msgstr "" -#: src/etc/inc/filter.inc:256 +#: src/etc/inc/filter.inc:267 msgid "Initializing" msgstr "" -#: src/etc/inc/filter.inc:268 +#: src/etc/inc/filter.inc:279 msgid "Configuring firewall" msgstr "" -#: src/etc/inc/filter.inc:275 +#: src/etc/inc/filter.inc:286 msgid "Creating aliases" msgstr "" -#: src/etc/inc/filter.inc:281 +#: src/etc/inc/filter.inc:292 msgid "Generating Limiter rules" msgstr "" -#: src/etc/inc/filter.inc:284 +#: src/etc/inc/filter.inc:295 msgid "Generating NAT rules" msgstr "" -#: src/etc/inc/filter.inc:290 +#: src/etc/inc/filter.inc:301 msgid "Generating filter rules" msgstr "" -#: src/etc/inc/filter.inc:297 +#: src/etc/inc/filter.inc:308 msgid "Generating ALTQ queues" msgstr "" -#: src/etc/inc/filter.inc:302 +#: src/etc/inc/filter.inc:313 msgid "Loading filter rules" msgstr "" -#: src/etc/inc/filter.inc:309 +#: src/etc/inc/filter.inc:320 msgid "Filter is disabled. Not loading rules." msgstr "" -#: src/etc/inc/filter.inc:311 src/etc/inc/filter.inc:563 +#: src/etc/inc/filter.inc:322 src/etc/inc/filter.inc:574 #: src/etc/inc/interfaces.inc:207 src/etc/inc/interfaces.inc:231 #: src/etc/inc/interfaces.inc:369 src/etc/inc/interfaces.inc:431 #: src/etc/inc/interfaces.inc:714 src/etc/inc/interfaces.inc:1065 #: src/etc/inc/interfaces.inc:1096 src/etc/inc/interfaces.inc:1120 -#: src/etc/inc/interfaces.inc:1141 src/etc/inc/interfaces.inc:2134 +#: src/etc/inc/interfaces.inc:1141 src/etc/inc/interfaces.inc:2164 #: src/etc/inc/pkg-utils.inc:514 src/etc/inc/pkg-utils.inc:663 #: src/etc/inc/pkg-utils.inc:687 src/etc/inc/pkg-utils.inc:723 #: src/etc/inc/pkg-utils.inc:728 src/etc/inc/pkg-utils.inc:733 @@ -873,199 +869,199 @@ msgstr "" #: src/etc/inc/pkg-utils.inc:790 src/etc/inc/pkg-utils.inc:833 #: src/etc/inc/pkg-utils.inc:859 src/etc/inc/pkg-utils.inc:902 #: src/etc/inc/pkg-utils.inc:921 src/etc/inc/rrd.inc:1052 -#: src/etc/inc/services.inc:1577 src/etc/inc/services.inc:1957 -#: src/etc/inc/services.inc:2173 src/etc/inc/services.inc:2215 -#: src/etc/inc/services.inc:2424 src/etc/inc/system.inc:1076 -#: src/etc/inc/system.inc:1174 src/etc/inc/system.inc:1462 -#: src/etc/inc/system.inc:1847 src/etc/inc/system.inc:1998 +#: src/etc/inc/services.inc:1588 src/etc/inc/services.inc:1969 +#: src/etc/inc/services.inc:2185 src/etc/inc/services.inc:2227 +#: src/etc/inc/services.inc:2436 src/etc/inc/system.inc:1077 +#: src/etc/inc/system.inc:1175 src/etc/inc/system.inc:1464 +#: src/etc/inc/system.inc:1849 src/etc/inc/system.inc:2000 msgid "done." msgstr "" -#: src/etc/inc/filter.inc:407 +#: src/etc/inc/filter.inc:418 msgid "Setting up logging information" msgstr "" -#: src/etc/inc/filter.inc:412 +#: src/etc/inc/filter.inc:423 msgid "Setting up SCRUB information" msgstr "" -#: src/etc/inc/filter.inc:458 +#: src/etc/inc/filter.inc:469 #, php-format msgid "The line in question reads [%1$d]: %2$s" msgstr "" -#: src/etc/inc/filter.inc:465 +#: src/etc/inc/filter.inc:476 msgid "PF was wedged/busy and has been reset." msgstr "" -#: src/etc/inc/filter.inc:471 src/etc/inc/filter.inc:472 +#: src/etc/inc/filter.inc:482 src/etc/inc/filter.inc:483 #, php-format msgid "There were error(s) loading the rules: %1$s - %2$s" msgstr "" -#: src/etc/inc/filter.inc:548 +#: src/etc/inc/filter.inc:559 msgid "Processing down interface states" msgstr "" -#: src/etc/inc/filter.inc:552 +#: src/etc/inc/filter.inc:563 msgid "Running plugins" msgstr "" -#: src/etc/inc/filter.inc:556 +#: src/etc/inc/filter.inc:567 msgid "Running plugins (pf)" msgstr "" -#: src/etc/inc/filter.inc:558 +#: src/etc/inc/filter.inc:569 msgid "Plugins completed." msgstr "" -#: src/etc/inc/filter.inc:561 src/usr/local/www/restart_httpd.php:75 +#: src/etc/inc/filter.inc:572 src/usr/local/www/restart_httpd.php:75 #: src/usr/local/www/restart_httpd.php:78 #: src/usr/local/www/restart_httpd.php:81 #: src/usr/local/www/restart_httpd.php:84 msgid "Done" msgstr "" -#: src/etc/inc/filter.inc:866 +#: src/etc/inc/filter.inc:877 msgid "Creating gateway group item..." msgstr "" -#: src/etc/inc/filter.inc:904 +#: src/etc/inc/filter.inc:915 #, php-format msgid "Setting up route with %1$s on %2$s" msgstr "" -#: src/etc/inc/filter.inc:913 +#: src/etc/inc/filter.inc:924 #, php-format msgid "" "An error occurred while trying to find the interface got %s . The rule has " "not been added." msgstr "" -#: src/etc/inc/filter.inc:1264 +#: src/etc/inc/filter.inc:1275 #, php-format msgid "Creating reflection NAT rule for %s..." msgstr "" -#: src/etc/inc/filter.inc:1362 +#: src/etc/inc/filter.inc:1373 #, php-format msgid "Creating reflection rule for %s..." msgstr "" -#: src/etc/inc/filter.inc:1570 +#: src/etc/inc/filter.inc:1581 msgid "localhost" msgstr "" -#: src/etc/inc/filter.inc:1578 +#: src/etc/inc/filter.inc:1589 msgid "static route" msgstr "" -#: src/etc/inc/filter.inc:1590 +#: src/etc/inc/filter.inc:1601 msgid "DHCP alias address" msgstr "" -#: src/etc/inc/filter.inc:1624 +#: src/etc/inc/filter.inc:1635 msgid "PPPoE server" msgstr "" -#: src/etc/inc/filter.inc:1635 +#: src/etc/inc/filter.inc:1646 msgid "L2TP server" msgstr "" -#: src/etc/inc/filter.inc:1644 +#: src/etc/inc/filter.inc:1655 msgid "OpenVPN server" msgstr "" -#: src/etc/inc/filter.inc:1653 +#: src/etc/inc/filter.inc:1664 msgid "OpenVPN client" msgstr "" -#: src/etc/inc/filter.inc:1663 +#: src/etc/inc/filter.inc:1674 msgid "IPsec client" msgstr "" -#: src/etc/inc/filter.inc:1699 +#: src/etc/inc/filter.inc:1710 msgid "Auto created rule for ISAKMP" msgstr "" -#: src/etc/inc/filter.inc:1709 +#: src/etc/inc/filter.inc:1720 msgid "Auto created rule" msgstr "" -#: src/etc/inc/filter.inc:1842 +#: src/etc/inc/filter.inc:1853 msgid "Creating 1:1 rules..." msgstr "" -#: src/etc/inc/filter.inc:2028 +#: src/etc/inc/filter.inc:2039 #, php-format msgid "Creating advanced outbound rule %s" msgstr "" -#: src/etc/inc/filter.inc:2070 +#: src/etc/inc/filter.inc:2081 msgid "Creating outbound NAT rules" msgstr "" -#: src/etc/inc/filter.inc:2077 +#: src/etc/inc/filter.inc:2088 msgid "Creating automatic outbound rules" msgstr "" -#: src/etc/inc/filter.inc:2107 +#: src/etc/inc/filter.inc:2118 msgid "Setting up TFTP helper" msgstr "" -#: src/etc/inc/filter.inc:2149 +#: src/etc/inc/filter.inc:2160 #, php-format msgid "Creating NAT rule %s" msgstr "" -#: src/etc/inc/filter.inc:2377 +#: src/etc/inc/filter.inc:2388 #, php-format msgid "Creating filter rule %s ..." msgstr "" -#: src/etc/inc/filter.inc:2724 +#: src/etc/inc/filter.inc:2735 #, php-format msgid "Setting up pass/block rules %s" msgstr "" -#: src/etc/inc/filter.inc:2767 +#: src/etc/inc/filter.inc:2778 #, php-format msgid "Creating rule %s" msgstr "" -#: src/etc/inc/filter.inc:3060 +#: src/etc/inc/filter.inc:3067 msgid "Creating default rules" msgstr "" -#: src/etc/inc/filter.inc:3709 +#: src/etc/inc/filter.inc:3719 msgid "Creating IPsec rules..." msgstr "" -#: src/etc/inc/filter.inc:3762 +#: src/etc/inc/filter.inc:3772 msgid "" "Please use filter_tdr_install_cron() function tdr_install_cron will be " "deprecated!" msgstr "" -#: src/etc/inc/filter.inc:3811 +#: src/etc/inc/filter.inc:3821 msgid "Installed 15 minute filter reload for Time Based Rules" msgstr "" -#: src/etc/inc/filter.inc:3818 +#: src/etc/inc/filter.inc:3828 msgid "Removed 15 minute filter reload for Time Based Rules" msgstr "" -#: src/etc/inc/filter.inc:4165 +#: src/etc/inc/filter.inc:4184 #, php-format msgid "Checking for %1$s PF hooks in package %2$s" msgstr "" -#: src/etc/inc/filter.inc:4172 +#: src/etc/inc/filter.inc:4191 #, php-format msgid "Processing early %1$s rules for package %2$s" msgstr "" -#: src/etc/inc/filter.inc:4177 +#: src/etc/inc/filter.inc:4196 #, php-format msgid "There was an error while parsing the package filter rules for %s." msgstr "" @@ -1240,85 +1236,85 @@ msgstr "" msgid "Error: cannot open mpd_%s.conf in interface_ppps_configure().%s" msgstr "" -#: src/etc/inc/interfaces.inc:2073 +#: src/etc/inc/interfaces.inc:2103 msgid "Configuring CARP settings..." msgstr "" -#: src/etc/inc/interfaces.inc:2353 +#: src/etc/inc/interfaces.inc:2383 #, php-format msgid "" "Interface specified for the virtual IP address %s does not exist. Skipping " "this VIP." msgstr "" -#: src/etc/inc/interfaces.inc:2413 +#: src/etc/inc/interfaces.inc:2443 #, php-format msgid "Interface %s changed to hostap mode" msgstr "" -#: src/etc/inc/interfaces.inc:2417 +#: src/etc/inc/interfaces.inc:2447 #, php-format msgid "Interface %s changed to adhoc mode" msgstr "" -#: src/etc/inc/interfaces.inc:2421 +#: src/etc/inc/interfaces.inc:2451 #, php-format msgid "Interface %s changed to infrastructure mode" msgstr "" -#: src/etc/inc/interfaces.inc:2434 +#: src/etc/inc/interfaces.inc:2464 #, php-format msgid "Cloning new wireless interface %s" msgstr "" -#: src/etc/inc/interfaces.inc:2439 +#: src/etc/inc/interfaces.inc:2469 #, php-format msgid "Failed to clone interface %1$s with error code %2$s, output %3$s" msgstr "" -#: src/etc/inc/interfaces.inc:3234 +#: src/etc/inc/interfaces.inc:3264 msgid "Generating new MAC address." msgstr "" -#: src/etc/inc/interfaces.inc:3240 +#: src/etc/inc/interfaces.inc:3270 #, php-format msgid "" "The INVALID MAC address (ff:ff:ff:ff:ff:ff) on interface %1$s has been " "automatically replaced with %2$s" msgstr "" -#: src/etc/inc/interfaces.inc:4198 +#: src/etc/inc/interfaces.inc:4232 #, php-format msgid "" "Error: cannot open dhclient_%s.conf in interface_dhcp_configure() for " "writing.%s" msgstr "" -#: src/etc/inc/interfaces.inc:4211 +#: src/etc/inc/interfaces.inc:4245 #, php-format msgid "Invalid interface \"%s\" in interface_dhcp_configure()" msgstr "" -#: src/etc/inc/interfaces.inc:4267 +#: src/etc/inc/interfaces.inc:4301 #, php-format msgid "Could not bring up %s interface in interface_dhcp_configure()" msgstr "" -#: src/etc/inc/interfaces.inc:5419 src/etc/inc/service-utils.inc:390 +#: src/etc/inc/interfaces.inc:5453 src/etc/inc/service-utils.inc:390 #: src/usr/local/www/diag_backup.php:567 #: src/usr/local/www/diag_packet_capture.php:143 #: src/usr/local/www/firewall_nat_1to1_edit.php:441 -#: src/usr/local/www/firewall_nat_edit.php:699 +#: src/usr/local/www/firewall_nat_edit.php:712 #: src/usr/local/www/firewall_nat_npt_edit.php:206 -#: src/usr/local/www/firewall_rules.php:142 -#: src/usr/local/www/firewall_rules_edit.php:1010 -#: src/usr/local/www/head.inc:271 src/usr/local/www/head.inc:289 +#: src/usr/local/www/firewall_rules.php:187 +#: src/usr/local/www/firewall_rules_edit.php:1022 +#: src/usr/local/www/head.inc:279 src/usr/local/www/head.inc:297 #: src/usr/local/www/license.php:171 src/usr/local/www/status_graph.php:94 #: src/usr/local/www/status_logs.php:86 #: src/usr/local/www/status_logs_common.inc:118 #: src/usr/local/www/status_logs_settings.php:241 #: src/usr/local/www/status_openvpn.php:64 -#: src/usr/local/www/vpn_openvpn_client.php:68 +#: src/usr/local/www/vpn_openvpn_client.php:70 #: src/usr/local/www/vpn_openvpn_csc.php:70 #: src/usr/local/www/vpn_openvpn_server.php:592 #: src/usr/local/www/widgets/include/openvpn.inc:2 @@ -1336,7 +1332,7 @@ msgstr "" #: src/usr/local/www/services_unbound_domainoverride_edit.php:96 #: src/usr/local/www/services_unbound_host_edit.php:111 #: src/usr/local/www/status_captiveportal.php:176 -#: src/usr/local/www/status_dhcp_leases.php:370 +#: src/usr/local/www/status_dhcp_leases.php:379 #: src/usr/local/www/system_advanced_network.php:214 #: src/usr/local/www/system_certmanager.php:812 #: src/usr/local/www/vpn_l2tp_users.php:130 @@ -1360,13 +1356,13 @@ msgstr "" msgid "KeyID tag" msgstr "" -#: src/etc/inc/ipsec.inc:101 src/usr/local/www/head.inc:251 +#: src/etc/inc/ipsec.inc:101 src/usr/local/www/head.inc:259 #: src/usr/local/www/services_dhcp.php:987 #: src/usr/local/www/services_dhcp_edit.php:595 #: src/usr/local/www/services_dhcpv6.php:686 -#: src/usr/local/www/services_dyndns.php:95 -#: src/usr/local/www/services_dyndns.php:103 -#: src/usr/local/www/services_dyndns_edit.php:257 +#: src/usr/local/www/services_dyndns.php:100 +#: src/usr/local/www/services_dyndns.php:108 +#: src/usr/local/www/services_dyndns_edit.php:263 #: src/usr/local/www/services_rfc2136.php:92 #: src/usr/local/www/services_rfc2136.php:96 #: src/usr/local/www/services_rfc2136_edit.php:160 @@ -1376,13 +1372,13 @@ msgstr "" #: src/etc/inc/ipsec.inc:105 src/usr/local/www/diag_traceroute.php:84 #: src/usr/local/www/firewall_nat_1to1_edit.php:287 #: src/usr/local/www/firewall_nat_1to1_edit.php:329 -#: src/usr/local/www/firewall_nat_edit.php:534 -#: src/usr/local/www/firewall_nat_edit.php:580 -#: src/usr/local/www/firewall_nat_edit.php:755 +#: src/usr/local/www/firewall_nat_edit.php:547 +#: src/usr/local/www/firewall_nat_edit.php:593 +#: src/usr/local/www/firewall_nat_edit.php:768 #: src/usr/local/www/firewall_nat_out_edit.php:513 #: src/usr/local/www/firewall_nat_out_edit.php:537 -#: src/usr/local/www/firewall_rules_edit.php:1402 -#: src/usr/local/www/interfaces.php:2937 +#: src/usr/local/www/firewall_rules_edit.php:1414 +#: src/usr/local/www/interfaces.php:2941 msgid "Any" msgstr "" @@ -1396,12 +1392,12 @@ msgstr "" msgid "Mobile Client" msgstr "" -#: src/etc/inc/ipsec.inc:429 src/etc/inc/shaper.inc:3937 -#: src/etc/inc/shaper.inc:4241 src/usr/local/www/diag_pftop.php:150 -#: src/usr/local/www/firewall_nat_edit.php:919 -#: src/usr/local/www/firewall_rules_edit.php:1513 -#: src/usr/local/www/interfaces.php:1647 src/usr/local/www/interfaces.php:1648 -#: src/usr/local/www/interfaces.php:1672 src/usr/local/www/interfaces.php:1685 +#: src/etc/inc/ipsec.inc:429 src/etc/inc/shaper.inc:3936 +#: src/etc/inc/shaper.inc:4240 src/usr/local/www/diag_pftop.php:150 +#: src/usr/local/www/firewall_nat_edit.php:932 +#: src/usr/local/www/firewall_rules_edit.php:1525 +#: src/usr/local/www/interfaces.php:1651 src/usr/local/www/interfaces.php:1652 +#: src/usr/local/www/interfaces.php:1676 src/usr/local/www/interfaces.php:1689 #: src/usr/local/www/interfaces_bridge_edit.php:318 #: src/usr/local/www/system_advanced_misc.php:454 #: src/usr/local/www/vpn_ipsec_phase2.php:579 @@ -3743,14 +3739,14 @@ msgid "Router Advertisement Daemon" msgstr "" #: src/etc/inc/service-utils.inc:280 src/usr/local/www/diag_backup.php:559 -#: src/usr/local/www/head.inc:241 src/usr/local/www/services_dnsmasq.php:215 +#: src/usr/local/www/head.inc:249 src/usr/local/www/services_dnsmasq.php:215 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:153 #: src/usr/local/www/services_dnsmasq_edit.php:232 msgid "DNS Forwarder" msgstr "" #: src/etc/inc/service-utils.inc:287 src/usr/local/www/diag_backup.php:560 -#: src/usr/local/www/head.inc:242 src/usr/local/www/services_unbound.php:251 +#: src/usr/local/www/head.inc:250 src/usr/local/www/services_unbound.php:241 #: src/usr/local/www/services_unbound_acls.php:208 #: src/usr/local/www/services_unbound_advanced.php:221 #: src/usr/local/www/services_unbound_domainoverride_edit.php:145 @@ -3764,7 +3760,7 @@ msgid "NTP clock sync" msgstr "" #: src/etc/inc/service-utils.inc:302 src/usr/local/www/diag_backup.php:557 -#: src/usr/local/www/head.inc:240 src/usr/local/www/head.inc:278 +#: src/usr/local/www/head.inc:248 src/usr/local/www/head.inc:286 #: src/usr/local/www/services_captiveportal.php:96 #: src/usr/local/www/services_captiveportal_filemanager.php:99 #: src/usr/local/www/services_captiveportal_hostname.php:95 @@ -3780,15 +3776,16 @@ msgstr "" #: src/usr/local/www/status_rrd_graph.php:460 #: src/usr/local/www/status_rrd_graph_settings.php:80 #: src/usr/local/www/status_rrd_graph_settings.php:169 +#: src/usr/local/www/system_certmanager.php:1088 msgid "Captive Portal" msgstr "" -#: src/etc/inc/service-utils.inc:320 src/usr/local/www/head.inc:243 +#: src/etc/inc/service-utils.inc:320 src/usr/local/www/head.inc:251 #: src/usr/local/www/services_dhcp_relay.php:154 msgid "DHCP Relay" msgstr "" -#: src/etc/inc/service-utils.inc:327 src/usr/local/www/head.inc:244 +#: src/etc/inc/service-utils.inc:327 src/usr/local/www/head.inc:252 #: src/usr/local/www/services_dhcpv6_relay.php:152 msgid "DHCPv6 Relay" msgstr "" @@ -3843,21 +3840,21 @@ msgid "Stopped" msgstr "" #: src/etc/inc/service-utils.inc:495 -#: src/usr/local/www/firewall_nat_edit.php:662 +#: src/usr/local/www/firewall_nat_edit.php:675 #: src/usr/local/www/firewall_nat_npt_edit.php:225 #: src/usr/local/www/firewall_nat_out_edit.php:451 -#: src/usr/local/www/firewall_rules_edit.php:1087 -#: src/usr/local/www/interfaces.php:2591 +#: src/usr/local/www/firewall_rules_edit.php:1099 +#: src/usr/local/www/interfaces.php:2595 #: src/usr/local/www/interfaces_ppps_edit.php:728 #: src/usr/local/www/load_balancer_pool_edit.php:445 -#: src/usr/local/www/services_router_advertisements.php:133 +#: src/usr/local/www/services_router_advertisements.php:137 #: src/usr/local/www/system_gateways_edit.php:672 #: src/usr/local/www/system_routes_edit.php:298 #: src/usr/local/www/system_usermanager.php:497 #: src/usr/local/www/system_usermanager.php:618 #: src/usr/local/www/vpn_ipsec_phase1.php:666 #: src/usr/local/www/vpn_ipsec_phase2.php:535 -#: src/usr/local/www/vpn_openvpn_client.php:450 +#: src/usr/local/www/vpn_openvpn_client.php:458 #: src/usr/local/www/vpn_openvpn_csc.php:665 #: src/usr/local/www/vpn_openvpn_server.php:626 msgid "Disabled" @@ -3893,110 +3890,111 @@ msgstr "" msgid "%s has been restarted." msgstr "" -#: src/etc/inc/services.inc:487 +#: src/etc/inc/services.inc:498 #, php-format msgid "DHCP leases restore failed exited with %1$s, the error is: %2$s%3$s" msgstr "" -#: src/etc/inc/services.inc:514 +#: src/etc/inc/services.inc:525 msgid "Starting DHCP service..." msgstr "" -#: src/etc/inc/services.inc:606 +#: src/etc/inc/services.inc:617 msgid "Warning! DHCP Failover setup and no CARP virtual IPs defined!" msgstr "" -#: src/etc/inc/services.inc:773 +#: src/etc/inc/services.inc:784 #, php-format msgid "" "Invalid DHCP pool %s - %s for %s subnet %s/%s detected. Please correct the " "settings in Services, DHCP Server" msgstr "" -#: src/etc/inc/services.inc:1117 +#: src/etc/inc/services.inc:1128 #, php-format msgid "Error: cannot open dhcpd.conf in services_dhcpdv4_configure().%s" msgstr "" -#: src/etc/inc/services.inc:1630 +#: src/etc/inc/services.inc:1641 msgid "Could not write Igmpproxy configuration file!" msgstr "" -#: src/etc/inc/services.inc:1638 +#: src/etc/inc/services.inc:1649 msgid "Started IGMP proxy service." msgstr "" -#: src/etc/inc/services.inc:1662 +#: src/etc/inc/services.inc:1673 msgid "Starting DHCP relay service..." msgstr "" -#: src/etc/inc/services.inc:1796 +#: src/etc/inc/services.inc:1807 msgid "Starting DHCPv6 relay service..." msgstr "" -#: src/etc/inc/services.inc:1943 +#: src/etc/inc/services.inc:1955 msgid "Starting DynDNS clients..." msgstr "" -#: src/etc/inc/services.inc:2016 +#: src/etc/inc/services.inc:2028 msgid "Starting DNS forwarder..." msgstr "" -#: src/etc/inc/services.inc:2202 +#: src/etc/inc/services.inc:2214 msgid "Starting DNS Resolver..." msgstr "" -#: src/etc/inc/services.inc:2247 +#: src/etc/inc/services.inc:2259 msgid "Starting SNMP daemon... " msgstr "" -#: src/etc/inc/services.inc:2253 +#: src/etc/inc/services.inc:2265 #, php-format msgid "Error: cannot open snmpd.conf in services_snmpd_configure().%s" msgstr "" -#: src/etc/inc/services.inc:2602 +#: src/etc/inc/services.inc:2614 msgid "pfSense specific crontab entries" msgstr "" -#: src/etc/inc/services.inc:2603 +#: src/etc/inc/services.inc:2615 msgid "Created:" msgstr "" -#: src/etc/inc/services.inc:2625 +#: src/etc/inc/services.inc:2637 msgid "If possible do not add items to this file manually." msgstr "" -#: src/etc/inc/services.inc:2626 +#: src/etc/inc/services.inc:2638 msgid "" "If you do so, this file must be terminated with a blank line (e.g. new line)" msgstr "" -#: src/etc/inc/services.inc:2677 +#: src/etc/inc/services.inc:2689 msgid "Starting UPnP service... " msgstr "" -#: src/etc/inc/services.inc:2717 +#: src/etc/inc/services.inc:2729 #, php-format msgid "Installed cron job for %s" msgstr "" -#: src/etc/inc/services.inc:2721 +#: src/etc/inc/services.inc:2733 #, php-format msgid "Checked cron job for %s, no change needed" msgstr "" -#: src/etc/inc/services.inc:2724 +#: src/etc/inc/services.inc:2736 #, php-format msgid "Updated cron job for %s" msgstr "" -#: src/etc/inc/services.inc:2730 +#: src/etc/inc/services.inc:2742 #, php-format msgid "Removed cron job for %s" msgstr "" -#: src/etc/inc/shaper.inc:254 +#: src/etc/inc/shaper.inc:254 src/usr/local/www/system_camanager.php:262 +#: src/usr/local/www/system_certmanager.php:381 #, php-format msgid "The field '%s' contains invalid characters." msgstr "" @@ -4009,8 +4007,8 @@ msgstr "" #: src/etc/inc/shaper.inc:411 src/etc/inc/shaper.inc:1878 #: src/etc/inc/shaper.inc:2254 src/etc/inc/shaper.inc:2654 #: src/etc/inc/shaper.inc:2812 src/etc/inc/shaper.inc:2964 -#: src/etc/inc/shaper.inc:3113 src/etc/inc/shaper.inc:3340 -#: src/etc/inc/shaper.inc:3926 src/usr/local/www/interfaces_ppps_edit.php:889 +#: src/etc/inc/shaper.inc:3113 src/etc/inc/shaper.inc:3339 +#: src/etc/inc/shaper.inc:3925 src/usr/local/www/interfaces_ppps_edit.php:889 #: src/usr/local/www/status_queues.php:195 #: src/usr/local/www/status_queues.php:199 msgid "Bandwidth" @@ -4018,7 +4016,7 @@ msgstr "" #: src/etc/inc/shaper.inc:413 src/etc/inc/shaper.inc:1880 #: src/etc/inc/shaper.inc:2656 src/etc/inc/shaper.inc:2966 -#: src/etc/inc/shaper.inc:3344 +#: src/etc/inc/shaper.inc:3343 msgid "Bandwidthtype" msgstr "" @@ -4055,16 +4053,17 @@ msgstr "" #: src/etc/inc/shaper.inc:773 src/etc/inc/shaper.inc:1359 #: src/usr/local/www/diag_confbak.php:189 #: src/usr/local/www/diag_nanobsd.php:203 src/usr/local/www/edit.php:133 -#: src/usr/local/www/firewall_nat.php:413 +#: src/usr/local/www/firewall_nat.php:467 +#: src/usr/local/www/firewall_nat.php:481 #: src/usr/local/www/firewall_nat_1to1.php:282 #: src/usr/local/www/firewall_nat_1to1_edit.php:397 -#: src/usr/local/www/firewall_nat_edit.php:655 +#: src/usr/local/www/firewall_nat_edit.php:668 #: src/usr/local/www/firewall_nat_npt.php:271 -#: src/usr/local/www/firewall_nat_out.php:535 +#: src/usr/local/www/firewall_nat_out.php:539 #: src/usr/local/www/firewall_nat_out_edit.php:444 -#: src/usr/local/www/firewall_rules.php:758 -#: src/usr/local/www/firewall_rules.php:842 -#: src/usr/local/www/interfaces.php:1713 +#: src/usr/local/www/firewall_rules.php:836 +#: src/usr/local/www/firewall_rules.php:883 +#: src/usr/local/www/interfaces.php:1717 #: src/usr/local/www/interfaces_assign.php:597 #: src/usr/local/www/interfaces_qinq_edit.php:261 #: src/usr/local/www/load_balancer_monitor_edit.php:295 @@ -4075,7 +4074,7 @@ msgstr "" #: src/usr/local/www/services_dhcpv6.php:521 #: src/usr/local/www/services_igmpproxy.php:172 #: src/usr/local/www/services_igmpproxy.php:174 -#: src/usr/local/www/services_router_advertisements.php:276 +#: src/usr/local/www/services_router_advertisements.php:288 #: src/usr/local/www/status_lb_pool.php:279 #: src/usr/local/www/status_lb_pool.php:281 #: src/usr/local/www/status_logs_common.inc:961 @@ -4099,8 +4098,8 @@ msgid "Enable/Disable" msgstr "" #: src/etc/inc/shaper.inc:789 src/etc/inc/shaper.inc:1167 -#: src/etc/inc/shaper.inc:1376 src/etc/inc/shaper.inc:3346 -#: src/etc/inc/shaper.inc:3892 src/etc/inc/shaper.inc:4214 +#: src/etc/inc/shaper.inc:1376 src/etc/inc/shaper.inc:3345 +#: src/etc/inc/shaper.inc:3891 src/etc/inc/shaper.inc:4213 #: src/usr/local/www/diag_gmirror.php:251 #: src/usr/local/www/diag_gmirror.php:331 #: src/usr/local/www/firewall_aliases.php:222 @@ -4131,7 +4130,7 @@ msgstr "" #: src/usr/local/www/system_camanager.php:389 #: src/usr/local/www/system_certmanager.php:1004 #: src/usr/local/www/system_crlmanager.php:611 -#: src/usr/local/www/system_gateways.php:275 +#: src/usr/local/www/system_gateways.php:276 #: src/usr/local/www/system_gateways_edit.php:141 #: src/usr/local/www/system_gateways_edit.php:697 #: src/usr/local/www/system_groupmanager.php:237 @@ -4170,7 +4169,7 @@ msgstr "" msgid "The priority must be an integer between 1 and 15." msgstr "" -#: src/etc/inc/shaper.inc:1181 src/etc/inc/shaper.inc:3359 +#: src/etc/inc/shaper.inc:1181 src/etc/inc/shaper.inc:3358 msgid "Queue limit must be an integer" msgstr "" @@ -4179,7 +4178,7 @@ msgid "Queue limit must be positive" msgstr "" #: src/etc/inc/shaper.inc:1187 src/etc/inc/shaper.inc:1190 -#: src/etc/inc/shaper.inc:3362 src/etc/inc/shaper.inc:3365 +#: src/etc/inc/shaper.inc:3361 src/etc/inc/shaper.inc:3364 msgid "Queue names must be alphanumeric and _ or - only." msgstr "" @@ -4213,7 +4212,7 @@ msgstr "" msgid "Scheduler options" msgstr "" -#: src/etc/inc/shaper.inc:1412 src/usr/local/www/firewall_rules_edit.php:1635 +#: src/etc/inc/shaper.inc:1412 src/usr/local/www/firewall_rules_edit.php:1647 msgid "Default Queue" msgstr "" @@ -4252,29 +4251,29 @@ msgstr "" msgid "Select options for this queue" msgstr "" -#: src/etc/inc/shaper.inc:1449 src/etc/inc/shaper.inc:3962 -#: src/etc/inc/shaper.inc:4266 src/usr/local/www/firewall_aliases.php:224 +#: src/etc/inc/shaper.inc:1449 src/etc/inc/shaper.inc:3961 +#: src/etc/inc/shaper.inc:4265 src/usr/local/www/firewall_aliases.php:224 #: src/usr/local/www/firewall_aliases_edit.php:680 #: src/usr/local/www/firewall_aliases_edit.php:737 #: src/usr/local/www/firewall_aliases_import.php:208 -#: src/usr/local/www/firewall_nat.php:220 +#: src/usr/local/www/firewall_nat.php:253 #: src/usr/local/www/firewall_nat_1to1.php:187 #: src/usr/local/www/firewall_nat_1to1_edit.php:513 -#: src/usr/local/www/firewall_nat_edit.php:890 +#: src/usr/local/www/firewall_nat_edit.php:903 #: src/usr/local/www/firewall_nat_npt.php:186 #: src/usr/local/www/firewall_nat_npt_edit.php:267 #: src/usr/local/www/firewall_nat_out.php:319 -#: src/usr/local/www/firewall_nat_out.php:567 +#: src/usr/local/www/firewall_nat_out.php:571 #: src/usr/local/www/firewall_nat_out_edit.php:641 -#: src/usr/local/www/firewall_rules.php:321 -#: src/usr/local/www/firewall_rules_edit.php:1372 +#: src/usr/local/www/firewall_rules.php:394 +#: src/usr/local/www/firewall_rules_edit.php:1384 #: src/usr/local/www/firewall_schedule.php:128 #: src/usr/local/www/firewall_schedule_edit.php:409 #: src/usr/local/www/firewall_schedule_edit.php:649 #: src/usr/local/www/firewall_virtual_ip.php:298 #: src/usr/local/www/firewall_virtual_ip_edit.php:466 -#: src/usr/local/www/guiconfig.inc:1080 src/usr/local/www/interfaces.php:1728 -#: src/usr/local/www/interfaces.php:1882 src/usr/local/www/interfaces.php:3182 +#: src/usr/local/www/guiconfig.inc:1080 src/usr/local/www/interfaces.php:1732 +#: src/usr/local/www/interfaces.php:1886 src/usr/local/www/interfaces.php:3186 #: src/usr/local/www/interfaces_bridge.php:138 #: src/usr/local/www/interfaces_bridge_edit.php:384 #: src/usr/local/www/interfaces_gif.php:133 @@ -4304,27 +4303,28 @@ msgstr "" #: src/usr/local/www/services_captiveportal_hostname_edit.php:226 #: src/usr/local/www/services_captiveportal_ip.php:145 #: src/usr/local/www/services_captiveportal_mac.php:210 +#: src/usr/local/www/services_captiveportal_mac_edit.php:262 #: src/usr/local/www/services_captiveportal_zones.php:115 #: src/usr/local/www/services_dhcp.php:662 #: src/usr/local/www/services_dhcp.php:1296 #: src/usr/local/www/services_dhcp_edit.php:483 -#: src/usr/local/www/services_dhcpv6.php:899 +#: src/usr/local/www/services_dhcpv6.php:905 #: src/usr/local/www/services_dhcpv6_edit.php:257 -#: src/usr/local/www/services_dnsmasq.php:370 -#: src/usr/local/www/services_dnsmasq.php:451 +#: src/usr/local/www/services_dnsmasq.php:371 +#: src/usr/local/www/services_dnsmasq.php:452 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:190 #: src/usr/local/www/services_dnsmasq_edit.php:269 #: src/usr/local/www/services_dnsmasq_edit.php:318 -#: src/usr/local/www/services_dyndns.php:119 -#: src/usr/local/www/services_dyndns_edit.php:403 +#: src/usr/local/www/services_dyndns.php:124 +#: src/usr/local/www/services_dyndns_edit.php:422 #: src/usr/local/www/services_igmpproxy.php:124 #: src/usr/local/www/services_igmpproxy_edit.php:195 #: src/usr/local/www/services_pppoe.php:140 #: src/usr/local/www/services_pppoe_edit.php:383 #: src/usr/local/www/services_rfc2136.php:117 #: src/usr/local/www/services_rfc2136_edit.php:303 -#: src/usr/local/www/services_unbound.php:428 -#: src/usr/local/www/services_unbound.php:504 +#: src/usr/local/www/services_unbound.php:416 +#: src/usr/local/www/services_unbound.php:492 #: src/usr/local/www/services_unbound_acls.php:266 #: src/usr/local/www/services_unbound_acls.php:292 #: src/usr/local/www/services_unbound_acls.php:324 @@ -4346,18 +4346,18 @@ msgstr "" #: src/usr/local/www/system_gateway_groups.php:153 #: src/usr/local/www/system_gateway_groups_edit.php:308 #: src/usr/local/www/system_gateway_groups_edit.php:342 -#: src/usr/local/www/system_gateways.php:279 +#: src/usr/local/www/system_gateways.php:280 #: src/usr/local/www/system_gateways_edit.php:757 #: src/usr/local/www/system_groupmanager.php:238 #: src/usr/local/www/system_groupmanager.php:288 #: src/usr/local/www/system_groupmanager.php:386 -#: src/usr/local/www/system_routes.php:278 +#: src/usr/local/www/system_routes.php:279 #: src/usr/local/www/system_routes_edit.php:306 #: src/usr/local/www/system_usermanager.php:380 #: src/usr/local/www/vpn_ipsec_phase1.php:703 #: src/usr/local/www/vpn_ipsec_phase2.php:619 -#: src/usr/local/www/vpn_openvpn_client.php:542 -#: src/usr/local/www/vpn_openvpn_client.php:801 +#: src/usr/local/www/vpn_openvpn_client.php:550 +#: src/usr/local/www/vpn_openvpn_client.php:816 #: src/usr/local/www/vpn_openvpn_csc.php:368 #: src/usr/local/www/vpn_openvpn_csc.php:667 #: src/usr/local/www/vpn_openvpn_server.php:690 @@ -4487,61 +4487,61 @@ msgstr "" msgid "Priority must be an integer between 1 and 255." msgstr "" -#: src/etc/inc/shaper.inc:3138 +#: src/etc/inc/shaper.inc:3139 msgid "Scheduler specific options" msgstr "" -#: src/etc/inc/shaper.inc:3145 -msgid "Number of buckets available." +#: src/etc/inc/shaper.inc:3142 +msgid "Number of buckets available" msgstr "" -#: src/etc/inc/shaper.inc:3151 -msgid "Bandwidth limit for hosts to not saturate link." +#: src/etc/inc/shaper.inc:3149 +msgid "Bandwidth limit for hosts to not saturate link" msgstr "" -#: src/etc/inc/shaper.inc:3352 +#: src/etc/inc/shaper.inc:3351 msgid "Plr must be a value between 0 and 1." msgstr "" -#: src/etc/inc/shaper.inc:3356 +#: src/etc/inc/shaper.inc:3355 msgid "Buckets must be an integer between 16 and 65535." msgstr "" -#: src/etc/inc/shaper.inc:3369 +#: src/etc/inc/shaper.inc:3368 msgid "IPV4 bit mask must be blank or numeric value between 1 and 32." msgstr "" -#: src/etc/inc/shaper.inc:3374 +#: src/etc/inc/shaper.inc:3373 msgid "IPV6 bit mask must be blank or numeric value between 1 and 128." msgstr "" -#: src/etc/inc/shaper.inc:3528 +#: src/etc/inc/shaper.inc:3527 #, php-format msgid "Bandwidth for schedule %s must be an integer." msgstr "" -#: src/etc/inc/shaper.inc:3530 +#: src/etc/inc/shaper.inc:3529 #, php-format msgid "Burst for schedule %s must be an integer." msgstr "" -#: src/etc/inc/shaper.inc:3537 +#: src/etc/inc/shaper.inc:3536 msgid "You need to specify a schedule for every additional entry" msgstr "" -#: src/etc/inc/shaper.inc:3540 +#: src/etc/inc/shaper.inc:3539 msgid "If more than one bandwidth configured all schedules need to be selected" msgstr "" -#: src/etc/inc/shaper.inc:3543 +#: src/etc/inc/shaper.inc:3542 msgid "At least one bw specification is necessary" msgstr "" -#: src/etc/inc/shaper.inc:3546 +#: src/etc/inc/shaper.inc:3545 msgid "Delay must be an integer." msgstr "" -#: src/etc/inc/shaper.inc:3850 +#: src/etc/inc/shaper.inc:3849 #: src/usr/local/www/diag_dump_states_sources.php:179 #: src/usr/local/www/diag_gmirror.php:279 #: src/usr/local/www/diag_gmirror.php:297 src/usr/local/www/diag_tables.php:233 @@ -4552,18 +4552,18 @@ msgstr "" msgid "Remove" msgstr "" -#: src/etc/inc/shaper.inc:3857 +#: src/etc/inc/shaper.inc:3856 msgid "Add another schedule" msgstr "" -#: src/etc/inc/shaper.inc:3880 src/etc/inc/shaper.inc:4202 +#: src/etc/inc/shaper.inc:3879 src/etc/inc/shaper.inc:4201 msgid "Limiters" msgstr "" -#: src/etc/inc/shaper.inc:3884 src/etc/inc/shaper.inc:4206 +#: src/etc/inc/shaper.inc:3883 src/etc/inc/shaper.inc:4205 #: src/usr/local/www/firewall_nat_1to1_edit.php:524 -#: src/usr/local/www/firewall_rules.php:699 -#: src/usr/local/www/interfaces.php:1720 src/usr/local/www/interfaces.php:2980 +#: src/usr/local/www/firewall_rules.php:777 +#: src/usr/local/www/interfaces.php:1724 src/usr/local/www/interfaces.php:2984 #: src/usr/local/www/services_captiveportal.php:576 #: src/usr/local/www/services_captiveportal_vouchers.php:514 #: src/usr/local/www/services_dhcp.php:762 @@ -4575,28 +4575,26 @@ msgstr "" #: src/usr/local/www/services_rfc2136_edit.php:177 #: src/usr/local/www/services_snmp.php:229 #: src/usr/local/www/services_snmp.php:272 -#: src/usr/local/www/services_unbound.php:280 -#: src/usr/local/www/system_gateways.php:329 -#: src/usr/local/www/system_routes.php:312 +#: src/usr/local/www/services_unbound.php:270 #: src/usr/local/www/vpn_ipsec_phase1.php:868 #: src/usr/local/www/vpn_l2tp.php:245 src/usr/local/www/vpn_l2tp.php:331 #: src/usr/local/www/diag_routes.php:114 msgid "Enable" msgstr "" -#: src/etc/inc/shaper.inc:3937 src/etc/inc/shaper.inc:4241 +#: src/etc/inc/shaper.inc:3936 src/etc/inc/shaper.inc:4240 msgid "Source addresses" msgstr "" -#: src/etc/inc/shaper.inc:3937 src/etc/inc/shaper.inc:4241 +#: src/etc/inc/shaper.inc:3936 src/etc/inc/shaper.inc:4240 msgid "Destination addresses" msgstr "" -#: src/etc/inc/shaper.inc:3935 src/etc/inc/shaper.inc:4239 +#: src/etc/inc/shaper.inc:3934 src/etc/inc/shaper.inc:4238 msgid "Mask" msgstr "" -#: src/etc/inc/shaper.inc:3938 src/etc/inc/shaper.inc:4242 +#: src/etc/inc/shaper.inc:3937 src/etc/inc/shaper.inc:4241 msgid "" "If \"source\" or \"destination\" slots is chosen a dynamic pipe with the " "bandwidth, delay, packet loss and queue size given above will be created for " @@ -4604,21 +4602,21 @@ msgid "" "possible to easily specify bandwidth limits per host." msgstr "" -#: src/etc/inc/shaper.inc:3949 src/etc/inc/shaper.inc:4253 +#: src/etc/inc/shaper.inc:3948 src/etc/inc/shaper.inc:4252 msgid "IPV4 mask bits<br />255.255.255.255/?" msgstr "" -#: src/etc/inc/shaper.inc:3956 src/etc/inc/shaper.inc:4260 +#: src/etc/inc/shaper.inc:3955 src/etc/inc/shaper.inc:4259 msgid "" "IPV6 mask bits<br /><span style=\"font-family:consolas\">ffff:ffff:ffff:ffff:" "ffff:ffff:ffff:ffff/?</span>" msgstr "" -#: src/etc/inc/shaper.inc:3965 src/etc/inc/shaper.inc:4269 +#: src/etc/inc/shaper.inc:3964 src/etc/inc/shaper.inc:4268 #: src/usr/local/www/firewall_aliases_edit.php:683 #: src/usr/local/www/firewall_aliases_import.php:211 #: src/usr/local/www/firewall_nat_1to1_edit.php:516 -#: src/usr/local/www/firewall_nat_edit.php:893 +#: src/usr/local/www/firewall_nat_edit.php:906 #: src/usr/local/www/firewall_nat_npt_edit.php:270 #: src/usr/local/www/firewall_nat_out_edit.php:644 #: src/usr/local/www/firewall_virtual_ip_edit.php:469 @@ -4631,9 +4629,8 @@ msgstr "" #: src/usr/local/www/services_dhcp_edit.php:486 #: src/usr/local/www/services_dhcpv6_edit.php:260 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:193 -#: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:201 #: src/usr/local/www/services_dnsmasq_edit.php:272 -#: src/usr/local/www/services_dyndns_edit.php:406 +#: src/usr/local/www/services_dyndns_edit.php:425 #: src/usr/local/www/services_igmpproxy_edit.php:198 #: src/usr/local/www/services_rfc2136_edit.php:306 #: src/usr/local/www/services_unbound_domainoverride_edit.php:172 @@ -4644,42 +4641,42 @@ msgstr "" #: src/usr/local/www/system_routes_edit.php:309 #: src/usr/local/www/vpn_ipsec_phase1.php:706 #: src/usr/local/www/vpn_ipsec_phase2.php:622 -#: src/usr/local/www/vpn_openvpn_client.php:545 +#: src/usr/local/www/vpn_openvpn_client.php:553 #: src/usr/local/www/vpn_openvpn_server.php:693 msgid "You may enter a description here for your reference (not parsed)." msgstr "" -#: src/etc/inc/shaper.inc:3969 src/etc/inc/shaper.inc:4273 -#: src/usr/local/www/firewall_rules_edit.php:1381 -#: src/usr/local/www/firewall_rules_edit.php:1395 +#: src/etc/inc/shaper.inc:3968 src/etc/inc/shaper.inc:4272 +#: src/usr/local/www/firewall_rules_edit.php:1393 +#: src/usr/local/www/firewall_rules_edit.php:1407 #: src/usr/local/www/interfaces_ppps_edit.php:808 #: src/usr/local/www/system_gateways_edit.php:775 msgid "Advanced options" msgstr "" -#: src/etc/inc/shaper.inc:3973 +#: src/etc/inc/shaper.inc:3972 msgid "Delay (ms)" msgstr "" -#: src/etc/inc/shaper.inc:3976 +#: src/etc/inc/shaper.inc:3975 msgid "In most cases, you should specify 0 here (or leave the field empty)" msgstr "" -#: src/etc/inc/shaper.inc:3980 src/etc/inc/shaper.inc:4286 +#: src/etc/inc/shaper.inc:3979 src/etc/inc/shaper.inc:4285 msgid "Packet Loss Rate" msgstr "" -#: src/etc/inc/shaper.inc:3984 src/etc/inc/shaper.inc:4290 +#: src/etc/inc/shaper.inc:3983 src/etc/inc/shaper.inc:4289 msgid "" "In most cases, you should specify 0 here (or leave the field empty). A value " "of 0.001 means one packet in 1000 gets dropped" msgstr "" -#: src/etc/inc/shaper.inc:3989 src/etc/inc/shaper.inc:4295 +#: src/etc/inc/shaper.inc:3988 src/etc/inc/shaper.inc:4294 msgid "Queue size (slots)" msgstr "" -#: src/etc/inc/shaper.inc:3992 src/etc/inc/shaper.inc:4298 +#: src/etc/inc/shaper.inc:3991 src/etc/inc/shaper.inc:4297 msgid "" "In most cases, you should leave the field empty. All packets in this pipe " "are placed into a fixed-size queue first, then they are delayed by value " @@ -4687,125 +4684,157 @@ msgid "" "destination." msgstr "" -#: src/etc/inc/shaper.inc:3997 src/etc/inc/shaper.inc:4303 +#: src/etc/inc/shaper.inc:3996 src/etc/inc/shaper.inc:4302 msgid "Bucket size (slots)" msgstr "" -#: src/etc/inc/shaper.inc:4000 src/etc/inc/shaper.inc:4306 +#: src/etc/inc/shaper.inc:3999 src/etc/inc/shaper.inc:4305 msgid "" "In most cases, you should leave this field empty. It increases the hash size " "set" msgstr "" -#: src/etc/inc/shaper.inc:4071 +#: src/etc/inc/shaper.inc:4070 msgid "Weight must be an integer between 1 and 100." msgstr "" -#: src/etc/inc/shaper.inc:4277 src/usr/local/www/system_gateways_edit.php:800 +#: src/etc/inc/shaper.inc:4276 src/usr/local/www/system_gateways_edit.php:800 msgid "Weight" msgstr "" -#: src/etc/inc/shaper.inc:4281 +#: src/etc/inc/shaper.inc:4280 msgid "" "For queues under the same parent this specifies the share that a queue " "gets(values range from 1 to 100), you can leave it blank otherwise" msgstr "" -#: src/etc/inc/shaper.inc:4692 +#: src/etc/inc/shaper.inc:4691 msgid "Clone shaper on the I/F" msgstr "" -#: src/etc/inc/shaper.inc:4701 +#: src/etc/inc/shaper.inc:4700 #, php-format msgid "Welcome to the %s Traffic Shaper." msgstr "" -#: src/etc/inc/shaper.inc:4702 +#: src/etc/inc/shaper.inc:4701 msgid "" "The tree on the left helps you navigate through the queues.<br />Buttons at " "the bottom represent queue actions and are activated accordingly." msgstr "" -#: src/etc/inc/system.inc:600 +#: src/etc/inc/system.inc:601 #, php-format msgid "Not adding default route because OLSR dynamic gateway is enabled." msgstr "" -#: src/etc/inc/system.inc:660 +#: src/etc/inc/system.inc:661 #, php-format msgid "Static Routes: Gateway IP could not be found for %s" msgstr "" -#: src/etc/inc/system.inc:871 +#: src/etc/inc/system.inc:872 msgid "Starting syslog..." msgstr "" -#: src/etc/inc/system.inc:1029 +#: src/etc/inc/system.inc:1030 #, php-format msgid "Error: cannot open syslog.conf in system_syslogd_start().%s" msgstr "" -#: src/etc/inc/system.inc:1126 +#: src/etc/inc/system.inc:1127 msgid "Starting webConfigurator..." msgstr "" -#: src/etc/inc/system.inc:1176 src/etc/inc/system.inc:2001 -#: src/etc/inc/system.inc:2004 +#: src/etc/inc/system.inc:1177 src/etc/inc/system.inc:2003 +#: src/etc/inc/system.inc:2006 msgid "failed!" msgstr "" -#: src/etc/inc/system.inc:1361 +#: src/etc/inc/system.inc:1363 #, php-format msgid "Error: cannot open certificate file in system_webgui_start().%s" msgstr "" -#: src/etc/inc/system.inc:1374 +#: src/etc/inc/system.inc:1376 #, php-format msgid "Error: cannot open certificate key file in system_webgui_start().%s" msgstr "" -#: src/etc/inc/system.inc:1401 +#: src/etc/inc/system.inc:1403 #, php-format msgid "Error: cannot open %s in system_generate_nginx_config().%s" msgstr "" -#: src/etc/inc/system.inc:1450 +#: src/etc/inc/system.inc:1452 msgid "Setting timezone..." msgstr "" -#: src/etc/inc/system.inc:1838 +#: src/etc/inc/system.inc:1840 msgid "Syncing system time before startup..." msgstr "" -#: src/etc/inc/system.inc:1956 +#: src/etc/inc/system.inc:1958 #, php-format msgid "Error: cannot open dmesg.boot in system_dmesg_save().%s" msgstr "" -#: src/etc/inc/system.inc:1980 +#: src/etc/inc/system.inc:1982 msgid "Setting hard disk standby... " msgstr "" -#: src/etc/inc/system.inc:2116 +#: src/etc/inc/system.inc:2119 msgid "Generic PC" msgstr "" -#: src/etc/inc/system.inc:2120 +#: src/etc/inc/system.inc:2123 msgid "Generic PC (CD-ROM)" msgstr "" -#: src/etc/inc/system.inc:2156 +#: src/etc/inc/system.inc:2159 msgid "PC Engines WRAP" msgstr "" -#: src/etc/inc/system.inc:2160 src/etc/inc/system.inc:2179 +#: src/etc/inc/system.inc:2163 src/etc/inc/system.inc:2182 msgid "PC Engines ALIX" msgstr "" -#: src/etc/inc/system.inc:2184 +#: src/etc/inc/system.inc:2187 msgid "embedded (unknown)" msgstr "" +#: src/etc/inc/unbound.inc:800 src/usr/local/www/services_unbound_acls.php:261 +msgid "Deny" +msgstr "" + +#: src/etc/inc/unbound.inc:801 src/usr/local/www/services_unbound_acls.php:261 +msgid "Refuse" +msgstr "" + +#: src/etc/inc/unbound.inc:802 +msgid "Static" +msgstr "" + +#: src/etc/inc/unbound.inc:803 +msgid "Transparent" +msgstr "" + +#: src/etc/inc/unbound.inc:804 +msgid "Type Transparent" +msgstr "" + +#: src/etc/inc/unbound.inc:806 +msgid "Inform" +msgstr "" + +#: src/etc/inc/unbound.inc:807 +msgid "Inform Deny" +msgstr "" + +#: src/etc/inc/unbound.inc:808 +msgid "No Default" +msgstr "" + #: src/etc/inc/upgrade_config.inc:133 #, php-format msgid "%sWarning: filter rule removed (interface '%s' does not exist anymore)." @@ -5121,35 +5150,35 @@ msgstr "" msgid "Error: cannot open mpd.conf in vpn_pppoe_configure()." msgstr "" -#: src/etc/inc/vpn.inc:1720 +#: src/etc/inc/vpn.inc:1723 #, php-format msgid "Error: cannot open mpd.links in vpn_pppoe_configure()." msgstr "" -#: src/etc/inc/vpn.inc:1747 +#: src/etc/inc/vpn.inc:1750 #, php-format msgid "Error: cannot open mpd.secret in vpn_pppoe_configure()." msgstr "" -#: src/etc/inc/vpn.inc:1781 +#: src/etc/inc/vpn.inc:1784 msgid "done" msgstr "" -#: src/etc/inc/vpn.inc:1803 +#: src/etc/inc/vpn.inc:1806 msgid "Configuring l2tp VPN service... " msgstr "" -#: src/etc/inc/vpn.inc:1842 +#: src/etc/inc/vpn.inc:1845 #, php-format msgid "Error: cannot open mpd.conf in vpn_l2tp_configure()." msgstr "" -#: src/etc/inc/vpn.inc:1945 +#: src/etc/inc/vpn.inc:1948 #, php-format msgid "Error: cannot open mpd.links in vpn_l2tp_configure()." msgstr "" -#: src/etc/inc/vpn.inc:1972 +#: src/etc/inc/vpn.inc:1975 #, php-format msgid "Error: cannot open mpd.secret in vpn_l2tp_configure()." msgstr "" @@ -5224,48 +5253,48 @@ msgstr "" msgid "Non-numeric value received in INT or DOUBLE" msgstr "" -#: src/etc/inc/xmlrpc_client.inc:860 +#: src/etc/inc/xmlrpc_client.inc:864 #, php-format msgid "send()'s %s parameter must be an XML_RPC_Message object." msgstr "" -#: src/etc/inc/xmlrpc_client.inc:941 +#: src/etc/inc/xmlrpc_client.inc:945 #, php-format msgid "" "Connection to proxy server \n" " %1$s:%2$s failed. %3$s" msgstr "" -#: src/etc/inc/xmlrpc_client.inc:947 +#: src/etc/inc/xmlrpc_client.inc:951 #, php-format msgid "" "Connection to RPC server \n" " %1$s:%2$s failed. %3$s" msgstr "" -#: src/etc/inc/xmlrpc_client.inc:1312 +#: src/etc/inc/xmlrpc_client.inc:1316 msgid "The submitted request did not contain this parameter" msgstr "" -#: src/etc/inc/xmlrpc_client.inc:1343 +#: src/etc/inc/xmlrpc_client.inc:1347 msgid "mb_convert_encoding() is not available" msgstr "" -#: src/etc/inc/xmlrpc_client.inc:1452 +#: src/etc/inc/xmlrpc_client.inc:1456 #, php-format msgid "HTTP error, got response: %s" msgstr "" -#: src/etc/inc/xmlrpc_client.inc:1575 +#: src/etc/inc/xmlrpc_client.inc:1579 msgid "Scalar can have only one value" msgstr "" -#: src/etc/inc/xmlrpc_client.inc:1582 +#: src/etc/inc/xmlrpc_client.inc:1586 #, php-format msgid "Not a scalar type (%s)" msgstr "" -#: src/etc/inc/xmlrpc_client.inc:1618 src/etc/inc/xmlrpc_client.inc:1634 +#: src/etc/inc/xmlrpc_client.inc:1622 src/etc/inc/xmlrpc_client.inc:1638 #, php-format msgid "Already initialized as a [%s]" msgstr "" @@ -5290,7 +5319,7 @@ msgid "" msgstr "" #: src/usr/local/bin/dhcpd_gather_stats.php:106 -#: src/usr/local/www/status_dhcp_leases.php:213 +#: src/usr/local/www/status_dhcp_leases.php:222 msgid "Never" msgstr "" @@ -5331,7 +5360,7 @@ msgstr "" #: src/usr/local/www/diag_authentication.php:103 #: src/usr/local/www/diag_backup.php:596 src/usr/local/www/diag_confbak.php:135 #: src/usr/local/www/diag_defaults.php:73 src/usr/local/www/diag_dns.php:63 -#: src/usr/local/www/diag_dump_states.php:93 +#: src/usr/local/www/diag_dump_states.php:108 #: src/usr/local/www/diag_dump_states_sources.php:87 #: src/usr/local/www/diag_gmirror.php:67 src/usr/local/www/diag_halt.php:78 #: src/usr/local/www/diag_limiter_info.php:65 @@ -5418,7 +5447,7 @@ msgid "Just delete the crash report and take me back to the Dashboard" msgstr "" #: src/usr/local/www/diag_arp.php:286 src/usr/local/www/diag_arp.php:337 -#: src/usr/local/www/head.inc:321 +#: src/usr/local/www/head.inc:329 msgid "ARP Table" msgstr "" @@ -5427,26 +5456,26 @@ msgid " Loading, please wait..." msgstr "" #: src/usr/local/www/diag_arp.php:344 -#: src/usr/local/www/diag_dump_states.php:172 +#: src/usr/local/www/diag_dump_states.php:187 #: src/usr/local/www/diag_ndp.php:143 #: src/usr/local/www/diag_packet_capture.php:297 -#: src/usr/local/www/firewall_nat.php:212 +#: src/usr/local/www/firewall_nat.php:245 #: src/usr/local/www/firewall_nat_1to1.php:183 #: src/usr/local/www/firewall_nat_1to1_edit.php:152 #: src/usr/local/www/firewall_nat_1to1_edit.php:155 #: src/usr/local/www/firewall_nat_1to1_edit.php:446 #: src/usr/local/www/firewall_nat_edit.php:245 #: src/usr/local/www/firewall_nat_edit.php:248 -#: src/usr/local/www/firewall_nat_edit.php:704 +#: src/usr/local/www/firewall_nat_edit.php:717 #: src/usr/local/www/firewall_nat_npt.php:183 #: src/usr/local/www/firewall_nat_npt_edit.php:133 #: src/usr/local/www/firewall_nat_npt_edit.php:232 #: src/usr/local/www/firewall_nat_out.php:311 -#: src/usr/local/www/firewall_nat_out.php:559 +#: src/usr/local/www/firewall_nat_out.php:563 #: src/usr/local/www/firewall_nat_out_edit.php:181 #: src/usr/local/www/firewall_nat_out_edit.php:493 -#: src/usr/local/www/firewall_rules_edit.php:1142 -#: src/usr/local/www/firewall_rules_edit.php:1150 +#: src/usr/local/www/firewall_rules_edit.php:1154 +#: src/usr/local/www/firewall_rules_edit.php:1162 #: src/usr/local/www/firewall_virtual_ip.php:296 #: src/usr/local/www/firewall_virtual_ip_edit.php:403 #: src/usr/local/www/interfaces_assign.php:535 @@ -5461,7 +5490,7 @@ msgstr "" #: src/usr/local/www/services_captiveportal.php:246 #: src/usr/local/www/services_dhcp_relay.php:111 #: src/usr/local/www/services_dhcpv6_relay.php:112 -#: src/usr/local/www/services_dyndns.php:115 +#: src/usr/local/www/services_dyndns.php:120 #: src/usr/local/www/services_igmpproxy_edit.php:188 #: src/usr/local/www/services_ntpd.php:292 #: src/usr/local/www/services_pppoe.php:137 @@ -5472,20 +5501,20 @@ msgstr "" #: src/usr/local/www/services_wol.php:200 #: src/usr/local/www/services_wol_edit.php:106 #: src/usr/local/www/services_wol_edit.php:159 -#: src/usr/local/www/status_dhcp_leases.php:467 +#: src/usr/local/www/status_dhcp_leases.php:476 #: src/usr/local/www/status_graph.php:166 #: src/usr/local/www/status_logs_common.inc:492 #: src/usr/local/www/status_logs_common.inc:524 #: src/usr/local/www/status_logs_common.inc:527 #: src/usr/local/www/status_logs_filter.php:184 -#: src/usr/local/www/status_logs_filter_dynamic.php:419 -#: src/usr/local/www/system_gateways.php:276 +#: src/usr/local/www/status_logs_filter_dynamic.php:424 +#: src/usr/local/www/system_gateways.php:277 #: src/usr/local/www/system_gateways_edit.php:141 #: src/usr/local/www/system_gateways_edit.php:680 -#: src/usr/local/www/system_routes.php:277 +#: src/usr/local/www/system_routes.php:278 #: src/usr/local/www/vpn_ipsec_phase1.php:687 #: src/usr/local/www/vpn_l2tp.php:264 -#: src/usr/local/www/vpn_openvpn_client.php:478 +#: src/usr/local/www/vpn_openvpn_client.php:486 #: src/usr/local/www/vpn_openvpn_server.php:676 #: src/usr/local/www/widgets/widgets/wake_on_lan.widget.php:74 msgid "Interface" @@ -5500,8 +5529,8 @@ msgstr "" #: src/usr/local/www/services_wol_edit.php:106 #: src/usr/local/www/services_wol_edit.php:166 #: src/usr/local/www/status_captiveportal.php:179 -#: src/usr/local/www/status_dhcp_leases.php:371 -#: src/usr/local/www/status_dhcpv6_leases.php:446 +#: src/usr/local/www/status_dhcp_leases.php:380 +#: src/usr/local/www/status_dhcpv6_leases.php:456 #: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:134 msgid "MAC address" msgstr "" @@ -5510,23 +5539,24 @@ msgstr "" #: src/usr/local/www/diag_ndp.php:142 src/usr/local/www/diag_ping.php:176 #: src/usr/local/www/diag_testport.php:255 #: src/usr/local/www/diag_traceroute.php:164 -#: src/usr/local/www/interfaces.php:1932 +#: src/usr/local/www/interfaces.php:1936 #: src/usr/local/www/services_captiveportal_hostname.php:150 #: src/usr/local/www/services_captiveportal_hostname_edit.php:219 #: src/usr/local/www/services_dhcp.php:1295 #: src/usr/local/www/services_dhcp_edit.php:460 -#: src/usr/local/www/services_dhcpv6.php:898 +#: src/usr/local/www/services_dhcpv6.php:904 #: src/usr/local/www/services_dhcpv6_edit.php:250 -#: src/usr/local/www/services_dyndns.php:117 -#: src/usr/local/www/services_dyndns_edit.php:127 -#: src/usr/local/www/services_dyndns_edit.php:306 +#: src/usr/local/www/services_dyndns.php:122 +#: src/usr/local/www/services_dyndns_edit.php:128 +#: src/usr/local/www/services_dyndns_edit.php:310 +#: src/usr/local/www/services_dyndns_edit.php:314 #: src/usr/local/www/services_rfc2136.php:115 #: src/usr/local/www/services_rfc2136_edit.php:112 #: src/usr/local/www/services_rfc2136_edit.php:198 -#: src/usr/local/www/status_dhcp_leases.php:372 -#: src/usr/local/www/status_dhcpv6_leases.php:447 +#: src/usr/local/www/status_dhcp_leases.php:381 +#: src/usr/local/www/status_dhcpv6_leases.php:457 #: src/usr/local/www/system.php:143 src/usr/local/www/system.php:370 -#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:106 +#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:112 msgid "Hostname" msgstr "" @@ -5552,7 +5582,7 @@ msgstr "" #: src/usr/local/www/diag_authentication.php:82 #: src/usr/local/www/status_logs_vpn.php:172 -#: src/usr/local/www/status_logs_vpn.php:416 +#: src/usr/local/www/status_logs_vpn.php:425 #: src/usr/local/www/system_usermanager.php:121 #: src/usr/local/www/vpn_l2tp_users_edit.php:63 #: src/usr/local/www/vpn_l2tp_users_edit.php:185 @@ -5574,7 +5604,7 @@ msgid "Authentication failed." msgstr "" #: src/usr/local/www/diag_authentication.php:103 -#: src/usr/local/www/guiconfig.inc:189 src/usr/local/www/head.inc:322 +#: src/usr/local/www/guiconfig.inc:189 src/usr/local/www/head.inc:330 #: src/usr/local/www/services_captiveportal.php:718 msgid "Authentication" msgstr "" @@ -5584,7 +5614,6 @@ msgid "Authentication Test" msgstr "" #: src/usr/local/www/diag_authentication.php:127 -#: src/usr/local/www/system_authservers.php:114 #: src/usr/local/www/system_usermanager_settings.php:175 msgid "Authentication Server" msgstr "" @@ -5594,15 +5623,15 @@ msgid "Select the authentication server to test against" msgstr "" #: src/usr/local/www/diag_authentication.php:134 -#: src/usr/local/www/interfaces.php:2485 src/usr/local/www/interfaces.php:2551 -#: src/usr/local/www/interfaces.php:2682 +#: src/usr/local/www/interfaces.php:2489 src/usr/local/www/interfaces.php:2555 +#: src/usr/local/www/interfaces.php:2686 #: src/usr/local/www/interfaces_ppps_edit.php:238 #: src/usr/local/www/interfaces_ppps_edit.php:241 #: src/usr/local/www/interfaces_ppps_edit.php:249 #: src/usr/local/www/interfaces_ppps_edit.php:252 #: src/usr/local/www/interfaces_ppps_edit.php:603 -#: src/usr/local/www/services_dyndns_edit.php:131 -#: src/usr/local/www/services_dyndns_edit.php:352 +#: src/usr/local/www/services_dyndns_edit.php:132 +#: src/usr/local/www/services_dyndns_edit.php:371 #: src/usr/local/www/services_pppoe_edit.php:540 #: src/usr/local/www/status_captiveportal.php:182 #: src/usr/local/www/system_usermanager.php:182 @@ -5614,26 +5643,26 @@ msgstr "" #: src/usr/local/www/vpn_l2tp_users_edit.php:108 #: src/usr/local/www/vpn_l2tp_users_edit.php:111 #: src/usr/local/www/vpn_l2tp_users_edit.php:189 -#: src/usr/local/www/vpn_openvpn_client.php:520 -#: src/usr/local/www/vpn_openvpn_client.php:553 +#: src/usr/local/www/vpn_openvpn_client.php:528 +#: src/usr/local/www/vpn_openvpn_client.php:561 #: src/usr/local/www/widgets/widgets/captive_portal_status.widget.php:135 msgid "Username" msgstr "" #: src/usr/local/www/diag_authentication.php:142 #: src/usr/local/www/diag_backup.php:658 src/usr/local/www/diag_backup.php:702 -#: src/usr/local/www/interfaces.php:2492 src/usr/local/www/interfaces.php:2558 -#: src/usr/local/www/interfaces.php:2689 +#: src/usr/local/www/interfaces.php:2496 src/usr/local/www/interfaces.php:2562 +#: src/usr/local/www/interfaces.php:2693 #: src/usr/local/www/interfaces_ppps_edit.php:238 #: src/usr/local/www/interfaces_ppps_edit.php:241 #: src/usr/local/www/interfaces_ppps_edit.php:249 #: src/usr/local/www/interfaces_ppps_edit.php:252 #: src/usr/local/www/interfaces_ppps_edit.php:610 -#: src/usr/local/www/services_dyndns_edit.php:129 -#: src/usr/local/www/services_dyndns_edit.php:362 +#: src/usr/local/www/services_dyndns_edit.php:130 +#: src/usr/local/www/services_dyndns_edit.php:381 #: src/usr/local/www/services_pppoe_edit.php:547 #: src/usr/local/www/system_advanced_notifications.php:275 -#: src/usr/local/www/system_authservers.php:613 +#: src/usr/local/www/system_authservers.php:614 #: src/usr/local/www/system_usermanager.php:188 #: src/usr/local/www/system_usermanager.php:193 #: src/usr/local/www/system_usermanager.php:641 @@ -5642,8 +5671,8 @@ msgstr "" #: src/usr/local/www/system_usermanager_passwordmg.php:135 #: src/usr/local/www/vpn_l2tp_users_edit.php:111 #: src/usr/local/www/vpn_l2tp_users_edit.php:196 -#: src/usr/local/www/vpn_openvpn_client.php:527 -#: src/usr/local/www/vpn_openvpn_client.php:560 +#: src/usr/local/www/vpn_openvpn_client.php:535 +#: src/usr/local/www/vpn_openvpn_client.php:568 msgid "Password" msgstr "" @@ -5760,7 +5789,7 @@ msgstr "" #: src/usr/local/www/firewall_aliases_edit.php:71 #: src/usr/local/www/firewall_aliases_import.php:72 #: src/usr/local/www/firewall_aliases_import.php:93 -#: src/usr/local/www/head.inc:230 +#: src/usr/local/www/head.inc:238 msgid "Aliases" msgstr "" @@ -5768,7 +5797,7 @@ msgstr "" msgid "Captive Portal Vouchers" msgstr "" -#: src/usr/local/www/diag_backup.php:561 src/usr/local/www/head.inc:247 +#: src/usr/local/www/diag_backup.php:561 src/usr/local/www/head.inc:255 #: src/usr/local/www/services_dhcp.php:698 #: src/usr/local/www/status_rrd_graph.php:468 #: src/usr/local/www/status_rrd_graph_settings.php:177 @@ -5779,7 +5808,7 @@ msgstr "" #: src/usr/local/www/services_dhcpv6.php:439 #: src/usr/local/www/services_dhcpv6.php:515 #: src/usr/local/www/services_dhcpv6.php:528 -#: src/usr/local/www/services_router_advertisements.php:270 +#: src/usr/local/www/services_router_advertisements.php:282 msgid "DHCPv6 Server" msgstr "" @@ -5788,8 +5817,8 @@ msgid "Firewall Rules" msgstr "" #: src/usr/local/www/diag_backup.php:564 -#: src/usr/local/www/firewall_shaper.php:75 src/usr/local/www/head.inc:285 -#: src/usr/local/www/interfaces.php:1644 +#: src/usr/local/www/firewall_shaper.php:75 src/usr/local/www/head.inc:293 +#: src/usr/local/www/interfaces.php:1648 #: src/usr/local/www/interfaces_assign.php:67 #: src/usr/local/www/interfaces_bridge.php:109 #: src/usr/local/www/interfaces_bridge_edit.php:360 @@ -5822,19 +5851,19 @@ msgstr "" msgid "IPSEC" msgstr "" -#: src/usr/local/www/diag_backup.php:566 src/usr/local/www/firewall_nat.php:182 +#: src/usr/local/www/diag_backup.php:566 src/usr/local/www/firewall_nat.php:213 #: src/usr/local/www/firewall_nat_1to1.php:155 #: src/usr/local/www/firewall_nat_1to1_edit.php:281 -#: src/usr/local/www/firewall_nat_edit.php:646 +#: src/usr/local/www/firewall_nat_edit.php:659 #: src/usr/local/www/firewall_nat_npt.php:155 #: src/usr/local/www/firewall_nat_npt_edit.php:212 #: src/usr/local/www/firewall_nat_out.php:239 #: src/usr/local/www/firewall_nat_out_edit.php:393 -#: src/usr/local/www/head.inc:231 +#: src/usr/local/www/head.inc:239 msgid "NAT" msgstr "" -#: src/usr/local/www/diag_backup.php:568 src/usr/local/www/head.inc:528 +#: src/usr/local/www/diag_backup.php:568 src/usr/local/www/head.inc:536 #: src/usr/local/www/pkg_mgr.php:72 src/usr/local/www/pkg_mgr.php:163 #: src/usr/local/www/pkg_mgr_install.php:266 #: src/usr/local/www/pkg_mgr_installed.php:68 @@ -5854,7 +5883,7 @@ msgstr "" msgid "Syslog" msgstr "" -#: src/usr/local/www/diag_backup.php:572 src/usr/local/www/head.inc:528 +#: src/usr/local/www/diag_backup.php:572 src/usr/local/www/head.inc:536 #: src/usr/local/www/pkg_mgr.php:72 src/usr/local/www/pkg_mgr.php:163 #: src/usr/local/www/pkg_mgr_install.php:262 #: src/usr/local/www/pkg_mgr_install.php:266 @@ -5880,12 +5909,12 @@ msgstr "" #: src/usr/local/www/system_crlmanager.php:70 #: src/usr/local/www/system_gateway_groups.php:124 #: src/usr/local/www/system_gateway_groups_edit.php:180 -#: src/usr/local/www/system_gateways.php:244 +#: src/usr/local/www/system_gateways.php:245 #: src/usr/local/www/system_gateways_edit.php:631 #: src/usr/local/www/system_groupmanager.php:70 #: src/usr/local/www/system_groupmanager_addprivs.php:83 #: src/usr/local/www/system_hasync.php:131 -#: src/usr/local/www/system_routes.php:245 +#: src/usr/local/www/system_routes.php:246 #: src/usr/local/www/system_routes_edit.php:257 #: src/usr/local/www/system_update_settings.php:99 #: src/usr/local/www/system_usermanager.php:72 @@ -5914,7 +5943,7 @@ msgstr "" #: src/usr/local/www/firewall_shaper_queues.php:221 #: src/usr/local/www/firewall_shaper_vinterface.php:73 #: src/usr/local/www/firewall_shaper_wizards.php:96 -#: src/usr/local/www/head.inc:234 +#: src/usr/local/www/head.inc:242 msgid "Traffic Shaper" msgstr "" @@ -5922,7 +5951,7 @@ msgstr "" msgid "VLANS" msgstr "" -#: src/usr/local/www/diag_backup.php:578 src/usr/local/www/head.inc:265 +#: src/usr/local/www/diag_backup.php:578 src/usr/local/www/head.inc:273 #: src/usr/local/www/services_wol.php:146 #: src/usr/local/www/services_wol.php:169 #: src/usr/local/www/services_wol_edit.php:137 @@ -5933,13 +5962,13 @@ msgstr "" #: src/usr/local/www/firewall_aliases.php:188 #: src/usr/local/www/pkg_edit.php:1196 #: src/usr/local/www/services_ntpd_gps.php:205 -#: src/usr/local/www/services_unbound.php:233 +#: src/usr/local/www/services_unbound.php:223 #: src/usr/local/www/status_graph.php:185 src/usr/local/www/diag_smart.php:346 msgid "All" msgstr "" #: src/usr/local/www/diag_backup.php:596 src/usr/local/www/diag_backup.php:620 -#: src/usr/local/www/diag_confbak.php:144 src/usr/local/www/head.inc:323 +#: src/usr/local/www/diag_confbak.php:144 src/usr/local/www/head.inc:331 msgid "Backup/Restore" msgstr "" @@ -6043,8 +6072,8 @@ msgstr "" #: src/usr/local/www/diag_confbak.php:152 #: src/usr/local/www/diag_confbak.php:253 #: src/usr/local/www/diag_confbak.php:264 -#: src/usr/local/www/firewall_nat_edit.php:970 -#: src/usr/local/www/firewall_nat_edit.php:977 +#: src/usr/local/www/firewall_nat_edit.php:983 +#: src/usr/local/www/firewall_nat_edit.php:990 #: src/usr/local/www/firewall_nat_out_edit.php:673 #: src/usr/local/www/firewall_nat_out_edit.php:680 msgid "n/j/y H:i:s" @@ -6123,11 +6152,11 @@ msgstr "" #: src/usr/local/www/diag_confbak.php:243 #: src/usr/local/www/firewall_aliases.php:225 -#: src/usr/local/www/firewall_nat.php:221 +#: src/usr/local/www/firewall_nat.php:254 #: src/usr/local/www/firewall_nat_1to1.php:188 #: src/usr/local/www/firewall_nat_npt.php:187 #: src/usr/local/www/firewall_nat_out.php:320 -#: src/usr/local/www/firewall_rules.php:322 +#: src/usr/local/www/firewall_rules.php:395 #: src/usr/local/www/firewall_schedule.php:129 #: src/usr/local/www/firewall_virtual_ip.php:299 #: src/usr/local/www/interfaces_bridge.php:139 @@ -6144,27 +6173,28 @@ msgstr "" #: src/usr/local/www/load_balancer_virtual_server.php:161 #: src/usr/local/www/pkg_mgr_installed.php:108 #: src/usr/local/www/services_captiveportal_zones.php:116 -#: src/usr/local/www/services_dyndns.php:120 +#: src/usr/local/www/services_dhcp.php:663 +#: src/usr/local/www/services_dyndns.php:125 #: src/usr/local/www/services_igmpproxy.php:125 #: src/usr/local/www/services_pppoe.php:141 #: src/usr/local/www/services_rfc2136.php:118 #: src/usr/local/www/services_unbound_acls.php:325 #: src/usr/local/www/services_wol.php:203 -#: src/usr/local/www/status_dhcp_leases.php:377 -#: src/usr/local/www/status_dhcpv6_leases.php:452 +#: src/usr/local/www/status_dhcp_leases.php:386 +#: src/usr/local/www/status_dhcpv6_leases.php:462 #: src/usr/local/www/status_logs_filter_summary.php:117 #: src/usr/local/www/status_services.php:133 -#: src/usr/local/www/system_authservers.php:408 +#: src/usr/local/www/system_authservers.php:409 #: src/usr/local/www/system_camanager.php:394 #: src/usr/local/www/system_certmanager.php:1009 #: src/usr/local/www/system_gateway_groups.php:154 -#: src/usr/local/www/system_gateways.php:280 +#: src/usr/local/www/system_gateways.php:281 #: src/usr/local/www/system_groupmanager.php:290 -#: src/usr/local/www/system_routes.php:279 +#: src/usr/local/www/system_routes.php:280 #: src/usr/local/www/system_usermanager.php:499 #: src/usr/local/www/vpn_ipsec.php:290 src/usr/local/www/vpn_ipsec_keys.php:141 #: src/usr/local/www/vpn_l2tp_users.php:131 -#: src/usr/local/www/vpn_openvpn_client.php:802 +#: src/usr/local/www/vpn_openvpn_client.php:817 #: src/usr/local/www/vpn_openvpn_csc.php:668 #: src/usr/local/www/vpn_openvpn_server.php:1199 #: src/usr/local/www/widgets/widgets/installed_packages.widget.php:88 @@ -6269,7 +6299,7 @@ msgid "Are you sure you want to proceed?" msgstr "" #: src/usr/local/www/diag_dns.php:63 src/usr/local/www/diag_dns.php:223 -#: src/usr/local/www/head.inc:325 +#: src/usr/local/www/head.inc:333 msgid "DNS Lookup" msgstr "" @@ -6290,7 +6320,7 @@ msgid "No record found" msgstr "" #: src/usr/local/www/diag_dns.php:193 src/usr/local/www/diag_tables.php:218 -#: src/usr/local/www/interfaces.php:3054 src/usr/local/www/interfaces.php:3078 +#: src/usr/local/www/interfaces.php:3058 src/usr/local/www/interfaces.php:3082 #: src/usr/local/www/interfaces_ppps_edit.php:626 #: src/usr/local/www/load_balancer_pool_edit.php:412 #: src/usr/local/www/load_balancer_virtual_server.php:156 @@ -6308,7 +6338,7 @@ msgstr "" #: src/usr/local/www/services_unbound_host_edit.php:263 #: src/usr/local/www/status_graph.php:194 #: src/usr/local/www/status_logs_vpn.php:173 -#: src/usr/local/www/status_logs_vpn.php:423 +#: src/usr/local/www/status_logs_vpn.php:432 #: src/usr/local/www/system_advanced_notifications.php:267 #: src/usr/local/www/vpn_ipsec_phase2.php:714 #: src/usr/local/www/vpn_l2tp_users_edit.php:209 @@ -6316,16 +6346,18 @@ msgid "IP Address" msgstr "" #: src/usr/local/www/diag_dns.php:194 src/usr/local/www/status_graph.php:195 -#: src/usr/local/www/system_authservers.php:407 +#: src/usr/local/www/system_authservers.php:408 msgid "Host Name" msgstr "" #: src/usr/local/www/diag_dns.php:197 #: src/usr/local/www/services_rfc2136.php:114 #: src/usr/local/www/services_rfc2136_edit.php:254 -#: src/usr/local/www/status_ntpd.php:199 src/usr/local/www/vpn_l2tp.php:345 -#: src/usr/local/www/vpn_openvpn_client.php:436 -#: src/usr/local/www/vpn_openvpn_client.php:800 +#: src/usr/local/www/status_ntpd.php:199 +#: src/usr/local/www/system_certmanager.php:1055 +#: src/usr/local/www/vpn_l2tp.php:345 +#: src/usr/local/www/vpn_openvpn_client.php:444 +#: src/usr/local/www/vpn_openvpn_client.php:815 #: src/usr/local/www/vpn_openvpn_csc.php:322 #: src/usr/local/www/vpn_openvpn_server.php:592 #: src/usr/local/www/vpn_openvpn_server.php:610 @@ -6372,7 +6404,7 @@ msgid "More information" msgstr "" #: src/usr/local/www/diag_dns.php:293 src/usr/local/www/diag_ping.php:68 -#: src/usr/local/www/diag_ping.php:172 src/usr/local/www/head.inc:337 +#: src/usr/local/www/diag_ping.php:172 src/usr/local/www/head.inc:345 msgid "Ping" msgstr "" @@ -6390,77 +6422,78 @@ msgstr "" msgid "IP Info @ DNS Stuff" msgstr "" -#: src/usr/local/www/diag_dump_states.php:73 +#: src/usr/local/www/diag_dump_states.php:88 #: src/usr/local/www/diag_dump_states_sources.php:73 #: src/usr/local/www/status_openvpn.php:81 #: src/usr/local/www/widgets/widgets/openvpn.widget.php:71 msgid "invalid input" msgstr "" -#: src/usr/local/www/diag_dump_states.php:93 +#: src/usr/local/www/diag_dump_states.php:108 msgid "Show States" msgstr "" -#: src/usr/local/www/diag_dump_states.php:124 -#: src/usr/local/www/diag_dump_states.php:166 +#: src/usr/local/www/diag_dump_states.php:139 +#: src/usr/local/www/diag_dump_states.php:181 #: src/usr/local/www/diag_dump_states_sources.php:91 #: src/usr/local/www/diag_resetstate.php:113 #: src/usr/local/www/diag_states_summary.php:181 -#: src/usr/local/www/diag_states_summary.php:183 src/usr/local/www/head.inc:345 +#: src/usr/local/www/diag_states_summary.php:183 +#: src/usr/local/www/firewall_rules.php:385 src/usr/local/www/head.inc:353 msgid "States" msgstr "" -#: src/usr/local/www/diag_dump_states.php:126 +#: src/usr/local/www/diag_dump_states.php:141 #: src/usr/local/www/diag_dump_states_sources.php:92 #: src/usr/local/www/diag_resetstate.php:116 #: src/usr/local/www/diag_resetstate.php:143 msgid "Source Tracking" msgstr "" -#: src/usr/local/www/diag_dump_states.php:128 +#: src/usr/local/www/diag_dump_states.php:143 #: src/usr/local/www/diag_dump_states_sources.php:93 #: src/usr/local/www/diag_resetstate.php:119 msgid "Reset States" msgstr "" -#: src/usr/local/www/diag_dump_states.php:136 +#: src/usr/local/www/diag_dump_states.php:151 msgid "State filter" msgstr "" -#: src/usr/local/www/diag_dump_states.php:140 +#: src/usr/local/www/diag_dump_states.php:155 #: src/usr/local/www/diag_dump_states_sources.php:130 msgid "Filter expression" msgstr "" -#: src/usr/local/www/diag_dump_states.php:146 +#: src/usr/local/www/diag_dump_states.php:161 #: src/usr/local/www/diag_routes.php:129 src/usr/local/www/status_graph.php:187 msgid "Filter" msgstr "" -#: src/usr/local/www/diag_dump_states.php:154 +#: src/usr/local/www/diag_dump_states.php:169 msgid "Kill States" msgstr "" -#: src/usr/local/www/diag_dump_states.php:157 +#: src/usr/local/www/diag_dump_states.php:172 msgid "Kill filtered states" msgstr "" -#: src/usr/local/www/diag_dump_states.php:159 +#: src/usr/local/www/diag_dump_states.php:174 msgid "Remove all states to and from the filtered address" msgstr "" -#: src/usr/local/www/diag_dump_states.php:173 +#: src/usr/local/www/diag_dump_states.php:188 #: src/usr/local/www/diag_packet_capture.php:323 #: src/usr/local/www/diag_states_summary.php:182 -#: src/usr/local/www/firewall_nat.php:213 +#: src/usr/local/www/firewall_nat.php:246 #: src/usr/local/www/firewall_nat_edit.php:245 #: src/usr/local/www/firewall_nat_edit.php:248 -#: src/usr/local/www/firewall_nat_edit.php:713 +#: src/usr/local/www/firewall_nat_edit.php:726 #: src/usr/local/www/firewall_nat_out_edit.php:181 #: src/usr/local/www/firewall_nat_out_edit.php:502 -#: src/usr/local/www/firewall_rules.php:313 +#: src/usr/local/www/firewall_rules.php:386 #: src/usr/local/www/firewall_rules_edit.php:432 -#: src/usr/local/www/firewall_rules_edit.php:1189 +#: src/usr/local/www/firewall_rules_edit.php:1201 #: src/usr/local/www/interfaces_bridge_edit.php:513 #: src/usr/local/www/load_balancer_virtual_server.php:155 #: src/usr/local/www/services_rfc2136_edit.php:261 @@ -6468,37 +6501,49 @@ msgstr "" #: src/usr/local/www/status_ipsec_spd.php:94 #: src/usr/local/www/status_logs_common.inc:465 #: src/usr/local/www/status_logs_filter.php:196 -#: src/usr/local/www/status_logs_filter_dynamic.php:422 +#: src/usr/local/www/status_logs_filter_dynamic.php:427 #: src/usr/local/www/status_upnp.php:104 #: src/usr/local/www/system_advanced_admin.php:340 #: src/usr/local/www/system_advanced_admin.php:344 #: src/usr/local/www/system_advanced_admin.php:352 #: src/usr/local/www/vpn_ipsec_phase2.php:630 -#: src/usr/local/www/vpn_openvpn_client.php:464 -#: src/usr/local/www/vpn_openvpn_client.php:799 +#: src/usr/local/www/vpn_openvpn_client.php:472 +#: src/usr/local/www/vpn_openvpn_client.php:814 #: src/usr/local/www/vpn_openvpn_server.php:662 msgid "Protocol" msgstr "" -#: src/usr/local/www/diag_dump_states.php:174 +#: src/usr/local/www/diag_dump_states.php:189 msgid "Source -> Router -> Destination" msgstr "" -#: src/usr/local/www/diag_dump_states.php:175 -#: src/usr/local/www/status_dhcpv6_leases.php:541 +#: src/usr/local/www/diag_dump_states.php:190 +#: src/usr/local/www/status_dhcpv6_leases.php:551 msgid "State" msgstr "" -#: src/usr/local/www/diag_dump_states.php:215 +#: src/usr/local/www/diag_dump_states.php:191 +#: src/usr/local/www/status_rrd_graph.php:438 +#: src/usr/local/www/status_rrd_graph_settings.php:77 +#: src/usr/local/www/status_rrd_graph_settings.php:148 +msgid "Packets" +msgstr "" + +#: src/usr/local/www/diag_dump_states.php:192 +#: src/usr/local/www/diag_pftop.php:152 +msgid "Bytes" +msgstr "" + +#: src/usr/local/www/diag_dump_states.php:254 #, php-format msgid "Remove all state entries from %1$s to %2$s" msgstr "" -#: src/usr/local/www/diag_dump_states.php:229 +#: src/usr/local/www/diag_dump_states.php:269 msgid "No states were found that match the current filter" msgstr "" -#: src/usr/local/www/diag_dump_states.php:231 +#: src/usr/local/www/diag_dump_states.php:271 msgid "No states were found" msgstr "" @@ -6541,7 +6586,7 @@ msgstr "" msgid "No source tracking entries were found." msgstr "" -#: src/usr/local/www/diag_gmirror.php:67 src/usr/local/www/head.inc:330 +#: src/usr/local/www/diag_gmirror.php:67 src/usr/local/www/head.inc:338 msgid "GEOM Mirrors" msgstr "" @@ -6785,7 +6830,7 @@ msgstr "" msgid "Halt" msgstr "" -#: src/usr/local/www/diag_limiter_info.php:65 src/usr/local/www/head.inc:334 +#: src/usr/local/www/diag_limiter_info.php:65 src/usr/local/www/head.inc:342 msgid "Limiter Info" msgstr "" @@ -6799,7 +6844,7 @@ msgstr "" #: src/usr/local/www/diag_limiter_info.php:77 #: src/usr/local/www/firewall_shaper_queues.php:221 -#: src/usr/local/www/head.inc:295 src/usr/local/www/status_queues.php:145 +#: src/usr/local/www/head.inc:303 src/usr/local/www/status_queues.php:145 #: src/usr/local/www/status_rrd_graph.php:443 #: src/usr/local/www/status_rrd_graph_settings.php:79 #: src/usr/local/www/status_rrd_graph_settings.php:152 @@ -6814,7 +6859,7 @@ msgstr "" msgid "Gathering Limiter information, please wait..." msgstr "" -#: src/usr/local/www/diag_nanobsd.php:74 src/usr/local/www/head.inc:352 +#: src/usr/local/www/diag_nanobsd.php:74 src/usr/local/www/head.inc:360 msgid "NanoBSD" msgstr "" @@ -6957,15 +7002,15 @@ msgid "fdisk/bsdlabel log:" msgstr "" #: src/usr/local/www/diag_ndp.php:128 src/usr/local/www/diag_ndp.php:133 -#: src/usr/local/www/head.inc:335 +#: src/usr/local/www/head.inc:343 msgid "NDP Table" msgstr "" #: src/usr/local/www/diag_ndp.php:140 src/usr/local/www/interfaces.php:619 -#: src/usr/local/www/interfaces.php:1833 -#: src/usr/local/www/services_dhcpv6.php:897 +#: src/usr/local/www/interfaces.php:1837 +#: src/usr/local/www/services_dhcpv6.php:903 #: src/usr/local/www/services_dhcpv6_edit.php:242 -#: src/usr/local/www/status_dhcpv6_leases.php:443 +#: src/usr/local/www/status_dhcpv6_leases.php:453 msgid "IPv6 address" msgstr "" @@ -6974,7 +7019,7 @@ msgstr "" msgid "Download Capture" msgstr "" -#: src/usr/local/www/diag_packet_capture.php:118 src/usr/local/www/head.inc:349 +#: src/usr/local/www/diag_packet_capture.php:118 src/usr/local/www/head.inc:357 msgid "Packet Capture" msgstr "" @@ -7010,9 +7055,9 @@ msgstr "" #: src/usr/local/www/diag_packet_capture.php:231 #: src/usr/local/www/diag_packet_capture.php:392 #: src/usr/local/www/diag_packet_capture.php:460 -#: src/usr/local/www/status_dhcp_leases.php:373 -#: src/usr/local/www/status_dhcpv6_leases.php:448 -#: src/usr/local/www/status_dhcpv6_leases.php:539 +#: src/usr/local/www/status_dhcp_leases.php:382 +#: src/usr/local/www/status_dhcpv6_leases.php:458 +#: src/usr/local/www/status_dhcpv6_leases.php:549 #: src/usr/local/www/status_rrd_graph.php:597 #: src/usr/local/www/status_rrd_graph.php:600 msgid "Start" @@ -7057,7 +7102,7 @@ msgid "IPv6 Only" msgstr "" #: src/usr/local/www/diag_packet_capture.php:313 -#: src/usr/local/www/firewall_rules_edit.php:1178 +#: src/usr/local/www/firewall_rules_edit.php:1190 #: src/usr/local/www/system_gateways_edit.php:687 msgid "Address Family" msgstr "" @@ -7089,13 +7134,13 @@ msgstr "" #: src/usr/local/www/diag_testport.php:83 #: src/usr/local/www/diag_testport.php:263 #: src/usr/local/www/firewall_aliases_edit.php:585 -#: src/usr/local/www/firewall_nat_edit.php:873 +#: src/usr/local/www/firewall_nat_edit.php:886 #: src/usr/local/www/firewall_nat_out_edit.php:527 #: src/usr/local/www/firewall_nat_out_edit.php:551 #: src/usr/local/www/firewall_nat_out_edit.php:607 -#: src/usr/local/www/firewall_rules.php:315 -#: src/usr/local/www/firewall_rules.php:317 -#: src/usr/local/www/interfaces.php:3060 src/usr/local/www/interfaces.php:3084 +#: src/usr/local/www/firewall_rules.php:388 +#: src/usr/local/www/firewall_rules.php:390 +#: src/usr/local/www/interfaces.php:3064 src/usr/local/www/interfaces.php:3088 #: src/usr/local/www/load_balancer_pool.php:157 #: src/usr/local/www/load_balancer_pool_edit.php:107 #: src/usr/local/www/load_balancer_pool_edit.php:371 @@ -7137,7 +7182,7 @@ msgid "" msgstr "" #: src/usr/local/www/diag_packet_capture.php:366 -#: src/usr/local/www/services_router_advertisements.php:141 +#: src/usr/local/www/services_router_advertisements.php:145 msgid "Normal" msgstr "" @@ -7146,7 +7191,7 @@ msgid "Medium" msgstr "" #: src/usr/local/www/diag_packet_capture.php:368 -#: src/usr/local/www/services_router_advertisements.php:142 +#: src/usr/local/www/services_router_advertisements.php:146 msgid "High" msgstr "" @@ -7192,7 +7237,7 @@ msgstr "" msgid "Packets Captured" msgstr "" -#: src/usr/local/www/diag_pf_info.php:65 src/usr/local/www/head.inc:339 +#: src/usr/local/www/diag_pf_info.php:65 src/usr/local/www/head.inc:347 msgid "pfInfo" msgstr "" @@ -7212,7 +7257,7 @@ msgstr "" msgid "Gathering PF information, please wait..." msgstr "" -#: src/usr/local/www/diag_pftop.php:65 src/usr/local/www/head.inc:340 +#: src/usr/local/www/diag_pftop.php:65 src/usr/local/www/head.inc:348 msgid "pfTop" msgstr "" @@ -7221,8 +7266,8 @@ msgid "pfTop Configuration" msgstr "" #: src/usr/local/www/diag_pftop.php:128 -#: src/usr/local/www/firewall_rules_edit.php:1555 -#: src/usr/local/www/services_captiveportal.php:988 +#: src/usr/local/www/firewall_rules_edit.php:1567 +#: src/usr/local/www/services_captiveportal.php:999 msgid "default" msgstr "" @@ -7267,17 +7312,13 @@ msgstr "" msgid "Age" msgstr "" -#: src/usr/local/www/diag_pftop.php:152 -msgid "Bytes" -msgstr "" - #: src/usr/local/www/diag_pftop.php:153 msgid "Destination Address" msgstr "" #: src/usr/local/www/diag_pftop.php:154 #: src/usr/local/www/firewall_nat_out.php:315 -#: src/usr/local/www/firewall_nat_out.php:563 +#: src/usr/local/www/firewall_nat_out.php:567 #: src/usr/local/www/status_logs_common.inc:499 msgid "Destination Port" msgstr "" @@ -7296,14 +7337,14 @@ msgstr "" #: src/usr/local/www/diag_pftop.php:160 src/usr/local/www/diag_testport.php:271 #: src/usr/local/www/firewall_nat_out.php:313 -#: src/usr/local/www/firewall_nat_out.php:561 +#: src/usr/local/www/firewall_nat_out.php:565 #: src/usr/local/www/status_logs_common.inc:458 msgid "Source Port" msgstr "" #: src/usr/local/www/diag_pftop.php:161 src/usr/local/www/diag_testport.php:286 #: src/usr/local/www/diag_traceroute.php:179 -#: src/usr/local/www/firewall_nat.php:214 +#: src/usr/local/www/firewall_nat.php:247 #: src/usr/local/www/status_logs_settings.php:355 msgid "Source Address" msgstr "" @@ -7322,9 +7363,9 @@ msgstr "" #: src/usr/local/www/diag_ping.php:80 #: src/usr/local/www/firewall_nat_out_edit.php:590 -#: src/usr/local/www/interfaces.php:1862 src/usr/local/www/interfaces.php:2831 -#: src/usr/local/www/interfaces.php:2840 src/usr/local/www/interfaces.php:2849 -#: src/usr/local/www/interfaces.php:2907 src/usr/local/www/interfaces.php:3162 +#: src/usr/local/www/interfaces.php:1866 src/usr/local/www/interfaces.php:2835 +#: src/usr/local/www/interfaces.php:2844 src/usr/local/www/interfaces.php:2853 +#: src/usr/local/www/interfaces.php:2911 src/usr/local/www/interfaces.php:3166 #: src/usr/local/www/services_ntpd_gps.php:248 msgid "Default" msgstr "" @@ -7333,9 +7374,9 @@ msgstr "" #: src/usr/local/www/diag_traceroute.php:100 #: src/usr/local/www/load_balancer_monitor_edit.php:335 #: src/usr/local/www/load_balancer_monitor_edit.php:361 -#: src/usr/local/www/services_dnsmasq.php:367 +#: src/usr/local/www/services_dnsmasq.php:368 #: src/usr/local/www/services_dnsmasq_edit.php:246 -#: src/usr/local/www/services_unbound.php:425 +#: src/usr/local/www/services_unbound.php:413 #: src/usr/local/www/services_unbound_host_edit.php:247 #: src/usr/local/www/status_ipsec_leases.php:91 #: src/usr/local/www/services_rfc2136_edit.php:230 @@ -7417,8 +7458,8 @@ msgid "" "dashboard appears.)" msgstr "" -#: src/usr/local/www/diag_reboot.php:146 src/usr/local/www/head.inc:341 -#: src/usr/local/www/interfaces.php:1981 +#: src/usr/local/www/diag_reboot.php:146 src/usr/local/www/head.inc:349 +#: src/usr/local/www/interfaces.php:1985 msgid "Reboot" msgstr "" @@ -7633,7 +7674,7 @@ msgstr "" msgid "Log type" msgstr "" -#: src/usr/local/www/diag_sockets.php:65 src/usr/local/www/head.inc:344 +#: src/usr/local/www/diag_sockets.php:65 src/usr/local/www/head.inc:352 msgid "Sockets" msgstr "" @@ -7676,22 +7717,22 @@ msgstr "" #: src/usr/local/www/diag_states_summary.php:180 #: src/usr/local/www/firewall_aliases.php:185 -#: src/usr/local/www/services_dnsmasq.php:369 -#: src/usr/local/www/services_dnsmasq.php:450 -#: src/usr/local/www/services_unbound.php:427 -#: src/usr/local/www/services_unbound.php:503 +#: src/usr/local/www/services_dnsmasq.php:370 +#: src/usr/local/www/services_dnsmasq.php:451 +#: src/usr/local/www/services_unbound.php:415 +#: src/usr/local/www/services_unbound.php:491 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:251 msgid "IP" msgstr "" #: src/usr/local/www/diag_states_summary.php:184 -#: src/usr/local/www/firewall_nat.php:215 +#: src/usr/local/www/firewall_nat.php:248 #: src/usr/local/www/status_logs_filter_summary.php:122 msgid "Source Ports" msgstr "" #: src/usr/local/www/diag_states_summary.php:185 -#: src/usr/local/www/firewall_nat.php:217 +#: src/usr/local/www/firewall_nat.php:250 msgid "Dest. Ports" msgstr "" @@ -7715,7 +7756,7 @@ msgstr "" msgid "By IP Pair" msgstr "" -#: src/usr/local/www/diag_system_activity.php:65 src/usr/local/www/head.inc:347 +#: src/usr/local/www/diag_system_activity.php:65 src/usr/local/www/head.inc:355 msgid "System Activity" msgstr "" @@ -7727,7 +7768,7 @@ msgstr "" msgid "Gathering CPU activity, please wait..." msgstr "" -#: src/usr/local/www/diag_tables.php:64 src/usr/local/www/head.inc:336 +#: src/usr/local/www/diag_tables.php:64 src/usr/local/www/head.inc:344 msgid "Tables" msgstr "" @@ -7752,7 +7793,7 @@ msgstr "" msgid "Table" msgstr "" -#: src/usr/local/www/diag_tables.php:151 src/usr/local/www/head.inc:198 +#: src/usr/local/www/diag_tables.php:151 src/usr/local/www/head.inc:206 #: src/usr/local/www/pkg_mgr_install.php:262 #: src/usr/local/www/pkg_mgr_installed.php:209 #: src/usr/local/www/system_certmanager.php:502 @@ -7781,7 +7822,7 @@ msgid "No entries exist in this table" msgstr "" #: src/usr/local/www/diag_testport.php:71 -#: src/usr/local/www/diag_testport.php:251 src/usr/local/www/head.inc:338 +#: src/usr/local/www/diag_testport.php:251 src/usr/local/www/head.inc:346 msgid "Test Port" msgstr "" @@ -7939,7 +7980,7 @@ msgid "" "Logs page" msgstr "" -#: src/usr/local/www/easyrule.php:112 src/usr/local/www/head.inc:298 +#: src/usr/local/www/easyrule.php:112 src/usr/local/www/head.inc:306 msgid "System Logs" msgstr "" @@ -8029,7 +8070,7 @@ msgstr "" #: src/usr/local/www/exec.php:254 src/usr/local/www/pkg_mgr.php:197 #: src/usr/local/www/widgets/widgets/services_status.widget.php:149 -#: src/usr/local/www/interfaces.php:2013 +#: src/usr/local/www/interfaces.php:2017 msgid "Clear" msgstr "" @@ -8071,17 +8112,17 @@ msgstr "" #: src/usr/local/www/firewall_aliases.php:197 #: src/usr/local/www/firewall_aliases_edit.php:71 #: src/usr/local/www/firewall_aliases_import.php:72 -#: src/usr/local/www/firewall_nat.php:182 +#: src/usr/local/www/firewall_nat.php:213 #: src/usr/local/www/firewall_nat_1to1.php:155 #: src/usr/local/www/firewall_nat_1to1_edit.php:281 -#: src/usr/local/www/firewall_nat_edit.php:646 +#: src/usr/local/www/firewall_nat_edit.php:659 #: src/usr/local/www/firewall_nat_npt.php:155 #: src/usr/local/www/firewall_nat_npt_edit.php:212 #: src/usr/local/www/firewall_nat_out.php:239 #: src/usr/local/www/firewall_nat_out_edit.php:393 #: src/usr/local/www/firewall_rules.php:72 -#: src/usr/local/www/firewall_rules.php:269 -#: src/usr/local/www/firewall_rules_edit.php:1016 +#: src/usr/local/www/firewall_rules.php:335 +#: src/usr/local/www/firewall_rules_edit.php:1028 #: src/usr/local/www/firewall_schedule.php:75 #: src/usr/local/www/firewall_schedule_edit.php:85 #: src/usr/local/www/firewall_shaper.php:75 @@ -8100,24 +8141,36 @@ msgid "The alias list has been changed." msgstr "" #: src/usr/local/www/firewall_aliases.php:207 -#: src/usr/local/www/firewall_nat.php:191 +#: src/usr/local/www/firewall_nat.php:222 #: src/usr/local/www/firewall_nat_1to1.php:164 #: src/usr/local/www/firewall_nat_npt.php:164 #: src/usr/local/www/firewall_nat_out.php:248 -#: src/usr/local/www/firewall_rules.php:280 +#: src/usr/local/www/firewall_rules.php:346 +#: src/usr/local/www/firewall_shaper.php:433 +#: src/usr/local/www/firewall_shaper_queues.php:239 +#: src/usr/local/www/firewall_shaper_vinterface.php:411 #: src/usr/local/www/firewall_shaper_wizards.php:122 #: src/usr/local/www/firewall_virtual_ip.php:279 +#: src/usr/local/www/interfaces_assign.php:505 #: src/usr/local/www/load_balancer_monitor.php:121 +#: src/usr/local/www/load_balancer_pool.php:135 #: src/usr/local/www/load_balancer_setting.php:135 #: src/usr/local/www/load_balancer_virtual_server.php:135 +#: src/usr/local/www/services_captiveportal_mac.php:192 #: src/usr/local/www/services_captiveportal_zones.php:102 #: src/usr/local/www/services_dhcp.php:718 #: src/usr/local/www/services_dhcpv6.php:459 #: src/usr/local/www/services_dnsmasq.php:228 +#: src/usr/local/www/services_igmpproxy.php:109 #: src/usr/local/www/services_pppoe.php:125 +#: src/usr/local/www/services_unbound.php:255 #: src/usr/local/www/services_unbound_acls.php:221 -#: src/usr/local/www/system_gateways.php:257 -#: src/usr/local/www/system_routes.php:257 src/usr/local/www/vpn_ipsec.php:271 +#: src/usr/local/www/services_unbound_advanced.php:234 +#: src/usr/local/www/status_lb_pool.php:148 +#: src/usr/local/www/system_advanced_sysctl.php:178 +#: src/usr/local/www/system_gateway_groups.php:134 +#: src/usr/local/www/system_gateways.php:258 +#: src/usr/local/www/system_routes.php:258 src/usr/local/www/vpn_ipsec.php:271 #: src/usr/local/www/vpn_ipsec_keys.php:118 #: src/usr/local/www/vpn_ipsec_mobile.php:440 msgid "You must apply the changes in order for them to take effect." @@ -8142,19 +8195,19 @@ msgid "Delete alias" msgstr "" #: src/usr/local/www/firewall_aliases.php:303 -#: src/usr/local/www/firewall_nat.php:401 -#: src/usr/local/www/firewall_nat.php:405 +#: src/usr/local/www/firewall_nat.php:455 +#: src/usr/local/www/firewall_nat.php:459 #: src/usr/local/www/firewall_nat_1to1.php:270 #: src/usr/local/www/firewall_nat_1to1.php:274 #: src/usr/local/www/firewall_nat_npt.php:259 #: src/usr/local/www/firewall_nat_npt.php:263 -#: src/usr/local/www/firewall_nat_out.php:523 #: src/usr/local/www/firewall_nat_out.php:527 -#: src/usr/local/www/firewall_rules.php:746 -#: src/usr/local/www/firewall_rules.php:750 +#: src/usr/local/www/firewall_nat_out.php:531 +#: src/usr/local/www/firewall_rules.php:824 +#: src/usr/local/www/firewall_rules.php:828 #: src/usr/local/www/firewall_schedule.php:278 #: src/usr/local/www/firewall_virtual_ip.php:363 -#: src/usr/local/www/interfaces.php:1888 src/usr/local/www/interfaces.php:3188 +#: src/usr/local/www/interfaces.php:1892 src/usr/local/www/interfaces.php:3192 #: src/usr/local/www/interfaces_assign.php:588 #: src/usr/local/www/interfaces_bridge.php:190 #: src/usr/local/www/interfaces_gif.php:164 @@ -8178,35 +8231,35 @@ msgstr "" #: src/usr/local/www/services_dhcp.php:871 #: src/usr/local/www/services_dhcp.php:1198 #: src/usr/local/www/services_dhcp.php:1346 -#: src/usr/local/www/services_dhcpv6.php:942 -#: src/usr/local/www/services_dnsmasq.php:432 -#: src/usr/local/www/services_dnsmasq.php:486 -#: src/usr/local/www/services_dyndns.php:235 +#: src/usr/local/www/services_dhcpv6.php:948 +#: src/usr/local/www/services_dnsmasq.php:433 +#: src/usr/local/www/services_dnsmasq.php:487 +#: src/usr/local/www/services_dyndns.php:245 #: src/usr/local/www/services_igmpproxy.php:178 #: src/usr/local/www/services_ntpd.php:338 #: src/usr/local/www/services_pppoe.php:181 #: src/usr/local/www/services_rfc2136.php:226 -#: src/usr/local/www/services_router_advertisements.php:365 -#: src/usr/local/www/services_unbound.php:492 -#: src/usr/local/www/services_unbound.php:541 +#: src/usr/local/www/services_router_advertisements.php:393 +#: src/usr/local/www/services_unbound.php:480 +#: src/usr/local/www/services_unbound.php:529 #: src/usr/local/www/services_unbound_acls.php:361 #: src/usr/local/www/services_wol.php:230 -#: src/usr/local/www/system_authservers.php:434 +#: src/usr/local/www/system_authservers.php:435 #: src/usr/local/www/system_camanager.php:464 #: src/usr/local/www/system_certmanager.php:839 #: src/usr/local/www/system_certmanager.php:1137 #: src/usr/local/www/system_crlmanager.php:572 #: src/usr/local/www/system_gateway_groups.php:204 -#: src/usr/local/www/system_gateways.php:350 +#: src/usr/local/www/system_gateways.php:351 #: src/usr/local/www/system_groupmanager.php:256 #: src/usr/local/www/system_groupmanager.php:331 -#: src/usr/local/www/system_routes.php:331 +#: src/usr/local/www/system_routes.php:332 #: src/usr/local/www/system_usermanager.php:415 #: src/usr/local/www/system_usermanager.php:461 #: src/usr/local/www/system_usermanager.php:540 #: src/usr/local/www/vpn_ipsec_keys.php:206 #: src/usr/local/www/vpn_l2tp_users.php:158 -#: src/usr/local/www/vpn_openvpn_client.php:839 +#: src/usr/local/www/vpn_openvpn_client.php:854 #: src/usr/local/www/vpn_openvpn_csc.php:704 #: src/usr/local/www/vpn_openvpn_server.php:1236 msgid "Add" @@ -8229,11 +8282,11 @@ msgstr "" #: src/usr/local/www/firewall_aliases_edit.php:71 #: src/usr/local/www/firewall_nat_1to1_edit.php:281 -#: src/usr/local/www/firewall_nat_edit.php:646 +#: src/usr/local/www/firewall_nat_edit.php:659 #: src/usr/local/www/firewall_nat_npt_edit.php:212 #: src/usr/local/www/firewall_nat_out_edit.php:393 -#: src/usr/local/www/firewall_rules.php:695 -#: src/usr/local/www/firewall_rules_edit.php:1016 +#: src/usr/local/www/firewall_rules.php:773 +#: src/usr/local/www/firewall_rules_edit.php:1028 #: src/usr/local/www/firewall_schedule_edit.php:85 #: src/usr/local/www/firewall_virtual_ip_edit.php:339 #: src/usr/local/www/interfaces_bridge_edit.php:360 @@ -8248,18 +8301,13 @@ msgstr "" #: src/usr/local/www/load_balancer_monitor_edit.php:230 #: src/usr/local/www/load_balancer_pool_edit.php:219 #: src/usr/local/www/load_balancer_virtual_server_edit.php:193 -#: src/usr/local/www/services_dhcp.php:682 -#: src/usr/local/www/services_dyndns_edit.php:257 +#: src/usr/local/www/services_dyndns_edit.php:263 #: src/usr/local/www/services_igmpproxy_edit.php:66 #: src/usr/local/www/services_pppoe_edit.php:314 #: src/usr/local/www/services_rfc2136_edit.php:160 #: src/usr/local/www/services_wol_edit.php:137 -#: src/usr/local/www/system_camanager.php:446 -#: src/usr/local/www/system_gateway_groups.php:186 #: src/usr/local/www/system_gateway_groups_edit.php:180 -#: src/usr/local/www/system_gateways.php:323 #: src/usr/local/www/system_gateways_edit.php:631 -#: src/usr/local/www/system_routes.php:306 #: src/usr/local/www/system_routes_edit.php:257 #: src/usr/local/www/vpn_ipsec_keys_edit.php:155 #: src/usr/local/www/vpn_l2tp_users_edit.php:63 @@ -8548,8 +8596,8 @@ msgstr "" #: src/usr/local/www/firewall_aliases_edit.php:687 #: src/usr/local/www/firewall_nat_1to1_edit.php:472 #: src/usr/local/www/firewall_nat_1to1_edit.php:499 -#: src/usr/local/www/firewall_nat_edit.php:745 -#: src/usr/local/www/firewall_nat_edit.php:812 +#: src/usr/local/www/firewall_nat_edit.php:758 +#: src/usr/local/www/firewall_nat_edit.php:825 #: src/usr/local/www/firewall_nat_out_edit.php:514 #: src/usr/local/www/firewall_nat_out_edit.php:538 #: src/usr/local/www/firewall_rules_edit.php:432 @@ -8559,17 +8607,17 @@ msgstr "" #: src/usr/local/www/load_balancer_monitor.php:141 #: src/usr/local/www/load_balancer_monitor_edit.php:114 #: src/usr/local/www/load_balancer_monitor_edit.php:316 -#: src/usr/local/www/services_captiveportal.php:986 +#: src/usr/local/www/services_captiveportal.php:997 #: src/usr/local/www/services_dhcp.php:1177 #: src/usr/local/www/services_igmpproxy.php:122 #: src/usr/local/www/services_igmpproxy_edit.php:202 #: src/usr/local/www/status_logs_vpn.php:210 -#: src/usr/local/www/status_logs_vpn.php:439 +#: src/usr/local/www/status_logs_vpn.php:448 #: src/usr/local/www/status_ntpd.php:202 #: src/usr/local/www/system_authservers.php:201 #: src/usr/local/www/system_authservers.php:224 -#: src/usr/local/www/system_authservers.php:406 -#: src/usr/local/www/system_authservers.php:463 +#: src/usr/local/www/system_authservers.php:407 +#: src/usr/local/www/system_authservers.php:464 #: src/usr/local/www/system_certmanager.php:808 #: src/usr/local/www/system_certmanager.php:816 #: src/usr/local/www/vpn_ipsec_keys.php:139 @@ -8598,31 +8646,25 @@ msgid "Address" msgstr "" #: src/usr/local/www/firewall_aliases_edit.php:744 -#: src/usr/local/www/firewall_nat.php:409 +#: src/usr/local/www/firewall_nat.php:463 #: src/usr/local/www/firewall_nat_1to1.php:278 #: src/usr/local/www/firewall_nat_npt.php:267 -#: src/usr/local/www/firewall_nat_out.php:531 -#: src/usr/local/www/firewall_rules.php:705 -#: src/usr/local/www/firewall_rules.php:754 +#: src/usr/local/www/firewall_nat_out.php:535 +#: src/usr/local/www/firewall_rules.php:832 #: src/usr/local/www/firewall_schedule_edit.php:653 #: src/usr/local/www/interfaces_assign.php:564 -#: src/usr/local/www/interfaces_vlan.php:159 src/usr/local/www/pkg.php:544 -#: src/usr/local/www/pkg_edit.php:1433 src/usr/local/www/services_dhcp.php:684 -#: src/usr/local/www/services_dhcp.php:1188 +#: src/usr/local/www/interfaces_vlan.php:159 +#: src/usr/local/www/pkg_edit.php:1433 src/usr/local/www/services_dhcp.php:1188 #: src/usr/local/www/services_dhcpv6.php:850 #: src/usr/local/www/services_dnsmasq_edit.php:322 #: src/usr/local/www/services_igmpproxy_edit.php:264 #: src/usr/local/www/services_ntpd.php:330 #: src/usr/local/www/services_pppoe_edit.php:557 -#: src/usr/local/www/services_router_advertisements.php:353 +#: src/usr/local/www/services_router_advertisements.php:381 #: src/usr/local/www/services_unbound_acls.php:296 #: src/usr/local/www/services_unbound_host_edit.php:323 -#: src/usr/local/www/system_camanager.php:451 +#: src/usr/local/www/status_ipsec_sad.php:138 #: src/usr/local/www/system_certmanager.php:827 -#: src/usr/local/www/system_certmanager.php:1121 -#: src/usr/local/www/system_gateway_groups.php:188 -#: src/usr/local/www/system_gateways.php:335 -#: src/usr/local/www/system_routes.php:318 #: src/usr/local/www/system_usermanager.php:545 msgid "Delete" msgstr "" @@ -8652,14 +8694,14 @@ msgid "Descriptions must be less than 200 characters long." msgstr "" #: src/usr/local/www/firewall_aliases_import.php:196 -#: src/usr/local/www/firewall_nat.php:296 -#: src/usr/local/www/firewall_nat.php:313 -#: src/usr/local/www/firewall_nat.php:331 -#: src/usr/local/www/firewall_nat.php:348 -#: src/usr/local/www/firewall_rules.php:628 -#: src/usr/local/www/firewall_rules.php:637 -#: src/usr/local/www/firewall_rules.php:646 -#: src/usr/local/www/firewall_rules.php:655 +#: src/usr/local/www/firewall_nat.php:338 +#: src/usr/local/www/firewall_nat.php:355 +#: src/usr/local/www/firewall_nat.php:373 +#: src/usr/local/www/firewall_nat.php:390 +#: src/usr/local/www/firewall_rules.php:706 +#: src/usr/local/www/firewall_rules.php:715 +#: src/usr/local/www/firewall_rules.php:724 +#: src/usr/local/www/firewall_rules.php:733 msgid "Alias details" msgstr "" @@ -8682,27 +8724,27 @@ msgid "" "li><li>10.40.1.10-10.40.1.19 Managed switches</li></ul>" msgstr "" -#: src/usr/local/www/firewall_nat.php:174 +#: src/usr/local/www/firewall_nat.php:205 msgid "Firewall: NAT: Port forward, enable/disable NAT rule" msgstr "" -#: src/usr/local/www/firewall_nat.php:182 -#: src/usr/local/www/firewall_nat.php:195 +#: src/usr/local/www/firewall_nat.php:213 +#: src/usr/local/www/firewall_nat.php:226 #: src/usr/local/www/firewall_nat_1to1.php:168 -#: src/usr/local/www/firewall_nat_edit.php:646 +#: src/usr/local/www/firewall_nat_edit.php:659 #: src/usr/local/www/firewall_nat_npt.php:168 #: src/usr/local/www/firewall_nat_out.php:252 msgid "Port Forward" msgstr "" -#: src/usr/local/www/firewall_nat.php:190 +#: src/usr/local/www/firewall_nat.php:221 #: src/usr/local/www/firewall_nat_1to1.php:163 #: src/usr/local/www/firewall_nat_npt.php:163 #: src/usr/local/www/firewall_nat_out.php:247 msgid "The NAT configuration has been changed." msgstr "" -#: src/usr/local/www/firewall_nat.php:196 +#: src/usr/local/www/firewall_nat.php:227 #: src/usr/local/www/firewall_nat_1to1.php:155 #: src/usr/local/www/firewall_nat_1to1.php:169 #: src/usr/local/www/firewall_nat_1to1_edit.php:281 @@ -8711,7 +8753,7 @@ msgstr "" msgid "1:1" msgstr "" -#: src/usr/local/www/firewall_nat.php:197 +#: src/usr/local/www/firewall_nat.php:228 #: src/usr/local/www/firewall_nat_1to1.php:170 #: src/usr/local/www/firewall_nat_npt.php:170 #: src/usr/local/www/firewall_nat_out.php:239 @@ -8720,7 +8762,7 @@ msgstr "" msgid "Outbound" msgstr "" -#: src/usr/local/www/firewall_nat.php:198 +#: src/usr/local/www/firewall_nat.php:229 #: src/usr/local/www/firewall_nat_1to1.php:171 #: src/usr/local/www/firewall_nat_npt.php:155 #: src/usr/local/www/firewall_nat_npt.php:171 @@ -8729,88 +8771,109 @@ msgstr "" msgid "NPt" msgstr "" -#: src/usr/local/www/firewall_nat.php:204 +#: src/usr/local/www/firewall_nat.php:237 #: src/usr/local/www/firewall_rules.php:72 -#: src/usr/local/www/firewall_rules.php:269 -#: src/usr/local/www/firewall_rules_edit.php:1016 -#: src/usr/local/www/head.inc:232 +#: src/usr/local/www/firewall_rules.php:335 +#: src/usr/local/www/firewall_rules_edit.php:1028 +#: src/usr/local/www/head.inc:240 msgid "Rules" msgstr "" -#: src/usr/local/www/firewall_nat.php:216 +#: src/usr/local/www/firewall_nat.php:249 msgid "Dest. Address" msgstr "" -#: src/usr/local/www/firewall_nat.php:218 +#: src/usr/local/www/firewall_nat.php:251 msgid "NAT IP" msgstr "" -#: src/usr/local/www/firewall_nat.php:219 +#: src/usr/local/www/firewall_nat.php:252 msgid "NAT Ports" msgstr "" -#: src/usr/local/www/firewall_nat.php:258 +#: src/usr/local/www/firewall_nat.php:300 #: src/usr/local/www/firewall_nat_1to1.php:211 #: src/usr/local/www/firewall_nat_npt.php:212 #: src/usr/local/www/vpn_ipsec.php:310 src/usr/local/www/vpn_ipsec.php:460 msgid "click to toggle enabled/disabled status" msgstr "" -#: src/usr/local/www/firewall_nat.php:265 +#: src/usr/local/www/firewall_nat.php:307 msgid "All traffic matching this NAT entry is passed" msgstr "" -#: src/usr/local/www/firewall_nat.php:269 +#: src/usr/local/www/firewall_nat.php:311 #, php-format msgid "Firewall rule ID %s is managed by this rule" msgstr "" -#: src/usr/local/www/firewall_nat.php:383 +#: src/usr/local/www/firewall_nat.php:425 msgid "Edit rule" msgstr "" -#: src/usr/local/www/firewall_nat.php:384 +#: src/usr/local/www/firewall_nat.php:426 msgid "Add a new NAT based on this one" msgstr "" -#: src/usr/local/www/firewall_nat.php:385 +#: src/usr/local/www/firewall_nat.php:427 msgid "Delete rule" msgstr "" -#: src/usr/local/www/firewall_nat.php:399 -#: src/usr/local/www/firewall_rules.php:744 +#: src/usr/local/www/firewall_nat.php:453 +#: src/usr/local/www/firewall_rules.php:822 msgid "Add rule to the top of the list" msgstr "" -#: src/usr/local/www/firewall_nat.php:403 -#: src/usr/local/www/firewall_rules.php:748 +#: src/usr/local/www/firewall_nat.php:457 +#: src/usr/local/www/firewall_rules.php:826 msgid "Add rule to the end of the list" msgstr "" -#: src/usr/local/www/firewall_nat.php:407 -#: src/usr/local/www/firewall_rules.php:752 +#: src/usr/local/www/firewall_nat.php:461 +#: src/usr/local/www/firewall_rules.php:830 msgid "Delete selected rules" msgstr "" -#: src/usr/local/www/firewall_nat.php:411 -#: src/usr/local/www/firewall_rules.php:756 +#: src/usr/local/www/firewall_nat.php:465 +#: src/usr/local/www/firewall_rules.php:834 msgid "Save rule order" msgstr "" -#: src/usr/local/www/firewall_nat.php:446 +#: src/usr/local/www/firewall_nat.php:469 +#: src/usr/local/www/firewall_rules.php:838 +msgid "Add separator" +msgstr "" + +#: src/usr/local/www/firewall_nat.php:471 +#: src/usr/local/www/firewall_rules.php:840 +msgid "Separator" +msgstr "" + +#: src/usr/local/www/firewall_nat.php:480 +#: src/usr/local/www/firewall_rules.php:882 +#: src/usr/local/www/interfaces.php:1899 src/usr/local/www/interfaces.php:3199 +msgid "Cancel" +msgstr "" + +#: src/usr/local/www/firewall_nat.php:482 +#: src/usr/local/www/firewall_rules.php:884 +msgid "Enter a description, Save, then drag to final location." +msgstr "" + +#: src/usr/local/www/firewall_nat.php:518 msgid "You have moved one or more Port Forward rules but have not yet saved" msgstr "" -#: src/usr/local/www/firewall_nat.php:461 -#: src/usr/local/www/firewall_rules.php:771 +#: src/usr/local/www/firewall_nat.php:533 +#: src/usr/local/www/firewall_rules.php:849 msgid "Legend" msgstr "" -#: src/usr/local/www/firewall_nat.php:462 -#: src/usr/local/www/firewall_nat_edit.php:919 -#: src/usr/local/www/firewall_nat_edit.php:954 -#: src/usr/local/www/firewall_rules.php:772 -#: src/usr/local/www/firewall_rules_edit.php:1065 +#: src/usr/local/www/firewall_nat.php:534 +#: src/usr/local/www/firewall_nat_edit.php:932 +#: src/usr/local/www/firewall_nat_edit.php:967 +#: src/usr/local/www/firewall_rules.php:850 +#: src/usr/local/www/firewall_rules_edit.php:1077 #: src/usr/local/www/services_captiveportal_mac.php:94 #: src/usr/local/www/services_captiveportal_mac_edit.php:236 #: src/usr/local/www/status_logs_common.inc:440 @@ -8819,7 +8882,7 @@ msgstr "" msgid "Pass" msgstr "" -#: src/usr/local/www/firewall_nat.php:463 +#: src/usr/local/www/firewall_nat.php:535 msgid "Linked rule" msgstr "" @@ -8851,19 +8914,19 @@ msgstr "" #: src/usr/local/www/firewall_nat_1to1.php:252 #: src/usr/local/www/firewall_nat_npt.php:242 -#: src/usr/local/www/firewall_nat_out.php:506 +#: src/usr/local/www/firewall_nat_out.php:510 msgid "Edit mapping" msgstr "" #: src/usr/local/www/firewall_nat_1to1.php:253 #: src/usr/local/www/firewall_nat_npt.php:243 -#: src/usr/local/www/firewall_nat_out.php:507 +#: src/usr/local/www/firewall_nat_out.php:511 msgid "Add a new mapping based on this one" msgstr "" #: src/usr/local/www/firewall_nat_1to1.php:254 #: src/usr/local/www/firewall_nat_npt.php:244 -#: src/usr/local/www/firewall_nat_out.php:508 +#: src/usr/local/www/firewall_nat_out.php:512 msgid "Delete mapping" msgstr "" @@ -8884,7 +8947,7 @@ msgstr "" #: src/usr/local/www/firewall_nat_1to1.php:280 #: src/usr/local/www/firewall_nat_npt.php:269 -#: src/usr/local/www/firewall_nat_out.php:533 +#: src/usr/local/www/firewall_nat_out.php:537 msgid "Save mapping order" msgstr "" @@ -8961,21 +9024,21 @@ msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:287 #: src/usr/local/www/firewall_nat_1to1_edit.php:329 -#: src/usr/local/www/firewall_nat_edit.php:534 -#: src/usr/local/www/firewall_nat_edit.php:580 -#: src/usr/local/www/firewall_rules_edit.php:1256 +#: src/usr/local/www/firewall_nat_edit.php:547 +#: src/usr/local/www/firewall_nat_edit.php:593 +#: src/usr/local/www/firewall_rules_edit.php:1268 msgid "Single host or alias" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:287 #: src/usr/local/www/firewall_nat_1to1_edit.php:329 -#: src/usr/local/www/firewall_nat_edit.php:534 -#: src/usr/local/www/firewall_nat_edit.php:580 +#: src/usr/local/www/firewall_nat_edit.php:547 +#: src/usr/local/www/firewall_nat_edit.php:593 #: src/usr/local/www/firewall_nat_out_edit.php:513 #: src/usr/local/www/firewall_nat_out_edit.php:537 -#: src/usr/local/www/firewall_rules_edit.php:1257 +#: src/usr/local/www/firewall_rules_edit.php:1269 #: src/usr/local/www/firewall_virtual_ip_edit.php:414 -#: src/usr/local/www/system_routes.php:275 +#: src/usr/local/www/system_routes.php:276 #: src/usr/local/www/vpn_ipsec_mobile.php:521 #: src/usr/local/www/vpn_ipsec_phase2.php:559 #: src/usr/local/www/vpn_ipsec_phase2.php:579 @@ -8985,26 +9048,26 @@ msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:292 #: src/usr/local/www/firewall_nat_1to1_edit.php:332 -#: src/usr/local/www/firewall_nat_edit.php:539 -#: src/usr/local/www/firewall_nat_edit.php:583 -#: src/usr/local/www/firewall_rules_edit.php:1268 +#: src/usr/local/www/firewall_nat_edit.php:552 +#: src/usr/local/www/firewall_nat_edit.php:596 +#: src/usr/local/www/firewall_rules_edit.php:1280 #: src/usr/local/www/guiconfig.inc:251 msgid "PPPoE clients" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:296 #: src/usr/local/www/firewall_nat_1to1_edit.php:336 -#: src/usr/local/www/firewall_nat_edit.php:543 -#: src/usr/local/www/firewall_nat_edit.php:587 -#: src/usr/local/www/firewall_rules_edit.php:1271 +#: src/usr/local/www/firewall_nat_edit.php:556 +#: src/usr/local/www/firewall_nat_edit.php:600 +#: src/usr/local/www/firewall_rules_edit.php:1283 #: src/usr/local/www/guiconfig.inc:252 msgid "L2TP clients" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:329 -#: src/usr/local/www/firewall_nat_edit.php:580 +#: src/usr/local/www/firewall_nat_edit.php:593 #: src/usr/local/www/firewall_nat_out_edit.php:513 -#: src/usr/local/www/firewall_rules_edit.php:1265 +#: src/usr/local/www/firewall_rules_edit.php:1277 msgid "This Firewall (self)" msgstr "" @@ -9025,37 +9088,38 @@ msgid "No BINAT (NOT)" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:414 -#: src/usr/local/www/firewall_nat_edit.php:672 +#: src/usr/local/www/firewall_nat_edit.php:685 msgid "" "This option is rarely needed, don't use this unless you know what you're " "doing." msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:426 -#: src/usr/local/www/firewall_nat_edit.php:684 +#: src/usr/local/www/firewall_nat_edit.php:697 #: src/usr/local/www/firewall_nat_npt_edit.php:189 -#: src/usr/local/www/firewall_rules.php:123 -#: src/usr/local/www/firewall_rules_edit.php:996 +#: src/usr/local/www/firewall_rules.php:168 +#: src/usr/local/www/firewall_rules_edit.php:1008 msgid "L2TP VPN" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:431 -#: src/usr/local/www/firewall_nat_edit.php:689 +#: src/usr/local/www/firewall_nat_edit.php:702 #: src/usr/local/www/firewall_nat_npt_edit.php:195 -#: src/usr/local/www/firewall_rules.php:130 -#: src/usr/local/www/firewall_rules_edit.php:1000 -#: src/usr/local/www/head.inc:255 src/usr/local/www/services_pppoe.php:116 +#: src/usr/local/www/firewall_rules.php:175 +#: src/usr/local/www/firewall_rules_edit.php:1012 +#: src/usr/local/www/head.inc:263 src/usr/local/www/services_pppoe.php:116 #: src/usr/local/www/services_pppoe.php:130 #: src/usr/local/www/services_pppoe_edit.php:314 msgid "PPPoE Server" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:436 -#: src/usr/local/www/firewall_nat_edit.php:694 +#: src/usr/local/www/firewall_nat_edit.php:707 #: src/usr/local/www/firewall_nat_npt_edit.php:201 -#: src/usr/local/www/firewall_rules.php:137 -#: src/usr/local/www/firewall_rules_edit.php:1005 -#: src/usr/local/www/head.inc:270 src/usr/local/www/head.inc:286 +#: src/usr/local/www/firewall_rules.php:182 +#: src/usr/local/www/firewall_rules_edit.php:1017 +#: src/usr/local/www/head.inc:278 src/usr/local/www/head.inc:294 +#: src/usr/local/www/status_graph.php:87 src/usr/local/www/status_graph.php:252 #: src/usr/local/www/status_ipsec.php:70 #: src/usr/local/www/status_ipsec_leases.php:68 #: src/usr/local/www/status_ipsec_sad.php:69 @@ -9076,7 +9140,7 @@ msgid "IPsec" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:449 -#: src/usr/local/www/firewall_nat_edit.php:707 +#: src/usr/local/www/firewall_nat_edit.php:720 #: src/usr/local/www/firewall_nat_out_edit.php:496 msgid "" "Choose which interface this rule applies to. In most cases \"WAN\" is " @@ -9101,8 +9165,8 @@ msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:478 #: src/usr/local/www/firewall_nat_1to1_edit.php:505 -#: src/usr/local/www/firewall_nat_edit.php:751 -#: src/usr/local/www/firewall_nat_edit.php:818 +#: src/usr/local/www/firewall_nat_edit.php:764 +#: src/usr/local/www/firewall_nat_edit.php:831 msgid "Address/mask" msgstr "" @@ -9113,17 +9177,17 @@ msgid "" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:485 -#: src/usr/local/www/firewall_nat_edit.php:798 +#: src/usr/local/www/firewall_nat_edit.php:811 #: src/usr/local/www/firewall_nat_out.php:314 -#: src/usr/local/www/firewall_nat_out.php:562 +#: src/usr/local/www/firewall_nat_out.php:566 #: src/usr/local/www/firewall_nat_out_edit.php:181 #: src/usr/local/www/firewall_nat_out_edit.php:531 -#: src/usr/local/www/firewall_rules.php:316 +#: src/usr/local/www/firewall_rules.php:389 #: src/usr/local/www/firewall_rules_edit.php:435 #: src/usr/local/www/status_ipsec_sad.php:99 #: src/usr/local/www/status_ipsec_spd.php:92 #: src/usr/local/www/status_logs_filter.php:195 -#: src/usr/local/www/status_logs_filter_dynamic.php:421 +#: src/usr/local/www/status_logs_filter_dynamic.php:426 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:234 #: src/usr/local/www/widgets/widgets/log.widget.php:139 msgid "Destination" @@ -9136,23 +9200,21 @@ msgid "" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:523 -#: src/usr/local/www/firewall_nat_edit.php:909 +#: src/usr/local/www/firewall_nat_edit.php:922 msgid "Use system default" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:525 -#: src/usr/local/www/firewall_nat_edit.php:912 -#: src/usr/local/www/firewall_rules.php:702 -#: src/usr/local/www/services_dyndns_edit.php:276 -#: src/usr/local/www/system_gateways.php:332 -#: src/usr/local/www/system_routes.php:315 +#: src/usr/local/www/firewall_nat_edit.php:925 +#: src/usr/local/www/firewall_rules.php:780 +#: src/usr/local/www/services_dyndns_edit.php:282 #: src/usr/local/www/vpn_ipsec_phase1.php:868 #: src/usr/local/www/vpn_openvpn_csc.php:354 msgid "Disable" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:520 -#: src/usr/local/www/firewall_nat_edit.php:906 +#: src/usr/local/www/firewall_nat_edit.php:919 msgid "NAT reflection" msgstr "" @@ -9172,7 +9234,7 @@ msgid "Destination port to" msgstr "" #: src/usr/local/www/firewall_nat_edit.php:263 -#: src/usr/local/www/firewall_nat_edit.php:860 +#: src/usr/local/www/firewall_nat_edit.php:873 msgid "Redirect target IP" msgstr "" @@ -9240,26 +9302,26 @@ msgstr "" msgid "The destination port range overlaps with an existing entry." msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:494 +#: src/usr/local/www/firewall_nat_edit.php:495 msgid "NAT Port Forward" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:658 +#: src/usr/local/www/firewall_nat_edit.php:671 msgid "Edit Redirect entry" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:669 +#: src/usr/local/www/firewall_nat_edit.php:682 msgid "No RDR (NOT)" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:716 +#: src/usr/local/www/firewall_nat_edit.php:729 msgid "" "Choose which protocol this rule should match. In most cases \"TCP\" is " "specified." msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:720 src/usr/local/www/head.inc:197 -#: src/usr/local/www/interfaces.php:2096 +#: src/usr/local/www/firewall_nat_edit.php:733 src/usr/local/www/head.inc:205 +#: src/usr/local/www/interfaces.php:2100 #: src/usr/local/www/interfaces_bridge_edit.php:391 #: src/usr/local/www/services_dhcp.php:981 #: src/usr/local/www/services_dhcp.php:1029 @@ -9292,18 +9354,18 @@ msgstr "" msgid "Advanced" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:726 -#: src/usr/local/www/firewall_nat_edit.php:730 +#: src/usr/local/www/firewall_nat_edit.php:739 +#: src/usr/local/www/firewall_nat_edit.php:743 #: src/usr/local/www/firewall_nat_out.php:312 -#: src/usr/local/www/firewall_nat_out.php:560 +#: src/usr/local/www/firewall_nat_out.php:564 #: src/usr/local/www/firewall_nat_out_edit.php:181 #: src/usr/local/www/firewall_nat_out_edit.php:507 -#: src/usr/local/www/firewall_rules.php:314 +#: src/usr/local/www/firewall_rules.php:387 #: src/usr/local/www/firewall_rules_edit.php:434 #: src/usr/local/www/status_ipsec_sad.php:98 #: src/usr/local/www/status_ipsec_spd.php:91 #: src/usr/local/www/status_logs_filter.php:194 -#: src/usr/local/www/status_logs_filter_dynamic.php:420 +#: src/usr/local/www/status_logs_filter_dynamic.php:425 #: src/usr/local/www/vpn_ipsec_mobile.php:488 #: src/usr/local/www/vpn_ipsec_mobile.php:498 #: src/usr/local/www/widgets/widgets/ipsec.widget.php:233 @@ -9311,33 +9373,33 @@ msgstr "" msgid "Source" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:735 +#: src/usr/local/www/firewall_nat_edit.php:748 msgid "Source not" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:755 +#: src/usr/local/www/firewall_nat_edit.php:768 #: src/usr/local/www/firewall_virtual_ip.php:267 #: src/usr/local/www/firewall_virtual_ip_edit.php:394 msgid "Other" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:761 +#: src/usr/local/www/firewall_nat_edit.php:774 msgid "Source port range" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:769 -#: src/usr/local/www/firewall_nat_edit.php:830 +#: src/usr/local/www/firewall_nat_edit.php:782 +#: src/usr/local/www/firewall_nat_edit.php:843 msgid "From port" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:776 -#: src/usr/local/www/firewall_nat_edit.php:790 -#: src/usr/local/www/firewall_nat_edit.php:837 -#: src/usr/local/www/firewall_nat_edit.php:851 -#: src/usr/local/www/firewall_nat_edit.php:884 -#: src/usr/local/www/firewall_rules_edit.php:1327 -#: src/usr/local/www/firewall_rules_edit.php:1341 -#: src/usr/local/www/interfaces.php:2591 +#: src/usr/local/www/firewall_nat_edit.php:789 +#: src/usr/local/www/firewall_nat_edit.php:803 +#: src/usr/local/www/firewall_nat_edit.php:850 +#: src/usr/local/www/firewall_nat_edit.php:864 +#: src/usr/local/www/firewall_nat_edit.php:897 +#: src/usr/local/www/firewall_rules_edit.php:1339 +#: src/usr/local/www/firewall_rules_edit.php:1353 +#: src/usr/local/www/interfaces.php:2595 #: src/usr/local/www/interfaces_ppps_edit.php:729 #: src/usr/local/www/services_ntpd_gps.php:248 #: src/usr/local/www/status_rrd_graph.php:471 @@ -9345,12 +9407,12 @@ msgstr "" msgid "Custom" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:783 -#: src/usr/local/www/firewall_nat_edit.php:844 +#: src/usr/local/www/firewall_nat_edit.php:796 +#: src/usr/local/www/firewall_nat_edit.php:857 msgid "To port" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:792 +#: src/usr/local/www/firewall_nat_edit.php:805 msgid "" "Specify the source port or port range for this rule. This is usually random " "and almost never equal to the destination port range (and should usually be " @@ -9358,32 +9420,32 @@ msgid "" "single port." msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:802 +#: src/usr/local/www/firewall_nat_edit.php:815 msgid "Destination not" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:822 +#: src/usr/local/www/firewall_nat_edit.php:835 msgid "Destination port range" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:853 +#: src/usr/local/www/firewall_nat_edit.php:866 msgid "" "Specify the port or port range for the destination of the packet for this " "mapping. You can leave the 'to' field empty if you only want to map a single " "port " msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:862 +#: src/usr/local/www/firewall_nat_edit.php:875 msgid "" "Enter the internal IP address of the server on which you want to map the " "ports.<br />e.g.: 192.168.1.12" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:865 +#: src/usr/local/www/firewall_nat_edit.php:878 msgid "Redirect target port" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:875 +#: src/usr/local/www/firewall_nat_edit.php:888 msgid "" "Specify the port on the machine with the IP address entered above. In case " "of a port range, specify the beginning port of the range (the end port will " @@ -9391,83 +9453,83 @@ msgid "" "\" above" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:898 +#: src/usr/local/www/firewall_nat_edit.php:911 #: src/usr/local/www/firewall_nat_out_edit.php:632 -#: src/usr/local/www/firewall_rules_edit.php:1520 +#: src/usr/local/www/firewall_rules_edit.php:1532 msgid "No XMLRPC Sync" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:901 +#: src/usr/local/www/firewall_nat_edit.php:914 msgid "" "This prevents the rule on Master from automatically syncing to other CARP " "members. This does NOT prevent the rule from being overwritten on Slave." msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:910 +#: src/usr/local/www/firewall_nat_edit.php:923 msgid "Enable (NAT + Proxy)" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:911 +#: src/usr/local/www/firewall_nat_edit.php:924 msgid "Enable (Pure NAT)" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:926 +#: src/usr/local/www/firewall_nat_edit.php:939 #, php-format msgid "Rule %s" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:929 +#: src/usr/local/www/firewall_nat_edit.php:942 msgid "View the filter rule" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:936 +#: src/usr/local/www/firewall_nat_edit.php:949 msgid "Create new associated filter rule" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:941 -#: src/usr/local/www/firewall_nat_edit.php:948 +#: src/usr/local/www/firewall_nat_edit.php:954 +#: src/usr/local/www/firewall_nat_edit.php:961 msgid "Filter rule association" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:952 +#: src/usr/local/www/firewall_nat_edit.php:965 msgid "Add associated filter rule" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:953 +#: src/usr/local/www/firewall_nat_edit.php:966 msgid "Add unassociated filter rule" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:956 +#: src/usr/local/www/firewall_nat_edit.php:969 msgid "" "The \"pass\" selection does not work properly with Multi-WAN. It will only " "work on an interface containing the default gateway." msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:965 +#: src/usr/local/www/firewall_nat_edit.php:978 #: src/usr/local/www/firewall_nat_out_edit.php:668 -#: src/usr/local/www/firewall_rules_edit.php:1650 +#: src/usr/local/www/firewall_rules_edit.php:1662 msgid "Rule Information" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:970 -#: src/usr/local/www/firewall_nat_edit.php:977 +#: src/usr/local/www/firewall_nat_edit.php:983 +#: src/usr/local/www/firewall_nat_edit.php:990 #: src/usr/local/www/firewall_nat_out_edit.php:673 #: src/usr/local/www/firewall_nat_out_edit.php:680 -#: src/usr/local/www/firewall_rules_edit.php:1655 -#: src/usr/local/www/firewall_rules_edit.php:1662 +#: src/usr/local/www/firewall_rules_edit.php:1667 +#: src/usr/local/www/firewall_rules_edit.php:1674 #: src/usr/local/www/license.php:70 msgid " by " msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:969 +#: src/usr/local/www/firewall_nat_edit.php:982 #: src/usr/local/www/firewall_nat_out_edit.php:672 -#: src/usr/local/www/firewall_rules_edit.php:1654 +#: src/usr/local/www/firewall_rules_edit.php:1666 msgid "Created" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:976 +#: src/usr/local/www/firewall_nat_edit.php:989 #: src/usr/local/www/firewall_nat_out_edit.php:679 -#: src/usr/local/www/firewall_rules_edit.php:1661 +#: src/usr/local/www/firewall_rules_edit.php:1673 msgid "Updated" msgstr "" @@ -9553,7 +9615,7 @@ msgstr "" #: src/usr/local/www/firewall_nat_out.php:262 #: src/usr/local/www/firewall_nat_out.php:266 -#: src/usr/local/www/interfaces.php:875 src/usr/local/www/interfaces.php:2920 +#: src/usr/local/www/interfaces.php:879 src/usr/local/www/interfaces.php:2924 #: src/usr/local/www/interfaces_wireless.php:136 #: src/usr/local/www/interfaces_wireless_edit.php:115 #: src/usr/local/www/interfaces_wireless_edit.php:221 @@ -9592,63 +9654,63 @@ msgid "Mappings" msgstr "" #: src/usr/local/www/firewall_nat_out.php:316 -#: src/usr/local/www/firewall_nat_out.php:564 +#: src/usr/local/www/firewall_nat_out.php:568 msgid "NAT Address" msgstr "" #: src/usr/local/www/firewall_nat_out.php:317 -#: src/usr/local/www/firewall_nat_out.php:565 +#: src/usr/local/www/firewall_nat_out.php:569 msgid "NAT Port" msgstr "" #: src/usr/local/www/firewall_nat_out.php:318 -#: src/usr/local/www/firewall_nat_out.php:566 +#: src/usr/local/www/firewall_nat_out.php:570 msgid "Static Port" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:352 +#: src/usr/local/www/firewall_nat_out.php:356 msgid "This rule is being ignored" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:357 +#: src/usr/local/www/firewall_nat_out.php:361 msgid "Click to toggle enabled/disabled status" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:493 -#: src/usr/local/www/firewall_nat_out.php:644 +#: src/usr/local/www/firewall_nat_out.php:497 +#: src/usr/local/www/firewall_nat_out.php:648 msgid "YES" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:495 -#: src/usr/local/www/firewall_nat_out.php:646 +#: src/usr/local/www/firewall_nat_out.php:499 +#: src/usr/local/www/firewall_nat_out.php:650 msgid "NO" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:521 +#: src/usr/local/www/firewall_nat_out.php:525 msgid "Add new mapping to the top of the list" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:525 +#: src/usr/local/www/firewall_nat_out.php:529 msgid "Add new mapping to the end of the list" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:529 +#: src/usr/local/www/firewall_nat_out.php:533 msgid "Delete selected map" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:529 +#: src/usr/local/www/firewall_nat_out.php:533 msgid "Delete selected maps" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:553 +#: src/usr/local/www/firewall_nat_out.php:557 msgid "Automatic rules:" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:577 +#: src/usr/local/www/firewall_nat_out.php:581 msgid "automatic outbound nat" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:666 +#: src/usr/local/www/firewall_nat_out.php:670 msgid "" "If automatic outbound NAT is selected, a mapping is automatically generated " "for each interface's subnet (except WAN-type connections) and the rules on " @@ -9662,7 +9724,7 @@ msgid "" "is setup, a " msgstr "" -#: src/usr/local/www/firewall_nat_out.php:673 +#: src/usr/local/www/firewall_nat_out.php:677 #: src/usr/local/www/firewall_nat_out_edit.php:582 #: src/usr/local/www/status_carp.php:211 #: src/usr/local/www/system_gateway_groups_edit.php:298 @@ -9671,11 +9733,11 @@ msgstr "" msgid "Virtual IP" msgstr "" -#: src/usr/local/www/firewall_nat_out.php:673 +#: src/usr/local/www/firewall_nat_out.php:677 msgid " may also be required." msgstr "" -#: src/usr/local/www/firewall_nat_out.php:706 +#: src/usr/local/www/firewall_nat_out.php:710 msgid "You have moved one or more NAT outbound mappings but have not yet saved" msgstr "" @@ -9850,77 +9912,81 @@ msgid "" "members. This does NOT prevent the rule from being overwritten on Slave." msgstr "" -#: src/usr/local/www/firewall_rules.php:167 +#: src/usr/local/www/firewall_rules.php:113 +msgid "States details" +msgstr "" + +#: src/usr/local/www/firewall_rules.php:211 #, php-format msgid "" "The settings have been applied. The firewall rules are now reloading in the " "background.<br />You can also %s monitor %s the reload progress" msgstr "" -#: src/usr/local/www/firewall_rules.php:256 -#: src/usr/local/www/firewall_rules_edit.php:1170 +#: src/usr/local/www/firewall_rules.php:322 +#: src/usr/local/www/firewall_rules_edit.php:1182 msgid "Floating" msgstr "" -#: src/usr/local/www/firewall_rules.php:280 +#: src/usr/local/www/firewall_rules.php:346 msgid "The firewall rule configuration has been changed." msgstr "" -#: src/usr/local/www/firewall_rules.php:306 +#: src/usr/local/www/firewall_rules.php:378 msgid "Rules (Drag to change order)" msgstr "" -#: src/usr/local/www/firewall_rules.php:318 -#: src/usr/local/www/firewall_rules_edit.php:1581 +#: src/usr/local/www/firewall_rules.php:391 +#: src/usr/local/www/firewall_rules_edit.php:1593 #: src/usr/local/www/interfaces.php:568 src/usr/local/www/interfaces.php:619 #: src/usr/local/www/services_dhcp.php:913 #: src/usr/local/www/services_dhcp_edit.php:554 #: src/usr/local/www/status_gateways.php:99 src/usr/local/www/system.php:421 #: src/usr/local/www/system.php:424 #: src/usr/local/www/system_gateway_groups_edit.php:268 -#: src/usr/local/www/system_gateways.php:277 +#: src/usr/local/www/system_gateways.php:278 #: src/usr/local/www/system_gateways_edit.php:704 -#: src/usr/local/www/system_routes.php:276 +#: src/usr/local/www/system_routes.php:277 #: src/usr/local/www/system_routes_edit.php:115 #: src/usr/local/www/system_routes_edit.php:290 msgid "Gateway" msgstr "" -#: src/usr/local/www/firewall_rules.php:319 +#: src/usr/local/www/firewall_rules.php:392 #: src/usr/local/www/status_queues.php:191 msgid "Queue" msgstr "" -#: src/usr/local/www/firewall_rules.php:320 -#: src/usr/local/www/firewall_rules_edit.php:1550 +#: src/usr/local/www/firewall_rules.php:393 +#: src/usr/local/www/firewall_rules_edit.php:1562 msgid "Schedule" msgstr "" -#: src/usr/local/www/firewall_rules.php:336 -#: src/usr/local/www/firewall_rules.php:429 +#: src/usr/local/www/firewall_rules.php:409 +#: src/usr/local/www/firewall_rules.php:506 msgid "traffic is passed" msgstr "" -#: src/usr/local/www/firewall_rules.php:345 +#: src/usr/local/www/firewall_rules.php:419 msgid "Anti-Lockout Rule" msgstr "" -#: src/usr/local/www/firewall_rules.php:347 -#: src/usr/local/www/firewall_rules.php:365 -#: src/usr/local/www/firewall_rules.php:383 +#: src/usr/local/www/firewall_rules.php:421 +#: src/usr/local/www/firewall_rules.php:440 +#: src/usr/local/www/firewall_rules.php:459 #: src/usr/local/www/load_balancer_monitor.php:129 #: src/usr/local/www/load_balancer_pool.php:143 #: src/usr/local/www/load_balancer_setting.php:120 #: src/usr/local/www/load_balancer_setting.php:143 #: src/usr/local/www/load_balancer_virtual_server.php:143 -#: src/usr/local/www/services_router_advertisements.php:389 +#: src/usr/local/www/services_router_advertisements.php:417 #: src/usr/local/www/status_logs_common.inc:120 #: src/usr/local/www/status_logs_settings.php:209 #: src/usr/local/www/status_logs_settings.php:243 #: src/usr/local/www/status_rrd_graph.php:472 #: src/usr/local/www/status_rrd_graph_settings.php:143 #: src/usr/local/www/status_rrd_graph_settings.php:181 -#: src/usr/local/www/system_authservers.php:391 +#: src/usr/local/www/system_authservers.php:393 #: src/usr/local/www/system_groupmanager.php:274 #: src/usr/local/www/system_groupmanager_addprivs.php:185 #: src/usr/local/www/system_usermanager.php:480 @@ -9931,232 +9997,226 @@ msgstr "" msgid "Settings" msgstr "" -#: src/usr/local/www/firewall_rules.php:354 -#: src/usr/local/www/firewall_rules.php:372 -#: src/usr/local/www/firewall_rules.php:420 +#: src/usr/local/www/firewall_rules.php:428 +#: src/usr/local/www/firewall_rules.php:447 +#: src/usr/local/www/firewall_rules.php:497 msgid "traffic is blocked" msgstr "" -#: src/usr/local/www/firewall_rules.php:356 +#: src/usr/local/www/firewall_rules.php:431 msgid "RFC 1918 networks" msgstr "" -#: src/usr/local/www/firewall_rules.php:363 -#: src/usr/local/www/interfaces.php:3113 +#: src/usr/local/www/firewall_rules.php:438 +#: src/usr/local/www/interfaces.php:3117 msgid "Block private networks" msgstr "" -#: src/usr/local/www/firewall_rules.php:374 -msgid "Reserved/not assigned by IANA" +#: src/usr/local/www/firewall_rules.php:450 +#, php-format +msgid "Reserved%sNot assigned by IANA" msgstr "" -#: src/usr/local/www/firewall_rules.php:381 -#: src/usr/local/www/interfaces.php:3123 +#: src/usr/local/www/firewall_rules.php:457 +#: src/usr/local/www/interfaces.php:3127 msgid "Block bogon networks" msgstr "" -#: src/usr/local/www/firewall_rules.php:423 +#: src/usr/local/www/firewall_rules.php:500 msgid "traffic is rejected" msgstr "" -#: src/usr/local/www/firewall_rules.php:426 +#: src/usr/local/www/firewall_rules.php:503 msgid "traffic is matched" msgstr "" -#: src/usr/local/www/firewall_rules.php:438 +#: src/usr/local/www/firewall_rules.php:515 msgid "advanced setting" msgstr "" -#: src/usr/local/www/firewall_rules.php:442 +#: src/usr/local/www/firewall_rules.php:519 msgid "traffic is logged" msgstr "" -#: src/usr/local/www/firewall_rules.php:461 +#: src/usr/local/www/firewall_rules.php:538 #: src/usr/local/www/firewall_schedule.php:68 #: src/usr/local/www/firewall_schedule_edit.php:89 #: src/usr/local/www/firewall_schedule_edit.php:293 msgid "Mon" msgstr "" -#: src/usr/local/www/firewall_rules.php:461 +#: src/usr/local/www/firewall_rules.php:538 #: src/usr/local/www/firewall_schedule.php:68 #: src/usr/local/www/firewall_schedule_edit.php:89 msgid "Tues" msgstr "" -#: src/usr/local/www/firewall_rules.php:461 +#: src/usr/local/www/firewall_rules.php:538 #: src/usr/local/www/firewall_schedule.php:68 #: src/usr/local/www/firewall_schedule_edit.php:89 #: src/usr/local/www/firewall_schedule_edit.php:295 msgid "Wed" msgstr "" -#: src/usr/local/www/firewall_rules.php:461 +#: src/usr/local/www/firewall_rules.php:538 #: src/usr/local/www/firewall_schedule.php:68 #: src/usr/local/www/firewall_schedule_edit.php:89 msgid "Thur" msgstr "" -#: src/usr/local/www/firewall_rules.php:461 +#: src/usr/local/www/firewall_rules.php:538 #: src/usr/local/www/firewall_schedule.php:68 #: src/usr/local/www/firewall_schedule_edit.php:89 #: src/usr/local/www/firewall_schedule_edit.php:297 msgid "Fri" msgstr "" -#: src/usr/local/www/firewall_rules.php:461 +#: src/usr/local/www/firewall_rules.php:538 #: src/usr/local/www/firewall_schedule.php:68 #: src/usr/local/www/firewall_schedule_edit.php:89 #: src/usr/local/www/firewall_schedule_edit.php:298 msgid "Sat" msgstr "" -#: src/usr/local/www/firewall_rules.php:461 +#: src/usr/local/www/firewall_rules.php:538 #: src/usr/local/www/firewall_schedule.php:68 #: src/usr/local/www/firewall_schedule_edit.php:89 #: src/usr/local/www/firewall_schedule_edit.php:299 msgid "Sun" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "January" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "February" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "March" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "April" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "May" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "June" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "July" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "August" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "September" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "October" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "November" msgstr "" -#: src/usr/local/www/firewall_rules.php:462 +#: src/usr/local/www/firewall_rules.php:539 #: src/usr/local/www/firewall_schedule.php:69 #: src/usr/local/www/firewall_schedule_edit.php:90 msgid "December" msgstr "" -#: src/usr/local/www/firewall_rules.php:575 +#: src/usr/local/www/firewall_rules.php:652 msgid "Traffic matching this rule is currently being denied" msgstr "" -#: src/usr/local/www/firewall_rules.php:579 +#: src/usr/local/www/firewall_rules.php:656 msgid "Traffic matching this rule is currently being allowed" msgstr "" -#: src/usr/local/www/firewall_rules.php:588 +#: src/usr/local/www/firewall_rules.php:665 msgid "This rule is not currently active because its period has expired" msgstr "" -#: src/usr/local/www/firewall_rules.php:616 -#: src/usr/local/www/firewall_rules_edit.php:1212 +#: src/usr/local/www/firewall_rules.php:694 +#: src/usr/local/www/firewall_rules_edit.php:1224 msgid "ICMP type" msgstr "" -#: src/usr/local/www/firewall_rules.php:680 -#: src/usr/local/www/firewall_rules_edit.php:1552 -#: src/usr/local/www/firewall_rules_edit.php:1593 -#: src/usr/local/www/firewall_rules_edit.php:1600 +#: src/usr/local/www/firewall_rules.php:758 +#: src/usr/local/www/firewall_rules_edit.php:1564 +#: src/usr/local/www/firewall_rules_edit.php:1605 +#: src/usr/local/www/firewall_rules_edit.php:1612 #: src/usr/local/www/status_ipsec.php:379 #: src/usr/local/www/vpn_ipsec_mobile.php:495 -#: src/usr/local/www/vpn_openvpn_client.php:515 +#: src/usr/local/www/vpn_openvpn_client.php:523 msgid "none" msgstr "" -#: src/usr/local/www/firewall_rules.php:696 -#: src/usr/local/www/system_gateway_groups.php:187 -#: src/usr/local/www/system_gateways.php:324 -#: src/usr/local/www/system_routes.php:308 +#: src/usr/local/www/firewall_rules.php:774 msgid "Copy" msgstr "" -#: src/usr/local/www/firewall_rules.php:733 +#: src/usr/local/www/firewall_rules.php:783 +msgid "Delete this rule" +msgstr "" + +#: src/usr/local/www/firewall_rules.php:811 msgid "No floating rules are currently defined." msgstr "" -#: src/usr/local/www/firewall_rules.php:735 +#: src/usr/local/www/firewall_rules.php:813 msgid "No rules are currently defined for this interface" msgstr "" -#: src/usr/local/www/firewall_rules.php:736 +#: src/usr/local/www/firewall_rules.php:814 msgid "" "All incoming connections on this interface will be blocked until you add " "pass rules." msgstr "" -#: src/usr/local/www/firewall_rules.php:738 +#: src/usr/local/www/firewall_rules.php:816 msgid "Click the button to add a new rule." msgstr "" -#: src/usr/local/www/firewall_rules.php:760 -msgid "Add separator" -msgstr "" - -#: src/usr/local/www/firewall_rules.php:762 -msgid "Separator" -msgstr "" - -#: src/usr/local/www/firewall_rules.php:773 -#: src/usr/local/www/firewall_rules_edit.php:1071 +#: src/usr/local/www/firewall_rules.php:851 +#: src/usr/local/www/firewall_rules_edit.php:1083 msgid "Match" msgstr "" -#: src/usr/local/www/firewall_rules.php:774 -#: src/usr/local/www/firewall_rules_edit.php:1066 +#: src/usr/local/www/firewall_rules.php:852 +#: src/usr/local/www/firewall_rules_edit.php:1078 #: src/usr/local/www/services_captiveportal_mac.php:95 #: src/usr/local/www/services_captiveportal_mac_edit.php:236 #: src/usr/local/www/status_logs_common.inc:481 @@ -10165,35 +10225,35 @@ msgstr "" msgid "Block" msgstr "" -#: src/usr/local/www/firewall_rules.php:775 -#: src/usr/local/www/firewall_rules_edit.php:1067 +#: src/usr/local/www/firewall_rules.php:853 +#: src/usr/local/www/firewall_rules_edit.php:1079 #: src/usr/local/www/widgets/widgets/log.widget.php:267 msgid "Reject" msgstr "" -#: src/usr/local/www/firewall_rules.php:776 -#: src/usr/local/www/firewall_rules_edit.php:1362 +#: src/usr/local/www/firewall_rules.php:854 +#: src/usr/local/www/firewall_rules_edit.php:1374 #: src/usr/local/www/status_logs_common.inc:804 msgid "Log" msgstr "" -#: src/usr/local/www/firewall_rules.php:777 +#: src/usr/local/www/firewall_rules.php:855 msgid "Advanced filter" msgstr "" -#: src/usr/local/www/firewall_rules.php:782 +#: src/usr/local/www/firewall_rules.php:860 msgid "" "Rules are evaluated on a first-match basis (i.e. the action of the first " "rule to match a packet will be executed). " msgstr "" -#: src/usr/local/www/firewall_rules.php:784 +#: src/usr/local/www/firewall_rules.php:862 msgid "" "This means that if you use block rules, you'll have to pay attention to the " "rule order. Everything that isn't explicitly passed is blocked by default. " msgstr "" -#: src/usr/local/www/firewall_rules.php:788 +#: src/usr/local/www/firewall_rules.php:866 msgid "" "Floating rules are evaluated on a first-match basis (i.e. the action of the " "first rule to match a packet will be executed) only if the 'quick' option is " @@ -10202,16 +10262,7 @@ msgid "" "matches, the per-interface or default rules are used. " msgstr "" -#: src/usr/local/www/firewall_rules.php:841 -msgid "Enter a description, Save, then drag to final location." -msgstr "" - -#: src/usr/local/www/firewall_rules.php:843 -#: src/usr/local/www/interfaces.php:1895 src/usr/local/www/interfaces.php:3195 -msgid "Cancel" -msgstr "" - -#: src/usr/local/www/firewall_rules.php:953 +#: src/usr/local/www/firewall_rules.php:918 msgid "You have moved one or more rules but have not yet saved" msgstr "" @@ -10451,40 +10502,40 @@ msgid "" "flags as well." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:942 +#: src/usr/local/www/firewall_rules_edit.php:954 msgid "set" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:943 +#: src/usr/local/www/firewall_rules_edit.php:955 msgid "out of" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:970 +#: src/usr/local/www/firewall_rules_edit.php:982 msgid " Any flags." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1027 +#: src/usr/local/www/firewall_rules_edit.php:1039 msgid "Edit Firewall rule" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1032 +#: src/usr/local/www/firewall_rules_edit.php:1044 #: src/usr/local/www/status_ipsec_leases.php:90 msgid "ID" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1041 +#: src/usr/local/www/firewall_rules_edit.php:1053 msgid "Tracker" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1049 +#: src/usr/local/www/firewall_rules_edit.php:1061 msgid "After" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1056 +#: src/usr/local/www/firewall_rules_edit.php:1068 msgid "Ruleid" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1076 +#: src/usr/local/www/firewall_rules_edit.php:1088 #: src/usr/local/www/services_captiveportal_mac.php:208 #: src/usr/local/www/services_captiveportal_mac_edit.php:131 #: src/usr/local/www/services_captiveportal_mac_edit.php:234 @@ -10493,14 +10544,14 @@ msgstr "" #: src/usr/local/www/services_unbound_acls.php:323 #: src/usr/local/www/status_logs_common.inc:957 #: src/usr/local/www/status_logs_filter.php:182 -#: src/usr/local/www/status_logs_filter_dynamic.php:417 +#: src/usr/local/www/status_logs_filter_dynamic.php:422 #: src/usr/local/www/status_logs_vpn.php:171 -#: src/usr/local/www/status_logs_vpn.php:397 +#: src/usr/local/www/status_logs_vpn.php:406 #: src/usr/local/www/widgets/widgets/services_status.widget.php:92 msgid "Action" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1079 +#: src/usr/local/www/firewall_rules_edit.php:1091 msgid "" "Choose what to do with packets that match the criteria specified below.<br/" ">Hint: the difference between block and reject is that with reject, a packet " @@ -10509,103 +10560,103 @@ msgid "" "original packet is discarded." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1090 +#: src/usr/local/www/firewall_rules_edit.php:1102 msgid "Set this option to disable this rule without removing it from the list." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1096 +#: src/usr/local/www/firewall_rules_edit.php:1108 msgid "Quick" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1099 +#: src/usr/local/www/firewall_rules_edit.php:1111 msgid "" "Set this option if you need to apply this action to traffic that matches " "this rule immediately." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1109 +#: src/usr/local/www/firewall_rules_edit.php:1121 msgid "View the NAT rule" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1114 +#: src/usr/local/www/firewall_rules_edit.php:1126 msgid "Associated filter rule" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1146 +#: src/usr/local/www/firewall_rules_edit.php:1158 msgid "Choose the interface(s) for this rule." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1153 +#: src/usr/local/www/firewall_rules_edit.php:1165 msgid "Choose the interface from which packets must come to match this rule." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1163 +#: src/usr/local/www/firewall_rules_edit.php:1175 msgid "in" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1164 +#: src/usr/local/www/firewall_rules_edit.php:1176 msgid "out" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1159 +#: src/usr/local/www/firewall_rules_edit.php:1171 #: src/usr/local/www/services_captiveportal_hostname_edit.php:211 #: src/usr/local/www/services_captiveportal_ip_edit.php:258 #: src/usr/local/www/status_ipsec_spd.php:93 msgid "Direction" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1185 +#: src/usr/local/www/firewall_rules_edit.php:1197 msgid "Select the Internet Protocol version this rule applies to" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1208 +#: src/usr/local/www/firewall_rules_edit.php:1220 msgid "Choose which IP protocol this rule should match." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1215 -#: src/usr/local/www/firewall_rules_edit.php:1222 +#: src/usr/local/www/firewall_rules_edit.php:1227 +#: src/usr/local/www/firewall_rules_edit.php:1234 msgid "" "If you selected ICMP for the protocol above, you may specify an ICMP type " "here." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1219 +#: src/usr/local/www/firewall_rules_edit.php:1231 msgid "ICMPv6 type" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1234 +#: src/usr/local/www/firewall_rules_edit.php:1246 msgid " not" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1261 +#: src/usr/local/www/firewall_rules_edit.php:1273 msgid "This firewall (self)" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1285 +#: src/usr/local/www/firewall_rules_edit.php:1297 msgid " Type" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1292 +#: src/usr/local/www/firewall_rules_edit.php:1304 msgid " Address" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1301 +#: src/usr/local/www/firewall_rules_edit.php:1313 msgid "Show advanced" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1305 +#: src/usr/local/www/firewall_rules_edit.php:1317 msgid "(other)" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1311 +#: src/usr/local/www/firewall_rules_edit.php:1323 msgid " port range" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1317 +#: src/usr/local/www/firewall_rules_edit.php:1329 msgid " port begin" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1320 +#: src/usr/local/www/firewall_rules_edit.php:1332 #: src/usr/local/www/services_captiveportal_hostname_edit.php:186 #: src/usr/local/www/services_captiveportal_ip_edit.php:229 #: src/usr/local/www/services_dhcp.php:849 @@ -10616,11 +10667,11 @@ msgstr "" msgid "From" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1331 +#: src/usr/local/www/firewall_rules_edit.php:1343 msgid " port end" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1334 +#: src/usr/local/www/firewall_rules_edit.php:1346 #: src/usr/local/www/services_captiveportal_hostname_edit.php:186 #: src/usr/local/www/services_captiveportal_ip_edit.php:229 #: src/usr/local/www/services_dhcp.php:855 @@ -10631,7 +10682,7 @@ msgstr "" msgid "To" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1345 +#: src/usr/local/www/firewall_rules_edit.php:1357 msgid "" "Specify the source port or port range for this rule. This is usually random " "and almost never equal to the destination port range (and should usually be " @@ -10639,17 +10690,17 @@ msgid "" "a single port." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1350 +#: src/usr/local/www/firewall_rules_edit.php:1362 msgid "" "Specify the destination port or port range for this rule. You can leave the " "\"To\" field empty if you only want to filter a single port." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1359 +#: src/usr/local/www/firewall_rules_edit.php:1371 msgid "Extra options" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1365 +#: src/usr/local/www/firewall_rules_edit.php:1377 msgid "" "Hint: the firewall has limited local log space. Don't turn on logging for " "everything. If you want to do a lot of logging, consider using a remote " @@ -10657,189 +10708,189 @@ msgid "" "logs: Settings</a> page)." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1375 +#: src/usr/local/www/firewall_rules_edit.php:1387 #: src/usr/local/www/services_unbound_acls.php:269 msgid "You may enter a description here for your reference." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1400 +#: src/usr/local/www/firewall_rules_edit.php:1412 msgid "Source OS" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1403 +#: src/usr/local/www/firewall_rules_edit.php:1415 msgid "" "Note: this only works for TCP rules. General OS choice matches all subtypes." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1407 +#: src/usr/local/www/firewall_rules_edit.php:1419 msgid "Diffserv Code Point" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1414 +#: src/usr/local/www/firewall_rules_edit.php:1426 msgid "Allow IP options" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1422 +#: src/usr/local/www/firewall_rules_edit.php:1434 #: src/usr/local/www/system_advanced_firewall.php:553 msgid "Disable reply-to" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1429 +#: src/usr/local/www/firewall_rules_edit.php:1441 #: src/usr/local/www/interfaces_qinq.php:144 msgid "Tag" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1432 +#: src/usr/local/www/firewall_rules_edit.php:1444 msgid "" "You can mark a packet matching this rule and use this mark to match on other " "NAT/filter rules. It is called <b>Policy filtering</b>." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1437 +#: src/usr/local/www/firewall_rules_edit.php:1449 msgid "Tagged" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1440 +#: src/usr/local/www/firewall_rules_edit.php:1452 msgid "You can match packet on a mark placed before on another rule." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1444 +#: src/usr/local/www/firewall_rules_edit.php:1456 msgid "Max. states" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1447 +#: src/usr/local/www/firewall_rules_edit.php:1459 msgid "Maximum state entries this rule can create." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1451 +#: src/usr/local/www/firewall_rules_edit.php:1463 msgid "Max. src nodes" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1454 +#: src/usr/local/www/firewall_rules_edit.php:1466 msgid "Maximum number of unique source hosts." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1458 +#: src/usr/local/www/firewall_rules_edit.php:1470 msgid "Max. connections" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1461 +#: src/usr/local/www/firewall_rules_edit.php:1473 msgid "Maximum number of established connections per host (TCP only)." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1465 +#: src/usr/local/www/firewall_rules_edit.php:1477 msgid "Max. src. states" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1468 +#: src/usr/local/www/firewall_rules_edit.php:1480 msgid "Maximum state entries per host." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1472 +#: src/usr/local/www/firewall_rules_edit.php:1484 msgid "Max. src. conn. Rate" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1475 +#: src/usr/local/www/firewall_rules_edit.php:1487 msgid "Maximum new connections per host (TCP only)" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1479 +#: src/usr/local/www/firewall_rules_edit.php:1491 msgid "Max. src. conn. Rates" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1483 +#: src/usr/local/www/firewall_rules_edit.php:1495 msgid "/ per how many second(s) (TCP only)" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1487 +#: src/usr/local/www/firewall_rules_edit.php:1499 msgid "State timeout" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1491 +#: src/usr/local/www/firewall_rules_edit.php:1503 msgid "State Timeout in seconds (TCP only)" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1494 -#: src/usr/local/www/status_logs_filter.php:353 -#: src/usr/local/www/status_logs_filter_dynamic.php:497 +#: src/usr/local/www/firewall_rules_edit.php:1506 +#: src/usr/local/www/status_logs_filter.php:362 +#: src/usr/local/www/status_logs_filter_dynamic.php:511 msgid "TCP Flags" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1496 +#: src/usr/local/www/firewall_rules_edit.php:1508 msgid "" "Use this to choose TCP flags that must be set or cleared for this rule to " "match." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1500 +#: src/usr/local/www/firewall_rules_edit.php:1512 msgid "No pfSync" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1510 +#: src/usr/local/www/firewall_rules_edit.php:1522 msgid "Keep" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1511 +#: src/usr/local/www/firewall_rules_edit.php:1523 msgid "Sloppy" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1512 +#: src/usr/local/www/firewall_rules_edit.php:1524 msgid "Synproxy" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1507 +#: src/usr/local/www/firewall_rules_edit.php:1519 msgid "State type" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1515 +#: src/usr/local/www/firewall_rules_edit.php:1527 msgid "" "Select which type of state tracking mechanism you would like to use. If in " "doubt, use keep state<br /><span></span>" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1523 +#: src/usr/local/www/firewall_rules_edit.php:1535 msgid "This does NOT prevent the rule from being overwritten on Slave." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1529 +#: src/usr/local/www/firewall_rules_edit.php:1541 msgid "VLAN Prio" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1532 +#: src/usr/local/www/firewall_rules_edit.php:1544 msgid "Choose 802.1p priority to match on" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1536 +#: src/usr/local/www/firewall_rules_edit.php:1548 msgid "VLAN Prio Set" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1539 +#: src/usr/local/www/firewall_rules_edit.php:1551 msgid "Choose 802.1p priority to apply" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1553 +#: src/usr/local/www/firewall_rules_edit.php:1565 msgid "Leave as 'none' to leave the rule enabled all the time" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1584 +#: src/usr/local/www/firewall_rules_edit.php:1596 msgid "" "Leave as 'default' to use the system routing table. Or choose a gateway to " "utilize policy based routing." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1587 +#: src/usr/local/www/firewall_rules_edit.php:1599 msgid "In / Out pipe" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1591 +#: src/usr/local/www/firewall_rules_edit.php:1603 msgid "DNpipe" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1598 +#: src/usr/local/www/firewall_rules_edit.php:1610 msgid "PDNpipe" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1603 +#: src/usr/local/www/firewall_rules_edit.php:1615 msgid "" "Choose the Out queue/Virtual interface only if you have also selected In. " "The Out selection is applied to traffic leaving the interface where the rule " @@ -10849,22 +10900,22 @@ msgid "" "reversed, Out is for incoming and In is for outgoing." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1611 +#: src/usr/local/www/firewall_rules_edit.php:1623 msgid "Ackqueue / Queue" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1628 +#: src/usr/local/www/firewall_rules_edit.php:1640 msgid "Ackqueue" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1640 +#: src/usr/local/www/firewall_rules_edit.php:1652 msgid "Choose the Acknowledge Queue only if you have selected Queue." msgstr "" #: src/usr/local/www/firewall_schedule.php:75 #: src/usr/local/www/firewall_schedule.php:120 #: src/usr/local/www/firewall_schedule_edit.php:85 -#: src/usr/local/www/head.inc:233 +#: src/usr/local/www/head.inc:241 #: src/usr/local/www/system_advanced_misc.php:479 msgid "Schedules" msgstr "" @@ -10985,11 +11036,11 @@ msgstr "" #: src/usr/local/www/status_logs_common.inc:451 #: src/usr/local/www/status_logs_filter.php:183 #: src/usr/local/www/status_logs_filter.php:329 -#: src/usr/local/www/status_logs_filter_dynamic.php:418 +#: src/usr/local/www/status_logs_filter_dynamic.php:423 #: src/usr/local/www/status_logs_vpn.php:170 #: src/usr/local/www/status_logs_vpn.php:209 -#: src/usr/local/www/status_logs_vpn.php:390 -#: src/usr/local/www/status_logs_vpn.php:432 +#: src/usr/local/www/status_logs_vpn.php:399 +#: src/usr/local/www/status_logs_vpn.php:441 #: src/usr/local/www/widgets/widgets/log.widget.php:136 msgid "Time" msgstr "" @@ -11072,9 +11123,8 @@ msgstr "" #: src/usr/local/www/firewall_shaper.php:433 #: src/usr/local/www/firewall_shaper_queues.php:239 #: src/usr/local/www/firewall_shaper_vinterface.php:411 -msgid "" -"The traffic shaper configuration has been changed. You must apply the " -"changes in order for them to take effect." +#: src/usr/local/www/firewall_shaper_wizards.php:122 +msgid "The traffic shaper configuration has been changed." msgstr "" #: src/usr/local/www/firewall_shaper.php:437 @@ -11104,7 +11154,7 @@ msgstr "" #: src/usr/local/www/firewall_shaper_vinterface.php:418 #: src/usr/local/www/firewall_shaper_wizards.php:96 #: src/usr/local/www/firewall_shaper_wizards.php:114 -#: src/usr/local/www/vpn_openvpn_client.php:439 +#: src/usr/local/www/vpn_openvpn_client.php:447 #: src/usr/local/www/vpn_openvpn_csc.php:325 #: src/usr/local/www/vpn_openvpn_server.php:613 msgid "Wizards" @@ -11160,10 +11210,6 @@ msgstr "" msgid "Dedicated Links" msgstr "" -#: src/usr/local/www/firewall_shaper_wizards.php:122 -msgid "The traffic shaper configuration has been changed." -msgstr "" - #: src/usr/local/www/firewall_shaper_wizards.php:127 msgid "Traffic Shaper Wizards" msgstr "" @@ -11520,17 +11566,17 @@ msgstr "" msgid "10BASE-T half-duplex" msgstr "" -#: src/usr/local/www/guiconfig.inc:268 src/usr/local/www/interfaces.php:2922 +#: src/usr/local/www/guiconfig.inc:268 src/usr/local/www/interfaces.php:2926 #: src/usr/local/www/interfaces_wireless_edit.php:224 msgid "Infrastructure (BSS)" msgstr "" -#: src/usr/local/www/guiconfig.inc:269 src/usr/local/www/interfaces.php:2922 +#: src/usr/local/www/guiconfig.inc:269 src/usr/local/www/interfaces.php:2926 #: src/usr/local/www/interfaces_wireless_edit.php:225 msgid "Ad-hoc (IBSS)" msgstr "" -#: src/usr/local/www/guiconfig.inc:270 src/usr/local/www/interfaces.php:2922 +#: src/usr/local/www/guiconfig.inc:270 src/usr/local/www/interfaces.php:2926 #: src/usr/local/www/interfaces_wireless_edit.php:226 msgid "Access Point" msgstr "" @@ -11590,43 +11636,43 @@ msgstr "" msgid "Value" msgstr "" -#: src/usr/local/www/head.inc:196 +#: src/usr/local/www/head.inc:204 msgid "Logout" msgstr "" -#: src/usr/local/www/head.inc:199 src/usr/local/www/system.php:352 +#: src/usr/local/www/head.inc:207 src/usr/local/www/system.php:352 msgid "General Setup" msgstr "" -#: src/usr/local/www/head.inc:200 +#: src/usr/local/www/head.inc:208 msgid "High Avail. Sync" msgstr "" -#: src/usr/local/www/head.inc:202 src/usr/local/www/pkg_mgr.php:207 +#: src/usr/local/www/head.inc:210 src/usr/local/www/pkg_mgr.php:207 #: src/usr/local/www/widgets/widgets/installed_packages.widget.php:183 msgid "Packages" msgstr "" -#: src/usr/local/www/head.inc:204 +#: src/usr/local/www/head.inc:212 msgid "Setup Wizard" msgstr "" -#: src/usr/local/www/head.inc:205 src/usr/local/www/status_logs.php:92 +#: src/usr/local/www/head.inc:213 src/usr/local/www/status_logs.php:92 #: src/usr/local/www/status_logs_common.inc:127 #: src/usr/local/www/system_gateway_groups.php:124 #: src/usr/local/www/system_gateway_groups_edit.php:180 -#: src/usr/local/www/system_gateways.php:244 +#: src/usr/local/www/system_gateways.php:245 #: src/usr/local/www/system_gateways_edit.php:631 -#: src/usr/local/www/system_routes.php:245 +#: src/usr/local/www/system_routes.php:246 #: src/usr/local/www/system_routes_edit.php:257 msgid "Routing" msgstr "" -#: src/usr/local/www/head.inc:206 +#: src/usr/local/www/head.inc:214 msgid "Cert Manager" msgstr "" -#: src/usr/local/www/head.inc:208 src/usr/local/www/head.inc:210 +#: src/usr/local/www/head.inc:216 src/usr/local/www/head.inc:218 #: src/usr/local/www/system_authservers.php:67 #: src/usr/local/www/system_groupmanager.php:70 #: src/usr/local/www/system_groupmanager_addprivs.php:83 @@ -11636,25 +11682,25 @@ msgstr "" msgid "User Manager" msgstr "" -#: src/usr/local/www/head.inc:218 +#: src/usr/local/www/head.inc:226 msgid "(assign)" msgstr "" -#: src/usr/local/www/head.inc:235 +#: src/usr/local/www/head.inc:243 msgid "Virtual IPs" msgstr "" -#: src/usr/local/www/head.inc:248 +#: src/usr/local/www/head.inc:256 msgid "DHCPv6 Server/RA" msgstr "" -#: src/usr/local/www/head.inc:252 src/usr/local/www/services_igmpproxy.php:101 +#: src/usr/local/www/head.inc:260 src/usr/local/www/services_igmpproxy.php:101 #: src/usr/local/www/services_igmpproxy.php:115 #: src/usr/local/www/services_igmpproxy_edit.php:66 msgid "IGMP Proxy" msgstr "" -#: src/usr/local/www/head.inc:253 src/usr/local/www/head.inc:287 +#: src/usr/local/www/head.inc:261 src/usr/local/www/head.inc:295 #: src/usr/local/www/load_balancer_monitor.php:107 #: src/usr/local/www/load_balancer_monitor_edit.php:230 #: src/usr/local/www/load_balancer_pool.php:121 @@ -11669,7 +11715,7 @@ msgstr "" msgid "Load Balancer" msgstr "" -#: src/usr/local/www/head.inc:254 src/usr/local/www/head.inc:288 +#: src/usr/local/www/head.inc:262 src/usr/local/www/head.inc:296 #: src/usr/local/www/services_dhcp.php:1062 #: src/usr/local/www/services_ntpd.php:267 #: src/usr/local/www/services_ntpd.php:279 @@ -11684,31 +11730,31 @@ msgstr "" msgid "NTP" msgstr "" -#: src/usr/local/www/head.inc:256 src/usr/local/www/services_snmp.php:210 +#: src/usr/local/www/head.inc:264 src/usr/local/www/services_snmp.php:210 msgid "SNMP" msgstr "" -#: src/usr/local/www/head.inc:262 src/usr/local/www/head.inc:302 +#: src/usr/local/www/head.inc:270 src/usr/local/www/head.inc:310 #: src/usr/local/www/status_upnp.php:76 msgid "UPnP & NAT-PMP" msgstr "" -#: src/usr/local/www/head.inc:273 src/usr/local/www/interfaces.php:1647 +#: src/usr/local/www/head.inc:281 src/usr/local/www/interfaces.php:1651 #: src/usr/local/www/interfaces_ppps_edit.php:455 #: src/usr/local/www/vpn_l2tp.php:219 src/usr/local/www/vpn_l2tp_users.php:63 #: src/usr/local/www/vpn_l2tp_users_edit.php:63 msgid "L2TP" msgstr "" -#: src/usr/local/www/head.inc:279 +#: src/usr/local/www/head.inc:287 msgid "CARP (failover)" msgstr "" -#: src/usr/local/www/head.inc:280 src/usr/local/www/index.php:315 +#: src/usr/local/www/head.inc:288 src/usr/local/www/index.php:315 msgid "Dashboard" msgstr "" -#: src/usr/local/www/head.inc:281 +#: src/usr/local/www/head.inc:289 #: src/usr/local/www/status_gateway_groups.php:91 #: src/usr/local/www/status_gateway_groups.php:103 #: src/usr/local/www/status_gateways.php:80 @@ -11718,40 +11764,40 @@ msgstr "" #: src/usr/local/www/status_logs_common.inc:126 #: src/usr/local/www/system_gateway_groups.php:138 #: src/usr/local/www/system_gateway_groups.php:151 -#: src/usr/local/www/system_gateways.php:244 -#: src/usr/local/www/system_gateways.php:261 -#: src/usr/local/www/system_gateways.php:268 +#: src/usr/local/www/system_gateways.php:245 +#: src/usr/local/www/system_gateways.php:262 +#: src/usr/local/www/system_gateways.php:269 #: src/usr/local/www/system_gateways_edit.php:631 -#: src/usr/local/www/system_routes.php:261 +#: src/usr/local/www/system_routes.php:262 #: src/usr/local/www/widgets/include/gateways.inc:3 msgid "Gateways" msgstr "" -#: src/usr/local/www/head.inc:282 +#: src/usr/local/www/head.inc:290 msgid "DHCP Leases" msgstr "" -#: src/usr/local/www/head.inc:283 +#: src/usr/local/www/head.inc:291 msgid "DHCPv6 Leases" msgstr "" -#: src/usr/local/www/head.inc:284 src/usr/local/www/status_filter_reload.php:67 +#: src/usr/local/www/head.inc:292 src/usr/local/www/status_filter_reload.php:67 #: src/usr/local/www/status_filter_reload.php:94 msgid "Filter Reload" msgstr "" -#: src/usr/local/www/head.inc:292 +#: src/usr/local/www/head.inc:300 msgid "Package Logs" msgstr "" -#: src/usr/local/www/head.inc:296 src/usr/local/www/status_rrd_graph.php:309 +#: src/usr/local/www/head.inc:304 src/usr/local/www/status_rrd_graph.php:309 #: src/usr/local/www/status_rrd_graph_img.php:66 #: src/usr/local/www/status_rrd_graph_settings.php:143 #: src/usr/local/www/status_rrd_graph_settings.php:199 msgid "RRD Graphs" msgstr "" -#: src/usr/local/www/head.inc:297 +#: src/usr/local/www/head.inc:305 #: src/usr/local/www/load_balancer_monitor.php:107 #: src/usr/local/www/load_balancer_monitor_edit.php:230 #: src/usr/local/www/load_balancer_pool.php:121 @@ -11780,8 +11826,8 @@ msgstr "" #: src/usr/local/www/services_dnsmasq.php:215 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:153 #: src/usr/local/www/services_dnsmasq_edit.php:232 -#: src/usr/local/www/services_dyndns.php:95 -#: src/usr/local/www/services_dyndns_edit.php:257 +#: src/usr/local/www/services_dyndns.php:100 +#: src/usr/local/www/services_dyndns_edit.php:263 #: src/usr/local/www/services_igmpproxy.php:101 #: src/usr/local/www/services_igmpproxy_edit.php:66 #: src/usr/local/www/services_ntpd.php:267 @@ -11791,9 +11837,9 @@ msgstr "" #: src/usr/local/www/services_pppoe_edit.php:314 #: src/usr/local/www/services_rfc2136.php:92 #: src/usr/local/www/services_rfc2136_edit.php:160 -#: src/usr/local/www/services_router_advertisements.php:228 +#: src/usr/local/www/services_router_advertisements.php:240 #: src/usr/local/www/services_snmp.php:210 -#: src/usr/local/www/services_unbound.php:251 +#: src/usr/local/www/services_unbound.php:241 #: src/usr/local/www/services_unbound_acls.php:208 #: src/usr/local/www/services_unbound_advanced.php:221 #: src/usr/local/www/services_unbound_domainoverride_edit.php:145 @@ -11806,11 +11852,11 @@ msgstr "" msgid "Services" msgstr "" -#: src/usr/local/www/head.inc:299 src/usr/local/www/status_graph.php:150 +#: src/usr/local/www/head.inc:307 src/usr/local/www/status_graph.php:150 msgid "Traffic Graph" msgstr "" -#: src/usr/local/www/head.inc:314 src/usr/local/www/interfaces_assign.php:520 +#: src/usr/local/www/head.inc:322 src/usr/local/www/interfaces_assign.php:520 #: src/usr/local/www/interfaces_bridge.php:119 #: src/usr/local/www/interfaces_gif.php:114 #: src/usr/local/www/interfaces_gre.php:114 @@ -11831,137 +11877,137 @@ msgstr "" msgid "Wireless" msgstr "" -#: src/usr/local/www/head.inc:324 +#: src/usr/local/www/head.inc:332 msgid "Command Prompt" msgstr "" -#: src/usr/local/www/head.inc:326 +#: src/usr/local/www/head.inc:334 msgid "Edit File" msgstr "" -#: src/usr/local/www/head.inc:327 +#: src/usr/local/www/head.inc:335 msgid "Factory Defaults" msgstr "" -#: src/usr/local/www/head.inc:333 +#: src/usr/local/www/head.inc:341 msgid "Halt System" msgstr "" -#: src/usr/local/www/head.inc:342 +#: src/usr/local/www/head.inc:350 msgid "Routes" msgstr "" -#: src/usr/local/www/head.inc:343 +#: src/usr/local/www/head.inc:351 #: src/usr/local/www/widgets/include/smart_status.inc:3 #: src/usr/local/www/widgets/widgets/smart_status.widget.php:72 msgid "SMART Status" msgstr "" -#: src/usr/local/www/head.inc:346 +#: src/usr/local/www/head.inc:354 msgid "States Summary" msgstr "" -#: src/usr/local/www/head.inc:356 +#: src/usr/local/www/head.inc:364 msgid "Restart HTTPD" msgstr "" -#: src/usr/local/www/head.inc:362 +#: src/usr/local/www/head.inc:370 msgid "pfSense Gold" msgstr "" -#: src/usr/local/www/head.inc:367 +#: src/usr/local/www/head.inc:375 msgid "About this Page" msgstr "" -#: src/usr/local/www/head.inc:369 +#: src/usr/local/www/head.inc:377 msgid "Bug Database" msgstr "" -#: src/usr/local/www/head.inc:372 +#: src/usr/local/www/head.inc:380 msgid "User Forum" msgstr "" -#: src/usr/local/www/head.inc:373 +#: src/usr/local/www/head.inc:381 msgid "Documentation" msgstr "" -#: src/usr/local/www/head.inc:374 +#: src/usr/local/www/head.inc:382 msgid "Developers Wiki" msgstr "" -#: src/usr/local/www/head.inc:375 +#: src/usr/local/www/head.inc:383 msgid "Paid Support" msgstr "" -#: src/usr/local/www/head.inc:376 +#: src/usr/local/www/head.inc:384 msgid "pfSense Book" msgstr "" -#: src/usr/local/www/head.inc:377 +#: src/usr/local/www/head.inc:385 msgid "Search Portal" msgstr "" -#: src/usr/local/www/head.inc:378 +#: src/usr/local/www/head.inc:386 msgid "FreeBSD Handbook" msgstr "" -#: src/usr/local/www/head.inc:434 src/usr/local/www/head.inc:561 +#: src/usr/local/www/head.inc:442 src/usr/local/www/head.inc:569 msgid "Notices" msgstr "" -#: src/usr/local/www/head.inc:443 +#: src/usr/local/www/head.inc:451 msgid "Log out" msgstr "" -#: src/usr/local/www/head.inc:467 src/usr/local/www/index.php:328 +#: src/usr/local/www/head.inc:475 src/usr/local/www/index.php:328 #: src/usr/local/www/system.php:526 msgid "Available Widgets" msgstr "" -#: src/usr/local/www/head.inc:475 src/usr/local/www/status_logs_common.inc:310 +#: src/usr/local/www/head.inc:483 src/usr/local/www/status_logs_common.inc:310 #: src/usr/local/www/status_logs_common.inc:518 -#: src/usr/local/www/status_logs_vpn.php:478 src/usr/local/www/system.php:533 +#: src/usr/local/www/status_logs_vpn.php:487 src/usr/local/www/system.php:533 msgid "Log Filter" msgstr "" -#: src/usr/local/www/head.inc:483 src/usr/local/www/system.php:540 +#: src/usr/local/www/head.inc:491 src/usr/local/www/system.php:540 msgid "Manage Log" msgstr "" -#: src/usr/local/www/head.inc:515 +#: src/usr/local/www/head.inc:523 msgid "Help for items on this page" msgstr "" -#: src/usr/local/www/head.inc:526 +#: src/usr/local/www/head.inc:534 #, php-format msgid "" "%s is booting then packages will be reinstalled in the background.<p>Do not " "make changes in the GUI until this is complete." msgstr "" -#: src/usr/local/www/head.inc:529 +#: src/usr/local/www/head.inc:537 msgid "" "Packages are currently being reinstalled in the background.<p>Do not make " "changes in the GUI until this is complete." msgstr "" -#: src/usr/local/www/head.inc:530 +#: src/usr/local/www/head.inc:538 msgid "" "<p>If the above message is still displayed after a couple of hours, use the " "'Clear Package Lock' button on the <a href='diag_backup.php' title='Backup/" "Restore'>Backup/Restore page</a> and reinstall packages manually." msgstr "" -#: src/usr/local/www/head.inc:542 +#: src/usr/local/www/head.inc:550 msgid "This page is currently being managed by a remote machine." msgstr "" -#: src/usr/local/www/head.inc:600 +#: src/usr/local/www/head.inc:608 #: src/usr/local/www/system_usermanager_settings_ldapacpicker.php:132 msgid "Close" msgstr "" -#: src/usr/local/www/head.inc:601 +#: src/usr/local/www/head.inc:609 msgid "Mark all as read" msgstr "" @@ -12077,8 +12123,8 @@ msgid "PPPoE password" msgstr "" #: src/usr/local/www/interfaces.php:588 src/usr/local/www/interfaces.php:598 -#: src/usr/local/www/interfaces.php:608 src/usr/local/www/interfaces.php:2572 -#: src/usr/local/www/interfaces.php:2708 +#: src/usr/local/www/interfaces.php:608 src/usr/local/www/interfaces.php:2576 +#: src/usr/local/www/interfaces.php:2712 #: src/usr/local/www/interfaces_ppps_edit.php:238 #: src/usr/local/www/interfaces_ppps_edit.php:249 msgid "Dial on demand" @@ -12155,239 +12201,243 @@ msgid "You can only have one interface configured as 6to4." msgstr "" #: src/usr/local/www/interfaces.php:673 -msgid "You must enter a valid hexadecimal number for the IPv6 prefix ID." +msgid "You have to select a valid interface to track." msgstr "" #: src/usr/local/www/interfaces.php:677 +msgid "You must enter a valid hexadecimal number for the IPv6 prefix ID." +msgstr "" + +#: src/usr/local/www/interfaces.php:681 msgid "You specified an IPv6 prefix ID that is out of range." msgstr "" -#: src/usr/local/www/interfaces.php:687 +#: src/usr/local/www/interfaces.php:691 #, php-format msgid "This track6 prefix ID is already being used in %s." msgstr "" -#: src/usr/local/www/interfaces.php:700 +#: src/usr/local/www/interfaces.php:704 msgid "A valid IPv4 address must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:704 +#: src/usr/local/www/interfaces.php:708 #, php-format msgid "IPv4 address %s is being used by or overlaps with:" msgstr "" -#: src/usr/local/www/interfaces.php:714 +#: src/usr/local/www/interfaces.php:718 msgid "This IPv4 address is the network address and cannot be used" msgstr "" -#: src/usr/local/www/interfaces.php:716 +#: src/usr/local/www/interfaces.php:720 msgid "This IPv4 address is the broadcast address and cannot be used" msgstr "" -#: src/usr/local/www/interfaces.php:723 +#: src/usr/local/www/interfaces.php:727 msgid "This IPv4 address conflicts with a Static Route." msgstr "" -#: src/usr/local/www/interfaces.php:732 +#: src/usr/local/www/interfaces.php:736 #: src/usr/local/www/services_dhcpv6_edit.php:159 msgid "A valid IPv6 address must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:735 +#: src/usr/local/www/interfaces.php:739 msgid "IPv6 link local addresses cannot be configured as an interface IP." msgstr "" -#: src/usr/local/www/interfaces.php:739 +#: src/usr/local/www/interfaces.php:743 #, php-format msgid "IPv6 address %s is being used by or overlaps with:" msgstr "" -#: src/usr/local/www/interfaces.php:749 +#: src/usr/local/www/interfaces.php:753 msgid "This IPv6 address conflicts with a Static Route." msgstr "" -#: src/usr/local/www/interfaces.php:757 src/usr/local/www/interfaces.php:760 +#: src/usr/local/www/interfaces.php:761 src/usr/local/www/interfaces.php:764 msgid "A valid subnet bit count must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:763 +#: src/usr/local/www/interfaces.php:767 msgid "A valid alias IP address must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:766 +#: src/usr/local/www/interfaces.php:770 msgid "A valid alias subnet bit count must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:769 +#: src/usr/local/www/interfaces.php:773 msgid "A valid alias IP address must be specified to reject DHCP Leases from." msgstr "" -#: src/usr/local/www/interfaces.php:784 +#: src/usr/local/www/interfaces.php:788 #: src/usr/local/www/system_routes_edit.php:127 msgid "A valid gateway must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:788 +#: src/usr/local/www/interfaces.php:792 msgid "The service name contains invalid characters." msgstr "" -#: src/usr/local/www/interfaces.php:791 src/usr/local/www/interfaces.php:814 +#: src/usr/local/www/interfaces.php:795 src/usr/local/www/interfaces.php:818 #: src/usr/local/www/interfaces_ppps_edit.php:273 msgid "The idle timeout value must be an integer." msgstr "" -#: src/usr/local/www/interfaces.php:795 +#: src/usr/local/www/interfaces.php:799 #: src/usr/local/www/interfaces_ppps_edit.php:277 msgid "A valid PPPoE reset hour must be specified (0-23)." msgstr "" -#: src/usr/local/www/interfaces.php:799 +#: src/usr/local/www/interfaces.php:803 #: src/usr/local/www/interfaces_ppps_edit.php:281 msgid "A valid PPPoE reset minute must be specified (0-59)." msgstr "" -#: src/usr/local/www/interfaces.php:802 +#: src/usr/local/www/interfaces.php:806 #: src/usr/local/www/interfaces_ppps_edit.php:284 msgid "A valid PPPoE reset date must be specified (mm/dd/yyyy)." msgstr "" -#: src/usr/local/www/interfaces.php:805 +#: src/usr/local/www/interfaces.php:809 msgid "A valid PPTP local IP address must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:808 +#: src/usr/local/www/interfaces.php:812 msgid "A valid PPTP subnet bit count must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:811 +#: src/usr/local/www/interfaces.php:815 msgid "A valid PPTP remote IP address must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:817 +#: src/usr/local/www/interfaces.php:821 #: src/usr/local/www/services_dhcp_edit.php:214 #: src/usr/local/www/services_wol.php:112 #: src/usr/local/www/services_wol_edit.php:114 msgid "A valid MAC address must be specified." msgstr "" -#: src/usr/local/www/interfaces.php:832 +#: src/usr/local/www/interfaces.php:836 #, php-format msgid "The MTU must be between %d and %d bytes." msgstr "" -#: src/usr/local/www/interfaces.php:844 +#: src/usr/local/www/interfaces.php:848 msgid "The MTU of a VLAN cannot be greater than that of its parent interface." msgstr "" -#: src/usr/local/www/interfaces.php:862 +#: src/usr/local/www/interfaces.php:866 #, php-format msgid "Interface %s (VLAN) has MTU set to a larger value" msgstr "" -#: src/usr/local/www/interfaces.php:869 +#: src/usr/local/www/interfaces.php:873 msgid "The MSS must be an integer between 576 and 65535 bytes." msgstr "" -#: src/usr/local/www/interfaces.php:878 src/usr/local/www/interfaces.php:2927 +#: src/usr/local/www/interfaces.php:882 src/usr/local/www/interfaces.php:2931 #: src/usr/local/www/status_interfaces.php:172 msgid "SSID" msgstr "" -#: src/usr/local/www/interfaces.php:881 +#: src/usr/local/www/interfaces.php:885 msgid "A specific channel, not auto, must be selected for Access Point mode." msgstr "" -#: src/usr/local/www/interfaces.php:886 +#: src/usr/local/www/interfaces.php:890 msgid "802.11n standards require enabling WME." msgstr "" -#: src/usr/local/www/interfaces.php:892 +#: src/usr/local/www/interfaces.php:896 msgid "Key Rotation must be an integer between 1 and 9999." msgstr "" -#: src/usr/local/www/interfaces.php:895 +#: src/usr/local/www/interfaces.php:899 msgid "Master Key Regeneration must be an integer between 1 and 9999." msgstr "" -#: src/usr/local/www/interfaces.php:899 +#: src/usr/local/www/interfaces.php:903 msgid "Master Key Regeneration must be greater than Key Rotation." msgstr "" -#: src/usr/local/www/interfaces.php:904 +#: src/usr/local/www/interfaces.php:908 msgid "802.1X Authentication Server must be an IP or hostname." msgstr "" -#: src/usr/local/www/interfaces.php:909 +#: src/usr/local/www/interfaces.php:913 msgid "Secondary 802.1X Authentication Server must be an IP or hostname." msgstr "" -#: src/usr/local/www/interfaces.php:914 +#: src/usr/local/www/interfaces.php:918 msgid "" "802.1X Authentication Server Port must be a valid port number (1-65535)." msgstr "" -#: src/usr/local/www/interfaces.php:919 +#: src/usr/local/www/interfaces.php:923 msgid "" "Secondary 802.1X Authentication Server Port must be a valid port number " "(1-65535)." msgstr "" -#: src/usr/local/www/interfaces.php:924 +#: src/usr/local/www/interfaces.php:928 msgid "Invalid channel specified." msgstr "" -#: src/usr/local/www/interfaces.php:927 +#: src/usr/local/www/interfaces.php:931 msgid "Channel must be between 0-255." msgstr "" -#: src/usr/local/www/interfaces.php:932 +#: src/usr/local/www/interfaces.php:936 msgid "Distance must be an integer." msgstr "" -#: src/usr/local/www/interfaces.php:936 +#: src/usr/local/www/interfaces.php:940 msgid "Channel selected is not valid for 802.11a or 802.11na." msgstr "" -#: src/usr/local/www/interfaces.php:941 +#: src/usr/local/www/interfaces.php:945 msgid "Channel selected is not valid for 802.11b or 802.11g." msgstr "" -#: src/usr/local/www/interfaces.php:945 +#: src/usr/local/www/interfaces.php:949 msgid "Invalid option chosen for OFDM Protection Mode" msgstr "" -#: src/usr/local/www/interfaces.php:951 +#: src/usr/local/www/interfaces.php:955 msgid "The WPA passphrase must be between 8 and 63 characters long." msgstr "" -#: src/usr/local/www/interfaces.php:957 +#: src/usr/local/www/interfaces.php:961 msgid "A WPA Passphrase must be specified when WPA PSK is enabled." msgstr "" -#: src/usr/local/www/interfaces.php:963 +#: src/usr/local/www/interfaces.php:967 msgid "PPP Password and confirmed password must match!" msgstr "" -#: src/usr/local/www/interfaces.php:967 +#: src/usr/local/www/interfaces.php:971 msgid "PPPoE Password and confirmed password must match!" msgstr "" -#: src/usr/local/www/interfaces.php:971 +#: src/usr/local/www/interfaces.php:975 msgid "PTPP Password and confirmed password must match!" msgstr "" -#: src/usr/local/www/interfaces.php:1621 +#: src/usr/local/www/interfaces.php:1625 #, php-format msgid "" "Unable to change mode to %s.\t You may already have the maximum number of " "wireless clones supported in this mode." msgstr "" -#: src/usr/local/www/interfaces.php:1647 +#: src/usr/local/www/interfaces.php:1651 msgid "Static IPv4" msgstr "" -#: src/usr/local/www/interfaces.php:1647 +#: src/usr/local/www/interfaces.php:1651 #: src/usr/local/www/services_dhcp_edit.php:410 #: src/usr/local/www/status_logs.php:76 #: src/usr/local/www/status_logs_common.inc:112 @@ -12395,7 +12445,7 @@ msgstr "" msgid "DHCP" msgstr "" -#: src/usr/local/www/interfaces.php:1647 +#: src/usr/local/www/interfaces.php:1651 #: src/usr/local/www/interfaces_ppps_edit.php:455 #: src/usr/local/www/status_logs.php:82 #: src/usr/local/www/status_logs_common.inc:115 @@ -12403,128 +12453,128 @@ msgstr "" msgid "PPP" msgstr "" -#: src/usr/local/www/interfaces.php:1647 +#: src/usr/local/www/interfaces.php:1651 #: src/usr/local/www/interfaces_ppps_edit.php:455 msgid "PPPoE" msgstr "" -#: src/usr/local/www/interfaces.php:1647 +#: src/usr/local/www/interfaces.php:1651 #: src/usr/local/www/interfaces_ppps_edit.php:455 msgid "PPTP" msgstr "" -#: src/usr/local/www/interfaces.php:1648 +#: src/usr/local/www/interfaces.php:1652 msgid "Static IPv6" msgstr "" -#: src/usr/local/www/interfaces.php:1648 +#: src/usr/local/www/interfaces.php:1652 msgid "DHCP6" msgstr "" -#: src/usr/local/www/interfaces.php:1648 +#: src/usr/local/www/interfaces.php:1652 msgid "SLAAC" msgstr "" -#: src/usr/local/www/interfaces.php:1648 +#: src/usr/local/www/interfaces.php:1652 msgid "6rd Tunnel" msgstr "" -#: src/usr/local/www/interfaces.php:1648 +#: src/usr/local/www/interfaces.php:1652 msgid "6to4 Tunnel" msgstr "" -#: src/usr/local/www/interfaces.php:1648 +#: src/usr/local/www/interfaces.php:1652 msgid "Track Interface" msgstr "" -#: src/usr/local/www/interfaces.php:1658 +#: src/usr/local/www/interfaces.php:1662 msgid "Default (no preference, typically autoselect)" msgstr "" -#: src/usr/local/www/interfaces.php:1659 +#: src/usr/local/www/interfaces.php:1663 msgid "------- Media Supported by this interface -------" msgstr "" -#: src/usr/local/www/interfaces.php:1702 +#: src/usr/local/www/interfaces.php:1706 #, php-format msgid "The %s configuration has been changed." msgstr "" -#: src/usr/local/www/interfaces.php:1703 +#: src/usr/local/www/interfaces.php:1707 msgid "" "You must apply the changes in order for them to take effect. Don't forget to " "adjust the DHCP Server range if needed after applying." msgstr "" -#: src/usr/local/www/interfaces.php:1716 +#: src/usr/local/www/interfaces.php:1720 msgid "General configuration" msgstr "" -#: src/usr/local/www/interfaces.php:1731 +#: src/usr/local/www/interfaces.php:1735 msgid "Enter a description (name) for the interface here." msgstr "" -#: src/usr/local/www/interfaces.php:1735 +#: src/usr/local/www/interfaces.php:1739 msgid "IPv4 Configuration Type" msgstr "" -#: src/usr/local/www/interfaces.php:1742 +#: src/usr/local/www/interfaces.php:1746 msgid "IPv6 Configuration Type" msgstr "" -#: src/usr/local/www/interfaces.php:1749 +#: src/usr/local/www/interfaces.php:1753 #: src/usr/local/www/services_captiveportal_mac_edit.php:241 +#: src/usr/local/www/services_captiveportal_mac_edit.php:254 #: src/usr/local/www/services_dhcp_edit.php:425 #: src/usr/local/www/status_interfaces.php:144 msgid "MAC Address" msgstr "" -#: src/usr/local/www/interfaces.php:1757 +#: src/usr/local/www/interfaces.php:1761 #: src/usr/local/www/services_captiveportal_mac_edit.php:249 #: src/usr/local/www/services_dhcp_edit.php:433 msgid "Copy My MAC" msgstr "" -#: src/usr/local/www/interfaces.php:1762 -#: src/usr/local/www/services_captiveportal_mac_edit.php:254 +#: src/usr/local/www/interfaces.php:1766 #: src/usr/local/www/services_dhcp_edit.php:438 msgid "MAC controls" msgstr "" -#: src/usr/local/www/interfaces.php:1765 +#: src/usr/local/www/interfaces.php:1769 msgid "" "This field can be used to modify (\"spoof\") the MAC address of this " "interface.<br />Enter a MAC address in the following format: xx:xx:xx:xx:xx:" "xx or leave blank" msgstr "" -#: src/usr/local/www/interfaces.php:1771 +#: src/usr/local/www/interfaces.php:1775 #: src/usr/local/www/interfaces_ppps_edit.php:896 #: src/usr/local/www/status_interfaces.php:167 msgid "MTU" msgstr "" -#: src/usr/local/www/interfaces.php:1774 +#: src/usr/local/www/interfaces.php:1778 msgid "" "If you leave this field blank, the adapter's default MTU will be used. This " "is typically 1500 bytes but can vary in some circumstances." msgstr "" -#: src/usr/local/www/interfaces.php:1779 +#: src/usr/local/www/interfaces.php:1783 msgid "MSS" msgstr "" -#: src/usr/local/www/interfaces.php:1782 +#: src/usr/local/www/interfaces.php:1786 msgid "" "If you enter a value in this field, then MSS clamping for TCP connections to " "the value entered above minus 40 (TCP/IP header size) will be in effect." msgstr "" -#: src/usr/local/www/interfaces.php:1788 +#: src/usr/local/www/interfaces.php:1792 msgid "Speed and Duplex" msgstr "" -#: src/usr/local/www/interfaces.php:1791 +#: src/usr/local/www/interfaces.php:1795 msgid "" "Here you can explicitly set speed and duplex mode for this interface.<br /" ">WARNING: You MUST leave this set to autoselect (automatically negotiate " @@ -12532,106 +12582,106 @@ msgid "" "forced." msgstr "" -#: src/usr/local/www/interfaces.php:1797 +#: src/usr/local/www/interfaces.php:1801 msgid "Static IPv4 configuration" msgstr "" -#: src/usr/local/www/interfaces.php:1802 +#: src/usr/local/www/interfaces.php:1806 #: src/usr/local/www/status_interfaces.php:149 msgid "IPv4 Address" msgstr "" -#: src/usr/local/www/interfaces.php:1806 +#: src/usr/local/www/interfaces.php:1810 msgid "IPv4 Upstream gateway" msgstr "" -#: src/usr/local/www/interfaces.php:1810 +#: src/usr/local/www/interfaces.php:1814 msgid "IPv4 Upstream Gateway" msgstr "" -#: src/usr/local/www/interfaces.php:1817 src/usr/local/www/interfaces.php:1848 +#: src/usr/local/www/interfaces.php:1821 src/usr/local/www/interfaces.php:1852 msgid "Add a new gateway" msgstr "" -#: src/usr/local/www/interfaces.php:1822 +#: src/usr/local/www/interfaces.php:1826 msgid "You can manage gateways by " msgstr "" -#: src/usr/local/www/interfaces.php:1822 +#: src/usr/local/www/interfaces.php:1826 msgid " clicking here" msgstr "" -#: src/usr/local/www/interfaces.php:1820 +#: src/usr/local/www/interfaces.php:1824 msgid "" "If this interface is an Internet connection, select an existing Gateway from " "the list or add a new one using the \"Add\" button.<br />On local LANs the " "upstream gateway should be \"none\"." msgstr "" -#: src/usr/local/www/interfaces.php:1828 +#: src/usr/local/www/interfaces.php:1832 msgid "Static IPv6 configuration" msgstr "" -#: src/usr/local/www/interfaces.php:1837 +#: src/usr/local/www/interfaces.php:1841 msgid "IPv6 Upstream gateway" msgstr "" -#: src/usr/local/www/interfaces.php:1841 +#: src/usr/local/www/interfaces.php:1845 msgid "IPv6 Upstream Gateway" msgstr "" -#: src/usr/local/www/interfaces.php:1851 +#: src/usr/local/www/interfaces.php:1855 msgid "" "If this interface is an Internet connection, select an existing Gateway from " "the list or add a new one using the \"Add\" button.<br />On local LANs the " "upstream gateway should be \"none\". " msgstr "" -#: src/usr/local/www/interfaces.php:1858 +#: src/usr/local/www/interfaces.php:1862 msgid "New IPv6 gateway" msgstr "" -#: src/usr/local/www/interfaces.php:1869 src/usr/local/www/interfaces.php:3169 +#: src/usr/local/www/interfaces.php:1873 src/usr/local/www/interfaces.php:3173 #: src/usr/local/www/system_gateways_edit.php:700 msgid "Gateway name" msgstr "" -#: src/usr/local/www/interfaces.php:1876 +#: src/usr/local/www/interfaces.php:1880 #: src/usr/local/www/status_interfaces.php:155 msgid "Gateway IPv6" msgstr "" -#: src/usr/local/www/interfaces.php:1909 +#: src/usr/local/www/interfaces.php:1913 msgid "DHCP client configuration" msgstr "" -#: src/usr/local/www/interfaces.php:1912 +#: src/usr/local/www/interfaces.php:1916 #: src/usr/local/www/status_rrd_graph.php:551 msgid "Options" msgstr "" -#: src/usr/local/www/interfaces.php:1935 +#: src/usr/local/www/interfaces.php:1939 msgid "" "The value in this field is sent as the DHCP client identifier and hostname " "when requesting a DHCP lease. Some ISPs may require this (for client " "identification)." msgstr "" -#: src/usr/local/www/interfaces.php:1939 +#: src/usr/local/www/interfaces.php:1943 msgid "Alias IPv4 address" msgstr "" -#: src/usr/local/www/interfaces.php:1941 +#: src/usr/local/www/interfaces.php:1945 msgid "" "The value in this field is used as a fixed alias IPv4 address by the DHCP " "client." msgstr "" -#: src/usr/local/www/interfaces.php:1945 +#: src/usr/local/www/interfaces.php:1949 msgid "Reject leases from" msgstr "" -#: src/usr/local/www/interfaces.php:1948 +#: src/usr/local/www/interfaces.php:1952 msgid "" "If there is a certain upstream DHCP server that should be ignored, place the " "IP address or subnet of the DHCP server to be ignored here. This is useful " @@ -12639,99 +12689,99 @@ msgid "" "upstream sync." msgstr "" -#: src/usr/local/www/interfaces.php:1951 +#: src/usr/local/www/interfaces.php:1955 msgid "Protocol timing" msgstr "" -#: src/usr/local/www/interfaces.php:1959 +#: src/usr/local/www/interfaces.php:1963 #: src/usr/local/www/load_balancer_setting.php:152 msgid "Timeout" msgstr "" -#: src/usr/local/www/interfaces.php:1966 +#: src/usr/local/www/interfaces.php:1970 #: src/usr/local/www/load_balancer_pool_edit.php:378 msgid "Retry" msgstr "" -#: src/usr/local/www/interfaces.php:1974 +#: src/usr/local/www/interfaces.php:1978 msgid "Select timeout" msgstr "" -#: src/usr/local/www/interfaces.php:1988 +#: src/usr/local/www/interfaces.php:1992 msgid "Backoff cutoff" msgstr "" -#: src/usr/local/www/interfaces.php:1995 +#: src/usr/local/www/interfaces.php:1999 msgid "Initial interval" msgstr "" -#: src/usr/local/www/interfaces.php:1999 +#: src/usr/local/www/interfaces.php:2003 msgid "Presets" msgstr "" -#: src/usr/local/www/interfaces.php:2034 +#: src/usr/local/www/interfaces.php:2038 msgid "" "The values in these fields are DHCP protocol timings used when requesting a " "lease.<br /><a href=\"http://www.freebsd.org/cgi/man.cgi?query=dhclient." "conf&sektion=5#PROTOCOL_TIMING\">See here more information</a>" msgstr "" -#: src/usr/local/www/interfaces.php:2041 src/usr/local/www/interfaces.php:2104 -#: src/usr/local/www/interfaces.php:1924 +#: src/usr/local/www/interfaces.php:2045 src/usr/local/www/interfaces.php:2108 +#: src/usr/local/www/interfaces.php:1928 msgid "Config file override" msgstr "" -#: src/usr/local/www/interfaces.php:2051 +#: src/usr/local/www/interfaces.php:2055 msgid "Lease Requirements and Requests" msgstr "" -#: src/usr/local/www/interfaces.php:2056 src/usr/local/www/interfaces.php:2165 +#: src/usr/local/www/interfaces.php:2060 src/usr/local/www/interfaces.php:2169 msgid "Send options" msgstr "" -#: src/usr/local/www/interfaces.php:2066 +#: src/usr/local/www/interfaces.php:2070 msgid "Request options" msgstr "" -#: src/usr/local/www/interfaces.php:2074 +#: src/usr/local/www/interfaces.php:2078 msgid "Require options" msgstr "" -#: src/usr/local/www/interfaces.php:2081 +#: src/usr/local/www/interfaces.php:2085 msgid "Option modifiers" msgstr "" -#: src/usr/local/www/interfaces.php:2091 +#: src/usr/local/www/interfaces.php:2095 msgid "DHCP6 client configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2112 +#: src/usr/local/www/interfaces.php:2116 msgid "Use IPv4 connectivity as parent interface" msgstr "" -#: src/usr/local/www/interfaces.php:2119 +#: src/usr/local/www/interfaces.php:2123 msgid "Request only an IPv6 prefix" msgstr "" -#: src/usr/local/www/interfaces.php:2126 +#: src/usr/local/www/interfaces.php:2130 msgid "DHCPv6 Prefix Delegation size" msgstr "" -#: src/usr/local/www/interfaces.php:2129 +#: src/usr/local/www/interfaces.php:2133 msgid "" "The value in this field is the delegated prefix length provided by the " "DHCPv6 server. Normally specified by the ISP." msgstr "" -#: src/usr/local/www/interfaces.php:2133 +#: src/usr/local/www/interfaces.php:2137 msgid "Send IPv6 prefix hint" msgstr "" -#: src/usr/local/www/interfaces.php:2140 +#: src/usr/local/www/interfaces.php:2144 msgid "Configuration File Override" msgstr "" -#: src/usr/local/www/interfaces.php:2143 +#: src/usr/local/www/interfaces.php:2147 msgid "" "The value in this field is the full absolute path to a DHCP client " "configuration file.\t [/[dirname/[.../]]filename[.ext]]<br />Value " @@ -12741,220 +12791,220 @@ msgid "" "ISPs may require certain options be or not be sent." msgstr "" -#: src/usr/local/www/interfaces.php:2152 +#: src/usr/local/www/interfaces.php:2156 msgid "Advanced DHCP6 client configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2157 +#: src/usr/local/www/interfaces.php:2161 msgid "Information only" msgstr "" -#: src/usr/local/www/interfaces.php:2175 +#: src/usr/local/www/interfaces.php:2179 msgid "Request Options" msgstr "" -#: src/usr/local/www/interfaces.php:2183 +#: src/usr/local/www/interfaces.php:2187 msgid "Scripts" msgstr "" -#: src/usr/local/www/interfaces.php:2189 +#: src/usr/local/www/interfaces.php:2193 msgid "Identity Association Statement" msgstr "" -#: src/usr/local/www/interfaces.php:2268 +#: src/usr/local/www/interfaces.php:2272 msgid "Prefix interface statement" msgstr "" -#: src/usr/local/www/interfaces.php:2286 +#: src/usr/local/www/interfaces.php:2290 msgid "Authentication statement" msgstr "" -#: src/usr/local/www/interfaces.php:2318 +#: src/usr/local/www/interfaces.php:2322 msgid "Keyinfo statement" msgstr "" -#: src/usr/local/www/interfaces.php:2363 +#: src/usr/local/www/interfaces.php:2367 msgid "6RD Configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2368 +#: src/usr/local/www/interfaces.php:2372 msgid "6RD Prefix" msgstr "" -#: src/usr/local/www/interfaces.php:2375 +#: src/usr/local/www/interfaces.php:2379 msgid "6RD Border relay" msgstr "" -#: src/usr/local/www/interfaces.php:2382 +#: src/usr/local/www/interfaces.php:2386 msgid "6RD IPv4 Prefix length" msgstr "" -#: src/usr/local/www/interfaces.php:2385 +#: src/usr/local/www/interfaces.php:2389 msgid "" "6RD IPv4 prefix length. Normally specified by the ISP. A value of 0 means we " "embed the entire IPv4 address in the 6RD prefix." msgstr "" -#: src/usr/local/www/interfaces.php:2390 +#: src/usr/local/www/interfaces.php:2394 msgid "Track IPv6 Interface" msgstr "" -#: src/usr/local/www/interfaces.php:2432 +#: src/usr/local/www/interfaces.php:2436 msgid "IPv6 Interface" msgstr "" -#: src/usr/local/www/interfaces.php:2435 +#: src/usr/local/www/interfaces.php:2439 msgid "selects the dynamic IPv6 WAN interface to track for configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2443 +#: src/usr/local/www/interfaces.php:2447 msgid "IPv6 Prefix ID" msgstr "" -#: src/usr/local/www/interfaces.php:2446 +#: src/usr/local/www/interfaces.php:2450 msgid "" "<span id=\"track6-prefix-id-range\"></span>The value in this field is the " "(Delegated) IPv6 prefix ID. This determines the configurable network ID " "based on the dynamic IPv6 connection. The default value is 0." msgstr "" -#: src/usr/local/www/interfaces.php:2459 +#: src/usr/local/www/interfaces.php:2463 #: src/usr/local/www/interfaces_ppps_edit.php:554 msgid "PPP Configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2464 src/usr/local/www/interfaces.php:2898 +#: src/usr/local/www/interfaces.php:2468 src/usr/local/www/interfaces.php:2902 #: src/usr/local/www/interfaces_ppps_edit.php:582 msgid "Country" msgstr "" -#: src/usr/local/www/interfaces.php:2471 +#: src/usr/local/www/interfaces.php:2475 #: src/usr/local/www/interfaces_ppps_edit.php:589 msgid "Provider" msgstr "" -#: src/usr/local/www/interfaces.php:2478 +#: src/usr/local/www/interfaces.php:2482 #: src/usr/local/www/interfaces_ppps_edit.php:596 msgid "Plan" msgstr "" -#: src/usr/local/www/interfaces.php:2481 +#: src/usr/local/www/interfaces.php:2485 #: src/usr/local/www/interfaces_ppps_edit.php:599 msgid "Select to fill in data for your service provider." msgstr "" -#: src/usr/local/www/interfaces.php:2499 +#: src/usr/local/www/interfaces.php:2503 #: src/usr/local/www/interfaces_ppps_edit.php:645 msgid "Phone number" msgstr "" -#: src/usr/local/www/interfaces.php:2502 +#: src/usr/local/www/interfaces.php:2506 #: src/usr/local/www/interfaces_ppps_edit.php:648 msgid "Typically *99# for GSM networks and #777 for CDMA networks" msgstr "" -#: src/usr/local/www/interfaces.php:2506 +#: src/usr/local/www/interfaces.php:2510 msgid "Access Point Name" msgstr "" -#: src/usr/local/www/interfaces.php:2532 +#: src/usr/local/www/interfaces.php:2536 msgid "Modem port" msgstr "" -#: src/usr/local/www/interfaces.php:2539 +#: src/usr/local/www/interfaces.php:2543 msgid "Advanced PPP" msgstr "" -#: src/usr/local/www/interfaces.php:2541 +#: src/usr/local/www/interfaces.php:2545 msgid "Create a new PPP configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2546 +#: src/usr/local/www/interfaces.php:2550 msgid "PPPoE Configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2565 +#: src/usr/local/www/interfaces.php:2569 #: src/usr/local/www/interfaces_ppps_edit.php:701 msgid "Service name" msgstr "" -#: src/usr/local/www/interfaces.php:2568 +#: src/usr/local/www/interfaces.php:2572 msgid "This field can usually be left empty" msgstr "" -#: src/usr/local/www/interfaces.php:2580 +#: src/usr/local/www/interfaces.php:2584 msgid "Idle timeout" msgstr "" -#: src/usr/local/www/interfaces.php:2584 src/usr/local/www/interfaces.php:2721 +#: src/usr/local/www/interfaces.php:2588 src/usr/local/www/interfaces.php:2725 msgid "" "If no qualifying outgoing packets are transmitted for the specified number " "of seconds, the connection is brought down. An idle timeout of zero disables " "this feature." msgstr "" -#: src/usr/local/www/interfaces.php:2591 +#: src/usr/local/www/interfaces.php:2595 #: src/usr/local/www/interfaces_ppps_edit.php:730 msgid "Pre-set" msgstr "" -#: src/usr/local/www/interfaces.php:2589 +#: src/usr/local/www/interfaces.php:2593 msgid "Periodic reset" msgstr "" -#: src/usr/local/www/interfaces.php:2592 +#: src/usr/local/www/interfaces.php:2596 #: src/usr/local/www/interfaces_ppps_edit.php:732 msgid "Select a reset timing type" msgstr "" -#: src/usr/local/www/interfaces.php:2594 +#: src/usr/local/www/interfaces.php:2598 msgid "Custom reset" msgstr "" -#: src/usr/local/www/interfaces.php:2603 +#: src/usr/local/www/interfaces.php:2607 msgid "Hour (0-23)" msgstr "" -#: src/usr/local/www/interfaces.php:2611 +#: src/usr/local/www/interfaces.php:2615 msgid "Minutes (0-59)" msgstr "" -#: src/usr/local/www/interfaces.php:2619 +#: src/usr/local/www/interfaces.php:2623 msgid "Specific date (mm/dd/yyyy)" msgstr "" -#: src/usr/local/www/interfaces.php:2621 +#: src/usr/local/www/interfaces.php:2625 msgid "" "If you leave the date field empty, the reset will be executed each day at " "the time you specified using the minutes and hour field" msgstr "" -#: src/usr/local/www/interfaces.php:2625 +#: src/usr/local/www/interfaces.php:2629 msgid "cron based reset" msgstr "" -#: src/usr/local/www/interfaces.php:2664 src/usr/local/www/interfaces.php:2669 -#: src/usr/local/www/interfaces.php:2732 src/usr/local/www/interfaces.php:2737 +#: src/usr/local/www/interfaces.php:2668 src/usr/local/www/interfaces.php:2673 +#: src/usr/local/www/interfaces.php:2736 src/usr/local/www/interfaces.php:2741 msgid "Advanced and MLPPP" msgstr "" -#: src/usr/local/www/interfaces.php:2677 +#: src/usr/local/www/interfaces.php:2681 msgid "PPTP/L2TP Configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2696 +#: src/usr/local/www/interfaces.php:2700 #: src/usr/local/www/interfaces_ppps_edit.php:249 #: src/usr/local/www/interfaces_ppps_edit.php:252 msgid "Local IP address" msgstr "" -#: src/usr/local/www/interfaces.php:2702 +#: src/usr/local/www/interfaces.php:2706 #: src/usr/local/www/interfaces_ppps_edit.php:249 #: src/usr/local/www/interfaces_ppps_edit.php:252 msgid "Remote IP address" msgstr "" -#: src/usr/local/www/interfaces.php:2712 +#: src/usr/local/www/interfaces.php:2716 msgid "" "This option causes the interface to operate in dial-on-demand mode, allowing " "you to have a virtual full time connection. The interface is configured, but " @@ -12962,150 +13012,150 @@ msgid "" "traffic is detected." msgstr "" -#: src/usr/local/www/interfaces.php:2717 +#: src/usr/local/www/interfaces.php:2721 msgid "Idle timeout (seconds)" msgstr "" -#: src/usr/local/www/interfaces.php:2726 +#: src/usr/local/www/interfaces.php:2730 msgid "There are additional Local and Remote IP addresses defined for MLPPP." msgstr "" -#: src/usr/local/www/interfaces.php:2747 +#: src/usr/local/www/interfaces.php:2751 msgid "" "Common wireless configuration - Settings apply to all wireless networks on " msgstr "" -#: src/usr/local/www/interfaces.php:2751 +#: src/usr/local/www/interfaces.php:2755 msgid "Persist common settings" msgstr "" -#: src/usr/local/www/interfaces.php:2771 +#: src/usr/local/www/interfaces.php:2775 msgid "Standard" msgstr "" -#: src/usr/local/www/interfaces.php:2781 src/usr/local/www/interfaces.php:2831 +#: src/usr/local/www/interfaces.php:2785 src/usr/local/www/interfaces.php:2835 msgid "Off" msgstr "" -#: src/usr/local/www/interfaces.php:2781 +#: src/usr/local/www/interfaces.php:2785 msgid "CTS to self" msgstr "" -#: src/usr/local/www/interfaces.php:2781 +#: src/usr/local/www/interfaces.php:2785 msgid "RTS and CTS" msgstr "" -#: src/usr/local/www/interfaces.php:2779 +#: src/usr/local/www/interfaces.php:2783 msgid "802.11g OFDM Protection Mode" msgstr "" -#: src/usr/local/www/interfaces.php:2782 +#: src/usr/local/www/interfaces.php:2786 msgid "" "For IEEE 802.11g, use the specified technique for protecting OFDM frames in " "a mixed 11b/11g network." msgstr "" -#: src/usr/local/www/interfaces.php:2792 src/usr/local/www/interfaces.php:2840 -#: src/usr/local/www/interfaces.php:2849 +#: src/usr/local/www/interfaces.php:2796 src/usr/local/www/interfaces.php:2844 +#: src/usr/local/www/interfaces.php:2853 #: src/usr/local/www/vpn_ipsec_phase1.php:675 #: src/usr/local/www/vpn_ipsec_phase1.php:860 #: src/usr/local/www/vpn_ipsec_phase2.php:663 msgid "Auto" msgstr "" -#: src/usr/local/www/interfaces.php:2816 +#: src/usr/local/www/interfaces.php:2820 #: src/usr/local/www/status_interfaces.php:171 msgid "Channel" msgstr "" -#: src/usr/local/www/interfaces.php:2819 +#: src/usr/local/www/interfaces.php:2823 msgid "" "Legend: wireless standards - channel # (frequency @ max TX power / TX power " "allowed in reg. domain)<br />Not all channels may be supported by your " "card. Auto may override the wireless standard selected above." msgstr "" -#: src/usr/local/www/interfaces.php:2824 +#: src/usr/local/www/interfaces.php:2828 msgid "Antenna Settings" msgstr "" -#: src/usr/local/www/interfaces.php:2831 +#: src/usr/local/www/interfaces.php:2835 msgid "On" msgstr "" -#: src/usr/local/www/interfaces.php:2832 +#: src/usr/local/www/interfaces.php:2836 msgid "Diversity" msgstr "" -#: src/usr/local/www/interfaces.php:2840 src/usr/local/www/interfaces.php:2849 +#: src/usr/local/www/interfaces.php:2844 src/usr/local/www/interfaces.php:2853 msgid "#1" msgstr "" -#: src/usr/local/www/interfaces.php:2840 src/usr/local/www/interfaces.php:2849 +#: src/usr/local/www/interfaces.php:2844 src/usr/local/www/interfaces.php:2853 msgid "#2" msgstr "" -#: src/usr/local/www/interfaces.php:2841 +#: src/usr/local/www/interfaces.php:2845 msgid "Transmit antenna" msgstr "" -#: src/usr/local/www/interfaces.php:2850 +#: src/usr/local/www/interfaces.php:2854 msgid "Receive antenna" msgstr "" -#: src/usr/local/www/interfaces.php:2853 +#: src/usr/local/www/interfaces.php:2857 msgid "" "Note: The antenna numbers do not always match up with the labels on the card." msgstr "" -#: src/usr/local/www/interfaces.php:2862 +#: src/usr/local/www/interfaces.php:2866 msgid "Distance setting (meters)" msgstr "" -#: src/usr/local/www/interfaces.php:2865 +#: src/usr/local/www/interfaces.php:2869 msgid "" "This field can be used to tune ACK/CTS timers to fit the distance between AP " "and Client" msgstr "" -#: src/usr/local/www/interfaces.php:2871 +#: src/usr/local/www/interfaces.php:2875 msgid "Regulatory settings" msgstr "" -#: src/usr/local/www/interfaces.php:2883 +#: src/usr/local/www/interfaces.php:2887 msgid "Regulatory domain" msgstr "" -#: src/usr/local/www/interfaces.php:2886 +#: src/usr/local/www/interfaces.php:2890 msgid "" "Some cards have a default that is not recognized and require changing the " "regulatory domain to one in this list for the changes to other regulatory " "settings to work" msgstr "" -#: src/usr/local/www/interfaces.php:2901 +#: src/usr/local/www/interfaces.php:2905 msgid "" "Any country setting other than \"Default\" will override the regulatory " "domain setting" msgstr "" -#: src/usr/local/www/interfaces.php:2907 +#: src/usr/local/www/interfaces.php:2911 msgid "Indoor" msgstr "" -#: src/usr/local/www/interfaces.php:2907 +#: src/usr/local/www/interfaces.php:2911 msgid "Outdoor" msgstr "" -#: src/usr/local/www/interfaces.php:2907 +#: src/usr/local/www/interfaces.php:2911 msgid "Anywhere" msgstr "" -#: src/usr/local/www/interfaces.php:2905 +#: src/usr/local/www/interfaces.php:2909 msgid "Location" msgstr "" -#: src/usr/local/www/interfaces.php:2908 +#: src/usr/local/www/interfaces.php:2912 msgid "" "These settings may affect which channels are available and the maximum " "transmit power allowed on those channels. Using the correct settings to " @@ -13116,75 +13166,75 @@ msgid "" "additional channels that are not already supported." msgstr "" -#: src/usr/local/www/interfaces.php:2916 +#: src/usr/local/www/interfaces.php:2920 msgid "Network-specific wireless configuration" msgstr "" -#: src/usr/local/www/interfaces.php:2937 +#: src/usr/local/www/interfaces.php:2941 msgid "802.11g" msgstr "" -#: src/usr/local/www/interfaces.php:2937 +#: src/usr/local/www/interfaces.php:2941 msgid "802.11n" msgstr "" -#: src/usr/local/www/interfaces.php:2935 +#: src/usr/local/www/interfaces.php:2939 msgid "Minimum wireless standard" msgstr "" -#: src/usr/local/www/interfaces.php:2938 +#: src/usr/local/www/interfaces.php:2942 msgid "" "When operating as an access point, allow only stations capable of the " "selected wireless standard to associate (stations not capable are not " "permitted to associate)" msgstr "" -#: src/usr/local/www/interfaces.php:2942 +#: src/usr/local/www/interfaces.php:2946 msgid "802.11g only" msgstr "" -#: src/usr/local/www/interfaces.php:2946 +#: src/usr/local/www/interfaces.php:2950 msgid "" "When operating as an access point in 802.11g mode, allow only 11g-capable " "stations to associate (11b-only stations are not permitted to associate)" msgstr "" -#: src/usr/local/www/interfaces.php:2951 +#: src/usr/local/www/interfaces.php:2955 msgid "Allow intra-BSS communication" msgstr "" -#: src/usr/local/www/interfaces.php:2955 +#: src/usr/local/www/interfaces.php:2959 msgid "" "Disabling the internal bridging is useful when traffic is to be processed " "with packet filtering" msgstr "" -#: src/usr/local/www/interfaces.php:2959 +#: src/usr/local/www/interfaces.php:2963 msgid "Enable WME" msgstr "" -#: src/usr/local/www/interfaces.php:2967 +#: src/usr/local/www/interfaces.php:2971 msgid "Hide SSID" msgstr "" -#: src/usr/local/www/interfaces.php:2976 src/usr/local/www/interfaces.php:2997 +#: src/usr/local/www/interfaces.php:2980 src/usr/local/www/interfaces.php:3001 msgid "WPA" msgstr "" -#: src/usr/local/www/interfaces.php:2988 src/usr/local/www/interfaces.php:3016 +#: src/usr/local/www/interfaces.php:2992 src/usr/local/www/interfaces.php:3020 msgid "WPA Pre-Shared Key" msgstr "" -#: src/usr/local/www/interfaces.php:2991 +#: src/usr/local/www/interfaces.php:2995 msgid "WPA Passphrase must be between 8 and 63 characters long" msgstr "" -#: src/usr/local/www/interfaces.php:2997 +#: src/usr/local/www/interfaces.php:3001 msgid "WPA2" msgstr "" -#: src/usr/local/www/interfaces.php:2997 src/usr/local/www/interfaces.php:3004 -#: src/usr/local/www/interfaces.php:3011 src/usr/local/www/pkg_mgr.php:192 +#: src/usr/local/www/interfaces.php:3001 src/usr/local/www/interfaces.php:3008 +#: src/usr/local/www/interfaces.php:3015 src/usr/local/www/pkg_mgr.php:192 #: src/usr/local/www/services_captiveportal_hostname_edit.php:186 #: src/usr/local/www/services_captiveportal_ip_edit.php:229 #: src/usr/local/www/widgets/widgets/gateways.widget.php:135 @@ -13192,11 +13242,11 @@ msgstr "" msgid "Both" msgstr "" -#: src/usr/local/www/interfaces.php:2995 +#: src/usr/local/www/interfaces.php:2999 msgid "WPA mode" msgstr "" -#: src/usr/local/www/interfaces.php:3004 +#: src/usr/local/www/interfaces.php:3008 #: src/usr/local/www/vpn_ipsec_keys.php:140 #: src/usr/local/www/vpn_ipsec_keys_edit.php:101 #: src/usr/local/www/vpn_ipsec_keys_edit.php:155 @@ -13206,90 +13256,90 @@ msgstr "" msgid "Pre-Shared Key" msgstr "" -#: src/usr/local/www/interfaces.php:3004 +#: src/usr/local/www/interfaces.php:3008 msgid "Extensible Authentication Protocol" msgstr "" -#: src/usr/local/www/interfaces.php:3002 +#: src/usr/local/www/interfaces.php:3006 msgid "WPA Key Management Mode" msgstr "" -#: src/usr/local/www/interfaces.php:3011 +#: src/usr/local/www/interfaces.php:3015 msgid "AES (recommended)" msgstr "" -#: src/usr/local/www/interfaces.php:3011 +#: src/usr/local/www/interfaces.php:3015 msgid "TKIP" msgstr "" -#: src/usr/local/www/interfaces.php:3009 +#: src/usr/local/www/interfaces.php:3013 msgid "WPA Pairwise" msgstr "" -#: src/usr/local/www/interfaces.php:3020 +#: src/usr/local/www/interfaces.php:3024 msgid "" "Specified in seconds. Allowed values are 1-9999. Must be shorter than Master " "Key Regeneration time" msgstr "" -#: src/usr/local/www/interfaces.php:3024 +#: src/usr/local/www/interfaces.php:3028 msgid "Master Key Regeneration" msgstr "" -#: src/usr/local/www/interfaces.php:3028 +#: src/usr/local/www/interfaces.php:3032 msgid "" "Specified in seconds. Allowed values are 1-9999. Must be longer than Key " "Rotation time" msgstr "" -#: src/usr/local/www/interfaces.php:3032 +#: src/usr/local/www/interfaces.php:3036 msgid "Strict Key Regeneration" msgstr "" -#: src/usr/local/www/interfaces.php:3040 +#: src/usr/local/www/interfaces.php:3044 msgid "802.1x RADIUS options" msgstr "" -#: src/usr/local/www/interfaces.php:3044 +#: src/usr/local/www/interfaces.php:3048 msgid "IEEE802.1X" msgstr "" -#: src/usr/local/www/interfaces.php:3048 +#: src/usr/local/www/interfaces.php:3052 msgid "This option requires that the \"Enable WPA box\" is checked" msgstr "" -#: src/usr/local/www/interfaces.php:3050 +#: src/usr/local/www/interfaces.php:3054 msgid "Primary 802.1X server" msgstr "" -#: src/usr/local/www/interfaces.php:3056 src/usr/local/www/interfaces.php:3080 +#: src/usr/local/www/interfaces.php:3060 src/usr/local/www/interfaces.php:3084 msgid "" "IP address. (Commonly a Radius server (FreeRadius, Internet Authentication " "Services, etc.)" msgstr "" -#: src/usr/local/www/interfaces.php:3063 src/usr/local/www/interfaces.php:3087 +#: src/usr/local/www/interfaces.php:3067 src/usr/local/www/interfaces.php:3091 msgid "Server port. Leave blank for the default port 1812" msgstr "" -#: src/usr/local/www/interfaces.php:3067 src/usr/local/www/interfaces.php:3070 -#: src/usr/local/www/interfaces.php:3091 src/usr/local/www/interfaces.php:3094 +#: src/usr/local/www/interfaces.php:3071 src/usr/local/www/interfaces.php:3074 +#: src/usr/local/www/interfaces.php:3095 src/usr/local/www/interfaces.php:3098 msgid "Shared secret" msgstr "" -#: src/usr/local/www/interfaces.php:3074 +#: src/usr/local/www/interfaces.php:3078 msgid "Secondary 802.1X server" msgstr "" -#: src/usr/local/www/interfaces.php:3100 +#: src/usr/local/www/interfaces.php:3104 msgid "Authentication Roaming Preauth" msgstr "" -#: src/usr/local/www/interfaces.php:3109 +#: src/usr/local/www/interfaces.php:3113 msgid "Private networks" msgstr "" -#: src/usr/local/www/interfaces.php:3117 +#: src/usr/local/www/interfaces.php:3121 msgid "" "Blocks traffic from IP addresses that are reserved for private networks per " "RFC 1918 (10/8, 172.16/12, 192.168/16) as well as loopback addresses " @@ -13297,7 +13347,7 @@ msgid "" "network lies in such a private address space, too." msgstr "" -#: src/usr/local/www/interfaces.php:3127 +#: src/usr/local/www/interfaces.php:3131 msgid "" "Blocks traffic from reserved IP addresses (but not RFC 1918) or not yet " "assigned by IANA. Bogons are prefixes that should never appear in the " @@ -13306,11 +13356,11 @@ msgid "" "under System->Advanced Firewall/NAT settings" msgstr "" -#: src/usr/local/www/interfaces.php:3158 +#: src/usr/local/www/interfaces.php:3162 msgid "New gateway" msgstr "" -#: src/usr/local/www/interfaces.php:3176 +#: src/usr/local/www/interfaces.php:3180 #: src/usr/local/www/status_interfaces.php:151 msgid "Gateway IPv4" msgstr "" @@ -13395,9 +13445,7 @@ msgid "" msgstr "" #: src/usr/local/www/interfaces_assign.php:505 -msgid "" -"The interface configuration has been changed.<br />You must apply the " -"changes in order for them to take effect." +msgid "The interface configuration has been changed." msgstr "" #: src/usr/local/www/interfaces_assign.php:518 @@ -13691,7 +13739,7 @@ msgstr "" #: src/usr/local/www/interfaces_bridge_edit.php:398 #: src/usr/local/www/interfaces_ppps_edit.php:814 #: src/usr/local/www/vpn_ipsec_phase2.php:708 -#: src/usr/local/www/vpn_openvpn_client.php:752 +#: src/usr/local/www/vpn_openvpn_client.php:767 #: src/usr/local/www/vpn_openvpn_server.php:1149 msgid "Advanced Configuration" msgstr "" @@ -14146,7 +14194,7 @@ msgstr "" #: src/usr/local/www/interfaces_groups.php:88 #: src/usr/local/www/interfaces_groups_edit.php:67 -#: src/usr/local/www/system_authservers.php:390 +#: src/usr/local/www/system_authservers.php:392 #: src/usr/local/www/system_groupmanager.php:70 #: src/usr/local/www/system_groupmanager.php:273 #: src/usr/local/www/system_groupmanager.php:281 @@ -14397,7 +14445,7 @@ msgstr "" #: src/usr/local/www/interfaces_ppps_edit.php:261 #: src/usr/local/www/services_captiveportal_vouchers.php:282 -#: src/usr/local/www/services_dyndns_edit.php:140 +#: src/usr/local/www/services_dyndns_edit.php:145 msgid "Password and confirmed password must match." msgstr "" @@ -14607,7 +14655,7 @@ msgid "" msgstr "" #: src/usr/local/www/interfaces_ppps_edit.php:836 -#: src/usr/local/www/vpn_openvpn_client.php:717 +#: src/usr/local/www/vpn_openvpn_client.php:725 #: src/usr/local/www/vpn_openvpn_server.php:947 msgid "Compression" msgstr "" @@ -15200,8 +15248,10 @@ msgid "Monitor" msgstr "" #: src/usr/local/www/load_balancer_monitor.php:121 +#: src/usr/local/www/load_balancer_pool.php:135 #: src/usr/local/www/load_balancer_setting.php:134 -msgid "The load balancer configuration has been changed" +#: src/usr/local/www/status_lb_pool.php:148 +msgid "The load balancer configuration has been changed." msgstr "" #: src/usr/local/www/load_balancer_monitor.php:126 @@ -15361,18 +15411,11 @@ msgstr "" msgid "Pool" msgstr "" -#: src/usr/local/www/load_balancer_pool.php:135 -#, php-format -msgid "" -"The load balancer configuration has been changed%sYou must apply the changes " -"in order for them to take effect." -msgstr "" - #: src/usr/local/www/load_balancer_pool.php:156 #: src/usr/local/www/services_dhcp.php:885 #: src/usr/local/www/status_lb_pool.php:169 #: src/usr/local/www/status_lb_vs.php:103 -#: src/usr/local/www/system_authservers.php:392 +#: src/usr/local/www/system_authservers.php:394 #: src/usr/local/www/system_groupmanager.php:275 #: src/usr/local/www/system_groupmanager_addprivs.php:186 #: src/usr/local/www/system_usermanager.php:481 @@ -15382,6 +15425,7 @@ msgid "Servers" msgstr "" #: src/usr/local/www/load_balancer_pool.php:197 +#: src/usr/local/www/services_dhcp.php:682 msgid "Edit pool" msgstr "" @@ -15390,6 +15434,7 @@ msgid "Copy pool" msgstr "" #: src/usr/local/www/load_balancer_pool.php:199 +#: src/usr/local/www/services_dhcp.php:684 msgid "Delete pool" msgstr "" @@ -15558,7 +15603,7 @@ msgid "" msgstr "" #: src/usr/local/www/load_balancer_virtual_server.php:135 -msgid "The virtual server configuration has been changed" +msgid "The virtual server configuration has been changed." msgstr "" #: src/usr/local/www/load_balancer_virtual_server.php:159 @@ -16475,15 +16520,15 @@ msgstr "" msgid "Accounting updates" msgstr "" -#: src/usr/local/www/services_captiveportal.php:944 +#: src/usr/local/www/services_captiveportal.php:955 msgid "RADIUS options" msgstr "" -#: src/usr/local/www/services_captiveportal.php:949 +#: src/usr/local/www/services_captiveportal.php:960 msgid "Reathentication" msgstr "" -#: src/usr/local/www/services_captiveportal.php:952 +#: src/usr/local/www/services_captiveportal.php:963 msgid "" "If reauthentication is enabled, Access-Requests will be sent to the RADIUS " "server for each user that is logged in every minute. If an Access-Reject is " @@ -16491,41 +16536,41 @@ msgid "" "immediately." msgstr "" -#: src/usr/local/www/services_captiveportal.php:957 +#: src/usr/local/www/services_captiveportal.php:968 msgid "RADIUS MAC Authentication" msgstr "" -#: src/usr/local/www/services_captiveportal.php:960 +#: src/usr/local/www/services_captiveportal.php:971 msgid "" "If this option is enabled, the captive portal will try to authenticate users " "by sending their MAC address as the username and the password entered below " "to the RADIUS server." msgstr "" -#: src/usr/local/www/services_captiveportal.php:965 +#: src/usr/local/www/services_captiveportal.php:976 msgid "MAC authentication secret" msgstr "" -#: src/usr/local/www/services_captiveportal.php:972 +#: src/usr/local/www/services_captiveportal.php:983 msgid "RADIUS NAS IP Attribute" msgstr "" -#: src/usr/local/www/services_captiveportal.php:975 +#: src/usr/local/www/services_captiveportal.php:986 msgid "Choose the IP to use for calling station attribute." msgstr "" -#: src/usr/local/www/services_captiveportal.php:979 +#: src/usr/local/www/services_captiveportal.php:990 #: src/usr/local/www/system_usermanager_settings.php:160 msgid "Session timeout" msgstr "" -#: src/usr/local/www/services_captiveportal.php:982 +#: src/usr/local/www/services_captiveportal.php:993 msgid "" "When enabled, clients will be disconnected after the amount of time " "retrieved from the RADIUS Session-Timeout attribute." msgstr "" -#: src/usr/local/www/services_captiveportal.php:989 +#: src/usr/local/www/services_captiveportal.php:1000 msgid "" "If RADIUS type is set to Cisco, in Access-Requests the value of Calling-" "Station-ID will be set to the client's IP address and the Called-Station-Id " @@ -16533,39 +16578,39 @@ msgid "" "client's MAC address and Called-Station-ID = pfSense's WAN IP address." msgstr "" -#: src/usr/local/www/services_captiveportal.php:995 +#: src/usr/local/www/services_captiveportal.php:1006 msgid "Accounting style" msgstr "" -#: src/usr/local/www/services_captiveportal.php:998 +#: src/usr/local/www/services_captiveportal.php:1009 msgid "" "When enabled, data counts for RADIUS accounting packets will be taken from " "the client perspective, not the NAS. Acct-Input-Octets will represent " "download, and Acct-Output-Octets will represent upload." msgstr "" -#: src/usr/local/www/services_captiveportal.php:1003 +#: src/usr/local/www/services_captiveportal.php:1014 msgid "NAS Identifier" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1006 +#: src/usr/local/www/services_captiveportal.php:1017 msgid "" "Specify a NAS identifier to override the default value (pfSense.localdomain)" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1012 +#: src/usr/local/www/services_captiveportal.php:1023 msgid "Single dash" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1012 +#: src/usr/local/www/services_captiveportal.php:1023 msgid "Unformatted" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1010 +#: src/usr/local/www/services_captiveportal.php:1021 msgid "MAC address format" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1013 +#: src/usr/local/www/services_captiveportal.php:1024 msgid "" "This option changes the MAC address format used in the whole RADIUS system. " "Change this if you also need to change the username format for RADIUS MAC " @@ -16574,22 +16619,22 @@ msgid "" ">Unformatted: 001122334455" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1023 +#: src/usr/local/www/services_captiveportal.php:1034 msgid "HTTPS options" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1031 +#: src/usr/local/www/services_captiveportal.php:1042 msgid "" "When enabled, the username and password will be transmitted over an HTTPS " "connection to protect against eavesdroppers. A server name and certificate " "must also be specified below." msgstr "" -#: src/usr/local/www/services_captiveportal.php:1036 +#: src/usr/local/www/services_captiveportal.php:1047 msgid "HTTPS server name" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1039 +#: src/usr/local/www/services_captiveportal.php:1050 msgid "" "This name will be used in the form action for the HTTPS POST and should " "match the Common Name (CN) in your certificate (otherwise, the client " @@ -16598,22 +16643,22 @@ msgid "" "the IP resolves to the correct interface IP on pfSense." msgstr "" -#: src/usr/local/www/services_captiveportal.php:1045 +#: src/usr/local/www/services_captiveportal.php:1056 #: src/usr/local/www/system_advanced_admin.php:371 msgid "SSL Certificate" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1048 +#: src/usr/local/www/services_captiveportal.php:1059 msgid "" "If no certificates are defined, you may define one here: <a href=" "\"system_certmanager.php\">System > Cert Manager</a>" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1052 +#: src/usr/local/www/services_captiveportal.php:1063 msgid "HTTPS Forwards" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1055 +#: src/usr/local/www/services_captiveportal.php:1066 msgid "" "If this option is set, attempts to connect to SSL/HTTPS (Port 443) sites " "will not be forwarded to the captive portalThis prevents certificate errors " @@ -16623,15 +16668,15 @@ msgid "" "the HTTPS login page." msgstr "" -#: src/usr/local/www/services_captiveportal.php:1062 +#: src/usr/local/www/services_captiveportal.php:1073 msgid "HTML page contents" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1067 +#: src/usr/local/www/services_captiveportal.php:1078 msgid "Portal page contents" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1070 +#: src/usr/local/www/services_captiveportal.php:1081 msgid "" "Upload an HTML/PHP file for the portal page here (leave blank to keep the " "current one). Make sure to include a form (POST to \"$PORTAL_ACTION$\") with " @@ -16653,27 +16698,27 @@ msgid "" "\t\t\t </form>" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1095 -#: src/usr/local/www/services_captiveportal.php:1124 -#: src/usr/local/www/services_captiveportal.php:1151 +#: src/usr/local/www/services_captiveportal.php:1106 +#: src/usr/local/www/services_captiveportal.php:1135 +#: src/usr/local/www/services_captiveportal.php:1162 msgid "View current page" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1101 -#: src/usr/local/www/services_captiveportal.php:1130 -#: src/usr/local/www/services_captiveportal.php:1157 +#: src/usr/local/www/services_captiveportal.php:1112 +#: src/usr/local/www/services_captiveportal.php:1141 +#: src/usr/local/www/services_captiveportal.php:1168 msgid "Download current page" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1107 +#: src/usr/local/www/services_captiveportal.php:1118 msgid "Restore default portal page" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1114 +#: src/usr/local/www/services_captiveportal.php:1125 msgid "Auth error page contents" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1117 +#: src/usr/local/www/services_captiveportal.php:1128 msgid "" "The contents of the HTML/PHP file that you upload here are displayed when an " "authentication error occurs. You may include \"$PORTAL_MESSAGE$\", which " @@ -16681,25 +16726,25 @@ msgid "" "any." msgstr "" -#: src/usr/local/www/services_captiveportal.php:1136 +#: src/usr/local/www/services_captiveportal.php:1147 msgid "Restore default error page" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1143 +#: src/usr/local/www/services_captiveportal.php:1154 msgid "Logout page contents" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1146 +#: src/usr/local/www/services_captiveportal.php:1157 msgid "" "The contents of the HTML/PHP file that you upload here are displayed on " "authentication success when the logout popup is enabled." msgstr "" -#: src/usr/local/www/services_captiveportal.php:1163 +#: src/usr/local/www/services_captiveportal.php:1174 msgid "Restore default logout page" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1177 +#: src/usr/local/www/services_captiveportal.php:1188 msgid "" "Warning:<br />Don't forget to enable the DHCP server on your captive portal " "interface! Make sure that the default/maximum DHCP lease time is higher than " @@ -16844,7 +16889,7 @@ msgstr "" #: src/usr/local/www/services_captiveportal_hostname_edit.php:233 #: src/usr/local/www/services_captiveportal_ip_edit.php:266 -#: src/usr/local/www/services_captiveportal_mac_edit.php:262 +#: src/usr/local/www/services_captiveportal_mac_edit.php:269 msgid "Bandwidth up" msgstr "" @@ -16854,7 +16899,7 @@ msgstr "" #: src/usr/local/www/services_captiveportal_hostname_edit.php:240 #: src/usr/local/www/services_captiveportal_ip_edit.php:273 -#: src/usr/local/www/services_captiveportal_mac_edit.php:269 +#: src/usr/local/www/services_captiveportal_mac_edit.php:276 msgid "Bandwidth down" msgstr "" @@ -16965,9 +17010,7 @@ msgid "No entry exists for this mac address:" msgstr "" #: src/usr/local/www/services_captiveportal_mac.php:192 -msgid "" -"The captive portal MAC address configuration has been changed.<br />You must " -"apply the changes in order for them to take effect." +msgid "The captive portal MAC address configuration has been changed." msgstr "" #: src/usr/local/www/services_captiveportal_mac.php:232 @@ -17008,15 +17051,18 @@ msgid "Choose what to do with packets coming from this MAC address." msgstr "" #: src/usr/local/www/services_captiveportal_mac_edit.php:257 -#: src/usr/local/www/services_dhcp_edit.php:441 -msgid "MAC address (6 hex octets separated by colons)" +msgid "6 hex octets separated by colons" msgstr "" #: src/usr/local/www/services_captiveportal_mac_edit.php:265 -msgid "Enter an upload limit to be enforced on this MAC in Kbit/s" +msgid "You may enter a description here for your reference (not parsed)" msgstr "" #: src/usr/local/www/services_captiveportal_mac_edit.php:272 +msgid "Enter an upload limit to be enforced on this MAC in Kbit/s" +msgstr "" + +#: src/usr/local/www/services_captiveportal_mac_edit.php:279 msgid "Enter a download limit to be enforced on this MAC in Kbit/s" msgstr "" @@ -17428,7 +17474,7 @@ msgid "Zones" msgstr "" #: src/usr/local/www/services_captiveportal_zones.php:102 -msgid "The Captive Portal entry list has been changed" +msgid "The Captive Portal entry list has been changed." msgstr "" #: src/usr/local/www/services_captiveportal_zones.php:107 @@ -17490,7 +17536,6 @@ msgstr "" #: src/usr/local/www/services_dhcp.php:250 #: src/usr/local/www/services_dhcp.php:253 -#: src/usr/local/www/services_dhcpv6.php:198 #: src/usr/local/www/services_dhcpv6.php:204 #: src/usr/local/www/services_dhcpv6.php:207 msgid "A valid range must be specified." @@ -17528,8 +17573,8 @@ msgstr "" #: src/usr/local/www/services_dhcp.php:296 #, php-format msgid "" -"The Captive Portal zone '%s' has Hard Timeout parameter set to a value " -"bigger than Default lease time (%s)." +"The Captive Portal zone (%1$s) has Hard Timeout parameter set to a value " +"bigger than Default lease time (%2$s)." msgstr "" #: src/usr/local/www/services_dhcp.php:302 @@ -17562,7 +17607,7 @@ msgstr "" #: src/usr/local/www/services_dhcp.php:318 #: src/usr/local/www/services_dhcp_edit.php:310 #: src/usr/local/www/services_dhcpv6.php:239 -#: src/usr/local/www/services_router_advertisements.php:187 +#: src/usr/local/www/services_router_advertisements.php:192 msgid "A valid domain search list must be specified." msgstr "" @@ -17701,12 +17746,12 @@ msgid "The DHCP range cannot overlap any static DHCP mappings." msgstr "" #: src/usr/local/www/services_dhcp.php:660 -#: src/usr/local/www/status_dhcp_leases.php:468 +#: src/usr/local/www/status_dhcp_leases.php:477 msgid "Pool Start" msgstr "" #: src/usr/local/www/services_dhcp.php:661 -#: src/usr/local/www/status_dhcp_leases.php:469 +#: src/usr/local/www/status_dhcp_leases.php:478 msgid "Pool End" msgstr "" @@ -17719,7 +17764,7 @@ msgstr "" #: src/usr/local/www/services_dhcp.php:718 #: src/usr/local/www/services_dhcpv6.php:459 -msgid "The static mapping configuration has been changed" +msgid "The static mapping configuration has been changed." msgstr "" #: src/usr/local/www/services_dhcp.php:744 @@ -17817,7 +17862,7 @@ msgstr "" #: src/usr/local/www/services_dhcp.php:927 #: src/usr/local/www/services_dhcp_edit.php:568 #: src/usr/local/www/services_dhcpv6.php:648 -#: src/usr/local/www/services_router_advertisements.php:382 +#: src/usr/local/www/services_router_advertisements.php:410 msgid "Domain search list" msgstr "" @@ -18011,12 +18056,12 @@ msgstr "" #: src/usr/local/www/services_dhcp.php:1137 msgid "" "Enter the DHCP option number and the value for each item you would like to " -"include in the DHCP lease information. For a list of available options " -"please visit this " +"include in the DHCP lease information." msgstr "" #: src/usr/local/www/services_dhcp.php:1138 -msgid "URL" +#, php-format +msgid "For a list of available options please visit this %1$s URL%2$s" msgstr "" #: src/usr/local/www/services_dhcp.php:1146 @@ -18110,14 +18155,14 @@ msgstr "" #: src/usr/local/www/services_dhcp.php:1327 #: src/usr/local/www/services_dhcp_edit.php:410 -#: src/usr/local/www/services_dhcpv6.php:924 +#: src/usr/local/www/services_dhcpv6.php:930 #: src/usr/local/www/services_dhcpv6_edit.php:217 -#: src/usr/local/www/status_dhcp_leases.php:443 +#: src/usr/local/www/status_dhcp_leases.php:452 msgid "Edit static mapping" msgstr "" #: src/usr/local/www/services_dhcp.php:1328 -#: src/usr/local/www/services_dhcpv6.php:925 +#: src/usr/local/www/services_dhcpv6.php:931 msgid "Delete static mapping" msgstr "" @@ -18175,6 +18220,10 @@ msgstr "" msgid "The IP address cannot be the %s broadcast address." msgstr "" +#: src/usr/local/www/services_dhcp_edit.php:441 +msgid "MAC address (6 hex octets separated by colons)" +msgstr "" + #: src/usr/local/www/services_dhcp_edit.php:446 msgid "Client Identifier" msgstr "" @@ -18272,7 +18321,7 @@ msgstr "" #: src/usr/local/www/services_dhcp_edit.php:601 #: src/usr/local/www/services_dhcpv6.php:692 #: src/usr/local/www/services_dnsmasq.php:244 -#: src/usr/local/www/services_unbound.php:339 +#: src/usr/local/www/services_unbound.php:327 msgid "DHCP Registration" msgstr "" @@ -18385,6 +18434,7 @@ msgid "" "This is the IP address of the server to which DHCP requests are relayed." msgstr "" +#: src/usr/local/www/services_dhcpv6.php:198 #: src/usr/local/www/services_dhcpv6.php:201 msgid "A valid prefix range must be specified." msgstr "" @@ -18394,7 +18444,7 @@ msgid "A valid IPv6 address must be specified for the gateway." msgstr "" #: src/usr/local/www/services_dhcpv6.php:216 -#: src/usr/local/www/services_router_advertisements.php:181 +#: src/usr/local/www/services_router_advertisements.php:186 msgid "A valid IPv6 address must be specified for each of the DNS servers." msgstr "" @@ -18429,8 +18479,8 @@ msgid "" msgstr "" #: src/usr/local/www/services_dhcpv6.php:516 -#: src/usr/local/www/services_router_advertisements.php:228 -#: src/usr/local/www/services_router_advertisements.php:271 +#: src/usr/local/www/services_router_advertisements.php:240 +#: src/usr/local/www/services_router_advertisements.php:283 msgid "Router Advertisements" msgstr "" @@ -18469,6 +18519,8 @@ msgid "" msgstr "" #: src/usr/local/www/services_dhcpv6.php:641 +#: src/usr/local/www/services_dyndns_edit.php:135 +#: src/usr/local/www/services_dyndns_edit.php:320 msgid "Domain Name" msgstr "" @@ -18511,51 +18563,28 @@ msgstr "" msgid "Add Option" msgstr "" -#: src/usr/local/www/services_dhcpv6.php:881 -msgid "The DNS servers entered in " -msgstr "" - -#: src/usr/local/www/services_dhcpv6.php:881 -msgid " System: General setup" -msgstr "" - -#: src/usr/local/www/services_dhcpv6.php:882 -msgid " (or the " -msgstr "" - -#: src/usr/local/www/services_dhcpv6.php:882 -msgid "DNS forwarder" -msgstr "" - -#: src/usr/local/www/services_dhcpv6.php:882 -msgid "if enabled) " -msgstr "" - #: src/usr/local/www/services_dhcpv6.php:883 -msgid "will be assigned to clients by the DHCP server." -msgstr "" - -#: src/usr/local/www/services_dhcpv6.php:884 -msgid "The DHCP lease table can be viewed on the " -msgstr "" - -#: src/usr/local/www/services_dhcpv6.php:885 -msgid "Status: DHCPv6 leases" +#, php-format +msgid "" +"The DNS servers entered in %1$sSystem: General setup%3$s (or the %2$sDNS " +"forwarder%3$s if enabled) will be assigned to clients by the DHCP server." msgstr "" -#: src/usr/local/www/services_dhcpv6.php:885 -msgid " page." +#: src/usr/local/www/services_dhcpv6.php:889 +#, php-format +msgid "" +"The DHCP lease table can be viewed on the %1$sStatus: DHCPv6 leases%2$s page." msgstr "" -#: src/usr/local/www/services_dhcpv6.php:891 +#: src/usr/local/www/services_dhcpv6.php:897 msgid "DHCPv6 Static Mappings for this interface." msgstr "" -#: src/usr/local/www/services_dhcpv6.php:896 +#: src/usr/local/www/services_dhcpv6.php:902 #: src/usr/local/www/services_dhcpv6_edit.php:141 #: src/usr/local/www/services_dhcpv6_edit.php:232 -#: src/usr/local/www/status_dhcpv6_leases.php:445 -#: src/usr/local/www/status_dhcpv6_leases.php:538 +#: src/usr/local/www/status_dhcpv6_leases.php:455 +#: src/usr/local/www/status_dhcpv6_leases.php:548 msgid "DUID" msgstr "" @@ -18597,7 +18626,7 @@ msgid "Enter the root-path string. This overrides setting on main page." msgstr "" #: src/usr/local/www/services_dhcpv6_relay.php:121 -msgid "A valid Destination Server IPv6 address must be specified." +msgid "A valid Destination Server IPv6 address must be specified." msgstr "" #: src/usr/local/www/services_dhcpv6_relay.php:157 @@ -18642,7 +18671,7 @@ msgid "Invalid custom options" msgstr "" #: src/usr/local/www/services_dnsmasq.php:228 -msgid "The DNS forwarder configuration has been changed" +msgid "The DNS forwarder configuration has been changed." msgstr "" #: src/usr/local/www/services_dnsmasq.php:233 @@ -18650,7 +18679,7 @@ msgid "General DNS Forwarder Options" msgstr "" #: src/usr/local/www/services_dnsmasq.php:256 -#: src/usr/local/www/services_unbound.php:348 +#: src/usr/local/www/services_unbound.php:336 msgid "Static DHCP" msgstr "" @@ -18660,17 +18689,17 @@ msgstr "" #: src/usr/local/www/services_dnsmasq.php:275 #: src/usr/local/www/services_dnsmasq.php:279 -#: src/usr/local/www/services_unbound.php:332 +#: src/usr/local/www/services_unbound.php:320 msgid "DNS Query Forwarding" msgstr "" #: src/usr/local/www/services_dnsmasq.php:309 -#: src/usr/local/www/services_unbound.php:287 +#: src/usr/local/www/services_unbound.php:277 msgid "Listen Port" msgstr "" #: src/usr/local/www/services_dnsmasq.php:313 -#: src/usr/local/www/services_unbound.php:291 +#: src/usr/local/www/services_unbound.php:281 msgid "" "The port used for responding to DNS queries. It should normally be left " "blank unless another service needs to bind to TCP/UDP port 53." @@ -18697,10 +18726,10 @@ msgid "" msgstr "" #: src/usr/local/www/services_dnsmasq.php:337 +#: src/usr/local/www/services_unbound.php:345 +#: src/usr/local/www/services_unbound.php:351 #: src/usr/local/www/services_unbound.php:357 -#: src/usr/local/www/services_unbound.php:363 -#: src/usr/local/www/services_unbound.php:369 -#: src/usr/local/www/vpn_openvpn_client.php:757 +#: src/usr/local/www/vpn_openvpn_client.php:772 #: src/usr/local/www/vpn_openvpn_server.php:1153 msgid "Custom options" msgstr "" @@ -18711,20 +18740,33 @@ msgid "" "configuration here, separated by a space or newline" msgstr "" -#: src/usr/local/www/services_dnsmasq.php:362 -#: src/usr/local/www/services_unbound.php:420 +#: src/usr/local/www/services_dnsmasq.php:349 +#, php-format +msgid "" +"If the DNS forwarder is enabled, the DHCP service (if enabled) will " +"automatically serve the LAN IP address as a DNS server to DHCP clients so " +"they will use the forwarder. The DNS forwarder will use the DNS servers " +"entered in %1$sSystem: General setup%3$s or those obtained via DHCP or PPP " +"on WAN if "Allow DNS server list to be overridden by DHCP/PPP on " +"WAN" is checked. If you don't use that option (or if you use a static " +"IP address on WAN), you must manually specify at least one DNS server on the " +"%2$sSystem:General setup%3$s page." +msgstr "" + +#: src/usr/local/www/services_dnsmasq.php:363 +#: src/usr/local/www/services_unbound.php:408 msgid "Host Overrides" msgstr "" -#: src/usr/local/www/services_dnsmasq.php:368 -#: src/usr/local/www/services_dnsmasq.php:449 +#: src/usr/local/www/services_dnsmasq.php:369 +#: src/usr/local/www/services_dnsmasq.php:450 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:100 #: src/usr/local/www/services_dnsmasq_domainoverride_edit.php:167 #: src/usr/local/www/services_dnsmasq_edit.php:110 #: src/usr/local/www/services_dnsmasq_edit.php:254 #: src/usr/local/www/services_dnsmasq_edit.php:311 -#: src/usr/local/www/services_unbound.php:426 -#: src/usr/local/www/services_unbound.php:502 +#: src/usr/local/www/services_unbound.php:414 +#: src/usr/local/www/services_unbound.php:490 #: src/usr/local/www/services_unbound_domainoverride_edit.php:96 #: src/usr/local/www/services_unbound_domainoverride_edit.php:155 #: src/usr/local/www/services_unbound_host_edit.php:111 @@ -18734,48 +18776,48 @@ msgstr "" msgid "Domain" msgstr "" -#: src/usr/local/www/services_dnsmasq.php:392 -#: src/usr/local/www/services_dnsmasq.php:416 -#: src/usr/local/www/services_unbound.php:451 -#: src/usr/local/www/services_unbound.php:475 +#: src/usr/local/www/services_dnsmasq.php:393 +#: src/usr/local/www/services_dnsmasq.php:417 +#: src/usr/local/www/services_unbound.php:439 +#: src/usr/local/www/services_unbound.php:463 msgid "Edit host override" msgstr "" -#: src/usr/local/www/services_dnsmasq.php:393 -#: src/usr/local/www/services_unbound.php:452 +#: src/usr/local/www/services_dnsmasq.php:394 +#: src/usr/local/www/services_unbound.php:440 msgid "Delete host override" msgstr "" -#: src/usr/local/www/services_dnsmasq.php:409 -#: src/usr/local/www/services_unbound.php:468 +#: src/usr/local/www/services_dnsmasq.php:410 +#: src/usr/local/www/services_unbound.php:456 msgid "Alias for " msgstr "" -#: src/usr/local/www/services_dnsmasq.php:438 +#: src/usr/local/www/services_dnsmasq.php:439 msgid "" "Entries in this section override individual results from the forwarders." msgstr "" -#: src/usr/local/www/services_dnsmasq.php:439 +#: src/usr/local/www/services_dnsmasq.php:440 msgid "Use these for changing DNS results or for adding custom DNS records." msgstr "" -#: src/usr/local/www/services_dnsmasq.php:444 -#: src/usr/local/www/services_unbound.php:497 +#: src/usr/local/www/services_dnsmasq.php:445 +#: src/usr/local/www/services_unbound.php:485 msgid "Domain Overrides" msgstr "" -#: src/usr/local/www/services_dnsmasq.php:471 -#: src/usr/local/www/services_unbound.php:525 +#: src/usr/local/www/services_dnsmasq.php:472 +#: src/usr/local/www/services_unbound.php:513 msgid "Edit domain override" msgstr "" -#: src/usr/local/www/services_dnsmasq.php:472 -#: src/usr/local/www/services_unbound.php:526 +#: src/usr/local/www/services_dnsmasq.php:473 +#: src/usr/local/www/services_unbound.php:514 msgid "Delete domain override" msgstr "" -#: src/usr/local/www/services_dnsmasq.php:492 +#: src/usr/local/www/services_dnsmasq.php:493 msgid "" "Entries in this area override an entire domain, and subdomains, by " "specifying an authoritative DNS server to be queried for that domain." @@ -18912,136 +18954,138 @@ msgstr "" msgid "Add host name" msgstr "" -#: src/usr/local/www/services_dyndns.php:95 +#: src/usr/local/www/services_dyndns.php:100 msgid "Clients" msgstr "" -#: src/usr/local/www/services_dyndns.php:104 +#: src/usr/local/www/services_dyndns.php:109 #: src/usr/local/www/services_rfc2136.php:97 msgid "RFC 2136" msgstr "" -#: src/usr/local/www/services_dyndns.php:109 +#: src/usr/local/www/services_dyndns.php:114 msgid "Dynamic DNS Clients" msgstr "" -#: src/usr/local/www/services_dyndns.php:116 +#: src/usr/local/www/services_dyndns.php:121 #: src/usr/local/www/status_openvpn.php:260 #: src/usr/local/www/status_openvpn.php:316 #: src/usr/local/www/status_services.php:130 -#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:105 +#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:111 #: src/usr/local/www/widgets/widgets/services_status.widget.php:90 msgid "Service" msgstr "" -#: src/usr/local/www/services_dyndns.php:118 +#: src/usr/local/www/services_dyndns.php:123 #: src/usr/local/www/services_rfc2136.php:116 -#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:107 +#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:113 msgid "Cached IP" msgstr "" -#: src/usr/local/www/services_dyndns.php:209 +#: src/usr/local/www/services_dyndns.php:219 msgid "Edit service" msgstr "" -#: src/usr/local/www/services_dyndns.php:212 +#: src/usr/local/www/services_dyndns.php:222 msgid "Disable service" msgstr "" -#: src/usr/local/www/services_dyndns.php:215 +#: src/usr/local/www/services_dyndns.php:225 msgid "Enable service" msgstr "" -#: src/usr/local/www/services_dyndns.php:218 +#: src/usr/local/www/services_dyndns.php:228 msgid "Delete service" msgstr "" -#: src/usr/local/www/services_dyndns.php:240 +#: src/usr/local/www/services_dyndns.php:250 msgid "" "IP addresses appearing in <span class=\"text-success\">green</span> are up " "to date with Dynamic DNS provider. " msgstr "" -#: src/usr/local/www/services_dyndns.php:241 +#: src/usr/local/www/services_dyndns.php:251 msgid "" "You can force an update for an IP address on the edit page for that service." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:123 +#: src/usr/local/www/services_dyndns_edit.php:124 msgid "Service type" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:134 -#: src/usr/local/www/services_dyndns_edit.php:380 +#: src/usr/local/www/services_dyndns_edit.php:139 +#: src/usr/local/www/services_dyndns_edit.php:399 msgid "Update URL" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:153 +#: src/usr/local/www/services_dyndns_edit.php:158 msgid "The hostname contains invalid characters." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:160 +#: src/usr/local/www/services_dyndns_edit.php:165 msgid "The MX contains invalid characters." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:163 +#: src/usr/local/www/services_dyndns_edit.php:168 #: src/usr/local/www/system_usermanager.php:204 #: src/usr/local/www/vpn_l2tp_users_edit.php:117 msgid "The username contains invalid characters." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:257 -#: src/usr/local/www/services_dyndns_edit.php:270 +#: src/usr/local/www/services_dyndns_edit.php:263 +#: src/usr/local/www/services_dyndns_edit.php:276 msgid "Dynamic DNS Client" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:283 +#: src/usr/local/www/services_dyndns_edit.php:289 msgid "Service Type" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:292 +#: src/usr/local/www/services_dyndns_edit.php:298 msgid "Interface to monitor" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:299 +#: src/usr/local/www/services_dyndns_edit.php:305 msgid "Interface to send update from" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:302 +#: src/usr/local/www/services_dyndns_edit.php:308 msgid "This is almost always the same as the Interface to Monitor. " msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:309 +#: src/usr/local/www/services_dyndns_edit.php:325 msgid "" "Enter the complete fully qualified domain name. Example: myhost.dyndns." "org<br />he.net tunnelbroker: Enter your tunnel ID<br />GleSYS: Enter your " -"record ID<br />DNSimple: Enter only the domain name." +"record ID<br />DNSimple: Enter only the domain name.<br />Namecheap: Enter " +"the hostname and the domain separately, with the domain being the domain or " +"subdomain zone being handled by Namecheap." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:316 +#: src/usr/local/www/services_dyndns_edit.php:335 msgid "MX" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:319 +#: src/usr/local/www/services_dyndns_edit.php:338 msgid "" "Note: With DynDNS service you can only use a hostname, not an IP address. " "Set this option only if you need a special MX record. Not all services " "support this." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:324 +#: src/usr/local/www/services_dyndns_edit.php:343 msgid "Wildcards" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:331 +#: src/usr/local/www/services_dyndns_edit.php:350 msgid "Verbose logging" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:338 +#: src/usr/local/www/services_dyndns_edit.php:357 msgid "CURL options" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:355 +#: src/usr/local/www/services_dyndns_edit.php:374 msgid "" "Username is required for all types except Namecheap, FreeDNS and Custom " "Entries.<br />Route 53: Enter your Access Key ID.<br />GleSYS: Enter your " @@ -19049,51 +19093,49 @@ msgid "" "Authentication username and passwords." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:365 +#: src/usr/local/www/services_dyndns_edit.php:384 msgid "" "FreeDNS (freedns.afraid.org): Enter your \"Authentication Token\" provided " "by FreeDNS.<br />Route 53: Enter your Secret Access Key.<br />GleSYS: Enter " "your API key.<br />DNSimple: Enter your API token." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:372 +#: src/usr/local/www/services_dyndns_edit.php:391 msgid "Zone ID" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:375 +#: src/usr/local/www/services_dyndns_edit.php:394 msgid "" "Enter Zone ID that you received when you created your domain in Route 53." "<br />DNSimple: Enter the Record ID of record to update." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:383 +#: src/usr/local/www/services_dyndns_edit.php:402 msgid "" "This is the only field required by for Custom Dynamic DNS, and is only used " "by Custom Entries." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:387 +#: src/usr/local/www/services_dyndns_edit.php:406 msgid "Result Match" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:396 +#: src/usr/local/www/services_dyndns_edit.php:415 #: src/usr/local/www/services_rfc2136_edit.php:112 msgid "TTL" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:399 +#: src/usr/local/www/services_dyndns_edit.php:418 msgid "Choose TTL for your dns record." msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:418 +#: src/usr/local/www/services_dyndns_edit.php:437 #: src/usr/local/www/services_rfc2136_edit.php:149 msgid "Save & Force Update" msgstr "" #: src/usr/local/www/services_igmpproxy.php:109 -msgid "" -"The IGMP entry list has been changed.<br />You must apply the changes in " -"order for them to take effect." +msgid "The IGMP entry list has been changed." msgstr "" #: src/usr/local/www/services_igmpproxy.php:156 @@ -19153,6 +19195,10 @@ msgstr "" msgid "Add network" msgstr "" +#: src/usr/local/www/services_ntpd.php:78 +msgid "Upgraded settings from openttpd" +msgstr "" + #: src/usr/local/www/services_ntpd.php:280 #: src/usr/local/www/services_ntpd_gps.php:225 #: src/usr/local/www/services_ntpd_gps.php:231 @@ -19216,7 +19262,8 @@ msgstr "" #: src/usr/local/www/services_ntpd.php:376 msgid "" "These options enable additional messages from NTP to be written to the " -"System Log <a href=\"diag_logs_ntpd.php\">Status > System Logs > NTP</a>" +"System Log <a href=\"status_logs.php?logfile=ntpd\">Status > System Logs > " +"NTP</a>" msgstr "" #: src/usr/local/www/services_ntpd.php:388 @@ -19428,7 +19475,7 @@ msgid "This may be used to change the PPS Clock ID (default: PPS)." msgstr "" #: src/usr/local/www/services_pppoe.php:125 -msgid "The PPPoE entry list has been changed" +msgid "The PPPoE entry list has been changed." msgstr "" #: src/usr/local/www/services_pppoe.php:138 @@ -19606,7 +19653,7 @@ msgstr "" #: src/usr/local/www/services_pppoe_edit.php:456 #: src/usr/local/www/services_pppoe_edit.php:489 #: src/usr/local/www/system_authservers.php:231 -#: src/usr/local/www/system_authservers.php:717 +#: src/usr/local/www/system_authservers.php:718 msgid "Authentication port" msgstr "" @@ -19667,7 +19714,7 @@ msgid "RFC2136 Clients" msgstr "" #: src/usr/local/www/services_rfc2136.php:200 -#: src/usr/local/www/vpn_openvpn_client.php:823 +#: src/usr/local/www/vpn_openvpn_client.php:838 msgid "Edit client" msgstr "" @@ -19680,7 +19727,7 @@ msgid "Enable client" msgstr "" #: src/usr/local/www/services_rfc2136.php:209 -#: src/usr/local/www/vpn_openvpn_client.php:824 +#: src/usr/local/www/vpn_openvpn_client.php:839 msgid "Delete client" msgstr "" @@ -19691,7 +19738,7 @@ msgstr "" #: src/usr/local/www/services_rfc2136_edit.php:112 #: src/usr/local/www/services_rfc2136_edit.php:247 -#: src/usr/local/www/vpn_openvpn_client.php:587 +#: src/usr/local/www/vpn_openvpn_client.php:595 #: src/usr/local/www/vpn_openvpn_server.php:717 msgid "Key" msgstr "" @@ -19754,63 +19801,77 @@ msgstr "" msgid "Record Type" msgstr "" +#: src/usr/local/www/services_rfc2136_edit.php:320 +#, php-format +msgid "" +"You must configure a DNS server in %1$sSystem: General setup %2$sor allow " +"the DNS server list to be overridden by DHCP/PPP on WAN for dynamic DNS " +"updates to work." +msgstr "" + #: src/usr/local/www/services_router_advertisements.php:95 msgid "" "The DHCPv6 Server can only be enabled on interfaces configured with static, " -"non unique local IP addresses" +"non unique local IP addresses." msgstr "" #: src/usr/local/www/services_router_advertisements.php:96 -msgid "Only interfaces configured with a static IP will be shown" +msgid "Only interfaces configured with a static IP will be shown." msgstr "" -#: src/usr/local/www/services_router_advertisements.php:134 +#: src/usr/local/www/services_router_advertisements.php:138 msgid "Router Only" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:135 +#: src/usr/local/www/services_router_advertisements.php:139 msgid "Unmanaged" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:136 +#: src/usr/local/www/services_router_advertisements.php:140 msgid "Managed" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:137 +#: src/usr/local/www/services_router_advertisements.php:141 msgid "Assisted" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:138 +#: src/usr/local/www/services_router_advertisements.php:142 msgid "Stateless DHCP" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:140 +#: src/usr/local/www/services_router_advertisements.php:144 msgid "Low" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:145 +#: src/usr/local/www/services_router_advertisements.php:150 msgid "" "Subnets are specified in CIDR format. Select the CIDR mask that pertains to " "each entry.\t/128 specifies a single IPv6 host; /64 specifies a normal IPv6 " "network; etc. If no subnets are specified here, the Router Advertisement " "(RA) Daemon will advertise to the subnet to which the router's interface is " -"assigned.</span>" +"assigned." msgstr "" -#: src/usr/local/www/services_router_advertisements.php:175 +#: src/usr/local/www/services_router_advertisements.php:180 #, php-format msgid "An invalid subnet or alias was specified. [%s/%s]" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:279 +#: src/usr/local/www/services_router_advertisements.php:199 +msgid "" +"A valid lifetime below 2 hrs will be ignored by clients (RFC 4862 Section " +"5.5.3 point e)" +msgstr "" + +#: src/usr/local/www/services_router_advertisements.php:291 msgid "Advertisements" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:283 +#: src/usr/local/www/services_router_advertisements.php:295 msgid "Router mode" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:286 +#: src/usr/local/www/services_router_advertisements.php:298 msgid "" "Select the Operating Mode for the Router Advertisement (RA) Daemon. Use:<br /" "> <strong>Router Only</strong> to only advertise this router<br /> " @@ -19822,39 +19883,61 @@ msgid "" "network" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:295 +#: src/usr/local/www/services_router_advertisements.php:307 msgid "Router priority" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:298 +#: src/usr/local/www/services_router_advertisements.php:310 msgid "Select the Priority for the Router Advertisement (RA) Daemon." msgstr "" -#: src/usr/local/www/services_router_advertisements.php:319 -msgid "RA Interface" +#: src/usr/local/www/services_router_advertisements.php:314 +msgid "Default valid lifetime" +msgstr "" + +#: src/usr/local/www/services_router_advertisements.php:317 +msgid "" +"Seconds. The length of time in seconds (relative to the time the packet is " +"sent) that the prefix is valid for the purpose of on-link determination. " +"<br />The default is 86400 seconds." msgstr "" #: src/usr/local/www/services_router_advertisements.php:322 +msgid "Default preferred lifetime" +msgstr "" + +#: src/usr/local/www/services_router_advertisements.php:325 +msgid "" +"Seconds. The length of time in seconds (relative to the time the packet is " +"sent) that addresses generated from the prefix via stateless address " +"autoconfiguration remain preferred. <br />The default is 14400 seconds." +msgstr "" + +#: src/usr/local/www/services_router_advertisements.php:347 +msgid "RA Interface" +msgstr "" + +#: src/usr/local/www/services_router_advertisements.php:350 msgid "Select the Interface for the Router Advertisement (RA) Daemon." msgstr "" -#: src/usr/local/www/services_router_advertisements.php:326 +#: src/usr/local/www/services_router_advertisements.php:354 msgid "RA Subnets" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:343 +#: src/usr/local/www/services_router_advertisements.php:371 msgid "Subnets" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:370 +#: src/usr/local/www/services_router_advertisements.php:398 msgid "DNS Configuration" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:375 +#: src/usr/local/www/services_router_advertisements.php:403 msgid "Server " msgstr "" -#: src/usr/local/www/services_router_advertisements.php:385 +#: src/usr/local/www/services_router_advertisements.php:413 msgid "" "The RA server can optionally provide a domain search list. Use the semicolon " "character as separator " @@ -19990,66 +20073,61 @@ msgid "One or more Outgoing Network Interfaces must be selected." msgstr "" #: src/usr/local/www/services_unbound.php:155 -msgid "A System Domain Local-Zone Type must be selected." -msgstr "" - -#: src/usr/local/www/services_unbound.php:159 msgid "You must specify a valid port number." msgstr "" -#: src/usr/local/www/services_unbound.php:182 +#: src/usr/local/www/services_unbound.php:173 msgid "" "The generated config file cannot be parsed by unbound. Please correct the " "following errors:" msgstr "" -#: src/usr/local/www/services_unbound.php:198 +#: src/usr/local/www/services_unbound.php:189 #: src/usr/local/www/services_unbound_advanced.php:214 msgid "DNS Resolver configured." msgstr "" -#: src/usr/local/www/services_unbound.php:251 +#: src/usr/local/www/services_unbound.php:241 #: src/usr/local/www/status_logs.php:74 #: src/usr/local/www/status_logs_common.inc:125 msgid "General" msgstr "" -#: src/usr/local/www/services_unbound.php:265 +#: src/usr/local/www/services_unbound.php:255 +#: src/usr/local/www/services_unbound_acls.php:221 #: src/usr/local/www/services_unbound_advanced.php:234 -msgid "" -"The configuration of the DNS Resolver has been changed. You must apply " -"changes for them to take effect." +msgid "The DNS Resolver configuration has been changed." msgstr "" -#: src/usr/local/www/services_unbound.php:269 +#: src/usr/local/www/services_unbound.php:259 #: src/usr/local/www/services_unbound_acls.php:225 #: src/usr/local/www/services_unbound_advanced.php:238 msgid "General settings" msgstr "" -#: src/usr/local/www/services_unbound.php:270 +#: src/usr/local/www/services_unbound.php:260 #: src/usr/local/www/services_unbound_acls.php:226 #: src/usr/local/www/services_unbound_advanced.php:239 msgid "Advanced settings" msgstr "" -#: src/usr/local/www/services_unbound.php:271 +#: src/usr/local/www/services_unbound.php:261 #: src/usr/local/www/services_unbound_acls.php:208 #: src/usr/local/www/services_unbound_acls.php:227 #: src/usr/local/www/services_unbound_advanced.php:240 msgid "Access Lists" msgstr "" -#: src/usr/local/www/services_unbound.php:276 +#: src/usr/local/www/services_unbound.php:266 msgid "General DNS Resolver Options" msgstr "" -#: src/usr/local/www/services_unbound.php:297 +#: src/usr/local/www/services_unbound.php:287 #: src/usr/local/www/system_advanced_network.php:233 msgid "Network Interfaces" msgstr "" -#: src/usr/local/www/services_unbound.php:301 +#: src/usr/local/www/services_unbound.php:291 msgid "" "Interface IPs used by the DNS Resolver for responding to queries from " "clients. If an interface has both IPv4 and IPv6 IPs, both are used. Queries " @@ -20057,73 +20135,39 @@ msgid "" "behavior is to respond to queries on every available IPv4 and IPv6 address." msgstr "" -#: src/usr/local/www/services_unbound.php:308 +#: src/usr/local/www/services_unbound.php:298 msgid "Outgoing Network Interfaces" msgstr "" -#: src/usr/local/www/services_unbound.php:312 +#: src/usr/local/www/services_unbound.php:302 msgid "" "Utilize different network interface(s) that the DNS Resolver will use to " "send queries to authoritative servers and receive their replies. By default " "all interfaces are used." msgstr "" -#: src/usr/local/www/services_unbound.php:314 -#: src/usr/local/www/services_unbound_acls.php:261 -msgid "Deny" -msgstr "" - -#: src/usr/local/www/services_unbound.php:314 -#: src/usr/local/www/services_unbound_acls.php:261 -msgid "Refuse" -msgstr "" - -#: src/usr/local/www/services_unbound.php:314 -msgid "Static" -msgstr "" - -#: src/usr/local/www/services_unbound.php:314 -msgid "Transparent" -msgstr "" - -#: src/usr/local/www/services_unbound.php:314 -msgid "Type Transparent" -msgstr "" - -#: src/usr/local/www/services_unbound.php:314 -msgid "Inform" -msgstr "" - -#: src/usr/local/www/services_unbound.php:314 -msgid "Inform Deny" -msgstr "" - -#: src/usr/local/www/services_unbound.php:314 -msgid "No Default" -msgstr "" - -#: src/usr/local/www/services_unbound.php:318 +#: src/usr/local/www/services_unbound.php:306 msgid "System Domain Local Zone Type" msgstr "" -#: src/usr/local/www/services_unbound.php:321 +#: src/usr/local/www/services_unbound.php:309 msgid "" "The local-zone type used for the pfSense system domain (System | General " "Setup | Domain). Transparent is the default. Local-Zone type descriptions " "are available in the unbound.conf(5) manual pages." msgstr "" -#: src/usr/local/www/services_unbound.php:325 +#: src/usr/local/www/services_unbound.php:313 msgid "DNSSEC" msgstr "" -#: src/usr/local/www/services_unbound.php:371 +#: src/usr/local/www/services_unbound.php:359 msgid "" "Enter any additional configuration parameters to add to the DNS Resolver " "configuration here, separated by a newline" msgstr "" -#: src/usr/local/www/services_unbound.php:546 +#: src/usr/local/www/services_unbound.php:534 #, php-format msgid "" "If the DNS Resolver is enabled, the DHCP service (if enabled) will " @@ -20177,10 +20221,6 @@ msgid "" "be configured for your administrative host." msgstr "" -#: src/usr/local/www/services_unbound_acls.php:221 -msgid "The configuration of the DNS Resolver, has been changed" -msgstr "" - #: src/usr/local/www/services_unbound_acls.php:234 msgid "New Access List" msgstr "" @@ -20523,14 +20563,14 @@ msgstr "" #: src/usr/local/www/services_wol.php:86 #, php-format -msgid "Sent magic packet to %1$s (%2$s)%3$s" +msgid "Sent magic packet to %1$s (%2$s)." msgstr "" #: src/usr/local/www/services_wol.php:89 #, php-format msgid "" "Please check the %1$ssystem log%2$s, the wol command for %3$s (%4$s) did not " -"complete successfully%5$s" +"complete successfully." msgstr "" #: src/usr/local/www/services_wol.php:115 @@ -20550,16 +20590,13 @@ msgstr "" #, php-format msgid "" "Please check the %1$ssystem log%2$s, the wol command for %3$s did not " -"complete successfully%4$s" +"complete successfully." msgstr "" #: src/usr/local/www/services_wol.php:151 msgid "" -"This service can be used to wake up (power on) computers by sending special" -msgstr "" - -#: src/usr/local/www/services_wol.php:151 -msgid "Magic Packets" +"This service can be used to wake up (power on) computers by sending special " +"\"Magic Packets\"." msgstr "" #: src/usr/local/www/services_wol.php:152 @@ -20729,12 +20766,10 @@ msgid "Captive Portal Status" msgstr "" #: src/usr/local/www/status_captiveportal.php:262 +#, php-format msgid "" "No captive portal zones have been configured. You may add new zones here: " -msgstr "" - -#: src/usr/local/www/status_captiveportal.php:262 -msgid "Services->Captive portal" +"%1$sServices->Captive portal%2$s" msgstr "" #: src/usr/local/www/status_captiveportal.php:278 @@ -20774,6 +20809,8 @@ msgid "used" msgstr "" #: src/usr/local/www/status_captiveportal_voucher_rolls.php:114 +#: src/usr/local/www/status_dhcp_leases.php:176 +#: src/usr/local/www/status_dhcpv6_leases.php:212 msgid "active" msgstr "" @@ -20829,23 +20866,16 @@ msgid "" "CARP has detected a problem and this unit has been demoted to BACKUP status." msgstr "" -#: src/usr/local/www/status_carp.php:186 -msgid "Check the link status on all interfaces with configured CARP VIPs." -msgstr "" - #: src/usr/local/www/status_carp.php:187 -msgid "Search the" +msgid "Check the link status on all interfaces with configured CARP VIPs." msgstr "" #: src/usr/local/www/status_carp.php:189 -msgid "system log" -msgstr "" - -#: src/usr/local/www/status_carp.php:191 -msgid "for CARP demotion-related events." +#, php-format +msgid "Search the %1$sSystem Log%2$s for CARP demotion-related events." msgstr "" -#: src/usr/local/www/status_carp.php:193 +#: src/usr/local/www/status_carp.php:192 msgid "Reset CARP Demotion Status" msgstr "" @@ -20881,35 +20911,65 @@ msgstr "" msgid "DHCP leases" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:333 -#: src/usr/local/www/status_dhcpv6_leases.php:401 +#: src/usr/local/www/status_dhcp_leases.php:174 +#: src/usr/local/www/status_dhcpv6_leases.php:210 +msgid "online" +msgstr "" + +#: src/usr/local/www/status_dhcp_leases.php:175 +#: src/usr/local/www/status_dhcpv6_leases.php:211 +msgid "offline" +msgstr "" + +#: src/usr/local/www/status_dhcp_leases.php:177 +#: src/usr/local/www/status_dhcpv6_leases.php:213 +msgid "expired" +msgstr "" + +#: src/usr/local/www/status_dhcp_leases.php:178 +#: src/usr/local/www/status_dhcpv6_leases.php:214 +msgid "reserved" +msgstr "" + +#: src/usr/local/www/status_dhcp_leases.php:179 +#: src/usr/local/www/status_dhcpv6_leases.php:216 +msgid "dynamic" +msgstr "" + +#: src/usr/local/www/status_dhcp_leases.php:180 +#: src/usr/local/www/status_dhcpv6_leases.php:217 +msgid "static" +msgstr "" + +#: src/usr/local/www/status_dhcp_leases.php:342 +#: src/usr/local/www/status_dhcpv6_leases.php:411 msgid "Pool status" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:338 -#: src/usr/local/www/status_dhcpv6_leases.php:406 +#: src/usr/local/www/status_dhcp_leases.php:347 +#: src/usr/local/www/status_dhcpv6_leases.php:416 msgid "Failover Group" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:339 -#: src/usr/local/www/status_dhcpv6_leases.php:407 +#: src/usr/local/www/status_dhcp_leases.php:348 +#: src/usr/local/www/status_dhcpv6_leases.php:417 msgid "My State" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:340 -#: src/usr/local/www/status_dhcp_leases.php:342 -#: src/usr/local/www/status_dhcpv6_leases.php:408 -#: src/usr/local/www/status_dhcpv6_leases.php:410 +#: src/usr/local/www/status_dhcp_leases.php:349 +#: src/usr/local/www/status_dhcp_leases.php:351 +#: src/usr/local/www/status_dhcpv6_leases.php:418 +#: src/usr/local/www/status_dhcpv6_leases.php:420 msgid "Since" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:341 -#: src/usr/local/www/status_dhcpv6_leases.php:409 +#: src/usr/local/www/status_dhcp_leases.php:350 +#: src/usr/local/www/status_dhcpv6_leases.php:419 msgid "Peer State" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:364 -#: src/usr/local/www/status_dhcpv6_leases.php:437 +#: src/usr/local/www/status_dhcp_leases.php:373 +#: src/usr/local/www/status_dhcpv6_leases.php:447 #: src/usr/local/www/status_ipsec.php:120 #: src/usr/local/www/status_ipsec_leases.php:68 #: src/usr/local/www/status_ipsec_leases.php:76 @@ -20918,16 +20978,16 @@ msgstr "" msgid "Leases" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:374 -#: src/usr/local/www/status_dhcpv6_leases.php:449 -#: src/usr/local/www/status_dhcpv6_leases.php:540 +#: src/usr/local/www/status_dhcp_leases.php:383 +#: src/usr/local/www/status_dhcpv6_leases.php:459 +#: src/usr/local/www/status_dhcpv6_leases.php:550 #: src/usr/local/www/status_rrd_graph.php:604 #: src/usr/local/www/status_rrd_graph.php:607 msgid "End" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:375 -#: src/usr/local/www/status_dhcpv6_leases.php:450 +#: src/usr/local/www/status_dhcp_leases.php:384 +#: src/usr/local/www/status_dhcpv6_leases.php:460 #: src/usr/local/www/status_gateway_groups.php:167 #: src/usr/local/www/status_gateways.php:176 #: src/usr/local/www/status_gateways.php:180 @@ -20937,45 +20997,45 @@ msgstr "" msgid "Online" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:376 -#: src/usr/local/www/status_dhcpv6_leases.php:451 +#: src/usr/local/www/status_dhcp_leases.php:385 +#: src/usr/local/www/status_dhcpv6_leases.php:461 msgid "Lease Type" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:441 -#: src/usr/local/www/status_dhcpv6_leases.php:516 +#: src/usr/local/www/status_dhcp_leases.php:450 +#: src/usr/local/www/status_dhcpv6_leases.php:526 msgid "Add static mapping" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:445 -#: src/usr/local/www/status_dhcpv6_leases.php:518 +#: src/usr/local/www/status_dhcp_leases.php:454 +#: src/usr/local/www/status_dhcpv6_leases.php:528 msgid "Add WOL mapping" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:447 +#: src/usr/local/www/status_dhcp_leases.php:456 msgid "Send WOL packet" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:451 -#: src/usr/local/www/status_dhcpv6_leases.php:520 +#: src/usr/local/www/status_dhcp_leases.php:460 +#: src/usr/local/www/status_dhcpv6_leases.php:530 msgid "Delete lease" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:462 +#: src/usr/local/www/status_dhcp_leases.php:471 msgid "Leases in use" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:470 +#: src/usr/local/www/status_dhcp_leases.php:479 msgid "# of leases in use" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:488 -#: src/usr/local/www/status_dhcpv6_leases.php:609 +#: src/usr/local/www/status_dhcp_leases.php:497 +#: src/usr/local/www/status_dhcpv6_leases.php:619 msgid "Show active and static leases only" msgstr "" -#: src/usr/local/www/status_dhcp_leases.php:490 -#: src/usr/local/www/status_dhcpv6_leases.php:611 +#: src/usr/local/www/status_dhcp_leases.php:499 +#: src/usr/local/www/status_dhcpv6_leases.php:621 msgid "Show all configured leases" msgstr "" @@ -20983,31 +21043,43 @@ msgstr "" msgid "DHCPv6 leases" msgstr "" -#: src/usr/local/www/status_dhcpv6_leases.php:432 +#: src/usr/local/www/status_dhcpv6_leases.php:215 +msgid "released" +msgstr "" + +#: src/usr/local/www/status_dhcpv6_leases.php:442 msgid "No leases file found. Is the DHCP server active?" msgstr "" -#: src/usr/local/www/status_dhcpv6_leases.php:444 -#: src/usr/local/www/status_dhcpv6_leases.php:537 +#: src/usr/local/www/status_dhcpv6_leases.php:454 +#: src/usr/local/www/status_dhcpv6_leases.php:547 msgid "IAID" msgstr "" -#: src/usr/local/www/status_dhcpv6_leases.php:531 +#: src/usr/local/www/status_dhcpv6_leases.php:541 msgid "Delegated Prefixes" msgstr "" -#: src/usr/local/www/status_dhcpv6_leases.php:536 +#: src/usr/local/www/status_dhcpv6_leases.php:546 msgid "IPv6 Prefix" msgstr "" -#: src/usr/local/www/status_dhcpv6_leases.php:588 +#: src/usr/local/www/status_dhcpv6_leases.php:598 msgid "Routed To" msgstr "" +#: src/usr/local/www/status_filter_reload.php:97 +msgid "Reload Filter" +msgstr "" + +#: src/usr/local/www/status_filter_reload.php:100 +msgid "Force Config Sync" +msgstr "" + #: src/usr/local/www/status_filter_reload.php:117 msgid "" "This page will automatically refresh every 3 seconds until the filter is " -"done reloading" +"done reloading." msgstr "" #: src/usr/local/www/status_filter_reload.php:138 @@ -21036,8 +21108,8 @@ msgstr "" #: src/usr/local/www/system_gateway_groups.php:140 #: src/usr/local/www/system_gateway_groups.php:144 #: src/usr/local/www/system_gateway_groups_edit.php:180 -#: src/usr/local/www/system_gateways.php:263 -#: src/usr/local/www/system_routes.php:263 +#: src/usr/local/www/system_gateways.php:264 +#: src/usr/local/www/system_routes.php:264 msgid "Gateway Groups" msgstr "" @@ -21097,6 +21169,10 @@ msgstr "" msgid "Offline (forced)" msgstr "" +#: src/usr/local/www/status_gateways.php:197 +msgid "Last checked" +msgstr "" + #: src/usr/local/www/status_graph.php:157 #: src/usr/local/www/status_rrd_graph.php:549 #: src/usr/local/www/status_rrd_graph_settings.php:195 @@ -21147,29 +21223,21 @@ msgid "Host Name or IP" msgstr "" #: src/usr/local/www/status_graph_cpu.php:66 -msgid "CPU load" -msgstr "" - -#: src/usr/local/www/status_graph_cpu.php:70 -msgid "Status: CPU Graph" -msgstr "" - -#: src/usr/local/www/status_graph_cpu.php:74 -msgid "CPU Load graph" +#: src/usr/local/www/status_graph_cpu.php:72 +msgid "CPU Load Graph" msgstr "" -#: src/usr/local/www/status_graph_cpu.php:80 +#: src/usr/local/www/status_graph_cpu.php:79 #: src/usr/local/www/vpn_ipsec_keys.php:211 #: src/usr/local/www/vpn_ipsec_keys_edit.php:207 msgid "Note" msgstr "" #: src/usr/local/www/status_graph_cpu.php:80 -msgid "if you can't see the graph, you may have to install the" -msgstr "" - -#: src/usr/local/www/status_graph_cpu.php:81 -msgid "Adobe SVG viewer" +#, php-format +msgid "" +"If you cannot see the graph, you may have to install the %1$sAdobe SVG viewer" +"%2$s" msgstr "" #: src/usr/local/www/status_interfaces.php:120 @@ -21455,8 +21523,12 @@ msgstr "" msgid "Disconnected" msgstr "" -#: src/usr/local/www/status_ipsec.php:522 -msgid "You can configure IPsec " +#: src/usr/local/www/status_ipsec.php:531 +#: src/usr/local/www/status_ipsec_leases.php:164 +#: src/usr/local/www/status_ipsec_sad.php:161 +#: src/usr/local/www/status_ipsec_spd.php:145 +#, php-format +msgid "You can configure IPsec %1$shere%2$s" msgstr "" #: src/usr/local/www/status_ipsec_leases.php:88 @@ -21471,18 +21543,6 @@ msgstr "" msgid "No IPsec pools." msgstr "" -#: src/usr/local/www/status_ipsec_leases.php:155 -#: src/usr/local/www/status_ipsec_sad.php:152 -#: src/usr/local/www/status_ipsec_spd.php:136 -msgid "You can configure your IPsec subsystem by clicking " -msgstr "" - -#: src/usr/local/www/status_ipsec_leases.php:155 -#: src/usr/local/www/status_ipsec_sad.php:152 -#: src/usr/local/www/status_ipsec_spd.php:136 -msgid "here." -msgstr "" - #: src/usr/local/www/status_ipsec_sad.php:101 msgid "SPI" msgstr "" @@ -21523,12 +21583,6 @@ msgstr "" msgid "Updated load balancer pools via status screen." msgstr "" -#: src/usr/local/www/status_lb_pool.php:148 -msgid "" -"The load balancer configuration has been changed. You must apply the changes " -"in order for them to take effect." -msgstr "" - #: src/usr/local/www/status_lb_pool.php:162 msgid "Load Balancer Pools" msgstr "" @@ -21605,16 +21659,16 @@ msgstr "" #: src/usr/local/www/status_logs.php:170 #: src/usr/local/www/status_logs_common.inc:279 #: src/usr/local/www/status_logs_vpn.php:211 -#: src/usr/local/www/status_logs_vpn.php:446 +#: src/usr/local/www/status_logs_vpn.php:455 msgid "PID" msgstr "" -#: src/usr/local/www/status_logs.php:199 src/usr/local/www/status_logs.php:238 +#: src/usr/local/www/status_logs.php:199 src/usr/local/www/status_logs.php:247 #: src/usr/local/www/status_logs_filter.php:307 -#: src/usr/local/www/status_logs_filter.php:341 -#: src/usr/local/www/status_logs_filter_dynamic.php:481 +#: src/usr/local/www/status_logs_filter.php:350 +#: src/usr/local/www/status_logs_filter_dynamic.php:486 #: src/usr/local/www/status_logs_vpn.php:243 -#: src/usr/local/www/status_logs_vpn.php:266 +#: src/usr/local/www/status_logs_vpn.php:275 #: src/usr/local/www/widgets/widgets/log.widget.php:195 msgid "No logs to display" msgstr "" @@ -21639,7 +21693,7 @@ msgstr "" #: src/usr/local/www/vpn_ipsec_settings.php:236 #: src/usr/local/www/vpn_l2tp.php:219 src/usr/local/www/vpn_l2tp_users.php:63 #: src/usr/local/www/vpn_l2tp_users_edit.php:63 -#: src/usr/local/www/vpn_openvpn_client.php:68 +#: src/usr/local/www/vpn_openvpn_client.php:70 #: src/usr/local/www/vpn_openvpn_csc.php:70 #: src/usr/local/www/vpn_openvpn_server.php:592 msgid "VPN" @@ -21717,7 +21771,7 @@ msgstr "" #: src/usr/local/www/status_logs_common.inc:256 #: src/usr/local/www/status_logs_common.inc:417 -#: src/usr/local/www/status_logs_vpn.php:380 +#: src/usr/local/www/status_logs_vpn.php:389 msgid "Advanced Log Filter" msgstr "" @@ -21725,9 +21779,9 @@ msgstr "" #: src/usr/local/www/status_logs_common.inc:327 #: src/usr/local/www/status_logs_common.inc:473 #: src/usr/local/www/status_logs_common.inc:535 -#: src/usr/local/www/status_logs_vpn.php:405 -#: src/usr/local/www/status_logs_vpn.php:454 -#: src/usr/local/www/status_logs_vpn.php:495 +#: src/usr/local/www/status_logs_vpn.php:414 +#: src/usr/local/www/status_logs_vpn.php:463 +#: src/usr/local/www/status_logs_vpn.php:504 msgid "Quantity" msgstr "" @@ -21735,8 +21789,8 @@ msgstr "" #: src/usr/local/www/status_logs_common.inc:331 #: src/usr/local/www/status_logs_common.inc:510 #: src/usr/local/www/status_logs_common.inc:550 -#: src/usr/local/www/status_logs_vpn.php:470 -#: src/usr/local/www/status_logs_vpn.php:499 +#: src/usr/local/www/status_logs_vpn.php:479 +#: src/usr/local/www/status_logs_vpn.php:508 msgid "Apply Filter" msgstr "" @@ -21745,34 +21799,35 @@ msgstr "" #: src/usr/local/www/status_logs_common.inc:510 #: src/usr/local/www/status_logs_common.inc:550 #: src/usr/local/www/status_logs_common.inc:804 -#: src/usr/local/www/status_logs_common.inc:975 -#: src/usr/local/www/status_logs_vpn.php:470 -#: src/usr/local/www/status_logs_vpn.php:499 +#: src/usr/local/www/status_logs_common.inc:961 +#: src/usr/local/www/status_logs_common.inc:976 +#: src/usr/local/www/status_logs_vpn.php:479 +#: src/usr/local/www/status_logs_vpn.php:508 #: src/usr/local/www/diag_nanobsd.php:162 msgid " " msgstr "" #: src/usr/local/www/status_logs_common.inc:319 #: src/usr/local/www/status_logs_common.inc:546 -#: src/usr/local/www/status_logs_vpn.php:487 +#: src/usr/local/www/status_logs_vpn.php:496 msgid "Filter Expression" msgstr "" #: src/usr/local/www/status_logs_common.inc:344 #: src/usr/local/www/status_logs_common.inc:563 -#: src/usr/local/www/status_logs_vpn.php:512 +#: src/usr/local/www/status_logs_vpn.php:521 msgid "Regular expression reference" msgstr "" #: src/usr/local/www/status_logs_common.inc:344 #: src/usr/local/www/status_logs_common.inc:563 -#: src/usr/local/www/status_logs_vpn.php:512 +#: src/usr/local/www/status_logs_vpn.php:521 msgid "Precede with exclamation (!) to exclude match." msgstr "" #: src/usr/local/www/status_logs_common.inc:344 #: src/usr/local/www/status_logs_common.inc:563 -#: src/usr/local/www/status_logs_vpn.php:512 +#: src/usr/local/www/status_logs_vpn.php:521 msgid "" "<a target=\"_blank\" href=\"http://www.php.net/manual/en/book.pcre.php\">" msgstr "" @@ -21935,15 +21990,15 @@ msgid "" "performance with large rule sets" msgstr "" -#: src/usr/local/www/status_logs_common.inc:970 +#: src/usr/local/www/status_logs_common.inc:971 msgid "Saves changed settings." msgstr "" -#: src/usr/local/www/status_logs_common.inc:975 +#: src/usr/local/www/status_logs_common.inc:976 msgid "Clear log" msgstr "" -#: src/usr/local/www/status_logs_common.inc:985 +#: src/usr/local/www/status_logs_common.inc:986 msgid "" "Clears local log file and reinitializes it as an empty log. Save any " "settings changes first." @@ -21982,7 +22037,7 @@ msgstr "" msgid "Do you really want to add this PASS rule?" msgstr "" -#: src/usr/local/www/status_logs_filter_dynamic.php:409 +#: src/usr/local/www/status_logs_filter_dynamic.php:414 msgid "Pause" msgstr "" @@ -22203,7 +22258,7 @@ msgid "VPN Logins" msgstr "" #: src/usr/local/www/status_logs_vpn.php:212 -#: src/usr/local/www/status_logs_vpn.php:465 +#: src/usr/local/www/status_logs_vpn.php:474 msgid "Log Message" msgstr "" @@ -22272,48 +22327,48 @@ msgstr "" msgid "Jitter" msgstr "" -#: src/usr/local/www/status_ntpd.php:215 +#: src/usr/local/www/status_ntpd.php:217 #, php-format msgid "" "Statistics unavailable because ntpq and ntpdc queries are disabled in the " "%sNTP service settings%s" msgstr "" -#: src/usr/local/www/status_ntpd.php:221 +#: src/usr/local/www/status_ntpd.php:225 #, php-format msgid "No peers found, %sis the ntp service running?%s" msgstr "" -#: src/usr/local/www/status_ntpd.php:258 +#: src/usr/local/www/status_ntpd.php:266 msgid "GPS information" msgstr "" -#: src/usr/local/www/status_ntpd.php:264 +#: src/usr/local/www/status_ntpd.php:272 msgid "Clock Latitude" msgstr "" -#: src/usr/local/www/status_ntpd.php:267 +#: src/usr/local/www/status_ntpd.php:275 msgid "Clock Longitude" msgstr "" -#: src/usr/local/www/status_ntpd.php:271 +#: src/usr/local/www/status_ntpd.php:281 msgid "Clock Altitude" msgstr "" -#: src/usr/local/www/status_ntpd.php:278 +#: src/usr/local/www/status_ntpd.php:290 #: src/usr/local/www/widgets/widgets/ntp_status.widget.php:209 msgid "Satellites" msgstr "" -#: src/usr/local/www/status_ntpd.php:303 +#: src/usr/local/www/status_ntpd.php:322 msgid "in view " msgstr "" -#: src/usr/local/www/status_ntpd.php:310 +#: src/usr/local/www/status_ntpd.php:329 msgid "in use " msgstr "" -#: src/usr/local/www/status_ntpd.php:317 +#: src/usr/local/www/status_ntpd.php:338 msgid "Google Maps Link" msgstr "" @@ -22365,7 +22420,9 @@ msgid "Bytes Received" msgstr "" #: src/usr/local/www/status_openvpn.php:163 -msgid "Kill client connection from" +#: src/usr/local/www/widgets/widgets/openvpn.widget.php:136 +#, php-format +msgid "Kill client connection from %s" msgstr "" #: src/usr/local/www/status_openvpn.php:196 @@ -22541,12 +22598,6 @@ msgstr "" msgid "Traffic" msgstr "" -#: src/usr/local/www/status_rrd_graph.php:438 -#: src/usr/local/www/status_rrd_graph_settings.php:77 -#: src/usr/local/www/status_rrd_graph_settings.php:148 -msgid "Packets" -msgstr "" - #: src/usr/local/www/status_rrd_graph.php:439 #: src/usr/local/www/status_rrd_graph_settings.php:78 #: src/usr/local/www/status_rrd_graph_settings.php:149 @@ -22584,7 +22635,7 @@ msgstr "" #: src/usr/local/www/status_rrd_graph.php:575 msgid "" -"Any changes to these option may not take affect until the next auto-refresh." +"Any changes to these options may not take affect until the next auto-refresh." msgstr "" #: src/usr/local/www/status_rrd_graph.php:589 @@ -22593,7 +22644,7 @@ msgstr "" #: src/usr/local/www/status_rrd_graph.php:610 msgid "" -"Any changes to these option may not take affect until the next auto-refresh" +"Any changes to these options may not take affect until the next auto-refresh" msgstr "" #: src/usr/local/www/status_rrd_graph_img.php:66 @@ -22691,10 +22742,33 @@ msgstr "" msgid "Rescan" msgstr "" +#: src/usr/local/www/status_wireless.php:247 +msgid "" +"<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power saving " +"mode<br /><b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-" +"hoc mode), P = privacy (WEP/TKIP/AES), S = Short preamble, s = Short slot " +"time" +msgstr "" + #: src/usr/local/www/system.php:175 msgid "The domain may only contain the characters a-z, 0-9, '-' and '.'." msgstr "" +#: src/usr/local/www/system.php:184 +#, php-format +msgid "A valid IP address must be specified for DNS server %s." +msgstr "" + +#: src/usr/local/www/system.php:190 +#, php-format +msgid "You can not specify IPv6 gateway \"%1$s\" for IPv4 DNS server \"%2$s\"." +msgstr "" + +#: src/usr/local/www/system.php:193 +#, php-format +msgid "You can not specify IPv4 gateway \"%1$s\" for IPv6 DNS server \"%2$s\"." +msgstr "" + #: src/usr/local/www/system.php:211 #, php-format msgid "" @@ -23566,6 +23640,27 @@ msgstr "" msgid "Other " msgstr "" +#: src/usr/local/www/system_advanced_firewall.php:746 +msgid "The default optimization algorithm" +msgstr "" + +#: src/usr/local/www/system_advanced_firewall.php:748 +msgid "" +"Used for eg. satellite links. Expires idle connections later than default" +msgstr "" + +#: src/usr/local/www/system_advanced_firewall.php:750 +msgid "" +"Expires idle connections quicker. More efficient use of CPU and memory but " +"can drop legitimate idle connections" +msgstr "" + +#: src/usr/local/www/system_advanced_firewall.php:752 +msgid "" +"Tries to avoid dropping any legitimate idle connections at the expense of " +"increased memory usage and CPU utilization" +msgstr "" + #: src/usr/local/www/system_advanced_misc.php:109 msgid "AMD Geode LX Security Block" msgstr "" @@ -24217,9 +24312,7 @@ msgid "The value may contain alphanumeric characters only." msgstr "" #: src/usr/local/www/system_advanced_sysctl.php:178 -msgid "" -"The firewall tunables have changed. You must apply the configuration for " -"them to take affect." +msgid "The firewall tunables have changed." msgstr "" #: src/usr/local/www/system_advanced_sysctl.php:198 @@ -24251,17 +24344,18 @@ msgid "Tunable" msgstr "" #: src/usr/local/www/system_authservers.php:67 -#: src/usr/local/www/system_authservers.php:399 +#: src/usr/local/www/system_authservers.php:400 msgid "Authentication Servers" msgstr "" #: src/usr/local/www/system_authservers.php:114 -msgid "deleted" +#, php-format +msgid "Authentication Server %s deleted" msgstr "" #: src/usr/local/www/system_authservers.php:200 #: src/usr/local/www/system_authservers.php:223 -#: src/usr/local/www/system_authservers.php:456 +#: src/usr/local/www/system_authservers.php:457 #: src/usr/local/www/system_camanager.php:204 #: src/usr/local/www/system_camanager.php:218 #: src/usr/local/www/system_camanager.php:233 @@ -24288,17 +24382,17 @@ msgid "Hostname or IP" msgstr "" #: src/usr/local/www/system_authservers.php:203 -#: src/usr/local/www/system_authservers.php:487 +#: src/usr/local/www/system_authservers.php:488 msgid "Port value" msgstr "" #: src/usr/local/www/system_authservers.php:204 -#: src/usr/local/www/system_authservers.php:494 +#: src/usr/local/www/system_authservers.php:495 msgid "Transport" msgstr "" #: src/usr/local/www/system_authservers.php:205 -#: src/usr/local/www/system_authservers.php:523 +#: src/usr/local/www/system_authservers.php:524 msgid "Protocol version" msgstr "" @@ -24315,7 +24409,7 @@ msgid "Group naming Attribute" msgstr "" #: src/usr/local/www/system_authservers.php:209 -#: src/usr/local/www/system_authservers.php:650 +#: src/usr/local/www/system_authservers.php:651 msgid "Group member attribute" msgstr "" @@ -24332,12 +24426,12 @@ msgid "Bind Password" msgstr "" #: src/usr/local/www/system_authservers.php:237 -#: src/usr/local/www/system_authservers.php:724 +#: src/usr/local/www/system_authservers.php:725 msgid "Accounting port" msgstr "" #: src/usr/local/www/system_authservers.php:242 -#: src/usr/local/www/system_authservers.php:703 +#: src/usr/local/www/system_authservers.php:704 msgid "Shared Secret" msgstr "" @@ -24354,7 +24448,7 @@ msgstr "" msgid "%s Timeout value must be numeric and positive." msgstr "" -#: src/usr/local/www/system_authservers.php:389 +#: src/usr/local/www/system_authservers.php:391 #: src/usr/local/www/system_groupmanager.php:272 #: src/usr/local/www/system_groupmanager_addprivs.php:183 #: src/usr/local/www/system_usermanager.php:72 @@ -24368,184 +24462,184 @@ msgstr "" msgid "Users" msgstr "" -#: src/usr/local/www/system_authservers.php:405 +#: src/usr/local/www/system_authservers.php:406 msgid "Server Name" msgstr "" -#: src/usr/local/www/system_authservers.php:419 +#: src/usr/local/www/system_authservers.php:420 #: src/usr/local/www/vpn_openvpn_server.php:1220 msgid "Edit server" msgstr "" -#: src/usr/local/www/system_authservers.php:420 +#: src/usr/local/www/system_authservers.php:421 #: src/usr/local/www/vpn_openvpn_server.php:1221 msgid "Delete server" msgstr "" -#: src/usr/local/www/system_authservers.php:452 +#: src/usr/local/www/system_authservers.php:453 msgid "Server settings" msgstr "" -#: src/usr/local/www/system_authservers.php:471 +#: src/usr/local/www/system_authservers.php:472 msgid "LDAP Server Settings" msgstr "" -#: src/usr/local/www/system_authservers.php:479 -#: src/usr/local/www/system_authservers.php:696 +#: src/usr/local/www/system_authservers.php:480 +#: src/usr/local/www/system_authservers.php:697 msgid "Hostname or IP address" msgstr "" -#: src/usr/local/www/system_authservers.php:482 +#: src/usr/local/www/system_authservers.php:483 msgid "" "NOTE: When using SSL, this hostname MUST match the Common Name (CN) of the " "LDAP server's SSL Certificate." msgstr "" -#: src/usr/local/www/system_authservers.php:502 -#: src/usr/local/www/system_authservers.php:514 +#: src/usr/local/www/system_authservers.php:503 +#: src/usr/local/www/system_authservers.php:515 #: src/usr/local/www/vpn_ipsec_phase1.php:783 -#: src/usr/local/www/vpn_openvpn_client.php:599 -#: src/usr/local/www/vpn_openvpn_client.php:605 +#: src/usr/local/www/vpn_openvpn_client.php:607 +#: src/usr/local/www/vpn_openvpn_client.php:613 #: src/usr/local/www/vpn_openvpn_server.php:730 #: src/usr/local/www/vpn_openvpn_server.php:736 msgid "Peer Certificate Authority" msgstr "" -#: src/usr/local/www/system_authservers.php:517 +#: src/usr/local/www/system_authservers.php:518 msgid "" "This option is used if 'SSL Encrypted' option is choosen. It must match with " "the CA in the AD otherwise problems will arise." msgstr "" -#: src/usr/local/www/system_authservers.php:530 +#: src/usr/local/www/system_authservers.php:531 msgid "Server Timeout" msgstr "" -#: src/usr/local/www/system_authservers.php:534 +#: src/usr/local/www/system_authservers.php:535 msgid "Timeout for LDAP operations (seconds)" msgstr "" -#: src/usr/local/www/system_authservers.php:536 -#: src/usr/local/www/system_authservers.php:554 +#: src/usr/local/www/system_authservers.php:537 +#: src/usr/local/www/system_authservers.php:555 msgid "Search scope" msgstr "" -#: src/usr/local/www/system_authservers.php:540 +#: src/usr/local/www/system_authservers.php:541 msgid "Level" msgstr "" -#: src/usr/local/www/system_authservers.php:547 +#: src/usr/local/www/system_authservers.php:548 msgid "Base DN" msgstr "" -#: src/usr/local/www/system_authservers.php:558 +#: src/usr/local/www/system_authservers.php:559 msgid "Authentication containers" msgstr "" -#: src/usr/local/www/system_authservers.php:561 +#: src/usr/local/www/system_authservers.php:562 msgid "Containers" msgstr "" -#: src/usr/local/www/system_authservers.php:564 +#: src/usr/local/www/system_authservers.php:565 msgid "" "Note: Semi-Colon separated. This will be prepended to the search base dn " "above or you can specify full container path containing a dc= component.<br/" ">Example: CN=Users;DC=example,DC=com or OU=Staff;OU=Freelancers" msgstr "" -#: src/usr/local/www/system_authservers.php:570 +#: src/usr/local/www/system_authservers.php:571 msgid "Select a container" msgstr "" -#: src/usr/local/www/system_authservers.php:577 +#: src/usr/local/www/system_authservers.php:578 msgid "Extended query" msgstr "" -#: src/usr/local/www/system_authservers.php:582 -#: src/usr/local/www/system_authservers.php:587 +#: src/usr/local/www/system_authservers.php:583 +#: src/usr/local/www/system_authservers.php:588 msgid "Query" msgstr "" -#: src/usr/local/www/system_authservers.php:590 +#: src/usr/local/www/system_authservers.php:591 msgid "Example: &(objectClass=inetOrgPerson)(mail=*@example.com)" msgstr "" -#: src/usr/local/www/system_authservers.php:596 +#: src/usr/local/www/system_authservers.php:597 msgid "Bind anonymous" msgstr "" -#: src/usr/local/www/system_authservers.php:601 +#: src/usr/local/www/system_authservers.php:602 msgid "Bind credentials" msgstr "" -#: src/usr/local/www/system_authservers.php:606 +#: src/usr/local/www/system_authservers.php:607 msgid "User DN:" msgstr "" -#: src/usr/local/www/system_authservers.php:628 +#: src/usr/local/www/system_authservers.php:629 msgid "Initial Template" msgstr "" -#: src/usr/local/www/system_authservers.php:636 +#: src/usr/local/www/system_authservers.php:637 msgid "User naming attribute" msgstr "" -#: src/usr/local/www/system_authservers.php:643 +#: src/usr/local/www/system_authservers.php:644 msgid "Group naming attribute" msgstr "" -#: src/usr/local/www/system_authservers.php:657 +#: src/usr/local/www/system_authservers.php:658 msgid "RFC 2307 Groups" msgstr "" -#: src/usr/local/www/system_authservers.php:660 +#: src/usr/local/www/system_authservers.php:661 msgid "" "RFC 2307 style group membership has members listed on the group object " "rather than using groups listed on user object. Leave unchecked for Active " "Directory style group membership (RFC 2307bis)." msgstr "" -#: src/usr/local/www/system_authservers.php:666 +#: src/usr/local/www/system_authservers.php:667 msgid "Group Object Class" msgstr "" -#: src/usr/local/www/system_authservers.php:670 +#: src/usr/local/www/system_authservers.php:671 msgid "" "Object class used for groups in RFC2307 mode. Typically \"posixGroup\" or " "\"group\"." msgstr "" -#: src/usr/local/www/system_authservers.php:675 +#: src/usr/local/www/system_authservers.php:676 msgid "UTF8 Encode" msgstr "" -#: src/usr/local/www/system_authservers.php:678 +#: src/usr/local/www/system_authservers.php:679 msgid "" "Required to support international characters, but may not be supported by " "every LDAP server." msgstr "" -#: src/usr/local/www/system_authservers.php:683 +#: src/usr/local/www/system_authservers.php:684 msgid "Username Alterations" msgstr "" -#: src/usr/local/www/system_authservers.php:686 +#: src/usr/local/www/system_authservers.php:687 msgid "e.g. user@host becomes user when unchecked." msgstr "" -#: src/usr/local/www/system_authservers.php:691 +#: src/usr/local/www/system_authservers.php:692 msgid "Radius Server Settings" msgstr "" -#: src/usr/local/www/system_authservers.php:710 +#: src/usr/local/www/system_authservers.php:711 msgid "Services offered" msgstr "" -#: src/usr/local/www/system_authservers.php:731 +#: src/usr/local/www/system_authservers.php:732 msgid "Authentication Timeout" msgstr "" -#: src/usr/local/www/system_authservers.php:734 +#: src/usr/local/www/system_authservers.php:735 msgid "" "This value controls how long, in seconds, that the RADIUS server may take to " "respond to an authentication request. If left blank, the default value is 5 " @@ -24554,15 +24648,15 @@ msgid "" "to receive and enter a token." msgstr "" -#: src/usr/local/www/system_authservers.php:762 +#: src/usr/local/www/system_authservers.php:763 msgid "Please fill the required values." msgstr "" -#: src/usr/local/www/system_authservers.php:769 +#: src/usr/local/www/system_authservers.php:770 msgid "Please fill the bind username/password." msgstr "" -#: src/usr/local/www/system_authservers.php:791 +#: src/usr/local/www/system_authservers.php:792 msgid "Popup blocker detected.\tAction aborted." msgstr "" @@ -24679,6 +24773,21 @@ msgstr "" msgid "Signing Certificate Authority" msgstr "" +#: src/usr/local/www/system_camanager.php:249 +msgid "The field 'Descriptive Name' contains invalid characters." +msgstr "" + +#: src/usr/local/www/system_camanager.php:255 +#: src/usr/local/www/system_certmanager.php:374 +msgid "" +"The field 'Distinguished name Email Address' contains invalid characters." +msgstr "" + +#: src/usr/local/www/system_camanager.php:259 +#: src/usr/local/www/system_certmanager.php:378 +msgid "The field 'Distinguished name Common Name' contains invalid characters." +msgstr "" + #: src/usr/local/www/system_camanager.php:266 #: src/usr/local/www/system_certmanager.php:386 #: src/usr/local/www/system_certmanager.php:393 @@ -24746,14 +24855,22 @@ msgstr "" msgid "Valid Until" msgstr "" +#: src/usr/local/www/system_camanager.php:446 +msgid "Edit CA" +msgstr "" + #: src/usr/local/www/system_camanager.php:447 -msgid "Export" +msgid "Export CA" msgstr "" #: src/usr/local/www/system_camanager.php:449 msgid "Export key" msgstr "" +#: src/usr/local/www/system_camanager.php:451 +msgid "Delete CA" +msgstr "" + #: src/usr/local/www/system_camanager.php:492 msgid "Create / edit CA" msgstr "" @@ -25004,6 +25121,30 @@ msgstr "" msgid "external - signature pending" msgstr "" +#: src/usr/local/www/system_certmanager.php:1070 +msgid "Revoked" +msgstr "" + +#: src/usr/local/www/system_certmanager.php:1073 +msgid "webConfigurator" +msgstr "" + +#: src/usr/local/www/system_certmanager.php:1076 +msgid "User Cert" +msgstr "" + +#: src/usr/local/www/system_certmanager.php:1079 +msgid "OpenVPN Server" +msgstr "" + +#: src/usr/local/www/system_certmanager.php:1082 +msgid "OpenVPN Client" +msgstr "" + +#: src/usr/local/www/system_certmanager.php:1085 +msgid "IPsec Tunnel" +msgstr "" + #: src/usr/local/www/system_certmanager.php:1112 msgid "Export Certificate" msgstr "" @@ -25025,6 +25166,10 @@ msgstr "" msgid "Export Request" msgstr "" +#: src/usr/local/www/system_certmanager.php:1121 +msgid "Delete Certificate" +msgstr "" + #: src/usr/local/www/system_crlmanager.php:70 msgid "Certificate Revocation Lists" msgstr "" @@ -25064,7 +25209,6 @@ msgid "Cannot revoke certificates for an imported/external CRL." msgstr "" #: src/usr/local/www/system_crlmanager.php:215 -#: src/usr/local/www/system_crlmanager.php:219 #, php-format msgid "Deleted Certificate %s from CRL %s" msgstr "" @@ -25081,7 +25225,7 @@ msgstr "" #: src/usr/local/www/system_crlmanager.php:241 #: src/usr/local/www/system_crlmanager.php:400 #: src/usr/local/www/vpn_ipsec_phase1.php:241 -#: src/usr/local/www/vpn_openvpn_client.php:322 +#: src/usr/local/www/vpn_openvpn_client.php:329 #: src/usr/local/www/vpn_openvpn_server.php:426 msgid "Certificate Authority" msgstr "" @@ -25191,26 +25335,37 @@ msgid "Delete CRL" msgstr "" #: src/usr/local/www/system_gateway_groups.php:109 -msgid "removed gateway group" +#, php-format +msgid "removed gateway group %s" msgstr "" #: src/usr/local/www/system_gateway_groups.php:134 -#, php-format -msgid "" -"The gateway configuration has been changed.%sYou must apply the changes in " -"order for them to take effect." +#: src/usr/local/www/system_gateways.php:258 +msgid "The gateway configuration has been changed." msgstr "" #: src/usr/local/www/system_gateway_groups.php:139 -#: src/usr/local/www/system_gateways.php:262 +#: src/usr/local/www/system_gateways.php:263 #: src/usr/local/www/system_routes.php:77 -#: src/usr/local/www/system_routes.php:245 -#: src/usr/local/www/system_routes.php:262 -#: src/usr/local/www/system_routes.php:268 +#: src/usr/local/www/system_routes.php:246 +#: src/usr/local/www/system_routes.php:263 +#: src/usr/local/www/system_routes.php:269 #: src/usr/local/www/system_routes_edit.php:257 msgid "Static Routes" msgstr "" +#: src/usr/local/www/system_gateway_groups.php:186 +msgid "Edit gateway group" +msgstr "" + +#: src/usr/local/www/system_gateway_groups.php:187 +msgid "Copy gateway group" +msgstr "" + +#: src/usr/local/www/system_gateway_groups.php:188 +msgid "Delete gateway group" +msgstr "" + #: src/usr/local/www/system_gateway_groups.php:209 msgid "" "Remember to use these Gateway Groups in firewall rules in order to enable " @@ -25257,8 +25412,8 @@ msgstr "" #: src/usr/local/www/system_gateway_groups_edit.php:149 #, php-format msgid "" -"A gateway group cannot have the same name with a gateway \"%s\" please " -"choose another name." +"A gateway group cannot have the same name as a gateway \"%s\" please choose " +"another name." msgstr "" #: src/usr/local/www/system_gateway_groups_edit.php:154 @@ -25299,46 +25454,72 @@ msgstr "" msgid "When to trigger exclusion of a member" msgstr "" -#: src/usr/local/www/system_gateways.php:117 +#: src/usr/local/www/system_gateways.php:118 #, php-format msgid "" -"Gateway '%s' cannot be deleted because it is in use on Gateway Group '%s'" +"Gateway \"%1$s\" cannot be deleted because it is in use on Gateway Group " +"\"%2$s\"" msgstr "" -#: src/usr/local/www/system_gateways.php:119 +#: src/usr/local/www/system_gateways.php:120 #: src/usr/local/www/system_gateways_edit.php:158 #, php-format msgid "" -"Gateway '%s' cannot be disabled because it is in use on Gateway Group '%s'" +"Gateway \"%1$s\" cannot be disabled because it is in use on Gateway Group " +"\"%2$s\"" msgstr "" -#: src/usr/local/www/system_gateways.php:131 +#: src/usr/local/www/system_gateways.php:132 #, php-format msgid "" -"Gateway '%s' cannot be deleted because it is in use on Static Route '%s'" +"Gateway \"%1$s\" cannot be deleted because it is in use on Static Route " +"\"%2$s\"" msgstr "" -#: src/usr/local/www/system_gateways.php:135 +#: src/usr/local/www/system_gateways.php:136 #: src/usr/local/www/system_gateways_edit.php:170 #, php-format msgid "" -"Gateway '%s' cannot be disabled because it is in use on Static Route '%s'" +"Gateway \"%1$s\" cannot be disabled because it is in use on Static Route " +"\"%2$s\"" msgstr "" -#: src/usr/local/www/system_gateways.php:257 -msgid "The gateway configuration has been changed." +#: src/usr/local/www/system_gateways.php:211 +#, php-format +msgid "Gateways: removed gateways %s" msgstr "" -#: src/usr/local/www/system_gateways.php:278 +#: src/usr/local/www/system_gateways.php:279 #: src/usr/local/www/system_gateways_edit.php:731 #: src/usr/local/www/widgets/widgets/gateways.widget.php:134 msgid "Monitor IP" msgstr "" -#: src/usr/local/www/system_gateways.php:295 +#: src/usr/local/www/system_gateways.php:296 msgid "This gateway is inactive because interface is missing" msgstr "" +#: src/usr/local/www/system_gateways.php:324 +#: src/usr/local/www/system_gateways_edit.php:668 +msgid "Edit gateway" +msgstr "" + +#: src/usr/local/www/system_gateways.php:325 +msgid "Copy gateway" +msgstr "" + +#: src/usr/local/www/system_gateways.php:330 +msgid "Enable gateway" +msgstr "" + +#: src/usr/local/www/system_gateways.php:333 +msgid "Disable gateway" +msgstr "" + +#: src/usr/local/www/system_gateways.php:336 +msgid "Delete gateway" +msgstr "" + #: src/usr/local/www/system_gateways_edit.php:178 msgid "A valid gateway IP address must be specified." msgstr "" @@ -25379,6 +25560,26 @@ msgstr "" msgid "A valid monitor IP address must be specified." msgstr "" +#: src/usr/local/www/system_gateways_edit.php:262 +#, php-format +msgid "The IPv6 gateway address '%s' can not be used as a IPv4 gateway." +msgstr "" + +#: src/usr/local/www/system_gateways_edit.php:265 +#, php-format +msgid "The IPv4 gateway address '%s' can not be used as a IPv6 gateway." +msgstr "" + +#: src/usr/local/www/system_gateways_edit.php:271 +#, php-format +msgid "The IPv6 monitor address '%s' can not be used on a IPv4 gateway." +msgstr "" + +#: src/usr/local/www/system_gateways_edit.php:274 +#, php-format +msgid "The IPv4 monitor address '%s' can not be used on a IPv6 gateway." +msgstr "" + #: src/usr/local/www/system_gateways_edit.php:283 msgid "Changing name on a gateway is not allowed." msgstr "" @@ -25473,6 +25674,20 @@ msgid "" "threshold." msgstr "" +#: src/usr/local/www/system_gateways_edit.php:419 +#, php-format +msgid "" +"The high latency threshold needs to be less than or equal to the default " +"loss interval (%d)" +msgstr "" + +#: src/usr/local/www/system_gateways_edit.php:426 +#, php-format +msgid "" +"The loss interval needs to be greater than or equal to the default high " +"latency threshold (%d)" +msgstr "" + #: src/usr/local/www/system_gateways_edit.php:433 msgid "" "The time period over which results are averaged needs to be a numeric value." @@ -25488,6 +25703,20 @@ msgid "" "the probe interval." msgstr "" +#: src/usr/local/www/system_gateways_edit.php:451 +#, php-format +msgid "" +"The probe interval needs to be half or less than the default time period " +"over which results are averaged (%d)" +msgstr "" + +#: src/usr/local/www/system_gateways_edit.php:458 +#, php-format +msgid "" +"The time period over which results are averaged needs to be at least twice " +"the default probe interval (%d)" +msgstr "" + #: src/usr/local/www/system_gateways_edit.php:465 msgid "The alert interval needs to be a numeric value." msgstr "" @@ -25501,8 +25730,18 @@ msgid "" "The alert interval needs to be greater than or equal to the probe interval." msgstr "" -#: src/usr/local/www/system_gateways_edit.php:668 -msgid "Edit gateway" +#: src/usr/local/www/system_gateways_edit.php:483 +#, php-format +msgid "" +"The probe interval needs to be less than or equal to the default alert " +"interval (%d)" +msgstr "" + +#: src/usr/local/www/system_gateways_edit.php:490 +#, php-format +msgid "" +"The alert interval needs to be greater than or equal to the default probe " +"interval (%d)" msgstr "" #: src/usr/local/www/system_gateways_edit.php:675 @@ -25615,6 +25854,10 @@ msgid "" "Default is %d." msgstr "" +#: src/usr/local/www/system_gateways_edit.php:896 +msgid "Additional information" +msgstr "" + #: src/usr/local/www/system_gateways_edit.php:898 msgid "" "The time period over which results are averaged must be at least twice the " @@ -25643,10 +25886,6 @@ msgid "" "latency versus loss." msgstr "" -#: src/usr/local/www/system_gateways_edit.php:896 -msgid "Additional information" -msgstr "" - #: src/usr/local/www/system_gateways_edit.php:917 msgid "Use non-local gateway" msgstr "" @@ -25767,8 +26006,8 @@ msgid "Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items." msgstr "" #: src/usr/local/www/system_hasync.php:108 -#: src/usr/local/www/vpn_openvpn_client.php:272 -#: src/usr/local/www/vpn_openvpn_client.php:336 +#: src/usr/local/www/vpn_openvpn_client.php:279 +#: src/usr/local/www/vpn_openvpn_client.php:343 msgid "Password and confirmation must match." msgstr "" @@ -25935,26 +26174,54 @@ msgid "Synchronize Captive Portal)" msgstr "" #: src/usr/local/www/system_routes.php:143 -#: src/usr/local/www/system_routes.php:155 -msgid "removed route to" +#, php-format +msgid "removed route to %s" msgstr "" -#: src/usr/local/www/system_routes.php:173 -msgid "gateway is disabled, cannot enable route to" +#: src/usr/local/www/system_routes.php:161 +#, php-format +msgid "removed route to%s" msgstr "" -#: src/usr/local/www/system_routes.php:176 -msgid "enabled route to" +#: src/usr/local/www/system_routes.php:174 +#, php-format +msgid "gateway is disabled, cannot enable route to %s" msgstr "" -#: src/usr/local/www/system_routes.php:181 -msgid "disabled route to" +#: src/usr/local/www/system_routes.php:177 +#, php-format +msgid "enabled route to %s" +msgstr "" + +#: src/usr/local/www/system_routes.php:182 +#, php-format +msgid "disabled route to %s" msgstr "" -#: src/usr/local/www/system_routes.php:257 +#: src/usr/local/www/system_routes.php:258 msgid "The static route configuration has been changed." msgstr "" +#: src/usr/local/www/system_routes.php:307 +msgid "Edit route" +msgstr "" + +#: src/usr/local/www/system_routes.php:309 +msgid "Copy route" +msgstr "" + +#: src/usr/local/www/system_routes.php:313 +msgid "Enable route" +msgstr "" + +#: src/usr/local/www/system_routes.php:316 +msgid "Disable route" +msgstr "" + +#: src/usr/local/www/system_routes.php:319 +msgid "Delete route" +msgstr "" + #: src/usr/local/www/system_routes_edit.php:113 #: src/usr/local/www/system_routes_edit.php:280 msgid "Destination network" @@ -25978,6 +26245,12 @@ msgid "" "order to choose a disabled gateway." msgstr "" +#: src/usr/local/www/system_routes_edit.php:133 +#, php-format +msgid "" +"The gateway \"%1$s\" is a different Address Family than network \"%2$s\"." +msgstr "" + #: src/usr/local/www/system_routes_edit.php:147 msgid "A IPv4 subnet can not be over 32 bits." msgstr "" @@ -26016,6 +26289,14 @@ msgstr "" msgid "Firmware Branch" msgstr "" +#: src/usr/local/www/system_update_settings.php:129 +msgid "Stable" +msgstr "" + +#: src/usr/local/www/system_update_settings.php:129 +msgid "Development" +msgstr "" + #: src/usr/local/www/system_update_settings.php:127 msgid "Branch" msgstr "" @@ -26237,7 +26518,7 @@ msgstr "" msgid "User privileges" msgstr "" -#: src/usr/local/www/system_usermanager_addprivs.php:187 +#: src/usr/local/www/system_usermanager_addprivs.php:188 msgid "Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items" msgstr "" @@ -26397,7 +26678,7 @@ msgstr "" #: src/usr/local/www/vpn_ipsec.php:271 src/usr/local/www/vpn_ipsec_keys.php:118 #: src/usr/local/www/vpn_ipsec_mobile.php:440 -msgid "The IPsec tunnel configuration has been changed" +msgid "The IPsec tunnel configuration has been changed." msgstr "" #: src/usr/local/www/vpn_ipsec.php:277 @@ -26971,7 +27252,7 @@ msgstr "" #: src/usr/local/www/vpn_ipsec_phase1.php:662 #: src/usr/local/www/vpn_ipsec_phase2.php:531 -#: src/usr/local/www/vpn_openvpn_client.php:446 +#: src/usr/local/www/vpn_openvpn_client.php:454 #: src/usr/local/www/vpn_openvpn_csc.php:332 #: src/usr/local/www/vpn_openvpn_server.php:622 msgid "General Information" @@ -27060,7 +27341,7 @@ msgid "Phase 1 proposal (Algorithms)" msgstr "" #: src/usr/local/www/vpn_ipsec_phase1.php:792 -#: src/usr/local/www/vpn_openvpn_client.php:648 +#: src/usr/local/www/vpn_openvpn_client.php:656 #: src/usr/local/www/vpn_openvpn_server.php:804 msgid "Encryption Algorithm" msgstr "" @@ -27541,7 +27822,7 @@ msgid "Warning: RADIUS is enabled. The local user database will not be used." msgstr "" #: src/usr/local/www/vpn_l2tp_users.php:113 -msgid "The l2tp user list has been modified" +msgid "The l2tp user list has been modified." msgstr "" #: src/usr/local/www/vpn_l2tp_users.php:113 @@ -27573,250 +27854,255 @@ msgid "" "If you want the user to be assigned a specific IP address, enter it here." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:68 -#: src/usr/local/www/vpn_openvpn_client.php:437 +#: src/usr/local/www/vpn_openvpn_client.php:70 +#: src/usr/local/www/vpn_openvpn_client.php:445 #: src/usr/local/www/vpn_openvpn_csc.php:323 #: src/usr/local/www/vpn_openvpn_server.php:611 msgid "Client" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:124 +#: src/usr/local/www/vpn_openvpn_client.php:126 msgid "Client successfully deleted" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:220 +#: src/usr/local/www/vpn_openvpn_client.php:223 #: src/usr/local/www/vpn_openvpn_server.php:289 msgid "" "Protocol and IP address families do not match. You cannot select an IPv6 " "protocol and an IPv4 IP address." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:222 +#: src/usr/local/www/vpn_openvpn_client.php:225 #: src/usr/local/www/vpn_openvpn_server.php:291 msgid "" "Protocol and IP address families do not match. You cannot select an IPv4 " "protocol and an IPv6 IP address." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:224 +#: src/usr/local/www/vpn_openvpn_client.php:227 #: src/usr/local/www/vpn_openvpn_server.php:293 msgid "" "An IPv4 protocol was selected, but the selected interface has no IPv4 " "address." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:226 +#: src/usr/local/www/vpn_openvpn_client.php:229 #: src/usr/local/www/vpn_openvpn_server.php:295 msgid "" "An IPv6 protocol was selected, but the selected interface has no IPv6 " "address." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:244 +#: src/usr/local/www/vpn_openvpn_client.php:247 #: src/usr/local/www/vpn_openvpn_server.php:339 msgid "The specified 'Local port' is in use. Please select another value" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:268 +#: src/usr/local/www/vpn_openvpn_client.php:260 +#: src/usr/local/www/vpn_openvpn_server.php:417 +msgid "The field 'Topology' contains an invalid selection" +msgstr "" + +#: src/usr/local/www/vpn_openvpn_client.php:275 msgid "User name and password are required for proxy with authentication." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:298 +#: src/usr/local/www/vpn_openvpn_client.php:305 msgid "The bandwidth limit must be a positive numeric value." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:308 +#: src/usr/local/www/vpn_openvpn_client.php:315 #: src/usr/local/www/vpn_openvpn_server.php:349 msgid "The field 'Shared Key' does not appear to be valid" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:315 +#: src/usr/local/www/vpn_openvpn_client.php:322 #: src/usr/local/www/vpn_openvpn_server.php:356 msgid "The field 'TLS Authentication Key' does not appear to be valid" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:326 +#: src/usr/local/www/vpn_openvpn_client.php:333 #: src/usr/local/www/vpn_openvpn_server.php:430 #: src/usr/local/www/vpn_openvpn_server.php:790 msgid "Shared key" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:332 +#: src/usr/local/www/vpn_openvpn_client.php:339 msgid "" "If no Client Certificate is selected, a username and/or password must be " "entered." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:438 +#: src/usr/local/www/vpn_openvpn_client.php:446 #: src/usr/local/www/vpn_openvpn_csc.php:70 #: src/usr/local/www/vpn_openvpn_csc.php:324 #: src/usr/local/www/vpn_openvpn_server.php:612 msgid "Client Specific Overrides" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:453 +#: src/usr/local/www/vpn_openvpn_client.php:461 msgid "" "Set this option to disable this client without removing it from the list" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:457 +#: src/usr/local/www/vpn_openvpn_client.php:465 #: src/usr/local/www/vpn_openvpn_server.php:633 msgid "Server mode" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:471 +#: src/usr/local/www/vpn_openvpn_client.php:479 #: src/usr/local/www/vpn_openvpn_server.php:669 msgid "Device mode" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:485 +#: src/usr/local/www/vpn_openvpn_client.php:493 #: src/usr/local/www/vpn_openvpn_server.php:683 msgid "Local port" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:488 +#: src/usr/local/www/vpn_openvpn_client.php:496 msgid "" "Set this option if you would like to bind to a specific port. Leave this " "blank or enter 0 for a random dynamic port." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:492 +#: src/usr/local/www/vpn_openvpn_client.php:500 msgid "Server host or address" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:499 +#: src/usr/local/www/vpn_openvpn_client.php:507 msgid "Server port" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:506 +#: src/usr/local/www/vpn_openvpn_client.php:514 msgid "Proxy host or address" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:515 +#: src/usr/local/www/vpn_openvpn_client.php:523 msgid "basic" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:515 +#: src/usr/local/www/vpn_openvpn_client.php:523 msgid "ntlm" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:513 +#: src/usr/local/www/vpn_openvpn_client.php:521 msgid "Proxy Auth. - Extra options" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:534 +#: src/usr/local/www/vpn_openvpn_client.php:542 msgid "Server hostname resolution" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:537 +#: src/usr/local/www/vpn_openvpn_client.php:545 msgid "" "Continuously attempt to resolve the server host name. Useful when " "communicating with a server that is not permanently connected to the " "Internet." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:548 +#: src/usr/local/www/vpn_openvpn_client.php:556 msgid "User Authentication settings" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:556 +#: src/usr/local/www/vpn_openvpn_client.php:564 msgid "Leave empty when no user name is needed" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:563 +#: src/usr/local/www/vpn_openvpn_client.php:571 msgid "Leave empty when no password is needed" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:567 +#: src/usr/local/www/vpn_openvpn_client.php:575 #: src/usr/local/www/vpn_openvpn_server.php:697 msgid "Cryptographic settings" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:571 +#: src/usr/local/www/vpn_openvpn_client.php:579 #: src/usr/local/www/vpn_openvpn_server.php:701 msgid "TLS authentication" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:589 -#: src/usr/local/www/vpn_openvpn_client.php:635 +#: src/usr/local/www/vpn_openvpn_client.php:597 +#: src/usr/local/www/vpn_openvpn_client.php:643 #: src/usr/local/www/vpn_openvpn_server.php:719 #: src/usr/local/www/vpn_openvpn_server.php:800 msgid "Paste your shared key here" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:613 -#: src/usr/local/www/vpn_openvpn_client.php:619 +#: src/usr/local/www/vpn_openvpn_client.php:621 +#: src/usr/local/www/vpn_openvpn_client.php:627 #: src/usr/local/www/vpn_openvpn_server.php:744 #: src/usr/local/www/vpn_openvpn_server.php:750 msgid "Peer Certificate Revocation list" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:626 +#: src/usr/local/www/vpn_openvpn_client.php:634 msgid "Auto generate" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:633 +#: src/usr/local/www/vpn_openvpn_client.php:641 #: src/usr/local/www/vpn_openvpn_server.php:798 msgid "Shared Key" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:641 +#: src/usr/local/www/vpn_openvpn_client.php:649 msgid "Client Certificate" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:655 +#: src/usr/local/www/vpn_openvpn_client.php:663 #: src/usr/local/www/vpn_openvpn_server.php:811 msgid "Auth digest algorithm" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:658 +#: src/usr/local/www/vpn_openvpn_client.php:666 #: src/usr/local/www/vpn_openvpn_server.php:814 msgid "" "Leave this set to SHA1 unless all clients are set to match. SHA1 is the " "default for OpenVPN. " msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:662 +#: src/usr/local/www/vpn_openvpn_client.php:670 #: src/usr/local/www/vpn_openvpn_server.php:818 msgid "Hardware Crypto" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:669 +#: src/usr/local/www/vpn_openvpn_client.php:677 #: src/usr/local/www/vpn_openvpn_csc.php:382 #: src/usr/local/www/vpn_openvpn_server.php:840 msgid "Tunnel settings" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:673 +#: src/usr/local/www/vpn_openvpn_client.php:681 #: src/usr/local/www/vpn_openvpn_server.php:844 msgid "IPv4 Tunnel Network" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:676 +#: src/usr/local/www/vpn_openvpn_client.php:684 msgid "" "This is the IPv4 virtual network used for private communications between " "this client and the server expressed using CIDR (eg. 10.0.8.0/24). The first " "network address will be assigned to the client virtual interface." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:682 +#: src/usr/local/www/vpn_openvpn_client.php:690 #: src/usr/local/www/vpn_openvpn_server.php:854 msgid "IPv6 Tunnel Network" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:685 +#: src/usr/local/www/vpn_openvpn_client.php:693 msgid "" "This is the IPv6 virtual network used for private communications between " "this client and the server\texpressed using CIDR (eg. fe80::/64). The first " "network address will be assigned to the server virtual interface." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:691 +#: src/usr/local/www/vpn_openvpn_client.php:699 #: src/usr/local/www/vpn_openvpn_server.php:922 msgid "IPv4 Remote network(s)" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:694 +#: src/usr/local/www/vpn_openvpn_client.php:702 #: src/usr/local/www/vpn_openvpn_server.php:925 msgid "" "IPv4 networks that will be routed through the tunnel, so that a site-to-site " @@ -27826,12 +28112,12 @@ msgid "" "you don't want a site-to-site VPN." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:700 +#: src/usr/local/www/vpn_openvpn_client.php:708 #: src/usr/local/www/vpn_openvpn_server.php:931 msgid "IPv6 Remote network(s)" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:703 +#: src/usr/local/www/vpn_openvpn_client.php:711 #: src/usr/local/www/vpn_openvpn_server.php:934 msgid "" "These are the IPv6 networks that will be routed through the tunnel, so that " @@ -27841,53 +28127,62 @@ msgid "" "blank if you don't want a site-to-site VPN." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:709 +#: src/usr/local/www/vpn_openvpn_client.php:717 msgid "Limit outgoing bandwidth" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:713 +#: src/usr/local/www/vpn_openvpn_client.php:721 msgid "" "Maximum outgoing bandwidth for this tunnel. Leave empty for no limit. The " "input value has to be something between 100 bytes/sec and 100 Mbytes/sec " "(entered as bytes per second)." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:720 +#: src/usr/local/www/vpn_openvpn_client.php:728 msgid "" "Compress tunnel packets using the LZO algorithm. Adaptive compression will " "dynamically disable compression for a period of time if OpenVPN detects that " "the data in the packets is not being compressed efficiently." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:724 +#: src/usr/local/www/vpn_openvpn_client.php:732 +#: src/usr/local/www/vpn_openvpn_server.php:1003 +msgid "Topology" +msgstr "" + +#: src/usr/local/www/vpn_openvpn_client.php:735 +msgid "Specifies the method used to configure a virtual adapter IP address." +msgstr "" + +#: src/usr/local/www/vpn_openvpn_client.php:739 #: src/usr/local/www/vpn_openvpn_server.php:956 msgid "Type-of-Service" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:731 +#: src/usr/local/www/vpn_openvpn_client.php:746 #: src/usr/local/www/vpn_openvpn_server.php:977 msgid "Disable IPv6" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:738 +#: src/usr/local/www/vpn_openvpn_client.php:753 msgid "Don't pull routes" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:741 +#: src/usr/local/www/vpn_openvpn_client.php:756 msgid "" "This option still allows the server to set the TCP/IP properties of the " "client's TUN/TAP interface. " msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:745 +#: src/usr/local/www/vpn_openvpn_client.php:760 msgid "Don't add/remove routes" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:748 +#: src/usr/local/www/vpn_openvpn_client.php:763 msgid "Pass routes to --route-upscript using environmental variables" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:759 +#: src/usr/local/www/vpn_openvpn_client.php:774 #: src/usr/local/www/vpn_openvpn_server.php:1155 msgid "" "Enter any additional options you would like to add to the OpenVPN server " @@ -27895,12 +28190,12 @@ msgid "" "10.0.0.0 255.255.255.0\"" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:764 +#: src/usr/local/www/vpn_openvpn_client.php:779 #: src/usr/local/www/vpn_openvpn_server.php:1160 msgid "Verbosity level" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:767 +#: src/usr/local/www/vpn_openvpn_client.php:782 #: src/usr/local/www/vpn_openvpn_server.php:1163 msgid "" "Each level shows all info from the previous levels. Level 3 is recommended " @@ -27911,7 +28206,7 @@ msgid "" "TUN/TAP packets<br />6: Debug info range" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:794 +#: src/usr/local/www/vpn_openvpn_client.php:809 msgid "OpenVPN Clients" msgstr "" @@ -28160,10 +28455,6 @@ msgstr "" msgid "The field 'Concurrent connections' must be numeric." msgstr "" -#: src/usr/local/www/vpn_openvpn_server.php:417 -msgid "The field 'Topology' contains an invalid selection" -msgstr "" - #: src/usr/local/www/vpn_openvpn_server.php:423 msgid "The selected certificate is not valid" msgstr "" @@ -28367,10 +28658,6 @@ msgstr "" msgid "Address Pool" msgstr "" -#: src/usr/local/www/vpn_openvpn_server.php:1003 -msgid "Topology" -msgstr "" - #: src/usr/local/www/vpn_openvpn_server.php:1006 msgid "" "Specifies the method used to supply a virtual adapter IP address to clients " @@ -28527,11 +28814,11 @@ msgstr "" msgid "Click %1$shere%2$s to configure CARP." msgstr "" -#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:104 +#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:110 msgid "Int." msgstr "" -#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:148 +#: src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php:159 msgid "Checking ..." msgstr "" @@ -28715,11 +29002,6 @@ msgstr "" msgid "Real/Virtual IP" msgstr "" -#: src/usr/local/www/widgets/widgets/openvpn.widget.php:136 -#, php-format -msgid "Kill client connection from %s" -msgstr "" - #: src/usr/local/www/widgets/widgets/openvpn.widget.php:164 #: src/usr/local/www/widgets/widgets/openvpn.widget.php:214 msgid "Remote/Virtual IP" @@ -29224,11 +29506,11 @@ msgstr "" msgid "Borrow from other queues when available" msgstr "" -#: src/etc/inc/shaper.inc:3885 +#: src/etc/inc/shaper.inc:3884 msgid "Enable limiter and its children" msgstr "" -#: src/etc/inc/shaper.inc:4207 +#: src/etc/inc/shaper.inc:4206 msgid "Enable this queue" msgstr "" @@ -29329,7 +29611,7 @@ msgid "This rule will be excluded from the NAT" msgstr "" #: src/usr/local/www/firewall_nat_1to1_edit.php:412 -#: src/usr/local/www/firewall_nat_edit.php:670 +#: src/usr/local/www/firewall_nat_edit.php:683 msgid "Disable redirection for traffic matching this rule" msgstr "" @@ -29341,20 +29623,20 @@ msgstr "" msgid "Not" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:663 +#: src/usr/local/www/firewall_nat_edit.php:676 #: src/usr/local/www/firewall_nat_npt_edit.php:226 #: src/usr/local/www/firewall_nat_out_edit.php:452 -#: src/usr/local/www/firewall_rules_edit.php:1088 +#: src/usr/local/www/firewall_rules_edit.php:1100 msgid "Disable this rule" msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:736 -#: src/usr/local/www/firewall_nat_edit.php:803 -#: src/usr/local/www/firewall_rules_edit.php:1235 +#: src/usr/local/www/firewall_nat_edit.php:749 +#: src/usr/local/www/firewall_nat_edit.php:816 +#: src/usr/local/www/firewall_rules_edit.php:1247 msgid "Invert match." msgstr "" -#: src/usr/local/www/firewall_nat_edit.php:899 +#: src/usr/local/www/firewall_nat_edit.php:912 msgid "Do not automatically sync to other CARP members" msgstr "" @@ -29368,42 +29650,42 @@ msgstr "" msgid "Static port" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1097 +#: src/usr/local/www/firewall_rules_edit.php:1109 msgid "Apply the action immediately on match." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1115 +#: src/usr/local/www/firewall_rules_edit.php:1127 msgid "" "<span class=\"help-block\">This is associated with a NAT rule.<br/>You " "cannot edit the interface, protocol, source, or destination of associated " "filter rules." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1363 +#: src/usr/local/www/firewall_rules_edit.php:1375 msgid "Log packets that are handled by this rule" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1415 +#: src/usr/local/www/firewall_rules_edit.php:1427 msgid "" "Allow packets with IP options to pass. Otherwise they are blocked by " "default. This is usually only seen with multicast traffic." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1423 +#: src/usr/local/www/firewall_rules_edit.php:1435 msgid "Disable auto generated reply-to for this rule." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1501 +#: src/usr/local/www/firewall_rules_edit.php:1513 msgid "Prevent states created by this rule to be sync'ed over pfsync." msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1521 +#: src/usr/local/www/firewall_rules_edit.php:1533 msgid "" "Prevent the rule on Master from automatically syncing to other CARP members" msgstr "" -#: src/usr/local/www/firewall_rules_edit.php:1655 -#: src/usr/local/www/firewall_rules_edit.php:1662 +#: src/usr/local/www/firewall_rules_edit.php:1667 +#: src/usr/local/www/firewall_rules_edit.php:1674 msgid "<b>" msgstr "" @@ -29413,126 +29695,126 @@ msgid "" "expands to 256 entries.) " msgstr "" -#: src/usr/local/www/interfaces.php:1721 +#: src/usr/local/www/interfaces.php:1725 msgid "Enable interface" msgstr "" -#: src/usr/local/www/interfaces.php:1863 src/usr/local/www/interfaces.php:3163 +#: src/usr/local/www/interfaces.php:1867 src/usr/local/www/interfaces.php:3167 msgid "Default gateway" msgstr "" -#: src/usr/local/www/interfaces.php:1917 +#: src/usr/local/www/interfaces.php:1921 msgid "Show DHCP advanced options" msgstr "" -#: src/usr/local/www/interfaces.php:2005 +#: src/usr/local/www/interfaces.php:2009 msgid "FreeBSD default" msgstr "" -#: src/usr/local/www/interfaces.php:2021 +#: src/usr/local/www/interfaces.php:2025 msgid "pfSense Default" msgstr "" -#: src/usr/local/www/interfaces.php:2029 +#: src/usr/local/www/interfaces.php:2033 msgid "Saved Cfg" msgstr "" -#: src/usr/local/www/interfaces.php:2097 +#: src/usr/local/www/interfaces.php:2101 msgid "Show DHCPv6 advanced options" msgstr "" -#: src/usr/local/www/interfaces.php:2105 +#: src/usr/local/www/interfaces.php:2109 msgid "Override the configuration from this file" msgstr "" -#: src/usr/local/www/interfaces.php:2113 +#: src/usr/local/www/interfaces.php:2117 msgid "Request a IPv6 prefix/information through the IPv4 connectivity link" msgstr "" -#: src/usr/local/www/interfaces.php:2120 +#: src/usr/local/www/interfaces.php:2124 msgid "Only request an IPv6 prefix, do not request an IPv6 address" msgstr "" -#: src/usr/local/www/interfaces.php:2134 +#: src/usr/local/www/interfaces.php:2138 msgid "" "Send an IPv6 prefix hint to indicate the desired prefix size for delegation" msgstr "" -#: src/usr/local/www/interfaces.php:2194 +#: src/usr/local/www/interfaces.php:2198 msgid "Non-Temporary Address Allocation" msgstr "" -#: src/usr/local/www/interfaces.php:2234 +#: src/usr/local/www/interfaces.php:2238 msgid "Prefix Delegation " msgstr "" -#: src/usr/local/www/interfaces.php:2573 src/usr/local/www/interfaces.php:2709 +#: src/usr/local/www/interfaces.php:2577 src/usr/local/www/interfaces.php:2713 msgid "Enable Dial-On-Demand mode " msgstr "" -#: src/usr/local/www/interfaces.php:2631 +#: src/usr/local/www/interfaces.php:2635 msgid "Reset at each month (\"0 0 1 * *\")" msgstr "" -#: src/usr/local/www/interfaces.php:2639 +#: src/usr/local/www/interfaces.php:2643 msgid "Reset at each week (\"0 0 * * 0\")" msgstr "" -#: src/usr/local/www/interfaces.php:2647 +#: src/usr/local/www/interfaces.php:2651 msgid "Reset at each day (\"0 0 * * *\")" msgstr "" -#: src/usr/local/www/interfaces.php:2655 +#: src/usr/local/www/interfaces.php:2659 msgid "Reset at each hour (\"0 * * * *\")" msgstr "" -#: src/usr/local/www/interfaces.php:2665 src/usr/local/www/interfaces.php:2733 +#: src/usr/local/www/interfaces.php:2669 src/usr/local/www/interfaces.php:2737 msgid "<a href=\"/interfaces_ppps_edit.php?id=" msgstr "" -#: src/usr/local/www/interfaces.php:2670 +#: src/usr/local/www/interfaces.php:2674 msgid "" "<a href=\"/interfaces_ppps_edit.php\" class=\"navlnk\">Click here for " "additional PPPoE configuration options and for MLPPP configuration.</a>" msgstr "" -#: src/usr/local/www/interfaces.php:2738 +#: src/usr/local/www/interfaces.php:2742 msgid "" "<a href=\"/interfaces_ppps_edit.php\" class=\"navlnk\">Click here for " "additional PPTP and L2TP configuration options.</a>" msgstr "" -#: src/usr/local/www/interfaces.php:2752 +#: src/usr/local/www/interfaces.php:2756 msgid "" "Preserve common wireless configuration through interface deletions and " "reassignments." msgstr "" -#: src/usr/local/www/interfaces.php:2952 +#: src/usr/local/www/interfaces.php:2956 msgid "" "Allow packets to pass between wireless clients directly when operating as an " "access point" msgstr "" -#: src/usr/local/www/interfaces.php:2960 +#: src/usr/local/www/interfaces.php:2964 msgid "Force the card to use WME (wireless QoS)" msgstr "" -#: src/usr/local/www/interfaces.php:2968 +#: src/usr/local/www/interfaces.php:2972 msgid "" "Force the card to NOT broadcast its SSID (This may cause problems for some " "clients)" msgstr "" -#: src/usr/local/www/interfaces.php:2981 +#: src/usr/local/www/interfaces.php:2985 msgid "Enable WPA" msgstr "" -#: src/usr/local/www/interfaces.php:3033 +#: src/usr/local/www/interfaces.php:3037 msgid "Force the AP to rekey whenever a client disassociates" msgstr "" -#: src/usr/local/www/interfaces.php:3045 +#: src/usr/local/www/interfaces.php:3049 msgid "Enable 802.1X authentication" msgstr "" @@ -29699,38 +29981,42 @@ msgid "Send RADIUS accounting packets to the primary RADIUS server." msgstr "" #: src/usr/local/www/services_captiveportal.php:922 -msgid "No Accounting updates" +msgid "No updates" +msgstr "" + +#: src/usr/local/www/services_captiveportal.php:930 +msgid "Stop/Start" msgstr "" -#: src/usr/local/www/services_captiveportal.php:929 -msgid "Stop/start Accounting" +#: src/usr/local/www/services_captiveportal.php:938 +msgid "Stop/Start (FreeRADIUS)" msgstr "" -#: src/usr/local/www/services_captiveportal.php:936 -msgid "Interim update" +#: src/usr/local/www/services_captiveportal.php:946 +msgid "Interim" msgstr "" -#: src/usr/local/www/services_captiveportal.php:950 +#: src/usr/local/www/services_captiveportal.php:961 msgid "Reauthenticate connected users every minute" msgstr "" -#: src/usr/local/www/services_captiveportal.php:958 +#: src/usr/local/www/services_captiveportal.php:969 msgid "Enable RADIUS MAC authentication" msgstr "" -#: src/usr/local/www/services_captiveportal.php:980 +#: src/usr/local/www/services_captiveportal.php:991 msgid "Use RADIUS Session-Timeout attributes" msgstr "" -#: src/usr/local/www/services_captiveportal.php:996 +#: src/usr/local/www/services_captiveportal.php:1007 msgid "Invert Acct-Input-Octets and Acct-Output-Octets" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1029 +#: src/usr/local/www/services_captiveportal.php:1040 msgid "Enable HTTPS login" msgstr "" -#: src/usr/local/www/services_captiveportal.php:1053 +#: src/usr/local/www/services_captiveportal.php:1064 msgid "Disable HTTPS Forwards" msgstr "" @@ -29790,7 +30076,7 @@ msgstr "" #: src/usr/local/www/services_dhcpv6.php:812 #: src/usr/local/www/services_ntpd_gps.php:383 #: src/usr/local/www/services_pppoe_edit.php:575 -#: src/usr/local/www/services_unbound.php:364 +#: src/usr/local/www/services_unbound.php:352 msgid " " msgstr "" @@ -29860,24 +30146,24 @@ msgstr "" msgid "Do not forward private reverse lookups" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:277 -#: src/usr/local/www/vpn_openvpn_client.php:451 +#: src/usr/local/www/services_dyndns_edit.php:283 +#: src/usr/local/www/vpn_openvpn_client.php:459 msgid "Disable this client" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:325 +#: src/usr/local/www/services_dyndns_edit.php:344 msgid "Enable Wildcard" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:332 +#: src/usr/local/www/services_dyndns_edit.php:351 msgid "Enable verbose logging" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:339 +#: src/usr/local/www/services_dyndns_edit.php:358 msgid "Force IPv4 resolving" msgstr "" -#: src/usr/local/www/services_dyndns_edit.php:346 +#: src/usr/local/www/services_dyndns_edit.php:365 msgid "Verify SSL peer" msgstr "" @@ -30036,7 +30322,7 @@ msgstr "" msgid "AAAA (IPv6)" msgstr "" -#: src/usr/local/www/services_router_advertisements.php:390 +#: src/usr/local/www/services_router_advertisements.php:418 msgid "Use same settings as DHCPv6 server" msgstr "" @@ -30068,23 +30354,23 @@ msgstr "" msgid "Regex" msgstr "" -#: src/usr/local/www/services_unbound.php:281 +#: src/usr/local/www/services_unbound.php:271 msgid "Enable DNS resolver" msgstr "" -#: src/usr/local/www/services_unbound.php:326 +#: src/usr/local/www/services_unbound.php:314 msgid "Enable DNSSEC Support" msgstr "" -#: src/usr/local/www/services_unbound.php:333 +#: src/usr/local/www/services_unbound.php:321 msgid "Enable Forwarding Mode" msgstr "" -#: src/usr/local/www/services_unbound.php:340 +#: src/usr/local/www/services_unbound.php:328 msgid "Register DHCP leases in the DNS Resolver" msgstr "" -#: src/usr/local/www/services_unbound.php:349 +#: src/usr/local/www/services_unbound.php:337 msgid "Register DHCP static mappings in the DNS Resolver" msgstr "" @@ -30413,33 +30699,33 @@ msgstr "" msgid "Disable the startup/shutdown beep" msgstr "" -#: src/usr/local/www/system_authservers.php:503 +#: src/usr/local/www/system_authservers.php:504 msgid "" "No Certificate Authorities defined.<br/>Create one under <a href=" "\"system_camanager.php\">System > Cert Manager</a>." msgstr "" -#: src/usr/local/www/system_authservers.php:555 +#: src/usr/local/www/system_authservers.php:556 msgid "Level " msgstr "" -#: src/usr/local/www/system_authservers.php:578 +#: src/usr/local/www/system_authservers.php:579 msgid "Enable extended query" msgstr "" -#: src/usr/local/www/system_authservers.php:597 +#: src/usr/local/www/system_authservers.php:598 msgid "Use anonymous binds to resolve distinguished names" msgstr "" -#: src/usr/local/www/system_authservers.php:658 +#: src/usr/local/www/system_authservers.php:659 msgid "LDAP Server uses RFC 2307 style group membership" msgstr "" -#: src/usr/local/www/system_authservers.php:676 +#: src/usr/local/www/system_authservers.php:677 msgid "UTF8 encode LDAP parameters before sending them to the server." msgstr "" -#: src/usr/local/www/system_authservers.php:684 +#: src/usr/local/www/system_authservers.php:685 msgid "Do not strip away parts of the username after the @ symbol" msgstr "" @@ -30711,42 +30997,42 @@ msgstr "" msgid "Issue IP Addresses via RADIUS server." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:535 +#: src/usr/local/www/vpn_openvpn_client.php:543 msgid "Infinitely resolve server " msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:572 +#: src/usr/local/www/vpn_openvpn_client.php:580 #: src/usr/local/www/vpn_openvpn_server.php:702 msgid "Enable authentication of TLS packets." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:580 +#: src/usr/local/www/vpn_openvpn_client.php:588 #: src/usr/local/www/vpn_openvpn_server.php:710 msgid "Automatically generate a shared TLS authentication key." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:627 +#: src/usr/local/www/vpn_openvpn_client.php:635 #: src/usr/local/www/vpn_openvpn_server.php:791 msgid "Automatically generate a shared key" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:725 +#: src/usr/local/www/vpn_openvpn_client.php:740 #: src/usr/local/www/vpn_openvpn_server.php:957 msgid "" "Set the TOS IP header value of tunnel packets to match the encapsulated " "packet value." msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:732 +#: src/usr/local/www/vpn_openvpn_client.php:747 #: src/usr/local/www/vpn_openvpn_server.php:978 msgid "Don't forward IPv6 traffic. " msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:739 +#: src/usr/local/www/vpn_openvpn_client.php:754 msgid "Bars the server from adding routes to the client's routing table" msgstr "" -#: src/usr/local/www/vpn_openvpn_client.php:746 +#: src/usr/local/www/vpn_openvpn_client.php:761 msgid "Don't add or remove routes automatically" msgstr "" diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index 30da41b..242551c 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -57,7 +57,7 @@ */ ##|+PRIV -##|*IDENT=page-diagnostics-backup/restore +##|*IDENT=page-diagnostics-backup-restore ##|*NAME=Diagnostics: Backup/restore ##|*DESCR=Allow access to the 'Diagnostics: Backup/restore' page. ##|*MATCH=diag_backup.php* diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index 91e0f77..b0d978a 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -64,6 +64,21 @@ require_once("guiconfig.inc"); require_once("interfaces.inc"); +function get_ip($addr) { + + $parts = explode(":", $addr); + if (count($parts) == 2) + return (trim($parts[0])); + else { + /* IPv6 */ + $parts = explode("[", $addr); + if (count($parts) == 2) + return (trim($parts[0])); + } + + return (""); +} + /* handle AJAX operations */ if (isset($_POST['action']) && $_POST['action'] == "remove") { if (isset($_POST['srcip']) && isset($_POST['dstip']) && is_ipaddr($_POST['srcip']) && is_ipaddr($_POST['dstip'])) { @@ -173,49 +188,74 @@ print $form; <th><?=gettext("Protocol")?></th> <th><?=gettext("Source -> Router -> Destination")?></th> <th><?=gettext("State")?></th> + <th><?=gettext("Packets")?></th> + <th><?=gettext("Bytes")?></th> <th></th> <!-- For the optional "Remove" button --> </tr> </thead> <tbody> <?php - $row = 0; - /* get our states */ - $grepline = (isset($_POST['filter'])) ? "| /usr/bin/egrep " . escapeshellarg(htmlspecialchars($_POST['filter'])) : ""; - $fd = popen("/sbin/pfctl -s state {$grepline}", "r"); - while ($line = chop(fgets($fd))) { - if ($row >= 10000) { - break; - } + if (isset($_REQUEST['ruleid'])) { + $ids = explode(",", $_REQUEST['ruleid']); + $arr = array(); + for ($i = 0; $i < count($ids); $i++) + $arr[] = array("ruleid" => intval($ids[$i])); + } - $line_split = preg_split("/\s+/", $line); + if (isset($arr) && is_array($arr) && count($arr) > 0) + $res = pfSense_get_pf_states($arr); + else + $res = pfSense_get_pf_states(); - $iface = array_shift($line_split); - $proto = array_shift($line_split); - $state = array_pop($line_split); - $info = implode(" ", $line_split); + $states = 0; + if ($res != NULL && is_array($res)) + $states = count($res); - // We may want to make this optional, with a large state table, this could get to be expensive. - $iface = convert_real_interface_to_friendly_descr($iface); + /* XXX - limit to 10.000 states. */ + if ($states > 10000) + $states = 10000; + + for ($i = 0; $i < $states; $i++) { + if ($res[$i]['direction'] === "out") { + $info = $res[$i]['src']; + if ($res[$i]['src-orig']) + $info .= " (" . $res[$i]['src-orig'] . ")"; + $info .= " -> "; + $info .= $res[$i]['dst']; + if ($res[$i]['dst-orig']) + $info .= " (" . $res[$i]['dst-orig'] . ")"; + $srcip = get_ip($res[$i]['src']); + $dstip = get_ip($res[$i]['dst']); + } else { + $info = $res[$i]['dst']; + if ($res[$i]['dst-orig']) + $info .= " (" . $res[$i]['dst-orig'] . ")"; + $info .= " -> "; + $info .= $res[$i]['src']; + if ($res[$i]['src-orig']) + $info .= " (" . $res[$i]['src-orig'] . ")"; + $srcip = get_ip($res[$i]['dst']); + $dstip = get_ip($res[$i]['src']); + } - /* break up info and extract $srcip and $dstip */ - $ends = preg_split("/\<?-\>?/", $info); - $parts = explode(":", $ends[0]); - $srcip = trim($parts[0]); - $parts = explode(":", $ends[count($ends) - 1]); - $dstip = trim($parts[0]); ?> <tr> - <td><?= $iface ?></td> - <td><?= $proto ?></td> + <td><?= convert_real_interface_to_friendly_descr($res[$i]['if']) ?></td> + <td><?= $res[$i]['proto'] ?></td> <td><?= $info ?></td> - <td><?= $state ?></td> + <td><?= $res[$i]['state'] ?></td> + <td><?= format_number($res[$i]['packets in']) ?> / + <?= format_number($res[$i]['packets out']) ?></td> + <td><?= format_bytes($res[$i]['bytes in']) ?> / + <?= format_bytes($res[$i]['bytes out']) ?></td> <td> <a class="btn fa fa-trash" data-entry="<?=$srcip?>|<?=$dstip?>" title="<?=sprintf(gettext('Remove all state entries from %1$s to %2$s'), $srcip, $dstip);?>"></a> </td> </tr> -<?php $row++; } +<? + } ?> </tbody> </table> @@ -224,7 +264,7 @@ print $form; </div> <?php -if ($row == 0) { +if ($states == 0) { if (isset($_POST['filter']) && !empty($_POST['filter'])) { $errmsg = gettext('No states were found that match the current filter'); } else { diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php index 1911548..4f422dd 100644 --- a/src/usr/local/www/firewall_aliases.php +++ b/src/usr/local/www/firewall_aliases.php @@ -216,7 +216,7 @@ display_top_tabs($tab_array); <div class="panel-body"> <div class="table-responsive"> -<table class="table table-striped table-hover"> +<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Name")?></th> diff --git a/src/usr/local/www/foot.inc b/src/usr/local/www/foot.inc index be2ed15..081cfca 100755 --- a/src/usr/local/www/foot.inc +++ b/src/usr/local/www/foot.inc @@ -24,7 +24,6 @@ <script src="/jquery/pfSense.js"></script> <script src="/jquery/pfSenseHelpers.js"></script> <script src="/sortable/sortable.js"></script> - <script type="text/javascript"> //<![CDATA[ // Un-hide the "Top of page" icons if the page is larger than the window diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index 015b3f9..515a6d6 100755 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -520,7 +520,7 @@ echo '<li>'. get_shortcut_log_link($shortcut_section, false). '</li>'; ?> <?php if (!$g['disablehelpicon']): ?> <li> - <a href="<?=$helpurl?>" target="_blank" title="<?=gettext("Help for items on this page")?>" class="help-icon"> + <a href="<?=$helpurl?>" target="_blank" title="<?=gettext("Help for items on this page")?>"> <i class="fa fa-question-circle"></i> </a> </li> diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index 0dbf149..55de55e 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -57,7 +57,7 @@ */ ##|+PRIV -##|*IDENT=page-system-login/logout +##|*IDENT=page-system-login-logout ##|*NAME=System: Login / Logout / Dashboard ##|*DESCR=Allow access to the 'System: Login / Logout' page and Dashboard. ##|*MATCH=index.php* @@ -489,7 +489,7 @@ events.push(function() { }); - $('.context-links li:last').prev('li').html('<a href="#" class=help-icon" title="<?=gettext("Save dashboard layout")?>" id="btnstore"><i class="fa fa-save"></i></a>'); + $('.context-links li:last').prev('li').html('<a href="#" title="<?=gettext("Save dashboard layout")?>" id="btnstore"><i class="fa fa-save"></i></a>'); $('#btnstore').click(function() { updateWidgets(); diff --git a/src/usr/local/www/load_balancer_monitor_edit.php b/src/usr/local/www/load_balancer_monitor_edit.php index 615064f..6ba0907 100644 --- a/src/usr/local/www/load_balancer_monitor_edit.php +++ b/src/usr/local/www/load_balancer_monitor_edit.php @@ -89,6 +89,10 @@ if (isset($id) && $a_monitor[$id]) { $pconfig['options']['code'] = 200; } +if ($_GET['act'] = "dup") { + unset($id); +} + $changedesc = gettext("Load Balancer: Monitor:") . " "; $changecount = 0; diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index 6492ac0..8a26e20 100755 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -541,7 +541,7 @@ if ($savemsg) { #Show custom description to delete button if defined $delete_msg=($pkg['adddeleteeditpagefields']['deletetext']?$pkg['adddeleteeditpagefields']['deletetext']:gettext("Delete this item")); ?> - <td> <a class="fa fa-trash" href="pkg.php?xml=<?=$xml?>&act=del&id=<?=$i?>" title="<?=$delete_msg?>"><?=gettext('Delete')?></a></td> + <td> <a class="fa fa-trash" href="pkg.php?xml=<?=$xml?>&act=del&id=<?=$i?>" title="<?=$delete_msg?>"></a></td> </tr> </tbody> </table> diff --git a/src/usr/local/www/services_captiveportal_mac_edit.php b/src/usr/local/www/services_captiveportal_mac_edit.php index e71e6a4..35d796e 100644 --- a/src/usr/local/www/services_captiveportal_mac_edit.php +++ b/src/usr/local/www/services_captiveportal_mac_edit.php @@ -251,13 +251,20 @@ $btnmymac = new Form_Button( $btnmymac->removeClass('btn-primary')->addClass('btn-success btn-sm'); -$group = new Form_Group('MAC controls'); +$group = new Form_Group('MAC Address'); $group->add($macaddress); $group->add($btnmymac); -$group->setHelp('MAC address (6 hex octets separated by colons)'); +$group->setHelp('6 hex octets separated by colons'); $section->add($group); $section->addInput(new Form_Input( + 'descr', + 'Description', + 'text', + $pconfig['descr'] +))->setHelp('You may enter a description here for your reference (not parsed)'); + +$section->addInput(new Form_Input( 'bw_up', 'Bandwidth up', 'text', diff --git a/src/usr/local/www/services_dyndns.php b/src/usr/local/www/services_dyndns.php index c9f24ff..e095cb2 100644 --- a/src/usr/local/www/services_dyndns.php +++ b/src/usr/local/www/services_dyndns.php @@ -70,7 +70,12 @@ $a_dyndns = &$config['dyndnses']['dyndns']; if ($_GET['act'] == "del") { $conf = $a_dyndns[$_GET['id']]; - @unlink("{$g['conf_path']}/dyndns_{$conf['interface']}{$conf['type']}" . escapeshellarg($conf['host']) . "{$conf['id']}.cache"); + if ($conf['type'] == "namecheap") { + $hostname = $conf['host'] . "." . $conf['domainname']; + } else { + $hostname = $conf['host']; + } + @unlink("{$g['conf_path']}/dyndns_{$conf['interface']}{$conf['type']}" . escapeshellarg($hostname) . "{$conf['id']}.cache"); unset($a_dyndns[$_GET['id']]); write_config(); @@ -124,6 +129,11 @@ display_top_tabs($tab_array); <?php $i = 0; foreach ($a_dyndns as $dyndns): + if ($dyndns['type'] == "namecheap") { + $hostname = $dyndns['host'] . "." . $dyndns['domainname']; + } else { + $hostname = $dyndns['host']; + } ?> <tr<?=!isset($dyndns['enable'])?' class="disabled"':''?>> <td> @@ -162,13 +172,13 @@ foreach ($a_dyndns as $dyndns): </td> <td> <?php - print(htmlspecialchars($dyndns['host'])); + print(htmlspecialchars($hostname)); ?> </td> <td> <?php - $filename = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache"; - $filename_v6 = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}_v6.cache"; + $filename = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($hostname) . "{$dyndns['id']}.cache"; + $filename_v6 = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($hostname) . "{$dyndns['id']}_v6.cache"; if (file_exists($filename)) { $ipaddr = dyndnsCheckIP($dyndns['interface']); $cached_ip_s = explode(":", file_get_contents($filename)); diff --git a/src/usr/local/www/services_dyndns_edit.php b/src/usr/local/www/services_dyndns_edit.php index 52e90e9..d76809f 100644 --- a/src/usr/local/www/services_dyndns_edit.php +++ b/src/usr/local/www/services_dyndns_edit.php @@ -92,6 +92,7 @@ if (isset($id) && isset($a_dyndns[$id])) { $pconfig['username'] = $a_dyndns[$id]['username']; $pconfig['password'] = $a_dyndns[$id]['password']; $pconfig['host'] = $a_dyndns[$id]['host']; + $pconfig['domainname'] = $a_dyndns[$id]['domainname']; $pconfig['mx'] = $a_dyndns[$id]['mx']; $pconfig['type'] = $a_dyndns[$id]['type']; $pconfig['enable'] = !isset($a_dyndns[$id]['enable']); @@ -129,6 +130,10 @@ if ($_POST) { $reqdfieldsn[] = gettext("Password"); $reqdfields[] = "username"; $reqdfieldsn[] = gettext("Username"); + if ($pconfig['type'] == "namecheap") { + $reqdfields[] = "domainname"; + $reqdfieldsn[] = gettext("Domain Name"); + } } else { $reqdfields[] = "updateurl"; $reqdfieldsn[] = gettext("Update URL"); @@ -180,6 +185,7 @@ if ($_POST) { $dyndns['password'] = $a_dyndns[$id]['password'];; } $dyndns['host'] = $_POST['host']; + $dyndns['domainname'] = $_POST['domainname']; $dyndns['mx'] = $_POST['mx']; $dyndns['wildcard'] = $_POST['wildcard'] ? true : false; $dyndns['verboselog'] = $_POST['verboselog'] ? true : false; @@ -308,15 +314,28 @@ $section->addInput(new Form_Select( $interfacelist ))->setHelp('This is almost always the same as the Interface to Monitor. '); -$section->addInput(new Form_Input( +$group = new Form_Group('Hostname'); + +$group->add(new Form_Input( 'host', 'Hostname', 'text', $pconfig['host'] -))->setHelp('Enter the complete fully qualified domain name. Example: myhost.dyndns.org'. '<br />' . +)); +$group->add(new Form_Input( + 'domainname', + 'Domain Name', + 'text', + $pconfig['domainname'] +)); + +$group->setHelp('Enter the complete fully qualified domain name. Example: myhost.dyndns.org'. '<br />' . 'he.net tunnelbroker: Enter your tunnel ID' . '<br />' . 'GleSYS: Enter your record ID' . '<br />' . - 'DNSimple: Enter only the domain name.'); + 'DNSimple: Enter only the domain name.' . '<br />' . + 'Namecheap: Enter the hostname and the domain separately, with the domain being the domain or subdomain zone being handled by Namecheap.'); + +$section->add($group); $section->addInput(new Form_Input( 'mx', @@ -441,6 +460,7 @@ events.push(function() { switch (service) { case "custom" : case "custom-v6" : + hideGroupInput('domainname', true); hideInput('resultmatch', false); hideInput('updateurl', false); hideInput('requestif', false); @@ -455,6 +475,7 @@ events.push(function() { case "dnsimple": case "route53": + hideGroupInput('domainname', true); hideInput('resultmatch', true); hideInput('updateurl', true); hideInput('requestif', true); @@ -466,8 +487,21 @@ events.push(function() { hideInput('zoneid', false); hideInput('ttl', false); break; - + case "namecheap": + hideGroupInput('domainname', false); + hideInput('resultmatch', true); + hideInput('updateurl', true); + hideInput('requestif', true); + hideCheckbox('curl_ipresolve_v4', true); + hideCheckbox('curl_ssl_verifypeer', true); + hideInput('host', false); + hideInput('mx', false); + hideCheckbox('wildcard', false); + hideInput('zoneid', true); + hideInput('ttl', true); + break; default: + hideGroupInput('domainname', true); hideInput('resultmatch', true); hideInput('updateurl', true); hideInput('requestif', true); diff --git a/src/usr/local/www/services_rfc2136.php b/src/usr/local/www/services_rfc2136.php index afb6e86..44bb1c5 100644 --- a/src/usr/local/www/services_rfc2136.php +++ b/src/usr/local/www/services_rfc2136.php @@ -123,6 +123,7 @@ if ($input_errors) { $iflist = get_configured_interface_with_descr(); +$groupslist = return_gateway_groups_array(); $i = 0; foreach ($a_rfc2136 as $rfc2136): @@ -136,6 +137,12 @@ foreach ($a_rfc2136 as $rfc2136): break; } } + foreach ($groupslist as $if => $group) { + if ($rfc2136['interface'] == $if) { + print($if); + break; + } + } ?> </td> <td> @@ -147,13 +154,14 @@ foreach ($a_rfc2136 as $rfc2136): <td> <?php $filename = "{$g['conf_path']}/dyndns_{$rfc2136['interface']}_rfc2136_" . escapeshellarg($rfc2136['host']) . "_{$rfc2136['server']}.cache"; + $if = get_failover_interface($rfc2136['interface']); if (file_exists($filename)) { print('IPv4: '); if (isset($rfc2136['usepublicip'])) { - $ipaddr = dyndnsCheckIP($rfc2136['interface']); + $ipaddr = dyndnsCheckIP($if); } else { - $ipaddr = get_interface_ip($rfc2136['interface']); + $ipaddr = get_interface_ip($if); } $cached_ip_s = explode("|", file_get_contents($filename)); @@ -175,7 +183,7 @@ foreach ($a_rfc2136 as $rfc2136): if (file_exists("{$filename}.ipv6")) { print('IPv6: '); - $ipaddr = get_interface_ipv6($rfc2136['interface']); + $ipaddr = get_interface_ipv6($if); $cached_ip_s = explode("|", file_get_contents("{$filename}.ipv6")); $cached_ip = $cached_ip_s[0]; diff --git a/src/usr/local/www/services_rfc2136_edit.php b/src/usr/local/www/services_rfc2136_edit.php index 5b74e36..891e8b1 100644 --- a/src/usr/local/www/services_rfc2136_edit.php +++ b/src/usr/local/www/services_rfc2136_edit.php @@ -157,6 +157,28 @@ if ($_POST) { } } +function build_if_list() { + $list = array(); + + $iflist = get_configured_interface_with_descr(); + + foreach ($iflist as $if => $ifdesc) { + $list[$if] = $ifdesc; + } + + unset($iflist); + + $grouplist = return_gateway_groups_array(); + + foreach ($grouplist as $name => $group) { + $list[$name] = 'GW Group ' . $name; + } + + unset($grouplist); + + return($list); +} + $pgtitle = array(gettext("Services"), gettext("Dynamic DNS"), gettext("RFC 2136 Client"), gettext("Edit")); include("head.inc"); @@ -180,17 +202,14 @@ $section->addInput(new Form_Checkbox( )); $optionlist = array(); -$iflist = get_configured_interface_with_descr(); -foreach ($iflist as $ifnam => $ifdescr) { - $optionlist[$ifnam] = $ifdescr; -} +$iflist = build_if_list(); $section->addInput(new Form_Select( 'interface', 'Interface', $pconfig['interface'], - $optionlist + $iflist )); $section->addInput(new Form_Input( @@ -306,12 +325,17 @@ $section->addInput(new Form_Input( ))->setHelp('You may enter a description here for your reference (not parsed).'); if (isset($id) && $a_rfc2136[$id]) { - $section->addInput(new Form_Input( - 'id', - null, - 'hidden', - $id + $section->addInput(new Form_Input( + 'id', + null, + 'hidden', + $id )); + + $form->addGlobal(new Form_Button( + 'force', + 'Save & Force Update' + ))->removeClass('btn-primary')->addClass('btn-info'); } $form->add($section); diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php index 8f8be60..41bce34 100644 --- a/src/usr/local/www/status_dhcp_leases.php +++ b/src/usr/local/www/status_dhcp_leases.php @@ -379,11 +379,12 @@ if (count($pools) > 0) { <th><?=gettext("IP address")?></th> <th><?=gettext("MAC address")?></th> <th><?=gettext("Hostname")?></th> + <th><?=gettext("Description")?></th> <th><?=gettext("Start")?></th> <th><?=gettext("End")?></th> <th><?=gettext("Online")?></th> <th><?=gettext("Lease Type")?></th> - <th><?=gettext("Actions")?></th> + <th data-sortable="false"><?=gettext("Actions")?></th> </tr> </thead> <tbody> @@ -437,12 +438,9 @@ foreach ($leases as $data): <?php endif; ?> </td> <td><?=htmlentities($data['hostname'])?></td> -<?php if ($data['type'] != $static_string):?> + <td><?=htmlentities($data['descr'])?></td> <td><?=adjust_gmt($data['start'])?></td> <td><?=adjust_gmt($data['end'])?></td> -<?php else: ?> - <td colspan="2"><?=htmlentities($data['descr'])?></td> -<?php endif; ?> <td><?=$data['online']?></td> <td><?=$data['act']?></td> <td> diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php index cbac6ef..541ba8f 100644 --- a/src/usr/local/www/status_dhcpv6_leases.php +++ b/src/usr/local/www/status_dhcpv6_leases.php @@ -530,8 +530,8 @@ foreach ($leases as $data): <a class="fa fa-trash" title="<?=gettext('Delete lease')?>" href="status_dhcpv6_leases.php?deleteip=<?=$data['ip']?>&all=<?=intval($_GET['all'])?>"></a> <?php endif; ?> </td> -<?php endforeach; ?> </tr> +<?php endforeach; ?> </tbody> </table> </div> @@ -608,8 +608,8 @@ foreach ($prefixes as $data): <td>n/a</td> <?php endif; ?> <td><?=$data['act']?></td> -<?php endforeach; ?> </tr> +<?php endforeach; ?> </tbody> </table> </div> diff --git a/src/usr/local/www/status_logs_common.inc b/src/usr/local/www/status_logs_common.inc index 0636064..b608817 100644 --- a/src/usr/local/www/status_logs_common.inc +++ b/src/usr/local/www/status_logs_common.inc @@ -334,7 +334,7 @@ function filter_form_system() { ); } - $btnsubmit->removeClass('btn-primary')->addClass('btn-success')->addClass('btn-sm'); + $btnsubmit->removeClass('btn-primary')->addClass('btn-sm btn-success'); $group->add(new Form_StaticText( '', @@ -553,7 +553,7 @@ function filter_form_firewall() { ); } - $btnsubmit->removeClass('btn-primary')->addClass('btn-success')->addClass('btn-sm'); + $btnsubmit->removeClass('btn-primary')->addClass('btn-sm btn-success'); $group->add(new Form_StaticText( '', @@ -958,11 +958,12 @@ function manage_log_section() { $btnsavesettings = new Form_Button( 'save_settings', - gettext('Save'), - null + ' ' . gettext('Save'), + null, + 'fa-save' ); - $btnsavesettings->addClass('btn-sm'); + $btnsavesettings->addClass('btn-sm btn-primary'); $group->add(new Form_StaticText( '', @@ -977,7 +978,7 @@ function manage_log_section() { 'fa-trash' ); - $btnclear->removeClass('btn-primary')->addClass('btn-danger')->addClass('btn-sm'); + $btnclear->removeClass('btn-primary')->addClass('btn-sm btn-danger'); $group->add(new Form_StaticText( '', diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index c791489..69d3069 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -181,16 +181,16 @@ if ($_POST) { $dnsname="dns{$dnscounter}"; $dnsgwname="dns{$dnscounter}gw"; if (($_POST[$dnsname] && !is_ipaddr($_POST[$dnsname]))) { - $input_errors[] = gettext("A valid IP address must be specified for DNS server $dnscounter."); + $input_errors[] = sprintf(gettext("A valid IP address must be specified for DNS server %s."), $dnscounter); } else { if (($_POST[$dnsgwname] <> "") && ($_POST[$dnsgwname] <> "none")) { // A real gateway has been selected. if (is_ipaddr($_POST[$dnsname])) { if ((is_ipaddrv4($_POST[$dnsname])) && (validate_address_family($_POST[$dnsname], $_POST[$dnsgwname]) === false)) { - $input_errors[] = gettext("You can not specify IPv6 gateway '{$_POST[$dnsgwname]}' for IPv4 DNS server '{$_POST[$dnsname]}'"); + $input_errors[] = sprintf(gettext('You can not specify IPv6 gateway "%1$s" for IPv4 DNS server "%2$s".'), $_POST[$dnsgwname], $_POST[$dnsname]); } if ((is_ipaddrv6($_POST[$dnsname])) && (validate_address_family($_POST[$dnsname], $_POST[$dnsgwname]) === false)) { - $input_errors[] = gettext("You can not specify IPv4 gateway '{$_POST[$dnsgwname]}' for IPv6 DNS server '{$_POST[$dnsname]}'"); + $input_errors[] = sprintf(gettext('You can not specify IPv4 gateway "%1$s" for IPv6 DNS server "%2$s".'), $_POST[$dnsgwname], $_POST[$dnsname]); } } else { // The user selected a gateway but did not provide a DNS address. Be nice and set the gateway back to "none". diff --git a/src/usr/local/www/system_advanced_firewall.php b/src/usr/local/www/system_advanced_firewall.php index 29b92af..f831959 100644 --- a/src/usr/local/www/system_advanced_firewall.php +++ b/src/usr/local/www/system_advanced_firewall.php @@ -470,7 +470,7 @@ $section->addInput(new Form_Checkbox( $section->addInput(new Form_Checkbox( 'disablescrub', 'Disable Firewall Scrub', - 'Disables the PF scrubbing option which can sometimes interfere with NFS and PPTP traffic.', + 'Disables the PF scrubbing option which can sometimes interfere with NFS traffic.', isset($config['system']['disablescrub']) )); @@ -545,8 +545,7 @@ $section->addInput(new Form_Checkbox( 'Disable Auto-added VPN rules', 'Disable all auto-added VPN rules.', isset($config['system']['disablevpnrules']) -))->setHelp('<span>Note: This disables automatically added rules for IPsec, '. - 'PPTP.</span>'); +))->setHelp('Note: This disables automatically added rules for IPsec.'); $section->addInput(new Form_Checkbox( 'disablereplyto', @@ -743,13 +742,13 @@ events.push(function() { var htext = '<span class="text-success">'; if (val == 'normal') { - htext += 'The default optimization algorithm'; + htext += '<?=gettext("The default optimization algorithm");?>'; } else if (val == 'high-latency') { - htext += 'Used for eg. satellite links. Expires idle connections later than default'; + htext += '<?=gettext("Used for eg. satellite links. Expires idle connections later than default");?>'; } else if (val == 'aggressive') { - htext += 'Expires idle connections quicker. More efficient use of CPU and memory but can drop legitimate idle connections'; + htext += '<?=gettext("Expires idle connections quicker. More efficient use of CPU and memory but can drop legitimate idle connections");?>'; } else if (val == 'conservative') { - htext += 'Tries to avoid dropping any legitimate idle connections at the expense of increased memory usage and CPU utilization'; + htext += '<?=gettext("Tries to avoid dropping any legitimate idle connections at the expense of increased memory usage and CPU utilization");?>'; } htext += '</span>'; diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index 75e71a6..1171c7e 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -111,7 +111,7 @@ if ($act == "del") { /* Remove server from temp list used later on this page. */ unset($a_server[$_GET['id']]); - $savemsg = gettext("Authentication Server") . " " . htmlspecialchars($serverdeleted) . " " . gettext("deleted") . "<br />"; + $savemsg = sprintf(gettext("Authentication Server %s deleted"), htmlspecialchars($serverdeleted)); write_config($savemsg); } @@ -379,11 +379,13 @@ if($_POST && $input_errors) { include("head.inc"); -if ($input_errors) +if ($input_errors) { print_input_errors($input_errors); +} -if ($savemsg) +if ($savemsg) { print_info_box($savemsg, 'success'); +} $tab_array = array(); $tab_array[] = array(gettext("Users"), false, "system_usermanager.php"); @@ -392,8 +394,7 @@ $tab_array[] = array(gettext("Settings"), false, "system_usermanager_settings.ph $tab_array[] = array(gettext("Servers"), true, "system_authservers.php"); display_top_tabs($tab_array); -if (!($act == "new" || $act == "edit" || $input_errors)) -{ +if (!($act == "new" || $act == "edit" || $input_errors)) { ?> <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Authentication Servers')?></h2></div> diff --git a/src/usr/local/www/system_camanager.php b/src/usr/local/www/system_camanager.php index 6dbd32f..d81ce00 100644 --- a/src/usr/local/www/system_camanager.php +++ b/src/usr/local/www/system_camanager.php @@ -128,7 +128,7 @@ if ($act == "del") { $name = $a_ca[$id]['descr']; unset($a_ca[$id]); write_config(); - $savemsg = sprintf(gettext("Certificate Authority %s and its CRLs (if any) successfully deleted"), htmlspecialchars($name)) . "<br />"; + $savemsg = sprintf(gettext("Certificate Authority %s and its CRLs (if any) successfully deleted"), htmlspecialchars($name)); pfSenseHeader("system_camanager.php"); exit; } @@ -246,20 +246,20 @@ if ($_POST) { if ($pconfig['method'] != "existing") { /* Make sure we do not have invalid characters in the fields for the certificate */ if (preg_match("/[\?\>\<\&\/\\\"\']/", $_POST['descr'])) { - array_push($input_errors, "The field 'Descriptive Name' contains invalid characters."); + array_push($input_errors, gettext("The field 'Descriptive Name' contains invalid characters.")); } for ($i = 0; $i < count($reqdfields); $i++) { if ($reqdfields[$i] == 'dn_email') { if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $_POST["dn_email"])) { - array_push($input_errors, "The field 'Distinguished name Email Address' contains invalid characters."); + array_push($input_errors, gettext("The field 'Distinguished name Email Address' contains invalid characters.")); } } else if ($reqdfields[$i] == 'dn_commonname') { if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $_POST["dn_commonname"])) { - array_push($input_errors, "The field 'Distinguished name Common Name' contains invalid characters."); + array_push($input_errors, gettext("The field 'Distinguished name Common Name' contains invalid characters.")); } } else if (($reqdfields[$i] != "descr") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\.\"\']/", $_POST["$reqdfields[$i]"])) { - array_push($input_errors, "The field '" . $reqdfieldsn[$i] . "' contains invalid characters."); + array_push($input_errors, sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i])); } } if (!in_array($_POST["keylen"], $ca_keylens)) { diff --git a/src/usr/local/www/system_certmanager.php b/src/usr/local/www/system_certmanager.php index f186f5a..d9cd26b 100644 --- a/src/usr/local/www/system_certmanager.php +++ b/src/usr/local/www/system_certmanager.php @@ -137,7 +137,7 @@ if ($act == "del") { unset($a_cert[$id]); write_config(); - $savemsg = sprintf(gettext("Certificate %s successfully deleted"), htmlspecialchars($a_cert[$id]['descr'])) . "<br />"; + $savemsg = sprintf(gettext("Certificate %s successfully deleted"), htmlspecialchars($a_cert[$id]['descr'])); pfSenseHeader("system_certmanager.php"); exit; } @@ -247,7 +247,7 @@ if ($act == "csr") { } if ($_POST) { - // This is just the blank altername name that is added for display purposes. We don't want to validate/save it + // This is just the blank alternate name that is added for display purposes. We don't want to validate/save it if ($_POST['altname_value0'] == "") { unset($_POST['altname_type0']); unset($_POST['altname_value0']); @@ -371,14 +371,14 @@ if ($_POST) { for ($i = 0; $i < count($reqdfields); $i++) { if (preg_match('/email/', $reqdfields[$i])) { /* dn_email or csr_dn_name */ if (preg_match("/[\!\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $_POST[$reqdfields[$i]])) { - array_push($input_errors, "The field 'Distinguished name Email Address' contains invalid characters."); + array_push($input_errors, gettext("The field 'Distinguished name Email Address' contains invalid characters.")); } } else if (preg_match('/commonname/', $reqdfields[$i])) { /* dn_commonname or csr_dn_commonname */ if (preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\"\']/", $_POST[$reqdfields[$i]])) { - array_push($input_errors, "The field 'Distinguished name Common Name' contains invalid characters."); + array_push($input_errors, gettext("The field 'Distinguished name Common Name' contains invalid characters.")); } } else if (($reqdfields[$i] != "descr") && preg_match("/[\!\@\#\$\%\^\(\)\~\?\>\<\&\/\\\,\.\"\']/", $_POST[$reqdfields[$i]])) { - array_push($input_errors, "The field '" . $reqdfieldsn[$i] . "' contains invalid characters."); + array_push($input_errors, sprintf(gettext("The field '%s' contains invalid characters."), $reqdfieldsn[$i])); } } @@ -1052,7 +1052,7 @@ foreach ($a_cert as $i => $cert): <i><?=$cert_types[$cert['type']]?></i><br /> <?php endif?> <?php if (is_array($purpose)): ?> - CA: <b><?=$purpose['ca']?></b>, Server: <b><?=$purpose['server']?></b> + CA: <b><?=$purpose['ca']?></b>, <?=gettext("Server")?>: <b><?=$purpose['server']?></b> <?php endif?> </td> <td><?=$caname?></td> @@ -1067,25 +1067,25 @@ foreach ($a_cert as $i => $cert): </td> <td> <?php if (is_cert_revoked($cert)): ?> - <i>Revoked </i> + <i><?=gettext("Revoked")?></i> <?php endif?> <?php if (is_webgui_cert($cert['refid'])): ?> - webConfigurator + <?=gettext("webConfigurator")?> <?php endif?> <?php if (is_user_cert($cert['refid'])): ?> - User Cert + <?=gettext("User Cert")?> <?php endif?> <?php if (is_openvpn_server_cert($cert['refid'])): ?> - OpenVPN Server + <?=gettext("OpenVPN Server")?> <?php endif?> <?php if (is_openvpn_client_cert($cert['refid'])): ?> - OpenVPN Client + <?=gettext("OpenVPN Client")?> <?php endif?> <?php if (is_ipsec_cert($cert['refid'])): ?> - IPsec Tunnel + <?=gettext("IPsec Tunnel")?> <?php endif?> <?php if (is_captiveportal_cert($cert['refid'])): ?> - Captive Portal + <?=gettext("Captive Portal")?> <?php endif?> <?php $refid = $cert['refid']; diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index 5d3a3f5..650ea20 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -123,7 +123,7 @@ if (!$thiscrl && (($act != "") && ($act != "new"))) { if ($act == "del") { $name = htmlspecialchars($thiscrl['descr']); if (crl_in_use($id)) { - $savemsg = sprintf(gettext("Certificate Revocation List %s is in use and cannot be deleted"), $name) . "<br />"; + $savemsg = sprintf(gettext("Certificate Revocation List %s is in use and cannot be deleted"), $name); } else { foreach ($a_crl as $cid => $acrl) { if ($acrl['refid'] == $thiscrl['refid']) { @@ -131,7 +131,7 @@ if ($act == "del") { } } write_config("Deleted CRL {$name}."); - $savemsg = sprintf(gettext("Certificate Revocation List %s successfully deleted"), $name) . "<br />"; + $savemsg = sprintf(gettext("Certificate Revocation List %s successfully deleted"), $name); } } @@ -212,13 +212,13 @@ if ($act == "delcert") { $certname = htmlspecialchars($thiscert['descr']); $crlname = htmlspecialchars($thiscrl['descr']); if (cert_unrevoke($thiscert, $thiscrl)) { - $savemsg = sprintf(gettext("Deleted Certificate %s from CRL %s"), $certname, $crlname) . "<br />"; + $savemsg = sprintf(gettext("Deleted Certificate %s from CRL %s"), $certname, $crlname); // refresh IPsec and OpenVPN CRLs openvpn_refresh_crls(); vpn_ipsec_configure(); - write_config(sprintf(gettext("Deleted Certificate %s from CRL %s"), $certname, $crlname)); + write_config($savemsg); } else { - $savemsg = sprintf(gettext("Failed to delete Certificate %s from CRL %s"), $certname, $crlname) . "<br />"; + $savemsg = sprintf(gettext("Failed to delete Certificate %s from CRL %s"), $certname, $crlname); } $act="edit"; } diff --git a/src/usr/local/www/system_gateway_groups.php b/src/usr/local/www/system_gateway_groups.php index eaebcfe..cd21fd4 100644 --- a/src/usr/local/www/system_gateway_groups.php +++ b/src/usr/local/www/system_gateway_groups.php @@ -106,7 +106,7 @@ if ($_POST) { if ($_GET['act'] == "del") { if ($a_gateway_groups[$_GET['id']]) { - $changedesc .= gettext("removed gateway group") . " {$_GET['id']}"; + $changedesc .= sprintf(gettext("removed gateway group %s"), $_GET['id']); foreach ($config['filter']['rule'] as $idx => $rule) { if ($rule['gateway'] == $a_gateway_groups[$_GET['id']]['name']) { unset($config['filter']['rule'][$idx]['gateway']); diff --git a/src/usr/local/www/system_gateway_groups_edit.php b/src/usr/local/www/system_gateway_groups_edit.php index c026615..c28fa8d 100644 --- a/src/usr/local/www/system_gateway_groups_edit.php +++ b/src/usr/local/www/system_gateway_groups_edit.php @@ -146,7 +146,7 @@ if ($_POST) { } /* check for overlaps */ if ($_POST['name'] == $gwname) { - $input_errors[] = sprintf(gettext('A gateway group cannot have the same name with a gateway "%s" please choose another name.'), $_POST['name']); + $input_errors[] = sprintf(gettext('A gateway group cannot have the same name as a gateway "%s" please choose another name.'), $_POST['name']); } } diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php index 332a383..b28c727 100644 --- a/src/usr/local/www/system_gateways.php +++ b/src/usr/local/www/system_gateways.php @@ -115,9 +115,9 @@ function can_delete_disable_gateway_item($id, $disable = false) { $items = explode("|", $item); if ($items[0] == $a_gateways[$id]['name']) { if (!$disable) { - $input_errors[] = sprintf(gettext("Gateway '%s' cannot be deleted because it is in use on Gateway Group '%s'"), $a_gateways[$id]['name'], $group['name']); + $input_errors[] = sprintf(gettext('Gateway "%1$s" cannot be deleted because it is in use on Gateway Group "%2$s"'), $a_gateways[$id]['name'], $group['name']); } else { - $input_errors[] = sprintf(gettext("Gateway '%s' cannot be disabled because it is in use on Gateway Group '%s'"), $a_gateways[$id]['name'], $group['name']); + $input_errors[] = sprintf(gettext('Gateway "%1$s" cannot be disabled because it is in use on Gateway Group "%2$s"'), $a_gateways[$id]['name'], $group['name']); } } } @@ -129,11 +129,11 @@ function can_delete_disable_gateway_item($id, $disable = false) { if ($route['gateway'] == $a_gateways[$id]['name']) { if (!$disable) { // The user wants to delete this gateway, but there is a static route (enabled or disabled) that refers to the gateway. - $input_errors[] = sprintf(gettext("Gateway '%s' cannot be deleted because it is in use on Static Route '%s'"), $a_gateways[$id]['name'], $route['network']); + $input_errors[] = sprintf(gettext('Gateway "%1$s" cannot be deleted because it is in use on Static Route "%2$s"'), $a_gateways[$id]['name'], $route['network']); } else if (!isset($route['disabled'])) { // The user wants to disable this gateway. // But there is a static route that uses this gateway and is enabled (not disabled). - $input_errors[] = sprintf(gettext("Gateway '%s' cannot be disabled because it is in use on Static Route '%s'"), $a_gateways[$id]['name'], $route['network']); + $input_errors[] = sprintf(gettext('Gateway "%1$s" cannot be disabled because it is in use on Static Route "%2$s"'), $a_gateways[$id]['name'], $route['network']); } } } @@ -208,7 +208,7 @@ if (isset($_POST['del_x'])) { $items_deleted .= "{$rulei} "; } if (!empty($items_deleted)) { - write_config("Gateways: removed gateways {$items_deleted}"); + write_config(sprintf(gettext("Gateways: removed gateways %s", $items_deleted))); mark_subsystem_dirty('staticroutes'); } header("Location: system_gateways.php"); diff --git a/src/usr/local/www/system_gateways_edit.php b/src/usr/local/www/system_gateways_edit.php index 7c71408..a926190 100644 --- a/src/usr/local/www/system_gateways_edit.php +++ b/src/usr/local/www/system_gateways_edit.php @@ -117,6 +117,7 @@ if (isset($id) && $a_gateways[$id]) { $pconfig['losshigh'] = $a_gateways[$id]['losshigh']; $pconfig['monitor'] = $a_gateways[$id]['monitor']; $pconfig['monitor_disable'] = isset($a_gateways[$id]['monitor_disable']); + $pconfig['data_payload'] = $a_gateways[$id]['data_payload']; $pconfig['nonlocalgateway'] = isset($a_gateways[$id]['nonlocalgateway']); $pconfig['descr'] = $a_gateways[$id]['descr']; $pconfig['attribute'] = $a_gateways[$id]['attribute']; @@ -155,7 +156,7 @@ if ($_POST) { foreach ($group['item'] as $item) { $items = explode("|", $item); if ($items[0] == $_POST['name']) { - $input_errors[] = sprintf(gettext("Gateway '%s' cannot be disabled because it is in use on Gateway Group '%s'"), $_POST['name'], $group['name']); + $input_errors[] = sprintf(gettext('Gateway "%1$s" cannot be disabled because it is in use on Gateway Group "%2$s"'), $_POST['name'], $group['name']); } } } @@ -167,7 +168,7 @@ if ($_POST) { if ($route['gateway'] == $_POST['name']) { if (!isset($route['disabled'])) { // There is a static route that uses this gateway and is enabled (not disabled). - $input_errors[] = sprintf(gettext("Gateway '%s' cannot be disabled because it is in use on Static Route '%s'"), $_POST['name'], $route['network']); + $input_errors[] = sprintf(gettext('Gateway "%1$s" cannot be disabled because it is in use on Static Route "%2$s"'), $_POST['name'], $route['network']); } } } @@ -256,22 +257,25 @@ if ($_POST) { if (($_POST['monitor'] != "") && !is_ipaddr($_POST['monitor']) && $_POST['monitor'] != "dynamic") { $input_errors[] = gettext("A valid monitor IP address must be specified."); } + if (isset($_POST['data_payload']) && is_numeric($_POST['data_payload']) && $_POST['data_payload'] < 0) { + $input_errors[] = gettext("A valid data payload must be specified."); + } /* only allow correct IPv4 and IPv6 gateway addresses */ if (($_POST['gateway'] <> "") && is_ipaddr($_POST['gateway']) && $_POST['gateway'] != "dynamic") { if (is_ipaddrv6($_POST['gateway']) && ($_POST['ipprotocol'] == "inet")) { - $input_errors[] = gettext("The IPv6 gateway address '{$_POST['gateway']}' can not be used as a IPv4 gateway'."); + $input_errors[] = sprintf(gettext("The IPv6 gateway address '%s' can not be used as a IPv4 gateway."), $_POST['gateway']); } if (is_ipaddrv4($_POST['gateway']) && ($_POST['ipprotocol'] == "inet6")) { - $input_errors[] = gettext("The IPv4 gateway address '{$_POST['gateway']}' can not be used as a IPv6 gateway'."); + $input_errors[] = sprintf(gettext("The IPv4 gateway address '%s' can not be used as a IPv6 gateway."), $_POST['gateway']); } } /* only allow correct IPv4 and IPv6 monitor addresses */ if (($_POST['monitor'] <> "") && is_ipaddr($_POST['monitor']) && $_POST['monitor'] != "dynamic") { if (is_ipaddrv6($_POST['monitor']) && ($_POST['ipprotocol'] == "inet")) { - $input_errors[] = gettext("The IPv6 monitor address '{$_POST['monitor']}' can not be used on a IPv4 gateway'."); + $input_errors[] = sprintf(gettext("The IPv6 monitor address '%s' can not be used on a IPv4 gateway."), $_POST['monitor']); } if (is_ipaddrv4($_POST['monitor']) && ($_POST['ipprotocol'] == "inet6")) { - $input_errors[] = gettext("The IPv4 monitor address '{$_POST['monitor']}' can not be used on a IPv6 gateway'."); + $input_errors[] = sprintf(gettext("The IPv4 monitor address '%s' can not be used on a IPv6 gateway."), $_POST['monitor']); } } @@ -415,16 +419,16 @@ if ($_POST) { } else if ($_POST['latencyhigh']) { if (is_numeric($_POST['latencyhigh']) && ($_POST['latencyhigh'] > $dpinger_default['loss_interval'])) { - $input_errors[] = gettext(sprintf( - "The high latency threshold needs to be less than or equal to the default loss interval (%d)", - $dpinger_default['loss_interval'])); + $input_errors[] = sprintf( + gettext("The high latency threshold needs to be less than or equal to the default loss interval (%d)"), + $dpinger_default['loss_interval']); } } else if ($_POST['loss_interval']) { if (is_numeric($_POST['loss_interval']) && ($_POST['loss_interval'] < $dpinger_default['latencyhigh'])) { - $input_errors[] = gettext(sprintf( - "The loss interval needs to be greater than or equal to the default high latency threshold (%d)", - $dpinger_default['latencyhigh'])); + $input_errors[] = sprintf( + gettext("The loss interval needs to be greater than or equal to the default high latency threshold (%d)"), + $dpinger_default['latencyhigh']); } } @@ -447,16 +451,16 @@ if ($_POST) { } else if ($_POST['interval']) { if (is_numeric($_POST['interval']) && (($_POST['interval'] * 2) > $dpinger_default['time_period'])) { - $input_errors[] = gettext(sprintf( - "The probe interval needs to be half or less than the default time period over which results are averaged (%d)", - $dpinger_default['time_period'])); + $input_errors[] = sprintf( + gettext("The probe interval needs to be half or less than the default time period over which results are averaged (%d)"), + $dpinger_default['time_period']); } } else if ($_POST['time_period']) { if (is_numeric($_POST['time_period']) && ($_POST['time_period'] < ($dpinger_default['interval'] * 2))) { - $input_errors[] = gettext(sprintf( - "The time period over which results are averaged needs to be at least twice the default probe interval (%d)", - $dpinger_default['interval'])); + $input_errors[] = sprintf( + gettext("The time period over which results are averaged needs to be at least twice the default probe interval (%d)"), + $dpinger_default['interval']); } } @@ -479,16 +483,16 @@ if ($_POST) { } else if ($_POST['interval']) { if (is_numeric($_POST['interval']) && ($_POST['interval'] > $dpinger_default['alert_interval'])) { - $input_errors[] = gettext(sprintf( - "The probe interval needs to be less than or equal to the default alert interval (%d)", - $dpinger_default['alert_interval'])); + $input_errors[] = sprintf( + gettext("The probe interval needs to be less than or equal to the default alert interval (%d)"), + $dpinger_default['alert_interval']); } } else if ($_POST['alert_interval']) { if (is_numeric($_POST['alert_interval']) && ($_POST['alert_interval'] < $dpinger_default['interval'])) { - $input_errors[] = gettext(sprintf( - "The alert interval needs to be greater than or equal to the default probe interval (%d)", - $dpinger_default['interval'])); + $input_errors[] = sprintf( + gettext("The alert interval needs to be greater than or equal to the default probe interval (%d)"), + $dpinger_default['interval']); } } @@ -533,6 +537,9 @@ if ($_POST) { if (is_ipaddr($_POST['monitor'])) { $gateway['monitor'] = $_POST['monitor']; } + if (isset($_POST['data_payload']) && $_POST['data_payload'] > 0) { + $gateway['data_payload'] = $_POST['data_payload']; + } /* NOTE: If gateway ip is changed need to cleanup the old static interface route */ if ($_POST['monitor'] != "dynamic" && !empty($a_gateway_item[$realid]) && is_ipaddr($a_gateway_item[$realid]['gateway']) && @@ -762,7 +769,7 @@ $section->addInput(new Form_Input( // If any of the advanced options are non-default, we will not show the "Advanced" button // and will display the advanced section if (!(!empty($pconfig['latencylow']) || !empty($pconfig['latencyhigh']) || - !empty($pconfig['losslow']) || !empty($pconfig['losshigh']) || + !empty($pconfig['losslow']) || !empty($pconfig['losshigh']) || !empty($pconfig['data_payload']) || (isset($pconfig['weight']) && $pconfig['weight'] > 1) || (isset($pconfig['interval']) && !($pconfig['interval'] == $dpinger_default['interval'])) || (isset($pconfig['loss_interval']) && !($pconfig['loss_interval'] == $dpinger_default['loss_interval'])) || @@ -802,6 +809,14 @@ $section->addInput(new Form_Select( array_combine(range(1, 5), range(1, 5)) ))->setHelp('Weight for this gateway when used in a Gateway Group.'); +$section->addInput(new Form_Input( + 'data_payload', + 'Data Payload', + 'number', + $pconfig['data_payload'], + ['placeholder' => $dpinger_default['data_payload']] +))->setHelp('Define data payload to send on ICMP packets to gateway monitor IP.'); + $group = new Form_Group('Latency thresholds'); $group->add(new Form_Input( 'latencylow', @@ -893,7 +908,7 @@ $group->setHelp('Time interval in milliseconds between checking for an alert con $section->add($group); $section->addInput(new Form_StaticText( - 'Additional information', + gettext('Additional information'), '<span class="help-block">'. gettext('The time period over which results are averaged must be at least twice ' . 'the probe interval, otherwise the averaging would only "average" over a single probe.') . diff --git a/src/usr/local/www/system_groupmanager_addprivs.php b/src/usr/local/www/system_groupmanager_addprivs.php index 6819e39..e1ae561 100644 --- a/src/usr/local/www/system_groupmanager_addprivs.php +++ b/src/usr/local/www/system_groupmanager_addprivs.php @@ -207,8 +207,46 @@ $section->addInput(new Form_Select( $a_group['priv'], build_priv_list(), true -))->addClass('multiselect')->setHelp('Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items.')->setAttribute('style', 'height:400px;'); +))->addClass('multiselect') + ->setHelp('Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items.'); +$section->addInput(new Form_Select( + 'shadow', + 'Shadow', + null, + build_priv_list(), + true +))->addClass('shadowselect') + ->setHelp('Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items'); + +$section->addInput(new Form_Input( + 'filtertxt', + 'Filter', + 'text', + null +))->setHelp('Show only the choices containing this term'); + +$btnfilter = new Form_Button( + 'btnfilter', + 'Filter', + null, + 'fa-filter' +); + +$btnfilter->addClass('btn btn-info'); + +$form->addGlobal($btnfilter); + +$btnclear = new Form_Button( + 'btnclear', + 'Clear', + null, + 'fa-times' +); + +$btnclear->addClass('btn btn-warning'); + +$form->addGlobal($btnclear); $form->add($section); print $form; @@ -240,12 +278,87 @@ events.push(function() { echo $jdescs; } ?> + $('.shadowselect').parent().parent('div').addClass('hidden'); + // Set the number of options to display $('.multiselect').attr("size","20"); + $('.shadowselect').attr("size","20"); // When the 'sysprivs" selector is clicked, we display a description $('.multiselect').click(function() { - $('#pdesc').html('<span style="color: green;">' + descs[$(this).children('option:selected').index()] + '</span>'); + $('#pdesc').html('<span class="text-info">' + descs[$(this).children('option:selected').index()] + '</span>'); + + // and update the shadow list from the real list + $(".multiselect option").each(function() { + shadowoption = $('.shadowselect option').filter('[value=' + $(this).val() + ']'); + + if ($(this).is(':selected')) { + shadowoption.prop("selected", true); + } else { + shadowoption.prop("selected", false); + } + }); + }); + + $('#btnfilter').prop('type', 'button'); + + $('#btnfilter').click(function() { + searchterm = $('#filtertxt').val().toLowerCase(); + copyselect(true); + + // Then filter + $(".multiselect > option").each(function() { + if (this.text.toLowerCase().indexOf(searchterm) == -1 ) { + $(this).remove(); + } + }); + }); + + $('#btnclear').prop('type', 'button'); + + $('#btnclear').click(function() { + // Copy all options from shadow to sysprivs + copyselect(true) + + $('#filtertxt').val(''); + }); + + $('#filtertxt').keypress(function(e) { + if(e.which == 13) { + e.preventDefault(); + $('#btnfilter').trigger('click'); + } + }); + + // On submit unhide all options (or else they will not submit) + $('form').submit(function() { + + $(".multiselect > option").each(function() { + $(this).show(); + }); + + $('.shadowselect').remove(); + }); + + function copyselect(selected) { + // Copy all optionsfrom shadow to sysprivs + $('.multiselect').html($('.shadowselect').html()); + + if (selected) { + // Update the shadow list from the real list + $(".shadowselect option").each(function() { + multioption = $('.multiselect option').filter('[value=' + $(this).val() + ']'); + if ($(this).is(':selected')) { + multioption.prop("selected", true); + } else { + multioption.prop("selected", false); + } + }); + } + } + + $('.multiselect').mouseup(function () { + $('.multiselect').trigger('click'); }); }); //]]> diff --git a/src/usr/local/www/system_hasync.php b/src/usr/local/www/system_hasync.php index 6104d5c..f078910 100755 --- a/src/usr/local/www/system_hasync.php +++ b/src/usr/local/www/system_hasync.php @@ -108,6 +108,12 @@ if ($_POST) { $input_errors[] = gettext("Password and confirmation must match."); } + if ($pconfig['pfsyncpeerip'] != "") { + if (!is_ipaddrv4($pconfig['pfsyncpeerip'])) { + $input_errors[] = gettext("pfsync Synchronize Peer IP must be an IPv4 IP."); + } + } + if (!$input_errors) { write_config("Updated High Availability Sync configuration"); interfaces_sync_setup(); diff --git a/src/usr/local/www/system_routes.php b/src/usr/local/www/system_routes.php index 0c4fcbd..496e9d4 100644 --- a/src/usr/local/www/system_routes.php +++ b/src/usr/local/www/system_routes.php @@ -140,7 +140,7 @@ function delete_static_route($id) { if ($_GET['act'] == "del") { if ($a_routes[$_GET['id']]) { - $changedesc = $changedesc_prefix . gettext("removed route to") . " " . $a_routes[$_GET['id']]['network']; + $changedesc = $changedesc_prefix . sprintf(gettext("removed route to %s"), $a_routes[$_GET['id']]['network']); delete_static_route($_GET['id']); unset($a_routes[$_GET['id']]); write_config($changedesc); @@ -152,12 +152,13 @@ if ($_GET['act'] == "del") { if (isset($_POST['del_x'])) { /* delete selected routes */ if (is_array($_POST['route']) && count($_POST['route'])) { - $changedesc = $changedesc_prefix . gettext("removed route to"); + $deleted_routes = ""; foreach ($_POST['route'] as $routei) { - $changedesc .= " " . $a_routes[$routei]['network']; + $deleted_routes .= " " . $a_routes[$routei]['network']; delete_static_route($routei); unset($a_routes[$routei]); } + $changedesc = $changedesc_prefix . sprintf(gettext("removed route to%s"), $deleted_routes); write_config($changedesc); header("Location: system_routes.php"); exit; @@ -170,15 +171,15 @@ if (isset($_POST['del_x'])) { // Do not enable a route whose gateway is disabled if (isset($a_gateways[$a_routes[$_GET['id']]['gateway']]['disabled'])) { $do_update_config = false; - $input_errors[] = $changedesc_prefix . gettext("gateway is disabled, cannot enable route to") . " " . $a_routes[$_GET['id']]['network']; + $input_errors[] = $changedesc_prefix . sprintf(gettext("gateway is disabled, cannot enable route to %s"), $a_routes[$_GET['id']]['network']); } else { unset($a_routes[$_GET['id']]['disabled']); - $changedesc = $changedesc_prefix . gettext("enabled route to") . " " . $a_routes[$_GET['id']]['network']; + $changedesc = $changedesc_prefix . sprintf(gettext("enabled route to %s"), $a_routes[$_GET['id']]['network']); } } else { delete_static_route($_GET['id']); $a_routes[$_GET['id']]['disabled'] = true; - $changedesc = $changedesc_prefix . gettext("disabled route to") . " " . $a_routes[$_GET['id']]['network']; + $changedesc = $changedesc_prefix . sprintf(gettext("disabled route to %s"), $a_routes[$_GET['id']]['network']); } if ($do_update_config) { diff --git a/src/usr/local/www/system_routes_edit.php b/src/usr/local/www/system_routes_edit.php index 0e81be8..d9ac2c6 100644 --- a/src/usr/local/www/system_routes_edit.php +++ b/src/usr/local/www/system_routes_edit.php @@ -130,7 +130,7 @@ if ($_POST) { } 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)) { - $input_errors[] = gettext("The gateway '{$a_gateways[$_POST['gateway']]['gateway']}' is a different Address Family than network '{$_POST['network']}'."); + $input_errors[] = sprintf(gettext('The gateway "%1$s" is a different Address Family than network "%2$s".'), $a_gateways[$_POST['gateway']]['gateway'], $_POST['network']); } } } diff --git a/src/usr/local/www/system_update_settings.php b/src/usr/local/www/system_update_settings.php index 4133234..96b7c6d 100644 --- a/src/usr/local/www/system_update_settings.php +++ b/src/usr/local/www/system_update_settings.php @@ -126,7 +126,7 @@ $section->addInput(new Form_Select( fwbranch, 'Branch', (is_pkg_installed($g['product_name'] . "-repo")) ? "stable":"development", - ["stable" => "Stable", "development" => "Development"] + ["stable" => gettext("Stable"), "development" => gettext("Development")] ))->setHelp('Please select the stable, or the development branch from which to update the system firmware. ' . ' <br />' . 'Use of the development version is at your own risk!'); diff --git a/src/usr/local/www/system_usermanager_addprivs.php b/src/usr/local/www/system_usermanager_addprivs.php index 69860ba..3b7703b 100644 --- a/src/usr/local/www/system_usermanager_addprivs.php +++ b/src/usr/local/www/system_usermanager_addprivs.php @@ -93,6 +93,7 @@ $spriv_list = $priv_list; uasort($spriv_list, admusercmp); if ($_POST) { + conf_mount_rw(); unset($input_errors); @@ -184,7 +185,46 @@ $section->addInput(new Form_Select( null, build_priv_list(), true -))->addClass('multiselect')->setHelp('Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items')->setAttribute('style', 'height:400px;'); +))->addClass('multiselect') + ->setHelp('Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items'); + +$section->addInput(new Form_Select( + 'shadow', + 'Shadow', + null, + build_priv_list(), + true +))->addClass('shadowselect') + ->setHelp('Hold down CTRL (PC)/COMMAND (Mac) key to select multiple items'); + +$section->addInput(new Form_Input( + 'filtertxt', + 'Filter', + 'text', + null +))->setHelp('Show only the choices containing this term'); + +$btnfilter = new Form_Button( + 'btnfilter', + 'Filter', + null, + 'fa-filter' +); + +$btnfilter->addClass('btn btn-info'); + +$form->addGlobal($btnfilter); + +$btnclear = new Form_Button( + 'btnclear', + 'Clear', + null, + 'fa-times' +); + +$btnclear->addClass('btn btn-warning'); + +$form->addGlobal($btnclear); if (isset($userid)) { $section->addInput(new Form_Input( @@ -208,6 +248,7 @@ events.push(function() { <?php + // Build a list of privilege descriptions if (is_array($spriv_list)) { $id = 0; @@ -225,12 +266,88 @@ events.push(function() { echo $jdescs; } ?> + + $('.shadowselect').parent().parent('div').addClass('hidden'); + // Set the number of options to display $('.multiselect').attr("size","20"); + $('.shadowselect').attr("size","20"); // When the 'sysprivs" selector is clicked, we display a description $('.multiselect').click(function() { - $('#pdesc').html('<span style="color: green;">' + descs[$(this).children('option:selected').index()] + '</span>'); + $('#pdesc').html('<span class="text-info">' + descs[$(this).children('option:selected').index()] + '</span>'); + + // and update the shadow list from the real list + $(".multiselect option").each(function() { + shadowoption = $('.shadowselect option').filter('[value=' + $(this).val() + ']'); + + if ($(this).is(':selected')) { + shadowoption.prop("selected", true); + } else { + shadowoption.prop("selected", false); + } + }); + }); + + $('#btnfilter').prop('type', 'button'); + + $('#btnfilter').click(function() { + searchterm = $('#filtertxt').val().toLowerCase(); + copyselect(true); + + // Then filter + $(".multiselect > option").each(function() { + if (this.text.toLowerCase().indexOf(searchterm) == -1 ) { + $(this).remove(); + } + }); + }); + + $('#btnclear').prop('type', 'button'); + + $('#btnclear').click(function() { + // Copy all options from shadow to sysprivs + copyselect(true) + + $('#filtertxt').val(''); + }); + + $('#filtertxt').keypress(function(e) { + if(e.which == 13) { + e.preventDefault(); + $('#btnfilter').trigger('click'); + } + }); + + // On submit unhide all options (or else they will not submit) + $('form').submit(function() { + + $(".multiselect > option").each(function() { + $(this).show(); + }); + + $('.shadowselect').remove(); + }); + + function copyselect(selected) { + // Copy all optionsfrom shadow to sysprivs + $('.multiselect').html($('.shadowselect').html()); + + if (selected) { + // Update the shadow list from the real list + $(".shadowselect option").each(function() { + multioption = $('.multiselect option').filter('[value=' + $(this).val() + ']'); + if ($(this).is(':selected')) { + multioption.prop("selected", true); + } else { + multioption.prop("selected", false); + } + }); + } + } + + $('.multiselect').mouseup(function () { + $('.multiselect').trigger('click'); }); }); //]]> diff --git a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php index a875526..c8de7df 100644 --- a/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php +++ b/src/usr/local/www/widgets/widgets/dyn_dns_status.widget.php @@ -65,24 +65,48 @@ if (!is_array($config['dyndnses']['dyndns'])) { $config['dyndnses']['dyndns'] = array(); } -$a_dyndns = &$config['dyndnses']['dyndns']; +$a_dyndns = $config['dyndnses']['dyndns']; + +if (!is_array($config['dnsupdates']['dnsupdate'])) { + $config['dnsupdates']['dnsupdate'] = array(); +} + +$a_rfc2136 = $config['dnsupdates']['dnsupdate']; + +$all_dyndns = array_merge($a_dyndns, $a_rfc2136); if ($_REQUEST['getdyndnsstatus']) { $first_entry = true; - foreach ($a_dyndns as $dyndns) { + foreach ($all_dyndns as $dyndns) { if ($first_entry) { $first_entry = false; } else { // Put a vertical bar delimiter between the echoed HTML for each entry processed. echo "|"; } + $cache_sep = ":"; + if ($dyndns['type'] == "namecheap") { + $hostname = $dyndns['host'] . "." . $dyndns['domainname']; + } elseif (empty($dyndns['type'])) { + /* RFC2136, add some dummy values */ + $dyndns['type'] = '_rfc2136_'; + $dyndns['id'] = '_' . $dyndns['server']; + $hostname = $dyndns['host']; + $cache_sep = "|"; + } else { + $hostname = $dyndns['host']; + } - $filename = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($dyndns['host']) . "{$dyndns['id']}.cache"; + $filename = "{$g['conf_path']}/dyndns_{$dyndns['interface']}{$dyndns['type']}" . escapeshellarg($hostname) . "{$dyndns['id']}.cache"; if (file_exists($filename)) { - $ipaddr = dyndnsCheckIP($dyndns['interface']); - $cached_ip_s = explode(':', file_get_contents($filename)); + if (($dyndns['type'] == '_rfc2136_') && (!isset($dyndns['usepublicip']))) { + $ipaddr = get_interface_ip(get_failover_interface($dyndns['interface'])); + } else { + $ipaddr = dyndnsCheckIP($dyndns['interface']); + } + $cached_ip_s = explode($cache_sep, file_get_contents($filename)); $cached_ip = $cached_ip_s[0]; - if ($ipaddr <> $cached_ip) { + if (trim($ipaddr) != trim($cached_ip)) { print('<span class="text-danger">'); } else { print('<span class="text-success">'); @@ -108,7 +132,18 @@ if ($_REQUEST['getdyndnsstatus']) { </tr> </thead> <tbody> - <?php $dyndnsid = 0; foreach ($a_dyndns as $dyndns): ?> + <?php $dyndnsid = 0; foreach ($all_dyndns as $dyndns): + + if ($dyndns['type'] == "namecheap") { + $hostname = $dyndns['host'] . "." . $dyndns['domainname']; + } elseif (empty($dyndns['type'])) { + /* RFC2136, add some dummy values */ + $dyndns['type'] = '_rfc2136_'; + $dyndns['id'] = '_' . $dyndns['server']; + $hostname = $dyndns['host']; + } else { + $hostname = $dyndns['host']; + } ?> <tr ondblclick="document.location='services_dyndns_edit.php?id=<?=$dyndnsid;?>'"<?=!isset($dyndns['enable'])?' class="disabled"':''?>> <td> <?php $iflist = get_configured_interface_with_descr(); @@ -137,11 +172,14 @@ if ($_REQUEST['getdyndnsstatus']) { break; } } + if ($dyndns['type'] == '_rfc2136_') : ?> + RFC 2136 + <? endif; ?> </td> <td> <?php - print(htmlspecialchars($dyndns['host'])); + print(htmlspecialchars($hostname)); ?> </td> <td> diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh index 87d101d..5297d17 100755 --- a/tools/build_snapshots.sh +++ b/tools/build_snapshots.sh @@ -185,7 +185,7 @@ while [ /bin/true ]; do snapshot_update_status "${LINE}" done - (${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --flash-size '1g 2g 4g' \ + (${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --flash-size '2g 4g' \ --snapshots 2>&1) | while read -r LINE; do snapshot_update_status "${LINE}" done diff --git a/tools/builder_common.sh b/tools/builder_common.sh index 7b81bdc..82f1420 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -490,9 +490,6 @@ nanobsd_set_flash_details () { # NB: notice math error in SDCFJ-4096-388 line. # case "${a1}" in - 1024|1024m|1024mb|1g) - NANO_MEDIASIZE=$((997129216/512)) - ;; 2048|2048m|2048mb|2g) NANO_MEDIASIZE=$((1989999616/512)) ;; diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh index eb0e173..70ee8d0 100644 --- a/tools/builder_defaults.sh +++ b/tools/builder_defaults.sh @@ -224,7 +224,7 @@ export NANO_IMAGES=2 # 1 -> Initialize second image with a copy of the first export NANO_INIT_IMG2=1 export NANO_NEWFS="-b 4096 -f 512 -i 8192 -O1" -export FLASH_SIZE=${FLASH_SIZE:-"1g"} +export FLASH_SIZE=${FLASH_SIZE:-"2g"} # Size of code file system in 512 bytes sectors # If zero, size will be as large as possible. export NANO_CODESIZE=0 diff --git a/tools/conf/pfPorts/make.conf b/tools/conf/pfPorts/make.conf index 3ad0f7d..9dd38c2 100644 --- a/tools/conf/pfPorts/make.conf +++ b/tools/conf/pfPorts/make.conf @@ -19,8 +19,7 @@ net_relayd_SET_FORCE= LIBEVENT_STATIC databases_rrdtool12_UNSET_FORCE= PERL -databases_rrdtool_UNSET_FORCE= PERL_MODULE GRAPH -databases_rrdtool_SET_FORCE= JSON +databases_rrdtool_UNSET_FORCE= PYTHON_MODULE RUBY_MODULE PERL_MODULE DEJAVU GRAPH security_snortsam_UNSET_FORCE= IPFW @@ -34,6 +33,8 @@ security_strongswan_UNSET_FORCE= EAPAKA3GPP2 BUILTIN LIBC SMP security_xinetd_UNSET_FORCE= XCONV +sysutils_flashrom_UNSET_FORCE= FTDI BUSPIRATE + dns_unbound_SET_FORCE= LIBEVENT net_libzmq4_UNSET_FORCE=PGM diff --git a/tools/conf/pfPorts/poudriere_bulk b/tools/conf/pfPorts/poudriere_bulk index 2ef4305..ce6364e 100644 --- a/tools/conf/pfPorts/poudriere_bulk +++ b/tools/conf/pfPorts/poudriere_bulk @@ -1,3 +1,4 @@ +sysutils/flashrom databases/php56-mysql databases/php56-mysqli databases/php56-pdo_mysql |