Various fix for simplified menu (fix typos, icons, remove duplicate entries with

kdebase, etc.)

1 files changed, 49 insertions, 18 deletions

diff --git a/menu/mandrake_desk b/menu/mandrake_desk
index 8ad2516..d6474b4 100644
--- a/menu/mandrake_desk
+++ b/menu/mandrake_desk
@@ -1,11 +1,13 @@
 ## Administer your system
 # Configure sound settings
 ?package(kdemultimedia): needs="kde" kde_filename="kmix" section="Administer your system" title="Configure sound settings" icon="kmix.png" command="kmix" kde_command="kmix -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kmix;\\nProtocols=\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nExtensions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
 ?package(gmix): needs="gnome" section="Administer your system" title="Configure sound settings" command="/usr/bin/gmix" icon="gmix.xpm"
 
 
 # Configure KDE/GNOME
 ?package(gnome-control-center): command="/usr/bin/gnomecc" icon="/usr/share/pixmaps/control-center.png" title="Configure Gnome" needs="gnome" section="Administer your system"
+
 ?package(kdebase): needs="kde" kde_filename="KControl" section="Administer your system" title="Configure KDE" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true"
 
 
@@ -19,11 +21,13 @@
 
 # Format a floppy
 ?package(gnome-utils): needs="gnome" section="Administer your system" title="Format a floppy" command="/usr/bin/gfloppy" icon="gfloppy.xpm"
+
 ?package(kdeutils): needs="kde" kde_filename="KFloppy" section="Administer your system" title="Format a floppy" icon="kfloppy.png" command="kfloppy" kde_command="kfloppy -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kfloppy;\\nProtocols=\\nDocPath=kfloppy/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 
 # File manager
 ?package(kdebase): needs="kde" kde_filename="Home" section="Administer your system" title="Manage your files" icon="folder_home.png" command="kfmclient openProfile filemanagement" kde_opt="\\nTerminal=0"
+
 ?package(nautilus):command="/usr/bin/nautilus --no-desktop" needs="gnome" section="Administer your system" title="Manage your files" icon="nautilus.xpm"
 
 
@@ -31,7 +35,6 @@
 ?package(kdeutils): needs="x11" kde_filename="kdepasswd" section="Administer your system" title="Change your password" icon="password.png" command="kdepasswd" kde_opt="\\nTerminalOptions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 
-
 # Printer admin
 ?package(qtcups): needs="kde" section="Administer your system" title="Configure your printer(s)" command="/usr/bin/qtcups -j none" icon="/usr/share/icons/locolor/16x16/apps/qtcups.png"
 ?package(xpp): needs="gnome" section="Administer your system" title="Configure your printer(s)" command="xpp" icon="/usr/share/icons/locolor/16x16/apps/xpp.png"
@@ -57,11 +60,15 @@
 
 ## Locate a file
 ?package(gnome-utils):needs="gnome" section="/" title="Find files" command="/usr/bin/gsearchtool" icon="gnome-searchtool.xpm"
+
 ?package(kdeutils): needs="kde" kde_filename="Kfind" section="/" title="Find files" icon="kfind.png" command="kfind" kde_command="kfind -caption \"%c\" %i %m %f" multiple_files="false" accept_url="false" kde_opt="\\nBinaryPattern=kfind;\\nProtocols=file;\\nDocPath=kfind/index.html\\nTerminalOptions=\\nPath=\\nExtensions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
+
+
 ## Entertain yourself
 # Listen to a CD
 ?package(gnome-media):needs="gnome" command="/usr/bin/gtcd" section="Entertain yourself" title="Listen to a CD" icon="/usr/share/pixmaps/gtcd.png"
+
 ?package(kdemultimedia): needs="kde" kde_filename="kscd" section="Entertain yourself" title="Listen to a CD" icon="kscd.png" command="kscd" kde_command="kscd -caption \"%c\" %i %m" kde_opt="\\nBinaryPattern=kscd;\\nProtocols=\\nDocPath=kscd/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 
