fr: Update French translation

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

doc/language_issues.de

@@ -318,7 +318,7 @@ WARNING: translation string unused: fwhost Standard Network
 WARNING: translation string unused: fwhost attention
 WARNING: translation string unused: fwhost blue
 WARNING: translation string unused: fwhost changeremark
-WARNING: translation string unused: fwhost cust geoip
+WARNING: translation string unused: fwhost cust locationlocation
 WARNING: translation string unused: fwhost err addrgrp
 WARNING: translation string unused: fwhost err hostorip
 WARNING: translation string unused: fwhost err mac
@@ -338,9 +338,6 @@ WARNING: translation string unused: generatekeys
 WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
-WARNING: translation string unused: geoipblock country code
-WARNING: translation string unused: geoipblock country name
-WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: harddisk temperature graphs
@@ -402,6 +399,9 @@ WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
+WARNING: translation string unused: locationblock country code
+WARNING: translation string unused: locationblock country name
+WARNING: translation string unused: locationblock flag
 WARNING: translation string unused: log enabled
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
@@ -489,6 +489,7 @@ WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
+WARNING: translation string unused: other
 WARNING: translation string unused: our donors
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing firewall
@@ -766,7 +767,7 @@ WARNING: translation string unused: zoneconf val vlan amount assignment error
 WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val zoneslave amount error
 WARNING: untranslated string: error the to date has to be later than the from date = The to date has to be later than the from date!
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string

doc/language_issues.en

@@ -892,10 +892,10 @@ WARNING: untranslated string: fwdfw wd_thu = Thu
 WARNING: untranslated string: fwdfw wd_tue = Tue
 WARNING: untranslated string: fwdfw wd_wed = Wed
 WARNING: untranslated string: fwhost OpenVPN N-2-N = OpenVPN Net-to-Net
-WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
 WARNING: untranslated string: fwhost addgrp = Add new network/host group
 WARNING: untranslated string: fwhost addgrpname = Group name:
 WARNING: untranslated string: fwhost addhost = Add new host
+WARNING: untranslated string: fwhost addlocationgrp = Add new Location group
 WARNING: untranslated string: fwhost addnet = Add new network
 WARNING: untranslated string: fwhost addservice = Add service
 WARNING: untranslated string: fwhost addservicegrp = Add new service group
@@ -905,10 +905,10 @@ WARNING: untranslated string: fwhost ccdhost = OpenVPN clients:
 WARNING: untranslated string: fwhost ccdnet = OpenVPN networks:
 WARNING: untranslated string: fwhost change = Modify
 WARNING: untranslated string: fwhost cust addr = Hosts
-WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
-WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
 WARNING: untranslated string: fwhost cust grp = Network/Host Groups
+WARNING: untranslated string: fwhost cust location = Location Groups
+WARNING: untranslated string: fwhost cust locationgroup = Location Groups
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost cust net = Networks
 WARNING: untranslated string: fwhost cust service = Services
 WARNING: untranslated string: fwhost cust srvgrp = Service Groups
@@ -947,9 +947,9 @@ WARNING: untranslated string: fwhost ip_mac = IP/MAC address
 WARNING: untranslated string: fwhost ipsec net = IPsec networks:
 WARNING: untranslated string: fwhost menu = Firewall Groups
 WARNING: untranslated string: fwhost netaddress = Network address
-WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
 WARNING: untranslated string: fwhost newgrp = Network/Host Groups
 WARNING: untranslated string: fwhost newhost = Hosts
+WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: fwhost newnet = Networks
 WARNING: untranslated string: fwhost newservice = Services
 WARNING: untranslated string: fwhost newservicegrp = Service Groups
@@ -972,13 +972,6 @@ WARNING: untranslated string: generate ptr = Generate PTR
 WARNING: untranslated string: generate root/host certificates = Generate root/host certificates
 WARNING: untranslated string: 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.
 WARNING: untranslated string: genre = Genre
-WARNING: untranslated string: geoip = Location
-WARNING: untranslated string: geoipblock = Location Block
-WARNING: untranslated string: geoipblock block countries = Block countries
-WARNING: untranslated string: geoipblock configuration = Location Configuration
-WARNING: untranslated string: geoipblock country is allowed = Incoming traffic from this country is allowed
-WARNING: untranslated string: geoipblock country is blocked = Incoming traffic from this country will be blocked
-WARNING: untranslated string: geoipblock enable feature = Enable Location based blocking:
 WARNING: untranslated string: global settings = Global Settings
 WARNING: untranslated string: gpl i accept these terms and conditions = I accept these terms and conditions
 WARNING: untranslated string: gpl license agreement = License Agreement
@@ -1200,6 +1193,13 @@ WARNING: untranslated string: local ntp server specified but not enabled = Local
 WARNING: untranslated string: local subnet = Local subnet:
 WARNING: untranslated string: local subnet is invalid = Local subnet is invalid.
 WARNING: untranslated string: local vpn hostname/ip = Local VPN Hostname/IP
+WARNING: untranslated string: location = Location
+WARNING: untranslated string: locationblock = Location Block
+WARNING: untranslated string: locationblock block countries = Block countries
+WARNING: untranslated string: locationblock configuration = Location Configuration
+WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed
+WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
+WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
 WARNING: untranslated string: log = Log
 WARNING: untranslated string: log level = Log Level
 WARNING: untranslated string: log lines per page = Lines per page
@@ -1399,7 +1399,6 @@ WARNING: untranslated string: organization cant be empty = Organization can't be
 WARNING: untranslated string: organization name = Organization Name
 WARNING: untranslated string: organization too long = Organization is too long; it should not be longer than 60 characters.
 WARNING: untranslated string: os level = OS Level
-WARNING: untranslated string: other = Other
 WARNING: untranslated string: other countries = Other countries
 WARNING: untranslated string: other login script = Other login script
 WARNING: untranslated string: otherip = other IP

doc/language_issues.es

@@ -284,9 +284,6 @@ WARNING: translation string unused: generatekeys
 WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
-WARNING: translation string unused: geoipblock country code
-WARNING: translation string unused: geoipblock country name
-WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: harddisk temperature graphs
@@ -352,6 +349,9 @@ WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
+WARNING: translation string unused: locationblock country code
+WARNING: translation string unused: locationblock country name
+WARNING: translation string unused: locationblock flag
 WARNING: translation string unused: log enabled
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
@@ -1000,10 +1000,10 @@ WARNING: untranslated string: fwdfw wd_thu = Thu
 WARNING: untranslated string: fwdfw wd_tue = Tue
 WARNING: untranslated string: fwdfw wd_wed = Wed
 WARNING: untranslated string: fwhost OpenVPN N-2-N = OpenVPN Net-to-Net
-WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
 WARNING: untranslated string: fwhost addgrp = Add new network/host group
 WARNING: untranslated string: fwhost addgrpname = Group name:
 WARNING: untranslated string: fwhost addhost = Add new host
+WARNING: untranslated string: fwhost addlocationgrp = Add new Location group
 WARNING: untranslated string: fwhost addnet = Add new network
 WARNING: untranslated string: fwhost addservice = Add service
 WARNING: untranslated string: fwhost addservicegrp = Add new service group
@@ -1013,10 +1013,10 @@ WARNING: untranslated string: fwhost ccdhost = OpenVPN clients:
 WARNING: untranslated string: fwhost ccdnet = OpenVPN networks:
 WARNING: untranslated string: fwhost change = Modify
 WARNING: untranslated string: fwhost cust addr = Hosts
-WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
-WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
 WARNING: untranslated string: fwhost cust grp = Network/Host Groups
+WARNING: untranslated string: fwhost cust location = Location Groups
+WARNING: untranslated string: fwhost cust locationgroup = Location Groups
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost cust net = Networks
 WARNING: untranslated string: fwhost cust service = Services
 WARNING: untranslated string: fwhost cust srvgrp = Service Groups
@@ -1055,9 +1055,9 @@ WARNING: untranslated string: fwhost ip_mac = IP/MAC address
 WARNING: untranslated string: fwhost ipsec net = IPsec networks:
 WARNING: untranslated string: fwhost menu = Firewall Groups
 WARNING: untranslated string: fwhost netaddress = Network address
-WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
 WARNING: untranslated string: fwhost newgrp = Network/Host Groups
 WARNING: untranslated string: fwhost newhost = Hosts
+WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: fwhost newnet = Networks
 WARNING: untranslated string: fwhost newservice = Services
 WARNING: untranslated string: fwhost newservicegrp = Service Groups
@@ -1208,7 +1208,6 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not
 WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.
 WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.
 WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server.
-WARNING: untranslated string: other = Other
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
 WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access
 WARNING: untranslated string: outgoing firewall p2p allow = Using the P2P protocol is allowed

doc/language_issues.fr

@@ -346,7 +346,7 @@ WARNING: translation string unused: fwhost Standard Network
 WARNING: translation string unused: fwhost attention
 WARNING: translation string unused: fwhost blue
 WARNING: translation string unused: fwhost changeremark
-WARNING: translation string unused: fwhost cust geoip
+WARNING: translation string unused: fwhost cust locationlocation
 WARNING: translation string unused: fwhost err addrgrp
 WARNING: translation string unused: fwhost err hostorip
 WARNING: translation string unused: fwhost err mac
@@ -366,9 +366,6 @@ WARNING: translation string unused: generatekeys
 WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
-WARNING: translation string unused: geoipblock country code
-WARNING: translation string unused: geoipblock country name
-WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: harddisk temperature graphs
@@ -431,6 +428,9 @@ WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
+WARNING: translation string unused: locationblock country code
+WARNING: translation string unused: locationblock country name
+WARNING: translation string unused: locationblock flag
 WARNING: translation string unused: log enabled
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
@@ -520,6 +520,7 @@ WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
+WARNING: translation string unused: other
 WARNING: translation string unused: our donors
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing firewall
@@ -805,7 +806,7 @@ WARNING: translation string unused: zoneconf val ppp assignment error
 WARNING: translation string unused: zoneconf val vlan amount assignment error
 WARNING: translation string unused: zoneconf val vlan tag assignment error
 WARNING: translation string unused: zoneconf val zoneslave amount error
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
@@ -840,4 +841,3 @@ WARNING: untranslated string: pakfire ago = ago.
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
-WARNING: untranslated string: srbds = Special register buffer data sampling

doc/language_issues.it

@@ -494,6 +494,7 @@ WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
+WARNING: translation string unused: other
 WARNING: translation string unused: our donors
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing firewall
@@ -903,20 +904,13 @@ WARNING: untranslated string: fwdfw limitconcon = Limit concurrent connections p
 WARNING: untranslated string: fwdfw maxconcon = Max. concurrent connections
 WARNING: untranslated string: fwdfw numcon = Number of connections
 WARNING: untranslated string: fwdfw ratelimit = Rate-limit new connections
-WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
-WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
-WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
+WARNING: untranslated string: fwhost addlocationgrp = Add new Location group
+WARNING: untranslated string: fwhost cust location = Location Groups
+WARNING: untranslated string: fwhost cust locationgroup = Location Groups
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
-WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
+WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: generate ptr = Generate PTR
-WARNING: untranslated string: geoip = Location
-WARNING: untranslated string: geoipblock = Location Block
-WARNING: untranslated string: geoipblock block countries = Block countries
-WARNING: untranslated string: geoipblock configuration = Location Configuration
-WARNING: untranslated string: geoipblock country is allowed = Incoming traffic from this country is allowed
-WARNING: untranslated string: geoipblock country is blocked = Incoming traffic from this country will be blocked
-WARNING: untranslated string: geoipblock enable feature = Enable Location based blocking:
 WARNING: untranslated string: guaranteed bandwith = Guaranteed bandwith
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string
@@ -989,6 +983,13 @@ WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table
 WARNING: untranslated string: ipsec settings = IPsec Settings
 WARNING: untranslated string: itlb multihit = iTLB MultiHit
 WARNING: untranslated string: local ip address = Local IP Address
+WARNING: untranslated string: location = Location
+WARNING: untranslated string: locationblock = Location Block
+WARNING: untranslated string: locationblock block countries = Block countries
+WARNING: untranslated string: locationblock configuration = Location Configuration
+WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed
+WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
+WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
 WARNING: untranslated string: log server protocol = protocol:
 WARNING: untranslated string: masquerade blue = Masquerade BLUE
 WARNING: untranslated string: masquerade green = Masquerade GREEN

doc/language_issues.nl

@@ -489,6 +489,7 @@ WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
+WARNING: translation string unused: other
 WARNING: translation string unused: our donors
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing firewall
@@ -909,22 +910,15 @@ WARNING: untranslated string: fwdfw limitconcon = Limit concurrent connections p
 WARNING: untranslated string: fwdfw maxconcon = Max. concurrent connections
 WARNING: untranslated string: fwdfw numcon = Number of connections
 WARNING: untranslated string: fwdfw ratelimit = Rate-limit new connections
-WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
-WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
-WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
+WARNING: untranslated string: fwhost addlocationgrp = Add new Location group
+WARNING: untranslated string: fwhost cust location = Location Groups
+WARNING: untranslated string: fwhost cust locationgroup = Location Groups
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
-WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
+WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters
 WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters
 WARNING: untranslated string: generate ptr = Generate PTR
-WARNING: untranslated string: geoip = Location
-WARNING: untranslated string: geoipblock = Location Block
-WARNING: untranslated string: geoipblock block countries = Block countries
-WARNING: untranslated string: geoipblock configuration = Location Configuration
-WARNING: untranslated string: geoipblock country is allowed = Incoming traffic from this country is allowed
-WARNING: untranslated string: geoipblock country is blocked = Incoming traffic from this country will be blocked
-WARNING: untranslated string: geoipblock enable feature = Enable Location based blocking:
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string
 WARNING: untranslated string: guardian block httpd brute-force = unknown string
@@ -998,6 +992,13 @@ WARNING: untranslated string: ipsec routing table entries = IPsec Routing Table
 WARNING: untranslated string: ipsec settings = IPsec Settings
 WARNING: untranslated string: itlb multihit = iTLB MultiHit
 WARNING: untranslated string: local ip address = Local IP Address
+WARNING: untranslated string: location = Location
+WARNING: untranslated string: locationblock = Location Block
+WARNING: untranslated string: locationblock block countries = Block countries
+WARNING: untranslated string: locationblock configuration = Location Configuration
+WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed
+WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
+WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
 WARNING: untranslated string: log server protocol = protocol:
 WARNING: untranslated string: masquerade blue = Masquerade BLUE
 WARNING: untranslated string: masquerade green = Masquerade GREEN

doc/language_issues.pl

@@ -284,9 +284,6 @@ WARNING: translation string unused: generatekeys
 WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
-WARNING: translation string unused: geoipblock country code
-WARNING: translation string unused: geoipblock country name
-WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: harddisk temperature graphs
@@ -352,6 +349,9 @@ WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
+WARNING: translation string unused: locationblock country code
+WARNING: translation string unused: locationblock country name
+WARNING: translation string unused: locationblock flag
 WARNING: translation string unused: log enabled
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
@@ -1000,10 +1000,10 @@ WARNING: untranslated string: fwdfw wd_thu = Thu
 WARNING: untranslated string: fwdfw wd_tue = Tue
 WARNING: untranslated string: fwdfw wd_wed = Wed
 WARNING: untranslated string: fwhost OpenVPN N-2-N = OpenVPN Net-to-Net
-WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
 WARNING: untranslated string: fwhost addgrp = Add new network/host group
 WARNING: untranslated string: fwhost addgrpname = Group name:
 WARNING: untranslated string: fwhost addhost = Add new host
+WARNING: untranslated string: fwhost addlocationgrp = Add new Location group
 WARNING: untranslated string: fwhost addnet = Add new network
 WARNING: untranslated string: fwhost addservice = Add service
 WARNING: untranslated string: fwhost addservicegrp = Add new service group
@@ -1013,10 +1013,10 @@ WARNING: untranslated string: fwhost ccdhost = OpenVPN clients:
 WARNING: untranslated string: fwhost ccdnet = OpenVPN networks:
 WARNING: untranslated string: fwhost change = Modify
 WARNING: untranslated string: fwhost cust addr = Hosts
-WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
-WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
 WARNING: untranslated string: fwhost cust grp = Network/Host Groups
+WARNING: untranslated string: fwhost cust location = Location Groups
+WARNING: untranslated string: fwhost cust locationgroup = Location Groups
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost cust net = Networks
 WARNING: untranslated string: fwhost cust service = Services
 WARNING: untranslated string: fwhost cust srvgrp = Service Groups
@@ -1055,9 +1055,9 @@ WARNING: untranslated string: fwhost ip_mac = IP/MAC address
 WARNING: untranslated string: fwhost ipsec net = IPsec networks:
 WARNING: untranslated string: fwhost menu = Firewall Groups
 WARNING: untranslated string: fwhost netaddress = Network address
-WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
 WARNING: untranslated string: fwhost newgrp = Network/Host Groups
 WARNING: untranslated string: fwhost newhost = Hosts
+WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: fwhost newnet = Networks
 WARNING: untranslated string: fwhost newservice = Services
 WARNING: untranslated string: fwhost newservicegrp = Service Groups
@@ -1208,7 +1208,6 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not
 WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.
 WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.
 WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server.
-WARNING: untranslated string: other = Other
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
 WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access
 WARNING: untranslated string: outgoing firewall p2p allow = Using the P2P protocol is allowed

doc/language_issues.ru

@@ -994,10 +994,10 @@ WARNING: untranslated string: fwdfw wd_thu = Thu
 WARNING: untranslated string: fwdfw wd_tue = Tue
 WARNING: untranslated string: fwdfw wd_wed = Wed
 WARNING: untranslated string: fwhost OpenVPN N-2-N = OpenVPN Net-to-Net
-WARNING: untranslated string: fwhost addgeoipgrp = Add new Location group
 WARNING: untranslated string: fwhost addgrp = Add new network/host group
 WARNING: untranslated string: fwhost addgrpname = Group name:
 WARNING: untranslated string: fwhost addhost = Add new host
+WARNING: untranslated string: fwhost addlocationgrp = Add new Location group
 WARNING: untranslated string: fwhost addnet = Add new network
 WARNING: untranslated string: fwhost addservice = Add service
 WARNING: untranslated string: fwhost addservicegrp = Add new service group
@@ -1007,10 +1007,10 @@ WARNING: untranslated string: fwhost ccdhost = OpenVPN clients:
 WARNING: untranslated string: fwhost ccdnet = OpenVPN networks:
 WARNING: untranslated string: fwhost change = Modify
 WARNING: untranslated string: fwhost cust addr = Hosts
-WARNING: untranslated string: fwhost cust geoipgroup = Location Groups
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
-WARNING: untranslated string: fwhost cust geoiplocation = Location Locations
 WARNING: untranslated string: fwhost cust grp = Network/Host Groups
+WARNING: untranslated string: fwhost cust location = Location Groups
+WARNING: untranslated string: fwhost cust locationgroup = Location Groups
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost cust net = Networks
 WARNING: untranslated string: fwhost cust service = Services
 WARNING: untranslated string: fwhost cust srvgrp = Service Groups
