X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=langs%2Fen%2Fcgi-bin%2Fen.pl;h=5e47e5c2a28d6dadedcf210c05996b239e1ce66a;hp=f03ea376a6bed9b02895053e01323ac61d4bdfcd;hb=f536ab266173dd7d6ec5ddd984e0a458c1aedbc2;hpb=0037264780e516ef1cd85c1a73b178097b3201d6

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index f03ea376a..5e47e5c2a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -73,12 +73,12 @@
 'activate user' => 'Activate user',
 'active' => 'Active',
 'add' => 'Add',
-'add a host' => 'Add a host:',
+'add a host' => 'Add a host',
 'add a new rule' => 'Add a new rule:',
 'add cron' => 'add cronjob',
 'add device' => 'Add device',
 'add network' => 'Add network',
-'add new alias' => 'Add a new alias:',
+'add new alias' => 'Add a new alias',
 'add new lease' => 'Add a new fixed lease',
 'add new ovpn' => 'OpenVPN Settings:',
 'add printer' => 'Add printer',
@@ -89,6 +89,7 @@
 'add xtaccess' => 'Add External Access',
 'add-route' => 'Additional push route',
 'added from dhcp lease list' => 'Added from DHCP lease list',
+'addons' => 'Addons',
 'admin user password has been changed' => 'Admin user password has been changed.',
 'admin users' => 'User with superuser rights',
 'administrator user password' => 'Admin user password:',
@@ -358,7 +359,7 @@
 'april' => 'April',
 'archive not exist' => 'Configuration archive does not exist',
 'are you sure' => 'Are you sure?',
-'arp table entries' => 'ARP Table Entries:',
+'arp table entries' => 'ARP Table Entries',
 'artist' => 'Artist',
 'attemps' => 'Attempts',
 'attention' => 'ATTENTION',
@@ -560,7 +561,7 @@
 'connection' => 'Connection',
 'connection closed' => 'Not connected...',
 'connection debugging' => 'Connection debugging',
-'connection status and controlc' => 'Connection status and control:',
+'connection status and controlc' => 'Connection status and control',
 'connection tracking' => 'iptables Connection Tracking',
 'connection type' => 'Connection Type',
 'connection type is invalid' => 'Connection type is invalid.',
@@ -600,13 +601,13 @@
 'crl' => 'Certificate Revocation List',
 'cron server' => 'CRON Server',
 'current' => 'Current',
-'current aliases' => 'Current aliases:',
+'current aliases' => 'Current aliases',
 'current class' => 'Current class',
 'current devices' => 'Current devices',
 'current dhcp leases on blue' => 'Current DHCP leases on BLUE',
 'current dynamic leases' => 'Current dynamic leases',
 'current fixed leases' => 'Current fixed leases',
-'current hosts' => 'Current hosts:',
+'current hosts' => 'Current hosts',
 'current media' => 'Current media',
 'current ovpn' => 'Active OVPN-Connection:',
 'current playlist' => 'Current Playlist',
@@ -634,6 +635,7 @@
 'ddns noip prefix' => 'To use no-ip in group mode, prefix hostname with <b>%</b>',
 'deactivate' => 'deactivate',
 'deactivate user' => 'deactivate user',
+'dead peer detection' => 'Dead Peer Detection',
 'debugme' => 'Not yet implemented',
 'december' => 'December',
 'deep scan directories' => 'Scan recursive',
@@ -740,11 +742,11 @@
 '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 title' => 'Domain Name System',
-'dnsforward' => 'DNS forwarding',
-'dnsforward add a new entry' => 'Add a new entry:',
+'dnsforward' => 'DNS Forwarding',
+'dnsforward add a new entry' => 'Add a new entry',
 'dnsforward configuration' => 'DNS forward configuration',
-'dnsforward edit an entry' => 'Edit an existing entry:',
-'dnsforward entries' => 'Current entries:',
+'dnsforward edit an entry' => 'Edit an existing entry',
+'dnsforward entries' => 'Current entries',
 'dnsforward forward_server' => 'Nameserver',
 'dnsforward zone' => 'Zone',
 'do not log this port list' => 'Drop this port list just before they are logged (reduces log size)',
@@ -772,7 +774,9 @@
 'download new ruleset' => 'Download new ruleset',
 'download pkcs12 file' => 'Download PKCS12 file',
 'download root certificate' => 'Download root certificate',
-'dpd action' => 'Dead Peer Detection action',
+'dpd action' => 'Action',
+'dpd delay' => 'Delay',
+'dpd timeout' => 'Timeout',
 'driver' => 'Driver',
 'drop action' => 'Default behaviour of (forward) firewall in mode "Blocked"',
 'drop action1' => 'Default behaviour of (outgoing) firewall in mode "Blocked"',
