fr: Update French translation

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2026-05-11 01:38:25 +02:00 · 2020-07-27 18:09:27 +00:00
parent 8cb99ea7bf
commit cd6bd02f53
15 changed files with 221 additions and 221 deletions
--- a/doc/language_issues.de
+++ b/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
--- a/doc/language_issues.en
+++ b/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
--- a/doc/language_issues.es
+++ b/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
--- a/doc/language_issues.fr
+++ b/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
--- a/doc/language_issues.it
+++ b/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
--- a/doc/language_issues.nl
+++ b/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
--- a/doc/language_issues.pl
+++ b/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
--- a/doc/language_issues.ru
+++ b/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
--- a/doc/language_issues.tr
+++ b/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
--- a/doc/language_missings
+++ b/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