Add separator in simplified menu

2 files changed, 11 insertions, 8 deletions

diff --git a/desktop-common-data.spec b/desktop-common-data.spec
index 6104d87..2b3b275 100644
--- a/desktop-common-data.spec
+++ b/desktop-common-data.spec
@@ -1,7 +1,7 @@
 Summary:	Desktop common files 
 Name:		desktop-common-data
 Version:	10.3.1
-Release: 	5mdk
+Release: 	6mdk
 License:	GPL
 URL:		http://www.mandrivalinux.com/
 Group:		System/Configuration/Other
@@ -171,6 +171,9 @@ rm -fr %buildroot
 
 
 %changelog
+* Thu Sep 08 2005 Laurent MONTEL <lmontel@mandriva.com> 10.3.1-6mdk
+- Add separator in simplified menu
+
 * Mon Aug 29 2005 Frederic Crozat <fcrozat@mandriva.com> 10.3.1-5mdk 
 - Fix default directories script when no translation is available
 
diff --git a/menu/menu-simplified b/menu/menu-simplified
index 1a99ee0..f40a15f 100644
--- a/menu/menu-simplified
+++ b/menu/menu-simplified
@@ -1,21 +1,21 @@
-?package(menu): needs=x11 section="/" title="Use Office Tools" icon="office_section.png" order="_mergemenu_,Create a Text Document,Create a Spreadsheet,Create a Presentation,Create a Drawing,kivio,Design a Layout,kontact-kaddressbook,kdeprintfax,kfax,kpilot,kcalc,kdict,_mergefile_,Use More Office Tools,_separator_,Other"
+?package(menu): needs=x11 section="/" title="Use Office Tools" icon="office_section.png" order="_mergemenu_,Create a Text Document,Create a Spreadsheet,Create a Presentation,Create a Drawing,kivio,Design a Layout,kontact-kaddressbook,kdeprintfax,kfax,kpilot,kcalc,kdict,_mergefile_,_separator_,Use More Office Tools,_separator_,Other"
 ?package(menu): needs=x11 section="Use Office Tools" title="Use More Office Tools" icon="office_section.png" order="Wordprocessors,Spreadsheets,Presentations,Drawing,Graphs,Publishing,Tasks Management,Time Management,Address Books,Communications,Accessories,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="/" title="Organize" icon="timemanagement_section.png" order="_mergemenu_,kontact-knotes,kontact-korganizer,kontact-korganizer-time,karm,Manage Projects,Manage Your Finances,_mergefile_"
+?package(menu): needs=x11 section="/" title="Organize" icon="timemanagement_section.png" order="_mergemenu_,kontact-knotes,kontact-korganizer,kontact-korganizer-time,karm,Manage Projects,Manage Your Finances,_mergefile_,_separator_,Use More Productivity Tools,_separator_,Other"
 ?package(menu): needs=x11 section="Organize" title="Use More Productivity Tools" icon="timemanagement_section.png"
 ?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Finances" icon="finances_section.png"
 ?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,kontact-KMail,kopete,kontact-KNode,Organize a Video Conference,kphone,quanta,kbear,Kppp,_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_" excludefiles="Mandrakelinux-Internet-InstantMessaging-kopete.desktop"
-?package(menu): needs=x11 section="/" title="Enjoy Music and Video" icon="multimedia_section.png" order="_mergemenu_,kmix,kscd,amarok,kaudiocreator,Record Sounds,Mix Music,rosegarden,kaffeine,kdenlive,kdetv,_mergefile_,Discover More Entertainment Options,_separator_,Other"
+?package(menu): needs=x11 section="/" title="Surf the Internet" icon="internet_section.png" order="_mergemenu_,konqueror,kontact-KMail,kopete,kontact-KNode,Organize a Video Conference,kphone,quanta,kbear,Kppp,_mergefile_,_separator_,Use More Internet Software,_separator_,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_" excludefiles="Mandrakelinux-Internet-InstantMessaging-kopete.desktop"
+?package(menu): needs=x11 section="/" title="Enjoy Music and Video" icon="multimedia_section.png" order="_mergemenu_,kmix,kscd,amarok,kaudiocreator,Record Sounds,Mix Music,rosegarden,kaffeine,kdenlive,kdetv,_mergefile_,_separator_,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"  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_,kuickshow,Edit Images and Photos,kooka,digikam,ksnapshot,_mergefile_,Use More Image Editing Tools,_separator_,Other"
+?package(menu): needs=x11 section="/" title="View, Modify and Create Graphics" icon="graphics_section.png" order="_mergemenu_,kuickshow,Edit Images and Photos,kooka,digikam,ksnapshot,_mergefile_,_separator_,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"
 ?package(menu): needs=x11 section="/" title="Play Games" icon="amusement_section.png" order="_mergemenu_,Frozen-Bubble,ArmageTron,Cannon Smash,Chromium,LBreakout 2,Tuxracer,Crack Attack! - Solo,_mergefile_,Play More Games,_separator_,Other"
 ?package(menu): needs=x11 section="Play Games" title="Play More Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="/" title="Administer Your System" icon="configuration_section.png" order="_mergemenu_,KControl,Configure Your Computer,kdepasswd,k3b,Backup Your Data,ark,KFloppy,konsole,_mergefile_,Use More Administration Tools,_separator_,Other"
+?package(menu): needs=x11 section="/" title="Administer Your System" icon="configuration_section.png" order="_mergemenu_,KControl,Configure Your Computer,kdepasswd,k3b,Backup Your Data,ark,KFloppy,konsole,_mergefile_,_separator_,Use More Administration Tools,_separator_,Other"
 ?package(menu): needs=x11 section="Administer Your System" title="Use More Administration Tools" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session,_mergemenu_,_mergefile_"
 ?package(menu): needs=x11 section="Administer Your System/Use More Administration Tools" title="Accessibility" icon="accessibility_section.png" 
 ?package(menu): needs=x11 section="Administer Your System/Use More Administration Tools" title="Communications" icon="communications_section.png"