Merge branch 'master' into next

Conflicts:
	doc/language_issues.tr

diff --cc doc/language_issues.de
index 8bf36d695b19a6b3467c683676128ffac8f388b1,a7d894055d6eee48045351c4efd588bb337d85aa..bdbe71b1a1765f2afa088f343962916749bda834
--- 1/doc/language_issues.de
--- 2/doc/language_issues.de
+++ b/doc/language_issues.de
@@@ -377,7 -377,7 +377,6 @@@ WARNING: translation string unused: opt
  WARNING: translation string unused: optionsfw warning
  WARNING: translation string unused: or
  WARNING: translation string unused: original
--WARNING: translation string unused: other countries
  WARNING: translation string unused: our donors
  WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall add ip group

diff --cc doc/language_issues.en
index 7cf69532a4eaefca13df8241e830c2f865956575,26c8d3280d0b96c55f5b5d97ca9043110e5259df..1a909099a93d1aadc95c9ed59910a77989977429
--- 1/doc/language_issues.en
--- 2/doc/language_issues.en
+++ b/doc/language_issues.en
@@@ -403,7 -403,7 +403,6 @@@ WARNING: translation string unused: opt
  WARNING: translation string unused: optionsfw warning
  WARNING: translation string unused: or
  WARNING: translation string unused: original
--WARNING: translation string unused: other countries
  WARNING: translation string unused: our donors
  WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall add ip group

diff --cc doc/language_issues.es
index e32468403fe793573e552aef7a0beb74331831ec,95f85cb2fa839f50d8ee2f7f4a2faf63cad87e5d..a726b4dab110431109b709c48adfad576341a19b
--- 1/doc/language_issues.es
--- 2/doc/language_issues.es
+++ b/doc/language_issues.es
@@@ -359,7 -359,7 +359,6 @@@ WARNING: translation string unused: opt
  WARNING: translation string unused: optionsfw warning
  WARNING: translation string unused: or
  WARNING: translation string unused: original
--WARNING: translation string unused: other countries
  WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall mode0
  WARNING: translation string unused: outgoing firewall mode1
@@@ -568,7 -572,11 +567,12 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: year-graph
  WARNING: translation string unused: yearly firewallhits
  WARNING: untranslated string: Async logging enabled
+ WARNING: untranslated string: ConnSched dial
+ WARNING: untranslated string: ConnSched hangup
+ WARNING: untranslated string: ConnSched reboot
+ WARNING: untranslated string: ConnSched shutdown
  WARNING: untranslated string: MB read
++WARNING: untranslated string: Number of Countries for the pie chart
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: Set time on boot
  WARNING: untranslated string: addons
@@@ -665,6 -670,6 +669,7 @@@ WARNING: untranslated string: fireinfo 
  WARNING: untranslated string: fireinfo why enable
  WARNING: untranslated string: fireinfo why read more
  WARNING: untranslated string: fireinfo your profile id
++WARNING: untranslated string: firewall logs country
  WARNING: untranslated string: firewall rules
  WARNING: untranslated string: first
  WARNING: untranslated string: flag
@@@ -878,8 -875,7 +884,9 @@@ WARNING: untranslated string: routing c
  WARNING: untranslated string: routing config changed
  WARNING: untranslated string: routing table
  WARNING: untranslated string: server restart
 +WARNING: untranslated string: show dh
  WARNING: untranslated string: snat new source ip address
++WARNING: untranslated string: source ip country
  WARNING: untranslated string: ssh
  WARNING: untranslated string: static routes
  WARNING: untranslated string: support donation

diff --cc doc/language_issues.fr
index c62c6fb749735a4f6f286401f6ae7efc396309e2,0b513d06e17add5c9b5578cb4ee7f15186f2d5b5..f0dee16537997ffb59a9ead97d5b7a2cc63c2ddd
--- 1/doc/language_issues.fr
--- 2/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@@ -359,7 -359,7 +359,6 @@@ WARNING: translation string unused: opt
  WARNING: translation string unused: optionsfw warning
  WARNING: translation string unused: or
  WARNING: translation string unused: original
--WARNING: translation string unused: other countries
  WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall add ip group
  WARNING: translation string unused: outgoing firewall add mac group
@@@ -579,7 -583,11 +578,12 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: xtaccess bad transfert
  WARNING: translation string unused: year-graph
  WARNING: translation string unused: yearly firewallhits
+ WARNING: untranslated string: ConnSched dial
+ WARNING: untranslated string: ConnSched hangup
+ WARNING: untranslated string: ConnSched reboot
+ WARNING: untranslated string: ConnSched shutdown
  WARNING: untranslated string: MB read
