Merge remote-tracking branch 'origin/next' into fifteen

[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 44e8697beafd99666d5fd61d25ccf6c15d31f78d..f03ea376a6bed9b02895053e01323ac61d4bdfcd 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -906,6 +906,7 @@
 'firewall logs' => 'Firewall Logs',
 'firewall logs ip' => 'Fw-Loggraphs (IP)',
 'firewall logs port' => 'Fw-Loggraphs (Port)',
+'firewall rules' => 'Firewall Rules',
 'firewallhits' => 'firewallhits',
 'firmware' => 'Firmware',
 'firmware upload' => 'Upload Firmware/Drivers',
@@ -1063,6 +1064,8 @@
 'fwhost err isccdnet' => 'This name is already used by an OpenVPN network',
 'fwhost err isingrp' => 'This entry already exists in the group',
 'fwhost err mac' => 'Invalid MAC address',
+'fwhost err maxservicetcp' => 'The maximal number of 15 TCP services has been reached in this group (port ranges count twice)',
+'fwhost err maxserviceudp' => 'The maximal number of 15 UDP services has been reached in this group (port ranges count twice)',
 'fwhost err name' => 'Invalid name. Allowed characters: Upper- and lowercase letters, digits, space and dash.',
 'fwhost err name1' => 'Empty name.',
 'fwhost err net' => 'Network/IP address already exists',
@@ -1730,7 +1733,7 @@
 'proxy admin password' => 'Cache administrator password',
 'proxy cachemgr' => 'Activate cachemanager',
 'proxy errmsg filedescriptors' => 'Wrong amount of filedescriptors',
-'proxy filedescriptors' => 'Amount of fildescriptors',
+'proxy filedescriptors' => 'Amount of filedescriptors',
 'proxy log viewer' => 'Proxy log viewer',
 'proxy logs' => 'Proxy Logs',
 'proxy no proxy extend' => 'or specify a list of not proxied destination',