@@ -826,6 +830,7 @@
 'enabledtitle' => 'Enabled',
 'encapsulation' => 'Encapsulation',
 'encrypted' => 'Encrypted',
+'encryption' => 'Encryption:',
 'end address' => 'End address:',
 'enter ack class' => 'Enter the ACK- Class <br /> and then press <i>Save</i>.',
 'enter data' => 'Enter your settings <br /> and then press <i>Save</i>.',
@@ -841,7 +846,7 @@
 'err rs 8 untar' => 'Error untarring archive',
 '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 messages' => 'Error messages',
 'esp encryption' => 'ESP Encryption:',
 'esp grouptype' => 'ESP Grouptype:',
 'esp integrity' => 'ESP Integrity:',
@@ -955,6 +960,7 @@
 'fwdfw dnat' => 'Destination NAT (Port forwarding)',
 'fwdfw dnat error' => 'You have to select a single host for DNAT. Groups or networks are not allowed.',
 'fwdfw dnat porterr' => 'You have to select a single port or portrange (tcp/udp) for NAT',
+'fwdfw dnat porterr2' => 'Cannot use external port (NAT) when no destination port is defined.',
 'fwdfw edit' => 'Edit',
 'fwdfw err nosrc' => 'No source selected.',
 'fwdfw err nosrcip' => 'Please provide a source IP address.',
@@ -982,7 +988,7 @@
 'fwdfw log' => 'Log',
 'fwdfw log rule' => 'Log rule',
 'fwdfw man port' => 'Port(s):',
-'fwdfw menu' => 'Firewall Rules',
+'fwdfw menu' => 'Firewall',
 'fwdfw movedown' => 'Move down',
 'fwdfw moveup' => 'Move up',
 'fwdfw natport used' => 'The given port for NAPT is already in use by an other DNAT rule.',
@@ -1024,13 +1030,12 @@
 'fwdfw wd_tue' => 'Tue',
 'fwdfw wd_wed' => 'Wed',
 'fwdfw xt access' => 'Input',
-'fwhost addgrp' => 'Add new network/host group:',
+'fwhost addgrp' => 'Add new network/host group',
 'fwhost addgrpname' => 'Group name:',
-'fwhost addhost' => 'Add new host:',
-'fwhost addnet' => 'Add new network:',
-'fwhost addrule' => 'Add/edit rule:',
-'fwhost addservice' => 'Add service:',
-'fwhost addservicegrp' => 'Add new service group:',
+'fwhost addhost' => 'Add new host',
+'fwhost addnet' => 'Add new network',
+'fwhost addservice' => 'Add service',
+'fwhost addservicegrp' => 'Add new service group',
 'fwhost any' => 'Any',
 'fwhost attention' => 'ATTENTION',
 'fwhost back' => 'Back',
@@ -1039,11 +1044,11 @@
 'fwhost ccdnet' => 'OpenVPN networks:',
 'fwhost change' => 'Modify',
 'fwhost changeremark' => 'You modified just the remark',
-'fwhost cust addr' => 'Hosts:',
-'fwhost cust grp' => 'Network/Host Groups:',
-'fwhost cust net' => 'Networks:',
-'fwhost cust service' => 'Services:',
-'fwhost cust srvgrp' => 'Service Groups:',
+'fwhost cust addr' => 'Hosts',
+'fwhost cust grp' => 'Network/Host Groups',
+'fwhost cust net' => 'Networks',
+'fwhost cust service' => 'Services',
+'fwhost cust srvgrp' => 'Service Groups',
 'fwhost deleted' => 'Deleted',
 'fwhost empty' => 'No rules defined',
 'fwhost err addr' => 'Invalid IP address or subnet',
@@ -1051,7 +1056,7 @@
 'fwhost err empty' => 'Please fill in all input fields',
 'fwhost err emptytable' => 'No entries in this group',
 'fwhost err groupempty' => 'The selected group is empty',
-'fwhost err grpexist' => 'Group already exists',
+'fwhost err grpexist' => 'A group with the same name already exists',
 'fwhost err hostexist' => 'A host with the same name already exists',
 'fwhost err hostorip' => 'Invalid name or IP address',
 'fwhost err ip' => 'IP address invalid',
@@ -1129,6 +1134,7 @@
 'graph per' => 'per',
 'green' => 'GREEN',
 'green interface' => 'Green Interface',
+'grouptype' => 'Grouptype:',
 'guaranteed bandwith' => 'Guaranteed bandwith',
 'guardian alertfile' => 'Alertfile',
 'guardian configuration' => 'Guardian Configuration',
@@ -1141,8 +1147,8 @@
 'gz with key' => 'Only an encrypted archive can be restored on this machine.',
 'hangup' => 'Disconnect',
 'hangup string' => 'Hangup:',
