diff --git a/doc/language_issues.de b/doc/language_issues.de
index 15db223fe..6a0354451 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -273,6 +273,7 @@ WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
 WARNING: translation string unused: enter ack class
+WARNING: translation string unused: entropy graphs
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -417,6 +418,13 @@ WARNING: translation string unused: invalid upstream proxy username or password
 WARNING: translation string unused: invalid users
 WARNING: translation string unused: invert
 WARNING: translation string unused: ip address in use
+WARNING: translation string unused: ipblocklist category application
+WARNING: translation string unused: ipblocklist category attacker
+WARNING: translation string unused: ipblocklist category c and c
+WARNING: translation string unused: ipblocklist category composite
+WARNING: translation string unused: ipblocklist category invalid
+WARNING: translation string unused: ipblocklist category reputation
+WARNING: translation string unused: ipblocklist category scanner
 WARNING: translation string unused: ipfire side
 WARNING: translation string unused: ipsec no connections
 WARNING: translation string unused: iptable rules
@@ -863,6 +871,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 vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: cake profile bridged-llcsnap 32 = Bridged LLC SNAP (32 bytes)
 WARNING: untranslated string: cake profile bridged-ptm 19 = Bridged PTM (19 bytes)
 WARNING: untranslated string: cake profile bridged-vcmux 24 = Bridged VC-MUX (24 bytes)
@@ -882,6 +891,7 @@ WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
 WARNING: untranslated string: enable = Enable
+WARNING: untranslated string: error message = unknown string
 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 locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 56ad0af4f..420b5df75 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -309,6 +309,7 @@ WARNING: untranslated string: aktiv = Active
 WARNING: untranslated string: album = Album
 WARNING: untranslated string: alias ip = Alias IP
 WARNING: untranslated string: aliases = Aliases
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: aliases not active = Aliases will not be active unless your RED interface is STATIC
 WARNING: untranslated string: all = All
 WARNING: untranslated string: all services = All Services
@@ -733,9 +734,9 @@ WARNING: untranslated string: encryption = Encryption:
 WARNING: untranslated string: end address = End address:
 WARNING: untranslated string: enter data = Enter your settings <br /> and then press <i>Save</i>.
 WARNING: untranslated string: entropy = Entropy
-WARNING: untranslated string: entropy graphs = Entropy Graphs
 WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
 WARNING: untranslated string: error = Error
+WARNING: untranslated string: error message = unknown string
 WARNING: untranslated string: error messages = Error messages
 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: esp keylife should be between 1 and 24 hours = ESP keylife should be between 1 and 24 hours.
@@ -1170,6 +1171,22 @@ WARNING: untranslated string: ip alias removed = External IP alias removed
 WARNING: untranslated string: ip basic info = Basic IP information
 WARNING: untranslated string: ip info = IP information
 WARNING: untranslated string: ip info for = IP information for
+WARNING: untranslated string: ipblocklist = IP Address Blocklists
+WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings
+WARNING: untranslated string: ipblocklist category = Category
+WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist
+WARNING: untranslated string: ipblocklist download error = A download error occured.
+WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received.
+WARNING: untranslated string: ipblocklist enable = Enable
+WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for
+WARNING: untranslated string: ipblocklist id = Blocklist
+WARNING: untranslated string: ipblocklist input = Packets dropped (IN)
+WARNING: untranslated string: ipblocklist log = Log dropped packets
+WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist)
+WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs
+WARNING: untranslated string: ipblocklist name = Name
+WARNING: untranslated string: ipblocklist output = Packets dropped (OUT)
+WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists
 WARNING: untranslated string: ipfire has now rebooted = IPFire is rebooting now.
 WARNING: untranslated string: ipfire has now shutdown = IPFire is shutting down now.
 WARNING: untranslated string: ipfire side is invalid = IPFire side is invalid.
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 09e7c0ad6..f248f2298 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -828,6 +828,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION
@@ -985,9 +986,9 @@ WARNING: untranslated string: enable otp = Enable OTP
 WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
 WARNING: untranslated string: encryption = Encryption:
 WARNING: untranslated string: entropy = Entropy
-WARNING: untranslated string: entropy graphs = Entropy Graphs
 WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
 WARNING: untranslated string: error = Error