++WARNING: untranslated string: Number of Countries for the pie chart
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: addons
  WARNING: untranslated string: advproxy cache-digest
@@@ -676,6 -681,6 +680,7 @@@ WARNING: untranslated string: fireinfo 
  WARNING: untranslated string: fireinfo why enable
  WARNING: untranslated string: fireinfo why read more
  WARNING: untranslated string: fireinfo your profile id
++WARNING: untranslated string: firewall logs country
  WARNING: untranslated string: firewall rules
  WARNING: untranslated string: first
  WARNING: untranslated string: flag
@@@ -885,9 -882,8 +891,10 @@@ WARNING: untranslated string: routing c
  WARNING: untranslated string: routing config changed
  WARNING: untranslated string: routing table
  WARNING: untranslated string: server restart
 +WARNING: untranslated string: show dh
  WARNING: untranslated string: snat new source ip address
  WARNING: untranslated string: snort working
++WARNING: untranslated string: source ip country
  WARNING: untranslated string: ssh
  WARNING: untranslated string: static routes
  WARNING: untranslated string: support donation

diff --cc doc/language_issues.nl
index 4061147c0230489f8042ff220b2d1894fa0e7d67,d19b602159a0000e686946fb48bc07079d5bc0f5..8b2bb09aad06f5e9daf113c0574305c4a0c075df
--- 1/doc/language_issues.nl
--- 2/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@@ -363,7 -363,7 +363,6 @@@ WARNING: translation string unused: opt
  WARNING: translation string unused: optionsfw warning
  WARNING: translation string unused: or
  WARNING: translation string unused: original
--WARNING: translation string unused: other countries
  WARNING: translation string unused: our donors
  WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall add ip group
@@@ -583,7 -587,11 +582,12 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: xtaccess bad transfert
  WARNING: translation string unused: year-graph
  WARNING: translation string unused: yearly firewallhits
+ WARNING: untranslated string: ConnSched dial
+ WARNING: untranslated string: ConnSched hangup
+ WARNING: untranslated string: ConnSched reboot
+ WARNING: untranslated string: ConnSched shutdown
  WARNING: untranslated string: MB read
++WARNING: untranslated string: Number of Countries for the pie chart
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: addons
  WARNING: untranslated string: advproxy cache-digest
@@@ -623,6 -628,6 +627,7 @@@ WARNING: untranslated string: drop outg
  WARNING: untranslated string: encryption
  WARNING: untranslated string: entropy
  WARNING: untranslated string: entropy graphs
++WARNING: untranslated string: firewall logs country
  WARNING: untranslated string: firewall rules
  WARNING: untranslated string: first
  WARNING: untranslated string: flag
@@@ -806,8 -803,7 +812,9 @@@ WARNING: untranslated string: route con
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed
  WARNING: untranslated string: routing table
 +WARNING: untranslated string: show dh
  WARNING: untranslated string: snat new source ip address
++WARNING: untranslated string: source ip country
  WARNING: untranslated string: ssh
  WARNING: untranslated string: support donation
  WARNING: untranslated string: system has hwrng

diff --cc doc/language_issues.pl
index e32468403fe793573e552aef7a0beb74331831ec,95f85cb2fa839f50d8ee2f7f4a2faf63cad87e5d..a726b4dab110431109b709c48adfad576341a19b
--- 1/doc/language_issues.pl
--- 2/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@@ -359,7 -359,7 +359,6 @@@ WARNING: translation string unused: opt
  WARNING: translation string unused: optionsfw warning
  WARNING: translation string unused: or
  WARNING: translation string unused: original
--WARNING: translation string unused: other countries
  WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall mode0
  WARNING: translation string unused: outgoing firewall mode1
@@@ -568,7 -572,11 +567,12 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: year-graph
  WARNING: translation string unused: yearly firewallhits
  WARNING: untranslated string: Async logging enabled
+ WARNING: untranslated string: ConnSched dial
+ WARNING: untranslated string: ConnSched hangup
+ WARNING: untranslated string: ConnSched reboot
+ WARNING: untranslated string: ConnSched shutdown
  WARNING: untranslated string: MB read
++WARNING: untranslated string: Number of Countries for the pie chart
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: Set time on boot
  WARNING: untranslated string: addons
@@@ -665,6 -670,6 +669,7 @@@ WARNING: untranslated string: fireinfo 
  WARNING: untranslated string: fireinfo why enable
  WARNING: untranslated string: fireinfo why read more
  WARNING: untranslated string: fireinfo your profile id
