X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=langs%2Fen%2Fcgi-bin%2Fen.pl;h=064fd7fc9e5f823d6060562b24e53a4afc01e3a0;hp=a04d994d6274c75ab9fd837009d281717dd6f4c7;hb=0a219160ac7dfe243c94c1f04c182d29206df8ec;hpb=8bbcfa1152f87e8092c91284e25184ae52914e6d

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a04d994d62..064fd7fc9e 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,12 +1,61 @@
 %tr = ( 
 %tr,
 
+'24 hours' => '24 Hours',
 'Act as' => 'Act as:',
 'Add Level7 rule' => 'Add Level7 rule',
 'Add Port Rule' => 'Add port rule',
 'Add Rule' => 'Add rule',
 'Add a route' => 'Add a route',
 'Async logging enabled' => 'Enable asynchronous writing of the syslog file',
+'Captive 1day' => '1 day',
+'Captive 1month' => '1 month',
+'Captive 1week' => '1 week',
+'Captive ACTIVATE' => 'ACTIVATE',
+'Captive GAIN ACCESS' => 'GAIN ACCESS',
+'Captive activate' => 'Activate',
+'Captive activated' => 'Activated',
+'Captive active on' => 'Activated on',
+'Captive agree tac' => 'I agree with the terms & conditions below.',
+'Captive auth_lic' => 'License',
+'Captive auth_vou' => 'Voucher',
+'Captive authentication' => 'Type of Access',
+'Captive brand color' => 'Brand Color',
+'Captive branding' => 'Branding',
+'Captive client session expiry time' => 'Session Expiry Time',
+'Captive config' => 'Settings',
+'Captive coupon' => 'Coupon',
+'Captive err doublevoucher' => 'A voucher with this code already exists',
+'Captive expire' => 'Expire',
+'Captive expiry time' => 'Expiry Time',
+'Captive generate coupon' => 'Generate Coupon',
+'Captive heading terms' => 'Terms & Conditions',
+'Captive heading voucher' => 'Voucher or Access Code',
+'Captive invalid coupon' => 'You entered an invalid coupon code. Please try again.',
+'Captive invalid logosize' => 'The uploaded image file does not meet the required resolution of at least 1280x400 but not larger than 1920x800 pixels',
+'Captive invalid_voucher' => 'Invalid code. Please try again',
+'Captive ip' => 'IP Address',
+'Captive issued coupons' => 'Issued Coupons',
+'Captive logo uploaded' => 'Logo uploaded',
+'Captive logo_set' => 'Current Logo',
+'Captive mac' => 'MAC Address',
+'Captive menu' => 'Captive Portal',
+'Captive noexpiretime' => 'No valid connection time range given',
+'Captive nolimit' => 'unlimited',
+'Captive nr' => 'Number',
+'Captive please accept the terms and conditions' => 'Please accept the terms & conditions',
+'Captive please enter a coupon code' => 'Please enter a coupon code',
+'Captive terms' => 'Terms & Conditions',
+'Captive terms short' => 'T&Cs',
+'Captive time' => 'Access time post activation (hours)',
+'Captive title' => 'Title of Login Page',
+'Captive upload logo' => 'Upload Logo',
+'Captive upload logo recommendations' => '(PNG or JPEG, recommended 1280x720 pixels)',
+'Captive voactive' => 'Active Vouchers',
+'Captive voucher' => 'Voucher',
+'Captive vouchervalid' => 'Allowed time for this voucher',
+'Captive vout' => 'Issued Vouchers',
+'Captive wrong ext' => 'Uploaded file has wrong filetype',
 'Choose Rule' => 'Choose <u>one</u> of the following rules.',
 'Class' => 'Class',
 'Class was deleted' => 'with potential subclasses was deleted',
@@ -650,7 +699,7 @@
 'day after' => 'Day after',
 'day before' => 'Day before',
 'day-graph' => 'Day',
-'days' => 'days.',
+'days' => 'Days',
 'dbfile' => 'Dbfile',
 'ddns help dnsmadeeasy' => 'In the field for hostname enter your ID (or a list of IDs seperated by;)',
 'ddns help freedns' => 'In the fied username enter your connect string',
@@ -792,6 +841,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',
@@ -866,6 +916,7 @@
 'edit share' => 'Edit share',
 'editor' => 'Editor',
 'eg' => 'e.g.:',
+'eight hours' => '8 Hours',
 'email config' => 'Configuration',
 'email empty field' => 'Empty field',
 'email error' => 'ERROR: Test mail could not be sent',
@@ -974,11 +1025,15 @@
 'fireinfo why read more' => 'Read more about the reasons.',
 'fireinfo your profile id' => 'Your profile ID',
 'firewall' => 'Firewall',
-'firewall graphs' => 'Firewall Graphs',
+'firewall graph country' => 'Firewall-Diagram (Country)',
+'firewall graph ip' => 'Firewall-Diagram (IP)',
+'firewall graph port' => 'Firewall-Diagram (Port)',
 'firewall hits' => 'Total number of firewall hits for',
 'firewall hits per' => 'firewallhits per',
 'firewall log' => 'Firewall log',
-'firewall log viewer' => 'Firewall Log Viewer',
+'firewall log country' => 'Firewall log (Country)',
+'firewall log ip' => 'Firewall log (IP)',
+'firewall log port' => 'Firewall log (Port)',
 'firewall logs' => 'Firewall Logs',
 'firewall logs country' => 'Fw-Loggraphs (Country)',
 'firewall logs ip' => 'Fw-Loggraphs (IP)',
@@ -1277,7 +1332,7 @@
 'hosts config changed' => 'Hosts config changed',
 'hour' => 'Hour',
 'hour-graph' => 'Hour',
-'hours' => 'hours',
+'hours' => 'Hours',
 'hours2' => 'Hours',
 'ibod for dual isdn only' => 'iBOD can only be used with Dual ISDN.',
 'icmp selected but no type' => 'ICMP selected for protocol, but no ICMP type specified.',
@@ -1601,7 +1656,7 @@
 'monthly volume' => 'Monthly volume',
 'monthly volume start day' => 'First day of monthly period',
 'monthly volume start day short' => 'First day',
-'months' => 'months',
+'months' => 'Months',
 'more' => 'more',
 'most preferred' => 'most preferred',
 'mount' => 'Mount',
@@ -1696,6 +1751,9 @@
 'ok' => 'OK',
 'older' => 'Older',
 'on' => 'on',
+'one hour' => 'One Hour',
+'one month' => 'One Month',
+'one week' => 'One Week',
 'online help en' => 'Online help (in english)',
 'only digits allowed in holdoff field' => 'Only digits allowed in holdoff field',
 'only digits allowed in max retries field' => 'Only digits allowed in max retries field.',
@@ -2309,6 +2367,7 @@
 'unix password sync' => 'Unix Password Sync',
 'unix shell' => 'UNIX Shell',
 'unknown' => 'UNKNOWN',
+'unlimited' => 'Unlimited',
 'unnamed' => 'Unnamed',
 'update' => 'Update',
 'update accelerator' => 'Update Accelerator',
@@ -2393,6 +2452,7 @@
 'updxlrtr year' => 'one year',
 'upgrade' => 'upgrade',
 'uplink' => 'Uplink',
+'uplink bit rate' => 'Uplink Bit Rate',
 'uplink speed' => 'Uplink speed (kbit/sec)',
 'uplink std class' => 'uplink standard class',
 'upload' => 'Upload',
@@ -2647,7 +2707,9 @@
 '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 connecting' => 'CONNECTING',
 '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)',
@@ -2660,13 +2722,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 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',
@@ -2681,7 +2748,7 @@
 'week' => 'Week',
 'week-graph' => 'Week',
 'weekly firewallhits' => 'weekly firewallhits',
-'weeks' => 'weeks',
+'weeks' => 'Weeks',
 'wildcards' => 'Wildcards',
 'wins server' => 'Wins Server',
 'wins support' => 'Wins Support',
@@ -2689,31 +2756,46 @@
 'wireless config added' => 'Wireless config added',
 'wireless config changed' => 'Wireless config changed',
 'wireless configuration' => 'Wireless Configuration',
+'wireless network' => 'WiFi Network',
 'wlan client' => 'Wireless client',
 'wlan client advanced settings' => 'Advanced settings',
 'wlan client and' => 'and',
+'wlan client anonymous identity' => 'Anonymous Identity',
+'wlan client auth auto' => 'Auto',
+'wlan client auth peap' => 'PEAP',
+'wlan client auth ttls' => 'TTLS',
+'wlan client authentication settings' => 'Authentication Settings',
 'wlan client bssid' => 'BSSID',
 'wlan client ccmp' => 'CCMP',
 'wlan client configuration' => 'Wireless Client Configuration',
 'wlan client disconnected' => 'Disconnected',
 'wlan client duplicate ssid' => 'Duplicate SSID',
+'wlan client eap authentication method' => 'EAP Authentication Method',
+'wlan client eap phase2 method' => 'EAP Phase 2 Method',
+'wlan client eap state' => 'EAP Status',
 'wlan client edit entry' => 'Edit wireless client configuration',
 'wlan client encryption' => 'Encryption',
+'wlan client encryption eap' => 'EAP',
 'wlan client encryption none' => 'None',
 'wlan client encryption wep' => 'WEP',
 'wlan client encryption wpa' => 'WPA',
 'wlan client encryption wpa2' => 'WPA2',
 'wlan client group cipher' => 'Group cipher',
 'wlan client group key algorithm' => 'GKA',
+'wlan client identity' => 'Identity',
 'wlan client invalid key length' => 'Invalid key length.',
+'wlan client method' => 'Method',
 'wlan client new entry' => 'Create new wireless client configuration',
 'wlan client new network' => 'New network',
 'wlan client pairwise cipher' => 'Pairwise cipher',
 'wlan client pairwise key algorithm' => 'PKA',
 'wlan client pairwise key group key' => 'Pairwise key/group key',
+'wlan client password' => 'Password',
 'wlan client psk' => 'Pre-shared key',
 'wlan client ssid' => 'SSID',
 'wlan client tkip' => 'TKIP',
+'wlan client tls cipher' => 'TLS Cipher',
+'wlan client tls version' => 'TLS Version',
 'wlan client wpa mode' => 'WPA mode',
 'wlan client wpa mode all' => 'Auto',
 'wlan client wpa mode ccmp ccmp' => 'CCMP-CCMP',