Merge remote-tracking branch 'ms/firewall-no-nat' into next

Conflicts:
	doc/language_issues.nl
	doc/language_issues.tr

diff --cc doc/language_issues.es
index 70bff8e094b2e8b4cd0426900f8818df7baa3ec5,a00298336abb4d004d768c5e59fa0657ebe4c92c..57df9d6e535a99652f7e4f1e38ebf3405aaeabf2
--- 1/doc/language_issues.es
--- 2/doc/language_issues.es
+++ b/doc/language_issues.es
@@@ -867,8 -860,13 +867,14 @@@ WARNING: untranslated string: las
  WARNING: untranslated string: least preferred
  WARNING: untranslated string: lifetime
  WARNING: untranslated string: mac filter
+ WARNING: untranslated string: masquerade blue
+ WARNING: untranslated string: masquerade green
+ WARNING: untranslated string: masquerade orange
+ WARNING: untranslated string: masquerading
+ WARNING: untranslated string: masquerading disabled
+ WARNING: untranslated string: masquerading enabled
  WARNING: untranslated string: maximum
 +WARNING: untranslated string: messages
  WARNING: untranslated string: minimum
  WARNING: untranslated string: minute
  WARNING: untranslated string: model

diff --cc doc/language_issues.fr
index 158b544c3c08a9769171cd67f61d8c2dbe19961d,de6dc8ac732496975d87519c7e34ec007819c435..d2344ed3dcae090a99140c1d33691d61eb625791
--- 1/doc/language_issues.fr
--- 2/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@@ -878,8 -871,13 +878,14 @@@ WARNING: untranslated string: las
  WARNING: untranslated string: least preferred
  WARNING: untranslated string: lifetime
  WARNING: untranslated string: mac filter
+ WARNING: untranslated string: masquerade blue
+ WARNING: untranslated string: masquerade green
+ WARNING: untranslated string: masquerade orange
+ WARNING: untranslated string: masquerading
+ WARNING: untranslated string: masquerading disabled
+ WARNING: untranslated string: masquerading enabled
  WARNING: untranslated string: maximum
 +WARNING: untranslated string: messages
  WARNING: untranslated string: minimum
  WARNING: untranslated string: minute
  WARNING: untranslated string: model

diff --cc doc/language_issues.nl
index 358958b0099318d4d7a766112482ca821d60b32f,ee7096f521c570dc3bd91bf040da5b5c3d5ace07..607d6807d9b0e7d9f4ac2af412c027108951c168
--- 1/doc/language_issues.nl
--- 2/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@@ -688,7 -683,12 +688,13 @@@ WARNING: untranslated string: gen d
  WARNING: untranslated string: generate dh key
  WARNING: untranslated string: imei
  WARNING: untranslated string: imsi
+ WARNING: untranslated string: masquerade blue
+ WARNING: untranslated string: masquerade green
+ WARNING: untranslated string: masquerade orange
+ WARNING: untranslated string: masquerading
+ WARNING: untranslated string: masquerading disabled
+ WARNING: untranslated string: masquerading enabled
 +WARNING: untranslated string: messages
  WARNING: untranslated string: model
  WARNING: untranslated string: modem hardware details
  WARNING: untranslated string: modem information

diff --cc doc/language_issues.pl
index 70bff8e094b2e8b4cd0426900f8818df7baa3ec5,a00298336abb4d004d768c5e59fa0657ebe4c92c..57df9d6e535a99652f7e4f1e38ebf3405aaeabf2
--- 1/doc/language_issues.pl
--- 2/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@@ -867,8 -860,13 +867,14 @@@ WARNING: untranslated string: las
  WARNING: untranslated string: least preferred
  WARNING: untranslated string: lifetime
  WARNING: untranslated string: mac filter
+ WARNING: untranslated string: masquerade blue
+ WARNING: untranslated string: masquerade green
+ WARNING: untranslated string: masquerade orange
+ WARNING: untranslated string: masquerading
+ WARNING: untranslated string: masquerading disabled
+ WARNING: untranslated string: masquerading enabled
  WARNING: untranslated string: maximum
 +WARNING: untranslated string: messages
  WARNING: untranslated string: minimum
  WARNING: untranslated string: minute
  WARNING: untranslated string: model

diff --cc doc/language_issues.ru
index b3c765e2b2699c51de2e912eef169df491375302,f7a84280cf940e27a075b94e53818d0ab29bceb2..03e48b790298695196fa25373220e56ebfc377de
--- 1/doc/language_issues.ru
--- 2/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@@ -863,8 -856,13 +863,14 @@@ WARNING: untranslated string: las
  WARNING: untranslated string: least preferred
  WARNING: untranslated string: lifetime
  WARNING: untranslated string: mac filter
+ WARNING: untranslated string: masquerade blue
+ WARNING: untranslated string: masquerade green
+ WARNING: untranslated string: masquerade orange
+ WARNING: untranslated string: masquerading
+ WARNING: untranslated string: masquerading disabled
+ WARNING: untranslated string: masquerading enabled
  WARNING: untranslated string: maximum
 +WARNING: untranslated string: messages
  WARNING: untranslated string: minimum
  WARNING: untranslated string: minute
  WARNING: untranslated string: model

diff --cc doc/language_issues.tr
index abb23afe73850d17808c204b27ef098b57eb684e,9e6d3d5577563ebf797da5981344e8351a4b3bd9..b9207275932eccbb594092f28be77ad40d11baa2
--- 1/doc/language_issues.tr
--- 2/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@@ -688,7 -683,12 +688,13 @@@ WARNING: untranslated string: gen d
  WARNING: untranslated string: generate dh key
  WARNING: untranslated string: imei
  WARNING: untranslated string: imsi
+ WARNING: untranslated string: masquerade blue
+ WARNING: untranslated string: masquerade green
+ WARNING: untranslated string: masquerade orange
+ WARNING: untranslated string: masquerading
+ WARNING: untranslated string: masquerading disabled
+ WARNING: untranslated string: masquerading enabled
 +WARNING: untranslated string: messages
  WARNING: untranslated string: model
  WARNING: untranslated string: modem hardware details
  WARNING: untranslated string: modem information

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 src/initscripts/init.d/firewall
Simple merge