-'harddisk temperature' => 'Harddisk temperature',
-'harddisk temperature graphs' => 'hdd temperature graphs',
+'harddisk temperature' => 'Harddisk Temperature',
+'harddisk temperature graphs' => 'HDD Graphs',
 'hardware graphs' => 'Hardware Graphs',
 'hdd temperature in' => 'Harddisk temperature in',
 'help' => 'Help',
@@ -1163,7 +1169,7 @@
 'hostname not set' => 'Hostname not set.',
 'hosts config added' => 'Hosts config added',
 'hosts config changed' => 'Hosts config changed',
-'hour' => 'hour',
+'hour' => 'Hour',
 'hour-graph' => 'Hour',
 'hours' => 'hours',
 'hours2' => 'Hours',
@@ -1206,6 +1212,7 @@
 'installed' => 'Installed',
 'installed updates' => 'Installed updates:',
 'instant update' => 'Instant Update',
+'integrity' => 'Integrity:',
 'interface' => 'Interface',
 'interfaces' => 'Interfaces',
 'internet' => 'INTERNET',
@@ -1233,6 +1240,8 @@
 'invalid input for dhcp dns' => 'Invalid input for DHCP DNS',
 'invalid input for dhcp domain' => 'Invalid input for DHCP domain',
 'invalid input for dhcp wins' => 'Invalid input for DHCP WINS',
+'invalid input for dpd delay' => 'Invalid input for DPD delay',
+'invalid input for dpd timeout' => 'Invalid input for DPD timeout',
 'invalid input for e-mail address' => 'Invalid input for e-mail address.',
 'invalid input for esp keylife' => 'Invalid input for ESP Keylife',
 'invalid input for hostname' => 'Invalid input for hostname.',
@@ -1289,6 +1298,8 @@
 'ipfire side is invalid' => 'IPFire side is invalid.',
 'ipfires hostname' => 'IPFire\'s Hostname',
 'ipinfo' => 'IP info',
+'ipsec' => 'IPsec',
+'ipsec network' => 'IPsec network',
 'iptable rules' => 'IPTable rules',
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
@@ -1317,6 +1328,7 @@
 'least preferred' => 'least preferred',
 'legend' => 'Legend',
 'length' => 'Length',
+'lifetime' => 'Lifetime:',
 'line' => 'Line',
 'linkq' => 'Link Quality',
 'load printer' => 'Load Printer',
@@ -1329,7 +1341,7 @@
 'local vpn hostname/ip' => 'Local VPN Hostname/IP',
 'localkey' => 'Localkey',
 'localkeyfile' => 'Localkeyfile',
-'log' => 'Log:',
+'log' => 'Log',
 'log enabled' => 'Log Enabled',
 'log level' => 'Log Level',
 'log lines per page' => 'Lines per page',
@@ -1368,11 +1380,11 @@
 'mac address error not valid' => 'MAC addresse not valid!',
 'mac address header' => 'MAC address on red0',
 'mac address in use' => 'MAC address already in use',
-'mac address menu' => 'Assign MAC-address',
+'mac address menu' => 'Assign MAC-Address',
 'mac address recon' => 'Trying to reconnect!',
 'mac address saved' => 'Successfully saved!',
 'mac address saved txt' => 'The MAC address has been successfully saved, but changes will only take effect after reboot or reconnection.',
-'mac address title' => 'Medium Access Control Address',
+'mac address title' => 'Assign MAC Address',
 'mac desc' => 'Here you are able to change the MAC address on red0. The address must be entered in hexadecimal (0-9,a-f), a valid entry is <br />e.g. 00-01-02-0e-b8-d6 or 00:01:02:0e:b8:d6.',
 'mac new' => 'new MAC address:',
 'mac1 new' => 'new MAC address 1 (vdsl-inet):',
@@ -1414,10 +1426,10 @@
 'mbmon volt' => 'Voltage',
 'meaning' => 'meaning',
 'media' => 'Media',
-'media information' => 'media information',
+'media information' => 'Media information',
 'medium' => 'Medium',
 'memory' => 'Memory',
-'memory information' => 'memory information',
+'memory information' => 'Memory information',
 'memory usage per' => 'Memory Usage per',
 'messages logging' => 'Logsettings for /var/log/messages',
 'method' => 'Method:',
@@ -1490,7 +1502,7 @@
 'network red' => 'Network (external)',
 'network removed' => 'Custom network removed',
 'network status information' => 'Network Status Information',
-'network time' => 'Use a network time server:',
+'network time' => 'Use a network time server',
 'network time from' => 'Obtain time from a network time server',
 'network traffic graphs' => 'Network traffic graphs',
 'network traffic graphs external' => 'Net-Traffic graphs (external)',
