Merge branch 'master' into next

Conflicts:
	doc/language_issues.tr

diff --combined doc/language_issues.de
index 8bf36d695b19a6b3467c683676128ffac8f388b1,a7d894055d6eee48045351c4efd588bb337d85aa..bdbe71b1a1765f2afa088f343962916749bda834
--- 1/doc/language_issues.de
--- 2/doc/language_issues.de
+++ b/doc/language_issues.de
@@@ -1,3 -1,4 +1,3 @@@
 -WARNING: translation string unused: Client status and controlc
  WARNING: translation string unused: ConnSched scheduler
  WARNING: translation string unused: ConnSched select profile
  WARNING: translation string unused: HDD temperature
@@@ -354,7 -355,6 +354,7 @@@ WARNING: translation string unused: net
  WARNING: translation string unused: network traffic graphs
  WARNING: translation string unused: network updated
  WARNING: translation string unused: networks settings
 +WARNING: translation string unused: never
  WARNING: translation string unused: new optionsfw must boot
  WARNING: translation string unused: no alcatelusb firmware
  WARNING: translation string unused: no cfg upload
@@@ -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
@@@ -399,11 -399,10 +398,11 @@@ WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall view group
  WARNING: translation string unused: outgoing firewall warning
  WARNING: translation string unused: override mtu
 -WARNING: translation string unused: ovpn
  WARNING: translation string unused: ovpn config
  WARNING: translation string unused: ovpn dl
 +WARNING: translation string unused: ovpn engines
  WARNING: translation string unused: ovpn log
 +WARNING: translation string unused: ovpn reneg sec
  WARNING: translation string unused: ovpn_fastio
  WARNING: translation string unused: ovpn_fragment
  WARNING: translation string unused: ovpn_mssfix
@@@ -450,12 -449,16 +449,12 @@@ WARNING: translation string unused: rel
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: requested data
 -WARNING: translation string unused: reserved dst port
 -WARNING: translation string unused: reserved src port
  WARNING: translation string unused: restore hardware settings
  WARNING: translation string unused: root
  WARNING: translation string unused: root path
  WARNING: translation string unused: root user password
  WARNING: translation string unused: route subnet is invalid
  WARNING: translation string unused: router ip
 -WARNING: translation string unused: rsvd dst port overlap
 -WARNING: translation string unused: rsvd src port overlap
  WARNING: translation string unused: rules already up to date
  WARNING: translation string unused: safe removal of umounted device
  WARNING: translation string unused: save error
@@@ -606,15 -609,10 +605,15 @@@ WARNING: untranslated string: addon
  WARNING: untranslated string: bytes
  WARNING: untranslated string: community rules
  WARNING: untranslated string: dead peer detection
 +WARNING: untranslated string: dns servers
 +WARNING: untranslated string: downlink
  WARNING: untranslated string: emerging rules
 +WARNING: untranslated string: first
  WARNING: untranslated string: fwhost err hostip
 +WARNING: untranslated string: last
  WARNING: untranslated string: qos add subclass
  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: uplink

diff --combined doc/language_issues.en
index 7cf69532a4eaefca13df8241e830c2f865956575,26c8d3280d0b96c55f5b5d97ca9043110e5259df..1a909099a93d1aadc95c9ed59910a77989977429
--- 1/doc/language_issues.en
--- 2/doc/language_issues.en
+++ b/doc/language_issues.en
@@@ -1,3 -1,4 +1,3 @@@
 -WARNING: translation string unused: Client status and controlc
  WARNING: translation string unused: ConnSched scheduler
  WARNING: translation string unused: ConnSched select profile
  WARNING: translation string unused: HDD temperature
@@@ -379,7 -380,6 +379,7 @@@ WARNING: translation string unused: net
  WARNING: translation string unused: network traffic graphs
  WARNING: translation string unused: network updated
  WARNING: translation string unused: networks settings
 +WARNING: translation string unused: never
  WARNING: translation string unused: new optionsfw must boot
  WARNING: translation string unused: no alcatelusb firmware
  WARNING: translation string unused: no cfg upload
@@@ -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
@@@ -425,11 -425,10 +424,11 @@@ WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall view group
  WARNING: translation string unused: outgoing firewall warning
  WARNING: translation string unused: override mtu
 -WARNING: translation string unused: ovpn
  WARNING: translation string unused: ovpn config
  WARNING: translation string unused: ovpn dl
 +WARNING: translation string unused: ovpn engines
  WARNING: translation string unused: ovpn log
 +WARNING: translation string unused: ovpn reneg sec
  WARNING: translation string unused: ovpn_fastio
  WARNING: translation string unused: ovpn_fragment
  WARNING: translation string unused: ovpn_mssfix
@@@ -477,12 -476,16 +476,12 @@@ WARNING: translation string unused: rel
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: requested data
 -WARNING: translation string unused: reserved dst port
 -WARNING: translation string unused: reserved src port
  WARNING: translation string unused: restore hardware settings
  WARNING: translation string unused: root
  WARNING: translation string unused: root path
  WARNING: translation string unused: root user password
  WARNING: translation string unused: route subnet is invalid
  WARNING: translation string unused: router ip
 -WARNING: translation string unused: rsvd dst port overlap
 -WARNING: translation string unused: rsvd src port overlap
  WARNING: translation string unused: rules already up to date
  WARNING: translation string unused: safe removal of umounted device
  WARNING: translation string unused: save error
@@@ -637,13 -640,8 +636,13 @@@ WARNING: translation string unused: yea
  WARNING: translation string unused: yearly firewallhits
  WARNING: untranslated string: Scan for Songs
  WARNING: untranslated string: bytes
 +WARNING: untranslated string: dns servers
 +WARNING: untranslated string: downlink
 +WARNING: untranslated string: first
  WARNING: untranslated string: fwhost err hostip
 +WARNING: untranslated string: last
  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: uplink

diff --combined 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
@@@ -369,6 -369,7 +368,6 @@@ WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall reset
  WARNING: translation string unused: outgoing firewall warning
  WARNING: translation string unused: override mtu
 -WARNING: translation string unused: ovpn
  WARNING: translation string unused: ovpn config
  WARNING: translation string unused: ovpn dl
  WARNING: translation string unused: ovpn log
@@@ -419,12 -420,16 +418,12 @@@ WARNING: translation string unused: rel
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: requested data
 -WARNING: translation string unused: reserved dst port
 -WARNING: translation string unused: reserved src port
  WARNING: translation string unused: restore hardware settings
  WARNING: translation string unused: root
  WARNING: translation string unused: root path
  WARNING: translation string unused: root user password
  WARNING: translation string unused: route subnet is invalid
  WARNING: translation string unused: router ip
 -WARNING: translation string unused: rsvd dst port overlap
 -WARNING: translation string unused: rsvd src port overlap
  WARNING: translation string unused: rules already up to date
  WARNING: translation string unused: safe removal of umounted device
  WARNING: translation string unused: save error
@@@ -551,7 -556,6 +550,7 @@@ WARNING: translation string unused: us
  WARNING: translation string unused: use ibod
  WARNING: translation string unused: view log
  WARNING: translation string unused: vpn aggrmode
 +WARNING: translation string unused: vpn configuration main
  WARNING: translation string unused: vpn incompatible use of defaultroute
  WARNING: translation string unused: vpn mtu invalid
  WARNING: translation string unused: vpn on blue
@@@ -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
@@@ -624,9 -632,6 +628,9 @@@ WARNING: untranslated string: countryco
  WARNING: untranslated string: dead peer detection
  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
@@@ -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
@@@ -710,6 -715,7 +715,7 @@@ WARNING: untranslated string: fwdfw hin
  WARNING: untranslated string: fwdfw iface
  WARNING: untranslated string: fwdfw log
  WARNING: untranslated string: fwdfw log rule
+ WARNING: untranslated string: fwdfw many
  WARNING: untranslated string: fwdfw menu
  WARNING: untranslated string: fwdfw movedown
  WARNING: untranslated string: fwdfw moveup
@@@ -811,8 -817,6 +817,8 @@@ 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
@@@ -829,7 -833,6 +835,7 @@@ WARNING: untranslated string: minimu
  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
