X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=langs%2Fen%2Fcgi-bin%2Fen.pl;h=d076e184f2a06e8ea90aafc25318973d8a44727c;hb=01c4d3ba0628c57fd908b105d384750f0f20653a;hp=e14c7d82558f0a9fda3d169635bf18c344897fe1;hpb=2a554ea34f7054669b76b26dae27ede826dcda01;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index e14c7d8255..d076e184f2 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -133,6 +133,7 @@
 'accounting' => 'Accounting',
 'accounting user nonpdc' => 'Accounting - none PDC Mode',
 'accounting user pdc' => 'Accounting - PDC Mode',
+'acpitemp' => 'ACPI - Temperatures',
 'action' => 'Action',
 'activate' => 'Activate',
 'activate user' => 'Activate user',
@@ -652,7 +653,7 @@
 'connection closed' => 'Not connected...',
 'connection debugging' => 'Connection debugging',
 'connection status and controlc' => 'Connection Status and -Control',
-'connection tracking' => 'iptables Connection Tracking',
+'connection tracking' => 'Connection Tracking',
 'connection type' => 'Connection Type',
 'connection type is invalid' => 'Connection type is invalid.',
 'connections' => 'Connections',
@@ -678,6 +679,7 @@
 'country' => 'Country',
 'country codes and flags' => 'Country Codes and Flags:',
 'countrycode' => 'Code',
+'cpu frequency' => 'CPU frequency',
 'cpu frequency per' => 'CPU frequency per',
 'cpu idle usage' => 'Idle CPU Usage',
 'cpu interrupt usage' => 'Interrupt CPU Usage',
@@ -754,6 +756,7 @@
 'demon login script' => 'Demon login script',
 'deprecated fs warn' => 'Deprecated filesystem! Newer kernel drop the support. Backup and reformat!',
 'description' => 'Description',
+'desired' => 'Desired',
 'dest ip and port' => 'Dest. IP: Port',
 'destination' => 'Destination',
 'destination ip' => 'Destination IP',
@@ -820,8 +823,9 @@
 'directory writeable' => 'directory writeable',
 'disabled' => 'disabled',
 'disconnect' => 'OVPN Stop / Disconnect',
+'disconnected' => 'Disconnected',
 'disconnects' => 'Disconnects',
-'disk access per' => 'Disk Access per',
+'disk access' => 'Disk Access',
 'disk usage' => 'Disk usage',
 'display' => 'Display',
 'display charset' => 'Display Charset',
@@ -921,7 +925,7 @@
 'drop action2' => 'Default behaviour of (input) firewall',
 'drop forward' => 'Log dropped forward packets',
 'drop input' => 'Log dropped input packets',
-'drop newnotsyn' => 'Log dropped new not syn packets',
+'drop newnotsyn' => 'Log dropped new not SYN packets',
 'drop outgoing' => 'Log dropped outgoing packets',
 'drop portscan' => 'Log dropped portscan packets',
 'drop proxy' => 'Drop all packets not addressed to proxy',
@@ -935,6 +939,7 @@
 'duplicate ip bold' => 'Duplicate addresses are in <b>bold</b>',
 'duplicate mac' => 'Duplicate MAC address entered',
 'duplicate name' => 'That name is already being used, please choose another.',
+'duration' => 'Duration',
 'dyn dns source choice' => 'Dynamic DNS provider(s) will receive an IP address for this IPFire from:',
 'dynamic dns' => 'Dynamic DNS',
 'dynamic dns client' => 'Dynamic DNS Client',
@@ -1013,6 +1018,7 @@
 'error config' => 'Could not open /var/ipfire/ovpn/config/ZERINA.ovpn !',
 'error external access' => 'Could not open /var/ipfire/xtaccess/config (external acccess could not be granted)!',
 'error messages' => 'Error messages',
+'error the to date has to be later than the from date' => 'The to date has to be later than the from date!',
 'esp encryption' => 'ESP Encryption:',
 'esp grouptype' => 'ESP Grouptype:',
 'esp integrity' => 'ESP Integrity:',
@@ -1229,10 +1235,10 @@
 'fwhost OpenVPN static host' => 'OpenVPN static host',
 'fwhost OpenVPN static network' => 'OpenVPN static network',
 'fwhost Standard Network' => 'Standard network',
-'fwhost addgeoipgrp' => 'Add new GeoIP group',
 'fwhost addgrp' => 'Add new network/host group',
 'fwhost addgrpname' => 'Group name:',
 'fwhost addhost' => 'Add new host',
+'fwhost addlocationgrp' => 'Add new Location group',
 'fwhost addnet' => 'Add new network',
 'fwhost addservice' => 'Add service',
 'fwhost addservicegrp' => 'Add new service group',
@@ -1245,10 +1251,10 @@
 'fwhost change' => 'Modify',
 'fwhost changeremark' => 'You modified just the remark',
 'fwhost cust addr' => 'Hosts',