+WARNING: untranslated string: error message = unknown string
 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: fallout zombieload ridl = Fallout/ZombieLoad/RIDL
 WARNING: untranslated string: fifteen minutes = 15 Minutes
@@ -1273,6 +1274,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ip basic info = Basic IP information
 WARNING: untranslated string: ip info for = IP information for
+WARNING: untranslated string: ipblocklist = IP Address Blocklists
+WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings
+WARNING: untranslated string: ipblocklist category = Category
+WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist
+WARNING: untranslated string: ipblocklist download error = A download error occured.
+WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received.
+WARNING: untranslated string: ipblocklist enable = Enable
+WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for
+WARNING: untranslated string: ipblocklist id = Blocklist
+WARNING: untranslated string: ipblocklist input = Packets dropped (IN)
+WARNING: untranslated string: ipblocklist log = Log dropped packets
+WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist)
+WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs
+WARNING: untranslated string: ipblocklist name = Name
+WARNING: untranslated string: ipblocklist output = Packets dropped (OUT)
+WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 114837a4d..b0f231184 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -301,6 +301,7 @@ WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
 WARNING: translation string unused: enter ack class
+WARNING: translation string unused: entropy graphs
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -905,7 +906,9 @@ 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 vlan tag range error
 WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: enable otp = Enable OTP
+WARNING: untranslated string: error message = unknown string
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
@@ -938,6 +941,22 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
 WARNING: untranslated string: guardian logtarget_syslog = unknown string
 WARNING: untranslated string: guardian no entries = unknown string
 WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: ipblocklist = IP Address Blocklists
+WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings
+WARNING: untranslated string: ipblocklist category = Category
+WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist
+WARNING: untranslated string: ipblocklist download error = A download error occured.
+WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received.
+WARNING: untranslated string: ipblocklist enable = Enable
+WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for
+WARNING: untranslated string: ipblocklist id = Blocklist
+WARNING: untranslated string: ipblocklist input = Packets dropped (IN)
+WARNING: untranslated string: ipblocklist log = Log dropped packets
+WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist)
+WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs
+WARNING: untranslated string: ipblocklist name = Name
+WARNING: untranslated string: ipblocklist output = Packets dropped (OUT)
+WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists
 WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: pakfire ago = ago.
diff --git a/doc/language_issues.it b/doc/language_issues.it
index d87ef8b1f..2e4407c69 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -267,6 +267,7 @@ WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
 WARNING: translation string unused: enter ack class
+WARNING: translation string unused: entropy graphs
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -913,6 +914,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL
 WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: available = available
@@ -997,6 +999,7 @@ WARNING: untranslated string: enable otp = Enable OTP
 WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
 WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
 WARNING: untranslated string: error = Error
+WARNING: untranslated string: error message = unknown string
 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: fallout zombieload ridl = Fallout/ZombieLoad/RIDL
 WARNING: untranslated string: fifteen minutes = 15 Minutes
@@ -1111,6 +1114,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ip basic info = Basic IP information
 WARNING: untranslated string: ip info for = IP information for
+WARNING: untranslated string: ipblocklist = IP Address Blocklists
+WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings
+WARNING: untranslated string: ipblocklist category = Category
+WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist
+WARNING: untranslated string: ipblocklist download error = A download error occured.
+WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received.
+WARNING: untranslated string: ipblocklist enable = Enable
+WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for
+WARNING: untranslated string: ipblocklist id = Blocklist
+WARNING: untranslated string: ipblocklist input = Packets dropped (IN)
+WARNING: untranslated string: ipblocklist log = Log dropped packets
+WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist)
+WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs
+WARNING: untranslated string: ipblocklist name = Name
+WARNING: untranslated string: ipblocklist output = Packets dropped (OUT)
+WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
 WARNING: untranslated string: ipsec interface mode gre = GRE
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index a3a70b621..5268d47dc 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -265,6 +265,7 @@ WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
 WARNING: translation string unused: enter ack class
+WARNING: translation string unused: entropy graphs
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -911,6 +912,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL
 WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: autonomous system = Autonomous System