@@@ -843,14 -846,8 +849,14 @@@ WARNING: untranslated string: openvpn s
  WARNING: untranslated string: other
  WARNING: untranslated string: outgoing firewall p2p allow
  WARNING: untranslated string: outgoing firewall p2p deny
 +WARNING: untranslated string: ovpn crypt options
 +WARNING: untranslated string: ovpn dh
 +WARNING: untranslated string: ovpn dh name
  WARNING: untranslated string: ovpn errmsg green already pushed
  WARNING: untranslated string: ovpn errmsg invalid ip or mask
 +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 mtu-disc
  WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
@@@ -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
@@@ -935,7 -931,6 +942,7 @@@ WARNING: untranslated string: tor traff
  WARNING: untranslated string: tor traffic read written
  WARNING: untranslated string: tor use exit nodes
  WARNING: untranslated string: uplink
 +WARNING: untranslated string: upload dh key
  WARNING: untranslated string: uptime load average
  WARNING: untranslated string: urlfilter redirect template
  WARNING: untranslated string: visit us at

diff --combined 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
@@@ -380,6 -380,7 +379,6 @@@ WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall view group
  WARNING: translation string unused: outgoing firewall warning
  WARNING: translation string unused: override mtu
 -WARNING: translation string unused: ovpn
  WARNING: translation string unused: ovpn config
  WARNING: translation string unused: ovpn dl
  WARNING: translation string unused: ovpn log
@@@ -430,12 -431,16 +429,12 @@@ WARNING: translation string unused: rel
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: requested data
 -WARNING: translation string unused: reserved dst port
 -WARNING: translation string unused: reserved src port
  WARNING: translation string unused: restore hardware settings
  WARNING: translation string unused: root
  WARNING: translation string unused: root path
  WARNING: translation string unused: root user password
  WARNING: translation string unused: route subnet is invalid
  WARNING: translation string unused: router ip
 -WARNING: translation string unused: rsvd dst port overlap
 -WARNING: translation string unused: rsvd src port overlap
  WARNING: translation string unused: rules already up to date
  WARNING: translation string unused: safe removal of umounted device
  WARNING: translation string unused: save error
@@@ -564,7 -569,6 +563,7 @@@ WARNING: translation string unused: us
  WARNING: translation string unused: use ibod
  WARNING: translation string unused: view log
  WARNING: translation string unused: vpn aggrmode
 +WARNING: translation string unused: vpn configuration main
  WARNING: translation string unused: vpn incompatible use of defaultroute
  WARNING: translation string unused: vpn mtu invalid
  WARNING: translation string unused: vpn on blue
@@@ -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
@@@ -634,9 -642,6 +638,9 @@@ WARNING: untranslated string: countryco
  WARNING: untranslated string: dead peer detection
  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
@@@ -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
@@@ -721,6 -726,7 +726,7 @@@ WARNING: untranslated string: fwdfw hin
  WARNING: untranslated string: fwdfw iface
  WARNING: untranslated string: fwdfw log
  WARNING: untranslated string: fwdfw log rule
+ WARNING: untranslated string: fwdfw many
  WARNING: untranslated string: fwdfw menu
  WARNING: untranslated string: fwdfw movedown
  WARNING: untranslated string: fwdfw moveup
@@@ -822,8 -828,6 +828,8 @@@ 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
@@@ -840,7 -844,6 +846,7 @@@ WARNING: untranslated string: minimu
  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
@@@ -854,12 -857,6 +860,12 @@@ WARNING: untranslated string: openvpn p
  WARNING: untranslated string: openvpn prefix remote subnet
  WARNING: untranslated string: openvpn subnet is used
  WARNING: untranslated string: other
 +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 mtu-disc
  WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
@@@ -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
@@@ -943,7 -939,6 +950,7 @@@ WARNING: untranslated string: tor traff
  WARNING: untranslated string: tor traffic read written
  WARNING: untranslated string: tor use exit nodes
  WARNING: untranslated string: uplink
 +WARNING: untranslated string: upload dh key
  WARNING: untranslated string: upload new ruleset
  WARNING: untranslated string: uptime load average
  WARNING: untranslated string: urlfilter file ext block

diff --combined 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
@@@ -385,6 -385,7 +384,6 @@@ WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall view group
  WARNING: translation string unused: outgoing firewall warning
  WARNING: translation string unused: override mtu
 -WARNING: translation string unused: ovpn
  WARNING: translation string unused: ovpn config
  WARNING: translation string unused: ovpn dl
  WARNING: translation string unused: ovpn log
@@@ -435,12 -436,16 +434,12 @@@ WARNING: translation string unused: rel
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: requested data
 -WARNING: translation string unused: reserved dst port
 -WARNING: translation string unused: reserved src port
  WARNING: translation string unused: restore hardware settings
  WARNING: translation string unused: root
  WARNING: translation string unused: root path
  WARNING: translation string unused: root user password
  WARNING: translation string unused: route subnet is invalid
  WARNING: translation string unused: router ip
 -WARNING: translation string unused: rsvd dst port overlap
 -WARNING: translation string unused: rsvd src port overlap
  WARNING: translation string unused: rules already up to date
  WARNING: translation string unused: safe removal of umounted device
  WARNING: translation string unused: save error
@@@ -567,7 -572,6 +566,7 @@@ WARNING: translation string unused: us
  WARNING: translation string unused: use ibod
  WARNING: translation string unused: view log
  WARNING: translation string unused: vpn aggrmode
 +WARNING: translation string unused: vpn configuration main
  WARNING: translation string unused: vpn incompatible use of defaultroute
  WARNING: translation string unused: vpn mtu invalid
  WARNING: translation string unused: vpn on blue
@@@ -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
@@@ -600,9 -608,6 +604,9 @@@ WARNING: untranslated string: country c
  WARNING: untranslated string: countrycode
  WARNING: untranslated string: dead peer detection
  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
@@@ -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
@@@ -668,6 -673,7 +673,7 @@@ WARNING: untranslated string: fwdfw hin
  WARNING: untranslated string: fwdfw iface
  WARNING: untranslated string: fwdfw log
  WARNING: untranslated string: fwdfw log rule
+ WARNING: untranslated string: fwdfw many
  WARNING: untranslated string: fwdfw menu
  WARNING: untranslated string: fwdfw movedown
  WARNING: untranslated string: fwdfw moveup
@@@ -769,8 -775,6 +775,8 @@@ 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
@@@ -786,15 -790,8 +792,15 @@@ WARNING: untranslated string: maximu
  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
@@@ -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
@@@ -861,7 -857,6 +868,7 @@@ WARNING: untranslated string: tor traff
  WARNING: untranslated string: tor traffic read written
  WARNING: untranslated string: tor use exit nodes
  WARNING: untranslated string: uplink
 +WARNING: untranslated string: upload dh key
  WARNING: untranslated string: uptime load average
  WARNING: untranslated string: urlfilter redirect template
  WARNING: untranslated string: wlan client

diff --combined 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
@@@ -369,6 -369,7 +368,6 @@@ WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall reset
  WARNING: translation string unused: outgoing firewall warning
  WARNING: translation string unused: override mtu
 -WARNING: translation string unused: ovpn
  WARNING: translation string unused: ovpn config
  WARNING: translation string unused: ovpn dl
  WARNING: translation string unused: ovpn log
@@@ -419,12 -420,16 +418,12 @@@ WARNING: translation string unused: rel
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: requested data
 -WARNING: translation string unused: reserved dst port
 -WARNING: translation string unused: reserved src port
  WARNING: translation string unused: restore hardware settings
  WARNING: translation string unused: root
  WARNING: translation string unused: root path
  WARNING: translation string unused: root user password
  WARNING: translation string unused: route subnet is invalid
  WARNING: translation string unused: router ip
 -WARNING: translation string unused: rsvd dst port overlap
 -WARNING: translation string unused: rsvd src port overlap
  WARNING: translation string unused: rules already up to date
  WARNING: translation string unused: safe removal of umounted device
  WARNING: translation string unused: save error
