X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=langs%2Fen%2Fcgi-bin%2Fen.pl;h=925f665282cf8cd72c0e541a3008b37cbeb2e575;hp=af7fda947e2b15c3ace8d0de4c0d28cecdaf660d;hb=c94d1976d3bf2fd760834a0093eeb286a90c8fdd;hpb=4b02b4045b619b207235b34882a000ef088f0df1

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index af7fda947e..925f665282 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -369,6 +369,7 @@
 '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',
@@ -722,6 +723,11 @@
 'dhcp bootp pxe data' => 'Enter optional bootp pxe data for this fixed lease',
 'dhcp configuration' => 'DHCP configuration',
 'dhcp create fixed leases' => 'Create fixed leases',
+'dhcp dns enable update' => 'Enable DNS Update (RFC2136):',
+'dhcp dns key name' => 'Key Name:',
+'dhcp dns update' => 'DNS Update',
+'dhcp dns update algo' => 'Algorithm:',
+'dhcp dns update secret' => 'Secret:',
 'dhcp fixed lease err1' => 'For a fix lease you have to enter the MAC address or the hostname, or you enter both.',
 'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN',
 'dhcp mode' => 'DHCP',
@@ -751,6 +757,7 @@
 'display traffic at home' => 'Display calculated traffic on startpage',
 'display webinterface effects' => 'Activate effects',
 'dl client arch' => 'Download Client Package (zip)',
+'dl client arch insecure' => 'Download insecure Client Package (zip)',
 'dmz' => 'DMZ',
 'dmz pinhole configuration' => 'DMZ pinhole configuration',
 'dmz pinhole rule added' => 'DMZ pinhole rule added; restarting DMZ pinhole',
@@ -785,6 +792,7 @@
 'dnsforward forward_server' => 'Nameserver',
 'dnsforward zone' => 'Zone',
 'dnssec aware' => 'DNSSEC Aware',
+'dnssec disabled warning' => 'WARNING: DNSSEC has been disabled',
 'dnssec information' => 'DNSSEC Information',
 'dnssec not supported' => 'DNSSEC Not supported',
 'dnssec validating' => 'DNSSEC Validating',
@@ -859,7 +867,27 @@
 'edit share' => 'Edit share',
 'editor' => 'Editor',
 'eg' => 'e.g.:',
+'email config' => 'Configuration',
+'email empty field' => 'Empty field',
+'email error' => 'ERROR: Test mail could not be sent',
+'email invalid' => 'Invalid field',
+'email invalid mailfqdn' => 'Invalid mail server fqdn',
+'email invalid mailip' => 'Invalid mail server IP address',
+'email invalid mailport' => 'Invalid mail server port',
+'email mailaddr' => 'Mail Server Address',
+'email mailpass' => 'Password',
+'email mailport' => 'Mail Server Port',
+'email mailrcpt' => 'Mail Recipient',
+'email mailsender' => 'Mail Sender',
+'email mailuser' => 'Username',
 'email server can not be empty' => 'E-mail server can not be empty',
+'email settings' => 'Mail Service',
+'email subject' => 'IPFire Test Mail',
+'email success' => 'Test message successfully sent',
+'email testmail' => 'Send test mail',
+'email text' => 'Test mail from IPFire Mail Service',
+'email tls' => 'Use TLS',
+'email usemail' => 'Activate Mail Service',
 'emailreportlevel' => 'E-mailreportlevel',
 'emerging rules' => 'Emergingthreats.net Community Rules',
 'empty' => 'This field may be left blank',
@@ -1219,12 +1247,7 @@
 'green interface' => 'Green Interface',
 'grouptype' => 'Grouptype:',
 'guaranteed bandwith' => 'Guaranteed bandwith',
-'guardian alertfile' => 'Alertfile',
-'guardian configuration' => 'Guardian Configuration',
-'guardian ignorefile' => 'Ignorefile',
-'guardian interface' => 'Interface',
-'guardian logfile' => 'Logfile',
-'guardian timelimit' => 'Timelimit',
+'guardian' => 'Guardian',
 'guest ok' => 'allow guests to access',
 'gui settings' => 'GUI Settings',
 'gz with key' => 'Only an encrypted archive can be restored on this machine.',
@@ -1948,6 +1971,7 @@
 'reportlevel' => 'Reportlevel',
 'request' => 'Request',
 'requested data' => '1. Connection Settings:',
+'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:',
 'reset' => 'Reset',
@@ -2163,7 +2187,6 @@
 'there are updates available' => 'There are updates available for your system. It is strongly urged that you install them as soon as possible.',
 'there was no file upload' => 'There was no file upload.',
 'this feature has been sponsored by' => 'This feature has been sponsored by',
-'this field may be blank' => 'This field may be blank.',
 'this is not a valid archive' => 'This is not a valid archive.',
 'this is not an authorised update' => 'This is not an authorised update.',
 'this months volume' => 'This months volume',
@@ -2336,7 +2359,7 @@
 'updxlrtr maintenance' => 'Maintenance',
 'updxlrtr marked as' => 'marked as',
 'updxlrtr max disk usage' => 'Max. disk usage',
-'updxlrtr max download rate' => 'Max. external download rate (kBit/s)',
+'updxlrtr max download rate' => 'Max. external download rate (kbit/s)',
 'updxlrtr month' => 'one month',
 'updxlrtr monthly' => 'monthly',
 'updxlrtr not accessed' => 'not accessed since',
@@ -2625,9 +2648,11 @@
 '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 broken' => 'Broken',
 '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 force mobike' => 'Force using MOBIKE (only IKEv2)',
 'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',
 'vpn keyexchange' => 'Keyexchange',
 'vpn local id' => 'Local ID',
@@ -2637,14 +2662,18 @@
 'vpn on blue' => 'VPN on BLUE',
 'vpn on green' => 'VPN on GREEN',
 'vpn on orange' => 'VPN on ORANGE',
+'vpn on-demand' => 'ON-DEMAND',
 'vpn payload compression' => 'Negotiate payload compression',
 'vpn red name' => 'Public IP or FQDN for RED interface or <%defaultroute>',
 'vpn remote id' => 'Remote ID',
+'vpn start action' => 'Start Action',
+'vpn start action route' => 'On Demand',
+'vpn start action start' => 'Always On',
 'vpn statistic n2n' => 'OpenVPN Net-to-Net Statistics',
 'vpn statistic rw' => 'OpenVPN Roadwarrior Statistics',
 'vpn subjectaltname' => 'Subject Alt Name',
-'vpn vhost' => 'Roadwarrior virtual IP (sometimes called Inner-IP)',
 'vpn watch' => 'Restart net-to-net vpn when remote peer IP changes (dyndns).',
+'vpn weak' => 'Weak',
 'waiting to synchronize clock' => 'Waiting to synchronize clock',
 'warn when traffic reaches' => 'Warn when traffic reaches x %',
 'warning messages' => 'Warning messages',