@@ -1049,9 +1049,9 @@ WARNING: untranslated string: fwhost ip_mac = IP/MAC address
 WARNING: untranslated string: fwhost ipsec net = IPsec networks:
 WARNING: untranslated string: fwhost menu = Firewall Groups
 WARNING: untranslated string: fwhost netaddress = Network address
-WARNING: untranslated string: fwhost newgeoipgrp = Location Groups
 WARNING: untranslated string: fwhost newgrp = Network/Host Groups
 WARNING: untranslated string: fwhost newhost = Hosts
+WARNING: untranslated string: fwhost newlocationgrp = Location Groups
 WARNING: untranslated string: fwhost newnet = Networks
 WARNING: untranslated string: fwhost newservice = Services
 WARNING: untranslated string: fwhost newservicegrp = Service Groups
@@ -1067,13 +1067,6 @@ WARNING: untranslated string: fwhost welcome = Over here, you can group single h
 WARNING: untranslated string: gen dh = Generate new Diffie-Hellman parameters
 WARNING: untranslated string: generate dh key = Generate Diffie-Hellman parameters
 WARNING: untranslated string: generate ptr = Generate PTR
-WARNING: untranslated string: geoip = Location
-WARNING: untranslated string: geoipblock = Location Block
-WARNING: untranslated string: geoipblock block countries = Block countries
-WARNING: untranslated string: geoipblock configuration = Location Configuration
-WARNING: untranslated string: geoipblock country is allowed = Incoming traffic from this country is allowed
-WARNING: untranslated string: geoipblock country is blocked = Incoming traffic from this country will be blocked
-WARNING: untranslated string: geoipblock enable feature = Enable Location based blocking:
 WARNING: untranslated string: grouptype = Grouptype:
 WARNING: untranslated string: guardian = Guardian
 WARNING: untranslated string: guardian block a host = unknown string
@@ -1159,6 +1152,13 @@ WARNING: untranslated string: last = Last
 WARNING: untranslated string: least preferred = least preferred
 WARNING: untranslated string: lifetime = Lifetime:
 WARNING: untranslated string: local ip address = Local IP Address
+WARNING: untranslated string: location = Location
+WARNING: untranslated string: locationblock = Location Block
+WARNING: untranslated string: locationblock block countries = Block countries
+WARNING: untranslated string: locationblock configuration = Location Configuration
+WARNING: untranslated string: locationblock country is allowed = Incoming traffic from this country is allowed
+WARNING: untranslated string: locationblock country is blocked = Incoming traffic from this country will be blocked
+WARNING: untranslated string: locationblock enable feature = Enable Location based blocking:
 WARNING: untranslated string: log server protocol = protocol:
 WARNING: untranslated string: mac filter = MAC filter
 WARNING: untranslated string: masquerade blue = Masquerade BLUE
@@ -1210,7 +1210,6 @@ WARNING: untranslated string: openvpn prefix local subnet = Using the prefix not
 WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix notation is not supported for the OpenVPN subnet. Please enter a subnet mask like 255.255.255.0.
 WARNING: untranslated string: openvpn prefix remote subnet = Using the prefix notation is not supported for the remote subnet. Please enter a subnet mask like 255.255.255.0.
 WARNING: untranslated string: openvpn subnet is used = The given subnet is used by another OpenVPN server.
-WARNING: untranslated string: other = Other
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
 WARNING: untranslated string: outgoing firewall access = Outgoing Firewall Access
 WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead

doc/language_issues.tr

@@ -343,7 +343,7 @@ WARNING: translation string unused: fwhost Standard Network
 WARNING: translation string unused: fwhost attention
 WARNING: translation string unused: fwhost blue
 WARNING: translation string unused: fwhost changeremark
-WARNING: translation string unused: fwhost cust geoip
+WARNING: translation string unused: fwhost cust locationlocation
 WARNING: translation string unused: fwhost err addrgrp
 WARNING: translation string unused: fwhost err hostorip
 WARNING: translation string unused: fwhost err mac
@@ -365,9 +365,6 @@ WARNING: translation string unused: generatekeys
 WARNING: translation string unused: generatepolicy
 WARNING: translation string unused: generatereport
 WARNING: translation string unused: genkey
-WARNING: translation string unused: geoipblock country code
-WARNING: translation string unused: geoipblock country name
-WARNING: translation string unused: geoipblock flag
 WARNING: translation string unused: green interface
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: harddisk temperature graphs
@@ -434,6 +431,9 @@ WARNING: translation string unused: loaded modules
 WARNING: translation string unused: local hard disk
 WARNING: translation string unused: localkey
 WARNING: translation string unused: localkeyfile
+WARNING: translation string unused: locationblock country code
+WARNING: translation string unused: locationblock country name
+WARNING: translation string unused: locationblock flag
 WARNING: translation string unused: log enabled
 WARNING: translation string unused: log var messages
 WARNING: translation string unused: log viewer
@@ -522,6 +522,7 @@ WARNING: translation string unused: optionsfw portlist hint
 WARNING: translation string unused: optionsfw warning
 WARNING: translation string unused: or
 WARNING: translation string unused: original
+WARNING: translation string unused: other
 WARNING: translation string unused: our donors
 WARNING: translation string unused: out
 WARNING: translation string unused: outgoing firewall
@@ -847,7 +848,7 @@ WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL
 WARNING: untranslated string: force enable = Forced
 WARNING: untranslated string: foreshadow = Foreshadow
 WARNING: untranslated string: fwdfw all subnets = All subnets
-WARNING: untranslated string: fwhost cust geoipgrp = unknown string
+WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: generate ptr = Generate PTR
 WARNING: untranslated string: guardian block a host = unknown string

doc/language_missings

@@ -421,10 +421,10 @@
 < fwdfw wd_tue
 < fwdfw wd_wed
 < fwdfw xt access
-< fwhost addgeoipgrp
 < fwhost addgrp
 < fwhost addgrpname
 < fwhost addhost
+< fwhost addlocationgrp
 < fwhost addnet
 < fwhost addservice
 < fwhost addservicegrp
@@ -437,10 +437,10 @@
 < fwhost change
 < fwhost changeremark
 < fwhost cust addr
-< fwhost cust geoip
-< fwhost cust geoipgroup
-< fwhost cust geoiplocation
 < fwhost cust grp
+< fwhost cust location
+< fwhost cust locationgroup
+< fwhost cust locationlocation
 < fwhost cust net
 < fwhost Custom Host
 < fwhost Custom Network
@@ -490,9 +490,9 @@
 < fwhost IpSec Network
 < fwhost menu
 < fwhost netaddress
-< fwhost newgeoipgrp
 < fwhost newgrp
 < fwhost newhost
