Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/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 87ffd269a72e2c9822094e0387e697ba8d1382ac..2ba6961f3ae76e1b16c240f428f76be4b4724e3c 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -323,8 +323,6 @@
 'advproxy errmsg wpad invalid ip or mask' => 'WPAD: Invalid IP or subnet for excluded IP subnet',
 'advproxy error design' => 'Error messages design',
 'advproxy error language' => 'Error messages language',
-'advproxy fake referer' => 'Fake referer submitted to external sites',
-'advproxy fake useragent' => 'Fake useragent submitted to external sites',
 'advproxy friday' => 'Fri',
 'advproxy from' => 'From',
 'advproxy group access control' => 'Group based access control',
@@ -354,7 +352,6 @@
 'advproxy off' => 'Proxy off',
 'advproxy offline mode' => 'Enable offline mode',
 'advproxy on' => 'Proxy on',
-'advproxy privacy' => 'Privacy',
 'advproxy proxy port' => 'Proxy port',
 'advproxy proxy port transparent' => 'Transparent port',
 'advproxy ram cache size' => 'Memory cache size (MB)',
@@ -436,7 +433,6 @@
 'and' => 'And',
 'ansi t1.483' => 'TO BE REMOVED',
 'apcupsd' => 'APC-UPS status',
-'application layer gateways' => 'Application Layer Gateways',
 'apply' => 'Apply now',
 'april' => 'April',
 'archive not exist' => 'Configuration archive does not exist',
@@ -452,6 +448,7 @@
 'authentication' => 'Authentication:',
 'automatic' => 'Automatic',
 'autonomous system' => 'Autonomous System',
+'available' => 'available',
 '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',
@@ -1034,7 +1031,6 @@
 'every' => 'Every',
 'exampel' => 'example',
 'exclude logfiles' => 'Exclude logfiles',
-'excluding buffers and cache' => '-/+ buffers/cache',
 'expected' => 'Expected',
 'expertoptions' => 'Expert options',
 'expires' => 'Expires',
@@ -1547,6 +1543,7 @@
 'ipinfo' => 'IP info',
 'ipsec' => 'IPsec',
 'ipsec connection' => 'IPsec Connection',
+'ipsec dns server address is invalid' => 'Invalid DNS server IP address(es)',
 'ipsec interface mode gre' => 'GRE',
 'ipsec interface mode none' => '- None (Default) -',
 'ipsec interface mode vti' => 'VTI',