diff --git a/mambabase/mambabase.kmdr b/mambabase/mambabase.kmdr
index 375396f..3c07cb4 100755
--- a/mambabase/mambabase.kmdr
+++ b/mambabase/mambabase.kmdr
@@ -841,366 +841,6 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing
WordBreak|AlignVCenter
-
-
- Label17
-
-
-
- 10
- 50
- 570
- 110
-
-
-
- The following components are recommended for optimal desktop use but do not have an Open Source license.
-
-Warning: you'll have to accept a license agreement for most selected packages.
-
-
- WordBreak|AlignTop
-
-
-
-
- GroupBox2_2_2
-
-
-
- 10
- 131
- 560
- 270
-
-
-
- Proprietary software installations/updates
-
-
-
- Label9_2_2
-
-
-
- -10
- -20
- 161
- 21
-
-
-
-
-
- inst_nvidia_legacy
-
-
- true
-
-
-
- 20
- 40
- 510
- 20
-
-
-
- NVIDIA propri&etary video driver (legacy) from openmamba.org
-
-
-
-
-
-
-
-
-
-
-
- inst_fglrx_legacy
-
-
- true
-
-
-
- 20
- 80
- 510
- 20
-
-
-
- AMD/ATI proprietary video driver (le&gacy) from openmamba.org
-
-
-
-
-
-
-
-
-
-
-
- inst_codecs
-
-
- true
-
-
-
- 20
- 160
- 500
- 20
-
-
-
- &Win32 codecs from mplayerhq.hu
-
-
- false
-
-
-
-
- inst_msttcf
-
-
- true
-
-
-
- 20
- 140
- 410
- 20
-
-
-
- MS TrueT&ype core fonts from sourceforge
-
-
-
-
-
-
-
-
-
-
-
- inst_flash
-
-
- true
-
-
-
- 20
- 120
- 510
- 20
-
-
-
- F&lash plugin from adobe.com
-
-
- false
-
-
-
-
- inst_skype
-
-
- true
-
-
-
- 20
- 200
- 510
- 20
-
-
-
- S&kype from skype.com
-
-
- 276824139
-
-
-
-
-
-
-
-
-
-
-
- inst_java
-
-
- true
-
-
-
- 20
- 180
- 510
- 20
-
-
-
- Oracle &Java 7 from oracle.com
-
-
-
-
-
-
-
-
-
-
-
- inst_spotify
-
-
- true
-
-
-
- 20
- 220
- 510
- 20
-
-
-
- Spot&ify from spotify.com
-
-
-
-
-
-
-
-
-
-
-
- inst_virtualbox
-
-
- true
-
-
-
- 20
- 240
- 510
- 20
-
-
-
- Virtualbo&x extension pack from virtualbox.org
-
-
-
-
-
-
-
-
-
-
-
- inst_b43
-
-
- true
-
-
-
- 20
- 100
- 510
- 20
-
-
-
- &Broadcom B43 proprietary firmware from openwrt.org
-
-
-
-
-
-
-
-
-
-
-
- inst_fglrx
-
-
- true
-
-
-
- 20
- 60
- 510
- 20
-
-
-
- AMD/ATI proprietary video driver from openmamba.org
-
-
-
-
-
-
-
-
-
-
-
- inst_nvidia
-
-
- true
-
-
-
- 20
- 20
- 510
- 20
-
-
-
- NVIDIA proprietary video &driver from openmamba.org
-
-
- false
-
-
-
-
-
-
-
-
-
-
checkform3
@@ -1258,6 +898,11 @@ if [ $? -eq 0 ]; then
dcop @dcopid KommanderIf setEnabled inst_skype false
fi
+openmamba-netsrpms -c broadcom-sta > /dev/null
+if [ $? -eq 0 ]; then
+ dcop @dcopid KommanderIf setEnabled inst_broadcom_sta false
+fi
+
openmamba-netsrpms -c b43-firmware > /dev/null
if [ $? -eq 0 ]; then
dcop @dcopid KommanderIf setEnabled inst_b43 false
@@ -1275,6 +920,391 @@ fi
+
+
+ GroupBox2_2_2
+
+
+
+ 10
+ 111
+ 560
+ 290
+
+
+
+ Proprietary software installations/updates
+
+
+
+ Label9_2_2
+
+
+
+ -10
+ -20
+ 161
+ 21
+
+
+
+
+
+ inst_nvidia_legacy
+
+
+ true
+
+
+
+ 20
+ 40
+ 510
+ 20
+
+
+
+ NVIDIA propri&etary video driver (legacy) from openmamba.org
+
+
+
+
+
+
+
+
+
+
+
+ inst_fglrx
+
+
+ true
+
+
+
+ 20
+ 60
+ 510
+ 20
+
+
+
+ AMD/ATI proprietary video driver from openmamba.org
+
+
+
+
+
+
+
+
+
+
+
+ inst_virtualbox
+
+
+ true
+
+
+
+ 20
+ 260
+ 510
+ 20
+
+
+
+ Virtualbo&x extension pack from virtualbox.org
+
+
+
+
+
+
+
+
+
+
+
+ inst_spotify
+
+
+ true
+
+
+
+ 20
+ 240
+ 510
+ 20
+
+
+
+ Spot&ify from spotify.com
+
+
+
+
+
+
+
+
+
+
+
+ inst_skype
+
+
+ true
+
+
+
+ 20
+ 220
+ 510
+ 20
+
+
+
+ S&kype from skype.com
+
+
+ 276824139
+
+
+
+
+
+
+
+
+
+
+
+ inst_java
+
+
+ true
+
+
+
+ 20
+ 200
+ 510
+ 20
+
+
+
+ Oracle &Java 7 from oracle.com
+
+
+
+
+
+
+
+
+
+
+
+ inst_msttcf
+
+
+ true
+
+
+
+ 20
+ 160
+ 410
+ 20
+
+
+
+ MS TrueT&ype core fonts from sourceforge
+
+
+
+
+
+
+
+
+
+
+
+ inst_flash
+
+
+ true
+
+
+
+ 20
+ 140
+ 510
+ 20
+
+
+
+ F&lash plugin from adobe.com
+
+
+ false
+
+
+
+
+ inst_codecs
+
+
+ true
+
+
+
+ 20
+ 180
+ 500
+ 20
+
+
+
+ &Win32 codecs from mplayerhq.hu
+
+
+ false
+
+
+
+
+ inst_nvidia
+
+
+ true
+
+
+
+ 20
+ 20
+ 510
+ 20
+
+
+
+ NVIDIA proprietary video &driver from openmamba.org
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+ inst_fglrx_legacy
+
+
+ true
+
+
+
+ 20
+ 80
+ 510
+ 20
+
+
+
+ AMD/ATI proprietary video driver (le&gacy) from openmamba.org
+
+
+
+
+
+
+
+
+
+
+
+ inst_b43
+
+
+ true
+
+
+
+ 20
+ 120
+ 510
+ 20
+
+
+
+ &Broadcom B43 proprietary firmware from openwrt.org
+
+
+
+
+
+
+
+
+
+
+
+ inst_broadcom_sta
+
+
+ true
+
+
+
+ 20
+ 100
+ 510
+ 20
+
+
+
+ Broadcom-sta proprietary wireless driver from openmamba.org
+
+
+
+
+
+
+
+
+
+
+
+
+ Label17
+
+
+
+ 10
+ 50
+ 570
+ 60
+
+
+
+ The following components are recommended for optimal desktop use but do not have an Open Source license.
+WARNING: you'll have to accept a license agreement for most selected packages.
+
+
+ WordBreak|AlignTop
+
+
@@ -1455,6 +1485,7 @@ INSTALL_NVIDIA='@inst_nvidia.checked()'
INSTALL_NVIDIA_LEGACY='@inst_nvidia_legacy.checked()'
INSTALL_FGLRX='@inst_fglrx.checked()'
INSTALL_FGLRX_LEGACY='@inst_fglrx_legacy.checked()'
+INSTALL_BROADCOM_STA='@inst_broadcom_sta.checked()'
INSTALL_B43='@inst_b43.checked()'
INSTALL_JAVA='@inst_java.checked()'
INSTALL_SPOTIFY='@inst_spotify.checked()'
diff --git a/mambabase/mambabase.sh b/mambabase/mambabase.sh
index b6baef1..2be8c98 100644
--- a/mambabase/mambabase.sh
+++ b/mambabase/mambabase.sh
@@ -85,6 +85,7 @@ TOTAL_PROGRESS=10
[ "$INSTALL_NVIDIA_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_FGLRX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_FGLRX_LEGACY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
+[ "$INSTALL_BROADCOM_STA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_B43" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_SPOTIFY" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
[ "$INSTALL_VIRTUALBOX" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10`
@@ -194,6 +195,12 @@ if [ "$INSTALL_FGLRX_LEGACY" = "1" ]; then
rpm -q --whatprovides xorg-drv-video-fglrx-legacy >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx-legacy
fi
+if [ "$INSTALL_BROADCOM_STA" = "1" ]; then
+ echo $"Installing Broadcom proprietary wireless driver"
+ dcop_write $"Installing Broadcom proprietary wireless driver..." 10
+ rpm -q --whatprovides broadcom-sta >/dev/null || apt_get_parsed install -y broadcom-sta
+fi
+
if [ "$INSTALL_B43" = "1" ]; then
echo $"Installing Broadcom B43 proprietary firmware"
dcop_write $"Installing Broadcom B43 proprietary firmware..." 10
diff --git a/mambabase/po/es.po b/mambabase/po/es.po
index ed3a797..55cdb83 100644
--- a/mambabase/po/es.po
+++ b/mambabase/po/es.po
@@ -156,14 +156,12 @@ msgstr "Seleccionar los componentes no Open Source"
msgid ""
"The following components are recommended for optimal desktop use but do not "
"have an Open Source license. \n"
-"\n"
-"Warning: you'll have to accept a license agreement for each selected "
+"WARNING: you'll have to accept a license agreement for each selected "
"packages."
msgstr ""
"Los siguientes componentes son recomendados para un uso óptimo del desktop pero "
"no tienen una licencia Open Source. \n"
-"\n"
-"Atención: debes aceptar una licencia específica para cada uno de los "
+"ATENCION: debes aceptar una licencia específica para cada uno de los "
"componentes seleccionados."
#: _from_rc.cc:32
diff --git a/mambabase/po/it.po b/mambabase/po/it.po
index dc87fcf..bcb144b 100644
--- a/mambabase/po/it.po
+++ b/mambabase/po/it.po
@@ -156,14 +156,12 @@ msgstr "Scegliere i componenti non Open Source"
msgid ""
"The following components are recommended for optimal desktop use but do not "
"have an Open Source license. \n"
-"\n"
-"Warning: you'll have to accept a license agreement for each selected "
+"WARNING: you'll have to accept a license agreement for each selected "
"packages."
msgstr ""
"I seguenti componenti sono raccomandati per un uso ottimale del desktop ma "
"non hanno una licenza Open Source. \n"
-"\n"
-"Attenzione: occorre accettare una licenza specifica per ognuno dei "
+"ATTENZIONE: occorre accettare una licenza specifica per ognuno dei "
"componenti selezionati."
#: _from_rc.cc:32