@@@ -551,7 -556,6 +550,7 @@@ WARNING: translation string unused: us
  WARNING: translation string unused: use ibod
  WARNING: translation string unused: view log
  WARNING: translation string unused: vpn aggrmode
 +WARNING: translation string unused: vpn configuration main
  WARNING: translation string unused: vpn incompatible use of defaultroute
  WARNING: translation string unused: vpn mtu invalid
  WARNING: translation string unused: vpn on blue
@@@ -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
@@@ -624,9 -632,6 +628,9 @@@ WARNING: untranslated string: countryco
  WARNING: untranslated string: dead peer detection
  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
@@@ -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
@@@ -710,6 -715,7 +715,7 @@@ WARNING: untranslated string: fwdfw hin
  WARNING: untranslated string: fwdfw iface
  WARNING: untranslated string: fwdfw log
  WARNING: untranslated string: fwdfw log rule
+ WARNING: untranslated string: fwdfw many
  WARNING: untranslated string: fwdfw menu
  WARNING: untranslated string: fwdfw movedown
  WARNING: untranslated string: fwdfw moveup
@@@ -811,8 -817,6 +817,8 @@@ 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
@@@ -829,7 -833,6 +835,7 @@@ WARNING: untranslated string: minimu
  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
@@@ -843,14 -846,8 +849,14 @@@ WARNING: untranslated string: openvpn s
  WARNING: untranslated string: other
  WARNING: untranslated string: outgoing firewall p2p allow
  WARNING: untranslated string: outgoing firewall p2p deny
 +WARNING: untranslated string: ovpn crypt options
 +WARNING: untranslated string: ovpn dh
 +WARNING: untranslated string: ovpn dh name
  WARNING: untranslated string: ovpn errmsg green already pushed
  WARNING: untranslated string: ovpn errmsg invalid ip or mask
 +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 mtu-disc
  WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
@@@ -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
@@@ -935,7 -931,6 +942,7 @@@ WARNING: untranslated string: tor traff
  WARNING: untranslated string: tor traffic read written
  WARNING: untranslated string: tor use exit nodes
  WARNING: untranslated string: uplink
 +WARNING: untranslated string: upload dh key
  WARNING: untranslated string: uptime load average
  WARNING: untranslated string: urlfilter redirect template
  WARNING: untranslated string: visit us at

diff --combined 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
@@@ -374,6 -374,7 +373,6 @@@ WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall view group
  WARNING: translation string unused: outgoing firewall warning
  WARNING: translation string unused: override mtu
 -WARNING: translation string unused: ovpn
  WARNING: translation string unused: ovpn config
  WARNING: translation string unused: ovpn dl
  WARNING: translation string unused: ovpn log
@@@ -424,12 -425,16 +423,12 @@@ WARNING: translation string unused: rel
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: requested data
 -WARNING: translation string unused: reserved dst port
 -WARNING: translation string unused: reserved src port
  WARNING: translation string unused: restore hardware settings
  WARNING: translation string unused: root
  WARNING: translation string unused: root path
  WARNING: translation string unused: root user password
  WARNING: translation string unused: route subnet is invalid
  WARNING: translation string unused: router ip
 -WARNING: translation string unused: rsvd dst port overlap
 -WARNING: translation string unused: rsvd src port overlap
  WARNING: translation string unused: rules already up to date
  WARNING: translation string unused: safe removal of umounted device
  WARNING: translation string unused: save error
@@@ -556,7 -561,6 +555,7 @@@ WARNING: translation string unused: us
  WARNING: translation string unused: use ibod
  WARNING: translation string unused: view log
  WARNING: translation string unused: vpn aggrmode
 +WARNING: translation string unused: vpn configuration main
  WARNING: translation string unused: vpn incompatible use of defaultroute
  WARNING: translation string unused: vpn mtu invalid
  WARNING: translation string unused: vpn on blue
@@@ -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
@@@ -628,9 -636,6 +632,9 @@@ WARNING: untranslated string: countryco
  WARNING: untranslated string: dead peer detection
  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
@@@ -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
@@@ -705,6 -710,7 +710,7 @@@ WARNING: untranslated string: fwdfw hin
  WARNING: untranslated string: fwdfw iface
  WARNING: untranslated string: fwdfw log
  WARNING: untranslated string: fwdfw log rule
+ WARNING: untranslated string: fwdfw many
  WARNING: untranslated string: fwdfw menu
  WARNING: untranslated string: fwdfw movedown
  WARNING: untranslated string: fwdfw moveup
@@@ -806,8 -812,6 +812,8 @@@ 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
@@@ -825,7 -829,6 +831,7 @@@ WARNING: untranslated string: minimu
  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
@@@ -838,12 -841,6 +844,12 @@@ WARNING: untranslated string: openvpn p
  WARNING: untranslated string: openvpn subnet is used
  WARNING: untranslated string: other
  WARNING: untranslated string: outgoing traffic in bytes per second
 +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 mtu-disc
  WARNING: untranslated string: ovpn mtu-disc and mtu not 1500
@@@ -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
@@@ -924,7 -920,6 +931,7 @@@ WARNING: untranslated string: tor traff
  WARNING: untranslated string: tor traffic read written
  WARNING: untranslated string: tor use exit nodes
  WARNING: untranslated string: uplink
 +WARNING: untranslated string: upload dh key
  WARNING: untranslated string: uptime load average
  WARNING: untranslated string: urlfilter redirect template
  WARNING: untranslated string: visit us at

diff --combined doc/language_issues.tr
index c897378a74e37fa8cd47741a6043606858e6988f,8b3afdf8389f3ca9985ea593543f20e48cbdf232..cac53be5085da1b721b1359a3971ca487833e44b
--- 1/doc/language_issues.tr
--- 2/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@@ -4,6 -4,7 +4,7 @@@ WARNING: translation string unused: Con
  WARNING: translation string unused: HDD temperature
  WARNING: translation string unused: Level7 rule
  WARNING: translation string unused: Local VPN IP
+ WARNING: translation string unused: MB written
  WARNING: translation string unused: Ping
  WARNING: translation string unused: Queuelenght
  WARNING: translation string unused: Remote IP
@@@ -169,7 -170,6 +170,6 @@@ WARNING: translation string unused: do 
  WARNING: translation string unused: donation-link
  WARNING: translation string unused: done
  WARNING: translation string unused: driver
- WARNING: translation string unused: drop output
  WARNING: translation string unused: dstprt range overlaps
  WARNING: translation string unused: dstprt within existing
  WARNING: translation string unused: dynamic dns client
@@@ -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
@@@ -425,6 -425,7 +424,6 @@@ WARNING: translation string unused: out
  WARNING: translation string unused: outgoing firewall view group
  WARNING: translation string unused: outgoing firewall warning
  WARNING: translation string unused: override mtu
 -WARNING: translation string unused: ovpn
  WARNING: translation string unused: ovpn config
  WARNING: translation string unused: ovpn dl
  WARNING: translation string unused: ovpn log
@@@ -475,12 -476,16 +474,12 @@@ WARNING: translation string unused: rel
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: requested data
 -WARNING: translation string unused: reserved dst port
 -WARNING: translation string unused: reserved src port
  WARNING: translation string unused: restore hardware settings
  WARNING: translation string unused: root
  WARNING: translation string unused: root path
  WARNING: translation string unused: root user password
  WARNING: translation string unused: route subnet is invalid
  WARNING: translation string unused: router ip
 -WARNING: translation string unused: rsvd dst port overlap
 -WARNING: translation string unused: rsvd src port overlap
  WARNING: translation string unused: rules already up to date
  WARNING: translation string unused: safe removal of umounted device
  WARNING: translation string unused: save error
@@@ -552,6 -557,7 +551,7 @@@ WARNING: translation string unused: to 
  WARNING: translation string unused: to install an update
  WARNING: translation string unused: to warn email bad
  WARNING: translation string unused: too long 80 char max
+ WARNING: translation string unused: tor 0 = disabled
  WARNING: translation string unused: tor accounting period daily
  WARNING: translation string unused: tor accounting period monthly
  WARNING: translation string unused: tor accounting period weekly
