From: Michael Tremer Date: Thu, 7 Aug 2014 12:50:42 +0000 (+0200) Subject: Merge remote-tracking branch 'ms/firewall-no-nat' into next X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=908555842cdeb364a5c28ecfc4d901432f6afd33;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'ms/firewall-no-nat' into next Conflicts: doc/language_issues.nl doc/language_issues.tr --- 908555842cdeb364a5c28ecfc4d901432f6afd33 diff --cc doc/language_issues.es index 70bff8e094,a00298336a..57df9d6e53 --- a/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 158b544c3c,de6dc8ac73..d2344ed3dc --- a/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 358958b009,ee7096f521..607d6807d9 --- a/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 70bff8e094,a00298336a..57df9d6e53 --- a/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 b3c765e2b2,f7a84280cf..03e48b7902 --- a/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 abb23afe73,9e6d3d5577..b920727593 --- a/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