@@ -1007,6 +1009,7 @@ WARNING: untranslated string: enable otp = Enable OTP
 WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
 WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
 WARNING: untranslated string: error = Error
+WARNING: untranslated string: error message = unknown string
 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: fallout zombieload ridl = Fallout/ZombieLoad/RIDL
 WARNING: untranslated string: fifteen minutes = 15 Minutes
@@ -1125,6 +1128,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ip basic info = Basic IP information
 WARNING: untranslated string: ip info for = IP information for
+WARNING: untranslated string: ipblocklist = IP Address Blocklists
+WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings
+WARNING: untranslated string: ipblocklist category = Category
+WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist
+WARNING: untranslated string: ipblocklist download error = A download error occured.
+WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received.
+WARNING: untranslated string: ipblocklist enable = Enable
+WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for
+WARNING: untranslated string: ipblocklist id = Blocklist
+WARNING: untranslated string: ipblocklist input = Packets dropped (IN)
+WARNING: untranslated string: ipblocklist log = Log dropped packets
+WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist)
+WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs
+WARNING: untranslated string: ipblocklist name = Name
+WARNING: untranslated string: ipblocklist output = Packets dropped (OUT)
+WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
 WARNING: untranslated string: ipsec interface mode gre = GRE
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 9bf42e649..247e06a59 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -840,6 +840,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION
@@ -996,9 +997,9 @@ WARNING: untranslated string: enable otp = Enable OTP
 WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
 WARNING: untranslated string: encryption = Encryption:
 WARNING: untranslated string: entropy = Entropy
-WARNING: untranslated string: entropy graphs = Entropy Graphs
 WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
 WARNING: untranslated string: error = Error
+WARNING: untranslated string: error message = unknown string
 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: extrahd because there is already a device mounted = , because there is already a device mounted
 WARNING: untranslated string: extrahd cant umount = Can't umount
@@ -1274,6 +1275,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ip basic info = Basic IP information
 WARNING: untranslated string: ip info for = IP information for
+WARNING: untranslated string: ipblocklist = IP Address Blocklists
+WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings
+WARNING: untranslated string: ipblocklist category = Category
+WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist
+WARNING: untranslated string: ipblocklist download error = A download error occured.
+WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received.
+WARNING: untranslated string: ipblocklist enable = Enable
+WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for
+WARNING: untranslated string: ipblocklist id = Blocklist
+WARNING: untranslated string: ipblocklist input = Packets dropped (IN)
+WARNING: untranslated string: ipblocklist log = Log dropped packets
+WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist)
+WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs
+WARNING: untranslated string: ipblocklist name = Name
+WARNING: untranslated string: ipblocklist output = Packets dropped (OUT)
+WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 62dd92044..eb2ceb954 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -836,6 +836,7 @@ WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to wor
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
 WARNING: untranslated string: age second = second
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: atm device = Device:
 WARNING: untranslated string: attention = ATTENTION
@@ -993,9 +994,9 @@ WARNING: untranslated string: enable otp = Enable OTP
 WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
 WARNING: untranslated string: encryption = Encryption:
 WARNING: untranslated string: entropy = Entropy
-WARNING: untranslated string: entropy graphs = Entropy Graphs
 WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
 WARNING: untranslated string: error = Error
+WARNING: untranslated string: error message = unknown string
 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: extrahd because there is already a device mounted = , because there is already a device mounted
 WARNING: untranslated string: extrahd cant umount = Can't umount
@@ -1272,6 +1273,22 @@ WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hos
 WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
 WARNING: untranslated string: ip basic info = Basic IP information
 WARNING: untranslated string: ip info for = IP information for
+WARNING: untranslated string: ipblocklist = IP Address Blocklists
+WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings
+WARNING: untranslated string: ipblocklist category = Category
+WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist
+WARNING: untranslated string: ipblocklist download error = A download error occured.
+WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received.
+WARNING: untranslated string: ipblocklist enable = Enable
+WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for
+WARNING: untranslated string: ipblocklist id = Blocklist
+WARNING: untranslated string: ipblocklist input = Packets dropped (IN)
+WARNING: untranslated string: ipblocklist log = Log dropped packets
+WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist)
+WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs
+WARNING: untranslated string: ipblocklist name = Name
+WARNING: untranslated string: ipblocklist output = Packets dropped (OUT)
+WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists
 WARNING: untranslated string: ipsec = IPsec
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index da549f52b..080e3abfe 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -294,6 +294,7 @@ WARNING: translation string unused: enable wildcards
 WARNING: translation string unused: enabledtitle
 WARNING: translation string unused: encrypted
 WARNING: translation string unused: enter ack class