@@ -70,22 +77,22 @@
 
 
 # Rip cd
-?package(grip):command="/usr/bin/grip" icon="grip.png" title="Rip a CDs" needs="x11" section="Entertain yourself"
+?package(grip):command="/usr/bin/grip" icon="grip.png" title="Rip a CD" needs="x11" section="Entertain yourself"
 
 
 # Watch videos
 ?package(xmovie): needs="x11" icon="xmovie.xpm" section="Entertain yourself" title="Watch videos" kde_opt="InitialPreference=10" mimetypes="video/x-msvideo;video/quicktime;video/x-flic;video/mpeg;video/x-mpeg" command="/usr/X11R6/bin/xmovie"
 
+
 # Watch TV
 ?package(xawtv): command="XawTV" icon="xawtv.png" section="Entertain yourself" title="Watch TV" needs="x11"
 
+
 # Listen to music files
 ?package(xmms): needs="x11" section="Entertain yourself" title="Listen to musicfiles"  command="soundwrapper xmms" mimetypes="video/mpeg;audio/x-mp3;audio/x-ogg;audio/x-mpegurl;audio/x-wav" icon="xmms.xpm"
 
 
 
-
-
 ## Play a game
 # armagetron
 ?package(armagetron):command="/usr/games/armagetron" icon="armagetron.xpm" needs="x11" section="Play a game" title="Play ArmageTron, a 3D lightcycle game"
@@ -100,7 +107,7 @@
 ?package(csmash):command="/usr/bin/csmash" icon="csmash.png" needs="x11" section="Play a game" title="Play Cannon Smash, a 3D tabletennis game"
 
 # freeciv
-?package(freeciv):needs="x11" section="Play a game" title="Play Freeciv, the Free Civilization Clone" command="/usr/games/civclient" icon="freeciv-client.xpm"
+?package(freeciv):needs="x11" section="Play a game" title="Play Freeciv, the free Civilization clone" command="/usr/games/civclient" icon="freeciv-client.xpm"
 
 ?package(freeciv):needs="text" section="Play a game" title="Start Freeciv server" command="/usr/games/civserver" icon="freeciv-server.xpm"
 
@@ -116,6 +123,7 @@
 
 ?package(gnome-games): title="Play solitaire" command="/usr/bin/sol" icon="gnome-aisleriot.xpm" needs="gnome" section="Play a game"
 
+
 # kdegames
 ?package(kdegames): needs="kde" kde_filename="kabalone" section="Play a game" title="Play Abalone" icon="kabalone.png" command="kabalone" kde_command="kabalone %i %m -caption \"%c\"" kde_opt="\\nDocPath=kabalone/index.html\\nKDE-X-StartupNotify=true"
 
@@ -137,41 +145,50 @@
 # Maelstrom
 ?package(Maelstrom):command="/usr/bin/Maelstrom" title="Play Maelstrom, an asteroids game" needs="x11" icon="Maelstrom.png" section="Play a game"
 
+
 #TuxRacer
 ?package(tuxracer):command="tuxracer" icon="tuxracer.xpm" needs="x11" section="Play a game" title="Play Tuxracer, a great racing game starring Tux"
 
+
 #Pingus
 ?package(pingus):command="Pingus" icon="pingus.png" needs="x11" section="Play a game" title="Play Pingus, a Lemmings clone"
 
 
+
 ## Use the Internet
 # HTML Editor
 ?package(mozilla):icon="mozilla.xpm" needs="gnome" section="Use the Internet" title="Create Web pages" command="NO_XALF /usr/bin/mozilla --editor"
+
 ?package(quanta): needs="kde" kde_filename="quanta" section="Use the Internet" title="Create Web pages" icon="quanta.png" command="quanta" mimetypes="text/html" kde_opt=""
 
 
 # Mail client
 ?package(evolution):command="evolution" icon="evolution.png" needs="gnome" section="Use the Internet" title="Read and send mail"