++WARNING: untranslated string: firewall logs country
  WARNING: untranslated string: firewall rules
  WARNING: untranslated string: first
  WARNING: untranslated string: flag
@@@ -878,8 -875,7 +884,9 @@@ WARNING: untranslated string: routing c
  WARNING: untranslated string: routing config changed
  WARNING: untranslated string: routing table
  WARNING: untranslated string: server restart
 +WARNING: untranslated string: show dh
  WARNING: untranslated string: snat new source ip address
++WARNING: untranslated string: source ip country
  WARNING: untranslated string: ssh
  WARNING: untranslated string: static routes
  WARNING: untranslated string: support donation

diff --cc doc/language_issues.ru
index bf6f61f09a091f3fa85ae2b752bffb64a4b1be94,15caa07f9e63a1a4eb1adbcfbd543bc41047fcfa..c42030b1a0ab4fa323c06f9ae67177649a76202e
--- 1/doc/language_issues.ru
--- 2/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@@ -353,7 -353,7 +353,6 @@@ WARNING: translation string unused: opt
  WARNING: translation string unused: optionsfw warning
  WARNING: translation string unused: or
  WARNING: translation string unused: original
--WARNING: translation string unused: other countries
  WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall add ip group
  WARNING: translation string unused: outgoing firewall add mac group
@@@ -571,8 -575,12 +570,13 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: xtaccess bad transfert
  WARNING: translation string unused: yearly firewallhits
  WARNING: untranslated string: Add a route
+ WARNING: untranslated string: ConnSched dial
+ WARNING: untranslated string: ConnSched hangup
+ WARNING: untranslated string: ConnSched reboot
+ WARNING: untranslated string: ConnSched shutdown
  WARNING: untranslated string: Edit an existing route
  WARNING: untranslated string: MB read
++WARNING: untranslated string: Number of Countries for the pie chart
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: addons
  WARNING: untranslated string: advproxy cache-digest
@@@ -660,6 -665,6 +664,7 @@@ WARNING: untranslated string: extrahd m
  WARNING: untranslated string: extrahd to
  WARNING: untranslated string: extrahd to root
  WARNING: untranslated string: extrahd you cant mount
++WARNING: untranslated string: firewall logs country
  WARNING: untranslated string: firewall rules
  WARNING: untranslated string: first
  WARNING: untranslated string: flag
@@@ -868,8 -865,7 +874,9 @@@ WARNING: untranslated string: routing c
  WARNING: untranslated string: routing config changed
  WARNING: untranslated string: routing table
  WARNING: untranslated string: server restart
 +WARNING: untranslated string: show dh
  WARNING: untranslated string: snat new source ip address
++WARNING: untranslated string: source ip country
  WARNING: untranslated string: ssh
  WARNING: untranslated string: static routes
  WARNING: untranslated string: support donation

diff --cc doc/language_issues.tr
index c897378a74e37fa8cd47741a6043606858e6988f,8b3afdf8389f3ca9985ea593543f20e48cbdf232..cac53be5085da1b721b1359a3971ca487833e44b
--- 1/doc/language_issues.tr
--- 2/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@@ -403,7 -403,7 +403,6 @@@ WARNING: translation string unused: opt
  WARNING: translation string unused: optionsfw warning
  WARNING: translation string unused: or
  WARNING: translation string unused: original
--WARNING: translation string unused: other countries
  WARNING: translation string unused: our donors
  WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall add ip group
@@@ -633,41 -638,16 +633,33 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: xtaccess bad transfert
  WARNING: translation string unused: year-graph
  WARNING: translation string unused: yearly firewallhits
- WARNING: untranslated string: MB read
+ WARNING: untranslated string: ConnSched dial
+ WARNING: untranslated string: ConnSched hangup
+ WARNING: untranslated string: ConnSched reboot
+ WARNING: untranslated string: ConnSched shutdown
++WARNING: untranslated string: Number of Countries for the pie chart
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: bytes
- 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: drop outgoing
- WARNING: untranslated string: entropy graphs
- WARNING: untranslated string: flag
- WARNING: untranslated string: fwdfw warn1
++WARNING: untranslated string: firewall logs country
+ WARNING: untranslated string: fwdfw many
  WARNING: untranslated string: fwhost err hostip
- WARNING: untranslated string: hardware support
- WARNING: untranslated string: last
- WARNING: untranslated string: no hardware random number generator
 +WARNING: untranslated string: gen dh
 +WARNING: untranslated string: generate dh key
 +WARNING: untranslated string: not a valid dh key
 +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: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed
  WARNING: untranslated string: routing table
