Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into beyond-next

Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.ru
	doc/language_issues.tr
	doc/language_missings

diff --cc doc/language_issues.de
Simple merge

diff --cc doc/language_issues.en
Simple merge

diff --cc doc/language_issues.es
index 065ba9b477ce22afabe74e3b323d86501fb0c529,cf2fe5282cab27e7e6ec2596311f2ee97e1634c0..2718a1aed2e6599925d53e95e4b0819a69fcbf4b
--- 1/doc/language_issues.es
--- 2/doc/language_issues.es
+++ b/doc/language_issues.es
@@@ -611,12 -620,13 +616,16 @@@ WARNING: untranslated string: ccd non
  WARNING: untranslated string: ccd routes
  WARNING: untranslated string: ccd subnet
  WARNING: untranslated string: ccd used
+ WARNING: untranslated string: count
+ WARNING: untranslated string: countries
+ WARNING: untranslated string: country codes and flags
+ WARNING: untranslated string: countrycode
  WARNING: untranslated string: dead peer detection
- WARNING: untranslated string: default ip
  WARNING: untranslated string: deprecated fs warn
+ WARNING: untranslated string: details
 +WARNING: untranslated string: dh
 +WARNING: untranslated string: dh key warn
 +WARNING: untranslated string: dh name is invalid
  WARNING: untranslated string: dnat address
  WARNING: untranslated string: dns servers
  WARNING: untranslated string: dnsforward
@@@ -798,9 -811,8 +810,10 @@@ WARNING: untranslated string: fwhost st
  WARNING: untranslated string: fwhost type
  WARNING: untranslated string: fwhost used
  WARNING: untranslated string: fwhost welcome
 +WARNING: untranslated string: gen dh
 +WARNING: untranslated string: generate dh key
  WARNING: untranslated string: grouptype
+ WARNING: untranslated string: hardware support
  WARNING: untranslated string: integrity
  WARNING: untranslated string: invalid input for dpd delay
  WARNING: untranslated string: invalid input for dpd timeout
@@@ -814,7 -826,7 +827,8 @@@ WARNING: untranslated string: maximu
  WARNING: untranslated string: minimum
  WARNING: untranslated string: minute
  WARNING: untranslated string: most preferred
+ WARNING: untranslated string: no hardware random number generator
 +WARNING: untranslated string: not a valid dh key
  WARNING: untranslated string: notice
  WARNING: untranslated string: openvpn default
  WARNING: untranslated string: openvpn destination port used

diff --cc doc/language_issues.fr
index d209395367c02fbe39b9106ba41cfc1ac5ccb2be,b3d9252be730fc21f39a5b110bc5d087c03e3d0d..aaecb4031965839e6008a3de3780175bbb325a83
--- 1/doc/language_issues.fr
--- 2/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@@ -621,12 -630,13 +626,16 @@@ WARNING: untranslated string: ccd non
  WARNING: untranslated string: ccd routes
  WARNING: untranslated string: ccd subnet
  WARNING: untranslated string: ccd used
+ WARNING: untranslated string: count
+ WARNING: untranslated string: countries
+ WARNING: untranslated string: country codes and flags
+ WARNING: untranslated string: countrycode
  WARNING: untranslated string: dead peer detection
- WARNING: untranslated string: default ip
  WARNING: untranslated string: deprecated fs warn
+ WARNING: untranslated string: details
 +WARNING: untranslated string: dh
 +WARNING: untranslated string: dh key warn
 +WARNING: untranslated string: dh name is invalid
  WARNING: untranslated string: dnat address
  WARNING: untranslated string: dns address deleted txt
  WARNING: untranslated string: dns servers
@@@ -809,9 -822,8 +821,10 @@@ WARNING: untranslated string: fwhost st
  WARNING: untranslated string: fwhost type
  WARNING: untranslated string: fwhost used
  WARNING: untranslated string: fwhost welcome
 +WARNING: untranslated string: gen dh
 +WARNING: untranslated string: generate dh key
  WARNING: untranslated string: grouptype
