Merge remote-tracking branch 'amarx/firewall' into fifteen

[people/teissler/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 8290763c25314a1276a95a89c9118861b54d2ee5..c38ba962876e15b4d3df21d405bc3c68a0e5b36a 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,4 +1,4 @@
-%tr = ( 
+%tr = (
 %tr,
 
 'Act as' => 'Act as:',
@@ -900,7 +900,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',
@@ -1044,6 +1044,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',
@@ -2024,7 +2025,7 @@
 'tor configuration' => 'Tor Configuration',
 'tor connected relays' => 'Connected relays',
 'tor contact info' => 'Contact Info',
-'tor do not advertise relay' => 'Do not advertise the relay',
+'tor daemon' => 'Daemon',
 'tor enabled' => 'Enable Tor',
 'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
 'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
@@ -2048,6 +2049,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.',
@@ -2327,6 +2329,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',