+< fwhost newlocationgrp
 < fwhost newnet
 < fwhost newservice
 < fwhost newservicegrp
@@ -921,7 +921,6 @@
 < bewan adsl usb
 < g.dtm
 < g.lite
-< srbds
 < upload fcdsl.o
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
@@ -1080,22 +1079,12 @@
 < fwdfw maxconcon
 < fwdfw numcon
 < fwdfw ratelimit
-< fwhost addgeoipgrp
-< fwhost cust geoip
-< fwhost cust geoipgroup
-< fwhost cust geoiplocation
-< fwhost newgeoipgrp
+< fwhost addlocationgrp
+< fwhost cust location
+< fwhost cust locationgroup
+< fwhost cust locationlocation
+< fwhost newlocationgrp
 < generate ptr
-< geoip
-< geoipblock
-< geoipblock block countries
-< geoipblock configuration
-< geoipblock country code
-< geoipblock country is allowed
-< geoipblock country is blocked
-< geoipblock country name
-< geoipblock enable feature
-< geoipblock flag
 < guaranteed bandwith
 < guardian
 < hardware vulnerabilities
@@ -1139,6 +1128,16 @@
 < ipsec settings
 < itlb multihit
 < local ip address
+< location
+< locationblock
+< locationblock block countries
+< locationblock configuration
+< locationblock country code
+< locationblock country is allowed
+< locationblock country is blocked
+< locationblock country name
+< locationblock enable feature
+< locationblock flag
 < log server protocol
 < masquerade blue
 < masquerade green
@@ -1451,24 +1450,14 @@
 < fwdfw maxconcon
 < fwdfw numcon
 < fwdfw ratelimit
-< fwhost addgeoipgrp
-< fwhost cust geoip
-< fwhost cust geoipgroup
-< fwhost cust geoiplocation
-< fwhost newgeoipgrp
+< fwhost addlocationgrp
+< fwhost cust location
+< fwhost cust locationgroup
+< fwhost cust locationlocation
+< fwhost newlocationgrp
 < gen dh
 < generate dh key
 < generate ptr
-< geoip
-< geoipblock
-< geoipblock block countries
-< geoipblock configuration
-< geoipblock country code
-< geoipblock country is allowed
-< geoipblock country is blocked
-< geoipblock country name
-< geoipblock enable feature
-< geoipblock flag
 < guardian
 < hardware vulnerabilities
 < ids apply
@@ -1513,6 +1502,16 @@
 < ipsec settings
 < itlb multihit
 < local ip address
+< location
+< locationblock
+< locationblock block countries
+< locationblock configuration
+< locationblock country code
+< locationblock country is allowed
+< locationblock country is blocked
+< locationblock country name
+< locationblock enable feature
+< locationblock flag
 < log server protocol
 < masquerade blue
 < masquerade green
@@ -2047,10 +2046,10 @@
 < fwdfw wd_tue
 < fwdfw wd_wed
 < fwdfw xt access
-< fwhost addgeoipgrp
 < fwhost addgrp
 < fwhost addgrpname
 < fwhost addhost
+< fwhost addlocationgrp
 < fwhost addnet
 < fwhost addservice
 < fwhost addservicegrp
@@ -2063,10 +2062,10 @@
 < fwhost change
 < fwhost changeremark
 < fwhost cust addr
-< fwhost cust geoip
-< fwhost cust geoipgroup
-< fwhost cust geoiplocation
 < fwhost cust grp
+< fwhost cust location
+< fwhost cust locationgroup
+< fwhost cust locationlocation
 < fwhost cust net
 < fwhost Custom Host
 < fwhost Custom Network
@@ -2116,9 +2115,9 @@
 < fwhost IpSec Network
 < fwhost menu
 < fwhost netaddress
-< fwhost newgeoipgrp
 < fwhost newgrp
 < fwhost newhost
+< fwhost newlocationgrp
 < fwhost newnet
 < fwhost newservice
 < fwhost newservicegrp
@@ -2147,16 +2146,6 @@
 < gen dh
 < generate dh key
 < generate ptr
-< geoip
-< geoipblock
-< geoipblock block countries
-< geoipblock configuration
-< geoipblock country code
-< geoipblock country is allowed
-< geoipblock country is blocked
-< geoipblock country name
-< geoipblock enable feature
-< geoipblock flag
 < grouptype
 < guardian
 < hardware support
@@ -2213,6 +2202,16 @@
 < least preferred
 < lifetime
 < local ip address
+< location
+< locationblock
+< locationblock block countries
+< locationblock configuration
+< locationblock country code
+< locationblock country is allowed
+< locationblock country is blocked
+< locationblock country name
+< locationblock enable feature
+< locationblock flag
 < log server protocol
 < mac filter
 < masquerade blue
@@ -2901,10 +2900,10 @@
 < fwdfw wd_tue
 < fwdfw wd_wed
 < fwdfw xt access
-< fwhost addgeoipgrp
 < fwhost addgrp
 < fwhost addgrpname
 < fwhost addhost
+< fwhost addlocationgrp
 < fwhost addnet
 < fwhost addservice
 < fwhost addservicegrp
@@ -2917,10 +2916,10 @@
 < fwhost change
 < fwhost changeremark
 < fwhost cust addr
-< fwhost cust geoip
-< fwhost cust geoipgroup
-< fwhost cust geoiplocation
 < fwhost cust grp
+< fwhost cust location
+< fwhost cust locationgroup
+< fwhost cust locationlocation
 < fwhost cust net
 < fwhost Custom Host
 < fwhost Custom Network
@@ -2970,9 +2969,9 @@
 < fwhost IpSec Network
 < fwhost menu
 < fwhost netaddress
-< fwhost newgeoipgrp
 < fwhost newgrp
 < fwhost newhost
+< fwhost newlocationgrp
 < fwhost newnet
 < fwhost newservice
 < fwhost newservicegrp
@@ -3001,16 +3000,6 @@
 < gen dh
 < generate dh key
 < generate ptr
-< geoip
-< geoipblock
-< geoipblock block countries
-< geoipblock configuration
-< geoipblock country code
-< geoipblock country is allowed
-< geoipblock country is blocked
-< geoipblock country name
-< geoipblock enable feature
-< geoipblock flag
 < grouptype
 < guardian
 < hardware support
@@ -3069,6 +3058,16 @@
 < least preferred
 < lifetime
 < local ip address