+ WARNING: untranslated string: hardware support
  WARNING: untranslated string: integrity
  WARNING: untranslated string: invalid input for dpd delay
  WARNING: untranslated string: invalid input for dpd timeout
@@@ -825,7 -837,7 +838,8 @@@ WARNING: untranslated string: maximu
  WARNING: untranslated string: minimum
  WARNING: untranslated string: minute
  WARNING: untranslated string: most preferred
+ WARNING: untranslated string: no hardware random number generator
 +WARNING: untranslated string: not a valid dh key
  WARNING: untranslated string: notice
  WARNING: untranslated string: ntp common settings
  WARNING: untranslated string: ntp sync

diff --cc doc/language_issues.nl
index d5302f7620de9d890f63e4c4c8e9999a16106314,9b20840e49c4d3630490ab8f6a43795ed65b1a70..d318d7f92477776fb471efd8d36bf3bd6f8e68e5
--- 1/doc/language_issues.nl
--- 2/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@@ -587,12 -594,15 +590,18 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy proxy port transparent
  WARNING: untranslated string: bit
  WARNING: untranslated string: bytes
+ WARNING: untranslated string: ccd err isipsecrw
+ WARNING: untranslated string: ccd err isovpnn2n
  WARNING: untranslated string: ccd iroute2
+ WARNING: untranslated string: count
+ WARNING: untranslated string: countries
+ WARNING: untranslated string: country codes and flags
+ WARNING: untranslated string: countrycode
  WARNING: untranslated string: dead peer detection
- WARNING: untranslated string: default ip
+ WARNING: untranslated string: details
 +WARNING: untranslated string: dh
 +WARNING: untranslated string: dh key warn
 +WARNING: untranslated string: dh name is invalid
  WARNING: untranslated string: dnat address
  WARNING: untranslated string: dns servers
  WARNING: untranslated string: dnsforward
@@@ -756,9 -769,8 +768,10 @@@ WARNING: untranslated string: fwhost st
  WARNING: untranslated string: fwhost type
  WARNING: untranslated string: fwhost used
  WARNING: untranslated string: fwhost welcome
 +WARNING: untranslated string: gen dh
 +WARNING: untranslated string: generate dh key
  WARNING: untranslated string: grouptype
+ WARNING: untranslated string: hardware support
  WARNING: untranslated string: integrity
  WARNING: untranslated string: invalid input for dpd delay
  WARNING: untranslated string: invalid input for dpd timeout
@@@ -771,15 -783,9 +784,16 @@@ WARNING: untranslated string: mac filte
  WARNING: untranslated string: maximum
  WARNING: untranslated string: minimum
  WARNING: untranslated string: most preferred
+ WARNING: untranslated string: no hardware random number generator
 +WARNING: untranslated string: not a valid dh key
  WARNING: untranslated string: notice
  WARNING: untranslated string: openvpn network
 +WARNING: untranslated string: ovpn crypt options
 +WARNING: untranslated string: ovpn dh
 +WARNING: untranslated string: ovpn dh name
 +WARNING: untranslated string: ovpn generating the root and host certificates
 +WARNING: untranslated string: ovpn ha
 +WARNING: untranslated string: ovpn hmac
  WARNING: untranslated string: ovpn mgmt in root range
  WARNING: untranslated string: ovpn no connections
  WARNING: untranslated string: ovpn port in root range

diff --cc doc/language_issues.pl
index 065ba9b477ce22afabe74e3b323d86501fb0c529,cf2fe5282cab27e7e6ec2596311f2ee97e1634c0..2718a1aed2e6599925d53e95e4b0819a69fcbf4b
--- 1/doc/language_issues.pl
--- 2/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@@ -611,12 -620,13 +616,16 @@@ WARNING: untranslated string: ccd non
  WARNING: untranslated string: ccd routes
  WARNING: untranslated string: ccd subnet
  WARNING: untranslated string: ccd used
