aboutsummaryrefslogtreecommitdiffstats
path: root/menu
diff options
context:
space:
mode:
authorLaurent Montel <lmontel@mandriva.org>2005-03-09 13:37:27 +0000
committerLaurent Montel <lmontel@mandriva.org>2005-03-09 13:37:27 +0000
commit486becf30a7d063e97993629b6d1adeecdaf1c48 (patch)
tree742759eff6b88b43ca14e93dbad9375e939a0d93 /menu
parent19b0ceee4142547485473dfe3046e76e399b7eb8 (diff)
downloadcommon-data-486becf30a7d063e97993629b6d1adeecdaf1c48.tar
common-data-486becf30a7d063e97993629b6d1adeecdaf1c48.tar.gz
common-data-486becf30a7d063e97993629b6d1adeecdaf1c48.tar.bz2
common-data-486becf30a7d063e97993629b6d1adeecdaf1c48.tar.xz
common-data-486becf30a7d063e97993629b6d1adeecdaf1c48.zip
Remove alias_inline
Diffstat (limited to 'menu')
-rw-r--r--menu/menu2
-rw-r--r--menu/menu-simplified6
2 files changed, 4 insertions, 4 deletions
diff --git a/menu/menu b/menu/menu
index b73e516..34d73b7 100644
--- a/menu/menu
+++ b/menu/menu
@@ -90,7 +90,7 @@
?package(menu): needs=x11 section="More Applications/Education" title="Other" icon="education_other_section.png"
#
?package(menu): needs=x11 section="More Applications" title="Emulators" icon="emulators_section.png"
-?package(menu): needs=x11 section="More Applications" title="Finances" icon="finances_section.png" order="_mergemenu_,Mandrakelinux-MoreApplications-Finances-GnuCash.desktop,Mandrakelinux-MoreApplications-Finances-kmymoney2.desktop,_mergefile"
+?package(menu): needs=x11 section="More Applications" title="Finances" icon="finances_section.png" order="_mergemenu_,Mandrakelinux-MoreApplications-Finances-GnuCash.desktop,Mandrakelinux-MoreApplications-Finances-kmymoney2.desktop,_mergefile_"
#
?package(menu): needs=x11 section="More Applications" title="Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys,_mergemenu_,_mergefile_"
?package(menu): needs=x11 section="More Applications/Games" title="Adventure" icon="adventure_section.png"
diff --git a/menu/menu-simplified b/menu/menu-simplified
index a48d265..7d657ca 100644
--- a/menu/menu-simplified
+++ b/menu/menu-simplified
@@ -6,10 +6,10 @@
?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Tasks Management" icon="taskmanagement_section.png"
?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Time Management" icon="timemanagement_section.png"
?package(menu): needs=x11 section="/" title="Surf the Internet" icon="internet_section.png" order="_mergemenu_,konqueror.desktop,kontact-KMail.desktop,kopete.desktop,kontact-KNode.desktop,-Organize a Video Conference.desktop,kphone.desktop,quanta.desktop,kbear.desktop,Kppp.desktop,_mergefile_,Use More Internet Software,Use More Connectivity Utilities,_separator_,Other"
-?package(menu): needs=x11 section="Surf the Internet" title="Use More Connectivity Utilities" icon="internet_section.png" order="Remote Access,Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,_separator,,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Surf the Internet" title="Use More Connectivity Utilities" icon="internet_section.png" order="Remote Access,Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,_separator,,Other,_mergemenu_,_mergefile_" excludefiles="Mandrakelinux-Internet-InstantMessaging-kopete.desktop"
?package(menu): needs=x11 section="/" title="Enjoy Music and Video" icon="multimedia_section.png" order="_mergemenu_,Mandrakelinux-EnjoyMusicandVideo-kmix.desktop,Mandrakelinux-EnjoyMusicandVideo-kscd.desktop,Mandrakelinux-EnjoyMusicandVideo-amarok.desktop,Mandrakelinux-EnjoyMusicandVideo-kaudiocreator.desktop,Mandrakelinux-EnjoyMusicandVideo-Record Sounds.desktop,Mandrakelinux-EnjoyMusicandVideo-Mix Music.desktop,Mandrakelinux-EnjoyMusicandVideo-rosegarden.desktop,Mandrakelinux-EnjoyMusicandVideo-kaffeine.desktop,Mandrakelinux-EnjoyMusicandVideo-kdenlive.desktop,Mandrakelinux-EnjoyMusicandVideo-kdetv.desktop,_mergefile_,Discover More Entertainment Options,_separator_,Other"
-?package(menu): needs=x11 section="Enjoy Music and Video" title="Discover More Entertainment Options" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Sound" icon="sound_section.png"
+?package(menu): needs=x11 section="Enjoy Music and Video" title="Discover More Entertainment Options" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Sound" icon="sound_section.png" excludefiles="Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kmix.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kscd.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-Totem Media Player.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kaudiocreator.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-Audacity.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-amarok.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-rosegarden.desktop"
?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Video" icon="video_section.png"
?package(menu): needs=x11 section="/" title="View, Modify and Create Graphics" icon="graphics_section.png" order="_mergemenu_,Mandrakelinux-View,ModifyandCreateGraphics-kuickshow.desktop,Mandrakelinux-View,ModifyandCreateGraphics-Edit Images and Photos.desktop,Mandrakelinux-View,ModifyandCreateGraphics-kooka.desktop,Mandrakelinux-View,ModifyandCreateGraphics-digikam.desktop,Mandrakelinux-View,ModifyandCreateGraphics-ksnapshot.desktop,_mergefile_,Use More Image Editing Tools,_separator_,Other"
?package(menu): needs=x11 section="View, Modify and Create Graphics" title="Use More Image Editing Tools" icon="graphics_section.png"