diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages
index b92a81b56..c0cefed5e 100644
--- a/config/cfgroot/manualpages
+++ b/config/cfgroot/manualpages
@@ -27,7 +27,6 @@ netovpnrw.cgi=configuration/status/network_ovpnrw
 #netovpnsrv.cgi=
 wio.cgi=addons/wio
 hardwaregraphs.cgi=configuration/status/hardware_diagrams
-entropy.cgi=configuration/status/entropy
 connections.cgi=configuration/status/connections
 traffic.cgi=configuration/status/nettraffic
 #mdstat.cgi=
diff --git a/config/menu/20-status.menu b/config/menu/20-status.menu
index f969a3b0b..5d956d0b6 100644
--- a/config/menu/20-status.menu
+++ b/config/menu/20-status.menu
@@ -58,12 +58,6 @@
 				'title' => "$Lang::tr{'hardware graphs'}",
 				'enabled' => 1,
 			  };
-    $substatus->{'61.entropy'} = {
-				'caption' => "$Lang::tr{'entropy'}",
-				'uri' => '/cgi-bin/entropy.cgi',
-				'title' => "$Lang::tr{'entropy graphs'}",
-				'enabled' => 1,
-			  };
     $substatus->{'71.connections'} = {
 				'caption' => $Lang::tr{'connections'},
 				'uri' => '/cgi-bin/connections.cgi',
diff --git a/config/rootfiles/common/web-user-interface b/config/rootfiles/common/web-user-interface
index 3c47dcdba..cae8dde32 100644
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -15,7 +15,6 @@ srv/web/ipfire/cgi-bin/ddns.cgi
 srv/web/ipfire/cgi-bin/dhcp.cgi
 srv/web/ipfire/cgi-bin/dns.cgi
 srv/web/ipfire/cgi-bin/dnsforward.cgi
-srv/web/ipfire/cgi-bin/entropy.cgi
 srv/web/ipfire/cgi-bin/extrahd.cgi
 srv/web/ipfire/cgi-bin/fireinfo.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi
diff --git a/config/rootfiles/core/169/filelists/files b/config/rootfiles/core/169/filelists/files
index de0b40e8b..8a7287d26 100644
--- a/config/rootfiles/core/169/filelists/files
+++ b/config/rootfiles/core/169/filelists/files
@@ -223,4 +223,5 @@ usr/sbin/setup
 var/ipfire/general-functions.pl
 var/ipfire/header.pl
 var/ipfire/main/manualpages
+var/ipfire/menu.d/20-status.menu
 var/ipfire/suricata/ruleset-sources
diff --git a/config/rootfiles/core/169/update.sh b/config/rootfiles/core/169/update.sh
index 8af8120ce..3902e2d45 100644
--- a/config/rootfiles/core/169/update.sh
+++ b/config/rootfiles/core/169/update.sh
@@ -128,6 +128,7 @@ rm -rvf \
 	/lib/xtables/libip6t_REDIRECT.so \
 	/lib/xtables/libipt_DNAT.so \
 	/lib/xtables/libipt_REDIRECT.so \
+	/srv/web/ipfire/cgi-bin/entropy.cgi \
 	/usr/lib/libfuse3.so.3.10.4 \
 	/usr/lib/libunbound.so.8.1.14
 	/usr/lib/libxml2.so.2.9.12 \
diff --git a/doc/language_issues.de b/doc/language_issues.de
index a7f03cd1e..15db223fe 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -22,6 +22,8 @@ WARNING: translation string unused: Captive voucher
 WARNING: translation string unused: Captive vout
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
+WARNING: translation string unused: Daily
+WARNING: translation string unused: Disabled
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
@@ -33,6 +35,7 @@ WARNING: translation string unused: Resolv
 WARNING: translation string unused: Subclass
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
+WARNING: translation string unused: Weekly
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: access refused with this oinkcode
 WARNING: translation string unused: accounting
@@ -171,7 +174,6 @@ WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
-WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
@@ -328,7 +330,6 @@ WARNING: translation string unused: fwdfw ipsec network
 WARNING: translation string unused: fwdfw man port
 WARNING: translation string unused: fwdfw menu
 WARNING: translation string unused: fwdfw natport used
-WARNING: translation string unused: fwdfw p2p txt
 WARNING: translation string unused: fwdfw rule action
 WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
@@ -557,11 +558,6 @@ WARNING: translation string unused: outgoing firewall mode0
 WARNING: translation string unused: outgoing firewall mode1
 WARNING: translation string unused: outgoing firewall mode2
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
-WARNING: translation string unused: outgoing firewall p2p allow
-WARNING: translation string unused: outgoing firewall p2p deny
-WARNING: translation string unused: outgoing firewall p2p description 1
-WARNING: translation string unused: outgoing firewall p2p description 2
-WARNING: translation string unused: outgoing firewall p2p description 3
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
@@ -595,7 +591,6 @@ WARNING: translation string unused: ovpn_processprioVD
 WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
-WARNING: translation string unused: p2p block
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire health check
@@ -726,7 +721,6 @@ WARNING: translation string unused: subnet is invalid
 WARNING: translation string unused: subscripted user rules
 WARNING: translation string unused: successfully refreshed updates list
 WARNING: translation string unused: system graphs
-WARNING: translation string unused: system has hwrng
 WARNING: translation string unused: system log viewer
 WARNING: translation string unused: system status information
 WARNING: translation string unused: test
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 122d8f594..56ad0af4f 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -57,8 +57,6 @@ WARNING: untranslated string: ConnSched shutdown = Shutdown
 WARNING: untranslated string: ConnSched time = Time:
 WARNING: untranslated string: ConnSched up = Up
 WARNING: untranslated string: ConnSched weekdays = Days of the week:
-WARNING: untranslated string: Daily = Daily
-WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Edit an existing route = Edit an existing route
 WARNING: untranslated string: Enter TOS = Activate or deactivate TOS-bits <br /> and then press <i>Save</i>.
 WARNING: untranslated string: Existing Files = Files in database
@@ -87,7 +85,6 @@ WARNING: untranslated string: The destination IP address is invalid. = The desti
 WARNING: untranslated string: The source IP address is invalid. = The source IP address is invalid.
 WARNING: untranslated string: Utilization on = Utilization on
 WARNING: untranslated string: WakeOnLan = Wake On Lan
-WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: a ca certificate with this name already exists = A CA certificate with this name already exists.
 WARNING: untranslated string: a connection with this common name already exists = A connection with this common name already exists.
 WARNING: untranslated string: a connection with this name already exists = A connection with this name already exists.
@@ -532,6 +529,7 @@ WARNING: untranslated string: current aliases = Current aliases
 WARNING: untranslated string: current class = Current class
 WARNING: untranslated string: current devices = Current devices
 WARNING: untranslated string: current dhcp leases on blue = Current DHCP leases on BLUE
+WARNING: untranslated string: current dynamic leases = Current dynamic leases
 WARNING: untranslated string: current fixed leases = Current fixed leases
 WARNING: untranslated string: current hosts = Current hosts
 WARNING: untranslated string: current playlist = Current Playlist
@@ -597,6 +595,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
 WARNING: untranslated string: dhcp dns update algo = Algorithm
 WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
 WARNING: untranslated string: dhcp server = DHCP Server
 WARNING: untranslated string: dhcp server disabled = DHCP server disabled.  Stopped.
 WARNING: untranslated string: dhcp server enabled = DHCP server enabled.  Restarting.
@@ -675,7 +674,7 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew
 WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked"
 WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall
 WARNING: untranslated string: drop forward = Log dropped forward packets
-WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop input = Log dropped input packets
 WARNING: untranslated string: drop newnotsyn = Log dropped new not SYN packets
 WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
@@ -725,6 +724,7 @@ WARNING: untranslated string: empty = This field may be left blank
 WARNING: untranslated string: empty profile = empty
 WARNING: untranslated string: enable = Enable
 WARNING: untranslated string: enable ignore filter = Enable ignore filter
+WARNING: untranslated string: enable otp = Enable OTP
 WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
 WARNING: untranslated string: enabled = Enabled:
 WARNING: untranslated string: enabled on = Enabled on
@@ -811,6 +811,7 @@ WARNING: untranslated string: fw blue = Firewall options for BLUE interface
 WARNING: untranslated string: fw default drop = Firewall policy
 WARNING: untranslated string: fw logging = Firewall logging
 WARNING: untranslated string: fw red = Firewall options for RED interface
+WARNING: untranslated string: fw rules reload notice = Please reload the firewall ruleset in order to apply your changes.
 WARNING: untranslated string: fw settings = Firewall settings
 WARNING: untranslated string: fw settings color = Show colors in ruletable
 WARNING: untranslated string: fw settings dropdown = Show all networks on rulecreation site
@@ -1019,7 +1020,6 @@ WARNING: untranslated string: hangup = Disconnect
 WARNING: untranslated string: hangup string = Hangup:
 WARNING: untranslated string: harddisk temperature = Harddisk Temperature
 WARNING: untranslated string: hardware graphs = Hardware Graphs
-WARNING: untranslated string: hardware support = Hardware Support
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hdd temperature in = Harddisk temperature in
 WARNING: untranslated string: help = Help
@@ -1041,29 +1041,36 @@ WARNING: untranslated string: idle = Idle
 WARNING: untranslated string: idle timeout = Idle timeout (mins; 0 to disable):
 WARNING: untranslated string: idle timeout not set = Idle timeout not set.
 WARNING: untranslated string: ids add provider = Add provider
+WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
-WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
 WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids cleanup tmp dir = Cleanup temporary directory...
 WARNING: untranslated string: ids could not add provider = Could not add provider
 WARNING: untranslated string: ids customize ruleset = Customize ruleset
 WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
 WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids extract ruleset = Extracting ruleset for provider:
+WARNING: untranslated string: ids finished = Finished...
 WARNING: untranslated string: ids force ruleset update = Force ruleset update
 WARNING: untranslated string: ids hide = Hide
 WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
 WARNING: untranslated string: ids log hits = Total of number of activated rules for
 WARNING: untranslated string: ids log viewer = IPS Log Viewer
 WARNING: untranslated string: ids logs = IPS Logs
+WARNING: untranslated string: ids merge classifications = Merging classifications...
+WARNING: untranslated string: ids merge sid files = Merging sid to message files...
 WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
 WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
 WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
 WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
 WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
+WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids ruleset settings = Ruleset Settings
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
@@ -1083,6 +1090,7 @@ WARNING: untranslated string: incoming overhead in bytes per second = Incoming O
 WARNING: untranslated string: incoming traffic in bytes per second = Incoming Traffic
 WARNING: untranslated string: info messages = unknown string
 WARNING: untranslated string: init string = Init:
+WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: install = Install
 WARNING: untranslated string: instant update = Instant Update
 WARNING: untranslated string: integrity = Integrity:
@@ -1288,6 +1296,7 @@ WARNING: untranslated string: minute = Minute
 WARNING: untranslated string: minutes = Minutes
 WARNING: untranslated string: misc-options = Miscellaneous options
 WARNING: untranslated string: mitigated = Mitigated
+WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: mode = Mode
 WARNING: untranslated string: model = Model
 WARNING: untranslated string: modem = Modem
@@ -1407,6 +1416,7 @@ WARNING: untranslated string: other countries = Other countries
 WARNING: untranslated string: other login script = Other login script
 WARNING: untranslated string: otherip = other IP
 WARNING: untranslated string: otherport = other Port
+WARNING: untranslated string: otp qrcode = OTP QRCode
 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
@@ -1441,10 +1451,10 @@ WARNING: untranslated string: ovpn subnet is invalid = OpenVPN subnet is invalid
 WARNING: untranslated string: ovpn subnet overlap = OpenVPN Subnet overlaps with : 
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
 WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
-WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
 WARNING: untranslated string: pagerefresh = Page is beeing refreshed, please wait.
 WARNING: untranslated string: pakfire accept all = Do you want to install all packages?
 WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire available addons = Available Addons:
 WARNING: untranslated string: pakfire configuration = Pakfire Configuration
 WARNING: untranslated string: pakfire core update level = Core-Update-Level
@@ -1529,7 +1539,6 @@ WARNING: untranslated string: qos graphs = Qos Graphs
 WARNING: untranslated string: qos warning = The rule <strong>must</strong> be saved, otherwise it will be discarded!
 WARNING: untranslated string: quick playlist = Quick Playlist
 WARNING: untranslated string: ram = RAM
-WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
 WARNING: untranslated string: read bytes = Bytes Read
 WARNING: untranslated string: real address = Real Address
@@ -1590,6 +1599,7 @@ WARNING: untranslated string: secondary dns = Secondary DNS:
 WARNING: untranslated string: secondary ntp server = Secondary NTP server
 WARNING: untranslated string: secondary wins server address = Secondary WINS server address
 WARNING: untranslated string: seconds = Secs
+WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: section = Section
 WARNING: untranslated string: secure shell server = Secure Shell Server
 WARNING: untranslated string: security = Security
@@ -1615,6 +1625,7 @@ WARNING: untranslated string: show certificate = Show file
 WARNING: untranslated string: show crl = Show certificate revocation list
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
 WARNING: untranslated string: show host certificate = Show host certificate
+WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show root certificate = Show root certificate
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: shuffle = Shuffle
@@ -1696,7 +1707,6 @@ WARNING: untranslated string: support donation = Support the IPFire project with
 WARNING: untranslated string: swap = Swap
 WARNING: untranslated string: swap usage per = Swap usage per
 WARNING: untranslated string: system = System
-WARNING: untranslated string: system has rdrand = This system has support for Intel(R) RDRAND.
 WARNING: untranslated string: system information = System Information
 WARNING: untranslated string: system is offline = The system is offline.
 WARNING: untranslated string: system logs = System Logs
@@ -2109,7 +2119,6 @@ WARNING: untranslated string: vpn start action route = On Demand
 WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = OpenVPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = OpenVPN: Roadwarrior Statistics
-WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: vpn subjectaltname = SubjectAlternativeName
 WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 5e4959860..09e7c0ad6 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -183,7 +183,6 @@ WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
-WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
@@ -512,7 +511,6 @@ WARNING: translation string unused: outgoing firewall mode0
 WARNING: translation string unused: outgoing firewall mode1
 WARNING: translation string unused: outgoing firewall mode2
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
-WARNING: translation string unused: outgoing firewall p2p description
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall warning
 WARNING: translation string unused: override mtu
@@ -795,15 +793,12 @@ WARNING: untranslated string: ConnSched dial = Connect
 WARNING: untranslated string: ConnSched hangup = Disconnect
 WARNING: untranslated string: ConnSched reboot = Reboot
 WARNING: untranslated string: ConnSched shutdown = Shutdown
-WARNING: untranslated string: Daily = Daily
-WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: MB read = MB read
 WARNING: untranslated string: MB written = MB written
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
 WARNING: untranslated string: Set time on boot = Force setting the system clock on boot
-WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password
@@ -920,6 +915,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
 WARNING: untranslated string: dhcp dns update algo = Algorithm
 WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
 WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
@@ -961,7 +957,7 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew
 WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked"
 WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall
 WARNING: untranslated string: drop forward = Log dropped forward packets
-WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
 WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
 WARNING: untranslated string: duration = Duration
@@ -985,6 +981,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
 WARNING: untranslated string: email tls implicit = implicit (TLS)
 WARNING: untranslated string: email usemail = Activate Mail Service
 WARNING: untranslated string: enable = Enable
+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
@@ -1027,6 +1024,7 @@ WARNING: untranslated string: foreshadow = Foreshadow
 WARNING: untranslated string: four hours = 4 Hours
 WARNING: untranslated string: fw default drop = Firewall policy
 WARNING: untranslated string: fw red = Firewall options for RED interface
+WARNING: untranslated string: fw rules reload notice = Please reload the firewall ruleset in order to apply your changes.
 WARNING: untranslated string: fw settings = Firewall settings
 WARNING: untranslated string: fw settings color = Show colors in ruletable
 WARNING: untranslated string: fw settings dropdown = Show all networks on rulecreation site
@@ -1214,31 +1212,37 @@ 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: hardware support = Hardware Support
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks = Hostile networks
 WARNING: untranslated string: ids add provider = Add provider
+WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
-WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
 WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids cleanup tmp dir = Cleanup temporary directory...
 WARNING: untranslated string: ids could not add provider = Could not add provider
 WARNING: untranslated string: ids customize ruleset = Customize ruleset
 WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
 WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids extract ruleset = Extracting ruleset for provider:
+WARNING: untranslated string: ids finished = Finished...
 WARNING: untranslated string: ids force ruleset update = Force ruleset update
 WARNING: untranslated string: ids hide = Hide
 WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
 WARNING: untranslated string: ids log hits = Total of number of activated rules for
+WARNING: untranslated string: ids merge classifications = Merging classifications...
+WARNING: untranslated string: ids merge sid files = Merging sid to message files...
 WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
 WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
 WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
 WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
 WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
+WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids ruleset settings = Ruleset Settings
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
@@ -1252,6 +1256,7 @@ WARNING: untranslated string: incoming compression in bytes per second = Incomin
 WARNING: untranslated string: incoming firewall access = Incoming Firewall Access
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
+WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: interface mode = Interface
 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
@@ -1302,6 +1307,7 @@ WARNING: untranslated string: messages = Messages
 WARNING: untranslated string: minimum = Minimum
 WARNING: untranslated string: minute = Minute
 WARNING: untranslated string: mitigated = Mitigated
+WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: model = Model
 WARNING: untranslated string: modem hardware details = Modem Hardware
 WARNING: untranslated string: modem information = Modem Information
@@ -1342,6 +1348,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix n
 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: optional = Optional
+WARNING: untranslated string: otp qrcode = OTP QRCode
 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
@@ -1366,8 +1373,8 @@ WARNING: untranslated string: ovpn routes push options = Route push options
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
 WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
-WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
 WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
 WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
@@ -1388,7 +1395,6 @@ WARNING: untranslated string: proxy reports today = Today
 WARNING: untranslated string: proxy reports weekly = Weekly reports
 WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
-WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
 WARNING: untranslated string: reboot fsck = Reboot & check filesystem
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
@@ -1405,9 +1411,11 @@ WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: search = Search
+WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
+WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
@@ -1433,7 +1441,6 @@ WARNING: untranslated string: strict = Strict
 WARNING: untranslated string: subnet mask = Subnet Mask
 WARNING: untranslated string: subscription code = Subscription code
 WARNING: untranslated string: support donation = Support the IPFire project with your donation
-WARNING: untranslated string: system has rdrand = This system has support for Intel(R) RDRAND.
 WARNING: untranslated string: system information = System Information
 WARNING: untranslated string: system is offline = The system is offline.
 WARNING: untranslated string: ta key = TLS-Authentification-Key
@@ -1524,7 +1531,6 @@ WARNING: untranslated string: vpn start action route = On Demand
 WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = OpenVPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = OpenVPN: Roadwarrior Statistics
-WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index aff9deb18..114837a4d 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -26,6 +26,8 @@ WARNING: translation string unused: Captive voucher
 WARNING: translation string unused: Captive vout
 WARNING: translation string unused: ConnSched scheduler
 WARNING: translation string unused: ConnSched select profile
+WARNING: translation string unused: Daily
+WARNING: translation string unused: Disabled
 WARNING: translation string unused: HDD temperature
 WARNING: translation string unused: Level7 rule
 WARNING: translation string unused: Local VPN IP
@@ -37,6 +39,7 @@ WARNING: translation string unused: Resolv
 WARNING: translation string unused: Subclass
 WARNING: translation string unused: TOS Bits
 WARNING: translation string unused: Verbose
+WARNING: translation string unused: Weekly
 WARNING: translation string unused: access allowed
 WARNING: translation string unused: access refused with this oinkcode
 WARNING: translation string unused: accounting
@@ -194,7 +197,6 @@ WARNING: translation string unused: create
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
 WARNING: translation string unused: cryptographic settings
-WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
@@ -356,7 +358,6 @@ WARNING: translation string unused: fwdfw ipsec network
 WARNING: translation string unused: fwdfw man port
 WARNING: translation string unused: fwdfw menu
 WARNING: translation string unused: fwdfw natport used
-WARNING: translation string unused: fwdfw p2p txt
 WARNING: translation string unused: fwdfw rule action
 WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
@@ -411,6 +412,7 @@ WARNING: translation string unused: ibod for dual isdn only
 WARNING: translation string unused: icmp selected but no type
 WARNING: translation string unused: icmp type
 WARNING: translation string unused: id
+WARNING: translation string unused: ids automatic rules update
 WARNING: translation string unused: ids oinkcode required
 WARNING: translation string unused: ids rules update
 WARNING: translation string unused: ike encryption
@@ -589,11 +591,6 @@ WARNING: translation string unused: outgoing firewall mode0
 WARNING: translation string unused: outgoing firewall mode1
 WARNING: translation string unused: outgoing firewall mode2
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
-WARNING: translation string unused: outgoing firewall p2p allow
-WARNING: translation string unused: outgoing firewall p2p deny
-WARNING: translation string unused: outgoing firewall p2p description 1
-WARNING: translation string unused: outgoing firewall p2p description 2
-WARNING: translation string unused: outgoing firewall p2p description 3
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
@@ -627,7 +624,6 @@ WARNING: translation string unused: ovpn_processprioVD
 WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
-WARNING: translation string unused: p2p block
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire health check
@@ -762,7 +758,6 @@ WARNING: translation string unused: subnet is invalid
 WARNING: translation string unused: subscripted user rules
 WARNING: translation string unused: successfully refreshed updates list
 WARNING: translation string unused: system graphs
-WARNING: translation string unused: system has hwrng
 WARNING: translation string unused: system log viewer
 WARNING: translation string unused: system status information
 WARNING: translation string unused: teovpn_fragment
@@ -910,6 +905,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: enable otp = Enable OTP
 WARNING: untranslated string: fwhost cust locationgrp = unknown string
 WARNING: untranslated string: fwhost err hostip = unknown string
 WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
@@ -942,7 +938,11 @@ 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: mmio stale data = MMIO Stale Data
+WARNING: untranslated string: otp qrcode = OTP QRCode
 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: secret = Secret
+WARNING: untranslated string: show otp qrcode = Show OTP QRCode
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 6a52dbcd1..d87ef8b1f 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -169,7 +169,6 @@ WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
-WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
@@ -327,7 +326,6 @@ WARNING: translation string unused: fwdfw ipsec network
 WARNING: translation string unused: fwdfw man port
 WARNING: translation string unused: fwdfw menu
 WARNING: translation string unused: fwdfw natport used
-WARNING: translation string unused: fwdfw p2p txt
 WARNING: translation string unused: fwdfw rule action
 WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
@@ -558,11 +556,6 @@ WARNING: translation string unused: outgoing firewall mode0
 WARNING: translation string unused: outgoing firewall mode1
 WARNING: translation string unused: outgoing firewall mode2
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
-WARNING: translation string unused: outgoing firewall p2p allow
-WARNING: translation string unused: outgoing firewall p2p deny
-WARNING: translation string unused: outgoing firewall p2p description 1
-WARNING: translation string unused: outgoing firewall p2p description 2
-WARNING: translation string unused: outgoing firewall p2p description 3
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
@@ -596,7 +589,6 @@ WARNING: translation string unused: ovpn_processprioVD
 WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
-WARNING: translation string unused: p2p block
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire health check
@@ -731,7 +723,6 @@ WARNING: translation string unused: subnet is invalid
 WARNING: translation string unused: subscripted user rules
 WARNING: translation string unused: successfully refreshed updates list
 WARNING: translation string unused: system graphs
-WARNING: translation string unused: system has hwrng
 WARNING: translation string unused: system log viewer
 WARNING: translation string unused: system status information
 WARNING: translation string unused: teovpn_fragment
@@ -897,12 +888,9 @@ WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG
 WARNING: untranslated string: Captive valid for = Valid for
 WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon
 WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype
-WARNING: untranslated string: Daily = Daily
-WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
-WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
@@ -959,6 +947,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
 WARNING: untranslated string: dhcp dns update algo = Algorithm
 WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
 WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
@@ -981,7 +970,7 @@ WARNING: untranslated string: dns use protocol for dns queries = Protocol for DN
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
-WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
 WARNING: untranslated string: duration = Duration
 WARNING: untranslated string: eight hours = 8 Hours
@@ -1004,6 +993,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
 WARNING: untranslated string: email tls implicit = implicit (TLS)
 WARNING: untranslated string: email usemail = Activate Mail Service
 WARNING: untranslated string: enable = Enable
+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
@@ -1069,27 +1059,34 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks = Hostile networks
 WARNING: untranslated string: ids add provider = Add provider
+WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
-WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
 WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids cleanup tmp dir = Cleanup temporary directory...
 WARNING: untranslated string: ids could not add provider = Could not add provider
 WARNING: untranslated string: ids customize ruleset = Customize ruleset
 WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
 WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids extract ruleset = Extracting ruleset for provider:
+WARNING: untranslated string: ids finished = Finished...
 WARNING: untranslated string: ids force ruleset update = Force ruleset update
 WARNING: untranslated string: ids hide = Hide
 WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
 WARNING: untranslated string: ids log hits = Total of number of activated rules for
+WARNING: untranslated string: ids merge classifications = Merging classifications...
+WARNING: untranslated string: ids merge sid files = Merging sid to message files...
 WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
 WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
 WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
 WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
 WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
+WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids ruleset settings = Ruleset Settings
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
@@ -1100,6 +1097,7 @@ WARNING: untranslated string: ids working = Changes are being applied. Please wa
 WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
+WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: interface mode = Interface
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for interface address = Invalid input for interface address
@@ -1145,6 +1143,7 @@ WARNING: untranslated string: masquerading enabled = Masquerading enabled
 WARNING: untranslated string: meltdown = Meltdown
 WARNING: untranslated string: messages = Messages
 WARNING: untranslated string: mitigated = Mitigated
+WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: mtu = MTU
 WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
 WARNING: untranslated string: no data = unknown string
@@ -1158,6 +1157,7 @@ WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: optional = Optional
+WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
 WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
 WARNING: untranslated string: ovpn add conf = Additional configuration
@@ -1167,6 +1167,7 @@ WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
 WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
 WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
@@ -1196,7 +1197,9 @@ WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: search = Search
+WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
+WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
 WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
@@ -1248,7 +1251,6 @@ WARNING: untranslated string: vpn start action route = On Demand
 WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = OpenVPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = OpenVPN: Roadwarrior Statistics
-WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index fba1a3f9b..a3a70b621 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -168,7 +168,6 @@ WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
-WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
@@ -325,7 +324,6 @@ WARNING: translation string unused: fwdfw ipsec network
 WARNING: translation string unused: fwdfw man port
 WARNING: translation string unused: fwdfw menu
 WARNING: translation string unused: fwdfw natport used
-WARNING: translation string unused: fwdfw p2p txt
 WARNING: translation string unused: fwdfw rule action
 WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
@@ -368,6 +366,7 @@ WARNING: translation string unused: green interface
 WARNING: translation string unused: guest ok
 WARNING: translation string unused: gz with key
 WARNING: translation string unused: harddisk temperature graphs
+WARNING: translation string unused: hardware support
 WARNING: translation string unused: hint
 WARNING: translation string unused: host
 WARNING: translation string unused: host allow
@@ -555,11 +554,6 @@ WARNING: translation string unused: outgoing firewall mode0
 WARNING: translation string unused: outgoing firewall mode1
 WARNING: translation string unused: outgoing firewall mode2
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
-WARNING: translation string unused: outgoing firewall p2p allow
-WARNING: translation string unused: outgoing firewall p2p deny
-WARNING: translation string unused: outgoing firewall p2p description 1
-WARNING: translation string unused: outgoing firewall p2p description 2
-WARNING: translation string unused: outgoing firewall p2p description 3
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
@@ -591,7 +585,6 @@ WARNING: translation string unused: ovpn_processprioVD
 WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
-WARNING: translation string unused: p2p block
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire health check
@@ -728,6 +721,7 @@ WARNING: translation string unused: subscripted user rules
 WARNING: translation string unused: successfully refreshed updates list
 WARNING: translation string unused: system graphs
 WARNING: translation string unused: system has hwrng
+WARNING: translation string unused: system has rdrand
 WARNING: translation string unused: system log viewer
 WARNING: translation string unused: system status information
 WARNING: translation string unused: test
@@ -892,12 +886,9 @@ WARNING: untranslated string: Captive upload logo recommendations = (PNG or JPEG
 WARNING: untranslated string: Captive valid for = Valid for
 WARNING: untranslated string: Captive vouchervalid = Allowed time for this coupon
 WARNING: untranslated string: Captive wrong ext = Uploaded file has wrong filetype
-WARNING: untranslated string: Daily = Daily
-WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
-WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: administrator password = Administrator password
 WARNING: untranslated string: administrator username = Administrator username
@@ -962,6 +953,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
 WARNING: untranslated string: dhcp dns update algo = Algorithm
 WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
 WARNING: untranslated string: dl client arch insecure = Download insecure Client Package (zip)
@@ -987,7 +979,7 @@ WARNING: untranslated string: dnssec not supported = DNSSEC Not supported
 WARNING: untranslated string: dnssec validating = DNSSEC Validating
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
 WARNING: untranslated string: download tls-auth key = Download tls-auth key
-WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
 WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
 WARNING: untranslated string: duration = Duration
@@ -1011,6 +1003,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
 WARNING: untranslated string: email tls implicit = implicit (TLS)
 WARNING: untranslated string: email usemail = Activate Mail Service
 WARNING: untranslated string: enable = Enable
+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
@@ -1078,27 +1071,34 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks = Hostile networks
 WARNING: untranslated string: ids add provider = Add provider
+WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
-WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
 WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids cleanup tmp dir = Cleanup temporary directory...
 WARNING: untranslated string: ids could not add provider = Could not add provider
 WARNING: untranslated string: ids customize ruleset = Customize ruleset
 WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
 WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids extract ruleset = Extracting ruleset for provider:
+WARNING: untranslated string: ids finished = Finished...
 WARNING: untranslated string: ids force ruleset update = Force ruleset update
 WARNING: untranslated string: ids hide = Hide
 WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
 WARNING: untranslated string: ids log hits = Total of number of activated rules for
+WARNING: untranslated string: ids merge classifications = Merging classifications...
+WARNING: untranslated string: ids merge sid files = Merging sid to message files...
 WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
 WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
 WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
 WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
 WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
+WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids ruleset settings = Ruleset Settings
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
@@ -1111,6 +1111,7 @@ WARNING: untranslated string: imsi = IMSI
 WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
+WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: interface mode = Interface
 WARNING: untranslated string: invalid input for inactivity timeout = Invalid input for Inactivity Timeout
 WARNING: untranslated string: invalid input for interface address = Invalid input for interface address
@@ -1156,6 +1157,7 @@ WARNING: untranslated string: masquerading enabled = Masquerading enabled
 WARNING: untranslated string: meltdown = Meltdown
 WARNING: untranslated string: messages = Messages
 WARNING: untranslated string: mitigated = Mitigated
+WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: model = Model
 WARNING: untranslated string: modem hardware details = Modem Hardware
 WARNING: untranslated string: modem information = Modem Information
@@ -1185,6 +1187,7 @@ WARNING: untranslated string: one week = One Week
 WARNING: untranslated string: one year = One Year
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: optional = Optional
+WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: outgoing compression in bytes per second = Outgoing compression
 WARNING: untranslated string: outgoing overhead in bytes per second = Outgoing Overhead
 WARNING: untranslated string: ovpn add conf = Additional configuration
@@ -1201,6 +1204,7 @@ WARNING: untranslated string: ovpn ha = Hash algorithm
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
 WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
 WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
@@ -1215,7 +1219,6 @@ WARNING: untranslated string: pptp peer = Peer
 WARNING: untranslated string: pptp route = PPTP Route
 WARNING: untranslated string: processor vulnerability mitigations = Processor Vulnerability Mitigations
 WARNING: untranslated string: ptr = PTR
-WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
 WARNING: untranslated string: reboot fsck = Reboot & check filesystem
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
@@ -1231,8 +1234,10 @@ WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: search = Search
+WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
+WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
@@ -1290,7 +1295,6 @@ WARNING: untranslated string: vpn start action route = On Demand
 WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = OpenVPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = OpenVPN: Roadwarrior Statistics
-WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index ff2f677c2..9bf42e649 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -161,7 +161,6 @@ WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
-WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
@@ -492,11 +491,6 @@ WARNING: translation string unused: outgoing firewall mode0
 WARNING: translation string unused: outgoing firewall mode1
 WARNING: translation string unused: outgoing firewall mode2
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
-WARNING: translation string unused: outgoing firewall p2p allow
-WARNING: translation string unused: outgoing firewall p2p deny
-WARNING: translation string unused: outgoing firewall p2p description 1
-WARNING: translation string unused: outgoing firewall p2p description 2
-WARNING: translation string unused: outgoing firewall p2p description 3
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
@@ -812,14 +806,11 @@ WARNING: untranslated string: ConnSched dial = Connect
 WARNING: untranslated string: ConnSched hangup = Disconnect
 WARNING: untranslated string: ConnSched reboot = Reboot
 WARNING: untranslated string: ConnSched shutdown = Shutdown
-WARNING: untranslated string: Daily = Daily
-WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: MB read = MB read
 WARNING: untranslated string: MB written = MB written
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
-WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password
@@ -936,6 +927,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
 WARNING: untranslated string: dhcp dns update algo = Algorithm
 WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
 WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
@@ -976,7 +968,7 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew
 WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked"
 WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall
 WARNING: untranslated string: drop forward = Log dropped forward packets
-WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
 WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
 WARNING: untranslated string: duration = Duration
@@ -1000,6 +992,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
 WARNING: untranslated string: email tls implicit = implicit (TLS)
 WARNING: untranslated string: email usemail = Activate Mail Service
 WARNING: untranslated string: enable = Enable
+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
@@ -1032,6 +1025,7 @@ WARNING: untranslated string: foreshadow = Foreshadow
 WARNING: untranslated string: four hours = 4 Hours
 WARNING: untranslated string: fw default drop = Firewall policy
 WARNING: untranslated string: fw red = Firewall options for RED interface
+WARNING: untranslated string: fw rules reload notice = Please reload the firewall ruleset in order to apply your changes.
 WARNING: untranslated string: fw settings = Firewall settings
 WARNING: untranslated string: fw settings color = Show colors in ruletable
 WARNING: untranslated string: fw settings dropdown = Show all networks on rulecreation site
@@ -1219,31 +1213,37 @@ 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: hardware support = Hardware Support
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks = Hostile networks
 WARNING: untranslated string: ids add provider = Add provider
+WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
-WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
 WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids cleanup tmp dir = Cleanup temporary directory...
 WARNING: untranslated string: ids could not add provider = Could not add provider
 WARNING: untranslated string: ids customize ruleset = Customize ruleset
 WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
 WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids extract ruleset = Extracting ruleset for provider:
+WARNING: untranslated string: ids finished = Finished...
 WARNING: untranslated string: ids force ruleset update = Force ruleset update
 WARNING: untranslated string: ids hide = Hide
 WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
 WARNING: untranslated string: ids log hits = Total of number of activated rules for
+WARNING: untranslated string: ids merge classifications = Merging classifications...
+WARNING: untranslated string: ids merge sid files = Merging sid to message files...
 WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
 WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
 WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
 WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
 WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
+WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids ruleset settings = Ruleset Settings
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
@@ -1257,6 +1257,7 @@ WARNING: untranslated string: incoming compression in bytes per second = Incomin
 WARNING: untranslated string: incoming firewall access = Incoming Firewall Access
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: info messages = unknown string
+WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: interface mode = Interface
 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
@@ -1314,6 +1315,7 @@ WARNING: untranslated string: messages = Messages
 WARNING: untranslated string: minimum = Minimum
 WARNING: untranslated string: minute = Minute
 WARNING: untranslated string: mitigated = Mitigated
+WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: model = Model
 WARNING: untranslated string: modem hardware details = Modem Hardware
 WARNING: untranslated string: modem information = Modem Information
@@ -1354,6 +1356,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix n
 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: optional = Optional
+WARNING: untranslated string: otp qrcode = OTP QRCode
 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
@@ -1378,7 +1381,7 @@ WARNING: untranslated string: ovpn routes push options = Route push options
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
 WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
-WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
+WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
 WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
@@ -1399,7 +1402,6 @@ WARNING: untranslated string: proxy reports today = Today
 WARNING: untranslated string: proxy reports weekly = Weekly reports
 WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
-WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
 WARNING: untranslated string: reboot fsck = Reboot & check filesystem
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
@@ -1416,9 +1418,11 @@ WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: search = Search
+WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
+WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
@@ -1444,7 +1448,6 @@ WARNING: untranslated string: strict = Strict
 WARNING: untranslated string: subnet mask = Subnet Mask
 WARNING: untranslated string: subscription code = Subscription code
 WARNING: untranslated string: support donation = Support the IPFire project with your donation
-WARNING: untranslated string: system has rdrand = This system has support for Intel(R) RDRAND.
 WARNING: untranslated string: system is offline = The system is offline.
 WARNING: untranslated string: ta key = TLS-Authentification-Key
 WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
@@ -1534,7 +1537,6 @@ WARNING: untranslated string: vpn start action route = On Demand
 WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = OpenVPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = OpenVPN: Roadwarrior Statistics
-WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 18b711626..62dd92044 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -161,7 +161,6 @@ WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
-WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
@@ -488,11 +487,6 @@ WARNING: translation string unused: outgoing firewall mode0
 WARNING: translation string unused: outgoing firewall mode1
 WARNING: translation string unused: outgoing firewall mode2
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
-WARNING: translation string unused: outgoing firewall p2p allow
-WARNING: translation string unused: outgoing firewall p2p deny
-WARNING: translation string unused: outgoing firewall p2p description 1
-WARNING: translation string unused: outgoing firewall p2p description 2
-WARNING: translation string unused: outgoing firewall p2p description 3
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
@@ -807,15 +801,12 @@ WARNING: untranslated string: ConnSched dial = Connect
 WARNING: untranslated string: ConnSched hangup = Disconnect
 WARNING: untranslated string: ConnSched reboot = Reboot
 WARNING: untranslated string: ConnSched shutdown = Shutdown
-WARNING: untranslated string: Daily = Daily
-WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Edit an existing route = Edit an existing route
 WARNING: untranslated string: MB read = MB read
 WARNING: untranslated string: MB written = MB written
 WARNING: untranslated string: MTU settings = MTU settings:
 WARNING: untranslated string: Number of Countries for the pie chart = Number of Countries for the pie chart
 WARNING: untranslated string: Scan for Songs = unknown string
-WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: addons = Addons
 WARNING: untranslated string: administrator password = Administrator password
@@ -932,6 +923,7 @@ WARNING: untranslated string: dhcp dns key name = Key Name
 WARNING: untranslated string: dhcp dns update = DNS Update
 WARNING: untranslated string: dhcp dns update algo = Algorithm
 WARNING: untranslated string: dhcp dns update secret = Secret
+WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
 WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
@@ -973,7 +965,7 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew
 WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked"
 WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall
 WARNING: untranslated string: drop forward = Log dropped forward packets
-WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
 WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
 WARNING: untranslated string: duration = Duration
@@ -997,6 +989,7 @@ WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
 WARNING: untranslated string: email tls implicit = implicit (TLS)
 WARNING: untranslated string: email usemail = Activate Mail Service
 WARNING: untranslated string: enable = Enable
+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
@@ -1029,6 +1022,7 @@ WARNING: untranslated string: foreshadow = Foreshadow
 WARNING: untranslated string: four hours = 4 Hours
 WARNING: untranslated string: fw default drop = Firewall policy
 WARNING: untranslated string: fw red = Firewall options for RED interface
+WARNING: untranslated string: fw rules reload notice = Please reload the firewall ruleset in order to apply your changes.
 WARNING: untranslated string: fw settings = Firewall settings
 WARNING: untranslated string: fw settings color = Show colors in ruletable
 WARNING: untranslated string: fw settings dropdown = Show all networks on rulecreation site
@@ -1216,31 +1210,37 @@ 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: hardware support = Hardware Support
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks = Hostile networks
 WARNING: untranslated string: ids add provider = Add provider
+WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
-WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
 WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids cleanup tmp dir = Cleanup temporary directory...
 WARNING: untranslated string: ids could not add provider = Could not add provider
 WARNING: untranslated string: ids customize ruleset = Customize ruleset
 WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
 WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids extract ruleset = Extracting ruleset for provider:
+WARNING: untranslated string: ids finished = Finished...
 WARNING: untranslated string: ids force ruleset update = Force ruleset update
 WARNING: untranslated string: ids hide = Hide
 WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
 WARNING: untranslated string: ids log hits = Total of number of activated rules for
+WARNING: untranslated string: ids merge classifications = Merging classifications...
+WARNING: untranslated string: ids merge sid files = Merging sid to message files...
 WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
 WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
 WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
 WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
 WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
+WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids ruleset settings = Ruleset Settings
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
@@ -1255,6 +1255,7 @@ WARNING: untranslated string: incoming firewall access = Incoming Firewall Acces
 WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
 WARNING: untranslated string: incoming traffic in bytes per second = Incoming Traffic
 WARNING: untranslated string: info messages = unknown string
+WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: integrity = Integrity:
 WARNING: untranslated string: interface mode = Interface
 WARNING: untranslated string: invalid input for dpd delay = Invalid input for DPD delay
@@ -1312,6 +1313,7 @@ WARNING: untranslated string: messages = Messages
 WARNING: untranslated string: minimum = Minimum
 WARNING: untranslated string: minute = Minute
 WARNING: untranslated string: mitigated = Mitigated
+WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: model = Model
 WARNING: untranslated string: modem hardware details = Modem Hardware
 WARNING: untranslated string: modem information = Modem Information
@@ -1352,6 +1354,7 @@ WARNING: untranslated string: openvpn prefix openvpn subnet = Using the prefix n
 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: optional = Optional
+WARNING: untranslated string: otp qrcode = OTP QRCode
 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
@@ -1373,7 +1376,7 @@ WARNING: untranslated string: ovpn port in root range = A port number of 1024 or
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
 WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
-WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
+WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
 WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
@@ -1394,7 +1397,6 @@ WARNING: untranslated string: proxy reports today = Today
 WARNING: untranslated string: proxy reports weekly = Weekly reports
 WARNING: untranslated string: ptr = PTR
 WARNING: untranslated string: qos enter bandwidths = You will need to enter your downstream and upstream bandwidth!
-WARNING: untranslated string: random number generator daemon = Random Number Generator Daemon
 WARNING: untranslated string: rdns = rDNS
 WARNING: untranslated string: reboot fsck = Reboot & check filesystem
 WARNING: untranslated string: rebooting ipfire fsck = Rebooting IPFire, forcing filesystem check
@@ -1411,9 +1413,11 @@ WARNING: untranslated string: samba join domain = Join domain
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
 WARNING: untranslated string: search = Search
+WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
 WARNING: untranslated string: server restart = You are not able to save any changes while the OpenVPN server is running.
 WARNING: untranslated string: show dh = Show Diffie-Hellman parameters
+WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: show tls-auth key = Show tls-auth key
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
@@ -1439,7 +1443,6 @@ WARNING: untranslated string: strict = Strict
 WARNING: untranslated string: subnet mask = Subnet Mask
 WARNING: untranslated string: subscription code = Subscription code
 WARNING: untranslated string: support donation = Support the IPFire project with your donation
-WARNING: untranslated string: system has rdrand = This system has support for Intel(R) RDRAND.
 WARNING: untranslated string: system is offline = The system is offline.
 WARNING: untranslated string: ta key = TLS-Authentification-Key
 WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
@@ -1529,7 +1532,6 @@ WARNING: untranslated string: vpn start action route = On Demand
 WARNING: untranslated string: vpn start action start = Always On
 WARNING: untranslated string: vpn statistic n2n = OpenVPN: Net-to-Net Statistics
 WARNING: untranslated string: vpn statistic rw = OpenVPN: Roadwarrior Statistics
-WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vpn weak = Weak
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index bbdfa1efa..da549f52b 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -191,7 +191,6 @@ WARNING: translation string unused: could not open update information file
 WARNING: translation string unused: create
 WARNING: translation string unused: create mask
 WARNING: translation string unused: create new backup
-WARNING: translation string unused: current dynamic leases
 WARNING: translation string unused: current media
 WARNING: translation string unused: current ovpn
 WARNING: translation string unused: current profile
@@ -352,7 +351,6 @@ WARNING: translation string unused: fwdfw ipsec network
 WARNING: translation string unused: fwdfw man port
 WARNING: translation string unused: fwdfw menu
 WARNING: translation string unused: fwdfw natport used
-WARNING: translation string unused: fwdfw p2p txt
 WARNING: translation string unused: fwdfw rule action
 WARNING: translation string unused: fwdfw rules
 WARNING: translation string unused: fwdfw std network
@@ -587,11 +585,6 @@ WARNING: translation string unused: outgoing firewall mode0
 WARNING: translation string unused: outgoing firewall mode1
 WARNING: translation string unused: outgoing firewall mode2
 WARNING: translation string unused: outgoing firewall outgoing firewall reserved groupname
-WARNING: translation string unused: outgoing firewall p2p allow
-WARNING: translation string unused: outgoing firewall p2p deny
-WARNING: translation string unused: outgoing firewall p2p description 1
-WARNING: translation string unused: outgoing firewall p2p description 2
-WARNING: translation string unused: outgoing firewall p2p description 3
 WARNING: translation string unused: outgoing firewall reset
 WARNING: translation string unused: outgoing firewall view group
 WARNING: translation string unused: outgoing firewall warning
@@ -625,7 +618,6 @@ WARNING: translation string unused: ovpn_processprioVD
 WARNING: translation string unused: ovpn_processprioVH
 WARNING: translation string unused: ovpnstatus log
 WARNING: translation string unused: ovpnsys log
-WARNING: translation string unused: p2p block
 WARNING: translation string unused: package failed to install
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire health check
@@ -761,7 +753,6 @@ WARNING: translation string unused: subnet is invalid
 WARNING: translation string unused: subscripted user rules
 WARNING: translation string unused: successfully refreshed updates list
 WARNING: translation string unused: system graphs
-WARNING: translation string unused: system has hwrng
 WARNING: translation string unused: system log viewer
 WARNING: translation string unused: system status information
 WARNING: translation string unused: teovpn_fragment
@@ -893,10 +884,7 @@ WARNING: translation string unused: year-graph
 WARNING: translation string unused: yearly firewallhits
 WARNING: untranslated string: Captive clients = unknown string
 WARNING: untranslated string: Captive delete logo = Delete Logo
-WARNING: untranslated string: Daily = Daily
-WARNING: untranslated string: Disabled = Disabled
 WARNING: untranslated string: Scan for Songs = unknown string
-WARNING: untranslated string: Weekly = Weekly
 WARNING: untranslated string: acpitemp = ACPI - Temperatures
 WARNING: untranslated string: advproxy asbased anomaly detection = Anomaly detections based on Autonomous Systems information
 WARNING: untranslated string: advproxy errmsg wpad invalid ip or mask = WPAD: Invalid IP or subnet for excluded IP subnet
@@ -940,6 +928,7 @@ WARNING: untranslated string: dangerous = Dangerous
 WARNING: untranslated string: default IP address = Default IP Address
 WARNING: untranslated string: desired = Desired
 WARNING: untranslated string: dhcp deny known clients: = Deny known clients:
+WARNING: untranslated string: dhcp make fixed lease = Add to fix leases
 WARNING: untranslated string: dhcp valid range required when deny known clients checked = Valid range required when "Deny known clients:" is checked
 WARNING: untranslated string: disable = Disable
 WARNING: untranslated string: disconnected = Disconnected
@@ -961,12 +950,13 @@ WARNING: untranslated string: dns use protocol for dns queries = Protocol for DN
 WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
 WARNING: untranslated string: dnsforward forward_servers = Nameservers
 WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
-WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at <a href="https://www.spamhaus.org/drop/" target="_blank">Spamhaus DROP</a>, etc.)
 WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
 WARNING: untranslated string: duration = Duration
 WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
 WARNING: untranslated string: email tls implicit = implicit (TLS)
 WARNING: untranslated string: enable = Enable
+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
@@ -1011,27 +1001,34 @@ WARNING: untranslated string: guardian service = unknown string
 WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
 WARNING: untranslated string: hostile networks = Hostile networks
 WARNING: untranslated string: ids add provider = Add provider
+WARNING: untranslated string: ids adjust ruleset = Adjust rules and add user defined customizations...
 WARNING: untranslated string: ids apply = Apply
 WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
-WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
 WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids cleanup tmp dir = Cleanup temporary directory...
 WARNING: untranslated string: ids could not add provider = Could not add provider
 WARNING: untranslated string: ids customize ruleset = Customize ruleset
 WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
 WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
 WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids extract ruleset = Extracting ruleset for provider:
+WARNING: untranslated string: ids finished = Finished...
 WARNING: untranslated string: ids force ruleset update = Force ruleset update
 WARNING: untranslated string: ids hide = Hide
 WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
 WARNING: untranslated string: ids log hits = Total of number of activated rules for
+WARNING: untranslated string: ids merge classifications = Merging classifications...
+WARNING: untranslated string: ids merge sid files = Merging sid to message files...
 WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
 WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
 WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
 WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
 WARNING: untranslated string: ids provider = Provider
 WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids remove rule structures = Remove old rule structures...
 WARNING: untranslated string: ids reset provider = Reset provider
 WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
+WARNING: untranslated string: ids ruleset is up to date = No update required - The ruleset is up to date.
 WARNING: untranslated string: ids ruleset settings = Ruleset Settings
 WARNING: untranslated string: ids show = Show
 WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
@@ -1040,6 +1037,7 @@ WARNING: untranslated string: ids unable to download the ruleset = Unable to dow
 WARNING: untranslated string: ids visit provider website = Visit provider website
 WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully...
 WARNING: untranslated string: info messages = unknown string
+WARNING: untranslated string: inodes = Index-Nodes
 WARNING: untranslated string: interface mode = Interface
 WARNING: untranslated string: invalid input for interface address = Invalid input for interface address
 WARNING: untranslated string: invalid input for interface mode = Invalid input for interface mode
@@ -1067,6 +1065,7 @@ WARNING: untranslated string: local ip address = Local IP Address
 WARNING: untranslated string: log dropped conntrack invalids = Log dropped packets classified as INVALID by connection tracking
 WARNING: untranslated string: meltdown = Meltdown
 WARNING: untranslated string: mitigated = Mitigated
+WARNING: untranslated string: mmio stale data = MMIO Stale Data
 WARNING: untranslated string: mtu = MTU
 WARNING: untranslated string: netbios nameserver daemon = NetBIOS Nameserver Daemon
 WARNING: untranslated string: no data = unknown string
@@ -1075,12 +1074,14 @@ WARNING: untranslated string: not affected = Not Affected
 WARNING: untranslated string: not validating = Not validating
 WARNING: untranslated string: open connections = Open Connections
 WARNING: untranslated string: optional = Optional
+WARNING: untranslated string: otp qrcode = OTP QRCode
 WARNING: untranslated string: ovpn connection name = Connection Name
 WARNING: untranslated string: ovpn error dh = The Diffie-Hellman parameter needs to be in minimum 2048 bit! <br>Please generate or upload a new Diffie-Hellman parameter, this can be made below in the section "Diffie-Hellman parameters options".</br>
 WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for the signature which is not accepted anymore. <br>Please update to the latest IPFire version and generate a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
 WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
 WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
 WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
 WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
@@ -1102,7 +1103,9 @@ WARNING: untranslated string: routing config changed = unknown string
 WARNING: untranslated string: routing table = unknown string
 WARNING: untranslated string: samba server role member = Domain Member
 WARNING: untranslated string: samba server role standalone = Standalone
+WARNING: untranslated string: secret = Secret
 WARNING: untranslated string: sent = Sent
+WARNING: untranslated string: show otp qrcode = Show OTP QRCode
 WARNING: untranslated string: smb daemon = SMB Daemon
 WARNING: untranslated string: smt disabled = Simultaneous Multi-Threading (SMT) is disabled
 WARNING: untranslated string: smt enabled = Simultaneous Multi-Threading (SMT) is enabled
@@ -1133,7 +1136,6 @@ WARNING: untranslated string: transport mode does not support vti = VTI is not s
 WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode
 WARNING: untranslated string: user management = User Management
 WARNING: untranslated string: vpn start action add = Wait for connection initiation
-WARNING: untranslated string: vpn statistics n2n = unknown string
 WARNING: untranslated string: vpn subjectaltname missing = SubjectAlternativeName cannot be emtpy.
 WARNING: untranslated string: vpn wait = WAITING
 WARNING: untranslated string: vulnerability = Vulnerability
diff --git a/doc/language_missings b/doc/language_missings
index 895800ea0..b8c6665f3 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -54,6 +54,7 @@
 < error the to date has to be later than the from date
 < g.dtm
 < g.lite
+< ids automatic rules update
 < ids subscription code required
 < insert removable device
 < invalid input for subscription code
@@ -67,6 +68,7 @@
 < okay
 < optional
 < quick control
+< random number generator daemon
 < required
 < samba server role member
 < samba server role standalone
@@ -221,6 +223,7 @@
 < dhcp dns update
 < dhcp dns update algo
 < dhcp dns update secret
+< dhcp make fixed lease
 < dhcp valid range required when deny known clients checked
 < dh key move failed
 < dh key warn
@@ -302,6 +305,7 @@
 < emerging pro rules
 < emerging rules
 < enable
+< enable otp
 < enable smt
 < encryption
 < entropy
@@ -401,7 +405,6 @@
 < fwdfw natport used
 < fwdfw newrule
 < fwdfw numcon
-< fwdfw p2p txt
 < fwdfw pol allow
 < fwdfw pol block
 < fwdfw pol text
@@ -534,6 +537,7 @@
 < fwhost welcome
 < fwhost wo subnet
 < fw red
+< fw rules reload notice
 < fw settings
 < fw settings color
 < fw settings dropdown
@@ -544,31 +548,38 @@
 < generate ptr
 < grouptype
 < guardian
-< hardware support
 < hardware vulnerabilities
 < hostile networks
 < ids add provider
+< ids adjust ruleset
 < ids apply
 < ids apply ruleset changes
 < ids automatic rules update
 < ids autoupdates
+< ids cleanup tmp dir
 < ids could not add provider
 < ids customize ruleset
 < ids download new ruleset
 < ids enable
 < ids enable automatic updates
+< ids extract ruleset
+< ids finished
 < ids force ruleset update
 < ids hide
 < ids ignored hosts
 < ids log hits
+< ids merge classifications
+< ids merge sid files
 < ids monitored interfaces
 < ids monitor traffic only
 < ids no enabled ruleset provider
 < ids no network zone
 < ids provider
 < ids provider settings
+< ids remove rule structures
 < ids reset provider
 < ids ruleset autoupdate in progress
+< ids ruleset is up to date
 < ids ruleset settings
 < ids show
 < ids subscription code required
@@ -581,6 +592,7 @@
 < incoming compression in bytes per second
 < incoming firewall access
 < incoming overhead in bytes per second
+< inodes
 < integrity
 < interface mode
 < intrusion prevention system
@@ -636,6 +648,7 @@
 < minimum
 < minute
 < mitigated
+< mmio stale data
 < model
 < modem hardware details
 < modem information
@@ -683,6 +696,7 @@
 < openvpn subnet is used
 < optional
 < other
+< otp qrcode
 < our donors
 < outgoing compression in bytes per second
 < outgoing firewall access
@@ -694,11 +708,6 @@
 < outgoing firewall groups
 < outgoing firewall ip groups
 < outgoing firewall mac groups
-< outgoing firewall p2p allow
-< outgoing firewall p2p deny
-< outgoing firewall p2p description 1
-< outgoing firewall p2p description 2
-< outgoing firewall p2p description 3
 < outgoing firewall view group
 < outgoing overhead in bytes per second
 < ovpn add conf
@@ -731,8 +740,7 @@
 < ovpn rw connection log
 < ovpn tls auth
 < ovpn warning rfc3280
-< p2p block
-< p2p block save notice
+< pakfire already busy
 < pakfire finished
 < pakfire finished error
 < pakfire invalid tree
@@ -767,10 +775,12 @@
 < samba server role member
 < samba server role standalone
 < search
+< secret
 < sent
 < server restart
 < Set time on boot
 < show dh
+< show otp qrcode
 < show tls-auth key
 < smb daemon
 < smt disabled
@@ -796,8 +806,6 @@
 < subnet mask
 < subscription code
 < support donation
-< system has hwrng
-< system has rdrand
 < system information
 < system is offline
 < taa zombieload2
@@ -996,9 +1004,15 @@
 < ansi t1.483
 < bewan adsl pci st
 < bewan adsl usb
+< enable otp
 < g.dtm
 < g.lite
 < guaranteed bandwidth
+< mmio stale data
+< otp qrcode
+< random number generator daemon
+< secret
+< show otp qrcode
 < upload fcdsl.o
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
@@ -1116,6 +1130,7 @@
 < dhcp dns update
 < dhcp dns update algo
 < dhcp dns update secret
+< dhcp make fixed lease
 < dhcp valid range required when deny known clients checked
 < disable
 < Disabled
@@ -1169,6 +1184,7 @@
 < email usemail
 < emerging pro rules
 < enable
+< enable otp
 < enable smt
 < eol architecture warning
 < error
@@ -1204,27 +1220,35 @@
 < hardware vulnerabilities
 < hostile networks
 < ids add provider
+< ids adjust ruleset
 < ids apply
 < ids apply ruleset changes
 < ids automatic rules update
 < ids autoupdates
+< ids cleanup tmp dir
 < ids could not add provider
 < ids customize ruleset
 < ids download new ruleset
 < ids enable
 < ids enable automatic updates
+< ids extract ruleset
+< ids finished
 < ids force ruleset update
 < ids hide
 < ids ignored hosts
 < ids log hits
+< ids merge classifications
+< ids merge sid files
 < ids monitored interfaces
 < ids monitor traffic only
 < ids no enabled ruleset provider
 < ids no network zone
 < ids provider
 < ids provider settings
+< ids remove rule structures
 < ids reset provider
 < ids ruleset autoupdate in progress
+< ids ruleset is up to date
 < ids ruleset settings
 < ids show
 < ids subscription code required
@@ -1234,6 +1258,7 @@
 < ids working
 < incoming compression in bytes per second
 < incoming overhead in bytes per second
+< inodes
 < interface mode
 < intrusion prevention system
 < invalid input for inactivity timeout
@@ -1284,6 +1309,7 @@
 < meltdown
 < messages
 < mitigated
+< mmio stale data
 < mtu
 < MTU settings
 < netbios nameserver daemon
@@ -1299,6 +1325,7 @@
 < one year
 < open connections
 < optional
+< otp qrcode
 < outgoing compression in bytes per second
 < outgoing overhead in bytes per second
 < ovpn add conf
@@ -1308,6 +1335,7 @@
 < ovpn rw connection log
 < ovpn tls auth
 < ovpn warning rfc3280
+< pakfire already busy
 < pakfire finished
 < pakfire finished error
 < pakfire invalid tree
@@ -1322,6 +1350,7 @@
 < pptp route
 < processor vulnerability mitigations
 < ptr
+< random number generator daemon
 < rdns
 < reboot fsck
 < rebooting ipfire fsck
@@ -1334,7 +1363,9 @@
 < samba server role member
 < samba server role standalone
 < search
+< secret
 < sent
+< show otp qrcode
 < smb daemon
 < smt disabled
 < smt enabled
@@ -1566,6 +1597,7 @@
 < dhcp dns update
 < dhcp dns update algo
 < dhcp dns update secret
+< dhcp make fixed lease
 < dh key move failed
 < dh key warn
 < dh key warn1
@@ -1630,6 +1662,7 @@
 < email usemail
 < emerging pro rules
 < enable
+< enable otp
 < enable smt
 < eol architecture warning
 < error
@@ -1667,27 +1700,35 @@
 < hardware vulnerabilities
 < hostile networks
 < ids add provider
+< ids adjust ruleset
 < ids apply
 < ids apply ruleset changes
 < ids automatic rules update
 < ids autoupdates
+< ids cleanup tmp dir
 < ids could not add provider
 < ids customize ruleset
 < ids download new ruleset
 < ids enable
 < ids enable automatic updates
+< ids extract ruleset
+< ids finished
 < ids force ruleset update
 < ids hide
 < ids ignored hosts
 < ids log hits
+< ids merge classifications
+< ids merge sid files
 < ids monitored interfaces
 < ids monitor traffic only
 < ids no enabled ruleset provider
 < ids no network zone
 < ids provider
 < ids provider settings
+< ids remove rule structures
 < ids reset provider
 < ids ruleset autoupdate in progress
+< ids ruleset is up to date
 < ids ruleset settings
 < ids show
 < ids subscription code required
@@ -1699,6 +1740,7 @@
 < imsi
 < incoming compression in bytes per second
 < incoming overhead in bytes per second
+< inodes
 < interface mode
 < intrusion prevention system
 < invalid input for inactivity timeout
@@ -1749,6 +1791,7 @@
 < meltdown
 < messages
 < mitigated
+< mmio stale data
 < model
 < modem hardware details
 < modem information
@@ -1781,6 +1824,7 @@
 < one year
 < open connections
 < optional
+< otp qrcode
 < outgoing compression in bytes per second
 < outgoing overhead in bytes per second
 < ovpn add conf
@@ -1799,6 +1843,7 @@
 < ovpn rw connection log
 < ovpn tls auth
 < ovpn warning rfc3280
+< pakfire already busy
 < pakfire finished
 < pakfire finished error
 < pakfire invalid tree
@@ -1826,8 +1871,10 @@
 < samba server role member
 < samba server role standalone
 < search
+< secret
 < sent
 < show dh
+< show otp qrcode
 < show tls-auth key
 < smb daemon
 < smt disabled
@@ -2131,6 +2178,7 @@
 < dhcp dns update
 < dhcp dns update algo
 < dhcp dns update secret
+< dhcp make fixed lease
 < dhcp valid range required when deny known clients checked
 < dh key move failed
 < dh key warn
@@ -2211,6 +2259,7 @@
 < emerging pro rules
 < emerging rules
 < enable
+< enable otp
 < enable smt
 < encryption
 < entropy
@@ -2302,7 +2351,6 @@
 < fwdfw natport used
 < fwdfw newrule
 < fwdfw numcon
-< fwdfw p2p txt
 < fwdfw pol allow
 < fwdfw pol block
 < fwdfw pol text
@@ -2435,6 +2483,7 @@
 < fwhost welcome
 < fwhost wo subnet
 < fw red
+< fw rules reload notice
 < fw settings
 < fw settings color
 < fw settings dropdown
@@ -2445,31 +2494,38 @@
 < generate ptr
 < grouptype
 < guardian
-< hardware support
 < hardware vulnerabilities
 < hostile networks
 < ids add provider
+< ids adjust ruleset
 < ids apply
 < ids apply ruleset changes
 < ids automatic rules update
 < ids autoupdates
+< ids cleanup tmp dir
 < ids could not add provider
 < ids customize ruleset
 < ids download new ruleset
 < ids enable
 < ids enable automatic updates
+< ids extract ruleset
+< ids finished
 < ids force ruleset update
 < ids hide
 < ids ignored hosts
 < ids log hits
+< ids merge classifications
+< ids merge sid files
 < ids monitored interfaces
 < ids monitor traffic only
 < ids no enabled ruleset provider
 < ids no network zone
 < ids provider
 < ids provider settings
+< ids remove rule structures
 < ids reset provider
 < ids ruleset autoupdate in progress
+< ids ruleset is up to date
 < ids ruleset settings
 < ids show
 < ids subscription code required
@@ -2482,6 +2538,7 @@
 < incoming compression in bytes per second
 < incoming firewall access
 < incoming overhead in bytes per second
+< inodes
 < integrity
 < interface mode
 < intrusion prevention system
@@ -2547,6 +2604,7 @@
 < minimum
 < minute
 < mitigated
+< mmio stale data
 < model
 < modem hardware details
 < modem information
@@ -2594,6 +2652,7 @@
 < openvpn subnet is used
 < optional
 < other
+< otp qrcode
 < our donors
 < outgoing compression in bytes per second
 < outgoing firewall access
@@ -2628,8 +2687,7 @@
 < ovpn rw connection log
 < ovpn tls auth
 < ovpn warning rfc3280
-< p2p block
-< p2p block save notice
+< pakfire already busy
 < pakfire finished
 < pakfire finished error
 < pakfire invalid tree
@@ -2664,9 +2722,11 @@
 < samba server role member
 < samba server role standalone
 < search
+< secret
 < sent
 < server restart
 < show dh
+< show otp qrcode
 < show tls-auth key
 < smb daemon
 < smt disabled
@@ -2692,8 +2752,6 @@
 < subnet mask
 < subscription code
 < support donation
-< system has hwrng
-< system has rdrand
 < system is offline
 < taa zombieload2
 < ta key
@@ -3073,6 +3131,7 @@
 < dhcp dns update
 < dhcp dns update algo
 < dhcp dns update secret
+< dhcp make fixed lease
 < dhcp valid range required when deny known clients checked
 < dh key move failed
 < dh key warn
@@ -3155,6 +3214,7 @@
 < emerging pro rules
 < emerging rules
 < enable
+< enable otp
 < enable smt
 < encryption
 < entropy
@@ -3247,7 +3307,6 @@
 < fwdfw natport used
 < fwdfw newrule
 < fwdfw numcon
-< fwdfw p2p txt
 < fwdfw pol allow
 < fwdfw pol block
 < fwdfw pol text
@@ -3380,6 +3439,7 @@
 < fwhost welcome
 < fwhost wo subnet
 < fw red
+< fw rules reload notice
 < fw settings
 < fw settings color
 < fw settings dropdown
@@ -3390,32 +3450,39 @@
 < generate ptr
 < grouptype
 < guardian
-< hardware support
 < hardware vulnerabilities
 < hostile networks
 < hour-graph
 < ids add provider
+< ids adjust ruleset
 < ids apply
 < ids apply ruleset changes
 < ids automatic rules update
 < ids autoupdates
+< ids cleanup tmp dir
 < ids could not add provider
 < ids customize ruleset
 < ids download new ruleset
 < ids enable
 < ids enable automatic updates
+< ids extract ruleset
+< ids finished
 < ids force ruleset update
 < ids hide
 < ids ignored hosts
 < ids log hits
+< ids merge classifications
+< ids merge sid files
 < ids monitored interfaces
 < ids monitor traffic only
 < ids no enabled ruleset provider
 < ids no network zone
 < ids provider
 < ids provider settings
+< ids remove rule structures
 < ids reset provider
 < ids ruleset autoupdate in progress
+< ids ruleset is up to date
 < ids ruleset settings
 < ids show
 < ids subscription code required
@@ -3429,6 +3496,7 @@
 < incoming firewall access
 < incoming overhead in bytes per second
 < incoming traffic in bytes per second
+< inodes
 < integrity
 < interface mode
 < intrusion prevention system
@@ -3494,6 +3562,7 @@
 < minimum
 < minute
 < mitigated
+< mmio stale data
 < model
 < modem hardware details
 < modem information
@@ -3542,6 +3611,7 @@
 < openvpn subnet is used
 < optional
 < other
+< otp qrcode
 < our donors
 < outgoing compression in bytes per second
 < outgoing firewall access
@@ -3573,8 +3643,7 @@
 < ovpn rw connection log
 < ovpn tls auth
 < ovpn warning rfc3280
-< p2p block
-< p2p block save notice
+< pakfire already busy
 < pakfire finished
 < pakfire finished error
 < pakfire invalid tree
@@ -3609,9 +3678,11 @@
 < samba server role member
 < samba server role standalone
 < search
+< secret
 < sent
 < server restart
 < show dh
+< show otp qrcode
 < show tls-auth key
 < smb daemon
 < smt disabled
@@ -3637,8 +3708,6 @@
 < subnet mask
 < subscription code
 < support donation
-< system has hwrng
-< system has rdrand
 < system is offline
 < taa zombieload2
 < ta key
@@ -3880,6 +3949,7 @@
 < default IP address
 < desired
 < dhcp deny known clients:
+< dhcp make fixed lease
 < dhcp valid range required when deny known clients checked
 < disable
 < Disabled
@@ -3910,6 +3980,7 @@
 < email tls implicit
 < emerging pro rules
 < enable
+< enable otp
 < enable smt
 < eol architecture warning
 < error
@@ -3923,27 +3994,35 @@
 < hardware vulnerabilities
 < hostile networks
 < ids add provider
+< ids adjust ruleset
 < ids apply
 < ids apply ruleset changes
 < ids automatic rules update
 < ids autoupdates
+< ids cleanup tmp dir
 < ids could not add provider
 < ids customize ruleset
 < ids download new ruleset
 < ids enable
 < ids enable automatic updates
+< ids extract ruleset
+< ids finished
 < ids force ruleset update
 < ids hide
 < ids ignored hosts
 < ids log hits
+< ids merge classifications
+< ids merge sid files
 < ids monitored interfaces
 < ids monitor traffic only
 < ids no enabled ruleset provider
 < ids no network zone
 < ids provider
 < ids provider settings
+< ids remove rule structures
 < ids reset provider
 < ids ruleset autoupdate in progress
+< ids ruleset is up to date
 < ids ruleset settings
 < ids show
 < ids subscription code required
@@ -3951,6 +4030,7 @@
 < ids unable to download the ruleset
 < ids visit provider website
 < ids working
+< inodes
 < interface mode
 < intrusion prevention system
 < invalid input for interface address
@@ -3980,6 +4060,7 @@
 < log dropped conntrack invalids
 < meltdown
 < mitigated
+< mmio stale data
 < mtu
 < netbios nameserver daemon
 < no entries
@@ -3988,12 +4069,14 @@
 < okay
 < open connections
 < optional
+< otp qrcode
 < ovpn connection name
 < ovpn error dh
 < ovpn error md5
 < ovpn rw connection log
 < ovpn tls auth
 < ovpn warning rfc3280
+< pakfire already busy
 < pakfire finished
 < pakfire finished error
 < pakfire invalid tree
@@ -4005,6 +4088,7 @@
 < please reboot to apply your changes
 < processor vulnerability mitigations
 < ptr
+< random number generator daemon
 < reboot fsck
 < rebooting ipfire fsck
 < received
@@ -4012,7 +4096,9 @@
 < runmode
 < samba server role member
 < samba server role standalone
+< secret
 < sent
+< show otp qrcode
 < smb daemon
 < smt disabled
 < smt enabled
diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
deleted file mode 100644
index 0a27d2329..000000000
--- a/html/cgi-bin/entropy.cgi
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/perl
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2005-2010  IPFire Team                                        #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-use strict;
-
-# enable only the following on debugging purpose
-#use warnings;
-#use CGI::Carp 'fatalsToBrowser';
-
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-require "${General::swroot}/graphs.pl";
-
-&Header::showhttpheaders();
-&Header::openpage($Lang::tr{'entropy'}, 1, '');
-&Header::openbigbox('100%', 'left');
-
-&Header::openbox('100%', 'center', $Lang::tr{'entropy'});
-&Graphs::makegraphbox("entropy.cgi", "entropy", "day");
-&Header::closebox();
-
-# Check for hardware support.
-my $message;
-my $message_colour = $Header::colourred;
-if (&has_rdrand()) {
-	$message = $Lang::tr{'system has rdrand'};
-	$message_colour = $Header::colourgreen;
-}
-
-my $rngd_status = "<td align='center' bgcolor='${Header::colourred}'><font color='white'><b>$Lang::tr{'stopped'}</b></font></td>";
-if (&rngd_is_running()) {
-	$rngd_status = "<td align='center' bgcolor='${Header::colourgreen}'><font color='white'><b>$Lang::tr{'running'}</b></font></td>";
-}
-
-&Header::openbox('100%', 'center', $Lang::tr{'hardware support'});
-if ($message) {
-	print <<EOF;
-	<p style="color: $message_colour; text-align: center;">$message</p>
-EOF
-}
-
-print <<EOF;
-	<table width='80%' cellspacing='1' class='tbl'>
-		<tr>
-			<th align='center'><b>$Lang::tr{'service'}</b></th>
-			<th align='center'><b>$Lang::tr{'status'}</b></th>
-		</tr>
-		<tr>
-			<td align='center'>
-				$Lang::tr{'random number generator daemon'}
-			</td>
-			$rngd_status
-		</tr>
-	</table>
-EOF
-&Header::closebox();
-
-&Header::closebigbox();
-&Header::closepage();
-
-sub has_rdrand() {
-	open(FILE, "/proc/cpuinfo") or return 0;
-	my @cpuinfo = <FILE>;
-	close(FILE);
-
-	my @result = grep(/rdrand/, @cpuinfo);
-	if (@result) {
-		return 1;
-	}
-
-	return 0;
-}
-
-sub rngd_is_running() {
-	return (-e "/var/run/rngd.pid");
-}
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 734fa5f28..3285f1bfa 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1345,7 +1345,6 @@
 'harddisk temperature' => 'Festplattentemperatur',
 'harddisk temperature graphs' => 'Festplattendiagramme',
 'hardware graphs' => 'Hardwarediagramme',
-'hardware support' => 'Hardwareunterstützung',
 'hardware vulnerabilities' => 'Hardwareverwundbarkeiten',
 'hdd temperature in' => 'Festplattentemperatur in',
 'help' => 'Hilfe',
@@ -1382,9 +1381,8 @@
 'ids adjust ruleset' => 'Regelset anpassen und Benutzermodifikationen übernehmen...',
 'ids apply' => 'Übernehmen',
 'ids apply ruleset changes' => 'Regeländerungen werden übernommen. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
-'ids automatic rules update' => 'Automatische Regelaktualisierung',
-'ids cleanup tmp dir' => 'Temporäres Verzeichnis aufräumen...',
 'ids autoupdates' => 'Automatische Updates',
+'ids cleanup tmp dir' => 'Temporäres Verzeichnis aufräumen...',
 'ids could not add provider' => 'Provider konnte nicht hinzugefügt werden',
 'ids customize ruleset' => 'Regelset anpassen',
 'ids download new ruleset' => 'Das neue Regelset wird heruntergeladen und entpackt. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
@@ -2113,7 +2111,6 @@
 'qos warning' => 'Die Regel <strong>muss</strong> wieder gespeichert werden, ansonsten wird sie verworfen!',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM-Speicher',
-'random number generator daemon' => 'Hintergrunddienst für Zufallszahlengenerierung',
 'rdns' => 'rDNS',
 'read bytes' => 'Gelesene Bytes',
 'read list' => 'Liste der Leseberechtigten',
@@ -2246,9 +2243,9 @@
 'show dh' => 'Diffie-Hellman-Parameter anzeigen',
 'show host certificate' => 'Host-Zertifikat anzeigen',
 'show last x lines' => 'die letzten x Zeilen anzeigen',
+'show otp qrcode' => 'Zeige OTP QRCode',
 'show root certificate' => 'Root-Zertifikat anzeigen',
 'show share options' => 'Anzeige der Freigabeeinstellungen',
-'show otp qrcode' => 'Zeige OTP QRCode',
 'shuffle' => 'Zufall',
 'shutdown' => 'Herunterfahren',
 'shutdown ask' => 'Herunterfahren?',
@@ -2368,8 +2365,6 @@
 'swap usage per' => 'Nutzung von Auslagerungsspeicher (Swap) pro',
 'system' => 'System',
 'system graphs' => 'System-Diagramme',
-'system has hwrng' => 'Dieses System hat einen Hardware-Zufallszahlengenerator.',
-'system has rdrand' => 'Dieses System unterstützt Intel(R) RDRAND.',
 'system information' => 'Systeminformationen',
 'system is offline' => 'Das System ist offline.',
 'system log viewer' => 'Betrachter der Systemprotokolldateien',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b4c24a535..2c79f1cbc 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1018,9 +1018,9 @@
 'empty' => 'This field may be left blank',
 'empty profile' => 'empty',
 'enable' => 'Enable',
-'enable otp' => 'Enable OTP',
 'enable ignore filter' => 'Enable ignore filter',
 'enable javascript' => 'Enable javascript',
+'enable otp' => 'Enable OTP',
 'enable smt' => 'Enable Simultaneous Multi-Threading (SMT)',
 'enable wildcards' => 'Enable wildcards:',
 'enabled' => 'Enabled:',
@@ -1389,7 +1389,6 @@
 'harddisk temperature' => 'Harddisk Temperature',
 'harddisk temperature graphs' => 'HDD Graphs',
 'hardware graphs' => 'Hardware Graphs',
-'hardware support' => 'Hardware Support',
 'hardware vulnerabilities' => 'Hardware Vulnerabilities',
 'hdd temperature in' => 'Harddisk temperature in',
 'help' => 'Help',
@@ -2426,8 +2425,6 @@
 'swap usage per' => 'Swap usage per',
 'system' => 'System',
 'system graphs' => 'System Graphs',
-'system has hwrng' => 'This system has a hardware random number generator.',
-'system has rdrand' => 'This system has support for Intel(R) RDRAND.',
 'system information' => 'System Information',
 'system is offline' => 'The system is offline.',
 'system log viewer' => 'System Log Viewer',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 4d62a9f7f..994ff9a21 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -1392,7 +1392,6 @@
 'harddisk temperature' => 'Température disque dur',
 'harddisk temperature graphs' => 'Graphiques température disque dur',
 'hardware graphs' => 'Graphiques matériel',
-'hardware support' => 'Support matériel',
 'hardware vulnerabilities' => 'Vulnérabilités matérielles',
 'hdd temperature in' => 'Température interne disque dur',
 'help' => 'Aide',
@@ -2171,7 +2170,6 @@
 'quick control' => 'Contrôle rapide',
 'quick playlist' => 'Liste de lecture rapide',
 'ram' => 'RAM',
-'random number generator daemon' => 'Service génération de nombres aléatoires',
 'rdns' => 'rDNS',
 'read bytes' => 'Octets lus',
 'read list' => 'liste des hôtes en lecture seule',
@@ -2433,8 +2431,6 @@
 'swap usage per' => 'Usage de la Swap par',
 'system' => 'Système',
 'system graphs' => 'Graphiques système',
-'system has hwrng' => 'Ce système a un générateur de nombre aléatoire de matériel.',
-'system has rdrand' => 'Ce système prend en charge Intel (R) RDRAND.',
 'system information' => 'Informations système',
 'system is offline' => 'Le système est hors ligne.',
 'system log viewer' => 'Visualisateur de journaux système',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index cb669931f..cf58bea90 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1190,7 +1190,6 @@
 'harddisk temperature' => 'Temperatura hard disk',
 'harddisk temperature graphs' => 'Grafico HDD',
 'hardware graphs' => 'Grafico Hardware',
-'hardware support' => 'Supporto Hardware',
 'hdd temperature in' => 'Temperatura hard disk',
 'help' => 'Help',
 'high' => 'Alto',
@@ -1841,7 +1840,6 @@
 'quick control' => 'Quick Control',
 'quick playlist' => 'Quick Playlist',
 'ram' => 'RAM',
-'random number generator daemon' => 'Random Number Generator Daemon',
 'read bytes' => 'Read Bytes',
 'read list' => 'list with readonly hosts',
 'real address' => 'Real Address',
@@ -2072,8 +2070,6 @@
 'swap usage per' => 'Utilizzo swap per',
 'system' => 'Sistema',
 'system graphs' => 'Grafico sistema',
-'system has hwrng' => 'This system has got a hardware random number generator.',
-'system has rdrand' => 'This system has got support for Intel(R) RDRAND.',
 'system information' => 'Informazione Sistema',
 'system log viewer' => 'System Log Viewer',
 'system logs' => 'Log di Sistema',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index eecd52417..bc2eead9a 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1303,7 +1303,6 @@
 'harddisk temperature' => 'sabit disk sıcaklığı',
 'harddisk temperature graphs' => 'hdd sıcaklık grafiği',
 'hardware graphs' => 'Donanım Grafikleri',
-'hardware support' => 'Donanım desteği',
 'hdd temperature in' => 'Sabit disk sıcaklığı',
 'help' => 'Yardım',
 'high' => 'Yüksek',
@@ -1989,7 +1988,6 @@
 'quick control' => 'Hızlı Kontrol',
 'quick playlist' => 'Hızlı Oynatıcı',
 'ram' => 'RAM',
-'random number generator daemon' => 'Rastgele sayı oluşturucu programı',
 'rdns' => 'oDNS',
 'read bytes' => 'okunan bayt',
 'read list' => 'salt okunur bilgisayarlar ile liste',
@@ -2225,8 +2223,6 @@
 'swap usage per' => 'takas alanı kullanımı - ',
 'system' => 'Sistem',
 'system graphs' => 'Sistem Grafikleri',
-'system has hwrng' => 'Bu sistem donanımsal rastgele sayı üreticisine sahiptir.',
-'system has rdrand' => 'Bu sistemde Intel(R) RDRAND için destek vardır.',
 'system information' => 'Sistem Bilgisi',
 'system log viewer' => 'Sistem Günlük Görüntüleyicisi',
 'system logs' => 'Sistem Günlükleri',