+WARNING: translation string unused: entropy graphs
 WARNING: translation string unused: err bk 1
 WARNING: translation string unused: err bk 10 password
 WARNING: translation string unused: err bk 2 key
@@ -901,6 +902,7 @@ WARNING: untranslated string: advproxy wpad label dst_noproxy_url = Excluded URL
 WARNING: untranslated string: advproxy wpad notice = Notice: For WPAD/PAC to work properly, furtcher changes need to be made. Please see the <a href="https://wiki.ipfire.org/configuration/network/proxy/extend/wpad" target="_blank">Wiki</a>.
 WARNING: untranslated string: advproxy wpad title = Web Proxy Auto-Discovery Protocol (WPAD) / Proxy Auto-Config (PAC)
 WARNING: untranslated string: advproxy wpad view pac = Open PAC File
+WARNING: untranslated string: aliases default interface = - Default Interface -
 WARNING: untranslated string: asn lookup failed = AS lookup failed
 WARNING: untranslated string: autonomous system = Autonomous System
 WARNING: untranslated string: available = available
@@ -960,6 +962,7 @@ WARNING: untranslated string: enable otp = Enable OTP
 WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
 WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
 WARNING: untranslated string: error = Error
+WARNING: untranslated string: error message = unknown string
 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: fallout zombieload ridl = Fallout/ZombieLoad/RIDL
 WARNING: untranslated string: force enable = Forced
@@ -1048,6 +1051,22 @@ WARNING: untranslated string: invalid input for subscription code = Invalid inpu
 WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
 WARNING: untranslated string: ip basic info = Basic IP information
 WARNING: untranslated string: ip info for = IP information for
+WARNING: untranslated string: ipblocklist = IP Address Blocklists
+WARNING: untranslated string: ipblocklist blocklist settings = Blocklist settings
+WARNING: untranslated string: ipblocklist category = Category
+WARNING: untranslated string: ipblocklist could not download blocklist = Could not download blocklist
+WARNING: untranslated string: ipblocklist download error = A download error occured.
+WARNING: untranslated string: ipblocklist empty blocklist received = An empty blocklist has been received.
+WARNING: untranslated string: ipblocklist enable = Enable
+WARNING: untranslated string: ipblocklist hits = Total number of blocklist hits for
+WARNING: untranslated string: ipblocklist id = Blocklist
+WARNING: untranslated string: ipblocklist input = Packets dropped (IN)
+WARNING: untranslated string: ipblocklist log = Log dropped packets
+WARNING: untranslated string: ipblocklist log list = Firewall log (blocklist)
+WARNING: untranslated string: ipblocklist logs = IP Address Blocklist Logs
+WARNING: untranslated string: ipblocklist name = Name
+WARNING: untranslated string: ipblocklist output = Packets dropped (OUT)
+WARNING: untranslated string: ipblocklist use ipblocklists = Enable IP Blocklists
 WARNING: untranslated string: ipsec connection = IPsec Connection
 WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
 WARNING: untranslated string: ipsec interface mode gre = GRE
diff --git a/doc/language_missings b/doc/language_missings
index b8c6665f3..b49ddcbaa 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -2,6 +2,7 @@
 # Checking cgi-bin translations for language: de                           #
 ############################################################################
 < advproxy update information
+< aliases default interface
 < ansi t1.483
 < backup archive
 < backup clear archive
@@ -130,6 +131,7 @@
 < age shour
 < age sminute
 < age ssecond
+< aliases default interface
 < asn lookup failed
 < Async logging enabled
 < atm device
@@ -609,6 +611,29 @@
 < invalid ip or hostname
 < invalid logserver protocol
 < ip basic info
