do not hardcode the path/name to g++

build_num

@@ -1 +1 @@
-#define BUILD_NUM 2441
+#define BUILD_NUM 2444

qmake.inc.in

@@ -26,7 +26,7 @@ unix {
     FWBPARSER_LIB = ../parsers/libfwbparser.a
     FWTRANSFER_LIB = ../fwtransfer/libfwtransfer.a
 
-    QMAKE_CXX = @CCACHE@ @DISTCC@ g++
+    QMAKE_CXX = @CCACHE@ @DISTCC@ $$QMAKE_CXX
 
     !macx {
 

src/gui/natruleoptionsdialog_q.ui

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>NATRuleOptionsDialog_q</class>
  <widget class="QWidget" name="NATRuleOptionsDialog_q">
@@ -86,7 +87,7 @@
        <item row="0" column="0">
         <widget class="QLabel" name="label">
          <property name="text">
-          <string>Normally, if object used to define translated source address is an interface marked as "dynamic",  fwbuilder generates NAT rule with target MASQUERADE. However masquerading has problems with policy routing. This option makes fwbuilder use SNAT target instead.</string>
+          <string>Normally, if object used to define translated source address is an interface marked as &quot;dynamic&quot;,  fwbuilder generates NAT rule with target MASQUERADE. However masquerading has problems with policy routing. This option makes fwbuilder use SNAT target instead.</string>
          </property>
          <property name="wordWrap">
           <bool>true</bool>
@@ -103,7 +104,7 @@
        <item row="2" column="0">
         <widget class="QCheckBox" name="ipt_snat_random">
          <property name="text">
-          <string>Randomize source port mapping in SNAT rules</string>
+          <string>Randomize source port mapping in SNAT and MASQUERADE rules</string>
          </property>
         </widget>
        </item>
@@ -146,10 +147,10 @@
          </property>
         </spacer>
        </item>
-       <item rowspan="3" row="0" column="0" >
+       <item row="0" column="0" rowspan="3">
         <widget class="QGroupBox" name="buttonGroup1">
          <property name="sizePolicy">
-          <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
+          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -221,7 +222,7 @@
          </property>
         </spacer>
        </item>
-       <item rowspan="2" row="2" column="1" >
+       <item row="2" column="1" rowspan="2">
         <spacer>
          <property name="orientation">
           <enum>Qt::Vertical</enum>

src/iptlib/NATCompiler_PrintRule.cpp

@@ -686,6 +686,11 @@ bool NATCompiler_ipt::PrintRule::processNext()
 
     switch (rule->getRuleType())
     {
+    case NATRule::Masq:  
+        if (ropt->getBool("ipt_snat_random"))
+            cmdout << " --random";
+        break;
+
     case NATRule::SNAT:  
 	if (rule->getStr("ipt_target")=="SNAT")
         {