Merge remote-tracking branch 'ms/iptables-conntrack' into next

diff --cc config/rootfiles/common/stage2
Simple merge

diff --cc doc/language_issues.es
Simple merge

diff --cc doc/language_issues.fr
Simple merge

diff --cc doc/language_issues.it
index 65643e8757bf5a4c4f568a342e962116c73efd66,c369e6c97e7f7e7bd5eeaec7348c9c183a9f9445..fd64d95641a25251e70b9bf9fcd583b2e3cea235
--- 1/doc/language_issues.it
--- 2/doc/language_issues.it
+++ b/doc/language_issues.it
@@@ -700,30 -672,9 +700,31 @@@ WARNING: untranslated string: advproxy 
  WARNING: untranslated string: advproxy basic authentication
  WARNING: untranslated string: advproxy group access control
  WARNING: untranslated string: advproxy group required
+ WARNING: untranslated string: application layer gateways
  WARNING: untranslated string: bytes
  WARNING: untranslated string: check all
 +WARNING: untranslated string: dhcp dns enable update
 +WARNING: untranslated string: dhcp dns key name
 +WARNING: untranslated string: dhcp dns update
 +WARNING: untranslated string: dhcp dns update algo
 +WARNING: untranslated string: dhcp dns update secret
 +WARNING: untranslated string: dl client arch insecure
 +WARNING: untranslated string: email config
 +WARNING: untranslated string: email empty field
 +WARNING: untranslated string: email invalid
 +WARNING: untranslated string: email invalid mailfqdn
 +WARNING: untranslated string: email invalid mailip
 +WARNING: untranslated string: email invalid mailport
 +WARNING: untranslated string: email mailaddr
 +WARNING: untranslated string: email mailpass
 +WARNING: untranslated string: email mailport
 +WARNING: untranslated string: email mailrcpt
 +WARNING: untranslated string: email mailsender
 +WARNING: untranslated string: email mailuser
 +WARNING: untranslated string: email settings
 +WARNING: untranslated string: email testmail
 +WARNING: untranslated string: email tls
 +WARNING: untranslated string: email usemail
  WARNING: untranslated string: fwdfw err concon
  WARNING: untranslated string: fwdfw err ratecon
  WARNING: untranslated string: fwdfw limitconcon

diff --cc doc/language_issues.nl
Simple merge

diff --cc doc/language_issues.pl
Simple merge

diff --cc doc/language_issues.ru
Simple merge

diff --cc doc/language_issues.tr
index a419afa9d3b438676c617e9746bee3dfc6ecb7b5,c692a46e5bfda5bbcedf19755711a61b792bcb60..b701bdf93f6a9aeb04b676741ac58461e042394b
--- 1/doc/language_issues.tr
--- 2/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@@ -703,12 -664,30 +703,13 @@@ WARNING: translation string unused: xta
  WARNING: translation string unused: year-graph
  WARNING: translation string unused: yearly firewallhits
  WARNING: untranslated string: Scan for Songs
+ WARNING: untranslated string: application layer gateways
  WARNING: untranslated string: bytes
 -WARNING: untranslated string: check all
 -WARNING: untranslated string: fwhost addgeoipgrp
 -WARNING: untranslated string: fwhost cust geoipgroup
  WARNING: untranslated string: fwhost cust geoipgrp
 -WARNING: untranslated string: fwhost cust geoiplocation
  WARNING: untranslated string: fwhost err hostip
 -WARNING: untranslated string: fwhost newgeoipgrp
 -WARNING: untranslated string: geoip
 -WARNING: untranslated string: geoipblock
 -WARNING: untranslated string: geoipblock block countries
 -WARNING: untranslated string: geoipblock configuration
 -WARNING: untranslated string: geoipblock country is allowed
 -WARNING: untranslated string: geoipblock country is blocked
 -WARNING: untranslated string: geoipblock enable feature
  WARNING: untranslated string: ike lifetime should be between 1 and 8 hours
 -WARNING: untranslated string: incoming compression in bytes per second
 -WARNING: untranslated string: incoming overhead in bytes per second
 -WARNING: untranslated string: invalid input for valid till days
 +WARNING: untranslated string: info messages
  WARNING: untranslated string: no data
 -WARNING: untranslated string: outgoing compression in bytes per second
 -WARNING: untranslated string: outgoing overhead in bytes per second
 -WARNING: untranslated string: ovpn add conf
  WARNING: untranslated string: route config changed
  WARNING: untranslated string: routing config added
  WARNING: untranslated string: routing config changed

diff --cc doc/language_missings
Simple merge

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

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

diff --cc lfs/configroot
Simple merge

diff --cc src/initscripts/init.d/firewall
Simple merge