+
 ?package(kdenetwork): needs="kde" kde_filename="KMail" section="Use the Internet" title="Read and send mail" icon="kmail.png" command="kmail" kde_command="kmail -caption \"%c\" %i %m" kde_opt="\\nDocPath=kmail/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
 
 # Web browser
 ?package(webclient): command="/usr/bin/webclient-gnome" icon="networking_www_section.png" needs="gnome" section="Use the Internet" title="Browse the Web"
+
 ?package(webclient): command="/usr/bin/webclient-kde" icon="networking_www_section.png" needs="kde" section="Use the Internet" title="Browse the Web"
-#needed for konqueror
-?package(kdebase): needs="kde" kde_filename="kfmclient_html" section="Use the Internet" title="Konqueror" icon="konqueror.png" command="kfmclient openURL %u text/html" mimetypes="text/html" kde_opt="\\nTerminal=0\\nInitialPreference=9\\nNoDisplay=true"
 
 
 # Newsgroups
 ?package(kdenetwork): needs="kde" kde_filename="KNode" section="Use the Internet" title="Access Newsgroups" icon="knode.png" command="knode" kde_command="knode -caption \"%c\" %i %m" kde_opt="\\nDocPath=knode/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
 ?package(pan):command="/usr/bin/pan" needs="gnome" icon="pan.png" section="Use the Internet" title="Access Newsgroups"
 
+
 # Connect to the Internet
 ?package(gnome-network): title="Connect to the Internet" command="/usr/bin/gnome-ppp" icon="gnome-networktool.xpm" needs="gnome" section="Use the Internet"
+
 ?package(kdenetwork): needs="x11" kde_filename="Kppp" section="Use the Internet" title="Connect to the Internet" icon="kppp.png" command="kppp" kde_command="kppp %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kppp;\\nProtocols=\\nDocPath=kppp/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
+
 # Dialog on IRC
 ?package(kdenetwork): needs="kde" kde_filename="ksirc" section="Use the Internet" title="Dialog on IRC" icon="ksirc.png" command="ksirc" kde_command="ksirc %i %m" mimetypes="" kde_opt="\\nSwallowExec=\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nMapNotify=true"
+
 ?package(xchat):needs="gnome" section="Use the Internet" title="Dialog on IRC" command="xchat" icon="xchat.xpm"
 
 
@@ -181,8 +198,11 @@
 
 # AOL
 ?package(gaim):command="gaim" icon="gaim.xpm" title="Dialog using an AOL instant messager client" needs="gnome" section="Use the Internet"
+
 ?package(kdenetwork): needs="kde" kde_filename="kit" section="Use the Internet" title="Dialog using an AOL instant messager client" icon="kit.png" command="kit" mimetypes="" kde_opt="\\nBinaryPattern=kit;\\nProtocols=\\nDocPath=kit/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
+
+
 ## Read documentation
 # gnome-core
 ?package(gnome-core): command="/usr/bin/gnome-help-browser" icon="/usr/share/pixmaps/gnome-help.png" title="Read Gnome documentation" needs=gnome section="Read documentation"
@@ -221,19 +241,19 @@
 
 ?package(howto-html-sv): command="sh -c '$BROWSER  /usr/share/doc/HOWTO/HTML/sv/index.html'" icon="documentation_section.png" needs="x11" title="Read Howtos in Swedish" section="Read documentation"
 
-?package(howto-html-zh): command="sh -c '$BROWSER /usr/share/doc/HOWTO/HTML/sl/index.html'" icon="documentation_section.png" needs="x11" title="Howtos in Chinese" section="Read documentation"
+?package(howto-html-zh): command="sh -c '$BROWSER /usr/share/doc/HOWTO/HTML/sl/index.html'" icon="documentation_section.png" needs="x11" title="Read Howtos in Chinese" section="Read documentation"
 
 
 # Mandrake documentation