@@ -1526,7 +1538,7 @@
 'notice' => 'Notice',
 'november' => 'November',
 'ntp common settings' => 'Common settings',
-'ntp configuration' => 'NTP configuration',
+'ntp configuration' => 'NTP Configuration',
 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
 'ntp server' => 'NTP Server',
 'ntp sync' => 'Synchronization',
@@ -1556,6 +1568,7 @@
 'openvpn fragment allowed with udp' => 'Using fragment is only allowed when using the UDP protocol.',
 'openvpn log' => 'OpenVPN Log',
 'openvpn mssfix allowed with udp' => 'Using "mssfix" is only allowed when using the UDP protocol.',
+'openvpn network' => 'OpenVPN networks',
 'openvpn prefix local subnet' => 'Using the prefix notation is not supported for the local subnet. Please enter a subnet mask like 255.255.255.0.',
 'openvpn prefix openvpn subnet' => 'Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.',
 '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.',
@@ -1645,7 +1658,7 @@
 'ovpn_processprioVH' => 'Very high',
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-System-Log',
-'p2p block' => 'P2P block',
+'p2p block' => 'P2P networks',
 'p2p block save notice' => 'Please reload the firewall ruleset in order to apply your changes.',
 'package failed to install' => 'Package failed to install.',
 'pagerefresh' => 'Page is beeing refreshed, please wait.',
@@ -1815,7 +1828,7 @@
 'root user password' => 'Root password',
 'route subnet is invalid' => 'Additional push route subnet is invalid',
 'router ip' => 'Router IP address:',
-'routing table entries' => 'Routing Table Entries:',
+'routing table entries' => 'Routing Table Entries',
 'rsvd dst port overlap' => 'Destination Port Range overlaps a port reserved for IPFire:',
 'rsvd src port overlap' => 'Source Port Range overlaps a port reserved for IPFire:',
 'rules already up to date' => 'Rules already up to date',
@@ -1927,6 +1940,7 @@
 'srcprt range overlaps' => 'Source port range overlaps an already defined port.',
 'srcprt within existing' => 'Source port is within an already defined port range.',
 'ssdmz pinholes' => 'DMZ Pinholes',
+'ssh' => 'SSH',
 'ssh access' => 'SSH Access',
 'ssh access tip' => 'IPFire SSH is not using default port 222!',
 'ssh fingerprint' => 'Fingerprint',
@@ -1958,10 +1972,10 @@
 'start ovpn server' => 'Start OpenVPN Server',
 'state or province' => 'State or Province',
 'static ip' => 'Static IP',
-'static routes' => 'Static routes',
+'static routes' => 'Static Routes',
 'status' => 'Status',
 'status information' => 'Status information',
-'status ovpn' => '4. OpenVPN Status / Configuration:',
+'status ovpn' => 'OpenVPN',
 'std classes' => 'Standardclasses',
 'stop' => 'Stop',
 'stop ovpn server' => 'Stop OpenVPN Server',
@@ -1975,11 +1989,12 @@
 'successfully refreshed updates list' => 'Successfully refreshed updates list.',
 'summaries kept' => 'Keep summaries for',
 'sunday' => 'Sunday',
+'support donation' => 'Support the IPFire project with your donation',
 'swap' => 'Swap',
 'swap usage per' => 'Swap usage per',
 'system' => 'System',
 'system graphs' => 'System Graphs',
-'system information' => 'System information',
+'system information' => 'System Information',
 'system log viewer' => 'System Log Viewer',
 'system logs' => 'System Logs',
 'system status information' => 'System Status Information',
@@ -2091,7 +2106,7 @@
 'trafficorange' => 'DMZ',
 'trafficout' => 'Output',
 'trafficred' => 'Internet',
-'traffics' => 'Utilization-overview:',
+'traffics' => 'Utilization-overview',
 'trafficsum' => 'Totals',
 'trafficto' => 'To',
 'transfer limits' => 'Transfer limits',
@@ -2220,7 +2235,7 @@
 'uptime' => 'Uptime',
 'uptime and users' => 'Uptime and users:',
 'uptime load average' => 'Load average',
-'url filter' => 'Content Filter',
+'url filter' => 'URL Filter',
 'urlfilter access' => 'Access',
 'urlfilter activity detection' => 'Activity detection',
 'urlfilter add new time constraint rule' => 'Add new time constraint rule',
@@ -2456,7 +2471,7 @@
 'vpn aggrmode' => 'IKE aggressive mode allowed. Avoid if possible (preshared key is transmitted in clear text)!',
 'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something',
 'vpn auth-dn' => 'Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field',
-'vpn configuration main' => 'VPN configuration - Main',
+'vpn configuration main' => 'VPN Configuration',
 'vpn delayed start' => 'Delay before launching VPN (seconds)',
 'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',