From 06f77e587c42457a0d4fd81dc2a6949049a2cca2 Mon Sep 17 00:00:00 2001
From: Vadim Kurland <vadim@slot.vk.crocodile.org>
Date: Fri, 4 Feb 2011 18:05:03 -0800
Subject: [PATCH] fixes #2030 FreeBSD Host OS Settings - duplicate entry for
 Packet Forwarding; new build 3459

---
 VERSION                               | 2 +-
 VERSION.h                             | 2 +-
 packaging/fwbuilder-static-qt.spec    | 2 +-
 packaging/fwbuilder.control           | 2 +-
 packaging/fwbuilder.spec              | 2 +-
 src/libgui/freebsdadvanceddialog_q.ui | 4 ++--
 src/libgui/openbsdadvanceddialog_q.ui | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/VERSION b/VERSION
index 8845d476a..eb17bc5e9 100644
--- a/VERSION
+++ b/VERSION
@@ -7,7 +7,7 @@ FWB_MICRO_VERSION=0
 # build number is like "nano" version number. I am incrementing build
 # number during development cycle
 #
-BUILD_NUM="3458"
+BUILD_NUM="3459"
 
 VERSION="$FWB_MAJOR_VERSION.$FWB_MINOR_VERSION.$FWB_MICRO_VERSION.$BUILD_NUM"
 
diff --git a/VERSION.h b/VERSION.h
index 87d45cf5a..fe3a21374 100644
--- a/VERSION.h
+++ b/VERSION.h
@@ -1,2 +1,2 @@
-#define VERSION      "4.2.0.3458"
+#define VERSION      "4.2.0.3459"
 #define GENERATION   "4.2"
diff --git a/packaging/fwbuilder-static-qt.spec b/packaging/fwbuilder-static-qt.spec
index 27a723172..c5902b22a 100644
--- a/packaging/fwbuilder-static-qt.spec
+++ b/packaging/fwbuilder-static-qt.spec
@@ -3,7 +3,7 @@
 
 
 %define name    fwbuilder
-%define version 4.2.0.3458
+%define version 4.2.0.3459
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/packaging/fwbuilder.control b/packaging/fwbuilder.control
index c43c977da..8c920c89d 100644
--- a/packaging/fwbuilder.control
+++ b/packaging/fwbuilder.control
@@ -4,6 +4,6 @@ Replaces: fwbuilder (<=4.1.1-1), fwbuilder-common, fwbuilder-bsd, fwbuilder-linu
 Priority: extra
 Section: checkinstall
 Maintainer: vadim@fwbuilder.org
-Version: 4.2.0.3458-1
+Version: 4.2.0.3459-1
 Depends: libqt4-gui (>= 4.3.0), libxml2, libxslt1.1, libsnmp | libsnmp15
 Description: Firewall Builder GUI and policy compilers
diff --git a/packaging/fwbuilder.spec b/packaging/fwbuilder.spec
index 434e1c607..489ec60ef 100644
--- a/packaging/fwbuilder.spec
+++ b/packaging/fwbuilder.spec
@@ -1,6 +1,6 @@
 
 %define name    fwbuilder
-%define version 4.2.0.3458
+%define version 4.2.0.3459
 %define release 1
 
 %if "%_vendor" == "MandrakeSoft"
diff --git a/src/libgui/freebsdadvanceddialog_q.ui b/src/libgui/freebsdadvanceddialog_q.ui
index b94851736..843570a40 100644
--- a/src/libgui/freebsdadvanceddialog_q.ui
+++ b/src/libgui/freebsdadvanceddialog_q.ui
@@ -49,7 +49,7 @@
        <item row="1" column="0">
         <widget class="QLabel" name="label544">
          <property name="text">
-          <string>Packet forwarding</string>
+          <string>IPv4 Packet forwarding</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -97,7 +97,7 @@
        <item row="2" column="0">
         <widget class="QLabel" name="label544_2">
          <property name="text">
-          <string>Packet forwarding</string>
+          <string>IPv6 Packet forwarding</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
diff --git a/src/libgui/openbsdadvanceddialog_q.ui b/src/libgui/openbsdadvanceddialog_q.ui
index b4909fac7..8fe9def71 100644
--- a/src/libgui/openbsdadvanceddialog_q.ui
+++ b/src/libgui/openbsdadvanceddialog_q.ui
@@ -23,7 +23,7 @@
    <item row="0" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab0">
       <attribute name="title">