-?package(mandrake_doc-de): command="sh -c '$BROWSER /usr/share/doc/mandrake/de/index.html'" icon="mandrake-doc-de.xpm" needs="x11" title="Mandrake documentation in german" section="Read documentation"
+?package(mandrake_doc-de): command="sh -c '$BROWSER /usr/share/doc/mandrake/de/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in german" section="Read documentation"
 
-?package(mandrake_doc-en): command="sh -c '$BROWSER /usr/share/doc/mandrake/en/index.html'" icon="mandrake-doc-en.xpm" needs="x11" title="Mandrake documentation in english" section="Read documentation"
+?package(mandrake_doc-en): command="sh -c '$BROWSER /usr/share/doc/mandrake/en/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in english" section="Read documentation"
 
-?package(mandrake_doc-es): command="sh -c '$BROWSER /usr/share/doc/mandrake/es/index.html'" icon="mandrake-doc-es.xpm" needs="x11" title="Mandrake documentation in spanish" section="Read documentation"
+?package(mandrake_doc-es): command="sh -c '$BROWSER /usr/share/doc/mandrake/es/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in spanish" section="Read documentation"
 
-?package(mandrake_doc-fr): command="sh -c '$BROWSER /usr/share/doc/mandrake/fr/index.html'" icon="mandrake-doc-fr.xpm" needs="x11" title="Mandrake documentation in french" section="Read documentation"
+?package(mandrake_doc-fr): command="sh -c '$BROWSER /usr/share/doc/mandrake/fr/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in french" section="Read documentation"
 
-?package(mandrake_doc-it): command="sh -c '$BROWSER /usr/share/doc/mandrake/it/index.html'" icon="mandrake-doc-it.xpm" needs="x11" title="Mandrake documentation in italian" section="Read documentation"
+?package(mandrake_doc-it): command="sh -c '$BROWSER /usr/share/doc/mandrake/it/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in italian" section="Read documentation"
 
 
 # kdebase
@@ -242,38 +262,46 @@
 ?package(kdebase): needs="kde" kde_filename="ktip" section="Read documentation" title="Read KDE tips" icon="ktip.png" command="ktip" kde_opt="\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-KDE-autostart-after=kdesktop\\nX-KDE-autostart-condition=kdewizardrc:General:TipsOnStart:false"
 
 
+
 ## Use office tools
 # Text processor
 ?package(abiword): command="/usr/bin/abiword" section="Use office tools" icon="abiword.png" needs="gnome" title="Create a text document"
+
 ?package(koffice): needs="kde" kde_filename="kword" section="Use office tools" title="Create a text document" icon="kword.png" command="kword" mimetypes="application/x-kword" kde_opt="\\nX-KDE-Library=libkwordpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,text/plain,application/x-kword-crypt\\nX-KDE-NativeMimeType=application/x-kword\\nDocPath=kword/index.html\\nKDE-X-StartupNotify=true"
 
+
 # Spreadsheets
 ?package(gnumeric): command="/usr/bin/gnumeric" needs="gnome" icon="gnumeric.png" section="Use office tools" title="Create spreadsheets using Gnumeric"
+
 ?package(koffice): needs="kde" kde_filename="kspread" section="Use office tools" title="Create spreadsheets" icon="kspread.png" command="kspread" mimetypes="application/x-kspread" kde_opt="\\nX-KDE-Library=libkspreadpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart,text/x-csv,application/x-kspread-crypt,application/x-quattropro\\nX-KDE-NativeMimeType=application/x-kspread\\nX-DCOP-ServiceType=multi\\nDocPath=kspread/index.html\\nKDE-X-StartupNotify=true"
 
 
 # Diagrams
 ?package(dia): needs="gnome" section="Use office tools" title="Create flowcharts and diagrams" command="/usr/bin/dia" icon="dia.xpm"
+
 ?package(koffice): needs="kde" kde_filename="kivio" section="Use office tools" title="Create flowcharts and diagrams" icon="kivio.png" command="kivio" mimetypes="application/x-kivio" kde_opt="\\nX-KDE-Library=libkiviopart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kivio"
 