+< location
+< locationblock
+< locationblock block countries
+< locationblock configuration
+< locationblock country code
+< locationblock country is allowed
+< locationblock country is blocked
+< locationblock country name
+< locationblock enable feature
+< locationblock flag
 < log server protocol
 < mac filter
 < masquerade blue

langs/de/cgi-bin/de.pl

@@ -1211,10 +1211,10 @@
 'fwhost OpenVPN static host' => 'OpenVPN statischer Host',
 'fwhost OpenVPN static network' => 'OpenVPN statisches Netzwerk',
 'fwhost Standard Network' => 'Standard-Netzwerk',
-'fwhost addlocationgrp' => 'Neue Location-Gruppe hinzufügen',
 'fwhost addgrp' => 'Neue Gruppe hinzufügen',
 'fwhost addgrpname' => 'Gruppenname:',
 'fwhost addhost' => 'Neuen Host hinzufügen',
+'fwhost addlocationgrp' => 'Neue Location-Gruppe hinzufügen',
 'fwhost addnet' => 'Neues Netzwerk hinzufügen',
 'fwhost addservice' => 'Neuen Dienst hinzufügen',
 'fwhost addservicegrp' => 'Neue Dienstgruppe hinzufügen',
@@ -1227,10 +1227,10 @@
 'fwhost change' => 'Ändern',
 'fwhost changeremark' => 'Es wurde nur die Bemerkung angepasst.',
 'fwhost cust addr' => 'Hosts',
+'fwhost cust grp' => 'Gruppen',
 'fwhost cust location' => 'Location-Gruppen',
 'fwhost cust locationgroup' => 'Location-Gruppen',
 'fwhost cust locationlocation' => 'Location-Ländercodes',
-'fwhost cust grp' => 'Gruppen',
 'fwhost cust net' => 'Netzwerke',
 'fwhost cust service' => 'Dienste',
 'fwhost cust srvgrp' => 'Dienstgruppen',
@@ -1276,9 +1276,9 @@
 'fwhost ipsec net' => 'IPsec-Netzwerke:',
 'fwhost menu' => 'Firewallgruppen',
 'fwhost netaddress' => 'Netzwerkadresse',
-'fwhost newlocationgrp' => 'Location-Gruppen',
 'fwhost newgrp' => 'Netzwerk-/Hostgruppen',
 'fwhost newhost' => 'Hosts',
+'fwhost newlocationgrp' => 'Location-Gruppen',
 'fwhost newnet' => 'Netzwerke',
 'fwhost newservice' => 'Dienst',
 'fwhost newservicegrp' => 'Dienstgruppen',
@@ -1312,16 +1312,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' => 'Die Erzeugung der Root- und Host-Zertifikate kann eine Weile dauern.  Auf älterer Hardware kann dies mehrere Minuten in Anspruch nehmen. Bitte haben Sie etwas Geduld.',
 'genkey' => 'PSK erzeugen',
 'genre' => 'Genre',
-'location' => 'Länderfilter konfigurieren',
-'locationblock' => 'Location-Filter',
-'locationblock block countries' => 'Länderfilter',
-'locationblock configuration' => 'Location-Konfiguration',
-'locationblock country code' => 'Ländercode',
-'locationblock country is allowed' => 'Eingehende Verbindungen aus diesem Land sind erlaubt.',
-'locationblock country is blocked' => 'Eingehende Verbindungen aus diesem Land werden blockiert.',
-'locationblock country name' => 'Ländername',
-'locationblock enable feature' => 'Location-basierte Filterung aktivieren:',
-'locationblock flag' => 'Flagge',
 'global settings' => 'Globale Einstellungen',
 'gpl i accept these terms and conditions' => 'Ich akzeptiere diese Bedingungen und Konditionen',
 'gpl license agreement' => 'Lizenzvereinbarung',
@@ -1575,6 +1565,16 @@
 'local vpn hostname/ip' => 'Lokaler VPN Hostname/IP',
 'localkey' => 'Localkey',
 'localkeyfile' => 'Localkeyfile',
+'location' => 'Länderfilter konfigurieren',
+'locationblock' => 'Location-Filter',
+'locationblock block countries' => 'Länderfilter',
+'locationblock configuration' => 'Location-Konfiguration',
+'locationblock country code' => 'Ländercode',
+'locationblock country is allowed' => 'Eingehende Verbindungen aus diesem Land sind erlaubt.',
+'locationblock country is blocked' => 'Eingehende Verbindungen aus diesem Land werden blockiert.',
+'locationblock country name' => 'Ländername',
+'locationblock enable feature' => 'Location-basierte Filterung aktivieren:',
+'locationblock flag' => 'Flagge',
 'log' => 'Protokoll',
 'log enabled' => 'Protokoll aktiviert',
 'log level' => 'Protokollierungsniveau',

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 addlocationgrp' => 'Add new Location group',
 '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',
@@ -1249,10 +1249,10 @@
 '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 grp' => 'Network/Host 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 newlocationgrp' => 'Location Groups',
 'fwhost newgrp' => 'Network/Host Groups',
 'fwhost newhost' => 'Hosts',
+'fwhost newlocationgrp' => 'Location 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',
-'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',
@@ -1599,6 +1589,16 @@
 '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',

langs/es/cgi-bin/es.pl

@@ -866,16 +866,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' => 'Generar los certificador root y host puede tomar mucho tiempo. Puede durar varios minutos en equipos antiguos. Por favor sea paciente.',
 'genkey' => 'Generar PSK',
 'genre' => 'Género',
-'location' => 'Location',
-'locationblock' => 'Location Block',
-'locationblock block countries' => 'Países bloqueados',
-'locationblock configuration' => 'Configuración Location',
-'locationblock country code' => 'Código del País',
-'locationblock country is allowed' => 'Se permite el tráfico procedente de este País',
-'locationblock country is blocked' => 'Se deniega el tráfico procedente de este País',
-'locationblock country name' => 'Nombre del País',
-'locationblock enable feature' => 'Habilitar bloqueo basado Location:',
-'locationblock flag' => 'Bandera',
 'global settings' => 'Configuraciones globales',
 'gpl i accept these terms and conditions' => 'I accept these terms and conditions',
 'gpl license agreement' => 'License Agreement',
@@ -1078,6 +1068,16 @@
 'local vpn hostname/ip' => 'Nombre de host/IP para VPN local',
 'localkey' => 'Llave local',
 'localkeyfile' => 'archivo de llave local',