+ WARNING: untranslated string: count
+ WARNING: untranslated string: countries
+ WARNING: untranslated string: country codes and flags
+ WARNING: untranslated string: countrycode
  WARNING: untranslated string: dead peer detection
- WARNING: untranslated string: default ip
  WARNING: untranslated string: deprecated fs warn
+ WARNING: untranslated string: details
 +WARNING: untranslated string: dh
 +WARNING: untranslated string: dh key warn
 +WARNING: untranslated string: dh name is invalid
  WARNING: untranslated string: dnat address
  WARNING: untranslated string: dns servers
  WARNING: untranslated string: dnsforward
@@@ -798,9 -811,8 +810,10 @@@ WARNING: untranslated string: fwhost st
  WARNING: untranslated string: fwhost type
  WARNING: untranslated string: fwhost used
  WARNING: untranslated string: fwhost welcome
 +WARNING: untranslated string: gen dh
 +WARNING: untranslated string: generate dh key
  WARNING: untranslated string: grouptype
+ WARNING: untranslated string: hardware support
  WARNING: untranslated string: integrity
  WARNING: untranslated string: invalid input for dpd delay
  WARNING: untranslated string: invalid input for dpd timeout
@@@ -814,7 -826,7 +827,8 @@@ WARNING: untranslated string: maximu
  WARNING: untranslated string: minimum
  WARNING: untranslated string: minute
  WARNING: untranslated string: most preferred
+ WARNING: untranslated string: no hardware random number generator
 +WARNING: untranslated string: not a valid dh key
  WARNING: untranslated string: notice
  WARNING: untranslated string: openvpn default
  WARNING: untranslated string: openvpn destination port used

diff --cc doc/language_issues.ru
index e7f884df5dde041b6a9587729bb20d8b77a5f553,0c94fc64af2b0c3101c61aaa59df3ed8273368f8..be721a37a737a2b6a437b2a24fd5017a18c2391c
--- 1/doc/language_issues.ru
--- 2/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@@ -615,12 -624,13 +620,16 @@@ WARNING: untranslated string: ccd route
  WARNING: untranslated string: ccd subnet
  WARNING: untranslated string: ccd used
  WARNING: untranslated string: community rules
+ WARNING: untranslated string: count
+ WARNING: untranslated string: countries
+ WARNING: untranslated string: country codes and flags
+ WARNING: untranslated string: countrycode
  WARNING: untranslated string: dead peer detection
- WARNING: untranslated string: default ip
  WARNING: untranslated string: deprecated fs warn
+ WARNING: untranslated string: details
 +WARNING: untranslated string: dh
 +WARNING: untranslated string: dh key warn
 +WARNING: untranslated string: dh name is invalid
  WARNING: untranslated string: disk access per
  WARNING: untranslated string: dnat address
  WARNING: untranslated string: dns servers
@@@ -793,9 -806,8 +805,10 @@@ WARNING: untranslated string: fwhost st
  WARNING: untranslated string: fwhost type
  WARNING: untranslated string: fwhost used
  WARNING: untranslated string: fwhost welcome
 +WARNING: untranslated string: gen dh
 +WARNING: untranslated string: generate dh key
  WARNING: untranslated string: grouptype
+ WARNING: untranslated string: hardware support
  WARNING: untranslated string: incoming traffic in bytes per second
  WARNING: untranslated string: integrity
  WARNING: untranslated string: invalid input for dpd delay
@@@ -810,7 -822,7 +823,8 @@@ WARNING: untranslated string: maximu
  WARNING: untranslated string: minimum
  WARNING: untranslated string: minute
  WARNING: untranslated string: most preferred
+ WARNING: untranslated string: no hardware random number generator
 +WARNING: untranslated string: not a valid dh key
  WARNING: untranslated string: notice
  WARNING: untranslated string: openvpn default
  WARNING: untranslated string: openvpn destination port used

