From ceb739233af290b0fb7ed82f8f2ae8420a461929 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 3 Jun 2011 16:20:46 +0200
Subject: [PATCH] mambabase: remove configure network button and update
 copyright year

---
 mambabase/mambabase.kmdr | 121 ++++++++++++++++-----------------------
 mambabase/mambabase.sh   |   4 +-
 mambabase/po/es.po       |   8 +--
 mambabase/po/it.po       |   4 +-
 4 files changed, 56 insertions(+), 81 deletions(-)

diff --git a/mambabase/mambabase.kmdr b/mambabase/mambabase.kmdr
index 6e26304..5b5bc0f 100755
--- a/mambabase/mambabase.kmdr
+++ b/mambabase/mambabase.kmdr
@@ -229,7 +229,7 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Copyright (c) 2007-2010 by mambaSoft di Silvan Calarco
+                    <string>Copyright (c) 2007-2011 by mambaSoft di Silvan Calarco
 Released under the terms of the GNU GPL v3 license</string>
                 </property>
                 <property name="textFormat">
@@ -277,53 +277,6 @@ Released under the terms of the GNU GPL v3 license</string>
             <property name="title">
                 <string></string>
             </property>
-            <widget class="ExecButton">
-                <property name="name">
-                    <cstring>checkButton</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>290</x>
-                        <y>190</y>
-                        <width>130</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>C&amp;heck again</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>errorlabel</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>110</y>
-                        <width>550</width>
-                        <height>70</height>
-                    </rect>
-                </property>
-                <property name="font">
-                    <font>
-                    </font>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-                <property name="textFormat">
-                    <enum>AutoText</enum>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignBottom</set>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>Label7</cstring>
@@ -351,29 +304,6 @@ Released under the terms of the GNU GPL v3 license</string>
                     <set>WordBreak|AlignTop</set>
                 </property>
             </widget>
-            <widget class="ExecButton">
-                <property name="name">
-                    <cstring>ConfigureButton</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>150</x>
-                        <y>190</y>
-                        <width>130</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Conf&amp;igure</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string>@exec("wicd-client -n")
-@checknetwork.execute()
-</string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>label</cstring>
@@ -400,6 +330,53 @@ Released under the terms of the GNU GPL v3 license</string>
                     <set>WordBreak|AlignBottom</set>
                 </property>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>errorlabel</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>110</y>
+                        <width>550</width>
+                        <height>70</height>
+                    </rect>
+                </property>
+                <property name="font">
+                    <font>
+                    </font>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+                <property name="textFormat">
+                    <enum>AutoText</enum>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignBottom</set>
+                </property>
+            </widget>
+            <widget class="ExecButton">
+                <property name="name">
+                    <cstring>checkButton</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>220</x>
+                        <y>190</y>
+                        <width>130</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>C&amp;heck again</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
         </widget>
         <widget class="ScriptObject">
             <property name="name">
@@ -424,7 +401,6 @@ dcop @dcopid KommanderIf setChecked BackBox false
 RET=$?
 if [ $RET -eq 0 ]; then
    dcop @dcopid KommanderIf setVisible checkButton false
-   dcop @dcopid KommanderIf setVisible ConfigureButton false
    dcop @dcopid KommanderIf setChecked NextBox true
    dcop @dcopid KommanderIf setVisible label true
    dcop @dcopid KommanderIf setText errorlabel ""
@@ -432,7 +408,6 @@ else
    dcop @dcopid KommanderIf setChecked NextBox false
    dcop @dcopid KommanderIf setText errorlabel "&lt;font color=red&gt;@i18n("Error: could not contact repository host (www.openmamba.org, ret=$RET).")&lt;/font&gt;&lt;br&gt;@i18n("Please check your network configuration and press the button below to try again.")"
    dcop @dcopid KommanderIf setVisible checkButton true
-   dcop @dcopid KommanderIf setVisible ConfigureButton true
    dcop @dcopid KommanderIf setVisible label false
 fi
 </string>
diff --git a/mambabase/mambabase.sh b/mambabase/mambabase.sh
index 48611a6..7b690e7 100644
--- a/mambabase/mambabase.sh
+++ b/mambabase/mambabase.sh
@@ -1,5 +1,5 @@
 # openmamba post installation script
-# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPLv3 License
 
@@ -50,7 +50,7 @@ DCOPID=$2
 
 echo $"\
 openmamba installation script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 [ "$DCOPID" ] && dcop $DCOPID KommanderIf setChecked NextBox false
diff --git a/mambabase/po/es.po b/mambabase/po/es.po
index 5f8f558..12b862a 100644
--- a/mambabase/po/es.po
+++ b/mambabase/po/es.po
@@ -38,10 +38,10 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Expedido según los terminos de la licencia GNU GPL versione 3"
 
 #: _from_rc.cc:10
@@ -240,10 +240,10 @@ msgstr "           operación."
 #: mambabase.sh:49
 msgid ""
 "openmamba installation script - version $VERSION\n"
-"Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 msgstr ""
 "Script de instalación de openmamba - versión $VERSION\n"
-"Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 #: mambabase.sh:55
 msgid "Starting installation..."
 msgstr "Inicio de la instalación..."
diff --git a/mambabase/po/it.po b/mambabase/po/it.po
index c4f8009..949a344 100644
--- a/mambabase/po/it.po
+++ b/mambabase/po/it.po
@@ -38,10 +38,10 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Rilasciato secondo i termini della licenza GNU GPL versione 3"
 
 #: _from_rc.cc:10