-'fwhost cust geoip' => 'GeoIP Groups',
-'fwhost cust geoipgroup' => 'GeoIP Groups',
-'fwhost cust geoiplocation' => 'GeoIP Locations',
 'fwhost cust grp' => 'Network/Host Groups',
+'fwhost cust location' => 'Location Groups',
+'fwhost cust locationgroup' => 'Location Groups',
+'fwhost cust locationlocation' => 'Location Locations',
 'fwhost cust net' => 'Networks',
 'fwhost cust service' => 'Services',
 'fwhost cust srvgrp' => 'Service Groups',
@@ -1294,9 +1300,9 @@
 'fwhost ipsec net' => 'IPsec networks:',
 'fwhost menu' => 'Firewall Groups',
 'fwhost netaddress' => 'Network address',
-'fwhost newgeoipgrp' => 'GeoIP Groups',
 'fwhost newgrp' => 'Network/Host Groups',
 'fwhost newhost' => 'Hosts',
+'fwhost newlocationgrp' => 'Location Groups',
 'fwhost newnet' => 'Networks',
 'fwhost newservice' => 'Services',
 'fwhost newservicegrp' => 'Service Groups',
@@ -1332,16 +1338,6 @@
 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time.  It can take up to several minutes on older hardware. Please be patient.',
 'genkey' => 'Generate PSK',
 'genre' => 'Genre',
-'geoip' => 'GeoIP',
-'geoipblock' => 'GeoIP Block',
-'geoipblock block countries' => 'Block countries',
-'geoipblock configuration' => 'GeoIP Configuration',
-'geoipblock country code' => 'Country Code',
-'geoipblock country is allowed' => 'Incoming traffic from this country is allowed',
-'geoipblock country is blocked' => 'Incoming traffic from this country will be blocked',
-'geoipblock country name' => 'Country Name',
-'geoipblock enable feature' => 'Enable GeoIP based blocking:',
-'geoipblock flag' => 'Flag',
 'global settings' => 'Global Settings',
 'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
 'gpl license agreement' => 'License Agreement',
@@ -1487,7 +1483,7 @@
 'invalid input for keepalive 1:2' => 'Invalid input for Keepalive use at least a ratio of 1:2',
 'invalid input for keepalive 2' => 'Invalid input for Keepalive ping-restart',
 'invalid input for local ip address' => 'Invalid input for local IP address',
-'invalid input for max clients' => 'Invalid input for Max Clients',
+'invalid input for max clients' => 'Invalid input for Max Clients. The maximum of 1024 clients has been exceeded',
 'invalid input for mode' => 'Invalid input for mode',
 'invalid input for name' => 'Invalid input for user\'s full name or system hostname',
 'invalid input for oink code' => 'Invalid input for Oink code',
@@ -1579,6 +1575,7 @@
 'lateprompting' => 'Lateprompting',
 'lease expires' => 'Lease expires',
 'least preferred' => 'least preferred',
+'legacy architecture warning' => 'You are running IPFire on a legacy architecture and it is recommended to upgrade',
 'legend' => 'Legend',
 'length' => 'Length',
 'lifetime' => 'Lifetime:',
@@ -1595,6 +1592,16 @@
 'local vpn hostname/ip' => 'Local VPN Hostname/IP',
 'localkey' => 'Localkey',
 'localkeyfile' => 'Localkeyfile',
+'location' => 'Location',
+'locationblock' => 'Location Block',
+'locationblock block countries' => 'Block countries',
+'locationblock configuration' => 'Location Configuration',
+'locationblock country code' => 'Country Code',
+'locationblock country is allowed' => 'Incoming traffic from this country is allowed',
+'locationblock country is blocked' => 'Incoming traffic from this country will be blocked',
+'locationblock country name' => 'Country Name',
+'locationblock enable feature' => 'Enable Location based blocking:',
+'locationblock flag' => 'Flag',
 'log' => 'Log',
 'log enabled' => 'Log Enabled',
 'log level' => 'Log Level',
@@ -1803,6 +1810,7 @@
 'no cfg upload' => 'No data was uploaded',
 'no dhcp lease' => 'No DHCP lease has been acquired',
 'no eciadsl synch.bin file' => 'No ECI ADSL synch.bin file. Please upload.',
+'no entries' => 'No entries at the moment.',
 'no filter pass' => 'Enter the standard class for non-filtered packets.',
 'no fritzdsl driver' => 'No Fritz!DSL driver.  Please upload.',
 'no hardware random number generator' => 'This system has no source for entropy.',
@@ -1852,6 +1860,7 @@
 'only digits allowed in max retries field' => 'Only digits allowed in max retries field.',
 'only digits allowed in the idle timeout' => 'Only digits allowed in the idle timeout.',
 'only red' => 'Only RED',
+'open connections' => 'Open Connections',
 'open to all' => 'Override external access to ALL',
 'openssl produced an error' => 'OpenSSL produced an error',
 'openvpn client' => 'OpenVPN client',