diff --cc doc/language_issues.tr
index 30c3842f876a125c6caa59b6a874def288202516,c2665104d5113e1349a6d16f95ebbcfedaaa0d91..da4e66c0b1af931466c40e548c6ccc79d5e1a656
--- 1/doc/language_issues.tr
--- 2/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@@ -629,76 -638,25 +634,39 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: year-graph
  WARNING: translation string unused: yearly firewallhits
  WARNING: untranslated string: Scan for Songs
- WARNING: untranslated string: addons
- WARNING: untranslated string: advproxy errmsg proxy ports equal
- WARNING: untranslated string: advproxy proxy port transparent
- WARNING: untranslated string: bit
  WARNING: untranslated string: bytes
- WARNING: untranslated string: dead peer detection
- WARNING: untranslated string: default ip
+ WARNING: untranslated string: ccd err isipsecrw
+ WARNING: untranslated string: ccd err isovpnn2n
+ WARNING: untranslated string: count
+ WARNING: untranslated string: countries
+ WARNING: untranslated string: country codes and flags
+ WARNING: untranslated string: countrycode
+ WARNING: untranslated string: details
 +WARNING: untranslated string: dh
 +WARNING: untranslated string: dh key warn
 +WARNING: untranslated string: dh name is invalid
- WARNING: untranslated string: dnat address
- WARNING: untranslated string: dns servers
- WARNING: untranslated string: downlink
- WARNING: untranslated string: dpd delay
- WARNING: untranslated string: dpd timeout
- WARNING: untranslated string: drop action
- WARNING: untranslated string: drop action1
- WARNING: untranslated string: drop action2
- WARNING: untranslated string: drop forward
  WARNING: untranslated string: drop outgoing
- WARNING: untranslated string: encryption
- WARNING: untranslated string: entropy
- WARNING: untranslated string: firewall rules
- WARNING: untranslated string: first
- WARNING: untranslated string: fwdfw dnat extport
- WARNING: untranslated string: fwdfw dnat nochoice
- WARNING: untranslated string: fwdfw dnat porterr2
- WARNING: untranslated string: fwdfw hint mac
+ WARNING: untranslated string: entropy graphs
+ WARNING: untranslated string: flag
+ WARNING: untranslated string: fwdfw warn1
  WARNING: untranslated string: fwhost err hostip
- WARNING: untranslated string: grouptype
- WARNING: untranslated string: integrity
- WARNING: untranslated string: invalid input for dpd delay
- WARNING: untranslated string: invalid input for dpd timeout
- WARNING: untranslated string: ipsec
- WARNING: untranslated string: ipsec network
 +WARNING: untranslated string: gen dh
 +WARNING: untranslated string: generate dh key
+ WARNING: untranslated string: hardware support
  WARNING: untranslated string: last
- WARNING: untranslated string: least preferred
- WARNING: untranslated string: lifetime
- WARNING: untranslated string: mac filter
- WARNING: untranslated string: maximum
- WARNING: untranslated string: minimum
- WARNING: untranslated string: most preferred
+ WARNING: untranslated string: no hardware random number generator
 +WARNING: untranslated string: not a valid dh key
- WARNING: untranslated string: notice
- WARNING: untranslated string: openvpn network
 +WARNING: untranslated string: ovpn crypt options
 +WARNING: untranslated string: ovpn dh
 +WARNING: untranslated string: ovpn dh name
 +WARNING: untranslated string: ovpn generating the root and host certificates
 +WARNING: untranslated string: ovpn ha
 +WARNING: untranslated string: ovpn hmac
- WARNING: untranslated string: ovpn mgmt in root range
- WARNING: untranslated string: ovpn no connections
- WARNING: untranslated string: ovpn port in root range
- WARNING: untranslated string: p2p block
- WARNING: untranslated string: p2p block save notice
- WARNING: untranslated string: red1
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed
  WARNING: untranslated string: routing table
