Merge remote-tracking branch 'origin/next'

[people/pmueller/ipfire-2.x.git] / langs / en / cgi-bin / en.pl

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 4f30f562dc85a1fc945c49f188d907e42f66c2c9..ab1f40180d562e58ca3f02bfebc9bf040fb56408 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -975,11 +975,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)',
@@ -2394,6 +2398,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',
@@ -2697,39 +2702,55 @@
 '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',
 'wlan client wpa mode ccmp tkip' => 'CCMP-TKIP',
 'wlan client wpa mode tkip tkip' => 'TKIP-TKIP',
 'wlan clients' => 'Wireless clients',
-'wlanap access point' => 'Access Point',
+'wlanap' => 'Access Point',
 'wlanap channel' => 'Channel',
+'wlanap configuration' => 'Access Point Configuration',
 'wlanap country' => 'Country Code',
 'wlanap debugging' => 'Debugging',
 'wlanap del interface' => 'Remove selected interface?',