Merge branch 'master' into next

[people/pmueller/ipfire-2.x.git] / config / menu / 50-firewall.menu

diff --git a/config/menu/50-firewall.menu b/config/menu/50-firewall.menu
index 54c6e40493bf0a64e74854e182365f89e802add9..de28f8e259c8cf59870e6ae7a2bdd8d723c1c969 100644 (file)
--- a/config/menu/50-firewall.menu
+++ b/config/menu/50-firewall.menu
@@ -1,42 +1,54 @@
     $subfirewall->{'10.dnat'} = {
-                                'caption' => $tr{'ssport forwarding'},
+                                'caption' => $Lang::tr{'ssport forwarding'},
                                 'uri' => '/cgi-bin/portfw.cgi',
-                                'title' => "$tr{'ssport forwarding'}",
+                                'title' => "$Lang::tr{'ssport forwarding'}",
                                 'enabled' => 1,
                                 };
     $subfirewall->{'20.xtaccess'} = {
-                                'caption' => $tr{'external access'},
+                                'caption' => $Lang::tr{'external access'},
                                 'uri' => '/cgi-bin/xtaccess.cgi',
-                                'title' => "$tr{'external access'}",
+                                'title' => "$Lang::tr{'external access'}",
                                 'enabled' => 1,
                                 };
     $subfirewall->{'30.wireless'} = {
-                               'caption' => $tr{'blue access'},
+                               'caption' => $Lang::tr{'blue access'},
                                'uri' => '/cgi-bin/wireless.cgi',
-                               'title' => "$tr{'blue access'}",
+                               'title' => "$Lang::tr{'blue access'}",
                                'enabled' => 1,
                                 };
     $subfirewall->{'40.dmz'} = {
-                               'caption' => $tr{'ssdmz pinholes'},
+                               'caption' => $Lang::tr{'ssdmz pinholes'},
                                'uri' => '/cgi-bin/dmzholes.cgi',
-                               'title' => "$tr{'dmz pinhole configuration'}",
+                               'title' => "$Lang::tr{'dmz pinhole configuration'}",
                                'enabled' => 1,
                                 };
     $subfirewall->{'50.outgoing'} = {
-                               'caption' => $tr{'outgoing firewall'},
+                               'caption' => $Lang::tr{'outgoing firewall'},
                                'uri' => '/cgi-bin/outgoingfw.cgi',
-                               'title' => "$tr{'outgoing firewall'}",
+                               'title' => "$Lang::tr{'outgoing firewall'}",
+                               'enabled' => 1,
+                               };
+    $subfirewall->{'51.outgoinggrp'} = {
+                               'caption' => $Lang::tr{'outgoing firewall groups'},
+                               'uri' => '/cgi-bin/outgoinggrp.cgi',
+                               'title' => "$Lang::tr{'outgoing firewall groups'}",
                                'enabled' => 1,
                                };
     $subfirewall->{'60.upnp'} = {
                                'caption' => 'UPnP',
                                'uri' => '/cgi-bin/upnp.cgi',
                                'title' => "Universal Plug and Play",
-                               'enabled' => 1,
+                               'enabled' => 0,
                                };
-    $subfirewall->{'70.fwopts'} = {
-                               'caption' => $tr{'options fw'},
+    $subfirewall->{'60.optingsfw'} = {
+                               'caption' => $Lang::tr{'options fw'},
                                'uri' => '/cgi-bin/optionsfw.cgi',
-                               'title' => "$tr{'options fw'}",
+                               'title' => "$Lang::tr{'options fw'}",
                                'enabled' => 1,
-                                };
+                               };
+    $subfirewall->{'70.iptables'} = {
+                               'caption' => $Lang::tr{'ipts'},
+                               'uri' => '/cgi-bin/iptables.cgi',
+                               'title' => "$Lang::tr{'ipts'}",
+                               'enabled' => 1,
+                               };