+< ipblocklist
+< ipblocklist blocklist settings
+< ipblocklist category
+< ipblocklist category application
+< ipblocklist category attacker
+< ipblocklist category c and c
+< ipblocklist category composite
+< ipblocklist category invalid
+< ipblocklist category reputation
+< ipblocklist category scanner
+< ipblocklist could not download blocklist
+< ipblocklist download error
+< ipblocklist empty blocklist received
+< ipblocklist enable
+< ipblocklist hits
+< ipblocklist id
+< ipblocklist input
+< ipblocklist log
+< ipblocklist log list
+< ipblocklist logs
+< ipblocklist name
+< ipblocklist output
+< ipblocklist use ipblocklists
 < ip info for
 < ipsec
 < ipsec connection
@@ -1001,6 +1026,7 @@
 ############################################################################
 # Checking cgi-bin translations for language: fr                           #
 ############################################################################
+< aliases default interface
 < ansi t1.483
 < bewan adsl pci st
 < bewan adsl usb
@@ -1008,6 +1034,29 @@
 < g.dtm
 < g.lite
 < guaranteed bandwidth
+< ipblocklist
+< ipblocklist blocklist settings
+< ipblocklist category
+< ipblocklist category application
+< ipblocklist category attacker
+< ipblocklist category c and c
+< ipblocklist category composite
+< ipblocklist category invalid
+< ipblocklist category reputation
+< ipblocklist category scanner
+< ipblocklist could not download blocklist
+< ipblocklist download error
+< ipblocklist empty blocklist received
+< ipblocklist enable
+< ipblocklist hits
+< ipblocklist id
+< ipblocklist input
+< ipblocklist log
+< ipblocklist log list
+< ipblocklist logs
+< ipblocklist name
+< ipblocklist output
+< ipblocklist use ipblocklists
 < mmio stale data
 < otp qrcode
 < random number generator daemon
@@ -1041,6 +1090,7 @@
 < advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
+< aliases default interface
 < asn lookup failed
 < autonomous system
 < available
@@ -1272,6 +1322,29 @@
 < invalid ip or hostname
 < invalid logserver protocol
 < ip basic info
+< ipblocklist
+< ipblocklist blocklist settings
+< ipblocklist category
+< ipblocklist category application
+< ipblocklist category attacker
+< ipblocklist category c and c
+< ipblocklist category composite
+< ipblocklist category invalid
+< ipblocklist category reputation
+< ipblocklist category scanner
+< ipblocklist could not download blocklist
+< ipblocklist download error
+< ipblocklist empty blocklist received
+< ipblocklist enable
+< ipblocklist hits
+< ipblocklist id
+< ipblocklist input
+< ipblocklist log
+< ipblocklist log list
+< ipblocklist logs
+< ipblocklist name
+< ipblocklist output
+< ipblocklist use ipblocklists
 < ip info for
 < ipsec connection
 < ipsec dns server address is invalid
@@ -1504,6 +1577,7 @@
 < advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
+< aliases default interface
 < asn lookup failed
 < atm device
 < autonomous system
@@ -1754,6 +1828,29 @@
 < invalid ip or hostname
 < invalid logserver protocol
 < ip basic info
+< ipblocklist
+< ipblocklist blocklist settings
+< ipblocklist category
+< ipblocklist category application
+< ipblocklist category attacker
+< ipblocklist category c and c
+< ipblocklist category composite
+< ipblocklist category invalid
+< ipblocklist category reputation
+< ipblocklist category scanner
+< ipblocklist could not download blocklist
+< ipblocklist download error
+< ipblocklist empty blocklist received
+< ipblocklist enable
+< ipblocklist hits
+< ipblocklist id
+< ipblocklist input
+< ipblocklist log
+< ipblocklist log list
+< ipblocklist logs
+< ipblocklist name
+< ipblocklist output
+< ipblocklist use ipblocklists
 < ip info for
 < ipsec connection
 < ipsec dns server address is invalid
@@ -2031,6 +2128,7 @@
 < age shour
 < age sminute
 < age ssecond
+< aliases default interface
 < asn lookup failed
 < atm device
 < attention
@@ -2555,6 +2653,29 @@
 < invalid ip or hostname
 < invalid logserver protocol
 < ip basic info