@@@ -617,7 -623,6 +617,7 @@@ WARNING: translation string unused: us
  WARNING: translation string unused: use ibod
  WARNING: translation string unused: view log
  WARNING: translation string unused: vpn aggrmode
 +WARNING: translation string unused: vpn configuration main
  WARNING: translation string unused: vpn incompatible use of defaultroute
  WARNING: translation string unused: vpn mtu invalid
  WARNING: translation string unused: vpn on blue
@@@ -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 --combined doc/language_missings
index 6d71db20caa48affb27dbe69f7164ebed52bd446,fc3089007bfa36b8a42060e2cd8c0c99e3acf31f..bc237177cbcd64913f7d7697b9aaa6dc777f469e
--- 1/doc/language_missings
--- 2/doc/language_missings
+++ b/doc/language_missings
@@@ -65,6 -65,10 +65,10 @@@
  < ccd routes
  < ccd subnet
  < ccd used
+ < ConnSched dial
+ < ConnSched hangup
+ < ConnSched reboot
+ < ConnSched shutdown
  < count
  < countries
  < countrycode
@@@ -72,9 -76,6 +76,9 @@@
  < default ip
  < deprecated fs warn
  < details
 +< dh
 +< dh key warn
 +< dh name is invalid
  < dnat address
  < dns address deleted txt
  < dnsforward
@@@ -84,6 -85,8 +88,6 @@@
  < dnsforward entries
  < dnsforward forward_server
  < dnsforward zone
 -< dns servers
 -< downlink
  < dpd delay
  < dpd timeout
  < drop action
@@@ -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
@@@ -158,6 -162,7 +163,7 @@@
  < fwdfw log
  < fwdfw log rule
  < fwdfw man port
+ < fwdfw many
  < fwdfw menu
  < fwdfw MODE1
  < fwdfw MODE2
@@@ -288,8 -293,6 +294,8 @@@
  < fw settings dropdown
  < fw settings remark
  < fw settings ruletable
 +< gen dh
 +< generate dh key
  < grouptype
  < hardware support
  < integrity
@@@ -298,6 -301,7 +304,6 @@@
  < ipsec
  < ipsec network
  < ipsec no connections
 -< last
  < least preferred
  < lifetime
  < mac filter
@@@ -307,12 -311,10 +313,13 @@@
  < minimum
  < minute
  < most preferred
 +< never
  < no hardware random number generator
 +< not a valid dh key
  < notice
  < ntp common settings
  < ntp sync
++< Number of Countries for the pie chart
  < openvpn default
  < openvpn destination port used
  < openvpn disabled
@@@ -326,13 -328,6 +333,13 @@@
  < openvpn subnet is used
  < other
  < our donors
 +< ovpn crypt options
 +< ovpn dh
 +< ovpn dh name
 +< ovpn engines
 +< ovpn generating the root and host certificates
 +< ovpn ha
 +< ovpn hmac
  < ovpn mgmt in root range
  < ovpn mtu-disc
  < ovpn mtu-disc and mtu not 1500
@@@ -343,7 -338,6 +350,7 @@@
  < ovpn mtu-disc yes
  < ovpn no connections
  < ovpn port in root range
 +< ovpn reneg sec
  < p2p block
  < p2p block save notice
  < proxy reports
@@@ -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
@@@ -418,7 -411,7 +426,7 @@@
  < tor use exit nodes
  < updxlrtr sources
  < updxlrtr standard view
 -< uplink
 +< upload dh key
  < upload new ruleset
  < uptime
  < uptime load average
@@@ -539,6 -532,10 +547,10 @@@
  < ccd routes
  < ccd subnet
  < ccd used
+ < ConnSched dial
+ < ConnSched hangup
+ < ConnSched reboot
+ < ConnSched shutdown
  < count
  < countries
  < countrycode
@@@ -546,9 -543,6 +558,9 @@@
  < default ip
  < deprecated fs warn
  < details
 +< dh
 +< dh key warn
 +< dh name is invalid
  < dnat address
  < dnsforward
  < dnsforward add a new entry
@@@ -557,6 -551,8 +569,6 @@@
  < dnsforward entries
  < dnsforward forward_server
  < dnsforward zone
 -< dns servers
 -< downlink
  < dpd delay
  < dpd timeout
  < drop action
@@@ -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
@@@ -631,6 -628,7 +644,7 @@@
  < fwdfw log
  < fwdfw log rule
  < fwdfw man port
+ < fwdfw many
  < fwdfw menu
  < fwdfw MODE1
  < fwdfw MODE2
@@@ -761,8 -759,6 +775,8 @@@
  < fw settings dropdown
  < fw settings remark
  < fw settings ruletable
 +< gen dh
 +< generate dh key
  < grouptype
  < hardware support
  < integrity
@@@ -771,6 -767,7 +785,6 @@@
  < ipsec
  < ipsec network
  < ipsec no connections
 -< last
  < least preferred
  < lifetime
  < mac filter
@@@ -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
@@@ -811,15 -806,8 +826,15 @@@
  < outgoing firewall p2p description 2
  < outgoing firewall p2p description 3
  < outgoing firewall view group
 +< ovpn crypt options
 +< ovpn dh
 +< ovpn dh name
 +< ovpn engines
  < ovpn errmsg green already pushed
  < ovpn errmsg invalid ip or mask
 +< ovpn generating the root and host certificates
 +< ovpn ha
 +< ovpn hmac
  < ovpn mgmt in root range
  < ovpn mtu-disc
  < ovpn mtu-disc and mtu not 1500
@@@ -830,7 -818,6 +845,7 @@@
  < ovpn mtu-disc yes
  < ovpn no connections
  < ovpn port in root range
 +< ovpn reneg sec
  < ovpn routes push
  < ovpn routes push options
  < p2p block
@@@ -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
@@@ -907,7 -893,7 +923,7 @@@
  < tor use exit nodes
  < updxlrtr sources
  < updxlrtr standard view
 -< uplink
 +< upload dh key
  < uptime
  < uptime load average
  < urlfilter redirect template
@@@ -1004,6 -990,10 +1020,10 @@@
  < ccd routes
  < ccd subnet
  < ccd used
+ < ConnSched dial
+ < ConnSched hangup
+ < ConnSched reboot
+ < ConnSched shutdown
  < count
  < countries
  < countrycode
@@@ -1011,9 -1001,6 +1031,9 @@@
  < default ip
  < deprecated fs warn
  < details
 +< dh
 +< dh key warn
 +< dh name is invalid
  < dnat address
  < dnsforward
  < dnsforward add a new entry
@@@ -1022,6 -1009,8 +1042,6 @@@
  < dnsforward entries
  < dnsforward forward_server
  < dnsforward zone
 -< dns servers
 -< downlink
  < dpd delay
  < dpd timeout
  < drop action
@@@ -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
@@@ -1088,6 -1078,7 +1109,7 @@@
  < fwdfw log
  < fwdfw log rule
  < fwdfw man port
+ < fwdfw many
  < fwdfw menu
  < fwdfw MODE1
  < fwdfw MODE2
@@@ -1218,8 -1209,6 +1240,8 @@@
  < fw settings dropdown
  < fw settings remark
  < fw settings ruletable
 +< gen dh
 +< generate dh key
  < grouptype
  < hardware support
  < integrity
@@@ -1228,6 -1217,7 +1250,6 @@@
  < ipsec
  < ipsec network
  < ipsec no connections
 -< last
  < least preferred
  < lifetime
  < mac filter
@@@ -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
@@@ -1254,15 -1242,8 +1277,15 @@@
  < openvpn subnet is used
  < other
  < our donors
 +< ovpn crypt options
 +< ovpn dh
 +< ovpn dh name
 +< ovpn engines
  < ovpn errmsg green already pushed
  < ovpn errmsg invalid ip or mask
 +< ovpn generating the root and host certificates
 +< ovpn ha
 +< ovpn hmac
  < ovpn mgmt in root range
  < ovpn mtu-disc
  < ovpn mtu-disc and mtu not 1500
