Merge branch 'master' into next

diff --cc config/collectd/collectd.conf
Simple merge

diff --cc config/rootfiles/oldcore/189/filelists/curl
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4b84bef53ae38906a2a44182a4ad79f8e0d5b93b
new file mode 120000 (symlink)
--- /dev/null
--- /dev/null
+++ b/config/rootfiles/oldcore/189/filelists/curl
@@@ -1,0 -1,0 +1,1 @@@
++../../../common/curl

diff --cc config/rootfiles/oldcore/189/filelists/dtc
index 0000000000000000000000000000000000000000,f2e3891c622b07a27e60554d038f041f7bc3c2e1..f2e3891c622b07a27e60554d038f041f7bc3c2e1
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/189/filelists/dtc
+++ b/config/rootfiles/oldcore/189/filelists/dtc

diff --cc config/rootfiles/oldcore/189/filelists/files
Simple merge

diff --cc config/rootfiles/oldcore/189/filelists/ntp
index 0000000000000000000000000000000000000000,7542d86cb0ce8fd1843c53eeb6b85611dd2ea4a2..7542d86cb0ce8fd1843c53eeb6b85611dd2ea4a2
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/189/filelists/ntp
+++ b/config/rootfiles/oldcore/189/filelists/ntp

diff --cc config/rootfiles/oldcore/189/update.sh
Simple merge

diff --cc doc/language_issues.en
Simple merge

diff --cc doc/language_issues.es
Simple merge

diff --cc doc/language_issues.fr
Simple merge

diff --cc doc/language_issues.it
Simple merge

diff --cc doc/language_issues.nl
Simple merge

diff --cc doc/language_issues.pl
Simple merge

diff --cc doc/language_issues.ru
Simple merge

diff --cc doc/language_issues.tr
Simple merge

diff --cc doc/language_missings
index f3d945c5b3dabf2b6e46a267f3e4257adab58ec9,6a44630bd8a2012873b5662e23aee81b1dde24d4..2a2333d948abe4013861bbd99d49e4f493d3f352
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -154,11 -160,13 +160,14 @@@
  < spec rstack overflow
  < system time
  < timeformat
+ < total
  < transport mode does not support vti
  < warning
+ < wg
+ < whitelisted
  < wireguard
  < wlanap
 +< wlanap hide ssid
  < wlanap psk
  < wlanap wireless mode
  < wlanap wlan clients
@@@ -182,12 -194,15 +195,16 @@@
  < ovpn roadwarrior server
  < processors
  < reg_file_data_sampling
+ < scanned
  < system time
  < timeformat
+ < total
  < upload fcdsl.o
  < warning
+ < wg
+ < whitelisted
  < wireguard
 +< wlanap hide ssid
  < wlanap psk
  < wlanap wireless mode
  < wlanap wlan clients

diff --cc langs/de/cgi-bin/de.pl
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge

diff --cc make.sh
Simple merge