Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

[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 5bfd356e7c9cdf25878700602005d882559e3b5b..7fbeb39f36199620d8bde8c8d03ef7739368c1e4 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -19,6 +19,7 @@
 'ConnSched ipsecstop' => 'IPSec stop',
 'ConnSched reconnect' => 'Reconnect',
 'ConnSched scheduled actions' => 'Scheduled actions',
+'outgoingfw warning' => 'Not selecting source ip or mac ignores them',
 'ConnSched scheduler' => 'Scheduler',
 'ConnSched select profile' => 'Select profile',
 'modify' => 'Modify',
@@ -1256,6 +1257,8 @@
 'not set' => 'not set',
 'notes' => 'Notes',
 'november' => 'November',
+'ntp common settings' => 'Common settings',
+'ntp sync' => 'Synchronization',
 'ntp configuration' => 'NTP configuration',
 'ntp must be enabled to have clients' => 'NTP must be enabled to have clients.',
 'ntp server' => 'NTP Server',
@@ -1302,17 +1305,20 @@
 'outgoing firewall groups' => 'Firewall Groups',
 'outgoing firewall add ip group' => 'Add IP Address Group',
 'outgoing firewall ip groups' => 'Outgoing Firewall IP Adress Groups',
+'outgoing firewall add mac group' => 'Add MAC Address Group',
+'outgoing firewall mac groups' => 'Outgoing Firewall MAC Adress Groups',
 'outgoing firewall view group' => 'View group',
+'outgoing firewall group error' => 'A group with the same name exists.',
 'outgoing traffic in bytes per second' => 'Outgoing Traffic',
-'outgoingfw mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
-'outgoingfw mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
-'outgoingfw mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',
-'outgoingfw p2p description 1' => 'The button',
-'outgoingfw p2p description 2' => 'means that the p2p protocol is allowed or',
-'outgoingfw p2p description 3' => 'that the p2p protocol is denied.',
-'outgoingfw p2p deny' => 'p2p protocol is denied',
-'outgoingfw p2p allow' => 'p2p protocol is allowed',
-'outgoingfw reset' => 'Reset all',
+'outgoing firewall mode0' => 'Using this mode, all clients are able to access the internet without any restrictions.',
+'outgoing firewall mode1' => 'Using this mode, only connections based on the defined rules are allowed.',
+'outgoing firewall mode2' => 'Using this mode, all connections are allowed despited off the defined ones.',
+'outgoing firewall p2p description 1' => 'The button',
+'outgoing firewall p2p description 2' => 'means that the p2p protocol is allowed or',
+'outgoing firewall p2p description 3' => 'that the p2p protocol is denied.',
+'outgoing firewall p2p deny' => 'p2p protocol is denied',
+'outgoing firewall p2p allow' => 'p2p protocol is allowed',
+'outgoing firewall reset' => 'Reset all',
 'override mtu' => 'Override default MTU',
 'ovpn' => 'OpenVPN',
 'ovpn con stat' => 'OpenVPN Connection Statistics',
@@ -1473,6 +1479,7 @@
 'remove x509' => 'Remove x509',
 'reportfile' => 'Reportfile',
 'reportlevel' => 'Reportlevel',
+'request' => 'Request',
 'requested data' => '1. Connection Settings:',
 'reserved dst port' => 'Destination port is reserved for IPFire use only:',
 'reserved src port' => 'Source port is reserved for IPFire use only:',