+
 #presentation
 ?package(koffice): needs="x11" kde_filename="kpresenter" section="Use office tools" title="Create a presentation" icon="kpresenter.png" command="kpresenter" mimetypes="application/x-kpresenter" kde_opt="\\nX-KDE-Library=libkpresenterpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kpresenter\\nX-DCOP-ServiceType=multi\\nDocPath=kpresenter/index.html\\nKDE-X-StartupNotify=true"
 
 
 # Fax 
 ?package(kdebase): needs="kde" kde_filename="kdeprintfax" section="Use office tools" title="Send a fax" icon="kdeprintfax.png" command="kdeprintfax %u" kde_command="kdeprintfax -caption \"%c\" %i %m %u" kde_opt="\\nMiniIcon=kdeprintfax\\nTerminal=0"
+
 ?package(gfax): needs="kde" kde_filename="kdeprintfax" section="Use office tools" title="Send a fax" icon="kdeprintfax.png" command="kdeprintfax %u" kde_command="kdeprintfax -caption \"%c\" %i %m %u" kde_opt="\\nMiniIcon=kdeprintfax\\nTerminal=0"
 
+
 # StarOffice
-?package(staroffice-de): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-de): title="Make your office work using StarOffice" icon="so52.xpm" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
-?package(staroffice-en): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-en): title="Make your office work using StarOffice" icon="so52.xpm" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
-?package(staroffice-es): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-es): title="Make your office work using StarOffice" icon="so52.xpm" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
 ?package(staroffice-fr): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
-?package(staroffice-it): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-it): title="Make your office work using StarOffice" icon="so52.xpm" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
 
 ## View, modify or create a picture
@@ -283,14 +311,17 @@
 
 # Take a screenshot
 ?package(kdegraphics): needs="kde" kde_filename="ksnapshot" section="View, modify or create a picture" title="Take a screenshot" icon="ksnapshot.png" command="ksnapshot" kde_command="ksnapshot %i %m" mimetypes="" kde_opt="\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nDocPath=ksnapshot/index.html\\nKDE-X-StartupNotify=true"
+
 ?package(gnome-core): needs="gnome" section="View, modify or create a picture" title="Take a screenshot" icon="ksnapshot.png" command="gnome-panel-screenshot"
 
 # Image acquisition
-?package(kdegraphics): needs="gnome" section="View, modify or create a picture" title="Acquire images using a scanner" icon="/usr/share/icons/hicolor/48x48/devices/scanner.png" command="kooka" multiple_files="true" accept_url="true" 
+?package(kdegraphics): needs="gnome" section="View, modify or create a picture" title="Acquire images using a scanner" icon="/usr/share/icons/hicolor/48x48/devices/scanner.png" command="kooka" multiple_files="true" accept_url="true"
+
 ?package(kdegraphics): needs="kde" kde_filename="kooka" section="View, modify or create a picture" title="Acquire images using a scanner" icon="scanner.png" command="kooka" kde_command="kooka %i %m %U" multiple_files="true" accept_url="true" kde_opt="\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kooka\\nDocPath=kooka/kooka.html"
 
 
 # Koffice
 ?package(koffice): needs="x11" kde_filename="kontour" section="View, modify or create a picture" title="Create vector based draws" icon="kontour.png" command="kontour" mimetypes="application/x-kontour" kde_opt="\\nX-KDE-Library=libkontourpart\\nServiceTypes=KOfficePart,KParts/ReadOnlyPart,KParts/ReadWritePart\\nX-KDE-NativeMimeType=application/x-kontour\\nDocPath=kontour/index.html\\nKDE-X-StartupNotify=true"
+
 ?package(sodipodi): needs="gnome" icon="sodipodi.xpm" section="View, modify or create a picture" title="Create vector based draws" command="/usr/bin/sodipodi"