+'location' => 'Location',
+'locationblock' => 'Location Block',
+'locationblock block countries' => 'Países bloqueados',
+'locationblock configuration' => 'Configuración Location',
+'locationblock country code' => 'Código del País',
+'locationblock country is allowed' => 'Se permite el tráfico procedente de este País',
+'locationblock country is blocked' => 'Se deniega el tráfico procedente de este País',
+'locationblock country name' => 'Nombre del País',
+'locationblock enable feature' => 'Habilitar bloqueo basado Location:',
+'locationblock flag' => 'Bandera',
 'log' => 'Registros:',
 'log enabled' => 'Registros activados',
 'log level' => 'Nivel de registros',

langs/fr/cgi-bin/fr.pl

@@ -376,7 +376,7 @@
 'advproxy standard ports' => 'Ports standards autorisés (un par ligne) ',
 'advproxy sunday' => 'Dim',
 'advproxy supervisor password' => 'Mot de passe superviseur',
-'advproxy suppress version' => 'Informations sur la version supprimée ',
+'advproxy suppress version' => 'Supprimer l\'information de version ',
 'advproxy throttle binary' => 'Fichiers binaires ',
 'advproxy throttle dskimg' => 'Images CD ',
 'advproxy throttle mmedia' => 'Multimédia ',
@@ -1240,10 +1240,10 @@
 'fwhost OpenVPN static host' => 'Hôte statique OpenVPN',
 'fwhost OpenVPN static network' => 'Réseau statique OpenVPN',
 'fwhost Standard Network' => 'Réseau standard',
-'fwhost addlocationgrp' => 'Ajouter un groupe Location',
 'fwhost addgrp' => 'Ajouter un réseau / groupe d\'hôtes',
 'fwhost addgrpname' => 'Nom du groupe :',
 'fwhost addhost' => 'Ajouter un hôte',
+'fwhost addlocationgrp' => 'Ajouter un groupe par localisation',
 'fwhost addnet' => 'Ajouter un réseau',
 'fwhost addservice' => 'Ajouter un service',
 'fwhost addservicegrp' => 'Ajouter un groupe de service',
@@ -1256,10 +1256,10 @@
 'fwhost change' => 'Modifier',
 'fwhost changeremark' => 'Vous avez juste modifié la remarque',
 'fwhost cust addr' => 'Hôtes',
-'fwhost cust location' => 'Groupes Location',
-'fwhost cust locationgroup' => 'Groupes Location',
-'fwhost cust locationlocation' => 'Emplacements Location',
 'fwhost cust grp' => 'Réseau / groupes hôte',
+'fwhost cust location' => 'Localisation par pays',
+'fwhost cust locationgroup' => 'Localisation par groupe',
+'fwhost cust locationlocation' => 'Emplacements de localisation',
 'fwhost cust net' => 'Réseaux',
 'fwhost cust service' => 'Services',
 'fwhost cust srvgrp' => 'Groupes de service',
@@ -1305,9 +1305,9 @@
 'fwhost ipsec net' => 'Réseaux IPsec :',
 'fwhost menu' => 'Groupes de pare-feu',
 'fwhost netaddress' => 'Adresse réseau ',
-'fwhost newlocationgrp' => 'Groupes Location',
 'fwhost newgrp' => 'Réseau / groupes hôtes',
 'fwhost newhost' => 'Hôtes',
+'fwhost newlocationgrp' => 'Groupes par localisation',
 'fwhost newnet' => 'Réseaux',
 'fwhost newservice' => 'Services',
 'fwhost newservicegrp' => 'Groupes de service',
@@ -1341,16 +1341,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' => 'Générer le certificat root et le certificat hôte peut prendre du temps. Cela peut prendre plusieurs minutes sur du matériel ancien, veuillez patienter.',
 'genkey' => 'Générer PSK',
 'genre' => 'Genre',
-'location' => 'Location',
-'locationblock' => 'Blocage Location',
-'locationblock block countries' => 'Blocage des pays',
-'locationblock configuration' => 'Configuration Location',
-'locationblock country code' => 'Code pays',
-'locationblock country is allowed' => 'Le trafic entrant de ce pays sera autorisé',
-'locationblock country is blocked' => 'Le trafic entrant de ce pays sera bloqué',
-'locationblock country name' => 'Nom de pays',
-'locationblock enable feature' => 'Activer le blocage Location :',
-'locationblock flag' => 'Drap.',
 'global settings' => 'Configuration générale',
 'gpl i accept these terms and conditions' => 'J\'accepte les termes et les conditions',
 'gpl license agreement' => 'Accord de licence',
@@ -1605,6 +1595,16 @@
 'local vpn hostname/ip' => 'Nom d\'hôte/IP du VPN local ',
 'localkey' => 'Clef locale',
 'localkeyfile' => 'Fichier clef locale',
+'location' => 'Localisation',
+'locationblock' => 'Blocage par localisation',
+'locationblock block countries' => 'Blocage des pays',
+'locationblock configuration' => 'Configuration de localisation',
+'locationblock country code' => 'Code pays',
+'locationblock country is allowed' => 'Le trafic entrant de ce pays sera autorisé',
+'locationblock country is blocked' => 'Le trafic entrant de ce pays sera bloqué',
+'locationblock country name' => 'Nom de pays',
+'locationblock enable feature' => 'Activer le blocage par localisation :',
+'locationblock flag' => 'Drap.',
 'log' => 'Rapport :',
 'log enabled' => 'Journal activé',
 'log level' => 'Niveau de rapport',
@@ -1931,7 +1931,7 @@
 'ovpn add conf' => 'Configuration additionnelle',
 'ovpn con stat' => 'Statistiques de connexions OpenVPN',
 'ovpn config' => 'Config OVPN',
-'ovpn connection name' => 'Nom de la connexion',
+'ovpn connection name' => 'Nom de la connexion ',
 'ovpn crypt options' => 'Options cryptographiques',
 'ovpn device' => 'Périphérique OpenVPN :',
 'ovpn dh' => 'Longueur de paramètres Diffie-Hellman ',
@@ -1963,7 +1963,7 @@
 'ovpn reneg sec' => 'Durée de vie de la clé de session :',
 'ovpn routes push' => 'Routes (une par ligne) :',
 'ovpn routes push options' => 'Options de route push',
-'ovpn rw connection log' => 'Rapports de connexions client nomade OpenVPN',
+'ovpn rw connection log' => 'Rapports de client nomade OpenVPN',
 'ovpn server status' => 'Statut actuel du serveur OpenVPN :',
 'ovpn subnet' => 'Sous-réseau OpenVPN',
 'ovpn subnet is invalid' => 'Sous-réseau OpenVPN non valide.',
