diff --git a/mambabase/mambabase.kmdr b/mambabase/mambabase.kmdr index d3a29b4..a022e1b 100755 --- a/mambabase/mambabase.kmdr +++ b/mambabase/mambabase.kmdr @@ -210,35 +210,6 @@ www.openmamba.org - - - Label18_2_2_2 - - - - 10 - 100 - 400 - 30 - - - - - 8 - 1 - - - - Copyright (c) 2007-2011 by mambaSoft di Silvan Calarco -Released under the terms of the GNU GPL v3 license - - - AutoText - - - WordBreak|AlignVCenter - - backnext @@ -261,6 +232,35 @@ Released under the terms of the GNU GPL v3 license + + + Label18_2_2_2 + + + + 10 + 100 + 400 + 30 + + + + + 8 + 1 + + + + Copyright (c) 2007-2014 by Silvan Calarco +Released under the terms of the GNU GPL v3 license + + + AutoText + + + WordBreak|AlignVCenter + + @@ -446,72 +446,6 @@ fi WordBreak|AlignVCenter - - - checkform2 - - - - 0 - 300 - 32 - 32 - - - - - @BackBox.setChecked(false) -@NextBox.setChecked(true) -. /usr/share/openmamba/pkggroups.db - -function check_pkgs() { - missing=false - rpm -q --whatprovides $1 >/dev/null || missing=true -} - -check_pkgs "$BASE_PKGS" -dcop @dcopid KommanderIf setEnabled inst_base $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_base true - -check_pkgs "$OFFICE_PKGS" -dcop @dcopid KommanderIf setEnabled inst_office $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_office true - -check_pkgs "$MULTIMEDIA_PLAYERS_PKGS" -dcop @dcopid KommanderIf setEnabled inst_players $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_players true - -check_pkgs "$MULTIMEDIA_EDITING_PKGS" -dcop @dcopid KommanderIf setEnabled inst_multimedia_editing $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_multimedia_editing true - -check_pkgs "$INTERNET_PKGS" -dcop @dcopid KommanderIf setEnabled inst_internet $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_internet true - -check_pkgs "$GRAPHICS_PKGS" -dcop @dcopid KommanderIf setEnabled inst_graphics $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_graphics true - -check_pkgs "$GAMES_PKGS" -dcop @dcopid KommanderIf setEnabled inst_games $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_games true - -check_pkgs "$VIRTUALIZATION_PKGS" -dcop @dcopid KommanderIf setEnabled inst_virtualization $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_virtualization true - -check_pkgs "$SERVER_PKGS" -dcop @dcopid KommanderIf setEnabled inst_server $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked server_prof true - -check_pkgs "$DEVEL_PKGS" -dcop @dcopid KommanderIf setEnabled inst_devel $missing -[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_devel true - - - - GroupBox2_2 @@ -592,32 +526,6 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing - - - inst_internet - - - true - - - - 10 - 140 - 550 - 20 - - - - Internet communication and p2p (&kopete, pidgin, ekiga, aMule, ...) - - - - - - - - - inst_graphics @@ -660,7 +568,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing - Base development packages (gcc, glibc-devel, kernel sources, ...) + Base &development packages (gcc, glibc-devel, kernel sources, ...) @@ -672,7 +580,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing - inst_office + inst_server true @@ -680,67 +588,13 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing 10 - 50 + 260 550 20 - Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...) - - - false - - - - - inst_multimedia_editing - - - true - - - - 10 - 110 - 550 - 20 - - - - Mu&ltimedia editing and production (kino, audacity, rosegarden, mixxx, ...) - - - false - - - - - - - - - - - - inst_players - - - true - - - - 10 - 80 - 550 - 20 - - - - Audio and Video players (amarok, &xmms, vlc, kaffeine, miro, ...) - - - false + Base server packages (apache, postfix, vsftpd, php, m&ysql, ...) @@ -784,7 +638,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing - inst_server + inst_office true @@ -792,13 +646,38 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing 10 - 260 + 50 550 20 - Base server packages (apache, postfix, vsftpd, php, m&ysql, ...) + Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...) + + + false + + + + + inst_players + + + true + + + + 10 + 80 + 550 + 20 + + + + Audio and Video players (amarok, &xmms, vlc, kaffeine, miro, ...) + + + false @@ -808,6 +687,127 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing + + + inst_multimedia_editing + + + true + + + + 10 + 110 + 550 + 20 + + + + Mu&ltimedia editing and production (kino, audacity, rosegarden, mixxx, ...) + + + false + + + + + + + + + + + + inst_internet + + + true + + + + 10 + 140 + 550 + 20 + + + + Internet communication and p2p (&kopete, pidgin, ekiga, aMule, ...) + + + + + + + + + + + + + checkform2 + + + + 0 + 300 + 32 + 32 + + + + + @BackBox.setChecked(false) +@NextBox.setChecked(true) +. /usr/share/openmamba/pkggroups.db + +function check_pkgs() { + missing=false + rpm -q --whatprovides $1 >/dev/null || missing=true +} + +check_pkgs "$BASE_PKGS" +dcop @dcopid KommanderIf setEnabled inst_base $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_base true + +check_pkgs "$OFFICE_PKGS" +dcop @dcopid KommanderIf setEnabled inst_office $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_office true + +check_pkgs "$MULTIMEDIA_PLAYERS_PKGS" +dcop @dcopid KommanderIf setEnabled inst_players $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_players true + +check_pkgs "$MULTIMEDIA_EDITING_PKGS" +dcop @dcopid KommanderIf setEnabled inst_multimedia_editing $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_multimedia_editing true + +check_pkgs "$INTERNET_PKGS" +dcop @dcopid KommanderIf setEnabled inst_internet $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_internet true + +check_pkgs "$GRAPHICS_PKGS" +dcop @dcopid KommanderIf setEnabled inst_graphics $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_graphics true + +check_pkgs "$GAMES_PKGS" +dcop @dcopid KommanderIf setEnabled inst_games $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_games true + +check_pkgs "$VIRTUALIZATION_PKGS" +dcop @dcopid KommanderIf setEnabled inst_virtualization $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_virtualization true + +check_pkgs "$SERVER_PKGS" +dcop @dcopid KommanderIf setEnabled inst_server $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked server_prof true + +check_pkgs "$DEVEL_PKGS" +dcop @dcopid KommanderIf setEnabled inst_devel $missing +[ "$missing" = "false" ] && dcop @dcopid KommanderIf setChecked inst_devel true + + + @@ -848,7 +848,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing 10 - 60 + 50 570 110 @@ -856,7 +856,7 @@ dcop @dcopid KommanderIf setEnabled inst_devel $missing 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 each selected packages. +Warning: you'll have to accept a license agreement for most selected packages. WordBreak|AlignTop @@ -868,14 +868,14 @@ Warning: you'll have to accept a license agreement for each selected packages. - 20 - 160 + 10 + 131 560 - 220 + 270 - Non Open Source installations/updates + Proprietary software installations/updates @@ -892,7 +892,7 @@ Warning: you'll have to accept a license agreement for each selected packages. - inst_flash + inst_nvidia_legacy true @@ -900,17 +900,47 @@ Warning: you'll have to accept a license agreement for each selected packages. 20 - 30 + 40 510 20 - F&lash plugin from adobe.com + 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 + + + + + + + + @@ -922,7 +952,7 @@ Warning: you'll have to accept a license agreement for each selected packages. 20 - 60 + 160 500 20 @@ -931,7 +961,7 @@ Warning: you'll have to accept a license agreement for each selected packages.&Win32 codecs from mplayerhq.hu - true + false @@ -944,7 +974,7 @@ Warning: you'll have to accept a license agreement for each selected packages. 20 - 90 + 140 410 20 @@ -962,7 +992,7 @@ Warning: you'll have to accept a license agreement for each selected packages. - inst_skype + inst_flash true @@ -975,9 +1005,193 @@ Warning: you'll have to accept a license agreement for each selected packages.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 + @@ -994,7 +1208,7 @@ Warning: you'll have to accept a license agreement for each selected packages. 0 - 360 + 370 32 32 @@ -1003,22 +1217,61 @@ Warning: you'll have to accept a license agreement for each selected packages. @BackBox.setChecked(true) @NextBox.setChecked(true) -rpm -q flashplugin && { - dcop @dcopid KommanderIf setChecked inst_flash false +rpm -q xorg-drv-video-nvidia && { + dcop @dcopid KommanderIf setEnabled inst_nvidia false } -rpm -q win32codecs && { - dcop @dcopid KommanderIf setChecked inst_codecs false +rpm -q xorg-drv-video-nvidia_304 && { + dcop @dcopid KommanderIf setEnabled inst_nvidia_legacy false } -rpm -q msttcorefonts && { - dcop @dcopid KommanderIf setChecked inst_msttcf false +rpm -q xorg-drv-video-fglrx && { + dcop @dcopid KommanderIf setEnabled inst_fglrx false } -rpm -q skype && { - dcop @dcopid KommanderIf setChecked inst_skype false +rpm -q xorg-drv-video-fglrx && { + dcop @dcopid KommanderIf setEnabled inst_fglrx_legacy false } - + +openmamba-netsrpms -c flashplugin > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_flash false +fi + +openmamba-netsrpms -c msttcorefonts > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_msttcf false +fi + +openmamba-netsrpms -c win32codecs > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_codecs false +fi + +openmamba-netsrpms -c sun-java7 > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_java false +fi + +openmamba-netsrpms -c skype > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_skype false +fi + +openmamba-netsrpms -c b43-firmware > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_b43 false +fi + +openmamba-netsrpms -c spotify > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_spotify false +fi + +openmamba-netsrpms -c virtualbox-extension-pack > /dev/null +if [ $? -eq 0 ]; then + dcop @dcopid KommanderIf setEnabled inst_virtualbox false +fi @@ -1086,25 +1339,6 @@ rpm -q skype && { - - - qt_dead_widget_ScriptObject8 - - - - 560 - 340 - 32 - 32 - - - - - dcop @dcopid KommanderIf setText logbox "`cat ~/.mambabase.log`" - - - - Label5_2_2_2 @@ -1129,50 +1363,6 @@ rpm -q skype && { AlignCenter - - - launchinstall - - - - 10 - 110 - 32 - 32 - - - - - @NextBox.setChecked(false) -@BackBox.setChecked(false) -conffile=~/.mambabase.conf -cat > $conffile << _EOF -# -# openmamba installation file -# -# created by mamba installer wizard -# -INSTALL_BASE='@inst_base.checked()' -INSTALL_OFFICE='@inst_office.checked()' -INSTALL_PLAYERS='@inst_players.checked()' -INSTALL_MULTIMEDIA_EDITING='@inst_multimedia_editing.checked()' -INSTALL_INTERNET='@inst_internet.checked()' -INSTALL_GRAPHICS='@inst_graphics.checked()' -INSTALL_GAMES='@inst_games.checked()' -INSTALL_VIRTUALIZATION='@inst_virtualization.checked()' -INSTALL_SERVER='@inst_server.checked()' -INSTALL_DEVEL='@inst_devel.checked()' -INSTALL_FLASH='@inst_flash.checked()' -INSTALL_CODECS='@inst_codecs.checked()' -INSTALL_MSTTCF='@inst_msttcf.checked()' -INSTALL_SKYPE='@inst_skype.checked()' -_EOF - -@exec("sh /usr/share/openmamba/mambabase/mambabase.sh -y @dcopid &> ~/.mambabase.log &") -dcop @dcopid KommanderIf execute Timer1 - - - progressText @@ -1205,6 +1395,77 @@ dcop @dcopid KommanderIf execute Timer1 AlignTop|AlignHCenter + + + qt_dead_widget_ScriptObject8 + + + + 560 + 340 + 32 + 32 + + + + + dcop @dcopid KommanderIf setText logbox "`cat ~/.mambabase.log`" + + + + + + + launchinstall + + + + 10 + 150 + 32 + 32 + + + + + @NextBox.setChecked(false) +@BackBox.setChecked(false) +conffile=~/.mambabase.conf +cat > $conffile << _EOF +# +# openmamba installation file +# +# created by mamba installer wizard +# +INSTALL_BASE='@inst_base.checked()' +INSTALL_OFFICE='@inst_office.checked()' +INSTALL_PLAYERS='@inst_players.checked()' +INSTALL_MULTIMEDIA_EDITING='@inst_multimedia_editing.checked()' +INSTALL_INTERNET='@inst_internet.checked()' +INSTALL_GRAPHICS='@inst_graphics.checked()' +INSTALL_GAMES='@inst_games.checked()' +INSTALL_VIRTUALIZATION='@inst_virtualization.checked()' +INSTALL_SERVER='@inst_server.checked()' +INSTALL_DEVEL='@inst_devel.checked()' +INSTALL_FLASH='@inst_flash.checked()' +INSTALL_CODECS='@inst_codecs.checked()' +INSTALL_MSTTCF='@inst_msttcf.checked()' +INSTALL_SKYPE='@inst_skype.checked()' +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_B43='@inst_b43.checked()' +INSTALL_JAVA='@inst_java.checked()' +INSTALL_SPOTIFY='@inst_spotify.checked()' +INSTALL_VIRTUALBOX='@inst_virtualbox.checked()' +_EOF + +@exec("sh /usr/share/openmamba/mambabase/mambabase.sh -y @dcopid &> ~/.mambabase.log &") +dcop @dcopid KommanderIf execute Timer1 + + + diff --git a/mambabase/mambabase.po b/mambabase/mambabase.po index 668236e..3eb5b26 100644 --- a/mambabase/mambabase.po +++ b/mambabase/mambabase.po @@ -11,19 +11,20 @@ msgstr "" # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: _from_rc.cc:3 _from_rc.cc:4 _from_rc.cc:5 _from_rc.cc:10 _from_rc.cc:15 -#: _from_rc.cc:41 +#: _from_rc.cc:3 _from_rc.cc:4 _from_rc.cc:5 _from_rc.cc:10 _from_rc.cc:13 +#: _from_rc.cc:46 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-05-28 16:55+0200\n" +"POT-Creation-Date: 2014-09-16 23:16+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: _from_rc.cc:6 @@ -40,19 +41,11 @@ msgstr "" #: _from_rc.cc:9 msgid "" -"Copyright (c) 2007-2008 by mambaSoft di Silvan Calarco\n" +"Copyright (c) 2007-2014 by Silvan Calarco\n" "Released under the terms of the GNU GPL v3 license" msgstr "" #: _from_rc.cc:11 -msgid "C&heck again" -msgstr "" - -#: _from_rc.cc:12 -msgid "Conf&igure" -msgstr "" - -#: _from_rc.cc:13 msgid "" "This program will complete the installation by adding the minimum " "recommended set of packages to the system. Additionally it will let you " @@ -62,42 +55,50 @@ msgid "" "center on the tray icon bar." msgstr "" -#: _from_rc.cc:14 +#: _from_rc.cc:12 msgid "Please, press the Next button to continue." msgstr "" -#: _from_rc.cc:16 +#: _from_rc.cc:14 +msgid "C&heck again" +msgstr "" + +#: _from_rc.cc:15 msgid "Select installations from network" msgstr "" -#: _from_rc.cc:17 _from_rc.cc:30 +#: _from_rc.cc:16 _from_rc.cc:29 msgid "" "Please, select from the boxes below the components that you want to install " "or update from network." msgstr "" -#: _from_rc.cc:18 +#: _from_rc.cc:17 msgid "openmamba installation/updates" msgstr "" -#: _from_rc.cc:19 +#: _from_rc.cc:18 msgid "&Games (turacer, pingus, ksudoku, ...)" msgstr "" -#: _from_rc.cc:20 +#: _from_rc.cc:19 msgid "Emulation and virtuali&zation (VirtualBox, kvm, QtEmu, wine, ...)" msgstr "" -#: _from_rc.cc:21 -msgid "Internet communication and p2p (&kopete, pidgin, ekiga, aMule, ...)" -msgstr "" - -#: _from_rc.cc:22 +#: _from_rc.cc:20 msgid "Grap&hics software (gimp, digikam, blender, sodipodi, ...)" msgstr "" +#: _from_rc.cc:21 +msgid "Base &development packages (gcc, glibc-devel, kernel sources, ...)" +msgstr "" + +#: _from_rc.cc:22 +msgid "Base server packages (apache, postfix, vsftpd, php, m&ysql, ...)" +msgstr "" + #: _from_rc.cc:23 -msgid "Base development packages (gcc, glibc-devel, kernel sources, ...)" +msgid "System &base packages (recommended)" msgstr "" #: _from_rc.cc:24 @@ -105,41 +106,41 @@ msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)" msgstr "" #: _from_rc.cc:25 +msgid "Audio and Video players (amarok, &xmms, vlc, kaffeine, miro, ...)" +msgstr "" + +#: _from_rc.cc:26 msgid "" "Mu<imedia editing and production (kino, audacity, rosegarden, mixxx, ...)" msgstr "" -#: _from_rc.cc:26 -msgid "Audio and Video players (amarok, &xmms, vlc, kaffeine, miro, ...)" -msgstr "" - #: _from_rc.cc:27 -msgid "System &base packages (recommended)" +msgid "Internet communication and p2p (&kopete, pidgin, ekiga, aMule, ...)" msgstr "" #: _from_rc.cc:28 -msgid "Base server packages (apache, postfix, vsftpd, php, m&ysql, ...)" -msgstr "" - -#: _from_rc.cc:29 msgid "Select non Open Source components" msgstr "" -#: _from_rc.cc:31 +#: _from_rc.cc:30 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 most selected " "packages." msgstr "" +#: _from_rc.cc:31 +msgid "Proprietary software installations/updates" +msgstr "" + #: _from_rc.cc:32 -msgid "Non Open Source installations/updates" +msgid "NVIDIA propri&etary video driver (legacy) from openmamba.org" msgstr "" #: _from_rc.cc:33 -msgid "F&lash plugin from adobe.com" +msgid "AMD/ATI proprietary video driver (le&gacy) from openmamba.org" msgstr "" #: _from_rc.cc:34 @@ -151,42 +152,62 @@ msgid "MS TrueT&ype core fonts from sourceforge" msgstr "" #: _from_rc.cc:36 -msgid "Sun Java Developers &Kit (DLJ license)" +msgid "F&lash plugin from adobe.com" msgstr "" #: _from_rc.cc:37 -msgid "Sun &Java Runtime Environment (DLJ license)" +msgid "S&kype from skype.com" msgstr "" #: _from_rc.cc:38 -msgid "Skype from skype.com" +msgid "Oracle &Java 7 from oracle.com" msgstr "" #: _from_rc.cc:39 -msgid "Installation" +msgid "Spot&ify from spotify.com" msgstr "" #: _from_rc.cc:40 -msgid "Details" +msgid "Virtualbo&x extension pack from virtualbox.org" +msgstr "" + +#: _from_rc.cc:41 +msgid "&Broadcom B43 proprietary firmware from openwrt.org" msgstr "" #: _from_rc.cc:42 -msgid "Installation in progress..." +msgid "AMD/ATI proprietary video driver from openmamba.org" msgstr "" #: _from_rc.cc:43 -msgid "Starting installation of selected components..." +msgid "NVIDIA proprietary video &driver from openmamba.org" msgstr "" #: _from_rc.cc:44 -msgid "End of installation" +msgid "Installation" msgstr "" #: _from_rc.cc:45 +msgid "Details" +msgstr "" + +#: _from_rc.cc:47 +msgid "Installation in progress..." +msgstr "" + +#: _from_rc.cc:48 +msgid "Starting installation of selected components..." +msgstr "" + +#: _from_rc.cc:49 +msgid "End of installation" +msgstr "" + +#: _from_rc.cc:50 msgid "Installation completed." msgstr "" -#: _from_rc.cc:46 +#: _from_rc.cc:51 msgid "" "If you ran into ploblems, please check the installation log below for " "warning or errors and send the report to the openmamba community at +Copyright (c) 2007-2014 by Silvan Calarco " [ "$DCOPID" ] && dcop $DCOPID KommanderIf setChecked NextBox false @@ -80,7 +80,14 @@ TOTAL_PROGRESS=10 [ "$INSTALL_SKYPE" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_CODECS" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` [ "$INSTALL_MSTTCF" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` -[ "$INSTALL_JRE" = "1" -o "$INSTALL_JDK" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` +[ "$INSTALL_JAVA" = "1" ] && TOTAL_PROGRESS=`expr $TOTAL_PROGRESS + 10` +[ "$INSTALL_NVIDIA" = "1" ] && TOTAL_PROGRESS=`expr $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_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` [ "$DCOPID" ] && dcop $DCOPID KommanderIf setMaximum progressBar $TOTAL_PROGRESS @@ -163,6 +170,48 @@ if [ "$INSTALL_DEVEL" = "1" ]; then rpm -q --whatprovides $DEVEL_PKGS >/dev/null || apt_get_parsed install -y $DEVEL_PKGS fi +if [ "$INSTALL_NVIDIA" = "1" ]; then + echo $"Installing NVIDIA proprietary video driver packages" + dcop_write $"Installing/updating NVIDIA proprietary video driver packages..." 10 + rpm -q --whatprovides xorg-drv-video-nvidia >/dev/null || apt_get_parsed install -y xorg-drv-video-nvidia +fi + +if [ "$INSTALL_NVIDIA_LEGACY" = "1" ]; then + echo $"Installing NVIDIA proprietary (legacy) video driver packages" + dcop_write $"Installing/updating NVIDIA proprietary (legacy) video driver packages..." 10 + rpm -q --whatprovides xorg-drv-video-nvidia_304 >/dev/null || apt_get_parsed install -y xorg-drv-video-nvidia_304 +fi + +if [ "$INSTALL_FGLRX" = "1" ]; then + echo $"Installing AMD/ATI proprietary video driver packages" + dcop_write $"Installing/updating AMD/ATI proprietary video driver packages..." 10 + rpm -q --whatprovides xorg-drv-video-fglrx >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx +fi + +if [ "$INSTALL_FGLRX_LEGACY" = "1" ]; then + echo $"Installing AMD/ATI proprietary (legacy) video driver packages" + dcop_write $"Installing/updating AMD/ATI proprietary (legacy) video driver packages..." 10 + rpm -q --whatprovides xorg-drv-video-fglrx-legacy >/dev/null || apt_get_parsed install -y xorg-drv-video-fglrx-legacy +fi + +if [ "$INSTALL_B43" = "1" ]; then + echo $"Installing Broadcom B43 proprietary firmware" + dcop_write $"Installing Broadcom B43 proprietary firmware..." 10 + /usr/bin/openmamba-netsrpms b43-firmware +fi + +if [ "$INSTALL_SPOTIFY" = "1" ]; then + echo $"Installing Spotify" + dcop_write $"Installing Spotify..." 10 + /usr/bin/openmamba-netsrpms spotify +fi + +if [ "$INSTALL_VIRTUALBOX" = "1" ]; then + echo $"Installing Virtualbox extension pack" + dcop_write $"Installing Virtualbox extension pack..." 10 + /usr/bin/openmamba-netsrpms virtualbox-extension-pack +fi + if [ "$INSTALL_FLASH" = "1" ]; then echo $"Installing flash plugin" dcop_write $"Installing Flash plugin..." 10 diff --git a/mambabase/po/es.po b/mambabase/po/es.po index 77143e2..ed3a797 100644 --- a/mambabase/po/es.po +++ b/mambabase/po/es.po @@ -38,10 +38,10 @@ msgstr "" #: _from_rc.cc:9 msgid "" -"Copyright (c) 2007-2011 by Silvan Calarco\n" +"Copyright (c) 2007-2014 by Silvan Calarco\n" "Released under the terms of the GNU GPL v3 license" msgstr "" -"Copyright (c) 2007-2011 by Silvan Calarco\n" +"Copyright (c) 2007-2014 by Silvan Calarco\n" "Expedido según los terminos de la licencia GNU GPL versione 3" #: _from_rc.cc:10 diff --git a/mambabase/po/it.po b/mambabase/po/it.po index 21a43d4..dc87fcf 100644 --- a/mambabase/po/it.po +++ b/mambabase/po/it.po @@ -38,10 +38,10 @@ msgstr "" #: _from_rc.cc:9 msgid "" -"Copyright (c) 2007-2011 by Silvan Calarco\n" +"Copyright (c) 2007-2014 by Silvan Calarco\n" "Released under the terms of the GNU GPL v3 license" msgstr "" -"Copyright (c) 2007-2011 by Silvan Calarco\n" +"Copyright (c) 2007-2014 by Silvan Calarco\n" "Rilasciato secondo i termini della licenza GNU GPL versione 3" #: _from_rc.cc:10 diff --git a/mambabase/po/it.po~ b/mambabase/po/it.po~ deleted file mode 100644 index c47f8f4..0000000 --- a/mambabase/po/it.po~ +++ /dev/null @@ -1,350 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#: _from_rc.cc:3 _from_rc.cc:4 _from_rc.cc:5 _from_rc.cc:12 _from_rc.cc:42 -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-12-27 22:05+0100\n" -"Last-Translator: Silvan Calarco \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: _from_rc.cc:1 -msgid "openmamba base network installations" -msgstr "Installazioni base di openmamba dalla rete" - -#: _from_rc.cc:2 -msgid "Welcome!" -msgstr "Benvenuto!" - -#: _from_rc.cc:6 -msgid "Version 0.1" -msgstr "" - -#: _from_rc.cc:7 -msgid "www.openmamba.org" -msgstr "" - -#: _from_rc.cc:8 mamba.kmdr:294 -msgid "version" -msgstr "" - -#: _from_rc.cc:9 -msgid "" -"Copyright (c) 2007 by Silvan Calarco\n" -"Released under the terms of the GNU GPL v3 license" -msgstr "" -"Copyright (c) 2007 by Silvan Calarco\n" -"Rilasciato secondo i termini della licenza GNU GPL versione 3" - -#: _from_rc.cc:10 -msgid "GNU/Linux distribution" -msgstr "Distribuzione GNU/Linux" - -#: _from_rc.cc:11 -msgid "" -"This program will complete the installation by adding the minimum " -"recommended set of packages to the system. Additionally it will let you " -"install, upon selection, macro-group of packages and proprietary software " -"components.\n" -"
TIP: you may run this program later from the openmamba control " -"center on the tray icon bar." -msgstr "" -"Questo programma completerà l'installazione aggiungendo un set minimo di " -"pacchetti raccomandati per il sistema. Inoltre permette di selezionare ed installare " -"macro-gruppi di pacchetti e componenti di software proprietario.\n" -"
SUGGERIMENTO: puoi eseguire questo programma in qualunque momento dal " -"Centro di controllo openmamba sulla tray icon bar." - -#: _from_rc.cc:13 -msgid "Conf&igure" -msgstr "Conf&igura" - -#: _from_rc.cc:12 -msgid "Please, press the Next button to continue." -msgstr "Premi il pulsante Successivo per continuare." - -#: _from_rc.cc:13 -msgid "Error: could not contact repository host (www.openmamba.org)." -msgstr "Errore: impossibile contattare il repository (www.openmamba.org)." - -#: _from_rc.cc:13 -msgid "Please check your network configuration and press the button below to try again." -msgstr "Verifica la configurazione della rete e premi il bottone sottostante per riprovare." - -#: _from_rc.cc:13 -msgid "Press the Next button to continue." -msgstr "

