fr: Update French translation

[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 3fcd3691e078337a6ffc5b68d7d7158d717aedbf..7e3bbec890cbe17331bac07c12126e397173f292 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1233,10 +1233,10 @@
 'fwhost OpenVPN static host' => 'OpenVPN static host',
 'fwhost OpenVPN static network' => 'OpenVPN static network',
 'fwhost Standard Network' => 'Standard network',
 'fwhost OpenVPN static host' => 'OpenVPN static host',
 'fwhost OpenVPN static network' => 'OpenVPN static network',
 'fwhost Standard Network' => 'Standard network',

-'fwhost addlocationgrp' => 'Add new Location group',

 'fwhost addgrp' => 'Add new network/host group',
 'fwhost addgrpname' => 'Group name:',
 'fwhost addhost' => 'Add new host',
 'fwhost addgrp' => 'Add new network/host group',
 'fwhost addgrpname' => 'Group name:',
 'fwhost addhost' => 'Add new host',

+'fwhost addlocationgrp' => 'Add new Location group',

 'fwhost addnet' => 'Add new network',
 'fwhost addservice' => 'Add service',
 'fwhost addservicegrp' => 'Add new service group',
 'fwhost addnet' => 'Add new network',
 'fwhost addservice' => 'Add service',
 'fwhost addservicegrp' => 'Add new service group',


@@ -1249,10 +1249,10 @@
 'fwhost change' => 'Modify',
 'fwhost changeremark' => 'You modified just the remark',
 'fwhost cust addr' => 'Hosts',
 'fwhost change' => 'Modify',
 'fwhost changeremark' => 'You modified just the remark',
 'fwhost cust addr' => 'Hosts',

+'fwhost cust grp' => 'Network/Host Groups',

 'fwhost cust location' => 'Location Groups',
 'fwhost cust locationgroup' => 'Location Groups',
 'fwhost cust locationlocation' => 'Location Locations',
 'fwhost cust location' => 'Location Groups',
 'fwhost cust locationgroup' => 'Location Groups',
 'fwhost cust locationlocation' => 'Location Locations',

-'fwhost cust grp' => 'Network/Host Groups',

 'fwhost cust net' => 'Networks',
 'fwhost cust service' => 'Services',
 'fwhost cust srvgrp' => 'Service Groups',
 'fwhost cust net' => 'Networks',
 'fwhost cust service' => 'Services',
 'fwhost cust srvgrp' => 'Service Groups',


@@ -1298,9 +1298,9 @@
 'fwhost ipsec net' => 'IPsec networks:',
 'fwhost menu' => 'Firewall Groups',
 'fwhost netaddress' => 'Network address',
 'fwhost ipsec net' => 'IPsec networks:',
 'fwhost menu' => 'Firewall Groups',
 'fwhost netaddress' => 'Network address',

-'fwhost newlocationgrp' => 'Location Groups',

 'fwhost newgrp' => 'Network/Host Groups',
 'fwhost newhost' => 'Hosts',
 'fwhost newgrp' => 'Network/Host Groups',
 'fwhost newhost' => 'Hosts',

+'fwhost newlocationgrp' => 'Location Groups',

 'fwhost newnet' => 'Networks',
 'fwhost newservice' => 'Services',
 'fwhost newservicegrp' => 'Service Groups',
 'fwhost newnet' => 'Networks',
 'fwhost newservice' => 'Services',
 'fwhost newservicegrp' => 'Service Groups',


@@ -1336,16 +1336,6 @@
 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time.  It can take up to several minutes on older hardware. Please be patient.',
 'genkey' => 'Generate PSK',
 'genre' => 'Genre',
 'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Generating the root and host certificates may take a long time.  It can take up to several minutes on older hardware. Please be patient.',
 'genkey' => 'Generate PSK',
 'genre' => 'Genre',

-'location' => 'Location',
-'locationblock' => 'Location Block',
-'locationblock block countries' => 'Block countries',
-'locationblock configuration' => 'Location Configuration',
-'locationblock country code' => 'Country Code',
-'locationblock country is allowed' => 'Incoming traffic from this country is allowed',
-'locationblock country is blocked' => 'Incoming traffic from this country will be blocked',
-'locationblock country name' => 'Country Name',
-'locationblock enable feature' => 'Enable Location based blocking:',
-'locationblock flag' => 'Flag',

 'global settings' => 'Global Settings',
 'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
 'gpl license agreement' => 'License Agreement',
 'global settings' => 'Global Settings',
 'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
 'gpl license agreement' => 'License Agreement',


@@ -1599,6 +1589,16 @@
 'local vpn hostname/ip' => 'Local VPN Hostname/IP',
 'localkey' => 'Localkey',
 'localkeyfile' => 'Localkeyfile',
 'local vpn hostname/ip' => 'Local VPN Hostname/IP',
 'localkey' => 'Localkey',
 'localkeyfile' => 'Localkeyfile',

+'location' => 'Location',
+'locationblock' => 'Location Block',
+'locationblock block countries' => 'Block countries',
+'locationblock configuration' => 'Location Configuration',
+'locationblock country code' => 'Country Code',
+'locationblock country is allowed' => 'Incoming traffic from this country is allowed',
+'locationblock country is blocked' => 'Incoming traffic from this country will be blocked',
+'locationblock country name' => 'Country Name',
+'locationblock enable feature' => 'Enable Location based blocking:',
+'locationblock flag' => 'Flag',

 'log' => 'Log',
 'log enabled' => 'Log Enabled',
 'log level' => 'Log Level',
 'log' => 'Log',
 'log enabled' => 'Log Enabled',
 'log level' => 'Log Level',