- WARNING: untranslated string: system has hwrng
- WARNING: untranslated string: system has rdrand
 +WARNING: untranslated string: show dh
++WARNING: untranslated string: source ip country
 +WARNING: untranslated string: upload dh key

diff --cc doc/language_missings
index 6d71db20caa48affb27dbe69f7164ebed52bd446,fc3089007bfa36b8a42060e2cd8c0c99e3acf31f..bc237177cbcd64913f7d7697b9aaa6dc777f469e
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -111,7 -114,8 +115,8 @@@
  < fireinfo why enable
  < fireinfo why read more
  < fireinfo your profile id
++< firewall logs country
  < firewall rules
 -< first
  < flag
  < forward firewall
  < fw default drop
@@@ -313,6 -315,6 +319,7 @@@
  < notice
  < ntp common settings
  < ntp sync
++< Number of Countries for the pie chart
  < openvpn default
  < openvpn destination port used
  < openvpn disabled
@@@ -354,9 -348,8 +361,10 @@@
  < qos enter bandwidths
  < red1
  < server restart
 +< show dh
  < snat new source ip address
  < snort working
++< source ip country
  < ssh
  < static routes
  < support donation
@@@ -584,7 -580,8 +596,8 @@@
  < fireinfo why enable
  < fireinfo why read more
  < fireinfo your profile id
++< firewall logs country
  < firewall rules
 -< first
  < flag
  < forward firewall
  < fw default drop
@@@ -780,10 -777,8 +794,11 @@@
  < minimum
  < minute
  < most preferred
 +< never
  < no hardware random number generator
 +< not a valid dh key
  < notice
++< Number of Countries for the pie chart
  < openvpn default
  < openvpn destination port used
  < openvpn disabled
@@@ -844,8 -831,7 +859,9 @@@
  < red1
  < server restart
  < Set time on boot
 +< show dh
  < snat new source ip address
++< source ip country
  < ssh
  < static routes
  < support donation
@@@ -1041,7 -1030,8 +1061,8 @@@
  < extrahd unable to read
  < extrahd unable to write
  < extrahd you cant mount
++< firewall logs country
  < firewall rules
 -< first
  < flag
  < forward firewall
  < fw default drop
@@@ -1237,10 -1227,8 +1259,11 @@@
  < minimum
  < minute
  < most preferred
 +< never
  < no hardware random number generator
 +< not a valid dh key
  < notice
++< Number of Countries for the pie chart
  < openvpn default
  < openvpn destination port used
  < openvpn disabled
@@@ -1286,8 -1266,7 +1309,9 @@@
  < qos enter bandwidths
  < red1
  < server restart
 +< show dh
  < snat new source ip address
++< source ip country
  < ssh
  < static routes
  < support donation
@@@ -1486,7 -1468,8 +1514,8 @@@
  < extrahd unable to read
  < extrahd unable to write
  < extrahd you cant mount
++< firewall logs country
  < firewall rules
 -< first
  < flag
  < forward firewall
  < frequency
@@@ -1686,10 -1669,8 +1716,11 @@@
  < minute
  < month-graph
  < most preferred
 +< never
  < no hardware random number generator
 +< not a valid dh key
  < notice
++< Number of Countries for the pie chart
  < openvpn default
  < openvpn destination port used
  < openvpn disabled
@@@ -1732,8 -1705,7 +1763,9 @@@
  < qos enter bandwidths
  < red1
  < server restart
 +< show dh
  < snat new source ip address
++< source ip country
  < ssh
  < static routes
  < support donation

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

diff --cc langs/en/cgi-bin/en.pl
index 46f5625c154bfaeebad2fa6ebc45c85305b6449a,db31a89ea2e00603dda359042ff8466d10c5cd1a..5b82627f5d5b6c81e5b760a66aa1e41535a7845a
--- 1/langs/en/cgi-bin/en.pl
--- 2/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@@ -925,9 -928,8 +929,9 @@@
  'firewall log' => 'Firewall log',
  'firewall log viewer' => 'Firewall Log Viewer',
  'firewall logs' => 'Firewall Logs',
++'firewall logs country' => 'Fw-Loggraphs (Country)',
  'firewall logs ip' => 'Fw-Loggraphs (IP)',
  'firewall logs port' => 'Fw-Loggraphs (Port)',
- 'firewall logs country' => 'Fw-Loggraphs (Country)',
  'firewall rules' => 'Firewall Rules',
  'firewallhits' => 'firewallhits',
  'firmware' => 'Firmware',