@@ -2294,6 +2294,7 @@
 'squid extension methods' => 'Votre liste de <tt>méthodes d\'extension</tt>',
 'squid extension methods invalid' => 'Votre liste de méthodes d\'extension peut seulement contenir des mots composés de majuscules ou de chiffres, séparés par un espace. ',
 'squid fix cache' => 'Cache de réparation',
+'srbds' => 'Échantillonnage spécial données du tampon de registre - CrossTalk',
 'src port' => 'Port source',
 'srcprt range overlaps' => 'La plage de port source chevauche un port déjà défini.',
 'srcprt within existing' => 'Le port source est à l\'intérieur d\'une plage de port déjà définie.',
@@ -2877,9 +2878,9 @@
 'vpn start action add' => 'Attendre l\'initialisation de la connexion',
 'vpn start action route' => 'A la demande',
 'vpn start action start' => 'Toujours démarré',
-'vpn statistic n2n' => 'Stat OpenVPN (site-à-site)',
-'vpn statistic rw' => 'Stats OpenVPN (client nomade)',
-'vpn statistics n2n' => 'Stats OpenVPN (site-à-site)',
+'vpn statistic n2n' => 'OpenVPN (site-à-site)',
+'vpn statistic rw' => 'OpenVPN (client nomade)',
+'vpn statistics n2n' => 'OpenVPN (site-à-site)',
 'vpn subjectaltname' => 'Nom de l\'objet',
 'vpn subjectaltname missing' => 'Le nom de l\'objet ne peut être vide.',
 'vpn wait' => 'ATTENTE',
@@ -2990,7 +2991,7 @@
 'written bytes' => 'Octets écrits',
 'xtaccess all error' => 'Vous ne pouvez pas donner l\'accès externe à tout ce qui se fait dans le dossier de redirection de port.',
 'xtaccess bad transfert' => 'Si vous spécifiez une plage de ports de destination, la plage source doit être identique !',
-'year' => 'Année',
+'year' => 'Année ',
 'year-graph' => 'Annee',
 'yearly firewallhits' => 'Contacts annuels du pare-feu',
 'yes' => 'Oui',

langs/tr/cgi-bin/tr.pl

@@ -1187,10 +1187,10 @@
 'fwhost OpenVPN static host' => 'OpenVPN statik ana bilgisayar',
 'fwhost OpenVPN static network' => 'OpenVPN statik ağ',
 'fwhost Standard Network' => 'Standart ağ',
-'fwhost addlocationgrp' => 'Yeni Location grubu ekle',
 'fwhost addgrp' => 'Yeni ağ/ana bilgisayar grubu ekle:',
 'fwhost addgrpname' => 'Grup adı:',
 'fwhost addhost' => 'Yeni bir ana bilgisayar ekle:',
+'fwhost addlocationgrp' => 'Yeni Location grubu ekle',
 'fwhost addnet' => 'Yeni bir ağ ekle:',
 'fwhost addservice' => 'Hizmet ekle:',
 'fwhost addservicegrp' => 'Yeni bir hizmet grubu ekle:',
@@ -1203,10 +1203,10 @@
 'fwhost change' => 'Değiştir',
 'fwhost changeremark' => 'Sadece açıklamalar değiştirilmiş',
 'fwhost cust addr' => 'Ana bilgisayarlar',
+'fwhost cust grp' => 'Ağ/Ana Bilgisayar Grupları:',
 'fwhost cust location' => 'Location Grupları',
 'fwhost cust locationgroup' => 'Location Grupları',
 'fwhost cust locationlocation' => 'Location Konumları',
-'fwhost cust grp' => 'Ağ/Ana Bilgisayar Grupları:',
 'fwhost cust net' => 'Ağlar',
 'fwhost cust service' => 'Hizmetler:',
 'fwhost cust srvgrp' => 'Hizmet grupları:',
@@ -1252,9 +1252,9 @@
 'fwhost ipsec net' => 'IPsec ağları:',
 'fwhost menu' => 'Güvenlik Duvarı Grupları',
 'fwhost netaddress' => 'Ağ adresi',
-'fwhost newlocationgrp' => 'Location Grupları',
 'fwhost newgrp' => 'Ağ/Ana Bilgisayar Grupları',
 'fwhost newhost' => 'Ana Bilgisayarlar',
+'fwhost newlocationgrp' => 'Location Grupları',
 'fwhost newnet' => 'Ağlar',
 'fwhost newservice' => 'Hizmetler',
 'fwhost newservicegrp' => 'Hizmet Grupları',
@@ -1289,16 +1289,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' => 'Yönetici ve sunucu sertifikalarının oluşturulması biraz zaman alır. Eski donanımlarda bu süre birkaç dakikayı bulabilir. Lütfen bekleyin.',
 'genkey' => 'PSK oluştur',
 'genre' => 'Tür',
-'location' => 'Location',
-'locationblock' => 'Location Engelleme',
-'locationblock block countries' => 'Engellenen ülkeler',
-'locationblock configuration' => 'Location Yapılandırması',
-'locationblock country code' => 'Ülke Kodu',
-'locationblock country is allowed' => 'Bu ülkeden gelen trafiğe izin ver',
-'locationblock country is blocked' => 'Bu ülkeden gelen trafiği engelle',
-'locationblock country name' => 'Ülke Adı',
-'locationblock enable feature' => 'Location tabanlı engellemeyi aktifleştir:',
-'locationblock flag' => 'Bayrak',
 'global settings' => 'Genel ayarlar',
 'gpl i accept these terms and conditions' => 'Bu şartları kabul ediyorum',
 'gpl license agreement' => 'Lisans Sözleşmesi',
@@ -1521,6 +1511,16 @@
 'local vpn hostname/ip' => 'Yerel VPN ana bilgisayar adı/ip',
 'localkey' => 'yerel Anahtar',
 'localkeyfile' => 'Yerel Anahtar Dosyası',
+'location' => 'Location',
+'locationblock' => 'Location Engelleme',
+'locationblock block countries' => 'Engellenen ülkeler',
+'locationblock configuration' => 'Location Yapılandırması',
+'locationblock country code' => 'Ülke Kodu',
+'locationblock country is allowed' => 'Bu ülkeden gelen trafiğe izin ver',
+'locationblock country is blocked' => 'Bu ülkeden gelen trafiği engelle',
+'locationblock country name' => 'Ülke Adı',
+'locationblock enable feature' => 'Location tabanlı engellemeyi aktifleştir:',
+'locationblock flag' => 'Bayrak',
 'log' => 'Günlük:',
 'log enabled' => 'Günlük Aktif',
 'log level' => 'Günlük seviyesi',