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

Conflicts:
	doc/language_issues.nl
	doc/language_issues.tr
This commit is contained in:
Michael Tremer
2014-08-07 14:50:42 +02:00
11 changed files with 164 additions and 3 deletions

View File

@@ -867,6 +867,12 @@ WARNING: untranslated string: last
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