- WARNING: untranslated string: snat new source ip address
- WARNING: untranslated string: ssh
- WARNING: untranslated string: support donation
- WARNING: untranslated string: tor directory port
- WARNING: untranslated string: tor errmsg invalid directory port
- WARNING: untranslated string: uplink
 +WARNING: untranslated string: show dh
- WARNING: untranslated string: urlfilter redirect template
- WARNING: untranslated string: wlan clients
+ WARNING: untranslated string: system has hwrng
+ WARNING: untranslated string: system has rdrand
 +WARNING: untranslated string: upload dh key

diff --cc doc/language_missings
index af54f2239c17cfe24ebcb994c5b1bfc1d79255d1,3c3d74207add1a0ec17a6514d767c6be766ad56b..8e75f7ecb42e48cfe3fe09885f713225fc006f5d
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -63,11 -65,13 +65,16 @@@
  < ccd routes
  < ccd subnet
  < ccd used
+ < count
+ < countries
+ < countrycode
+ < country codes and flags
  < default ip
  < deprecated fs warn
+ < details
 +< dh
 +< dh key warn
 +< dh name is invalid
  < dnat address
  < dns address deleted txt
  < dnsforward
@@@ -104,6 -111,8 +112,7 @@@
  < fireinfo why read more
  < fireinfo your profile id
  < firewall rules
 -< first
+ < flag
  < forward firewall
  < fw default drop
  < fwdfw ACCEPT
@@@ -278,9 -288,8 +288,10 @@@
  < fw settings dropdown
  < fw settings remark
  < fw settings ruletable
 +< gen dh
 +< generate dh key
  < grouptype
+ < hardware support
  < integrity
  < invalid input for dpd delay
  < invalid input for dpd timeout
@@@ -294,8 -304,7 +305,9 @@@
  < minimum
  < minute
  < most preferred
 +< never
+ < no hardware random number generator
 +< not a valid dh key
  < notice
  < ntp common settings
  < ntp sync
@@@ -521,11 -525,13 +537,16 @@@
  < ccd routes
  < ccd subnet
  < ccd used
+ < count
+ < countries
+ < countrycode
+ < country codes and flags
  < default ip
  < deprecated fs warn
+ < details
 +< dh
 +< dh key warn
 +< dh name is invalid
  < dnat address
  < dnsforward
  < dnsforward add a new entry
@@@ -561,6 -570,8 +583,7 @@@
  < fireinfo why read more
  < fireinfo your profile id
  < firewall rules
 -< first
+ < flag
  < forward firewall
  < fw default drop
  < fwdfw ACCEPT
@@@ -735,9 -747,8 +759,10 @@@
  < fw settings dropdown
  < fw settings remark
  < fw settings ruletable
 +< gen dh
 +< generate dh key
  < grouptype
+ < hardware support
  < integrity
  < invalid input for dpd delay
  < invalid input for dpd timeout
@@@ -751,8 -763,7 +776,9 @@@
  < minimum
  < minute
  < most preferred
 +< never
+ < no hardware random number generator
 +< not a valid dh key
  < notice
  < openvpn default
  < openvpn destination port used
@@@ -970,11 -976,13 +1000,16 @@@
  < ccd routes
  < ccd subnet
  < ccd used
+ < count
+ < countries
+ < countrycode
+ < country codes and flags
  < default ip
  < deprecated fs warn
+ < details
 +< dh
 +< dh key warn
 +< dh name is invalid
  < dnat address
  < dnsforward
  < dnsforward add a new entry
@@@ -1002,6 -1013,8 +1038,7 @@@
  < extrahd unable to write
  < extrahd you cant mount
  < firewall rules
 -< first
+ < flag
  < forward firewall
  < fw default drop
  < fwdfw ACCEPT
@@@ -1176,9 -1190,8 +1214,10 @@@
  < fw settings dropdown
  < fw settings remark
  < fw settings ruletable
 +< gen dh
 +< generate dh key
  < grouptype