+< ipblocklist
+< ipblocklist blocklist settings
+< ipblocklist category
+< ipblocklist category application
+< ipblocklist category attacker
+< ipblocklist category c and c
+< ipblocklist category composite
+< ipblocklist category invalid
+< ipblocklist category reputation
+< ipblocklist category scanner
+< ipblocklist could not download blocklist
+< ipblocklist download error
+< ipblocklist empty blocklist received
+< ipblocklist enable
+< ipblocklist hits
+< ipblocklist id
+< ipblocklist input
+< ipblocklist log
+< ipblocklist log list
+< ipblocklist logs
+< ipblocklist name
+< ipblocklist output
+< ipblocklist use ipblocklists
 < ip info for
 < ipsec
 < ipsec connection
@@ -2983,6 +3104,7 @@
 < age shour
 < age sminute
 < age ssecond
+< aliases default interface
 < asn lookup failed
 < atm device
 < attention
@@ -3513,6 +3635,29 @@
 < invalid ip or hostname
 < invalid logserver protocol
 < ip basic info
+< ipblocklist
+< ipblocklist blocklist settings
+< ipblocklist category
+< ipblocklist category application
+< ipblocklist category attacker
+< ipblocklist category c and c
+< ipblocklist category composite
+< ipblocklist category invalid
+< ipblocklist category reputation
+< ipblocklist category scanner
+< ipblocklist could not download blocklist
+< ipblocklist download error
+< ipblocklist empty blocklist received
+< ipblocklist enable
+< ipblocklist hits
+< ipblocklist id
+< ipblocklist input
+< ipblocklist log
+< ipblocklist log list
+< ipblocklist logs
+< ipblocklist name
+< ipblocklist output
+< ipblocklist use ipblocklists
 < ip info for
 < ipsec
 < ipsec connection
@@ -3920,6 +4065,7 @@
 < advproxy wpad notice
 < advproxy wpad title
 < advproxy wpad view pac
+< aliases default interface
 < asn lookup failed
 < autonomous system
 < available
@@ -4041,6 +4187,29 @@
 < invalid input for subscription code
 < invalid ip or hostname
 < ip basic info
+< ipblocklist
+< ipblocklist blocklist settings
+< ipblocklist category
+< ipblocklist category application
+< ipblocklist category attacker
+< ipblocklist category c and c
+< ipblocklist category composite
+< ipblocklist category invalid
+< ipblocklist category reputation
+< ipblocklist category scanner
+< ipblocklist could not download blocklist
+< ipblocklist download error
+< ipblocklist empty blocklist received
+< ipblocklist enable
+< ipblocklist hits
+< ipblocklist id
+< ipblocklist input
+< ipblocklist log
+< ipblocklist log list
+< ipblocklist logs
+< ipblocklist name
+< ipblocklist output
+< ipblocklist use ipblocklists
 < ip info for
 < ipsec connection
 < ipsec dns server address is invalid
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 4d884f0e6..49c582a1e 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1556,8 +1556,8 @@
 'ipblocklist hits' => 'Gesamtanzahl der Blocklist-Treffer für',
 'ipblocklist id' => 'Blocklist',
 'ipblocklist input' => 'Verworfene Pakete (IN)',
-'ipblocklist log list' => 'Firewallprotokoll (Blocklisten)',
 'ipblocklist log' => 'Verworfene Pakete protokollieren',
+'ipblocklist log list' => 'Firewallprotokoll (Blocklisten)',
 'ipblocklist logs' => 'IP-Address-Blocklisten-Protokolle',
 'ipblocklist name' => 'Name',
 'ipblocklist output' => 'Verworfene Pakete (OUT)',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a0b004038..ae233de8e 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1602,8 +1602,8 @@
 'ipblocklist hits' => 'Total number of blocklist hits for',
 'ipblocklist id' => 'Blocklist',
 'ipblocklist input' => 'Packets dropped (IN)',
-'ipblocklist log list' => 'Firewall log (blocklist)',
 'ipblocklist log' => 'Log dropped packets',
+'ipblocklist log list' => 'Firewall log (blocklist)',
 'ipblocklist logs' => 'IP Address Blocklist Logs',
 'ipblocklist name' => 'Name',
 'ipblocklist output' => 'Packets dropped (OUT)',