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=6d43a6c5a0f7252124c8907cb660f1486b741f3d;hp=63d1e9358e57ca0cc62c2946bb6a9681b3be93b8;hb=6bcb5ffe56238dc7e4107f3deba8d1b943253250;hpb=debe3af56492731d6589a9005de8516e3037f88f

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 63d1e9358..6d43a6c5a 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -243,6 +243,7 @@
 'advproxy errmsg password length 1' => 'Password must have at least ',
 'advproxy errmsg password length 2' => ' characters',
 'advproxy errmsg passwords different' => 'Passwords don\'t match',
+'advproxy errmsg proxy ports equal' => 'The proxy port and the transparent port cannot be equal.',
 'advproxy errmsg radius port' => 'Invalid RADIUS port number',
 'advproxy errmsg radius secret' => 'RADIUS shared secret required',
 'advproxy errmsg radius server' => 'Invalid IP address for RADIUS Server',
@@ -280,6 +281,7 @@
 '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)',
 'advproxy redirector children' => 'Number of filter processes',
 'advproxy reset' => 'Reset',
@@ -559,7 +561,7 @@
 'connection closed' => 'Not connected...',
 'connection debugging' => 'Connection debugging',
 'connection status and controlc' => 'Connection status and control:',
-'connection tracking' => 'IPTables Connection Tracking',
+'connection tracking' => 'iptables Connection Tracking',
 'connection type' => 'Connection Type',
 'connection type is invalid' => 'Connection type is invalid.',
 'connections' => 'Connections',
@@ -900,7 +902,7 @@
 'firewall log' => 'Firewall log',
 'firewall log viewer' => 'Firewall Log Viewer',
 'firewall logs' => 'Firewall Logs',
-'firewall logs ip' => 'Fw-Logdgraphs (IP)',
+'firewall logs ip' => 'Fw-Loggraphs (IP)',
 'firewall logs port' => 'Fw-Loggraphs (Port)',
 'firewallhits' => 'firewallhits',
 'firmware' => 'Firmware',
@@ -942,12 +944,10 @@
 'fwdfw REJECT' => 'REJECT',
 'fwdfw action' => 'Action',
 'fwdfw additional' => 'Additional settings',
-'fwdfw addr grp' => 'Adress groups:',
 'fwdfw addrule' => 'Add/Edit rule:',
+'fwdfw all icmp' => 'All ICMP types',
 'fwdfw change' => 'Update',
 'fwdfw copy' => 'Copy',
-'fwdfw cust addr' => 'Custom addresses:',
-'fwdfw cust net' => 'Custom networks:',
 'fwdfw delete' => 'Delete',
 'fwdfw dnat' => 'Port forwarding/Destination NAT',
 'fwdfw dnat error' => 'You have to select a single host for DNAT. Groups or networks are not allowed.',
@@ -957,21 +957,19 @@
 'fwdfw err nosrcip' => 'Please provide a source IP address.',
 'fwdfw err notgt' => 'No destination selected.',
 'fwdfw err notgtip' => 'Please provide a destination IP address.',
-'fwdfw err prot' => 'Source and destination protocol need to match.',
+'fwdfw err prot_port' => 'Source- or targetport are not allowed with selected protocol',
+'fwdfw err prot_port1' => 'When using Source- or targetport you have to select TCP or UDP for protocol',
 'fwdfw err remark' => 'Invalid characters in remark.',
 'fwdfw err ruleexists' => 'This rule already exists.',
 'fwdfw err same' => 'Source and destination are identical.',
 'fwdfw err samesub' => 'Source and destination IP addresses are from the same subnet.',
 'fwdfw err src_addr' => 'Invalid source MAC/IP address.',
-'fwdfw err srcovpn' => 'The entered source IP address is used by an OpenVPN client. Please use the dropdown menu and select the right client connection.',
-'fwdfw err srcport' => 'Please provide a source port.',
 'fwdfw err tgt_addr' => 'Invalid destination IP address.',
 'fwdfw err tgt_grp' => 'The destination service group is empty',
 'fwdfw err tgt_mac' => 'A MAC addresses cannot be used as destination.',
 'fwdfw err tgt_port' => 'Invalid destination port.',
-'fwdfw err tgtovpn' => 'The entered destination IP address is used by an OpenVPN client. Please use the dropdown menu and select the right client connection.',
-'fwdfw err tgtport' => 'Please provide a destination port.',
 'fwdfw err time' => 'You have to select at least one day.',
+'fwdfw external port nat' => 'External port (NAT)',
 'fwdfw final_rule' => 'Last rule: ',
 'fwdfw from' => 'From:',
 'fwdfw hint ip1' => 'The last generated rule may never match, because source and destination subnets may overlap.',
@@ -991,7 +989,7 @@
 'fwdfw pol text1' => 'Sets the default firewall behaviour for connections initiated by the firewall itself. Attention! You may lock yourself out.',
 'fwdfw pol title' => 'Default firewall behaviour',
 'fwdfw red' => 'RED',