Premi il pulsante Successivo per continuare." - - -#: _from_rc.cc:14 -msgid "C&heck again" -msgstr "Controlla di nuovo" - -#: _from_rc.cc:15 -msgid "Select installations from network" -msgstr "Scelta delle installazioni dalla rete" - -#: _from_rc.cc:16 _from_rc.cc:30 -msgid "" -"Please, select from the boxes below the components that you want to install " -"or update from network." -msgstr "" -"Seleziona nelle caselle sottostanti i componenti che desideri installare " -"o aggiornare dalla rete." - -#: _from_rc.cc:17 -msgid "openmamba installation/updates" -msgstr "installazioni/aggiornamenti di openmamba" - -#: _from_rc.cc:18 -msgid "Off&ice packages (OpenOffice, Groupware, PDA Syncronization, ...)" -msgstr "Programmi per l'&ufficio (OpenOffice, Sincronizzazione, ...)" - -#: _from_rc.cc:19 -msgid "Audio and Video players (amarok, &xmms, vlc, kaffeine, miro, ...)" -msgstr "Player audio e video (amarok, xmms, vlc, kaffeine, miro, ...)" - -#: _from_rc.cc:20 -msgid "Mu<imedia editing and production (kino, audacity, rosegarden, mixxx, ...)" -msgstr "Produzione multimediale (kino, audacity, rosegarden, mixxx, ...)"" - -#: _from_rc.cc:21 -msgid "Internet communication and p2p (&kopete, pidgin, ekiga, aMule, ...)" -msgstr "Programmi per internet (&kopete, pidgin, ekiga, aMule, ...)" - -#: _from_rc.cc:23 -msgid "Grap&hics software (gimp, digikam, blender, sodipodi, ...)" -msgstr "Programmi per la gra&fica (gimp, digikam, blender, sodipodi, ...)" - -#: _from_rc.cc:24 -msgid "&Games (turacer, pingus, ksudoku, ...)" -msgstr "&Giochi (tuxracer, pingus, ksudoku, ...)" - -#: _from_rc.cc:25 -msgid "Emulation and virtuali&zation (VirtualBox, kvm, QtEmu, wine, ...)" -msgstr "Emulatori e virtuali&zzatori (VirtualBox, kvm, QtEmu, wine, ...)" - -#: _from_rc.cc:22 -msgid "Base server packages (apache, postfix, vsftpd, php, mysql, ...)" -msgstr "Servizi di rete base (apache, postfix, vsftpd, php, mysql, ...)" - -#: _from_rc.cc:26 -msgid "Base development packages (gcc, glibc-devel, kernel sources, ...)" -msgstr "Ambiente di svilupppo base (gcc, glibc-devel, sorgenti del kernel, ...)" - -#: _from_rc.cc:27 -msgid "S&ystem update" -msgstr "Aggiornamento del &sistema" - -#: _from_rc.cc:28 -msgid "System &base packages (recommended)" -msgstr "Pacchetti &base del sistema (raccomandato)" - -#: _from_rc.cc:29 -msgid "Select non Open Source components" -msgstr "Scegliere i componenti non Open Source" - -#: _from_rc.cc:31 -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 " -"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 " -"componenti selezionati." - -#: _from_rc.cc:32 -msgid "Non Open Source installations/updates" -msgstr "Installazioni/aggiornamenti di software non Open Source" - -#: _from_rc.cc:33 -msgid "F&lash plugin from adobe.com" -msgstr "Plugin flash da adobe.com" - -#: _from_rc.cc:34 -msgid "&Win32 codecs from mplayerhq.hu" -msgstr "Codec &Win32 da mplayerhq.hu" - -#: _from_rc.cc:35 -msgid "MS TrueT&ype core fonts from sourceforge" -msgstr "Font MS TrueType da sourceforge" - -#: _from_rc.cc:36 -msgid "Sun Java Developers &Kit (DLJ license)" -msgstr "Sun Java Developers &Kit (licenza DLJ)" - -#: _from_rc.cc:37 -msgid "Sun &Java Runtime Environment (DLJ license)" -msgstr "Sun &Java Runtime Environment (licenza DLJ)" - -#: _from_rc.cc:38 -msgid "Installation" -msgstr "Installazione" - -#: _from_rc.cc:39 -msgid "Installation in progress..." -msgstr "Installazione in corso..." - -#: _from_rc.cc:40 -msgid "Starting installation of selected components..." -msgstr "Avvio dell'installazione dei componenti selezionati..." - - -#: _from_rc.cc:41 -msgid "Details" -msgstr "Dettagli" - -#: _from_rc.cc:43 -msgid "End of installation" -msgstr "Fine dell'installazione" - -#: _from_rc.cc:44 -msgid "Installation completed." -msgstr "Installazione completata." - -#: _from_rc.cc:45 -msgid "" -"If you ran into ploblems, please check the installation log below for " -"warning or errors and send the report to the openmamba community at www.openmamba.org." -msgstr "" -"Se hai incontrato dei problemi, per favore controlla se il log di installazione " -"riporta dei messaggi di errore ed invia un rapporto alla comunità di openmamba su " -"www.openmamba.org." -#: mambabase.sh:37 -msgid "Warning: this script will perform an automatic installation erasing all the" -msgstr "Attenzione: questo script effettuerà un'installazione automatica cancellando tutti" -#: mambabase.sh:38 -msgid " contents of device $INSTALL_DEVICE; use $0 -y to actually start the" -msgstr " i contenuti del dispositivo $INSTALL_DEVICE; usa $0 -y per avviare" -#: mambabase.sh:39 -msgid " operation." -msgstr " l'operazione." -#: mambabase.sh:49 -msgid "" -"openmamba installation script - version $VERSION\n" -"Copyright (c) 2007-2008 by Silvan Calarco \n" -msgstr "" -"Script di installazione di openmamba - versione $VERSION\n" -"Copyright (c) 2007-2008 by Silvan Calarco \n" -#: mambabase.sh:55 -msgid "Starting installation..." -msgstr "Avvio dell'installazione..." -#: mambabase.sh:58 -msgid "Error: cannot read input file $INPUT_FILE; aborting." -msgstr "Errore: impossibile leggere il file $INPUT_FILE; uscita." -#: mambabase.sh:85 -msgid "Installing openmamba base packages" -msgstr "Installazione dei pacchetti base di openmamba" -#: mambabase.sh:86 -msgid "Updating packages list..." -msgstr "Aggiornamento della lista dei pacchetti..." -#: mambabase.sh:89 -msgid "Removing packages that are no longer needed..." -msgstr "Rimozione dei pacchetti non più necessari..." -#: mambabase.sh:99 -msgid "Installing/updating openmamba base packages..." -msgstr "Installazione/aggiornamento dei pacchetti base di openmamba..." -#: mambabase.sh:104 -msgid "Updating installed packages" -msgstr "Aggiornamento dei pacchetti installati" -#: mambabase.sh:105 -msgid "Updating installed packages..." -msgstr "Aggiornamento dei pacchetti installati..." -#: mambabase.sh:110 -msgid "Installing Office packages" -msgstr "Installazione dei programmi per l'ufficio" -#: mambabase.sh:111 -msgid "Installing/updating Office packages..." -msgstr "Installazione/aggiornamento dei programmi per l'ufficio..." -#: mambabase.sh:122 -msgid "Installing Audio and Video players" -msgstr "Installazione dei riproduttori audio e video" -#: mambabase.sh:123 -msgid "Installing/updating Audio and Video players..." -msgstr "Installazione/aggiornamento dei riproduttori audio e video..." -#: mambabase.sh:116 -msgid "Installing multimedia editing and production packages" -msgstr "Installazione dei programmi per l'editing e il montaggio audio e video" -#: mambabase.sh:117 -msgid "Installing/updating multimedia editing and production packages..." -msgstr "Installazione/aggiornamento dei programmi per l'editing e il montattio audio e video..." -#: mambabase.sh:134 -msgid "Installing Internet packages" -msgstr "Installazione dei pacchetti per internet" -#: mambabase.sh:135 -msgid "Installing/updating Internet packages..." -msgstr "Installazione/aggiornamento dei programmi per internet..." -#: mambabase.sh:140 -msgid "Installing Graphics packages" -msgstr "Installazione dei programmi di grafica" -#: mambabase.sh:141 -msgid "Installing/updating Graphics packages..." -msgstr "Installazione/aggiornamento dei programmi di grafica..." -#: mambabase.sh:146 -msgid "Installing Games packages" -msgstr "Installazione dei giochi" -#: mambabase.sh:147 -msgid "Installing/updating Games packages..." -msgstr "Installazione/aggiornamento dei giochi..." -#: mambabase.sh:152 -msgid "Installing Virtualization packages" -msgstr "Installazione dei programmi per la virtualizzazione" -#: mambabase.sh:153 -msgid "Installing/updating Virtualization packages..." -msgstr "Installazione/aggironamento dei programmi per la virtualizzazione..." -#: mambabase.sh:128 -msgid "Installing Server packages" -msgstr "Installazione dei pacchetti per server di rete" -#: mambabase.sh:129 -msgid "Installing/updating Server packages..." -msgstr "Installazione/aggiornamento dei pacchetti per server di rete..." -#: mambabase.sh:158 -msgid "Installing openmamba Development packages" -msgstr "Installazione dei pacchetti per lo sviluppo" -#: mambabase.sh:159 -msgid "Installing/updating openmamba Development packages..." -msgstr "Installazione/aggiornamento dei pacchetti per lo sviluppo..." -#: mambabase.sh:164 -msgid "Installing flash plugin" -msgstr "Installazione del plugin flash" -#: mambabase.sh:165 -msgid "Installing Flash plugin..." -msgstr "Installazione del plugin flash..." -#: mambabase.sh:167 -msgid "Executing nspluginscan" -msgstr "Eseguo nspluginscan" -#: mambabase.sh:170 -msgid "Removing gnash" -msgstr "Rimozione di gnash" -#: mambabase.sh:176 -msgid "Installing win32 codecs" -msgstr "Installazione dei codec win32" -#: mambabase.sh:177 -msgid "Installing Win32 codecs..." -msgstr "Installazione dei codec win32..." -#: mambabase.sh:182 -msgid "Installing MS TrueType core fonts..." -msgstr "Installazione dei font MS TrueType..." -#: mambabase.sh:187 -msgid "Installing Sun Java Developers Kit..." -msgstr "Installazione del Sun Java Developers Kit" -#: mambabase.sh:191 -msgid "Installing Sun Java Runtime Environment..." -msgstr "Installazione del Sun Java Runtime Environment..." -#: mambabase.sh:197 -msgid "Press next to see the installation log and exit." -msgstr "Premi Successivo per vedere il log dell'installazione ed uscire." diff --git a/openmamba-update/openmamba-netsrpms b/openmamba-update/openmamba-netsrpms index 1d471a8..b990eb6 100755 --- a/openmamba-update/openmamba-netsrpms +++ b/openmamba-update/openmamba-netsrpms @@ -149,8 +149,16 @@ for pckname in $PACKAGES; do fi done -if [ "$CHECK_MODE" -a "$UPDATE_NEEDED" ]; then - echo $"Update needed." - exit 1 +if [ "$CHECK_MODE" ]; then + if [ "$UPDATE_NEEDED" ]; then + echo $"Update needed." + exit 1 + fi + rpm -q $pckname > /dev/null + if [ $? -eq 1 ]; then + echo $"Not installed." + exit 2 + fi fi + exit 0