Merge remote-tracking branch 'origin/master' into next

[people/pmueller/ipfire-2.x.git] / langs / en / cgi-bin / en.pl

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b907eb325ffc4548ccdd4a669f625d65859e9f5b..8e293d5c1e64432ddb60d6ca872c1e3256ab56a7 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -443,6 +443,7 @@
 'are you sure' => 'Are you sure?',
 'arp table entries' => 'ARP Table Entries',
 'artist' => 'Artist',
+'asn lookup failed' => 'AS lookup failed',
 'atm device' => 'Device:',
 'atm settings' => 'ATM settings',
 'attemps' => 'Attempts',
@@ -450,6 +451,7 @@
 'august' => 'August',
 'authentication' => 'Authentication:',
 'automatic' => 'Automatic',
+'autonomous system' => 'Autonomous System',
 'available updates' => 'Available updates:',
 'average' => 'Average',
 'avoid dod' => 'Do not use this option with Dial on Demand! Mainly used if your IPFire is behind a router. Your RED IP must be inside one of the three reserved network numbers e.g. 10/8, 172.16/12, 192.168/16',
@@ -821,6 +823,7 @@
 'dialup settings' => 'Dialup Settings',
 'directory mask' => 'UNIX directory rights',
 'directory writeable' => 'directory writeable',
+'disable' => 'Disable',
 'disabled' => 'disabled',
 'disconnect' => 'OVPN Stop / Disconnect',
 'disconnected' => 'Disconnected',
@@ -850,6 +853,7 @@
 'dns could not add server' => 'Could not add server - Reason:',
 'dns desc' => 'If the red0 interface gets the IP address information via DHCP from the provider, the DNS server addresses will be set automatically. Now here you are able to change these DNS server IP addresses with your own ones.',
 'dns enable safe-search' => 'Enable Safe Search',
+'dns enable safe-search youtube' => 'Include YouTube in Safe Search',
 'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.',
 'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!',
 'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.',
@@ -869,7 +873,6 @@
 'dns recursor mode' => 'Recursor Mode',
 'dns saved' => 'Successfully saved!',
 'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
-'dns server' => 'DNS Server',
 'dns servers' => 'DNS Servers',
 'dns title' => 'Domain Name System',
 'dns tls hostname' => 'TLS Hostname',
@@ -989,6 +992,7 @@
 'emerging rules' => 'Emergingthreats.net Community Rules',
 'empty' => 'This field may be left blank',
 'empty profile' => 'empty',
+'enable' => 'Enable',
 'enable ignore filter' => 'Enable ignore filter',
 'enable javascript' => 'Enable javascript',
 'enable smt' => 'Enable Simultaneous Multi-Threading (SMT)',
@@ -1529,7 +1533,8 @@
 'ip alias added' => 'External IP alias added',
 'ip alias changed' => 'External IP alias changed',
 'ip alias removed' => 'External IP alias removed',
-'ip info' => 'IP Information',
+'ip basic info' => 'Basic IP information',
+'ip info' => 'IP information for',
 'ipfire has now rebooted' => 'IPFire is rebooting now.',
 'ipfire has now shutdown' => 'IPFire is shutting down now.',
 'ipfire side' => 'IPFire side:',
@@ -1621,7 +1626,6 @@
 'logging server' => 'Logging Server',
 'loginlogout' => 'Login/Logout',
 'logs' => 'logs',
-'lookup failed' => 'Reverse lookup failed',
 'loosedirectorychecking' => 'Loosedirectorychecking',
 'low' => 'Low',
 'ls_dhcpd' => 'DHCP Server:',
@@ -2097,6 +2101,7 @@
 'proxy reports weekly' => 'Weekly reports',
 'psk' => 'PSK',
 'ptr' => 'PTR',
+'ptr lookup failed' => 'Reverse lookup failed',
 'pulse' => 'Pulse',
 'pulse dial' => 'Pulse dial:',
 'qos add subclass' => 'Add subclass',
@@ -2181,6 +2186,8 @@
 'samba' => 'Samba',
 'samba join a domain' => 'Join a domain',
 'samba join domain' => 'Join domain',
+'samba server role member' => 'Domain Member',
+'samba server role standalone' => 'Standalone',
 'samba status' => 'Samba Status',
 'saturday' => 'Saturday',
 'save' => 'Save',
@@ -2830,6 +2837,7 @@
 'used swap' => 'Used Swap',
 'user' => 'User',
 'user log' => 'user log',
+'user management' => 'User Management',
 'user proxy logs' => 'user proxy log',
 'username' => 'Username:',
 'username not set' => 'Username not set.',
@@ -2902,6 +2910,7 @@
 'week-graph' => 'Week',
 'weekly firewallhits' => 'weekly firewallhits',
 'weeks' => 'Weeks',
+'whois results from' => 'WHOIS results from',
 'wildcards' => 'Wildcards',
 'winbind daemon' => 'Winbind Daemon',
 'wins server' => 'Wins Server',
@@ -2957,6 +2966,9 @@
 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
 'wlan clients' => 'Wireless clients',
 'wlanap' => 'Access Point',
+'wlanap 802.11w disabled' => 'Disabled',
+'wlanap 802.11w enforced' => 'Enforced',
+'wlanap 802.11w optional' => 'Optional',
 'wlanap auto' => 'Automatic Channel Selection',
 'wlanap broadcast ssid' => 'Broadcast SSID',
 'wlanap channel' => 'Channel',