-'fwdfw reread' => 'Apply',
+'fwdfw reread' => 'Apply changes',
 'fwdfw rule action' => 'Rule action:',
 'fwdfw rule activate' => 'Activate rule',
 'fwdfw rulepos' => 'Rule position',
@@ -1008,8 +1006,8 @@
 'fwdfw toggle' => 'Activate or deactivate',
 'fwdfw togglelog' => 'Activate or deactivate logging',
 'fwdfw use nat' => 'Use NAT',
-'fwdfw use srcport' => 'Use source port',
-'fwdfw use srv' => 'Use destination port',
+'fwdfw use srcport' => 'Source port:',
+'fwdfw use srv' => 'Destination port:',
 'fwdfw useless rule' => 'This rule is useless.',
 'fwdfw wd_fri' => 'Fri',
 'fwdfw wd_mon' => 'Mon',
@@ -1022,7 +1020,7 @@
 'fwhost addgrp' => 'Add new network/host group:',
 'fwhost addgrpname' => 'Group name:',
 'fwhost addhost' => 'Add new host:',
-'fwhost addnet' => 'Add new hetwork:',
+'fwhost addnet' => 'Add new network:',
 'fwhost addrule' => 'Add/edit rule:',
 'fwhost addservice' => 'Add service:',
 'fwhost addservicegrp' => 'Add new service group:',
@@ -1044,6 +1042,7 @@
 'fwhost err addr' => 'Invalid IP address or subnet',
 'fwhost err addrgrp' => 'Please provide a group name',
 '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 hostexist' => 'A host with the same name already exists',
@@ -1284,7 +1283,7 @@
 'iptable rules' => 'IPTable rules',
 'iptmangles' => 'IPTable Mangles',
 'iptnats' => 'IPTable Network Address Translation',
-'ipts' => 'IPTables',
+'ipts' => 'iptables',
 'isdn' => 'ISDN',
 'isdn settings' => 'Additional ISDN settings:',
 'isdn1' => 'Single ISDN',
@@ -1306,6 +1305,7 @@
 'last activity' => 'Last Activity',
 'lateprompting' => 'Lateprompting',
 'lease expires' => 'Lease expires',
+'least preferred' => 'least preferred',
 'legend' => 'Legend',
 'length' => 'Length',
 'line' => 'Line',
@@ -1444,6 +1444,7 @@
 'monthly volume start day short' => 'First day',
 'months' => 'months',
 'more' => 'more',
+'most preferred' => 'most preferred',
 'mount' => 'Mount',
 'mounted on' => 'Mounted on',
 'mpfire' => 'Media Player for IPFire',
@@ -2004,6 +2005,7 @@
 'tone dial' => 'Tone dial:',
 'too long 80 char max' => ' is too long, maximum allowed is 80 characters',
 'tor' => 'Tor',
+'tor 0 = disabled' => '0 = disabled',
 'tor accounting' => 'Accounting',
 'tor accounting bytes' => 'Traffic (read/written)',
 'tor accounting bytes left' => 'left',
@@ -2024,8 +2026,11 @@
 'tor configuration' => 'Tor Configuration',
 'tor connected relays' => 'Connected relays',
 'tor contact info' => 'Contact Info',
+'tor daemon' => 'Daemon',
+'tor directory port' => 'Directory port',
 'tor enabled' => 'Enable Tor',
 'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
+'tor errmsg invalid directory port' => 'Invalid directory port',
 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
 'tor errmsg invalid node id' => 'Invalid node ID',
 'tor errmsg invalid relay address' => 'Invalid relay address',
@@ -2047,6 +2052,7 @@
 'tor relay mode relay' => 'Relay only',
 'tor relay nickname' => 'Relay nickname',
 'tor relay port' => 'Relay port',
+'tor service' => 'Tor Service',
 'tor socks port' => 'SOCKS port',
 'tor stats' => 'Statistics',
 'tor traffic limit hard' => 'Traffic limit has been reached.',
@@ -2326,6 +2332,7 @@
 'urlfilter quota restart message' => 'Note: The counters will be reset for all users when restarting the URL filter',
 'urlfilter quota time error' => 'Invalid value for time quota',
 'urlfilter quota user error' => 'At least one username is required',
+'urlfilter redirect template' => 'Redirect page template',
 'urlfilter redirectpage' => 'Redirect to this URL',
 'urlfilter remove file' => 'Remove file from repository',
 'urlfilter renewal' => 'Renewal',
@@ -2508,6 +2515,7 @@
 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
 'wlanap access point' => 'Access Point',
 'wlanap channel' => 'Channel',
+'wlanap country' => 'Country Code',
 'wlanap debugging' => 'Debugging',
 'wlanap del interface' => 'Remove selected interface?',
 'wlanap encryption' => 'Encryption',