@@@ -1273,7 -1254,6 +1296,7 @@@
  < ovpn mtu-disc yes
  < ovpn no connections
  < ovpn port in root range
 +< ovpn reneg sec
  < ovpn routes push
  < ovpn routes push options
  < p2p block
@@@ -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
@@@ -1348,7 -1327,7 +1372,7 @@@
  < tor use exit nodes
  < updxlrtr sources
  < updxlrtr standard view
 -< uplink
 +< upload dh key
  < uptime
  < uptime load average
  < urlfilter redirect template
@@@ -1446,6 -1425,10 +1470,10 @@@
  < ccd routes
  < ccd subnet
  < ccd used
+ < ConnSched dial
+ < ConnSched hangup
+ < ConnSched reboot
+ < ConnSched shutdown
  < count
  < countries
  < countrycode
@@@ -1454,9 -1437,6 +1482,9 @@@
  < default ip
  < deprecated fs warn
  < details
 +< dh
 +< dh key warn
 +< dh name is invalid
  < disk access per
  < dnat address
  < dnsforward
@@@ -1466,6 -1446,8 +1494,6 @@@
  < dnsforward entries
  < dnsforward forward_server
  < dnsforward zone
 -< dns servers
 -< downlink
  < dpd delay
  < dpd timeout
  < drop action
@@@ -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
@@@ -1534,6 -1517,7 +1563,7 @@@
  < fwdfw log
  < fwdfw log rule
  < fwdfw man port
+ < fwdfw many
  < fwdfw menu
  < fwdfw MODE1
  < fwdfw MODE2
@@@ -1664,8 -1648,6 +1694,8 @@@
  < fw settings dropdown
  < fw settings remark
  < fw settings ruletable
 +< gen dh
 +< generate dh key
  < grouptype
  < hardware support
  < hour-graph
@@@ -1676,6 -1658,7 +1706,6 @@@
  < ipsec
  < ipsec network
  < ipsec no connections
 -< last
  < least preferred
  < lifetime
  < mac filter
@@@ -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
@@@ -1704,13 -1685,6 +1735,13 @@@
  < other
  < our donors
  < outgoing traffic in bytes per second
 +< ovpn crypt options
 +< ovpn dh
 +< ovpn dh name
 +< ovpn engines
 +< ovpn generating the root and host certificates
 +< ovpn ha
 +< ovpn hmac
  < ovpn mgmt in root range
  < ovpn mtu-disc
  < ovpn mtu-disc and mtu not 1500
@@@ -1721,7 -1695,6 +1752,7 @@@
  < ovpn mtu-disc yes
  < ovpn no connections
  < ovpn port in root range
 +< ovpn reneg sec
  < p2p block
  < p2p block save notice
  < proxy reports
@@@ -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
@@@ -1794,7 -1766,7 +1826,7 @@@
  < tor use exit nodes
  < updxlrtr sources
  < updxlrtr standard view
 -< uplink
 +< upload dh key
  < uptime
  < uptime load average
  < urlfilter redirect template