+ < hardware support
  < integrity
  < invalid input for dpd delay
  < invalid input for dpd timeout
@@@ -1192,8 -1206,7 +1231,9 @@@
  < minimum
  < minute
  < most preferred
 +< never
+ < no hardware random number generator
 +< not a valid dh key
  < notice
  < openvpn default
  < openvpn destination port used
@@@ -1399,9 -1411,7 +1447,10 @@@
  < day-graph
  < default ip
  < deprecated fs warn
+ < details
 +< dh
 +< dh key warn
 +< dh name is invalid
  < disk access per
  < dnat address
  < dnsforward
@@@ -1431,6 -1444,8 +1481,7 @@@
  < extrahd unable to write
  < extrahd you cant mount
  < firewall rules
 -< first
+ < flag
  < forward firewall
  < frequency
  < fw default drop
@@@ -1606,9 -1622,8 +1658,10 @@@
  < fw settings dropdown
  < fw settings remark
  < fw settings ruletable
 +< gen dh
 +< generate dh key
  < grouptype
+ < hardware support
  < hour-graph
  < incoming traffic in bytes per second
  < integrity
@@@ -1625,8 -1641,7 +1678,9 @@@
  < minute
  < month-graph
  < most preferred
 +< never
+ < no hardware random number generator
 +< not a valid dh key
  < notice
  < openvpn default
  < openvpn destination port used

diff --cc html/cgi-bin/ovpnmain.cgi
Simple merge

diff --cc langs/de/cgi-bin/de.pl
index 67eff29539c7f6e0af73938e3bafbd600834b891,267d1751db3783c2a4ecdc79a3ed3950a0ae5941..c0502173528e4396f72e53f5cb1b15efbef8dff9
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -643,11 -650,9 +649,12 @@@
  'destination port numbers' => 'Zielport muß ein(e) gültige(r) Portnummer oder Portbereich sein.',
  'destination port overlaps' => 'Der Zielportbereich überlappt einen bereits bestehenden Portbereich.',
  'detail level' => 'Detaillierungsgrad',
+ 'details' => 'Mehr',
  'device' => 'Gerät',
  'devices on blue' => 'Geräte auf Blau',
 +'dh' => 'Diffie-Hellman Key',
 +'dh key warn' => 'Keys mit 1024 und 2048 Bit können mehreren Minuten, 3072 und 4096 Bit bis zu mehreren Stunden dauern. Bitte haben sie Geduld.',
 +'dh name is invalid' => 'Name ist ungültig, bitte "dh1024.pem" verwenden.',
  'dhcp advopt add' => 'DHCP Option hinzufügen',
  'dhcp advopt added' => 'DHCP Option hinzugefügt',
  'dhcp advopt blank value' => 'Wert für DHCP Option darf nicht leer sein',

diff --cc langs/en/cgi-bin/en.pl
index 0eb05341a8b00e1e2becc8721e48837a2cd8d328,64b6d19bbccea533147a7564509777dd13fc246e..37769b172c50b16b349209105a39b4657f43fd21
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -665,11 -672,9 +671,12 @@@
  'destination port numbers' => 'Destination port must be a valid port number or port range.',
  'destination port overlaps' => 'Destination port range overlaps an existing port range.',
  'detail level' => 'Detail level',
+ 'details' => 'Details',
  'device' => 'Device',
  'devices on blue' => 'Devices on BLUE',
 +'dh' => 'Diffie-Hellman Key',
 +'dh key warn' => 'Keys with 1024 and 2048 bit takes up to several minutes, 3072 and 4096 bit might needs several hours. Please be patient.',
 +'dh name is invalid' => 'Name ist ung\9fltig, bitte "dh1024.pem" verwenden.',
  'dhcp advopt add' => 'Add a DHCP option',
  'dhcp advopt added' => 'DHCP option added',
  'dhcp advopt blank value' => 'DHCP Option value cannot be empty.',