@@ -1868,6 +1877,7 @@
 'openvpn prefix remote subnet' => 'Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.',
 'openvpn server' => 'OpenVPN server',
 'openvpn subnet is used' => 'The given subnet is used by another OpenVPN server.',
+'optional' => 'Optional',
 'optional at cmd' => 'optional AT command',
 'optional data' => '3. Optional Settings:',
 'options' => 'Options',
@@ -1919,6 +1929,7 @@
 'ovpn add conf' => 'Additional configuration',
 'ovpn con stat' => 'OpenVPN Connection Statistics',
 'ovpn config' => 'OVPN-Config',
+'ovpn connection name' => 'Connection Name',
 'ovpn crypt options' => 'Cryptographic options',
 'ovpn device' => 'OpenVPN device:',
 'ovpn dh' => 'Diffie-Hellman parameters length',
@@ -1950,6 +1961,7 @@
 'ovpn reneg sec' => 'Session key lifetime:',
 'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24',
 'ovpn routes push options' => 'Route push options',
+'ovpn rw connection log' => 'OpenVPN Roadwarrior Connections Log',
 'ovpn server status' => 'Current OpenVPN server status:',
 'ovpn subnet' => 'OpenVPN subnet:',
 'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.',
@@ -1997,6 +2009,7 @@
 'pakfire tree stable' => 'Stable',
 'pakfire tree testing' => 'Testing',
 'pakfire tree unstable' => 'Unstable',
+'pakfire uninstall all' => 'Do you want to uninstall the following packages?',
 'pakfire uninstall description' => 'Please choose one or more items from the list below and <br /> click the minus to uninstall.',
 'pakfire uninstall package' => 'You want to uninstall the following packages: ',
 'pakfire update daily' => 'Search for updates daily:',
@@ -2030,7 +2043,7 @@
 'port' => 'Port',
 'port forwarding configuration' => 'Port forwarding configuration',
 'ports' => 'Ports',
-'portscans' => 'portscancs',
+'portscans' => 'Port Scans',
 'pots' => 'Analog classic line',
 'ppp setup' => 'PPP setup',
 'pppoe' => 'PPPoE',
@@ -2104,6 +2117,7 @@
 'reboot sure' => 'Are you sure that you want to reboot?',
 'rebooting' => 'Rebooting',
 'rebooting ipfire' => 'Rebooting IPFire',
+'received' => 'Received',
 'reconnect' => 'Reconnect',
 'reconnection' => 'Reconnection',
 'red' => 'Internet',
@@ -2133,6 +2147,7 @@
 'reportlevel' => 'Reportlevel',
 'request' => 'Request',
 'requested data' => '1. Connection Settings:',
+'required' => 'Required',
 'required field' => 'Required field',
 'reserved dst port' => 'Destination port is reserved for IPFire use only:',
 'reserved src port' => 'Source port is reserved for IPFire use only:',
@@ -2190,6 +2205,7 @@
 'send cr' => 'ISP requires Carriage Return:',
 'send email notification' => 'Enabled, send e-mail notification',
 'send test mail' => 'Send Teste-mail',
+'sent' => 'Sent',
 'september' => 'September',
 'serial' => 'Serial',
 'server reserved' => 'The connection name server is reserved and not allowed',
@@ -2275,6 +2291,7 @@
 'squid extension methods' => 'Your <tt>extension_methods</tt> list',
 'squid extension methods invalid' => 'Your \'extension_methods\' list can only contain uppercase words of letters and digits, separated with a space. ',
 'squid fix cache' => 'Repair cache',
+'srbds' => 'Special register buffer data sampling',
 'src port' => 'Src Port',
 'srcprt range overlaps' => 'Source port range overlaps an already defined port.',
 'srcprt within existing' => 'Source port is within an already defined port range.',
@@ -2442,7 +2459,7 @@
 'tor traffic limit soft' => 'Traffic limit almost reached. Not accepting any new connections.',
 'tor traffic read written' => 'Total traffic (read/written)',
 'tor use exit nodes' => 'Use only these exit nodes (one per line)',
-'total connection time' => 'Total connection time',
+'total connection time' => 'Total Connection Time',
 'total hits for log section' => 'Total hits for log section',
 'traffic back' => 'Back',
 'traffic calc time' => 'Time of calculation',
@@ -2859,8 +2876,8 @@
 'vpn start action add' => 'Wait for connection initiation',
 'vpn start action route' => 'On Demand',
 'vpn start action start' => 'Always On',
-'vpn statistic n2n' => 'VPN: Net-to-Net Statistics',
-'vpn statistic rw' => 'VPN: Roadwarrior Statistics',
+'vpn statistic n2n' => 'OpenVPN: Net-to-Net Statistics',
+'vpn statistic rw' => 'OpenVPN: Roadwarrior Statistics',
 'vpn subjectaltname' => 'SubjectAlternativeName',
 'vpn subjectaltname missing' => 'SubjectAlternativeName cannot be emtpy.',
 'vpn wait' => 'WAITING',