diff --combined langs/de/cgi-bin/de.pl
index 3fbdd2072dbc04f49f9b2bbedc0f315d84841de2,5e8892d767cabf2f11b95e4886e8e646329db3de..4fba869bac434470ad1d514d2162aed6ae12a696
--- 1/langs/de/cgi-bin/de.pl
--- 2/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@@ -1,7 -1,7 +1,7 @@@
  %tr = ( 
  %tr,
  
 -'Act as' => 'Konfiguriert als',
 +'Act as' => 'Konfiguriert als:',
  'Add Level7 rule' => 'Level7-Regel hinzufügen',
  'Add Port Rule' => 'Port-Regel hinzufügen',
  'Add Rule' => 'Regel hinzufügen',
@@@ -10,17 -10,22 +10,21 @@@
  'Choose Rule' => 'Wählen Sie <u>eine</u> der untenstehenden Regeln aus.',
  'Class' => 'Klasse',
  'Class was deleted' => 'wurde mit eventuell vorhandenen Unterklassen gelöscht',
 -'Client status and controlc' => 'Client-Status und -Kontrolle',
  'ConnSched action' => 'Aktion:',
  'ConnSched add action' => 'Aktion hinzufügen',
  'ConnSched change profile title' => 'Wechsle zu Profil:',
  'ConnSched days' => 'Tage:',
+ 'ConnSched dial' => 'Verbinden',
  'ConnSched down' => 'Runter',
+ 'ConnSched hangup' => 'Trennen',
  'ConnSched ipsecstart' => 'IPSec (neu)starten',
  'ConnSched ipsecstop' => 'IPSec stop',
+ 'ConnSched reboot' => 'Neustarten',
  'ConnSched reconnect' => 'Neu verbinden',
  'ConnSched scheduled actions' => 'Geplante Aktionen',
  'ConnSched scheduler' => 'Scheduler',
  'ConnSched select profile' => 'Wähle Profil',
+ 'ConnSched shutdown' => 'Herunterfahren',
  'ConnSched time' => 'Zeit:',
  'ConnSched up' => 'Hoch',
  'ConnSched weekdays' => 'Wochentage:',
@@@ -35,7 -40,6 +39,7 @@@
  'MB read' => 'MB gelesen',
  'MB written' => 'MB geschrieben',
  'MTU' => 'MTU Size',
 +'Number of Countries for the pie chart' => 'Anzahl der angezeigten Länder im Diagramm',
  'Number of IPs for the pie chart' => 'Anzahl der angezeigten IPs im Diagramm',
  'Number of Ports for the pie chart' => 'Anzahl der angezeigten Ports im Diagramm',
  'OVPN' => 'OpenVPN',
@@@ -521,7 -525,7 +525,7 @@@
  'check for net traffic update' => 'Prüfe auf Net-Traffic-Updates',
  'check vpn lr' => 'Überprüfen',
  'choose config' => 'Konfiguration auswählen',
 -'cipher' => 'Verschlüsselung',
 +'cipher' => 'Verschlüsselung:',
  'city' => 'Stadt',
  'class in use' => 'Die aktuelle Klasse wird bereits verwendet.',
  'clear cache' => 'Zwischenspeicher löschen',
@@@ -655,9 -659,6 +659,9 @@@
  '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',
@@@ -730,7 -731,8 +734,7 @@@
  'dns proxy server' => 'DNS-Proxyserver',
  'dns saved' => 'Erfolgreich gespeichert!',
  'dns saved txt' => 'Die beiden eingegebenen DNS-Server-Adressen wurde erfolgreich gespeichert.<br/>Um die Änderung wirksam zu machen, müssen Sie neustarten oder wiederverbinden!',
 -'dns server' => 'DNS-Server',
 -'dns servers' => 'DNS-Server',
 +'dns server' => 'DNS Server',
  'dns title' => 'Domain Name System',
  'dnsforward' => 'DNS-Weiterleitung',
  'dnsforward add a new entry' => 'Neuen Eintrag hinzufügen',
@@@ -754,6 -756,7 +758,6 @@@
  'donation-text' => '<strong>IPFire</strong> wird von Freiwilligen in ihrer Freizeit betrieben und auch betreut. Um dieses Projekt am Laufen zu halten, entstehen uns natürlich auch Kosten. Wenn Sie uns unterstützen wollen, würden wir uns über eine kleine Spende sehr freuen.',
  'dos charset' => 'DOS Charset',
  'down and up speed' => 'Geben Sie bitte hier ihre Download- bzw. Upload-Geschwindigkeit ein <br /> und klicken Sie danach auf <i>Speichern</i>.',
 -'downlink' => 'Downlink',
  'downlink speed' => 'Downlink-Geschwindigkeit (kBit/sek)',
  'downlink std class' => 'Downloadstandardklasse',
  'download' => 'herunterladen',
@@@ -899,13 -902,13 +903,13 @@@
  'firewall log' => 'Firewall-Protokoll',
  'firewall log viewer' => 'Betrachter der Firewall-Logdateien',
  'firewall logs' => 'Firewall-Logdateien',
 +'firewall logs country' => 'Fw-Logdiagramme (Land)',
  'firewall logs ip' => 'Fw-Logdiagramme (IP)',
  'firewall logs port' => 'Fw-Logdiagramme (Port)',
  'firewall rules' => 'Firewallregeln',
  'firewallhits' => 'Firewalltreffer',
  'firmware' => 'Firmware',
  'firmware upload' => 'Hochladen der Firmware/Treiber',
 -'first' => 'Erste',
  'fixed ip lease added' => 'Feste IP-Zuordnung hinzugefügt',
  'fixed ip lease modified' => 'Feste IP-Zuordnung geändert',
  'fixed ip lease removed' => 'Feste IP-Zuordnung gelöscht',
@@@ -983,6 -986,7 +987,7 @@@
  'fwdfw log' => 'Log',
  'fwdfw log rule' => 'Logging aktivieren',
  'fwdfw man port' => 'Port(s):',
+ 'fwdfw many' => 'Diverse',
  'fwdfw menu' => 'Firewall',
  'fwdfw movedown' => 'Herunter',
  'fwdfw moveup' => 'Herauf',
@@@ -1107,11 -1111,9 +1112,11 @@@
  'fwhost wo subnet' => '(Ohne Subnetz)',
  'gateway' => 'Gateway',
  'gateway ip' => 'Gateway-IP',
 +'gen dh' => 'Diffie-Hellman Key erzeugen',
  'gen static key' => 'Statischen Schlüssel erzeugen',
  'generate' => 'Root/Host-Zertifikate generieren',
  'generate a certificate' => 'Erzeuge ein Zertifikat:',
 +'generate dh key' => 'Diffie-Hellman Key generieren',
  'generate iso' => 'ISO erstellen',
  'generate root/host certificates' => 'Erzeuge Root/Host-Zertifikate',
  'generate tripwire keys and init' => 'Tripwire Initalisierung',
@@@ -1319,6 -1321,7 +1324,6 @@@
  'lan' => 'LAN',
  'lang' => 'de',
  'languagepurpose' => 'Wählen Sie eine Sprache, in der IPFire angezeigt werden soll:',
 -'last' => 'Letzte',
  'last activity' => 'Letzte Aktivität',
  'lateprompting' => 'Late prompting',
  'lease expires' => 'Zuordnung verfällt',
@@@ -1350,7 -1353,7 +1355,7 @@@
  'log view' => 'Log Anzeige',
  'log viewer' => 'Protokollansicht',
  'log viewing options' => 'Log Ansichts-Optionen',
 -'log-options' => 'Logfile options',
 +'log-options' => 'Logfile Optionen',
  'loged in at' => 'Angemeldet seit',
  'logging' => 'Logging',
  'logging server' => 'Protokollierungs-Server',
@@@ -1510,7 -1513,6 +1515,7 @@@
  'network traffic graphs others' => 'Netzwerk (sonstige)',
  'network updated' => 'Benutzerdefiniertes Netzwerk aktualisiert',
  'networks settings' => 'Firewall - Netzwerkeinstellungen',
 +'never' => 'Nie',
  'new optionsfw later' => 'Einige Einstellungen werden erst nach einem Neustart aktiv',
  'new optionsfw must boot' => 'Sie müssen Ihren IPFire neu starten',
  'newer' => 'Neuer',
@@@ -1532,7 -1534,6 +1537,7 @@@
  'nonetworkname' => 'Kein Netzwerkname wurde eingegeben',
  'noservicename' => 'Kein Dienstname wurde eingegeben',
  'not a valid ca certificate' => 'Kein gültiges CA Zertifikat.',
 +'not a valid dh key' => 'Kein gültiger Diffie-Hellman Schlüssel. Bitte nur 1024, 2048, 3072 oder 4096 Bit im PKCS#3 Format verwenden.',
  'not enough disk space' => 'Nicht genügend Plattenplatz vorhanden',
  'not present' => '<B>Nicht</B> vorhanden',
  'not running' => 'nicht gestartet',
@@@ -1623,17 -1624,10 +1628,17 @@@
  'ovpn' => 'OpenVPN',
  'ovpn con stat' => 'OpenVPN Verbindungs-Statistik',
  'ovpn config' => 'OVPN-Konfiguration',
 -'ovpn device' => 'OpenVPN-Gerät',
 +'ovpn crypt options' => 'Kryptografieoptionen',
 +'ovpn device' => 'OpenVPN-Gerät:',
 +'ovpn dh' => 'Diffie-Hellman Key Länge',
 +'ovpn dh name' => 'Diffie-Hellman Key Name',
  'ovpn dl' => 'OVPN-Konfiguration downloaden',
 +'ovpn engines' => 'Krypto Engine',
  'ovpn errmsg green already pushed' => 'Route für grünes Netzwerk wird immer gesetzt',
  'ovpn errmsg invalid ip or mask' => 'Ungültige Netzwerk-Adresse oder Subnetzmaske',
 +'ovpn generating the root and host certificates' => 'Die Erzeugung der Root- und Host-Zertifikate kann lange Zeit dauern.',
 +'ovpn ha' => 'Hash Algorithmus',
 +'ovpn hmac' => 'HMAC Optionen',
  'ovpn log' => 'OVPN-Log',
  'ovpn mgmt in root range' => 'Ein Port von 1024 oder höher ist erforderlich.',
  'ovpn mtu-disc' => 'Path MTU Discovery',
@@@ -1644,15 -1638,14 +1649,15 @@@
  'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery kann nicht gemeinsam mit mssfix oder fragment verwendet werden.',
  'ovpn mtu-disc yes' => 'Forciert',
  'ovpn no connections' => 'Keine aktiven OpenVPN Verbindungen',
 -'ovpn on blue' => 'OpenVPN auf BLAU',
 -'ovpn on orange' => 'OpenVPN auf ORANGE',
 -'ovpn on red' => 'OpenVPN auf ROT',
 +'ovpn on blue' => 'OpenVPN auf BLAU:',
 +'ovpn on orange' => 'OpenVPN auf ORANGE:',
 +'ovpn on red' => 'OpenVPN auf ROT:',
  'ovpn port in root range' => 'Ein Port von 1024 oder höher ist erforderlich.',
 +'ovpn reneg sec' => 'Session Key Lifetime',
  'ovpn routes push' => 'Routen (eine pro Zeile) z.b. 192.168.10.0/255.255.255.0 192.168.20.0/24',
  'ovpn routes push options' => 'Route push Optionen',
 -'ovpn server status' => 'OpenVPN-Server-Status',
 -'ovpn subnet' => 'OpenVPN-Subnetz (z.B. 10.0.10.0/255.255.255.0)',
 +'ovpn server status' => 'OpenVPN-Server-Status:',
 +'ovpn subnet' => 'OpenVPN-Subnetz:',
  'ovpn subnet is invalid' => 'Das OpenVPN-Subnetz ist ungültig.',
  'ovpn subnet overlap' => 'OpenVPNSubnetz überschneidet sich mit  ',
  'ovpn_fastio' => 'Fast-IO',
@@@ -1753,7 -1746,7 +1758,7 @@@
  'profile saved' => 'Profil gespeichert: ',
  'profiles' => 'Profile:',
  'proto' => 'Proto',
 -'protocol' => 'Protokoll',
 +'protocol' => 'Protokoll:',
  'proxy' => 'Proxy',
  'proxy access graphs' => 'Diagramme zur Proxyauslastung',
  'proxy admin password' => 'Cache Administrator Passwort',
@@@ -1825,7 -1818,7 +1830,7 @@@
  'resetglobals' => 'Globale Einstellungen zurücksetzen',
  'resetpolicy' => 'Policy zurücksetzen',
  'resetshares' => 'Shares zurücksetzen?',
 -'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Das Zurücksetzen der VPN-Konfiguration wird die Root-CA, die Host-Zertifikate und alle weiteren Zertifikate und alle zertifikatsbasierten Verbindungen entfernen',
 +'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Das Löschen des X509 wird die Root-CA, die Host-Zertifikate und alle zertifikatsbasierten Verbindungen entfernen.',
  'restart' => 'Neustart',
  'restart ovpn server' => 'OpenVPN-Server neu starten',
  'restore' => 'Wiederherstellen',
@@@ -1895,7 -1888,6 +1900,7 @@@
  'show ca certificate' => 'CA Zertifikat anzeigen',
  'show certificate' => 'Zertifikat anzeigen',
  'show crl' => 'Certificate Revocation List anzeigen',
 +'show dh' => 'Diffie-Hellman Key anzeigen',
  'show host certificate' => 'Host-Zertifikat anzeigen',
  'show last x lines' => 'die letzten x Zeilen anzeigen',
  'show root certificate' => 'Root-Zertifikat anzeigen',
@@@ -1932,7 -1924,6 +1937,7 @@@
  'source ip' => 'Quell-IP-Adresse',
  'source ip and port' => 'Quell-IP:Port',
  'source ip bad' => 'Ungültige Quell-IP-Adresse.',
 +'source ip country' => 'Quell-IP-Adresse Land',
  'source ip in use' => 'Benutzte Quell-IP:',
  'source ip or net' => 'Quellen-IP oder Netz',
  'source net' => 'Quell-Netz',
@@@ -2224,13 -2215,13 +2229,13 @@@
  'updxlrtr weekly' => 'wöchentlich',
  'updxlrtr year' => 'einem Jahr',
  'upgrade' => 'upgrade',
 -'uplink' => 'Uplink',
  'uplink speed' => 'Uplink-Geschwindigkeit (kBit/sek)',
  'uplink std class' => 'Uploadstandardklasse',
  'upload' => 'Hochladen',
  'upload a certificate' => 'Ein Zertifikat hochladen:',
  'upload a certificate request' => 'Eine Zertifikatsanfrage hochladen:',
  'upload ca certificate' => 'CA-Zertifikat hochladen',
 +'upload dh key' => 'Diffie-Hellman Key hochladen',
  'upload file' => 'Datei zum hochladen',
  'upload new ruleset' => 'Neuen Regelsatz hochladen',
  'upload p12 file' => 'PKCS12-Datei hochladen',
@@@ -2480,6 -2471,7 +2485,6 @@@
  'vpn aggrmode' => 'IKE Aggressive Mode zugelassen. Wenn möglich, vermeiden (preshared Schlüssel wird im Klartext übertragen)!',
  'vpn altname syntax' => 'Der Subjekt Alternativ Name ist eine durch Komma getrennte Liste von Email, DNS, URI, RID und IP Objekten. <br />Email: eine Email Adresse. Syntax Email: \'copy\' benutzt die Email Adresse aus dem Zertifikatfeld. <br />DNS: ein gültiger Domain Name.<br />URI: eine gültige URI.<br />RID: Registriertes Objekt Identifikation.<br />IP: eine IP Adresse.<br />Bitte beachten: der Zeichensatz ist eingeschränkt und die Groß-/Kleinschreibung ist entscheidend.<br />Beispiel:<br /><b>email:</b>info@ipfire.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/nach/irgendwo',
  'vpn auth-dn' => 'Peer wird identifiziert durch entweder ein IPV4_ADDR, FQDN, USER_FQDN oder DER_ASN1_DN string in Remote ID Feld',
 -'vpn configuration main' => 'VPN-Konfiguration',
  'vpn delayed start' => 'Verzögerung bevor VPN gestartet wird (Sekunden)',
  'vpn delayed start help' => 'Falls notwendig, kann diese Verzögerung dazu verwendet werden, um Dynamic-DNS-Updates ordnungsgemäß anzuwenden. 60 ist ein gängiger Wert, wenn ROT (RED) eine dynamische IP Adresse ist.',
  'vpn incompatible use of defaultroute' => 'Hostname=%defaultroute nicht zulässig',

diff --combined 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
@@@ -10,17 -10,22 +10,21 @@@
  'Choose Rule' => 'Choose <u>one</u> of the following rules.',
  'Class' => 'Class',
  'Class was deleted' => 'with potential subclasses was deleted',
 -'Client status and controlc' => 'Client status and control:',
  'ConnSched action' => 'Action:',
  'ConnSched add action' => 'Add action',
  'ConnSched change profile title' => 'Change to profile:',
  'ConnSched days' => 'Days:',
+ 'ConnSched dial' => 'Connect',
  'ConnSched down' => 'Down',
+ 'ConnSched hangup' => 'Disconnect',
  'ConnSched ipsecstart' => 'IPSec (re)start',
  'ConnSched ipsecstop' => 'IPSec stop',
+ 'ConnSched reboot' => 'Reboot',
  'ConnSched reconnect' => 'Reconnect',
  'ConnSched scheduled actions' => 'Scheduled actions',
  'ConnSched scheduler' => 'Scheduler',
  'ConnSched select profile' => 'Select profile',
+ 'ConnSched shutdown' => 'Shutdown',
  'ConnSched time' => 'Time:',
  'ConnSched up' => 'Up',
  'ConnSched weekdays' => 'Days of the week:',
@@@ -35,7 -40,6 +39,7 @@@
  'MB read' => 'MB read',
  'MB written' => 'MB written',
  'MTU' => 'MTU size:',
 +'Number of Countries for the pie chart' => 'Number of Countries for the pie chart',
  'Number of IPs for the pie chart' => 'Number of IPs for the pie chart',
  'Number of Ports for the pie chart' => 'Number of ports for the pie chart',
  'OVPN' => 'OpenVPN',
@@@ -419,7 -423,7 +423,7 @@@
  'behind a proxy' => 'Behind a proxy:',
  'bewan adsl pci st' => 'TO BE REMOVED',
  'bewan adsl usb' => 'TO BE REMOVED',
 -'bit' => 'Bit',
 +'bit' => 'bit',
  'bitrate' => 'Bitrate',
  'bleeding rules' => 'Bleeding Edge Snort Rules',
  'blue' => 'BLUE',
@@@ -677,9 -681,6 +681,9 @@@
  '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.',
@@@ -755,6 -756,7 +759,6 @@@
  'dns saved' => 'Successfully saved!',
  'dns saved txt' => 'The two entered DNS server addresses have been saved successfully.<br />You have to reboot or reconnect that the changes have effect!',
  'dns server' => 'DNS Server',
 -'dns servers' => 'DNS Servers',
  'dns title' => 'Domain Name System',
  'dnsforward' => 'DNS Forwarding',
  'dnsforward add a new entry' => 'Add a new entry',
@@@ -779,6 -781,7 +783,6 @@@
  'done' => 'Do it',
  'dos charset' => 'DOS Charset',
  'down and up speed' => 'Enter your Down- and Uplink-Speed <br /> and then press <i>Save</i>.',
 -'downlink' => 'Downlink',
  'downlink speed' => 'Downlink speed (kbit/sec)',
  'downlink std class' => 'downlink standard class',
  'download' => 'download',
@@@ -925,13 -928,13 +929,13 @@@
  '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',
  'firmware upload' => 'Upload Firmware/Drivers',
 -'first' => 'First',
  'fixed ip lease added' => 'Fixed IP lease added',
  'fixed ip lease modified' => 'Fixed IP lease modified',
  'fixed ip lease removed' => 'Fixed IP lease removed',
@@@ -1009,6 -1012,7 +1013,7 @@@
  'fwdfw log' => 'Log',
  'fwdfw log rule' => 'Log rule',
  'fwdfw man port' => 'Port(s):',
+ 'fwdfw many' => 'Many',
  'fwdfw menu' => 'Firewall',
  'fwdfw movedown' => 'Move down',
  'fwdfw moveup' => 'Move up',
@@@ -1135,11 -1139,9 +1140,11 @@@
  'g.lite' => 'TO BE REMOVED',
  'gateway' => 'Gateway',
  'gateway ip' => 'Gateway IP',
 +'gen dh' => 'Generate Diffie-Hellman key',
  'gen static key' => 'Generate a static key',
  'generate' => 'Generate root/host zertifikate',
  'generate a certificate' => 'Generate a certificate:',
 +'generate dh key' => 'Generate Diffie-Hellman key',
  'generate iso' => 'Generate ISO',
  'generate root/host certificates' => 'Generate root/host certificates',
  'generate tripwire keys and init' => 'generate tripwire keys and init',
@@@ -1348,6 -1350,7 +1353,6 @@@
  'lan' => 'LAN',
  'lang' => 'en',
  'languagepurpose' => 'Select the language you wish IPFire to display in:',
 -'last' => 'Last',
  'last activity' => 'Last Activity',
  'lateprompting' => 'Lateprompting',
  'lease expires' => 'Lease expires',
@@@ -1362,7 -1365,7 +1367,7 @@@
  'local hard disk' => 'Hard disk',
  'local master' => 'Local Master',
  'local ntp server specified but not enabled' => 'Local NTP server specified but not enabled',
 -'local subnet' => 'Local Subnet:',
 +'local subnet' => 'Local subnet:',
  'local subnet is invalid' => 'Local subnet is invalid.',
  'local vpn hostname/ip' => 'Local VPN Hostname/IP',
  'localkey' => 'Localkey',
@@@ -1539,7 -1542,6 +1544,7 @@@
  'network traffic graphs others' => 'Network (others)',
  'network updated' => 'Custom Network updated',
  'networks settings' => 'Firewall - Network settings',
 +'never' => 'Never',
  'new optionsfw later' => 'Some options need a reboot to take effect',
  'new optionsfw must boot' => 'You must reboot your IPFire',
  'newer' => 'Newer',
@@@ -1561,7 -1563,6 +1566,7 @@@
  'nonetworkname' => 'No Network Name entered',
  'noservicename' => 'No Service Name entered',
  'not a valid ca certificate' => 'Not a valid CA certificate.',
 +'not a valid dh key' => 'Not a valid Diffie-Hellman key. Please use 1024, 2048, 3072 or 4096 bit in PKCS#3 format.',
  'not enough disk space' => 'Not enough disk space',
  'not present' => '<b>Not</b> present',
  'not running' => 'not running',
@@@ -1653,17 -1654,10 +1658,17 @@@
  'ovpn' => 'OpenVPN',
  'ovpn con stat' => 'OpenVPN Connection Statistics',
  'ovpn config' => 'OVPN-Config',
 +'ovpn crypt options' => 'Cryptographic options',
  'ovpn device' => 'OpenVPN device:',
 +'ovpn dh' => 'Diffie-Hellman key lenght',
 +'ovpn dh name' => 'Diffie-Hellman key name',
  'ovpn dl' => 'OVPN-Config Download',
 +'ovpn engines' => 'Crypto engine',
  'ovpn errmsg green already pushed' => 'Route for green network is always set',
  'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
 +'ovpn generating the root and host certificates' => 'Generating the root and host certifictae can take a long time.',
 +'ovpn ha' => 'Hash algorithm',
 +'ovpn hmac' => 'HMAC options',
  'ovpn log' => 'OVPN-Log',
  'ovpn mgmt in root range' => 'A port number of 1024 or higher is required.',
  'ovpn mtu-disc' => 'Path MTU Discovery',
@@@ -1674,15 -1668,14 +1679,15 @@@
  'ovpn mtu-disc with mssfix or fragment' => 'Path MTU Discovery cannot be used with mssfix or fragment.',
  'ovpn mtu-disc yes' => 'Forced',
  'ovpn no connections' => 'No active OpenVPN connections',
 -'ovpn on blue' => 'OpenVPN on BLUE',
 -'ovpn on orange' => 'OpenVPN on ORANGE',
 -'ovpn on red' => 'OpenVPN on RED',
 +'ovpn on blue' => 'OpenVPN on BLUE:',
 +'ovpn on orange' => 'OpenVPN on ORANGE:',
 +'ovpn on red' => 'OpenVPN on RED:',
  'ovpn port in root range' => 'A port number of 1024 or higher is required.',
 +'ovpn reneg sec' => 'Session key lifetime:',
  'ovpn routes push' => 'Routes (one per line) e.g. 192.168.10.0/255.255.255.0 192.168.20.0/24',
  'ovpn routes push options' => 'Route push options',
  'ovpn server status' => 'Current OpenVPN server status:',
 -'ovpn subnet' => 'OpenVPN subnet (e.g. 10.0.10.0/255.255.255.0)',
 +'ovpn subnet' => 'OpenVPN subnet:',
  'ovpn subnet is invalid' => 'OpenVPN subnet is invalid.',
  'ovpn subnet overlap' => 'OpenVPN Subnet overlaps with : ',
  'ovpn_fastio' => 'Fast-IO',
@@@ -1783,7 -1776,7 +1788,7 @@@
  'profile saved' => 'Profile saved: ',
  'profiles' => 'Profiles:',
  'proto' => 'Proto',
 -'protocol' => 'Protocol',
 +'protocol' => 'Protocol:',
  'proxy' => 'Proxy',
  'proxy access graphs' => 'Proxy access graphs',
  'proxy admin password' => 'Cache administrator password',
@@@ -1857,7 -1850,7 +1862,7 @@@
  'resetglobals' => 'Reset global settings',
  'resetpolicy' => 'Reset policy to default',
  'resetshares' => 'Reset shares?',
 -'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Resetting the VPN configuration will remove the root CA, the host certificate and all certificate based connections',
 +'resetting the vpn configuration will remove the root ca, the host certificate and all certificate based connections' => 'Resetting the X509 remove the root CA, the host certificate and all certificate based connections.',
  'restart' => 'Restart',
  'restart ovpn server' => 'Restart OpenVPN server',
  'restore' => 'Restore',
@@@ -1929,7 -1922,6 +1934,7 @@@
  'show ca certificate' => 'Show CA certificate',
  'show certificate' => 'Show certificate',
  'show crl' => 'Show certificate revocation list',
 +'show dh' => 'Show Diffie-Hellman key',
  'show host certificate' => 'Show host certificate',
  'show last x lines' => 'Show last x lines',
  'show lines' => 'Show lines',
@@@ -1967,7 -1959,6 +1972,7 @@@
  'source ip' => 'Source IP',
  'source ip and port' => 'Source IP: Port',
  'source ip bad' => 'Not a valid IP address or a network address.',
 +'source ip country' => 'Source IP Country',
  'source ip in use' => 'Source IP in use:',
  'source ip or net' => 'Source IP or Net',
  'source net' => 'Source Net',
@@@ -2262,13 -2253,13 +2267,13 @@@
  'updxlrtr weekly' => 'weekly',
  'updxlrtr year' => 'one year',
  'upgrade' => 'upgrade',
 -'uplink' => 'Uplink',
  'uplink speed' => 'Uplink speed (kbit/sec)',
  'uplink std class' => 'uplink standard class',
  'upload' => 'Upload',
  'upload a certificate' => 'Upload a certificate:',
  'upload a certificate request' => 'Upload a certificate request:',
  'upload ca certificate' => 'Upload CA certificate',
 +'upload dh key' => 'Upload Diffie-Hellman key',
  'upload fcdsl.o' => 'TO BE REMOVED',
  'upload file' => 'Upload file',
  'upload new ruleset' => 'Upload new ruleset',
@@@ -2519,6 -2510,7 +2524,6 @@@
  'vpn aggrmode' => 'IKE aggressive mode allowed. Avoid if possible (preshared key is transmitted in clear text)!',
  'vpn altname syntax' => 'SubjectAltName is a comma separated list of e-mail, dns, uri, rid and ip objects.<br />email:an email address. Syntax email:copy takes the email field from the cert to be used.<br />DNS:a valid domain name.<br />URI:any valid uri.<br />RID:registered object identifier.<br />IP:an IP address.<br />Note:charset is limited and case is significant.<br />Example:<br /><b>e-mail:</b>ipfire@foo.org<b>,email:</b>copy<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/to/something',
  'vpn auth-dn' => 'Peer is identified by either IPV4_ADDR, FQDN, USER_FQDN or DER_ASN1_DN string in remote ID field',
 -'vpn configuration main' => 'VPN Configuration',
  'vpn delayed start' => 'Delay before launching VPN (seconds)',
  'vpn delayed start help' => 'If required, this delay can be used to allow dynamic DNS updates to propagate properly. 60 is a common value when RED is a dynamic IP.',
  'vpn incompatible use of defaultroute' => 'hostname=%defaultroute not allowed',