Merge branch 'next'

[people/mfischer/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 d98422621654cd893201d21451de89b90978460e..510ed095bc3b50ae51f1f5818c3f2d6b25aa0f66 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -827,6 +827,7 @@
 'dhcp dns update secret' => 'Secret',
 'dhcp fixed lease err1' => 'For a fix lease you have to enter the MAC address or the hostname, or you enter both.',
 'dhcp fixed lease help1' => 'IP Addresses might be entered as FQDN',
+'dhcp make fixed lease' => 'Add to fix leases',
 'dhcp mode' => 'DHCP',
 'dhcp server' => 'DHCP Server',
 'dhcp server disabled' => 'DHCP server disabled.  Stopped.',
@@ -1154,6 +1155,7 @@
 'fw default drop' => 'Firewall policy',
 'fw logging' => 'Firewall logging',
 'fw red' => 'Firewall options for RED interface',
+'fw rules reload notice' => 'Please reload the firewall ruleset in order to apply your changes.',
 'fw settings' => 'Firewall settings',
 'fw settings color' => 'Show colors in ruletable',
 'fw settings dropdown' => 'Show all networks on rulecreation site',
@@ -1217,7 +1219,6 @@
 'fwdfw natport used' => 'The given port for NAPT is already in use by an other DNAT rule.',
 'fwdfw newrule' => 'New rule',
 'fwdfw numcon' => 'Number of connections',
-'fwdfw p2p txt' => 'Grant/deny access to P2P networks.',
 'fwdfw pol allow' => 'Allowed',
 'fwdfw pol block' => 'Blocked',
 'fwdfw pol text' => 'Sets the default firewall behaviour for connections from local networks. You may either allow all new connections or block them by default. Connections between the local networks are also blocked in the latter mode.',
@@ -1963,11 +1964,6 @@
 '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 outgoing firewall reserved groupname' => 'Please use another group name, this name is reserved.',
-'outgoing firewall p2p allow' => 'Using the P2P protocol is allowed',
-'outgoing firewall p2p deny' => 'Using the P2P protocol is forbidden',
-'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 reset' => 'Reset all',
 'outgoing firewall view group' => 'View group',
 'outgoing firewall warning' => 'Not selecting source ip or mac ignores them',
@@ -2032,8 +2028,6 @@
 'ovpn_processprioVH' => 'Very high',
 'ovpnstatus log' => 'OVPN-Status-Log',
 'ovpnsys log' => 'OVPN-System-Log',
-'p2p block' => 'P2P networks',
-'p2p block save notice' => 'Please reload the firewall ruleset in order to apply your changes.',
 'package failed to install' => 'Package failed to install.',
 'pagerefresh' => 'Page is beeing refreshed, please wait.',
 'pakfire accept all' => 'Do you want to install all packages?',