aboutsummaryrefslogtreecommitdiffstats
path: root/trunk/menu
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@mandriva.com>2007-02-16 16:52:58 +0000
committerFrederic Crozat <fcrozat@mandriva.com>2007-02-16 16:52:58 +0000
commitc81e0a28703b568505589d6a181a873a123eba1e (patch)
tree9f55102b1aea175da2a2a6f4a285d00da11c1476 /trunk/menu
parent7f9e5c6b8e373556589b466f5699c0cb343f694d (diff)
parentf819db26866e2c85075f19b354a01fa8396d63de (diff)
downloadcommon-data-2007_1_1mdv.tar
common-data-2007_1_1mdv.tar.gz
common-data-2007_1_1mdv.tar.bz2
common-data-2007_1_1mdv.tar.xz
common-data-2007_1_1mdv.zip
V2007_1_1mdvV2007_1_1mdv
Diffstat (limited to 'trunk/menu')
-rw-r--r--trunk/menu/applications-discovery.menu243
-rw-r--r--trunk/menu/applications-mdk.menu1606
-rw-r--r--trunk/menu/defaultlayout-simplified.menu22
-rw-r--r--trunk/menu/defaultlayout.menu13
-rw-r--r--trunk/menu/desktop-common-data255
-rw-r--r--trunk/menu/desktop-directories/mandriva-hidden.directory.in7
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-chat.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-filetransfer.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-mail.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-news.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-videoconference.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet-webeditors.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-internet.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-communications.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-databases.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-development.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-editors.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-education.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-finances.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-games.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-moreapplications.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-multimedia-graphics.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-multimedia-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-multimedia-sound.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-multimedia-video.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-multimedia.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-networking.directory.in4
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-accessories.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-addressbooks.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-communications-fax.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-communications-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-communications-pda.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-communications-phone.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-communications.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-drawing.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-graphs.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-presentations.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-publishing.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-spreadsheets.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-timemanagement.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office-wordprocessors.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-office.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-archiving-backup.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-archiving-compression.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-archiving-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-archiving.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in6
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-kde.directory.in6
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-networking.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-other.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration-printing.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-configuration.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-filetools.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-monitoring.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-terminals.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system-texttools.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandriva-system.directory.in5
-rw-r--r--trunk/menu/desktop-directories/mandrivalinux.directory.in5
-rw-r--r--trunk/menu/icons/accessibility_section.pngbin2505 -> 0 bytes
-rw-r--r--trunk/menu/icons/addressbook_section.pngbin1921 -> 0 bytes
-rw-r--r--trunk/menu/icons/adventure_section.pngbin2198 -> 0 bytes
-rw-r--r--trunk/menu/icons/amusement_section.pngbin2150 -> 0 bytes
-rw-r--r--trunk/menu/icons/applications_section.pngbin2026 -> 0 bytes
-rw-r--r--trunk/menu/icons/arcade_section.pngbin2517 -> 0 bytes
-rw-r--r--trunk/menu/icons/archiving_section.pngbin1599 -> 0 bytes
-rw-r--r--trunk/menu/icons/artificial_intelligence_section.pngbin2047 -> 0 bytes
-rw-r--r--trunk/menu/icons/astronomy_section.pngbin1778 -> 0 bytes
-rw-r--r--trunk/menu/icons/backup_section.pngbin1782 -> 0 bytes
-rw-r--r--trunk/menu/icons/biology_section.pngbin2137 -> 0 bytes
-rw-r--r--trunk/menu/icons/boards_section.pngbin1833 -> 0 bytes
-rw-r--r--trunk/menu/icons/boot_init_section.pngbin2567 -> 0 bytes
-rw-r--r--trunk/menu/icons/cards_section.pngbin1805 -> 0 bytes
-rw-r--r--trunk/menu/icons/cd_burning_section.pngbin2318 -> 0 bytes
-rw-r--r--trunk/menu/icons/chat_section.pngbin1903 -> 0 bytes
-rw-r--r--trunk/menu/icons/chemistry_section.pngbin1923 -> 0 bytes
-rw-r--r--trunk/menu/icons/chinese_section.pngbin3150 -> 0 bytes
-rw-r--r--trunk/menu/icons/code_generator_section.pngbin1930 -> 0 bytes
-rw-r--r--trunk/menu/icons/communications_fax_section.pngbin1561 -> 0 bytes
-rw-r--r--trunk/menu/icons/communications_other_section.pngbin2573 -> 0 bytes
-rw-r--r--trunk/menu/icons/communications_phone_section.pngbin1977 -> 0 bytes
-rw-r--r--trunk/menu/icons/communications_section.pngbin2262 -> 0 bytes
-rw-r--r--trunk/menu/icons/compression_section.pngbin1833 -> 0 bytes
-rw-r--r--trunk/menu/icons/computer_science_section.pngbin2432 -> 0 bytes
-rw-r--r--trunk/menu/icons/configuration_section.pngbin2319 -> 0 bytes
-rw-r--r--trunk/menu/icons/data_visualization_section.pngbin2579 -> 0 bytes
-rw-r--r--trunk/menu/icons/databases_section.pngbin1606 -> 0 bytes
-rw-r--r--trunk/menu/icons/development_environment_section.pngbin1835 -> 0 bytes
-rw-r--r--trunk/menu/icons/development_section.pngbin2137 -> 0 bytes
-rw-r--r--trunk/menu/icons/development_tools_section.pngbin1572 -> 0 bytes
-rw-r--r--trunk/menu/icons/documentation_section.pngbin2248 -> 0 bytes
-rw-r--r--trunk/menu/icons/editors_section.pngbin2254 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_economy_section.pngbin2396 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_geography_section.pngbin2463 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_history_section.pngbin2646 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_languages_section.pngbin1991 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_literature_section.pngbin2136 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_mathematics.pngbin1738 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_other_section.pngbin2561 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_sciences.pngbin1864 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_section.pngbin2126 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_sport_section.pngbin2577 -> 0 bytes
-rw-r--r--trunk/menu/icons/education_tool.pngbin2636 -> 0 bytes
-rw-r--r--trunk/menu/icons/electricity_section.pngbin1828 -> 0 bytes
-rw-r--r--trunk/menu/icons/emulators_section.pngbin1936 -> 0 bytes
-rw-r--r--trunk/menu/icons/file_tools_section.pngbin1434 -> 0 bytes
-rw-r--r--trunk/menu/icons/file_transfer_section.pngbin2840 -> 0 bytes
-rw-r--r--trunk/menu/icons/finances_section.pngbin2618 -> 0 bytes
-rw-r--r--trunk/menu/icons/geosciences_section.pngbin3433 -> 0 bytes
-rw-r--r--trunk/menu/icons/gnome_section.pngbin1430 -> 0 bytes
-rw-r--r--trunk/menu/icons/graphics_section.pngbin2300 -> 0 bytes
-rw-r--r--trunk/menu/icons/graphs_section.pngbin2376 -> 0 bytes
-rw-r--r--trunk/menu/icons/hardware_configuration_section.pngbin2299 -> 0 bytes
-rw-r--r--trunk/menu/icons/hardware_section.pngbin1713 -> 0 bytes
-rw-r--r--trunk/menu/icons/image_processing_section.pngbin1957 -> 0 bytes
-rw-r--r--trunk/menu/icons/instant_messaging_section.pngbin2133 -> 0 bytes
-rw-r--r--trunk/menu/icons/internet_section.pngbin2880 -> 0 bytes
-rw-r--r--trunk/menu/icons/interpreters_section.pngbin1729 -> 0 bytes
-rw-r--r--trunk/menu/icons/irc_section.pngbin2419 -> 0 bytes
-rw-r--r--trunk/menu/icons/kde_section.pngbin2480 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/accessibility_section.pngbin4251 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/addressbook_section.pngbin2824 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/adventure_section.pngbin3470 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/amusement_section.pngbin3356 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/applications_section.pngbin3076 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/arcade_section.pngbin4187 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/archiving_section.pngbin2539 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/artificial_intelligence_section.pngbin3327 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/astronomy_section.pngbin2697 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/backup_section.pngbin2985 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/biology_section.pngbin3196 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/boards_section.pngbin2834 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/boot_init_section.pngbin4300 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/cards_section.pngbin2849 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/cd_burning_section.pngbin4022 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/chat_section.pngbin3726 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/chemistry_section.pngbin2761 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/chinese_section.pngbin5501 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/code_generator_section.pngbin3080 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/communications_fax_section.pngbin2607 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/communications_other_section.pngbin4364 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/communications_phone_section.pngbin3366 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/communications_section.pngbin3982 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/compression_section.pngbin2797 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/computer_science_section.pngbin3576 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/configuration_section.pngbin4155 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/data_visualization_section.pngbin4512 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/databases_section.pngbin2619 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/development_environment_section.pngbin2859 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/development_section.pngbin3403 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/development_tools_section.pngbin2360 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/documentation_section.pngbin3698 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/editors_section.pngbin3892 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_economy_section.pngbin3807 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_geography_section.pngbin4309 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_history_section.pngbin4563 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_languages_section.pngbin3087 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_literature_section.pngbin3829 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_mathematics.pngbin2629 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_other_section.pngbin4300 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_sciences.pngbin2929 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_section.pngbin3338 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_sport_section.pngbin4317 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/education_tool.pngbin4468 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/electricity_section.pngbin2931 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/emulators_section.pngbin3053 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/file_tools_section.pngbin2226 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/file_transfer_section.pngbin4868 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/finances_section.pngbin4578 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/geosciences_section.pngbin4835 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/gnome_section.pngbin3108 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/graphics_section.pngbin3755 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/graphs_section.pngbin3791 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/hardware_configuration_section.pngbin3520 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/hardware_section.pngbin2508 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/image_processing_section.pngbin3229 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/instant_messaging_section.pngbin3576 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/internet_section.pngbin4958 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/interpreters_section.pngbin2676 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/irc_section.pngbin4321 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/kde_section.pngbin4225 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/mail_section.pngbin3251 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/mandrake.pngbin2763 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/mathematics_section.pngbin2999 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/monitoring_section.pngbin2687 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/more_applications_other_section.pngbin3714 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/more_applications_section.pngbin3714 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/multimedia_section.pngbin2966 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/networking_configuration_section.pngbin5240 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/networking_section.pngbin3572 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/networking_www_section.pngbin3236 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/news_section.pngbin4177 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/numerical_analysis_section.pngbin3013 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/office_accessories_section.pngbin3795 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/office_drawing_section.pngbin4988 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/office_section.pngbin4538 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/other_amusement.pngbin4541 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/other_archiving.pngbin4029 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/other_configuration.pngbin5052 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/other_networking.pngbin5626 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/other_sciences.pngbin5290 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/packaging_section.pngbin4415 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/parallel_computing_section.pngbin3213 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/pda_section.pngbin2874 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/physics_section.pngbin5098 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/presentation_section.pngbin2091 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/printing_section.pngbin2970 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/publishing_section.pngbin2515 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/puzzle_section.pngbin3022 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/remote_access_section.pngbin3571 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/robotics_section.pngbin2899 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/sciences_section.pngbin4273 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/shells_section.pngbin6596 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/sound_section.pngbin2690 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/sport_section.pngbin3313 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/spreadsheet_section.pngbin1877 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/strategy_section.pngbin784 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/system_other_section.pngbin3768 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/system_section.pngbin3640 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/taskmanagement_section.pngbin3449 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/terminals_section.pngbin2506 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/text_tools_section.pngbin3311 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/timemanagement_section.pngbin3430 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/toys_section.pngbin3333 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/video_conferences_section.pngbin4132 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/video_section.pngbin1476 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/web_browser_section.pngbin2870 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/web_editors_section.pngbin4304 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/windowmanager_section.pngbin1336 -> 0 bytes
-rw-r--r--trunk/menu/icons/large/wordprocessor_section.pngbin3637 -> 0 bytes
-rw-r--r--trunk/menu/icons/mail_section.pngbin1811 -> 0 bytes
-rw-r--r--trunk/menu/icons/mandrake.pngbin2098 -> 0 bytes
-rw-r--r--trunk/menu/icons/mathematics_section.pngbin1796 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/accessibility_section.pngbin798 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/addressbook_section.pngbin992 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/adventure_section.pngbin1552 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/amusement_section.pngbin1279 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/applications_section.pngbin1353 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/arcade_section.pngbin1684 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/archiving_section.pngbin1093 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/artificial_intelligence_section.pngbin883 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/astronomy_section.pngbin1015 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/backup_section.pngbin1223 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/biology_section.pngbin1153 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/boards_section.pngbin1188 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/boot_init_section.pngbin1553 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/cards_section.pngbin1255 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/cd_burning_section.pngbin1463 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/chat_section.pngbin1251 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/chemistry_section.pngbin1322 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/chinese_section.pngbin1584 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/code_generator_section.pngbin1301 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/communications_fax_section.pngbin715 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/communications_other_section.pngbin1437 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/communications_phone_section.pngbin779 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/communications_section.pngbin916 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/compression_section.pngbin1342 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/computer_science_section.pngbin1531 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/configuration_section.pngbin1563 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/data_visualization_section.pngbin1055 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/databases_section.pngbin758 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/development_environment_section.pngbin1478 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/development_section.pngbin1331 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/development_tools_section.pngbin1051 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/documentation_section.pngbin1565 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/editors_section.pngbin793 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_economy_section.pngbin921 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_geography_section.pngbin896 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_history_section.pngbin1009 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_languages_section.pngbin1327 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_literature_section.pngbin758 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_mathematics.pngbin1034 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_other_section.pngbin1437 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_sciences.pngbin1120 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_section.pngbin1251 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_sport_section.pngbin952 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/education_tool.pngbin1396 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/electricity_section.pngbin800 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/emulators_section.pngbin1304 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/file_tools_section.pngbin983 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/file_transfer_section.pngbin1565 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/finances_section.pngbin1049 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/geosciences_section.pngbin1566 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/gnome_section.pngbin668 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/graphics_section.pngbin1328 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/graphs_section.pngbin1387 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/hardware_configuration_section.pngbin1496 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/hardware_section.pngbin1351 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/image_processing_section.pngbin901 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/instant_messaging_section.pngbin1138 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/internet_section.pngbin1620 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/interpreters_section.pngbin1295 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/irc_section.pngbin1412 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/kde_section.pngbin1000 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/mail_section.pngbin1231 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/mandrake.pngbin929 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/mathematics_section.pngbin1213 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/monitoring_section.pngbin1315 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/more_applications_other_section.pngbin1218 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/more_applications_section.pngbin1218 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/multimedia_section.pngbin1010 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/networking_configuration_section.pngbin1507 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/networking_section.pngbin1295 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/networking_www_section.pngbin1249 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/news_section.pngbin1163 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/numerical_analysis_section.pngbin754 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/office_accessories_section.pngbin1263 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/office_drawing_section.pngbin863 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/office_section.pngbin1465 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/other_amusement.pngbin1445 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/other_archiving.pngbin1518 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/other_configuration.pngbin1694 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/other_networking.pngbin1713 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/other_sciences.pngbin1636 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/packaging_section.pngbin1538 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/parallel_computing_section.pngbin928 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/pda_section.pngbin1244 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/physics_section.pngbin1723 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/presentation_section.pngbin867 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/printing_section.pngbin1293 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/publishing_section.pngbin826 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/puzzle_section.pngbin1402 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/remote_access_section.pngbin1230 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/robotics_section.pngbin983 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/sciences_section.pngbin1394 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/shells_section.pngbin1618 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/sound_section.pngbin1042 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/sport_section.pngbin1273 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/spreadsheet_section.pngbin1240 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/strategy_section.pngbin465 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/system_other_section.pngbin1106 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/system_section.pngbin1493 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/taskmanagement_section.pngbin1133 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/terminals_section.pngbin1191 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/text_tools_section.pngbin1304 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/timemanagement_section.pngbin1156 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/toys_section.pngbin1035 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/video_conferences_section.pngbin824 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/video_section.pngbin716 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/web_browser_section.pngbin917 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/web_editors_section.pngbin1014 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/windowmanager_section.pngbin763 -> 0 bytes
-rw-r--r--trunk/menu/icons/mini/wordprocessor_section.pngbin1500 -> 0 bytes
-rw-r--r--trunk/menu/icons/monitoring_section.pngbin1764 -> 0 bytes
-rw-r--r--trunk/menu/icons/more_applications_other_section.pngbin2389 -> 0 bytes
-rw-r--r--trunk/menu/icons/more_applications_section.pngbin2389 -> 0 bytes
-rw-r--r--trunk/menu/icons/multimedia_section.pngbin1871 -> 0 bytes
-rw-r--r--trunk/menu/icons/networking_configuration_section.pngbin2980 -> 0 bytes
-rw-r--r--trunk/menu/icons/networking_section.pngbin2205 -> 0 bytes
-rw-r--r--trunk/menu/icons/networking_www_section.pngbin1829 -> 0 bytes
-rw-r--r--trunk/menu/icons/news_section.pngbin2678 -> 0 bytes
-rw-r--r--trunk/menu/icons/numerical_analysis_section.pngbin1849 -> 0 bytes
-rw-r--r--trunk/menu/icons/office_accessories_section.pngbin2559 -> 0 bytes
-rw-r--r--trunk/menu/icons/office_drawing_section.pngbin2807 -> 0 bytes
-rw-r--r--trunk/menu/icons/office_section.pngbin2862 -> 0 bytes
-rw-r--r--trunk/menu/icons/other_amusement.pngbin2726 -> 0 bytes
-rw-r--r--trunk/menu/icons/other_archiving.pngbin2412 -> 0 bytes
-rw-r--r--trunk/menu/icons/other_configuration.pngbin2888 -> 0 bytes
-rw-r--r--trunk/menu/icons/other_networking.pngbin3229 -> 0 bytes
-rw-r--r--trunk/menu/icons/other_sciences.pngbin3069 -> 0 bytes
-rw-r--r--trunk/menu/icons/packaging_section.pngbin2621 -> 0 bytes
-rw-r--r--trunk/menu/icons/parallel_computing_section.pngbin2087 -> 0 bytes
-rw-r--r--trunk/menu/icons/pda_section.pngbin1957 -> 0 bytes
-rw-r--r--trunk/menu/icons/physics_section.pngbin2840 -> 0 bytes
-rw-r--r--trunk/menu/icons/presentation_section.pngbin1459 -> 0 bytes
-rw-r--r--trunk/menu/icons/printing_section.pngbin1858 -> 0 bytes
-rw-r--r--trunk/menu/icons/publishing_section.pngbin1591 -> 0 bytes
-rw-r--r--trunk/menu/icons/puzzle_section.pngbin1888 -> 0 bytes
-rw-r--r--trunk/menu/icons/remote_access_section.pngbin2166 -> 0 bytes
-rw-r--r--trunk/menu/icons/robotics_section.pngbin2091 -> 0 bytes
-rw-r--r--trunk/menu/icons/sciences_section.pngbin2463 -> 0 bytes
-rw-r--r--trunk/menu/icons/shells_section.pngbin3578 -> 0 bytes
-rw-r--r--trunk/menu/icons/sound_section.pngbin1656 -> 0 bytes
-rw-r--r--trunk/menu/icons/sport_section.pngbin1987 -> 0 bytes
-rw-r--r--trunk/menu/icons/spreadsheet_section.pngbin1275 -> 0 bytes
-rw-r--r--trunk/menu/icons/strategy_section.pngbin659 -> 0 bytes
-rw-r--r--trunk/menu/icons/system_other_section.pngbin2618 -> 0 bytes
-rw-r--r--trunk/menu/icons/system_section.pngbin2259 -> 0 bytes
-rw-r--r--trunk/menu/icons/taskmanagement_section.pngbin2274 -> 0 bytes
-rw-r--r--trunk/menu/icons/terminals_section.pngbin1649 -> 0 bytes
-rw-r--r--trunk/menu/icons/text_tools_section.pngbin2139 -> 0 bytes
-rw-r--r--trunk/menu/icons/timemanagement_section.pngbin1951 -> 0 bytes
-rw-r--r--trunk/menu/icons/toys_section.pngbin2185 -> 0 bytes
-rw-r--r--trunk/menu/icons/video_conferences_section.pngbin2496 -> 0 bytes
-rw-r--r--trunk/menu/icons/video_section.pngbin1104 -> 0 bytes
-rw-r--r--trunk/menu/icons/web_browser_section.pngbin1593 -> 0 bytes
-rw-r--r--trunk/menu/icons/web_editors_section.pngbin2730 -> 0 bytes
-rw-r--r--trunk/menu/icons/windowmanager_section.pngbin995 -> 0 bytes
-rw-r--r--trunk/menu/icons/wordprocessor_section.pngbin2456 -> 0 bytes
-rw-r--r--trunk/menu/mandrake_desk-9.2200
-rw-r--r--trunk/menu/mandriva-discovery.menu147
-rw-r--r--trunk/menu/menu128
-rw-r--r--trunk/menu/menu-simplified31
-rwxr-xr-xtrunk/menu/menustyle.csh17
-rwxr-xr-xtrunk/menu/menustyle.sh15
-rw-r--r--trunk/menu/translate_menus109
-rw-r--r--trunk/menu/translate_menus-simplified98
-rwxr-xr-xtrunk/menu/update-menus48
-rwxr-xr-xtrunk/menu/xdg_menu2216
452 files changed, 0 insertions, 5686 deletions
diff --git a/trunk/menu/applications-discovery.menu b/trunk/menu/applications-discovery.menu
deleted file mode 100644
index 3baaf10..0000000
--- a/trunk/menu/applications-discovery.menu
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
-<Menu>
- <Name>Applications</Name>
- <Layout>
- <Menuname>Games</Menuname>
- <Menuname>Graphics</Menuname>
- <Menuname>Internet</Menuname>
- <Menuname>Multimedia</Menuname>
- <Menuname>Office</Menuname>
- <Menuname>System</Menuname>
- <Menuname>Help</Menuname>
- <Menuname>More Applications</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <DefaultLayout inline="true" inline_limit="1" inline_header="false">
- <Merge type="menus"/>
- <Merge type="files"/>
- </DefaultLayout>
- <DefaultMergeDirs/>
- <KDELegacyDirs/>
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
- <Directory>mandrivalinux.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux</Category>
- <Category>X-MandrivaLinux-Other</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Games</Name>
- <Directory>mandriva-moreapplications-games.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Adventure</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Arcade</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Boards</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Cards</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Puzzles</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Sports</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Strategy</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
- <Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
- <Category>Game</Category>
- <Category>Amusement</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Graphics</Name>
- <Directory>mandriva-multimedia-graphics.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
- <Category>Graphics</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Internet</Name>
- <Directory>mandriva-internet.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet</Category>
- <Category>X-MandrivaLinux-Internet-Chat</Category>
- <Category>X-MandrivaLinux-Internet-FileTransfer</Category>
- <Category>X-MandrivaLinux-Internet-InstantMessaging</Category>
- <Category>X-MandrivaLinux-Internet-Mail</Category>
- <Category>X-MandrivaLinux-Internet-News</Category>
- <Category>X-MandrivaLinux-Internet-VideoConference</Category>
- <Category>X-MandrivaLinux-Internet-Other</Category>
- <Category>X-MandrivaLinux-Internet-RemoteAccess</Category>
- <Category>X-MandrivaLinux-Internet-WebBrowsers</Category>
- <Category>X-MandrivaLinux-Internet-WebEditors</Category>
- <Category>Network</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Multimedia</Name>
- <Layout>
- <Menuname>Sound</Menuname>
- <Menuname>Video</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-multimedia.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Multimedia</Category>
- <Category>X-MandrivaLinux-Multimedia-Sound</Category>
- <Category>X-MandrivaLinux-Multimedia-Video</Category>
- <Category>X-MandrivaLinux-Multimedia-Other</Category>
- <Category>Audio</Category>
- <Category>Video</Category>
- <Category>AudioVideo</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Office</Name>
- <Directory>mandriva-office.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Editors</Category>
- <Category>X-MandrivaLinux-Office</Category>
- <Category>X-MandrivaLinux-Office-Accessories</Category>
- <Category>X-MandrivaLinux-Office-AddressBooks</Category>
- <Category>X-MandrivaLinux-Office-Communications</Category>
- <Category>X-MandrivaLinux-Office-Communications-Fax</Category>
- <Category>X-MandrivaLinux-Office-Communications-PDA</Category>
- <Category>X-MandrivaLinux-Office-Communications-Phone</Category>
- <Category>X-MandrivaLinux-Office-Communications-Other</Category>
- <Category>X-MandrivaLinux-Office-Drawing</Category>
- <Category>X-MandrivaLinux-Office-Graphs</Category>
- <Category>X-MandrivaLinux-Office-Presentations</Category>
- <Category>X-MandrivaLinux-Office-Publishing</Category>
- <Category>X-MandrivaLinux-Office-Spreadsheets</Category>
- <Category>X-MandrivaLinux-Office-TasksManagement</Category>
- <Category>X-MandrivaLinux-Office-TimeManagement</Category>
- <Category>X-MandrivaLinux-Office-Other</Category>
- <Category>X-MandrivaLinux-Office-Wordprocessors</Category>
- <Category>Office</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>System</Name>
- <Directory>mandriva-system.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System</Category>
- <Category>X-MandrivaLinux-System-Archiving</Category>
- <Category>X-MandrivaLinux-System-Archiving-Backup</Category>
- <Category>X-MandrivaLinux-System-Archiving-CDBurning</Category>
- <Category>X-MandrivaLinux-System-Archiving-Compression</Category>
- <Category>X-MandrivaLinux-System-Archiving-Other</Category>
- <Category>X-MandrivaLinux-System-FileTools</Category>
- <Category>X-MandrivaLinux-System-Monitoring</Category>
- <Category>X-MandrivaLinux-System-Session</Category>
- <Category>X-MandrivaLinux-System-Session-Windowmanagers</Category>
- <Category>X-MandrivaLinux-System-Terminals</Category>
- <Category>X-MandrivaLinux-System-TextTools</Category>
- <Category>X-MandrivaLinux-System-Configuration</Category>
- <Category>X-MandrivaLinux-System-Configuration-BootandInit</Category>
- <Category>X-MandrivaLinux-System-Configuration-Hardware</Category>
- <Category>X-MandrivaLinux-System-Configuration-Networking</Category>
- <Category>X-MandrivaLinux-System-Configuration-Packaging</Category>
- <Category>X-MandrivaLinux-System-Configuration-Printing</Category>
- <Category>X-MandrivaLinux-System-Configuration-Users</Category>
- <Category>X-MandrivaLinux-System-Configuration-Other</Category>
- <Category>Settings</Category>
- <Category>System</Category>
- <Category>Utility</Category>
- </Or>
- </Include>
-<!-- Empty node for KDE -->
- <Menu>
- <Name>ScreenSaver</Name>
- </Menu>
- </Menu>
- <Menu>
- <Name>Documentation</Name>
- <Directory>mandriva-moreapplications-documentation.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
- <Category>Documentation</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>More Applications</Name>
- <Directory>mandriva-moreapplications.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications</Category>
- <Category>X-MandrivaLinux-MoreApplications-Accessibility</Category>
- <Category>X-MandrivaLinux-MoreApplications-Communications</Category>
- <Category>X-MandrivaLinux-MoreApplications-Finances</Category>
- <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
- <Category>X-MandrivaLinux-MoreApplications-Emulators</Category>
- <Category>X-MandrivaLinux-MoreApplications-Development</Category>
- <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
- <Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</Category>
- <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
- <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
- <Category>X-MandrivaLinux-MoreApplications-Other</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education-Economy</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education-History</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education-Languages</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education-Literature</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education-Sports</Category>
- <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
- <Category>Development</Category>
- <Category>Education</Category>
- <Category>Electronics</Category>
- <Category>Engineering</Category>
- </Or>
- </Include>
- </Menu>
-<!-- Empty nodes used by KDE -->
- <Menu>
- <Name>Settings</Name>
- </Menu>
- <Menu>
- <Name>Information</Name>
- </Menu>
- <Menu>
- <Name>.hidden</Name>
- <Directory>mandriva-hidden.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-.hidden</Category>
- </Or>
- </Include>
- </Menu>
- <MergeFile>/etc/xdg/discovery/menus/mandriva-discovery.menu</MergeFile>
- <MergeFile>applications-kmenuedit.menu</MergeFile>
-</Menu>
diff --git a/trunk/menu/applications-mdk.menu b/trunk/menu/applications-mdk.menu
deleted file mode 100644
index 511f231..0000000
--- a/trunk/menu/applications-mdk.menu
+++ /dev/null
@@ -1,1606 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
-<Menu>
- <Name>Applications</Name>
- <Layout>
- <Menuname>Office</Menuname>
- <Menuname>Internet</Menuname>
- <Menuname>Multimedia</Menuname>
- <Menuname>System</Menuname>
- <Menuname>More Applications</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <DefaultLayout inline="true" inline_limit="1" inline_header="false">
- <Merge type="menus"/>
- <Merge type="files"/>
- </DefaultLayout>
- <DefaultMergeDirs/>
- <DefaultAppDirs/>
- <DefaultDirectoryDirs/>
- <Directory>mandrivalinux.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Office</Name>
- <Layout>
- <Menuname>Wordprocessors</Menuname>
- <Menuname>Spreadsheets</Menuname>
- <Menuname>Presentations</Menuname>
- <Menuname>Drawing</Menuname>
- <Menuname>Graphs</Menuname>
- <Menuname>Publishing</Menuname>
- <Menuname>Tasks Management</Menuname>
- <Menuname>Time Management</Menuname>
- <Menuname>Address Books</Menuname>
- <Menuname>Communications</Menuname>
- <Menuname>Accessories</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office</Category>
- <Category>Office</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Accessories</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-kcalc.desktop</Filename>
- <Filename>MandrivaLinux-Office-Accessories-oooqs.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-accessories.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Accessories</Category>
- <Category>Calculator</Category>
- <Category>Dictionary</Category>
- <Category>Clock</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Address Books</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-kaddressbook.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-addressbooks.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-AddressBooks</Category>
- <Category>ContactManagement</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Communications</Name>
- <Layout>
- <Menuname>Fax</Menuname>
- <Menuname>Phone</Menuname>
- <Menuname>PDA</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-communications.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Communications</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Fax</Name>
- <Directory>mandriva-office-communications-fax.directory</Directory>
- <Include>
- <Category>X-MandrivaLinux-Office-Communications-Fax</Category>
- </Include>
- </Menu>
- <Menu>
- <Name>PDA</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-kpilot.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-communications-pda.directory</Directory>
- <Include>
- <Or>
- <Category>PDA</Category>
- <Category>X-MandrivaLinux-Office-Communications-PDA</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Phone</Name>
- <Directory>mandriva-office-communications-phone.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Communications-Phone</Category>
- <Category>TelephonyTool</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-office-communications-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Communications-Other</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Drawing</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Office-Drawing-OpenOffice.org Draw.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-drawing.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Drawing</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Graphs</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Office-Graphs-Dia.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-graphs.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Graphs</Category>
- <Category>Chart</Category>
- <Category>FlowChart</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Presentations</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Office-Presentations-OpenOffice.org Impress.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-presentations.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Presentations</Category>
- <Category>Presentation</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Publishing</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Office-Publishing-Xpdf.desktop</Filename>
- <Filename>MandrivaLinux-Office-Publishing-GhostView.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-publishing.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Publishing</Category>
- <Category>Scanning</Category>
- <Category>OCR</Category>
- <And>
- <Category>Office</Category>
- <Category>Viewer</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Spreadsheets</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Office-Spreadsheets-OpenOffice.org Calc.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-spreadsheets.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Spreadsheets</Category>
- <Category>Spreadsheet</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Tasks Management</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Office-TasksManagement-Planner.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-tasksmanagement.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-TasksManagement</Category>
- <Category>ProjectManagement</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Time Management</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-korganizer.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-timemanagement.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-TimeManagement</Category>
- <Category>Calendar</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-office-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Other</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Wordprocessors</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Office-Wordprocessors-OpenOffice.org Writer.desktop</Filename>
- <Filename>MandrivaLinux-Office-Wordprocessors-OpenOffice.org Math.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-office-wordprocessors.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Office-Wordprocessors</Category>
- <Category>WordProcessor</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Internet</Name>
- <Layout>
- <Menuname>Web Browsers</Menuname>
- <Menuname>Mail</Menuname>
- <Menuname>Instant Messaging</Menuname>
- <Menuname>Chat</Menuname>
- <Menuname>News</Menuname>
- <Menuname>File Transfer</Menuname>
- <Menuname>Video Conference</Menuname>
- <Menuname>Web Editors</Menuname>
- <Menuname>Remote Access</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-internet.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet</Category>
- <Category>Network</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Chat</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-ksirc.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-internet-chat.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-Chat</Category>
- <Category>IRCClient</Category>
- <Category>Chat</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>File Transfer</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Internet-FileTransfer-kbear.desktop</Filename>
- <Filename>MandrivaLinux-Internet-FileTransfer-Gtm.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-internet-filetransfer.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-FileTransfer</Category>
- <Category>FileTransfer</Category>
- <Category>P2P</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Instant Messaging</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-kopete.desktop</Filename>
- <Filename>MandrivaLinux-Internet-InstantMessaging-Gaim.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-internet-instantmessaging.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-InstantMessaging</Category>
- <Category>InstantMessaging</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Mail</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-Kontact.desktop</Filename>
- <Filename>evolution.desktop</Filename>
- <Filename>MandrivaLinux-Internet-Mail-Mozilla Thunderbird.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-internet-mail.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-Mail</Category>
- <Category>Email</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>News</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-KNode.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-internet-news.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-News</Category>
- <Category>News</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Video Conference</Name>
- <Directory>mandriva-internet-videoconference.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-VideoConference</Category>
- <Category>Telephony</Category>
- <Category>VideoConference</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-internet-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-Other</Category>
- <And>
- <Category>Network</Category>
- <Category>HamRadio</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Remote Access</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-Kppp.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-internet-remoteaccess.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-RemoteAccess</Category>
- <Category>RemoteAccess</Category>
- <Category>Dialup</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Web Browsers</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-konqbrowser.desktop</Filename>
- <Filename>MandrivaLinux-Internet-WebBrowsers-Mozilla Firefox.desktop</Filename>
- <Filename>MandrivaLinux-Internet-WebBrowsers-Mozilla.desktop</Filename>
- <Filename>MandrivaLinux-Internet-WebBrowsers-Epiphany Web Browser.desktop</Filename>
- <Filename>MandrivaLinux-Internet-WebBrowsers-Epiphany Bookmarks Editor.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-internet-webbrowsers.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-WebBrowsers</Category>
- <Category>WebBrowser</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Web Editors</Name>
- <Directory>mandriva-internet-webeditors.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Internet-WebEditors</Category>
- <Category>WebDevelopment</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>More Applications</Name>
- <Layout>
- <Menuname>Accessibility</Menuname>
- <Menuname>Development</Menuname>
- <Menuname>Editors</Menuname>
- <Menuname>Emulators</Menuname>
- <Menuname>Finances</Menuname>
- <Menuname>Databases</Menuname>
- <Menuname>Education</Menuname>
- <Menuname>Sciences</Menuname>
- <Menuname>Games</Menuname>
- <Menuname>Documentation</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications</Category>
- <Category>Utility</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Accessibility</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-kmag.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-accessibility.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Accessibility</Category>
- <Category>Accessibility</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Communications</Name>
- <Directory>mandriva-moreapplications-communications.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Communications</Category>
- <Category>Communications</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Finances</Name>
- <Directory>mandriva-moreapplications-finances.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Finances</Category>
- <Category>Finance</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Databases</Name>
- <Directory>mandriva-moreapplications-databases.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
- <Category>Database</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Emulators</Name>
- <Directory>mandriva-moreapplications-emulators.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Emulators</Category>
- <And>
- <Category>System</Category>
- <Category>Emulator</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Development</Name>
- <Layout>
- <Menuname>Development Environment</Menuname>
- <Menuname>Interpreters</Menuname>
- <Menuname>Tools</Menuname>
- <Menuname>Code Generators</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-development.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Development</Category>
- <Category>Development</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Development Environments</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-kdevelop.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-development-developmentenvironments.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
- <Category>IDE</Category>
- <Category>GUIDesigner</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Interpreters</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-MoreApplications-Development-Interpreters-GNU Prolog.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-development-interpreters.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Tools</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-MoreApplications-Development-Tools-Gdb.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-development-tools.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
- <Category>Building</Category>
- <Category>Profiling</Category>
- <Category>Debugger</Category>
- <Category>RevisionControl</Category>
- <And>
- <Category>Development</Category>
- <Category>Translation</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-moreapplications-development-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Documentation</Name>
- <Directory>mandriva-moreapplications-documentation.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
- <Category>Documentation</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-moreapplications-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Other</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Editors</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-MoreApplications-Editors-Emacs.desktop</Filename>
- <Filename>MandrivaLinux-MoreApplications-Editors-XEmacs.desktop</Filename>
- <Filename>MandrivaLinux-MoreApplications-Editors-VI editor.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-editors.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Editors</Category>
- <Category>TextEditor</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Education</Name>
- <Layout>
- <Menuname>Economy</Menuname>
- <Menuname>Geography</Menuname>
- <Menuname>History</Menuname>
- <Menuname>Languages</Menuname>
- <Menuname>Literature</Menuname>
- <Menuname>Sciences</Menuname>
- <Menuname>Sports</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-education.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education</Category>
- <Category>Education</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Economy</Name>
- <Directory>mandriva-moreapplications-education-economy.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education-Economy</Category>
- <Category>Economy</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Geography</Name>
- <Directory>mandriva-moreapplications-education-geography.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
- <Category>Geography</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>History</Name>
- <Directory>mandriva-moreapplications-education-history.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education-History</Category>
- <Category>History</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Languages</Name>
- <Directory>mandriva-moreapplications-education-languages.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education-Languages</Category>
- <Category>Languages</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Literature</Name>
- <Directory>mandriva-moreapplications-education-literature.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education-Literature</Category>
- <Category>Literature</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Sciences</Name>
- <Directory>mandriva-moreapplications-education-sciences.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
- <And>
- <Category>Science</Category>
- <Category>Education</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Sports</Name>
- <Directory>mandriva-moreapplications-education-sports.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education-Sports</Category>
- <Category>Sports</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-moreapplications-education-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category>
- <Category>Art</Category>
- <Category>Construction</Category>
- <Category>Teaching</Category>
- <And>
- <Category>Education</Category>
- <Category>Music</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Games</Name>
- <Layout>
- <Menuname>Adventure</Menuname>
- <Menuname>Arcade</Menuname>
- <Menuname>Boards</Menuname>
- <Menuname>Cards</Menuname>
- <Menuname>Puzzles</Menuname>
- <Menuname>Sports</Menuname>
- <Menuname>Strategy</Menuname>
- <Menuname>Toys</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-games.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games</Category>
- <Category>Game</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Adventure</Name>
- <Directory>mandriva-moreapplications-games-adventure.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Adventure</Category>
- <Category>AdventureGame</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Arcade</Name>
- <Directory>mandriva-moreapplications-games-arcade.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Arcade</Category>
- <Category>ArcadeGame</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Boards</Name>
- <Directory>mandriva-moreapplications-games-boards.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Boards</Category>
- <Category>BoardGame</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Cards</Name>
- <Directory>mandriva-moreapplications-games-cards.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Cards</Category>
- <Category>CardGame</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Puzzles</Name>
- <Directory>mandriva-moreapplications-games-puzzles.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Puzzles</Category>
- <Category>LogicGame</Category>
- <Category>BlocksGame</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Sports</Name>
- <Directory>mandriva-moreapplications-games-sports.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Sports</Category>
- <Category>SportsGame</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Strategy</Name>
- <Directory>mandriva-moreapplications-games-strategy.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Strategy</Category>
- <Category>StrategyGame</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-moreapplications-games-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
- <Category>KidsGame</Category>
- <Category>RolePlaying</Category>
- <Category>Simulation</Category>
- <Category>ActionGame</Category>
- <And>
- <Category>Game</Category>
- <Category>Emulator</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Toys</Name>
- <Directory>mandriva-moreapplications-games-toys.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
- <Category>Amusement</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Sciences</Name>
- <Layout>
- <Menuname>Artificial Intelligence</Menuname>
- <Menuname>Astronomy</Menuname>
- <Menuname>Biology</Menuname>
- <Menuname>Chemistry</Menuname>
- <Menuname>Computer Science</Menuname>
- <Menuname>Data Visualization</Menuname>
- <Menuname>Electricity</Menuname>
- <Menuname>Geosciences</Menuname>
- <Menuname>Image Processing</Menuname>
- <Menuname>Mathematics</Menuname>
- <Menuname>Numeric analysis</Menuname>
- <Menuname>Parallel Computing</Menuname>
- <Menuname>Physics</Menuname>
- <Menuname>Robotics</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-moreapplications-sciences.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
- <Category>Science</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Artificial Intelligence</Name>
- <Directory>mandriva-moreapplications-sciences-artificialintelligence.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
- <Category>ArtificialIntelligence</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Astronomy</Name>
- <Directory>mandriva-moreapplications-sciences-astronomy.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
- <Category>Astronomy</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Biology</Name>
- <Directory>mandriva-moreapplications-sciences-biology.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
- <Category>Biology</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Chemistry</Name>
- <Directory>mandriva-moreapplications-sciences-chemistry.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
- <Category>Chemistry</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Computer Science</Name>
- <Directory>mandriva-moreapplications-sciences-computerscience.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
- <Category>ComputerScience</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Data Visualization</Name>
- <Directory>mandriva-moreapplications-sciences-datavisualization.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
- <Category>DataVisualization</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Electricity</Name>
- <Directory>mandriva-moreapplications-sciences-electricity.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
- <Category>Electricity</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Geosciences</Name>
- <Directory>mandriva-moreapplications-sciences-geosciences.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
- <Category>Geoscience</Category>
- <Category>Geology</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Image Processing</Name>
- <Directory>mandriva-moreapplications-sciences-imageprocessing.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
- <Category>ImageProcessing</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Mathematics</Name>
- <Directory>mandriva-moreapplications-sciences-mathematics.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
- <Category>Math</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Numeric Analysis</Name>
- <Directory>mandriva-moreapplications-sciences-numericanalysis.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
- <Category>NumericAnalysis</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Parallel Computing</Name>
- <Directory>mandriva-moreapplications-sciences-parallelcomputing.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category>
- <Category>ParallelComptuting</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Physics</Name>
- <Directory>mandriva-moreapplications-sciences-physics.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
- <Category>Physics</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Robotics</Name>
- <Directory>mandriva-moreapplications-sciences-robotics.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
- <Category>Robotics</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-moreapplications-sciences-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
- <Category>MedicalSoftware</Category>
- <Category>Electronics</Category>
- <Category>Engineering</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- </Menu>
- <Menu>
- <Name>Multimedia</Name>
- <Layout>
- <Menuname>Sound</Menuname>
- <Menuname>Video</Menuname>
- <Menuname>Graphics</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-multimedia.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Multimedia</Category>
- <Category>AudioVideo</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Graphics</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Multimedia-Graphics-The GIMP.desktop</Filename>
- <Filename>kde-kooka.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-multimedia-graphics.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
- <Category>Graphics</Category>
- <Category>Photography</Category>
- <Category>3DGraphics</Category>
- <Category>2DGraphics</Category>
- <Category>VectorGraphics</Category>
- <Category>RasterGraphics</Category>
- <And>
- <Category>Graphics</Category>
- <Category>Viewer</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Sound</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-kscd.desktop</Filename>
- <Filename>MandrivaLinux-Multimedia-Sound-Totem Media Player.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-multimedia-sound.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Multimedia-Sound</Category>
- <Category>Audio</Category>
- <Category>Midi</Category>
- <Category>Mixer</Category>
- <Category>Sequencer</Category>
- <Category>Tuner</Category>
- <And>
- <Category>Audio</Category>
- <Or>
- <Category>AudioVideoEditing</Category>
- <Category>Player</Category>
- <Category>Recorder</Category>
- <Category>HamRadio</Category>
- </Or>
- </And>
- <And>
- <Category>AudioVideo</Category>
- <Category>Music</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Video</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-Multimedia-Video-Totem Movie Player.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-multimedia-video.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Multimedia-Video</Category>
- <Category>Video</Category>
- <Category>TV</Category>
- <And>
- <Category>Video</Category>
- <Or>
- <Category>AudioVideoEditing</Category>
- <Category>Player</Category>
- <Category>Recorder</Category>
- </Or>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-multimedia-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Multimedia-Other</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>System</Name>
- <Layout>
- <Menuname>Terminals</Menuname>
- <Menuname>Text Tools</Menuname>
- <Menuname>Configuration</Menuname>
- <Menuname>Archiving</Menuname>
- <Menuname>File Tools</Menuname>
- <Menuname>Monitoring</Menuname>
- <Menuname>Session</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System</Category>
- <Category>System</Category>
- <Category>Filesystem</Category>
- <And>
- <Category>System</Category>
- <Category>Security</Category>
- </And>
- </Or>
- </Include>
- <Menu>
- <Name>Archiving</Name>
- <Layout>
- <Menuname>Backup</Menuname>
- <Menuname>CD Burning</Menuname>
- <Menuname>Compression</Menuname>
- <Menuname>Other</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system-archiving.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Archiving</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Backup</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>MandrivaLinux-System-Archiving-Backup-DrakSync.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system-archiving-backup.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Archiving-Backup</Category>
- <Category>Archiving</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>CD Burning</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-k3b.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system-archiving-cdburning.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Archiving-CDBurning</Category>
- <Category>DiscBurning</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Compression</Name>
- <Directory>mandriva-system-archiving-compression.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Archiving-Compression</Category>
- <Category>Compression</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-system-archiving-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Archiving-Other</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Configuration</Name>
- <Layout>
- <Filename>kde-KControl.desktop</Filename>
- <Filename>MandrivaLinux-System-Configuration-Configure Your Computer.desktop</Filename>
- <Menuname>Boot and Init</Menuname>
- <Menuname>KDE</Menuname>
- <Menuname>GNOME</Menuname>
- <Menuname>Hardware</Menuname>
- <Menuname>Networking</Menuname>
- <Menuname>Packaging</Menuname>
- <Menuname>Printing</Menuname>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system-configuration.directory</Directory>
- <OnlyUnallocated/>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration</Category>
- <And>
- <Category>Settings</Category>
- <Category>DesktopSettings</Category>
- <Category>HardwareSettings</Category>
- <Not>
- <Category>GNOME</Category>
- <Category>KDE</Category>
- </Not>
- </And>
- </Or>
- </Include>
- <Menu>
- <Name>Boot and Init</Name>
- <Directory>mandriva-system-configuration-bootandinit.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-BootandInit</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Hardware</Name>
- <Directory>mandriva-system-configuration-hardware.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-Hardware</Category>
- <Category>HardwareSettings</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>GNOME</Name>
- <Directory>mandriva-system-configuration-gnome.directory</Directory>
- <Include>
- <Category>X-MandrivaLinux-System-Configuration-GNOME</Category>
- </Include>
- <Menu>
- <Name>Advanced</Name>
- <Directory>mandriva-system-configuration-gnome-advanced.directory</Directory>
- <Include>
- <Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>KDE</Name>
- <Directory>mandriva-system-configuration-kde.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Accessibility</Name>
- <Directory>kde-settings-accessibility.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-Accessibility</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Components</Name>
- <Directory>kde-settings-components.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-Components</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Information</Name>
- <Directory>kde-settings-hardware.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-Information</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>LookNFeel</Name>
- <Directory>kde-settings-looknfeel.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-LookNFeel</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Network</Name>
- <Directory>kde-settings-network.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-Network</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Peripherals</Name>
- <Directory>kde-settings-peripherals.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-Peripherals</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>PowerControl</Name>
- <Directory>kde-settings-power.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-PowerControl</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Security</Name>
- <Directory>kde-settings-security.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-Security</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Sound</Name>
- <Directory>kde-settings-sound.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-Sound</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>WebBrowsing</Name>
- <Directory>kde-settings-webbrowsing.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-WebBrowsing</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>System</Name>
- <Directory>kde-settings-system.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-KDE-System</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Networking</Name>
- <Directory>mandriva-system-configuration-networking.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-Networking</Category>
- <And>
- <Category>Settings</Category>
- <Category>Network</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Packaging</Name>
- <Directory>mandriva-system-configuration-packaging.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-Packaging</Category>
- <Category>PackageManager</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Printing</Name>
- <Directory>mandriva-system-configuration-printing.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-Printing</Category>
- <Category>Printing</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Users</Name>
- <Directory>mandriva-system-configuration-users.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-Users</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-system-configuration-other.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Configuration-Other</Category>
- <And>
- <Category>Settings</Category>
- <Category>Security</Category>
- </And>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>File Tools</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-Kfind.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system-filetools.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-FileTools</Category>
- <Category>FileTool</Category>
- <Category>FileManager</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Monitoring</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-ksysguard.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system-monitoring.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Monitoring</Category>
- <Category>Monitor</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Session</Name>
- <Directory>mandriva-system-session.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Session</Category>
- </Or>
- </Include>
- <Menu>
- <Name>Windowmanagers</Name>
- <Directory>mandriva-system-session-windowmanagers.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Session-Windowmanagers</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Terminals</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-konsole.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system-terminals.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-Terminals</Category>
- <Category>TerminalEmulator</Category>
- </Or>
- </Include>
- </Menu>
- <Menu>
- <Name>Text Tools</Name>
- <Layout>
- <Merge type="menus"/>
- <Filename>kde-kdict.desktop</Filename>
- <Merge type="files"/>
- </Layout>
- <Directory>mandriva-system-texttools.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-System-TextTools</Category>
- <Category>TextTool</Category>
- </Or>
- </Include>
- </Menu>
- </Menu>
- <Menu>
- <Name>Other</Name>
- <Directory>mandriva-other.directory</Directory>
- <OnlyUnallocated/>
-<!--
- <Include>
- <Or>
- <Category>X-MandrivaLinux-Other</Category>
- </Or>
- </Include>-->
- <KDELegacyDirs/>
- </Menu>
- <Menu>
- <Name>.hidden</Name>
- <Directory>mandriva-hidden.directory</Directory>
- <Include>
- <Or>
- <Category>X-MandrivaLinux-.hidden</Category>
- </Or>
- </Include>
- </Menu>
- <MergeFile>applications-kmenuedit.menu</MergeFile>
-</Menu>
diff --git a/trunk/menu/defaultlayout-simplified.menu b/trunk/menu/defaultlayout-simplified.menu
deleted file mode 100644
index 2a6b074..0000000
--- a/trunk/menu/defaultlayout-simplified.menu
+++ /dev/null
@@ -1,22 +0,0 @@
-<Menu>
-<Name>Mandrakelinux</Name>
-<Layout>
-<Menuname>Use Office Tools</Menuname>
-<Menuname>Organize</Menuname>
-<Menuname>Surf the Internet</Menuname>
-<Menuname>Enjoy Music and Video</Menuname>
-<Menuname>View, Modify and Create Graphics</Menuname>
-<Menuname>Play Games</Menuname>
-<Menuname>Administer Your System</Menuname>
-<Menuname>Read Documentation</Menuname>
-<Menuname>Develop</Menuname>
-<Menuname>Use Education Software</Menuname>
-<Menuname>Use Scientific Software</Menuname>
-<Menuname>Use Emulators</Menuname>
-<Menuname>Use More Applications</Menuname>
-<Merge type="menus"/>
-<Merge type="files"/>
-<Separator/>
-<Menuname>Other</Menuname>
-</Layout>
-</Menu>
diff --git a/trunk/menu/defaultlayout.menu b/trunk/menu/defaultlayout.menu
deleted file mode 100644
index d981f45..0000000
--- a/trunk/menu/defaultlayout.menu
+++ /dev/null
@@ -1,13 +0,0 @@
-<Menu>
-<Name>Mandrakelinux</Name>
-<Layout>
-<Menuname>Office</Menuname>
-<Menuname>Internet</Menuname>
-<Menuname>Multimedia</Menuname>
-<Menuname>System</Menuname>
-<Menuname>More Applications</Menuname>
-<Menuname>Other</Menuname>
-<Merge type="menus"/>
-<Merge type="files"/>
-</Layout>
-</Menu>
diff --git a/trunk/menu/desktop-common-data b/trunk/menu/desktop-common-data
deleted file mode 100644
index fbef1ac..0000000
--- a/trunk/menu/desktop-common-data
+++ /dev/null
@@ -1,255 +0,0 @@
-## Use Office Tools
-# Create a Text Document
-?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_writer.png" title="Create a Text Document" command="oowriter" mimetypes="application/vnd.sun.xml.writer,application/vnd.stardivision.writer,application/msword,application/vnd.ms-word,application/x-doc,text/rtf"
-
-# Create a Spreadsheet
-?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_calc.png" title="Create a Spreadsheet" command="oocalc" mimetypes="application/vnd.sun.xml.calc,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/msexcel,application/vnd.ms-excel"
-
-# Create a Presentation
-?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_impress.png" title="Create a Presentation" command="ooimpress" mimetypes="application/vnd.sun.xml.impress;application/vnd.stardivision.impress;application/mspowerpoint"
-
-# Create a Drawing
-?package(OpenOffice.org): needs=x11 section="Use Office Tools" icon="ooo_draw.png" title="Create a Drawing" command="oodraw" mimetypes="application/vnd.sun.xml.draw,application/vnd.stardivision.draw"
-
-
-# Diagrams
-?package(koffice-kivio): needs="kde" kde_filename="kivio" section="Use Office Tools" title="Create Flowcharts and Diagrams" icon="kivio.png" command="kivio" kde_command="kivio %u" mimetypes="application/x-kivio" multiple_files="false" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nGenericName=Flowchart & Diagram Editing\\nX-KDE-NativeMimeType=application/x-kivio\\nDocPath=kivio/index.html\\nX-DCOP-ServiceType=Multi"
-?package(dia): needs="gnome" section="Use Office Tools" title="Create Flowcharts and Diagrams" icon="dia.png" command="dia" mimetypes="application/x-kivio"
-
-# Design a Layout
-?package(scribus): needs="x11" section="Use Office Tools" command="scribus" title="Design a Layout" needs="x11" icon="wordprocessor_section.png"
-
-# Consult an Address Book
-?package(evolution): needs="gnome" section="Use Office Tools" title="Consult an Address Book" icon="evolution.png" command="evolution -c contacts"
-
-?package(kdepim-kaddressbook): needs="kde" kde_filename="kontact-kaddressbook" section="Use Office Tools" title="Consult an Address Book" icon="kontact-mdk.png" command="kontact --module kaddressbook" kde_command="kontact --module kaddressbook %u" mimetypes="text/x-vcard,text/x-ldif" multiple_files="false" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nDocPath=kaddressbook/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=kaddressbook\\nServiceTypes=KParts/ReadOnlyPart,Browser/View,DCOP/AddressBook\\nX-KDE-Library=libkaddressbookpart\\n"
-
-# Send a Fax
-?package(kdebase-kdeprintfax): 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="\\nEncoding=UTF-8\\nGenericName=Fax Utility\\nMiniIcon=kdeprintfax\\nTerminal=0\\nX-DCOP-ServiceType=Multi\\n"
-
-# View a Fax
-?package(kdegraphics-kfax): needs="x11" kde_filename="kfax" section="Use Office Tools" title="View a Fax" icon="kfax.png" command="kfax" kde_command="kfax %f -caption \"%c\" %i %m" mimetypes="image/fax-g3" multiple_files="false" accept_url="false" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=kfax;\\nGenericName=Fax Viewer\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-# Synchronize Your PDA
-?package(kdepim-kpilot): needs="kde" kde_filename="kpilot" section="Use Office Tools" title="Synchronize Your PDA" icon="kpilot.png" command="kpilot" kde_opt="\\nEncoding=UTF-8\\nGenericName=PalmPilot Tool\\nDocPath=kpilot/index.html\\nTerminal=0\\nMiniIcon=kpilot\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-?package(gnome-pilot): needs="gnome" section="Use Office Tools" title="Synchronize Your PDA" icon="/usr/share/pixmaps/gnome-palm.png" command="gpilotd-control-applet"
-
-# Use a Calculator
-?package(kdeutils-kcalc): needs="kde" kde_filename="kcalc" section="Use Office Tools" title="Use a Calculator" icon="kcalc.png" command="kcalc" kde_command="kcalc -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kcalc/index.html\\nGenericName=Scientific Calculator\\nTerminal=0\\nX-KDE-StartupNotify=true\\n"
-?package(gcalctool): needs="gnome" section="Use Office Tools" title="Use a Calculator" icon="gcalctool.png" command="gcalctool"
-
-# Search Dictionaries and Encyclopedias
-?package(kdenetwork-kdict): needs="x11" kde_filename="kdict" section="Use Office Tools" title="Search Dictionaries and Encyclopedias" icon="kdict.png" command="kdict" kde_command="kdict -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nTerminal=0\\nGenericName=Online Dictionary\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nDocPath=kdict/index.html\\n"
-
-
-## Organize
-# Write Notes
-?package(kdepim-knotes): needs="x11" kde_filename="kontact-knotes" section="Organize" title="Write Notes" icon="kontact-mdk.png" command="kontact --module knotes" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-
-# Manage Tasks
-?package(kdepim-korganizer): needs="kde" kde_filename="kontact-korganizer" section="Organize" title="Manage Tasks" icon="kontact-mdk.png" command="kontact --module todo" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nGenericName=Personal Organizer\\nServiceTypes=Browser/View,DCOP/Organizer\\nX-KDE-Library=libkorganizerpart\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=korganizer\\n"
-
-?package(evolution): needs="gnome" section="Organize" title="Manage Tasks" icon="evolution.png" command="evolution -c tasks"
-
-# Organize Your Time
-?package(kdepim-korganizer): needs="kde" kde_filename="kontact-korganizer-time" section="Organize" title="Organize Your Time" icon="kontact-mdk.png" command="kontact --module korganizer" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nGenericName=Personal Organizer\\nServiceTypes=Browser/View,DCOP/Organizer\\nX-KDE-Library=libkorganizerpart\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=korganizer\\n"
-
-?package(evolution): needs="gnome" section="Organize" title="Organize Your Time" icon="evolution.png" command="evolution -c calendar"
-
-# Track Time Spent on Tasks
-?package(kdepim-karm): needs="x11" kde_filename="karm" section="Organize" title="Track Time Spent on Tasks" icon="karm.png" command="karm" kde_command="karm -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nGenericName=Personal Time Tracker\\nTerminalOptions=\\nPath=\\nDocPath=karm/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-# Manage Projects
-?package(planner):command="planner" needs="x11" section="Organize" title="Manage Projects" icon="/usr/share/pixmaps/gnome-planner.png" startup_notify="true"
-
-# Manage Your Finances
-?package(gnucash): command="/usr/bin/gnucash" icon="gnucash.png" needs="X11" section="Organize" title="Manage Your Finances"
-
-
-
-## Surf the Internet
-# Connect to the Internet
-?package(kdenetwork-kppp): needs="x11" kde_filename="Kppp" section="Surf the Internet" title="Dial up" icon="kppp.png" command="kppp" kde_command="kppp %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Internet Dial-up Tool\\nBinaryPattern=kppp;\\nDocPath=kppp/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-# Browse the Web
-?package(mozilla-firefox): needs="x11" command="/usr/bin/mozilla-firefox" icon="mozilla-firefox.png" section="Surf the Internet" title="Browse the Web" startup_notify="true" longtitle="Lightweight Web Browser" accept_url="true" mimetypes="text/html,text/xml,application/xhtml+xml,application/vnd.mozilla.xul+xml,text/mml"
-
-?package(epiphany): needs="gnome" section="Surf the Internet" title="Browse the Web" icon="epiphany.png" command="epiphany" startup_notify="true"
-
-# Read and Send E-mail
-?package(kdepim-kmail): needs="kde" kde_filename="kontact-KMail" section="Surf the Internet" title="Read and Send E-mail" icon="kontact-mdk.png" command="kontact --module kmail" kde_command="kontact --module kmail -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kmail/index.html\\nGenericName=Mail Client\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=kmail\\nServiceTypes=DCOP/ResourceBackend/IMAP\\n"
-
-?package(evolution): needs="gnome" section="Surf the Internet" title="Read and Send E-mail" icon="evolution.png" command="evolution -c mail" startup_notify="true"
-
-# Chat
-?package(kdenetwork-kopete): needs="kde" kde_filename="kopete" section="Surf the Internet" title="Chat" icon="kopete.png" command="kopete" kde_command="kopete %i %m -caption \"%c\"" kde_opt="\\nGenericName=Instant Messenger\\nTerminal=0\\n"
-?package(gaim): needs="gnome" section="Surf the Internet" title="Chat" icon="gaim.png" command="gaim" startup_notify="true"
-
-# Read and Send Newsgroup Messages
-?package(kdepim-knode): needs="kde" kde_filename="kontact-KNode" section="Surf the Internet" title="Read and Send Newsgroup Messages" icon="kontact-mdk.png" command="kontact --module knode" kde_command="kontact --module kmail -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nTerminal=0\\nDocPath=knode/index.html\\nGenericName=News Reader\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-
-?package(pan): needs="gnome" section="Surf the Internet" title="Read and Send Newsgroup Messages" icon="pan.png" command="pan" startup_notify="true"
-
-# Make a Phone Call
-?package(kphone): needs="x11" kde_filename="kphone" section="Surf the Internet" title="Make a Phone Call" icon="kphone.png" command="kphone" kde_opt="\\nDocPath=kphone/index.html\\nTerminal=0"
-
-# Organize a Video Conference
-?package(gnomemeeting): command="/usr/bin/gnomemeeting" needs="x11" icon="gnomemeeting.png" section="Surf the Internet" title="Organize a Video Conference" startup_notify="true"
-
-# Create Your Own Web Site
-?package(quanta): needs="x11" kde_filename="quanta" section="Surf the Internet" title="Create Your Own Web Site" icon="quanta.png" command="quanta" mimetypes="text/html" kde_opt="\\nEncoding=UTF-8\\nDocPath=quanta/index.html\\nGenericName=Web Development Environment\\n"
-
-# Transfer Files With FTP
-?package(kbear): needs="kde" kde_filename="kbear" section="Surf the Internet" title="Transfer files with FTP" icon="kbear.png" command="kbear" kde_opt="\\nEncoding=UTF-8\\nGenericName=FTP Client\\nMiniIcon=kbear\\nDocPath=kbear/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
-
-?package(gftp): needs="gnome" section="Surf the Internet" title="Transfer Files With FTP" icon="gftp.png" command="gftp"
-
-
-
-## Enjoy Music and Video
-# Adjust Volume
-?package(kdemultimedia-kmix): needs="kde" kde_filename="kmix" section="Enjoy Music and Video" title="Adjust Volume" icon="kmix.png" command="kmix" kde_command="kmix -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nGenericName=Sound Mixer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-
-?package(gnome-media): needs="gnome" section="Enjoy Music and Video" title="Adjust Volume" icon="/usr/share/pixmaps/gnome-mixer.png" command="gnome-volume-control"
-
-# Listen to Audio CDs
-?package(kdemultimedia-kscd): needs="kde" kde_filename="kscd" section="Enjoy Music and Video" title="Listen to Audio CDs" icon="kscd.png" command="kscd" kde_command="kscd -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nGenericName=CD Player\\nBinaryPattern=kscd;\\nDocPath=kscd/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-?package(gnome-media): needs="gnome" section="Enjoy Music and Video" title="Listen to Audio CDs" icon="/usr/share/pixmaps/gnome-cd.png" command="gnome-cd"
-
-# Listen to Music Files
-?package(amarok): needs="kde" kde_filename="amarok" section="Enjoy Music and Video" title="Listen to Music Files" icon="amarok.png" command="amarok" kde_command="amarok %U" mimetypes="application/x-ogg,audio/x-vorbis,audio/basic,audio/x-mod,audio/x-mp3,audio/x-scpls,audio/x-mpegurl,audio/x-sid,audio/x-wav" multiple_files="true" accept_url="true" kde_opt="\\nVersion=0.9.4\\nEncoding=UTF-8\\nInitialPreference=15\\nGenericName=Audio Player\\nDocPath=amarok/index.html\\nTerminal=false\\nActions=Enqueue;\\nX-KDE-StartupNotify=false"
-
-?package(rhythmbox): needs="gnome" section="Enjoy Music and Video" title="Listen to Music Files" icon="rhythmbox.png" command="rhythmbox" startup_notify="true"
-
-# Rip Audio CDs
-?package(kdemultimedia-kaudiocreator): needs="kde" kde_filename="kaudiocreator" section="Enjoy Music and Video" title="Rip Audio CDs" icon="kaudiocreator.png" command="kaudiocreator" mimetypes="" kde_opt="\\nGenericName=CD Ripper\\nTerminalOptions=\\nPath=\\nTerminal=0\\n"
-
-?package(sound-juicer): needs="gnome" section="Enjoy Music and Video" title="Rip Audio CDs" icon="sound-juicer.png" command="sound-juicer"
-
-# Record Sounds
-?package(gnome-media): needs="x11" command="/usr/bin/gnome-sound-recorder" section="Enjoy Music and Video" title="Record Sounds" icon="/usr/share/pixmaps/gnome-grecord.png" startup_notify="true"
-
-# Mix Music
-?package(audacity): command="/usr/bin/audacity" needs="X11" icon="audacity.png" section="Enjoy Music and Video" title="Mix Music"
-
-# Compose Music
-?package(rosegarden4): needs="x11" kde_filename="rosegarden" section="Enjoy Music and Video" title="Compose Music" icon="rosegarden.png" command="rosegarden" kde_command="rosegarden -caption \"%c\" %i %m" mimetypes="audio/x-rosegarden,audio/x-rosegarden-device" kde_opt="\\nX-KDE-NativeMimeType=audio/x-rosegarden\\nMiniIcon=rosegarden.png\\nDocPath=rosegarden/index.html\\nTerminal=0"
-
-# Watch Videos
-?package(kaffeine): needs="kde" kde_filename="kaffeine" section="Enjoy Music and Video" title="Watch Videos" icon="kaffeine.png" command="kaffeine" mimetypes="application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine" kde_opt="\\nEncoding=UTF-8\\nGenericName=Mediaplayer\\nServiceTypes=\\nTerminal=false\\nInitialPreference=15"
-
-?package(totem): command="/usr/bin/totem" needs="gnome" section="Enjoy Music and Video" icon="totem.png" mimetypes="video/dv,video/mpeg,video/msvideo,video/quicktime,video/x-anim,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,video/x-nsv,video/x-flc,video/x-fli,application/ogg,application/x-ogg,audio/basic,audio/x-mp3,audio/x-mpeg,audio/mpeg,audio/x-wav,audio/x-mpegurl,audio/x-scpls,audio/x-m4a,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wax,application/vnd.rn-realmedia,audio/x-real-audio,audio-x-pn-realaudio,application/x-flac,audio/x-flac,misc/ultravox,application/x-matroska" accept_url="true" multiple_files="true" title="Watch Videos" startup_notify="true"
-
-# Edit Videos
-?package(kdenlive): needs="x11" kde_filename="kdenlive" section="Enjoy Music and Video" title="Edit Videos" icon="kdenlive.png" command="kdenlive" kde_command="kdenlive -caption \"%c\" %i %m " kde_opt="\\nEncoding=UTF-8\\nDocPath=kdenlive/index.html\\nTerminal=0"
-
-# Watch Television
-?package(kdetv): needs="x11" kde_filename="kdetv" section="Enjoy Music and Video" title="Watch Television" icon="kdetv.png" command="kdetv" kde_command="kdetv -caption \"%c\" %i %m" mimetypes="text/x-tv-channels" kde_opt="\\nEncoding=UTF-8\\nMiniIcon=kdetv\\nGenericName=TV Viewer\\nTerminal=0"
-
-
-## View, Modify and Create Graphics
-# View Images and Photos
-?package(kdegraphics-kuickshow): needs="kde" kde_filename="kuickshow" section="View, Modify and Create Graphics" title="View Images and Photos" icon="kuickshow.png" command="kuickshow" kde_command="kuickshow %i %m -caption \"%c\" %U" mimetypes="image/gif,image/x-xpm,image/x-xbm,image/jpeg,image/png,image/tiff,image/x-bmp,image/x-psd,image/x-eim,image/x-portable-bitmap,image/x-portable-pixmap,image/x-portable-greymap" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nDocPath=kuickshow/index.html\\nTerminal=0\\nInitialPreference=15\\nGenericName=Image Viewer\\nX-DCOP-ServiceType=Multi"
-
-?package(gqview): needs="gnome" section="View, Modify and Create Graphics" title="View Images and Photos" icon="gqview.png" command="gqview"
-
-# Edit Images and Photos
-?package(gimp): command="/usr/bin/gimp-remote" icon="wilber-icon.png" section="View, Modify and Create Graphics" title="Edit Images and Photos" needs="x11" mimetypes="image/gif;image/jpeg;image/png;image/tiff;image/x-xbm;image/x-xpm;image/bmp;image/fits;image/pcx;image/pix;image/pnm;image/x-bmp;image/x-xcf" startup_notify="true"
-
-# Scan and Use Optical Character Recognition (OCR)
-?package(kdegraphics-kooka): needs="x11" kde_filename="kooka" section="View, Modify and Create Graphics" title="Scan and Use Optical Character Recognition (OCR)" icon="scanner.png" command="kooka" kde_command="kooka %i %m %U" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kooka\\nDocPath=kooka/index.html\\nGenericName=Scan & OCR Program\\nX-DCOP-ServiceType=Multi\\n"
-
-# Import and Sort Your Photos
-?package(digikam): needs="kde" kde_filename="digikam" section="View, Modify and Create Graphics" title="Import and Sort Your Photos" icon="digikam.png" command="digikam" kde_command="digikam -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=digikam/index.html\\nTerminal=0"
-
-?package(gtkam): needs="gnome" section="View, Modify and Create Graphics" title="Import and Sort Your Photos" icon="gtkam.png" command="gtkam"
-
-# Create a Screenshot
-?package(kdegraphics-ksnapshot): needs="kde" kde_filename="ksnapshot" section="View, Modify and Create Graphics" title="Create a Screenshot" icon="ksnapshot.png" command="ksnapshot" kde_command="ksnapshot -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Screen Capture Program\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nDocPath=ksnapshot/index.html\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-?package(gnome-panel): needs="gnome" section="View, Modify and Create Graphics" title="Create a Screenshot" icon="/usr/share/pixmaps/gnome-screenshot.png" command="gnome-panel-screenshot"
-
-## Play games
-# Frozen-Bubble
-?package(frozen-bubble):command="/usr/games/frozen-bubble" icon="frozen-bubble.png" needs="X11" section="Play Games" title="Frozen-Bubble"
-
-# Armagetron
-?package(armagetron):command="/usr/games/armagetron" icon="armagetron.png" needs="x11" section="Play Games" title="ArmageTron"
-
-# CannonSmash
-?package(csmash):command="/usr/bin/csmash" icon="csmash.png" needs="x11" section="Play Games" title="Cannon Smash"
-
-# Chromium B.S.U
-?package(chromium):command="/usr/games/chromium" icon="chromium.png" needs="x11" section="Play Games" title="Chromium"
-
-# LBreakout 2
-?package(lbreakout2):needs=x11 section="Play Games" title="LBreakout 2" command="/usr/games/lbreakout2" icon="lbreakout2.png"
-
-# TuxRacer
-?package(tuxracer):command="soundwrapper /usr/games/tuxracer" icon="tuxracer.png" needs="x11" section="Play Games" title="Tuxracer"
-
-# CrackAttack
-?package(crack-attack): command="/usr/games/crack-attack-solo" icon="crack-attack.png" section="Play Games" title="Crack Attack! - Solo" needs="x11"
-
-
-## Administer Your System
-# Configure Your Desktop
-?package(kdebase-progs): needs="kde" kde_filename="KControl" section="Administer Your System" title="Configure Your Desktop" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nNoDisplay=false"
-
-?package(gnome-control-center): needs="gnome" section="Administer Your System" title="Configure Your Desktop" icon="control-center2.png" command="gnome-control-center"
-
-# Configure Your Computer
-?package(drakconf): needs="x11" icon="drakconf.png" section="Administer Your System" title="Configure Your Computer" command="/usr/sbin/drakconf"
-
-# Change Your Password
-?package(kdeutils-kdepasswd): needs="kde" kde_filename="kdepasswd" section="Administer Your System" title="Change Your Password" icon="password.png" command="kdepasswd" kde_opt="\\nEncoding=UTF-8\\nTerminalOptions=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-?package(usermode): needs="gnome" section="Administer Your System" title="Change Your Password" icon="userpasswd.xpm" command="userpasswd"
-
-# Burn CDs/DVDs
-?package(k3b): needs="x11" kde_filename="k3b" section="Administer Your System" title="Burn CDs-DVDs" icon="k3b.png" command="k3b" mimetypes="application/x-k3b" kde_opt="\\nDocPath=k3b/index.html\\nTerminal=false\\nX-KDE-NativeMimeType=application/x-k3b\\n"
-
-# Design a CD Cover
-?package(kover): needs="x11" kde_filename="kover" section="Administer Your System" title="Design a CD Cover" icon="kover.png" command="kover" kde_command="kover" kde_mimetype="application/x-kover" kde_opt="\\nTerminal=0"
-
-# Backup Your Data
-?package(drakxtools): needs="x11" icon="drakconf.png" section="Administer Your System" title="Backup Your Data" command="/usr/sbin/drakbackup"
-
-# Compress and Decompress Files
-?package(kdeutils-ark): needs="kde" kde_filename="ark" section="Administer Your System" title="Compress and Decompress Files" icon="ark.png" command="ark" kde_command="ark -caption \"%c\" %i %m %U" mimetypes="application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nGenericName=Archiving Tool\\nTerminalOptions=\\nPath=\\nDocPath=ark/index.html\\nTerminal=0\\nSwallowExec=\\nSwallowTitle=\\nBinaryPattern=ark;\\nX-DCOP-ServiceType=Unique\\n"
-
-?package(file-roller): needs="gnome" section="Administer Your System" title="Compress and Decompress Files" icon="file-roller.png" command="file-roller" startup_notify="true"
-
-# Format Floppies
-?package(kdeutils-kfloppy): needs="kde" kde_filename="KFloppy" section="Administer Your System" title="Format Floppies" icon="kfloppy.png" command="kfloppy" kde_command="kfloppy -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Floppy Formatter\\nBinaryPattern=kfloppy;\\nDocPath=kfloppy/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
-
-?package(gfloppy): needs="gnome" section="Administer Your System" title="Format Floppies" icon="gfloppy.png" command="gfloppy"
-
-# Use a Terminal Emulator
-?package(kdebase-konsole): needs="kde" kde_filename="konsole" section="Administer Your System" title="Use a Terminal Emulator" icon="konsole.png" command="konsole" kde_opt="\\nEncoding=UTF-8\\nDocPath=konsole/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nGenericName=Terminal Program\\nX-DCOP-ServiceType=Multi\\nX-KDE-AuthorizeAction=shell_access\\n"
-
-?package(gnome-terminal): needs="gnome" section="Administer Your System" title="Use a Terminal Emulator" icon="gnome-terminal.png" command="gnome-terminal"
-
-# .hidden
-?package(kdepim-kontact): needs="kde" kde_filename="kontact-summary" section=.hidden title="Kontact" icon="kontact-mdk.png" command="kontact --module summary" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
-
-
-
-## Read documentation
-# Mandriva Linux documentation in german
-#?package(mandrake-doc-de): command="/usr/bin/www-browser /usr/share/doc/mandriva/de/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in German" section="Read Documentation"
-
-# Mandriva Linux documentation in english
-?package(mandriva-doc-Discovery-en): command="/usr/bin/www-browser /usr/share/doc/mandriva/en/Discovery/Discovery.html/index.html" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in English" section="Read Documentation"
-
-# Mandriva Linux documentation in spanish
-#?package(mandrake-doc-es): command="/usr/bin/www-browser /usr/share/doc/mandriva/es/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in Spanish" section="Read Documentation"
-
-# Mandriva Linux documentation in spanish
-?package(mandriva-doc-Discovery-fr): command="/usr/bin/www-browser /usr/share/doc/mandriva/fr/Discovery/Discovery.html/index.html" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in French" section="Read Documentation"
-
-# Mandriva Linux documentation in italian
-#?package(mandrake-doc-it): command="/usr/bin/www-browser /usr/share/doc/mandriva/it/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in Italian" section="Read Documentation"
-
-# Mandriva Linux documentation in chinese
-#?package(mandrake-doc-zh_cn): command="/usr/bin/www-browser /usr/share/doc/mandriva/zh_cn/" icon="documentation_section.png" needs="x11" title="Mandriva Linux documentation in Chinese" section="Read Documentation"
diff --git a/trunk/menu/desktop-directories/mandriva-hidden.directory.in b/trunk/menu/desktop-directories/mandriva-hidden.directory.in
deleted file mode 100644
index d45295c..0000000
--- a/trunk/menu/desktop-directories/mandriva-hidden.directory.in
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=.hidden
-NoDisplay=true
-_Comment=Please don't remove or modify
-Icon=go
diff --git a/trunk/menu/desktop-directories/mandriva-internet-chat.directory.in b/trunk/menu/desktop-directories/mandriva-internet-chat.directory.in
deleted file mode 100644
index a38ac09..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-chat.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Chat
-Icon=chat_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-filetransfer.directory.in b/trunk/menu/desktop-directories/mandriva-internet-filetransfer.directory.in
deleted file mode 100644
index 241d150..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-filetransfer.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=File Transfer
-Icon=file_transfer_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in b/trunk/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
deleted file mode 100644
index 543bf14..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Instant Messaging
-Icon=instant_messaging_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-mail.directory.in b/trunk/menu/desktop-directories/mandriva-internet-mail.directory.in
deleted file mode 100644
index 2370cf1..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-mail.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Mail
-Icon=mail_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-news.directory.in b/trunk/menu/desktop-directories/mandriva-internet-news.directory.in
deleted file mode 100644
index 9c3be3d..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-news.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=News
-Icon=news_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-other.directory.in b/trunk/menu/desktop-directories/mandriva-internet-other.directory.in
deleted file mode 100644
index f79943a..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_networking
diff --git a/trunk/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in b/trunk/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
deleted file mode 100644
index ccfc817..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Remote Access
-Icon=remote_access_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-videoconference.directory.in b/trunk/menu/desktop-directories/mandriva-internet-videoconference.directory.in
deleted file mode 100644
index 3aa8bed..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-videoconference.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Video Conference
-Icon=video_conferences_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in b/trunk/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
deleted file mode 100644
index 712821a..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Web Browsers
-Icon=web_browser_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-webeditors.directory.in b/trunk/menu/desktop-directories/mandriva-internet-webeditors.directory.in
deleted file mode 100644
index 1930c53..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet-webeditors.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Web Editors
-Icon=web_editors_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet.directory.in b/trunk/menu/desktop-directories/mandriva-internet.directory.in
deleted file mode 100644
index e6bf925..0000000
--- a/trunk/menu/desktop-directories/mandriva-internet.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Internet
-Icon=internet_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in
deleted file mode 100644
index f43220c..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Accessibility
-Icon=accessibility_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-communications.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-communications.directory.in
deleted file mode 100644
index a52c0ba..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-communications.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Communications
-Icon=communications_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-databases.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-databases.directory.in
deleted file mode 100644
index 53be655..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-databases.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Databases
-Icon=databases_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in
deleted file mode 100644
index dd6b40e..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Development Environments
-Icon=development_environment_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
deleted file mode 100644
index c03f2b7..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Interpreters
-Icon=interpreters_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
deleted file mode 100644
index f7a909b..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=development_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in
deleted file mode 100644
index df038a7..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Tools
-Icon=development_tools_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development.directory.in
deleted file mode 100644
index 410858c..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-development.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Development
-Icon=development_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in
deleted file mode 100644
index c4e892d..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Documentation
-Icon=documentation_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-editors.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-editors.directory.in
deleted file mode 100644
index 9d61e53..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-editors.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Editors
-Icon=editors_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
deleted file mode 100644
index 582e3c5..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Economy
-Icon=education_economy_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
deleted file mode 100644
index 738fd42..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Geography
-Icon=education_geography_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
deleted file mode 100644
index 80b37e1..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=History
-Icon=education_history_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in
deleted file mode 100644
index c8ad555..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Languages
-Icon=education_languages_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
deleted file mode 100644
index 8643eb9..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Literature
-Icon=education_literature_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in
deleted file mode 100644
index 18dc436..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=education_other_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in
deleted file mode 100644
index b8c71b7..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sciences
-Icon=education_sciences
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
deleted file mode 100644
index 877f2bc..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sports
-Icon=education_sport_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education.directory.in
deleted file mode 100644
index edca46a..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-education.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Education
-Icon=education_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in
deleted file mode 100644
index 273fdab..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Emulators
-Icon=emulators_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-finances.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-finances.directory.in
deleted file mode 100644
index ed2c40f..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-finances.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Finances
-Icon=finances_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in
deleted file mode 100644
index 2aa1562..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Adventure
-Icon=adventure_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in
deleted file mode 100644
index c1b0e90..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Arcade
-Icon=arcade_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in
deleted file mode 100644
index 18954fa..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Boards
-Icon=boards_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in
deleted file mode 100644
index 2ac788f..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Cards
-Icon=cards_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in
deleted file mode 100644
index 39f3a69..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_amusement
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in
deleted file mode 100644
index 8ce0de8..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Puzzles
-Icon=puzzle_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in
deleted file mode 100644
index abf35c7..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sports
-Icon=sport_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in
deleted file mode 100644
index e034101..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Strategy
-Icon=strategy_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in
deleted file mode 100644
index 6565d42..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Toys
-Icon=toys_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games.directory.in
deleted file mode 100644
index 018fb82..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-games.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Games
-Icon=amusement_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-other.directory.in
deleted file mode 100644
index 85301a2..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=more_applications_other_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in
deleted file mode 100644
index 7cb1564..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Artificial Intelligence
-Icon=artificial_intelligence_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in
deleted file mode 100644
index a90b846..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Astronomy
-Icon=astronomy_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in
deleted file mode 100644
index 080fe41..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Biology
-Icon=biology_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in
deleted file mode 100644
index 6d26b77..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Chemistry
-Icon=chemistry_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in
deleted file mode 100644
index 3af7cb0..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Computer Science
-Icon=computer_science_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in
deleted file mode 100644
index 34474cc..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Data Visualization
-Icon=data_visualization_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in
deleted file mode 100644
index dfbfd6f..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Electricity
-Icon=electricity_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in
deleted file mode 100644
index 1163474..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Geosciences
-Icon=geosciences_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in
deleted file mode 100644
index 27c465a..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Image Processing
-Icon=image_processing_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in
deleted file mode 100644
index e63c918..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Mathematics
-Icon=mathematics_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in
deleted file mode 100644
index 8fb6220..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Numeric Analysis
-Icon=numerical_analysis_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in
deleted file mode 100644
index 1662a74..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_sciences
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in
deleted file mode 100644
index 37e9ff5..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Parallel Computing
-Icon=parallel_computing_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in
deleted file mode 100644
index c1b1df4..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Physics
-Icon=physics_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in
deleted file mode 100644
index 225c8d5..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Robotics
-Icon=robotics_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in
deleted file mode 100644
index c662b55..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sciences
-Icon=sciences_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications.directory.in
deleted file mode 100644
index 92b384f..0000000
--- a/trunk/menu/desktop-directories/mandriva-moreapplications.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=More Applications
-Icon=more_applications_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia-graphics.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia-graphics.directory.in
deleted file mode 100644
index 5dfcef9..0000000
--- a/trunk/menu/desktop-directories/mandriva-multimedia-graphics.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Graphics
-Icon=graphics_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia-other.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia-other.directory.in
deleted file mode 100644
index 010bf91..0000000
--- a/trunk/menu/desktop-directories/mandriva-multimedia-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=multimedia_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia-sound.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia-sound.directory.in
deleted file mode 100644
index b0206ed..0000000
--- a/trunk/menu/desktop-directories/mandriva-multimedia-sound.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sound
-Icon=sound_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia-video.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia-video.directory.in
deleted file mode 100644
index 5ba7030..0000000
--- a/trunk/menu/desktop-directories/mandriva-multimedia-video.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Video
-Icon=video_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia.directory.in
deleted file mode 100644
index ccaaa00..0000000
--- a/trunk/menu/desktop-directories/mandriva-multimedia.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Multimedia
-Icon=multimedia_section
diff --git a/trunk/menu/desktop-directories/mandriva-networking.directory.in b/trunk/menu/desktop-directories/mandriva-networking.directory.in
deleted file mode 100644
index b920097..0000000
--- a/trunk/menu/desktop-directories/mandriva-networking.directory.in
+++ /dev/null
@@ -1,4 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Networking
diff --git a/trunk/menu/desktop-directories/mandriva-office-accessories.directory.in b/trunk/menu/desktop-directories/mandriva-office-accessories.directory.in
deleted file mode 100644
index 4b4b8f8..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-accessories.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Accessories
-Icon=office_accessories_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-addressbooks.directory.in b/trunk/menu/desktop-directories/mandriva-office-addressbooks.directory.in
deleted file mode 100644
index e4efce6..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-addressbooks.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Address Books
-Icon=addressbook_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications-fax.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications-fax.directory.in
deleted file mode 100644
index b40260d..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-communications-fax.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Fax
-Icon=communications_fax_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications-other.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications-other.directory.in
deleted file mode 100644
index cb4e4af..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-communications-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=communications_other_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications-pda.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications-pda.directory.in
deleted file mode 100644
index c513475..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-communications-pda.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=PDA
-Icon=pda_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications-phone.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications-phone.directory.in
deleted file mode 100644
index c85e2a6..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-communications-phone.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Phone
-Icon=communications_phone_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications.directory.in
deleted file mode 100644
index a52c0ba..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-communications.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Communications
-Icon=communications_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-drawing.directory.in b/trunk/menu/desktop-directories/mandriva-office-drawing.directory.in
deleted file mode 100644
index e5e6736..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-drawing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Drawing
-Icon=office_drawing_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-graphs.directory.in b/trunk/menu/desktop-directories/mandriva-office-graphs.directory.in
deleted file mode 100644
index e0c5d5d..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-graphs.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Graphs
-Icon=graphs_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-other.directory.in b/trunk/menu/desktop-directories/mandriva-office-other.directory.in
deleted file mode 100644
index db3f56b..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=office_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-presentations.directory.in b/trunk/menu/desktop-directories/mandriva-office-presentations.directory.in
deleted file mode 100644
index c3102ef..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-presentations.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Presentations
-Icon=presentation_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-publishing.directory.in b/trunk/menu/desktop-directories/mandriva-office-publishing.directory.in
deleted file mode 100644
index ecab9f6..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-publishing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Publishing
-Icon=publishing_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-spreadsheets.directory.in b/trunk/menu/desktop-directories/mandriva-office-spreadsheets.directory.in
deleted file mode 100644
index b64f8e6..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-spreadsheets.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Spreadsheets
-Icon=spreadsheet_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in b/trunk/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
deleted file mode 100644
index 3cc120f..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Tasks Management
-Icon=taskmanagement_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-timemanagement.directory.in b/trunk/menu/desktop-directories/mandriva-office-timemanagement.directory.in
deleted file mode 100644
index ad8c6e9..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-timemanagement.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Time Management
-Icon=timemanagement_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-wordprocessors.directory.in b/trunk/menu/desktop-directories/mandriva-office-wordprocessors.directory.in
deleted file mode 100644
index c2e96e2..0000000
--- a/trunk/menu/desktop-directories/mandriva-office-wordprocessors.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Wordprocessors
-Icon=wordprocessor_section
diff --git a/trunk/menu/desktop-directories/mandriva-office.directory.in b/trunk/menu/desktop-directories/mandriva-office.directory.in
deleted file mode 100644
index 97a7706..0000000
--- a/trunk/menu/desktop-directories/mandriva-office.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Office
-Icon=office_section
diff --git a/trunk/menu/desktop-directories/mandriva-other.directory.in b/trunk/menu/desktop-directories/mandriva-other.directory.in
deleted file mode 100644
index 85301a2..0000000
--- a/trunk/menu/desktop-directories/mandriva-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=more_applications_other_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving-backup.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
deleted file mode 100644
index 4fd55f1..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Backup
-Icon=backup_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
deleted file mode 100644
index 5cae6d0..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=CD Burning
-Icon=cd_burning_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving-compression.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving-compression.directory.in
deleted file mode 100644
index ef08446..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-archiving-compression.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Compression
-Icon=compression_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving-other.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving-other.directory.in
deleted file mode 100644
index 1a0f328..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-archiving-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_archiving
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving.directory.in
deleted file mode 100644
index 20e5d95..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-archiving.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Archiving
-Icon=archiving_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
deleted file mode 100644
index d818d52..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Boot and Init
-Icon=boot_init_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in
deleted file mode 100644
index abc84b4..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Accessibility
-Icon=accessibility-directory
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in
deleted file mode 100644
index 1fa5fe7..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Advanced
-_Comment=Advanced Settings
-Icon=advanced-directory
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in
deleted file mode 100644
index 4118eb1..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=GNOME
-Icon=gnome_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
deleted file mode 100644
index 86cb531..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Hardware
-Icon=hardware_configuration_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-kde.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-kde.directory.in
deleted file mode 100644
index 40183dc..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-kde.directory.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=KDE
-X-KDE-BaseGroup=settings
-Icon=kde_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-networking.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-networking.directory.in
deleted file mode 100644
index 72ec939..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-networking.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Networking
-Icon=networking_configuration_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-other.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-other.directory.in
deleted file mode 100644
index 51b50ad..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_configuration
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
deleted file mode 100644
index 37c3ceb..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Packaging
-Icon=packaging_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-printing.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-printing.directory.in
deleted file mode 100644
index d9988df..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration-printing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Printing
-Icon=printing_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration.directory.in
deleted file mode 100644
index a3b404b..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-configuration.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Configuration
-Icon=configuration_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-filetools.directory.in b/trunk/menu/desktop-directories/mandriva-system-filetools.directory.in
deleted file mode 100644
index 4306fb7..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-filetools.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=File Tools
-Icon=file_tools_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-monitoring.directory.in b/trunk/menu/desktop-directories/mandriva-system-monitoring.directory.in
deleted file mode 100644
index df68be5..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-monitoring.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Monitoring
-Icon=monitoring_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-terminals.directory.in b/trunk/menu/desktop-directories/mandriva-system-terminals.directory.in
deleted file mode 100644
index ed56f96..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-terminals.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Terminals
-Icon=terminals_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-texttools.directory.in b/trunk/menu/desktop-directories/mandriva-system-texttools.directory.in
deleted file mode 100644
index da94ea2..0000000
--- a/trunk/menu/desktop-directories/mandriva-system-texttools.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Text Tools
-Icon=text_tools_section
diff --git a/trunk/menu/desktop-directories/mandriva-system.directory.in b/trunk/menu/desktop-directories/mandriva-system.directory.in
deleted file mode 100644
index b84cb66..0000000
--- a/trunk/menu/desktop-directories/mandriva-system.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=System
-Icon=system_section
diff --git a/trunk/menu/desktop-directories/mandrivalinux.directory.in b/trunk/menu/desktop-directories/mandrivalinux.directory.in
deleted file mode 100644
index 926cada..0000000
--- a/trunk/menu/desktop-directories/mandrivalinux.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Applications
-Icon=mandriva
diff --git a/trunk/menu/icons/accessibility_section.png b/trunk/menu/icons/accessibility_section.png
deleted file mode 100644
index 18d276f..0000000
--- a/trunk/menu/icons/accessibility_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/addressbook_section.png b/trunk/menu/icons/addressbook_section.png
deleted file mode 100644
index 6b3e60a..0000000
--- a/trunk/menu/icons/addressbook_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/adventure_section.png b/trunk/menu/icons/adventure_section.png
deleted file mode 100644
index fc68ca0..0000000
--- a/trunk/menu/icons/adventure_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/amusement_section.png b/trunk/menu/icons/amusement_section.png
deleted file mode 100644
index f30969f..0000000
--- a/trunk/menu/icons/amusement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/applications_section.png b/trunk/menu/icons/applications_section.png
deleted file mode 100644
index 9140a71..0000000
--- a/trunk/menu/icons/applications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/arcade_section.png b/trunk/menu/icons/arcade_section.png
deleted file mode 100644
index 3003afa..0000000
--- a/trunk/menu/icons/arcade_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/archiving_section.png b/trunk/menu/icons/archiving_section.png
deleted file mode 100644
index 6f81dab..0000000
--- a/trunk/menu/icons/archiving_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/artificial_intelligence_section.png b/trunk/menu/icons/artificial_intelligence_section.png
deleted file mode 100644
index 0a1d0cf..0000000
--- a/trunk/menu/icons/artificial_intelligence_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/astronomy_section.png b/trunk/menu/icons/astronomy_section.png
deleted file mode 100644
index 5a7f0a0..0000000
--- a/trunk/menu/icons/astronomy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/backup_section.png b/trunk/menu/icons/backup_section.png
deleted file mode 100644
index 2d8db19..0000000
--- a/trunk/menu/icons/backup_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/biology_section.png b/trunk/menu/icons/biology_section.png
deleted file mode 100644
index 8a9b9be..0000000
--- a/trunk/menu/icons/biology_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/boards_section.png b/trunk/menu/icons/boards_section.png
deleted file mode 100644
index 601d1ef..0000000
--- a/trunk/menu/icons/boards_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/boot_init_section.png b/trunk/menu/icons/boot_init_section.png
deleted file mode 100644
index 283038a..0000000
--- a/trunk/menu/icons/boot_init_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/cards_section.png b/trunk/menu/icons/cards_section.png
deleted file mode 100644
index 68a4e36..0000000
--- a/trunk/menu/icons/cards_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/cd_burning_section.png b/trunk/menu/icons/cd_burning_section.png
deleted file mode 100644
index 7053283..0000000
--- a/trunk/menu/icons/cd_burning_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/chat_section.png b/trunk/menu/icons/chat_section.png
deleted file mode 100644
index 9cc2a8b..0000000
--- a/trunk/menu/icons/chat_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/chemistry_section.png b/trunk/menu/icons/chemistry_section.png
deleted file mode 100644
index 7abf315..0000000
--- a/trunk/menu/icons/chemistry_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/chinese_section.png b/trunk/menu/icons/chinese_section.png
deleted file mode 100644
index 6487bde..0000000
--- a/trunk/menu/icons/chinese_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/code_generator_section.png b/trunk/menu/icons/code_generator_section.png
deleted file mode 100644
index fb063ca..0000000
--- a/trunk/menu/icons/code_generator_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/communications_fax_section.png b/trunk/menu/icons/communications_fax_section.png
deleted file mode 100644
index 839451b..0000000
--- a/trunk/menu/icons/communications_fax_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/communications_other_section.png b/trunk/menu/icons/communications_other_section.png
deleted file mode 100644
index 354976c..0000000
--- a/trunk/menu/icons/communications_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/communications_phone_section.png b/trunk/menu/icons/communications_phone_section.png
deleted file mode 100644
index 05aff8e..0000000
--- a/trunk/menu/icons/communications_phone_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/communications_section.png b/trunk/menu/icons/communications_section.png
deleted file mode 100644
index 510d302..0000000
--- a/trunk/menu/icons/communications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/compression_section.png b/trunk/menu/icons/compression_section.png
deleted file mode 100644
index 8f7197a..0000000
--- a/trunk/menu/icons/compression_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/computer_science_section.png b/trunk/menu/icons/computer_science_section.png
deleted file mode 100644
index 310b91f..0000000
--- a/trunk/menu/icons/computer_science_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/configuration_section.png b/trunk/menu/icons/configuration_section.png
deleted file mode 100644
index 54979c4..0000000
--- a/trunk/menu/icons/configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/data_visualization_section.png b/trunk/menu/icons/data_visualization_section.png
deleted file mode 100644
index b1fcbef..0000000
--- a/trunk/menu/icons/data_visualization_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/databases_section.png b/trunk/menu/icons/databases_section.png
deleted file mode 100644
index d3f9299..0000000
--- a/trunk/menu/icons/databases_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/development_environment_section.png b/trunk/menu/icons/development_environment_section.png
deleted file mode 100644
index 4585dd4..0000000
--- a/trunk/menu/icons/development_environment_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/development_section.png b/trunk/menu/icons/development_section.png
deleted file mode 100644
index fc33637..0000000
--- a/trunk/menu/icons/development_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/development_tools_section.png b/trunk/menu/icons/development_tools_section.png
deleted file mode 100644
index 0be303e..0000000
--- a/trunk/menu/icons/development_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/documentation_section.png b/trunk/menu/icons/documentation_section.png
deleted file mode 100644
index 27aa0dc..0000000
--- a/trunk/menu/icons/documentation_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/editors_section.png b/trunk/menu/icons/editors_section.png
deleted file mode 100644
index 499b97d..0000000
--- a/trunk/menu/icons/editors_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_economy_section.png b/trunk/menu/icons/education_economy_section.png
deleted file mode 100644
index bd958a3..0000000
--- a/trunk/menu/icons/education_economy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_geography_section.png b/trunk/menu/icons/education_geography_section.png
deleted file mode 100644
index bfa3c38..0000000
--- a/trunk/menu/icons/education_geography_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_history_section.png b/trunk/menu/icons/education_history_section.png
deleted file mode 100644
index 7b55ca4..0000000
--- a/trunk/menu/icons/education_history_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_languages_section.png b/trunk/menu/icons/education_languages_section.png
deleted file mode 100644
index 1457811..0000000
--- a/trunk/menu/icons/education_languages_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_literature_section.png b/trunk/menu/icons/education_literature_section.png
deleted file mode 100644
index c4c7e48..0000000
--- a/trunk/menu/icons/education_literature_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_mathematics.png b/trunk/menu/icons/education_mathematics.png
deleted file mode 100644
index 9ef0469..0000000
--- a/trunk/menu/icons/education_mathematics.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_other_section.png b/trunk/menu/icons/education_other_section.png
deleted file mode 100644
index 6fea767..0000000
--- a/trunk/menu/icons/education_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_sciences.png b/trunk/menu/icons/education_sciences.png
deleted file mode 100644
index b858fab..0000000
--- a/trunk/menu/icons/education_sciences.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_section.png b/trunk/menu/icons/education_section.png
deleted file mode 100644
index 96a5826..0000000
--- a/trunk/menu/icons/education_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_sport_section.png b/trunk/menu/icons/education_sport_section.png
deleted file mode 100644
index d150eb7..0000000
--- a/trunk/menu/icons/education_sport_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/education_tool.png b/trunk/menu/icons/education_tool.png
deleted file mode 100644
index b13cc87..0000000
--- a/trunk/menu/icons/education_tool.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/electricity_section.png b/trunk/menu/icons/electricity_section.png
deleted file mode 100644
index 1b8f225..0000000
--- a/trunk/menu/icons/electricity_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/emulators_section.png b/trunk/menu/icons/emulators_section.png
deleted file mode 100644
index a1c8399..0000000
--- a/trunk/menu/icons/emulators_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/file_tools_section.png b/trunk/menu/icons/file_tools_section.png
deleted file mode 100644
index b4a1139..0000000
--- a/trunk/menu/icons/file_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/file_transfer_section.png b/trunk/menu/icons/file_transfer_section.png
deleted file mode 100644
index f672912..0000000
--- a/trunk/menu/icons/file_transfer_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/finances_section.png b/trunk/menu/icons/finances_section.png
deleted file mode 100644
index b23df72..0000000
--- a/trunk/menu/icons/finances_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/geosciences_section.png b/trunk/menu/icons/geosciences_section.png
deleted file mode 100644
index d0611cd..0000000
--- a/trunk/menu/icons/geosciences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/gnome_section.png b/trunk/menu/icons/gnome_section.png
deleted file mode 100644
index f2f9254..0000000
--- a/trunk/menu/icons/gnome_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/graphics_section.png b/trunk/menu/icons/graphics_section.png
deleted file mode 100644
index 7511e1e..0000000
--- a/trunk/menu/icons/graphics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/graphs_section.png b/trunk/menu/icons/graphs_section.png
deleted file mode 100644
index 242430d..0000000
--- a/trunk/menu/icons/graphs_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/hardware_configuration_section.png b/trunk/menu/icons/hardware_configuration_section.png
deleted file mode 100644
index 1e9a2ab..0000000
--- a/trunk/menu/icons/hardware_configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/hardware_section.png b/trunk/menu/icons/hardware_section.png
deleted file mode 100644
index f1775b7..0000000
--- a/trunk/menu/icons/hardware_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/image_processing_section.png b/trunk/menu/icons/image_processing_section.png
deleted file mode 100644
index 9f9b8b7..0000000
--- a/trunk/menu/icons/image_processing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/instant_messaging_section.png b/trunk/menu/icons/instant_messaging_section.png
deleted file mode 100644
index 36f9d08..0000000
--- a/trunk/menu/icons/instant_messaging_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/internet_section.png b/trunk/menu/icons/internet_section.png
deleted file mode 100644
index ee4dab8..0000000
--- a/trunk/menu/icons/internet_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/interpreters_section.png b/trunk/menu/icons/interpreters_section.png
deleted file mode 100644
index b5f7094..0000000
--- a/trunk/menu/icons/interpreters_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/irc_section.png b/trunk/menu/icons/irc_section.png
deleted file mode 100644
index 90f5488..0000000
--- a/trunk/menu/icons/irc_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/kde_section.png b/trunk/menu/icons/kde_section.png
deleted file mode 100644
index ff9d36f..0000000
--- a/trunk/menu/icons/kde_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/accessibility_section.png b/trunk/menu/icons/large/accessibility_section.png
deleted file mode 100644
index b51e00b..0000000
--- a/trunk/menu/icons/large/accessibility_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/addressbook_section.png b/trunk/menu/icons/large/addressbook_section.png
deleted file mode 100644
index a525e7b..0000000
--- a/trunk/menu/icons/large/addressbook_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/adventure_section.png b/trunk/menu/icons/large/adventure_section.png
deleted file mode 100644
index cbb3192..0000000
--- a/trunk/menu/icons/large/adventure_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/amusement_section.png b/trunk/menu/icons/large/amusement_section.png
deleted file mode 100644
index 51038db..0000000
--- a/trunk/menu/icons/large/amusement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/applications_section.png b/trunk/menu/icons/large/applications_section.png
deleted file mode 100644
index 8d5f554..0000000
--- a/trunk/menu/icons/large/applications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/arcade_section.png b/trunk/menu/icons/large/arcade_section.png
deleted file mode 100644
index 5052c2d..0000000
--- a/trunk/menu/icons/large/arcade_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/archiving_section.png b/trunk/menu/icons/large/archiving_section.png
deleted file mode 100644
index 5ca5700..0000000
--- a/trunk/menu/icons/large/archiving_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/artificial_intelligence_section.png b/trunk/menu/icons/large/artificial_intelligence_section.png
deleted file mode 100644
index 30f48ce..0000000
--- a/trunk/menu/icons/large/artificial_intelligence_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/astronomy_section.png b/trunk/menu/icons/large/astronomy_section.png
deleted file mode 100644
index 751558b..0000000
--- a/trunk/menu/icons/large/astronomy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/backup_section.png b/trunk/menu/icons/large/backup_section.png
deleted file mode 100644
index cf08148..0000000
--- a/trunk/menu/icons/large/backup_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/biology_section.png b/trunk/menu/icons/large/biology_section.png
deleted file mode 100644
index 9707049..0000000
--- a/trunk/menu/icons/large/biology_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/boards_section.png b/trunk/menu/icons/large/boards_section.png
deleted file mode 100644
index e2f857c..0000000
--- a/trunk/menu/icons/large/boards_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/boot_init_section.png b/trunk/menu/icons/large/boot_init_section.png
deleted file mode 100644
index eec582f..0000000
--- a/trunk/menu/icons/large/boot_init_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/cards_section.png b/trunk/menu/icons/large/cards_section.png
deleted file mode 100644
index 8c38517..0000000
--- a/trunk/menu/icons/large/cards_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/cd_burning_section.png b/trunk/menu/icons/large/cd_burning_section.png
deleted file mode 100644
index a75175a..0000000
--- a/trunk/menu/icons/large/cd_burning_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/chat_section.png b/trunk/menu/icons/large/chat_section.png
deleted file mode 100644
index 1009e00..0000000
--- a/trunk/menu/icons/large/chat_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/chemistry_section.png b/trunk/menu/icons/large/chemistry_section.png
deleted file mode 100644
index 9305201..0000000
--- a/trunk/menu/icons/large/chemistry_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/chinese_section.png b/trunk/menu/icons/large/chinese_section.png
deleted file mode 100644
index 304f308..0000000
--- a/trunk/menu/icons/large/chinese_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/code_generator_section.png b/trunk/menu/icons/large/code_generator_section.png
deleted file mode 100644
index 01d7ed6..0000000
--- a/trunk/menu/icons/large/code_generator_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/communications_fax_section.png b/trunk/menu/icons/large/communications_fax_section.png
deleted file mode 100644
index 1007128..0000000
--- a/trunk/menu/icons/large/communications_fax_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/communications_other_section.png b/trunk/menu/icons/large/communications_other_section.png
deleted file mode 100644
index f01bc2d..0000000
--- a/trunk/menu/icons/large/communications_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/communications_phone_section.png b/trunk/menu/icons/large/communications_phone_section.png
deleted file mode 100644
index d9c9c9f..0000000
--- a/trunk/menu/icons/large/communications_phone_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/communications_section.png b/trunk/menu/icons/large/communications_section.png
deleted file mode 100644
index 362fc23..0000000
--- a/trunk/menu/icons/large/communications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/compression_section.png b/trunk/menu/icons/large/compression_section.png
deleted file mode 100644
index e6772c8..0000000
--- a/trunk/menu/icons/large/compression_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/computer_science_section.png b/trunk/menu/icons/large/computer_science_section.png
deleted file mode 100644
index a84ca67..0000000
--- a/trunk/menu/icons/large/computer_science_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/configuration_section.png b/trunk/menu/icons/large/configuration_section.png
deleted file mode 100644
index ba22103..0000000
--- a/trunk/menu/icons/large/configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/data_visualization_section.png b/trunk/menu/icons/large/data_visualization_section.png
deleted file mode 100644
index 6c7c73c..0000000
--- a/trunk/menu/icons/large/data_visualization_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/databases_section.png b/trunk/menu/icons/large/databases_section.png
deleted file mode 100644
index a2371ad..0000000
--- a/trunk/menu/icons/large/databases_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/development_environment_section.png b/trunk/menu/icons/large/development_environment_section.png
deleted file mode 100644
index b77ead3..0000000
--- a/trunk/menu/icons/large/development_environment_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/development_section.png b/trunk/menu/icons/large/development_section.png
deleted file mode 100644
index 5b60abd..0000000
--- a/trunk/menu/icons/large/development_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/development_tools_section.png b/trunk/menu/icons/large/development_tools_section.png
deleted file mode 100644
index f92a808..0000000
--- a/trunk/menu/icons/large/development_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/documentation_section.png b/trunk/menu/icons/large/documentation_section.png
deleted file mode 100644
index a2c946e..0000000
--- a/trunk/menu/icons/large/documentation_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/editors_section.png b/trunk/menu/icons/large/editors_section.png
deleted file mode 100644
index 2ba7bc2..0000000
--- a/trunk/menu/icons/large/editors_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_economy_section.png b/trunk/menu/icons/large/education_economy_section.png
deleted file mode 100644
index 3edae59..0000000
--- a/trunk/menu/icons/large/education_economy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_geography_section.png b/trunk/menu/icons/large/education_geography_section.png
deleted file mode 100644
index 50a32eb..0000000
--- a/trunk/menu/icons/large/education_geography_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_history_section.png b/trunk/menu/icons/large/education_history_section.png
deleted file mode 100644
index 8c722e7..0000000
--- a/trunk/menu/icons/large/education_history_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_languages_section.png b/trunk/menu/icons/large/education_languages_section.png
deleted file mode 100644
index df32f35..0000000
--- a/trunk/menu/icons/large/education_languages_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_literature_section.png b/trunk/menu/icons/large/education_literature_section.png
deleted file mode 100644
index 78b533c..0000000
--- a/trunk/menu/icons/large/education_literature_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_mathematics.png b/trunk/menu/icons/large/education_mathematics.png
deleted file mode 100644
index 6026c20..0000000
--- a/trunk/menu/icons/large/education_mathematics.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_other_section.png b/trunk/menu/icons/large/education_other_section.png
deleted file mode 100644
index 006730a..0000000
--- a/trunk/menu/icons/large/education_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_sciences.png b/trunk/menu/icons/large/education_sciences.png
deleted file mode 100644
index 2caacb7..0000000
--- a/trunk/menu/icons/large/education_sciences.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_section.png b/trunk/menu/icons/large/education_section.png
deleted file mode 100644
index c56099a..0000000
--- a/trunk/menu/icons/large/education_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_sport_section.png b/trunk/menu/icons/large/education_sport_section.png
deleted file mode 100644
index 0b6e59a..0000000
--- a/trunk/menu/icons/large/education_sport_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/education_tool.png b/trunk/menu/icons/large/education_tool.png
deleted file mode 100644
index 9ea3024..0000000
--- a/trunk/menu/icons/large/education_tool.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/electricity_section.png b/trunk/menu/icons/large/electricity_section.png
deleted file mode 100644
index c96bfec..0000000
--- a/trunk/menu/icons/large/electricity_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/emulators_section.png b/trunk/menu/icons/large/emulators_section.png
deleted file mode 100644
index 34b05a2..0000000
--- a/trunk/menu/icons/large/emulators_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/file_tools_section.png b/trunk/menu/icons/large/file_tools_section.png
deleted file mode 100644
index f45ce9e..0000000
--- a/trunk/menu/icons/large/file_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/file_transfer_section.png b/trunk/menu/icons/large/file_transfer_section.png
deleted file mode 100644
index 7904a10..0000000
--- a/trunk/menu/icons/large/file_transfer_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/finances_section.png b/trunk/menu/icons/large/finances_section.png
deleted file mode 100644
index 5a828c3..0000000
--- a/trunk/menu/icons/large/finances_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/geosciences_section.png b/trunk/menu/icons/large/geosciences_section.png
deleted file mode 100644
index 4d8ddc0..0000000
--- a/trunk/menu/icons/large/geosciences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/gnome_section.png b/trunk/menu/icons/large/gnome_section.png
deleted file mode 100644
index 0958e57..0000000
--- a/trunk/menu/icons/large/gnome_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/graphics_section.png b/trunk/menu/icons/large/graphics_section.png
deleted file mode 100644
index 618c01f..0000000
--- a/trunk/menu/icons/large/graphics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/graphs_section.png b/trunk/menu/icons/large/graphs_section.png
deleted file mode 100644
index bb00a78..0000000
--- a/trunk/menu/icons/large/graphs_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/hardware_configuration_section.png b/trunk/menu/icons/large/hardware_configuration_section.png
deleted file mode 100644
index daa4820..0000000
--- a/trunk/menu/icons/large/hardware_configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/hardware_section.png b/trunk/menu/icons/large/hardware_section.png
deleted file mode 100644
index 2c9da56..0000000
--- a/trunk/menu/icons/large/hardware_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/image_processing_section.png b/trunk/menu/icons/large/image_processing_section.png
deleted file mode 100644
index 6c7971a..0000000
--- a/trunk/menu/icons/large/image_processing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/instant_messaging_section.png b/trunk/menu/icons/large/instant_messaging_section.png
deleted file mode 100644
index fd5d7b8..0000000
--- a/trunk/menu/icons/large/instant_messaging_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/internet_section.png b/trunk/menu/icons/large/internet_section.png
deleted file mode 100644
index d2c306a..0000000
--- a/trunk/menu/icons/large/internet_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/interpreters_section.png b/trunk/menu/icons/large/interpreters_section.png
deleted file mode 100644
index 811b12f..0000000
--- a/trunk/menu/icons/large/interpreters_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/irc_section.png b/trunk/menu/icons/large/irc_section.png
deleted file mode 100644
index 64b15ac..0000000
--- a/trunk/menu/icons/large/irc_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/kde_section.png b/trunk/menu/icons/large/kde_section.png
deleted file mode 100644
index ffd82d7..0000000
--- a/trunk/menu/icons/large/kde_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/mail_section.png b/trunk/menu/icons/large/mail_section.png
deleted file mode 100644
index ceb01ef..0000000
--- a/trunk/menu/icons/large/mail_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/mandrake.png b/trunk/menu/icons/large/mandrake.png
deleted file mode 100644
index b3b811c..0000000
--- a/trunk/menu/icons/large/mandrake.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/mathematics_section.png b/trunk/menu/icons/large/mathematics_section.png
deleted file mode 100644
index 2f49d29..0000000
--- a/trunk/menu/icons/large/mathematics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/monitoring_section.png b/trunk/menu/icons/large/monitoring_section.png
deleted file mode 100644
index 1c669e9..0000000
--- a/trunk/menu/icons/large/monitoring_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/more_applications_other_section.png b/trunk/menu/icons/large/more_applications_other_section.png
deleted file mode 100644
index 6d6b95e..0000000
--- a/trunk/menu/icons/large/more_applications_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/more_applications_section.png b/trunk/menu/icons/large/more_applications_section.png
deleted file mode 100644
index 6d6b95e..0000000
--- a/trunk/menu/icons/large/more_applications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/multimedia_section.png b/trunk/menu/icons/large/multimedia_section.png
deleted file mode 100644
index 2112b8d..0000000
--- a/trunk/menu/icons/large/multimedia_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/networking_configuration_section.png b/trunk/menu/icons/large/networking_configuration_section.png
deleted file mode 100644
index 278f4b2..0000000
--- a/trunk/menu/icons/large/networking_configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/networking_section.png b/trunk/menu/icons/large/networking_section.png
deleted file mode 100644
index 00150e9..0000000
--- a/trunk/menu/icons/large/networking_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/networking_www_section.png b/trunk/menu/icons/large/networking_www_section.png
deleted file mode 100644
index 982315a..0000000
--- a/trunk/menu/icons/large/networking_www_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/news_section.png b/trunk/menu/icons/large/news_section.png
deleted file mode 100644
index b3055eb..0000000
--- a/trunk/menu/icons/large/news_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/numerical_analysis_section.png b/trunk/menu/icons/large/numerical_analysis_section.png
deleted file mode 100644
index a656f84..0000000
--- a/trunk/menu/icons/large/numerical_analysis_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/office_accessories_section.png b/trunk/menu/icons/large/office_accessories_section.png
deleted file mode 100644
index 231f630..0000000
--- a/trunk/menu/icons/large/office_accessories_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/office_drawing_section.png b/trunk/menu/icons/large/office_drawing_section.png
deleted file mode 100644
index 85b8243..0000000
--- a/trunk/menu/icons/large/office_drawing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/office_section.png b/trunk/menu/icons/large/office_section.png
deleted file mode 100644
index 34f8887..0000000
--- a/trunk/menu/icons/large/office_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/other_amusement.png b/trunk/menu/icons/large/other_amusement.png
deleted file mode 100644
index 6d2f9a4..0000000
--- a/trunk/menu/icons/large/other_amusement.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/other_archiving.png b/trunk/menu/icons/large/other_archiving.png
deleted file mode 100644
index a1d1672..0000000
--- a/trunk/menu/icons/large/other_archiving.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/other_configuration.png b/trunk/menu/icons/large/other_configuration.png
deleted file mode 100644
index 8a369bc..0000000
--- a/trunk/menu/icons/large/other_configuration.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/other_networking.png b/trunk/menu/icons/large/other_networking.png
deleted file mode 100644
index 17112af..0000000
--- a/trunk/menu/icons/large/other_networking.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/other_sciences.png b/trunk/menu/icons/large/other_sciences.png
deleted file mode 100644
index a8db7cc..0000000
--- a/trunk/menu/icons/large/other_sciences.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/packaging_section.png b/trunk/menu/icons/large/packaging_section.png
deleted file mode 100644
index b190bef..0000000
--- a/trunk/menu/icons/large/packaging_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/parallel_computing_section.png b/trunk/menu/icons/large/parallel_computing_section.png
deleted file mode 100644
index 2207b63..0000000
--- a/trunk/menu/icons/large/parallel_computing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/pda_section.png b/trunk/menu/icons/large/pda_section.png
deleted file mode 100644
index 10bfd3c..0000000
--- a/trunk/menu/icons/large/pda_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/physics_section.png b/trunk/menu/icons/large/physics_section.png
deleted file mode 100644
index 2873f76..0000000
--- a/trunk/menu/icons/large/physics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/presentation_section.png b/trunk/menu/icons/large/presentation_section.png
deleted file mode 100644
index 909a6bb..0000000
--- a/trunk/menu/icons/large/presentation_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/printing_section.png b/trunk/menu/icons/large/printing_section.png
deleted file mode 100644
index 37b24e8..0000000
--- a/trunk/menu/icons/large/printing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/publishing_section.png b/trunk/menu/icons/large/publishing_section.png
deleted file mode 100644
index 4804c1e..0000000
--- a/trunk/menu/icons/large/publishing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/puzzle_section.png b/trunk/menu/icons/large/puzzle_section.png
deleted file mode 100644
index 94d1321..0000000
--- a/trunk/menu/icons/large/puzzle_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/remote_access_section.png b/trunk/menu/icons/large/remote_access_section.png
deleted file mode 100644
index 1b795c8..0000000
--- a/trunk/menu/icons/large/remote_access_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/robotics_section.png b/trunk/menu/icons/large/robotics_section.png
deleted file mode 100644
index ce1e868..0000000
--- a/trunk/menu/icons/large/robotics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/sciences_section.png b/trunk/menu/icons/large/sciences_section.png
deleted file mode 100644
index e1cf469..0000000
--- a/trunk/menu/icons/large/sciences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/shells_section.png b/trunk/menu/icons/large/shells_section.png
deleted file mode 100644
index 794a17f..0000000
--- a/trunk/menu/icons/large/shells_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/sound_section.png b/trunk/menu/icons/large/sound_section.png
deleted file mode 100644
index 0757872..0000000
--- a/trunk/menu/icons/large/sound_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/sport_section.png b/trunk/menu/icons/large/sport_section.png
deleted file mode 100644
index d813cd8..0000000
--- a/trunk/menu/icons/large/sport_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/spreadsheet_section.png b/trunk/menu/icons/large/spreadsheet_section.png
deleted file mode 100644
index 840bf45..0000000
--- a/trunk/menu/icons/large/spreadsheet_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/strategy_section.png b/trunk/menu/icons/large/strategy_section.png
deleted file mode 100644
index dc29d60..0000000
--- a/trunk/menu/icons/large/strategy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/system_other_section.png b/trunk/menu/icons/large/system_other_section.png
deleted file mode 100644
index 6f3124c..0000000
--- a/trunk/menu/icons/large/system_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/system_section.png b/trunk/menu/icons/large/system_section.png
deleted file mode 100644
index 9805474..0000000
--- a/trunk/menu/icons/large/system_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/taskmanagement_section.png b/trunk/menu/icons/large/taskmanagement_section.png
deleted file mode 100644
index 3083897..0000000
--- a/trunk/menu/icons/large/taskmanagement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/terminals_section.png b/trunk/menu/icons/large/terminals_section.png
deleted file mode 100644
index 39e70e7..0000000
--- a/trunk/menu/icons/large/terminals_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/text_tools_section.png b/trunk/menu/icons/large/text_tools_section.png
deleted file mode 100644
index 520efff..0000000
--- a/trunk/menu/icons/large/text_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/timemanagement_section.png b/trunk/menu/icons/large/timemanagement_section.png
deleted file mode 100644
index 3d2fc18..0000000
--- a/trunk/menu/icons/large/timemanagement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/toys_section.png b/trunk/menu/icons/large/toys_section.png
deleted file mode 100644
index fd7f914..0000000
--- a/trunk/menu/icons/large/toys_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/video_conferences_section.png b/trunk/menu/icons/large/video_conferences_section.png
deleted file mode 100644
index a882620..0000000
--- a/trunk/menu/icons/large/video_conferences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/video_section.png b/trunk/menu/icons/large/video_section.png
deleted file mode 100644
index 5cb4d11..0000000
--- a/trunk/menu/icons/large/video_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/web_browser_section.png b/trunk/menu/icons/large/web_browser_section.png
deleted file mode 100644
index d62e8f6..0000000
--- a/trunk/menu/icons/large/web_browser_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/web_editors_section.png b/trunk/menu/icons/large/web_editors_section.png
deleted file mode 100644
index 22c2282..0000000
--- a/trunk/menu/icons/large/web_editors_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/windowmanager_section.png b/trunk/menu/icons/large/windowmanager_section.png
deleted file mode 100644
index 04b39af..0000000
--- a/trunk/menu/icons/large/windowmanager_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/large/wordprocessor_section.png b/trunk/menu/icons/large/wordprocessor_section.png
deleted file mode 100644
index 6b89666..0000000
--- a/trunk/menu/icons/large/wordprocessor_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mail_section.png b/trunk/menu/icons/mail_section.png
deleted file mode 100644
index 4895e87..0000000
--- a/trunk/menu/icons/mail_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mandrake.png b/trunk/menu/icons/mandrake.png
deleted file mode 100644
index 0b3199f..0000000
--- a/trunk/menu/icons/mandrake.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mathematics_section.png b/trunk/menu/icons/mathematics_section.png
deleted file mode 100644
index 77ed070..0000000
--- a/trunk/menu/icons/mathematics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/accessibility_section.png b/trunk/menu/icons/mini/accessibility_section.png
deleted file mode 100644
index e2d3958..0000000
--- a/trunk/menu/icons/mini/accessibility_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/addressbook_section.png b/trunk/menu/icons/mini/addressbook_section.png
deleted file mode 100644
index 7c90ed7..0000000
--- a/trunk/menu/icons/mini/addressbook_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/adventure_section.png b/trunk/menu/icons/mini/adventure_section.png
deleted file mode 100644
index 84e4155..0000000
--- a/trunk/menu/icons/mini/adventure_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/amusement_section.png b/trunk/menu/icons/mini/amusement_section.png
deleted file mode 100644
index 71a09d9..0000000
--- a/trunk/menu/icons/mini/amusement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/applications_section.png b/trunk/menu/icons/mini/applications_section.png
deleted file mode 100644
index df2acaf..0000000
--- a/trunk/menu/icons/mini/applications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/arcade_section.png b/trunk/menu/icons/mini/arcade_section.png
deleted file mode 100644
index 0b9edeb..0000000
--- a/trunk/menu/icons/mini/arcade_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/archiving_section.png b/trunk/menu/icons/mini/archiving_section.png
deleted file mode 100644
index 9b974cf..0000000
--- a/trunk/menu/icons/mini/archiving_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/artificial_intelligence_section.png b/trunk/menu/icons/mini/artificial_intelligence_section.png
deleted file mode 100644
index ae9e01f..0000000
--- a/trunk/menu/icons/mini/artificial_intelligence_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/astronomy_section.png b/trunk/menu/icons/mini/astronomy_section.png
deleted file mode 100644
index a900f92..0000000
--- a/trunk/menu/icons/mini/astronomy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/backup_section.png b/trunk/menu/icons/mini/backup_section.png
deleted file mode 100644
index bef6ec6..0000000
--- a/trunk/menu/icons/mini/backup_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/biology_section.png b/trunk/menu/icons/mini/biology_section.png
deleted file mode 100644
index 1afcad1..0000000
--- a/trunk/menu/icons/mini/biology_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/boards_section.png b/trunk/menu/icons/mini/boards_section.png
deleted file mode 100644
index b74790a..0000000
--- a/trunk/menu/icons/mini/boards_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/boot_init_section.png b/trunk/menu/icons/mini/boot_init_section.png
deleted file mode 100644
index 25b02c2..0000000
--- a/trunk/menu/icons/mini/boot_init_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/cards_section.png b/trunk/menu/icons/mini/cards_section.png
deleted file mode 100644
index 1bf7be5..0000000
--- a/trunk/menu/icons/mini/cards_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/cd_burning_section.png b/trunk/menu/icons/mini/cd_burning_section.png
deleted file mode 100644
index 4dd1cee..0000000
--- a/trunk/menu/icons/mini/cd_burning_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/chat_section.png b/trunk/menu/icons/mini/chat_section.png
deleted file mode 100644
index 3aa85bd..0000000
--- a/trunk/menu/icons/mini/chat_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/chemistry_section.png b/trunk/menu/icons/mini/chemistry_section.png
deleted file mode 100644
index a29fac3..0000000
--- a/trunk/menu/icons/mini/chemistry_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/chinese_section.png b/trunk/menu/icons/mini/chinese_section.png
deleted file mode 100644
index bcd698f..0000000
--- a/trunk/menu/icons/mini/chinese_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/code_generator_section.png b/trunk/menu/icons/mini/code_generator_section.png
deleted file mode 100644
index 8500349..0000000
--- a/trunk/menu/icons/mini/code_generator_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/communications_fax_section.png b/trunk/menu/icons/mini/communications_fax_section.png
deleted file mode 100644
index 5d53f2a..0000000
--- a/trunk/menu/icons/mini/communications_fax_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/communications_other_section.png b/trunk/menu/icons/mini/communications_other_section.png
deleted file mode 100644
index 63084b2..0000000
--- a/trunk/menu/icons/mini/communications_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/communications_phone_section.png b/trunk/menu/icons/mini/communications_phone_section.png
deleted file mode 100644
index 8c20abb..0000000
--- a/trunk/menu/icons/mini/communications_phone_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/communications_section.png b/trunk/menu/icons/mini/communications_section.png
deleted file mode 100644
index d906d7e..0000000
--- a/trunk/menu/icons/mini/communications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/compression_section.png b/trunk/menu/icons/mini/compression_section.png
deleted file mode 100644
index d613c10..0000000
--- a/trunk/menu/icons/mini/compression_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/computer_science_section.png b/trunk/menu/icons/mini/computer_science_section.png
deleted file mode 100644
index 6e4b0ff..0000000
--- a/trunk/menu/icons/mini/computer_science_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/configuration_section.png b/trunk/menu/icons/mini/configuration_section.png
deleted file mode 100644
index f8b81d2..0000000
--- a/trunk/menu/icons/mini/configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/data_visualization_section.png b/trunk/menu/icons/mini/data_visualization_section.png
deleted file mode 100644
index 42d6d7c..0000000
--- a/trunk/menu/icons/mini/data_visualization_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/databases_section.png b/trunk/menu/icons/mini/databases_section.png
deleted file mode 100644
index 7b373db..0000000
--- a/trunk/menu/icons/mini/databases_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/development_environment_section.png b/trunk/menu/icons/mini/development_environment_section.png
deleted file mode 100644
index b33ed65..0000000
--- a/trunk/menu/icons/mini/development_environment_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/development_section.png b/trunk/menu/icons/mini/development_section.png
deleted file mode 100644
index f10e7e4..0000000
--- a/trunk/menu/icons/mini/development_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/development_tools_section.png b/trunk/menu/icons/mini/development_tools_section.png
deleted file mode 100644
index 2b93e5d..0000000
--- a/trunk/menu/icons/mini/development_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/documentation_section.png b/trunk/menu/icons/mini/documentation_section.png
deleted file mode 100644
index e26b85e..0000000
--- a/trunk/menu/icons/mini/documentation_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/editors_section.png b/trunk/menu/icons/mini/editors_section.png
deleted file mode 100644
index 2194fc8..0000000
--- a/trunk/menu/icons/mini/editors_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_economy_section.png b/trunk/menu/icons/mini/education_economy_section.png
deleted file mode 100644
index 7efff4e..0000000
--- a/trunk/menu/icons/mini/education_economy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_geography_section.png b/trunk/menu/icons/mini/education_geography_section.png
deleted file mode 100644
index 9769d5d..0000000
--- a/trunk/menu/icons/mini/education_geography_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_history_section.png b/trunk/menu/icons/mini/education_history_section.png
deleted file mode 100644
index a16c1e6..0000000
--- a/trunk/menu/icons/mini/education_history_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_languages_section.png b/trunk/menu/icons/mini/education_languages_section.png
deleted file mode 100644
index 5cc46f7..0000000
--- a/trunk/menu/icons/mini/education_languages_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_literature_section.png b/trunk/menu/icons/mini/education_literature_section.png
deleted file mode 100644
index fd1fe2c..0000000
--- a/trunk/menu/icons/mini/education_literature_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_mathematics.png b/trunk/menu/icons/mini/education_mathematics.png
deleted file mode 100644
index cb40172..0000000
--- a/trunk/menu/icons/mini/education_mathematics.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_other_section.png b/trunk/menu/icons/mini/education_other_section.png
deleted file mode 100644
index cc3319f..0000000
--- a/trunk/menu/icons/mini/education_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_sciences.png b/trunk/menu/icons/mini/education_sciences.png
deleted file mode 100644
index 63a1578..0000000
--- a/trunk/menu/icons/mini/education_sciences.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_section.png b/trunk/menu/icons/mini/education_section.png
deleted file mode 100644
index 104a592..0000000
--- a/trunk/menu/icons/mini/education_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_sport_section.png b/trunk/menu/icons/mini/education_sport_section.png
deleted file mode 100644
index e5fa00b..0000000
--- a/trunk/menu/icons/mini/education_sport_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/education_tool.png b/trunk/menu/icons/mini/education_tool.png
deleted file mode 100644
index c59488a..0000000
--- a/trunk/menu/icons/mini/education_tool.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/electricity_section.png b/trunk/menu/icons/mini/electricity_section.png
deleted file mode 100644
index b505c9b..0000000
--- a/trunk/menu/icons/mini/electricity_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/emulators_section.png b/trunk/menu/icons/mini/emulators_section.png
deleted file mode 100644
index 0174b35..0000000
--- a/trunk/menu/icons/mini/emulators_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/file_tools_section.png b/trunk/menu/icons/mini/file_tools_section.png
deleted file mode 100644
index 545b0bd..0000000
--- a/trunk/menu/icons/mini/file_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/file_transfer_section.png b/trunk/menu/icons/mini/file_transfer_section.png
deleted file mode 100644
index 8f3ed86..0000000
--- a/trunk/menu/icons/mini/file_transfer_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/finances_section.png b/trunk/menu/icons/mini/finances_section.png
deleted file mode 100644
index e7bdec0..0000000
--- a/trunk/menu/icons/mini/finances_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/geosciences_section.png b/trunk/menu/icons/mini/geosciences_section.png
deleted file mode 100644
index 7338593..0000000
--- a/trunk/menu/icons/mini/geosciences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/gnome_section.png b/trunk/menu/icons/mini/gnome_section.png
deleted file mode 100644
index ede32ec..0000000
--- a/trunk/menu/icons/mini/gnome_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/graphics_section.png b/trunk/menu/icons/mini/graphics_section.png
deleted file mode 100644
index 9c2753a..0000000
--- a/trunk/menu/icons/mini/graphics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/graphs_section.png b/trunk/menu/icons/mini/graphs_section.png
deleted file mode 100644
index b34a124..0000000
--- a/trunk/menu/icons/mini/graphs_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/hardware_configuration_section.png b/trunk/menu/icons/mini/hardware_configuration_section.png
deleted file mode 100644
index a985ad0..0000000
--- a/trunk/menu/icons/mini/hardware_configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/hardware_section.png b/trunk/menu/icons/mini/hardware_section.png
deleted file mode 100644
index e844864..0000000
--- a/trunk/menu/icons/mini/hardware_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/image_processing_section.png b/trunk/menu/icons/mini/image_processing_section.png
deleted file mode 100644
index e308210..0000000
--- a/trunk/menu/icons/mini/image_processing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/instant_messaging_section.png b/trunk/menu/icons/mini/instant_messaging_section.png
deleted file mode 100644
index 6be8d44..0000000
--- a/trunk/menu/icons/mini/instant_messaging_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/internet_section.png b/trunk/menu/icons/mini/internet_section.png
deleted file mode 100644
index 9136637..0000000
--- a/trunk/menu/icons/mini/internet_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/interpreters_section.png b/trunk/menu/icons/mini/interpreters_section.png
deleted file mode 100644
index e2910a6..0000000
--- a/trunk/menu/icons/mini/interpreters_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/irc_section.png b/trunk/menu/icons/mini/irc_section.png
deleted file mode 100644
index 2c394c8..0000000
--- a/trunk/menu/icons/mini/irc_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/kde_section.png b/trunk/menu/icons/mini/kde_section.png
deleted file mode 100644
index d674ca7..0000000
--- a/trunk/menu/icons/mini/kde_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/mail_section.png b/trunk/menu/icons/mini/mail_section.png
deleted file mode 100644
index 3c0f393..0000000
--- a/trunk/menu/icons/mini/mail_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/mandrake.png b/trunk/menu/icons/mini/mandrake.png
deleted file mode 100644
index 4507510..0000000
--- a/trunk/menu/icons/mini/mandrake.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/mathematics_section.png b/trunk/menu/icons/mini/mathematics_section.png
deleted file mode 100644
index 4685410..0000000
--- a/trunk/menu/icons/mini/mathematics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/monitoring_section.png b/trunk/menu/icons/mini/monitoring_section.png
deleted file mode 100644
index a04b436..0000000
--- a/trunk/menu/icons/mini/monitoring_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/more_applications_other_section.png b/trunk/menu/icons/mini/more_applications_other_section.png
deleted file mode 100644
index 200f7a6..0000000
--- a/trunk/menu/icons/mini/more_applications_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/more_applications_section.png b/trunk/menu/icons/mini/more_applications_section.png
deleted file mode 100644
index 200f7a6..0000000
--- a/trunk/menu/icons/mini/more_applications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/multimedia_section.png b/trunk/menu/icons/mini/multimedia_section.png
deleted file mode 100644
index 9b4979d..0000000
--- a/trunk/menu/icons/mini/multimedia_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/networking_configuration_section.png b/trunk/menu/icons/mini/networking_configuration_section.png
deleted file mode 100644
index f10f6fd..0000000
--- a/trunk/menu/icons/mini/networking_configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/networking_section.png b/trunk/menu/icons/mini/networking_section.png
deleted file mode 100644
index 1f9c6fa..0000000
--- a/trunk/menu/icons/mini/networking_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/networking_www_section.png b/trunk/menu/icons/mini/networking_www_section.png
deleted file mode 100644
index a9dae1e..0000000
--- a/trunk/menu/icons/mini/networking_www_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/news_section.png b/trunk/menu/icons/mini/news_section.png
deleted file mode 100644
index 6afdf91..0000000
--- a/trunk/menu/icons/mini/news_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/numerical_analysis_section.png b/trunk/menu/icons/mini/numerical_analysis_section.png
deleted file mode 100644
index b5eefc1..0000000
--- a/trunk/menu/icons/mini/numerical_analysis_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/office_accessories_section.png b/trunk/menu/icons/mini/office_accessories_section.png
deleted file mode 100644
index 9cbf688..0000000
--- a/trunk/menu/icons/mini/office_accessories_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/office_drawing_section.png b/trunk/menu/icons/mini/office_drawing_section.png
deleted file mode 100644
index 69b53d8..0000000
--- a/trunk/menu/icons/mini/office_drawing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/office_section.png b/trunk/menu/icons/mini/office_section.png
deleted file mode 100644
index ad01280..0000000
--- a/trunk/menu/icons/mini/office_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/other_amusement.png b/trunk/menu/icons/mini/other_amusement.png
deleted file mode 100644
index 559636e..0000000
--- a/trunk/menu/icons/mini/other_amusement.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/other_archiving.png b/trunk/menu/icons/mini/other_archiving.png
deleted file mode 100644
index 31a30bf..0000000
--- a/trunk/menu/icons/mini/other_archiving.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/other_configuration.png b/trunk/menu/icons/mini/other_configuration.png
deleted file mode 100644
index 54d9839..0000000
--- a/trunk/menu/icons/mini/other_configuration.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/other_networking.png b/trunk/menu/icons/mini/other_networking.png
deleted file mode 100644
index 74766d0..0000000
--- a/trunk/menu/icons/mini/other_networking.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/other_sciences.png b/trunk/menu/icons/mini/other_sciences.png
deleted file mode 100644
index 61d18b7..0000000
--- a/trunk/menu/icons/mini/other_sciences.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/packaging_section.png b/trunk/menu/icons/mini/packaging_section.png
deleted file mode 100644
index 3a19324..0000000
--- a/trunk/menu/icons/mini/packaging_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/parallel_computing_section.png b/trunk/menu/icons/mini/parallel_computing_section.png
deleted file mode 100644
index 1f28902..0000000
--- a/trunk/menu/icons/mini/parallel_computing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/pda_section.png b/trunk/menu/icons/mini/pda_section.png
deleted file mode 100644
index cba8ec5..0000000
--- a/trunk/menu/icons/mini/pda_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/physics_section.png b/trunk/menu/icons/mini/physics_section.png
deleted file mode 100644
index c7f338e..0000000
--- a/trunk/menu/icons/mini/physics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/presentation_section.png b/trunk/menu/icons/mini/presentation_section.png
deleted file mode 100644
index 6f5709e..0000000
--- a/trunk/menu/icons/mini/presentation_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/printing_section.png b/trunk/menu/icons/mini/printing_section.png
deleted file mode 100644
index 9dee710..0000000
--- a/trunk/menu/icons/mini/printing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/publishing_section.png b/trunk/menu/icons/mini/publishing_section.png
deleted file mode 100644
index 88f1192..0000000
--- a/trunk/menu/icons/mini/publishing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/puzzle_section.png b/trunk/menu/icons/mini/puzzle_section.png
deleted file mode 100644
index 94ee70d..0000000
--- a/trunk/menu/icons/mini/puzzle_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/remote_access_section.png b/trunk/menu/icons/mini/remote_access_section.png
deleted file mode 100644
index e284407..0000000
--- a/trunk/menu/icons/mini/remote_access_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/robotics_section.png b/trunk/menu/icons/mini/robotics_section.png
deleted file mode 100644
index b13ce44..0000000
--- a/trunk/menu/icons/mini/robotics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/sciences_section.png b/trunk/menu/icons/mini/sciences_section.png
deleted file mode 100644
index 5c56aa7..0000000
--- a/trunk/menu/icons/mini/sciences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/shells_section.png b/trunk/menu/icons/mini/shells_section.png
deleted file mode 100644
index 93c7721..0000000
--- a/trunk/menu/icons/mini/shells_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/sound_section.png b/trunk/menu/icons/mini/sound_section.png
deleted file mode 100644
index 4ca4318..0000000
--- a/trunk/menu/icons/mini/sound_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/sport_section.png b/trunk/menu/icons/mini/sport_section.png
deleted file mode 100644
index 20fd2b7..0000000
--- a/trunk/menu/icons/mini/sport_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/spreadsheet_section.png b/trunk/menu/icons/mini/spreadsheet_section.png
deleted file mode 100644
index 557ce03..0000000
--- a/trunk/menu/icons/mini/spreadsheet_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/strategy_section.png b/trunk/menu/icons/mini/strategy_section.png
deleted file mode 100644
index a3d6344..0000000
--- a/trunk/menu/icons/mini/strategy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/system_other_section.png b/trunk/menu/icons/mini/system_other_section.png
deleted file mode 100644
index 997adab..0000000
--- a/trunk/menu/icons/mini/system_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/system_section.png b/trunk/menu/icons/mini/system_section.png
deleted file mode 100644
index a1c5a43..0000000
--- a/trunk/menu/icons/mini/system_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/taskmanagement_section.png b/trunk/menu/icons/mini/taskmanagement_section.png
deleted file mode 100644
index a151c94..0000000
--- a/trunk/menu/icons/mini/taskmanagement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/terminals_section.png b/trunk/menu/icons/mini/terminals_section.png
deleted file mode 100644
index 3f7d9ea..0000000
--- a/trunk/menu/icons/mini/terminals_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/text_tools_section.png b/trunk/menu/icons/mini/text_tools_section.png
deleted file mode 100644
index 622d3f9..0000000
--- a/trunk/menu/icons/mini/text_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/timemanagement_section.png b/trunk/menu/icons/mini/timemanagement_section.png
deleted file mode 100644
index 5f4073e..0000000
--- a/trunk/menu/icons/mini/timemanagement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/toys_section.png b/trunk/menu/icons/mini/toys_section.png
deleted file mode 100644
index ca3077a..0000000
--- a/trunk/menu/icons/mini/toys_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/video_conferences_section.png b/trunk/menu/icons/mini/video_conferences_section.png
deleted file mode 100644
index 6f5b66d..0000000
--- a/trunk/menu/icons/mini/video_conferences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/video_section.png b/trunk/menu/icons/mini/video_section.png
deleted file mode 100644
index 074cc97..0000000
--- a/trunk/menu/icons/mini/video_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/web_browser_section.png b/trunk/menu/icons/mini/web_browser_section.png
deleted file mode 100644
index 84abb8f..0000000
--- a/trunk/menu/icons/mini/web_browser_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/web_editors_section.png b/trunk/menu/icons/mini/web_editors_section.png
deleted file mode 100644
index 99c8db8..0000000
--- a/trunk/menu/icons/mini/web_editors_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/windowmanager_section.png b/trunk/menu/icons/mini/windowmanager_section.png
deleted file mode 100644
index 70c0ba9..0000000
--- a/trunk/menu/icons/mini/windowmanager_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/mini/wordprocessor_section.png b/trunk/menu/icons/mini/wordprocessor_section.png
deleted file mode 100644
index 617ccd6..0000000
--- a/trunk/menu/icons/mini/wordprocessor_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/monitoring_section.png b/trunk/menu/icons/monitoring_section.png
deleted file mode 100644
index 51f85dc..0000000
--- a/trunk/menu/icons/monitoring_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/more_applications_other_section.png b/trunk/menu/icons/more_applications_other_section.png
deleted file mode 100644
index 88b7904..0000000
--- a/trunk/menu/icons/more_applications_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/more_applications_section.png b/trunk/menu/icons/more_applications_section.png
deleted file mode 100644
index 88b7904..0000000
--- a/trunk/menu/icons/more_applications_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/multimedia_section.png b/trunk/menu/icons/multimedia_section.png
deleted file mode 100644
index 9e394a3..0000000
--- a/trunk/menu/icons/multimedia_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/networking_configuration_section.png b/trunk/menu/icons/networking_configuration_section.png
deleted file mode 100644
index 8f8df46..0000000
--- a/trunk/menu/icons/networking_configuration_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/networking_section.png b/trunk/menu/icons/networking_section.png
deleted file mode 100644
index be00baa..0000000
--- a/trunk/menu/icons/networking_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/networking_www_section.png b/trunk/menu/icons/networking_www_section.png
deleted file mode 100644
index 8ce7fc1..0000000
--- a/trunk/menu/icons/networking_www_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/news_section.png b/trunk/menu/icons/news_section.png
deleted file mode 100644
index 728fb7a..0000000
--- a/trunk/menu/icons/news_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/numerical_analysis_section.png b/trunk/menu/icons/numerical_analysis_section.png
deleted file mode 100644
index 9cec33f..0000000
--- a/trunk/menu/icons/numerical_analysis_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/office_accessories_section.png b/trunk/menu/icons/office_accessories_section.png
deleted file mode 100644
index 0e408bd..0000000
--- a/trunk/menu/icons/office_accessories_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/office_drawing_section.png b/trunk/menu/icons/office_drawing_section.png
deleted file mode 100644
index 2080bc2..0000000
--- a/trunk/menu/icons/office_drawing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/office_section.png b/trunk/menu/icons/office_section.png
deleted file mode 100644
index 20c61ff..0000000
--- a/trunk/menu/icons/office_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/other_amusement.png b/trunk/menu/icons/other_amusement.png
deleted file mode 100644
index fb66635..0000000
--- a/trunk/menu/icons/other_amusement.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/other_archiving.png b/trunk/menu/icons/other_archiving.png
deleted file mode 100644
index bbc4b0f..0000000
--- a/trunk/menu/icons/other_archiving.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/other_configuration.png b/trunk/menu/icons/other_configuration.png
deleted file mode 100644
index fff49dd..0000000
--- a/trunk/menu/icons/other_configuration.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/other_networking.png b/trunk/menu/icons/other_networking.png
deleted file mode 100644
index ab0fd13..0000000
--- a/trunk/menu/icons/other_networking.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/other_sciences.png b/trunk/menu/icons/other_sciences.png
deleted file mode 100644
index df1a7b4..0000000
--- a/trunk/menu/icons/other_sciences.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/packaging_section.png b/trunk/menu/icons/packaging_section.png
deleted file mode 100644
index 2706dea..0000000
--- a/trunk/menu/icons/packaging_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/parallel_computing_section.png b/trunk/menu/icons/parallel_computing_section.png
deleted file mode 100644
index a37b9ec..0000000
--- a/trunk/menu/icons/parallel_computing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/pda_section.png b/trunk/menu/icons/pda_section.png
deleted file mode 100644
index 6bbacf1..0000000
--- a/trunk/menu/icons/pda_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/physics_section.png b/trunk/menu/icons/physics_section.png
deleted file mode 100644
index 5fd6b60..0000000
--- a/trunk/menu/icons/physics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/presentation_section.png b/trunk/menu/icons/presentation_section.png
deleted file mode 100644
index bd71e7c..0000000
--- a/trunk/menu/icons/presentation_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/printing_section.png b/trunk/menu/icons/printing_section.png
deleted file mode 100644
index 420563e..0000000
--- a/trunk/menu/icons/printing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/publishing_section.png b/trunk/menu/icons/publishing_section.png
deleted file mode 100644
index 21738a2..0000000
--- a/trunk/menu/icons/publishing_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/puzzle_section.png b/trunk/menu/icons/puzzle_section.png
deleted file mode 100644
index 8367733..0000000
--- a/trunk/menu/icons/puzzle_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/remote_access_section.png b/trunk/menu/icons/remote_access_section.png
deleted file mode 100644
index 525fcb1..0000000
--- a/trunk/menu/icons/remote_access_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/robotics_section.png b/trunk/menu/icons/robotics_section.png
deleted file mode 100644
index 9fcf78c..0000000
--- a/trunk/menu/icons/robotics_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/sciences_section.png b/trunk/menu/icons/sciences_section.png
deleted file mode 100644
index 1676fc3..0000000
--- a/trunk/menu/icons/sciences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/shells_section.png b/trunk/menu/icons/shells_section.png
deleted file mode 100644
index d214a7a..0000000
--- a/trunk/menu/icons/shells_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/sound_section.png b/trunk/menu/icons/sound_section.png
deleted file mode 100644
index 6072de8..0000000
--- a/trunk/menu/icons/sound_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/sport_section.png b/trunk/menu/icons/sport_section.png
deleted file mode 100644
index 3258e82..0000000
--- a/trunk/menu/icons/sport_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/spreadsheet_section.png b/trunk/menu/icons/spreadsheet_section.png
deleted file mode 100644
index 5e394bb..0000000
--- a/trunk/menu/icons/spreadsheet_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/strategy_section.png b/trunk/menu/icons/strategy_section.png
deleted file mode 100644
index 355c080..0000000
--- a/trunk/menu/icons/strategy_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/system_other_section.png b/trunk/menu/icons/system_other_section.png
deleted file mode 100644
index 020adee..0000000
--- a/trunk/menu/icons/system_other_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/system_section.png b/trunk/menu/icons/system_section.png
deleted file mode 100644
index 8c3426c..0000000
--- a/trunk/menu/icons/system_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/taskmanagement_section.png b/trunk/menu/icons/taskmanagement_section.png
deleted file mode 100644
index cf3be48..0000000
--- a/trunk/menu/icons/taskmanagement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/terminals_section.png b/trunk/menu/icons/terminals_section.png
deleted file mode 100644
index 11cd164..0000000
--- a/trunk/menu/icons/terminals_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/text_tools_section.png b/trunk/menu/icons/text_tools_section.png
deleted file mode 100644
index 8fc2092..0000000
--- a/trunk/menu/icons/text_tools_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/timemanagement_section.png b/trunk/menu/icons/timemanagement_section.png
deleted file mode 100644
index dcb6fb3..0000000
--- a/trunk/menu/icons/timemanagement_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/toys_section.png b/trunk/menu/icons/toys_section.png
deleted file mode 100644
index 11f558a..0000000
--- a/trunk/menu/icons/toys_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/video_conferences_section.png b/trunk/menu/icons/video_conferences_section.png
deleted file mode 100644
index 132eba9..0000000
--- a/trunk/menu/icons/video_conferences_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/video_section.png b/trunk/menu/icons/video_section.png
deleted file mode 100644
index a4d324d..0000000
--- a/trunk/menu/icons/video_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/web_browser_section.png b/trunk/menu/icons/web_browser_section.png
deleted file mode 100644
index c01ff68..0000000
--- a/trunk/menu/icons/web_browser_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/web_editors_section.png b/trunk/menu/icons/web_editors_section.png
deleted file mode 100644
index b5eb19e..0000000
--- a/trunk/menu/icons/web_editors_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/windowmanager_section.png b/trunk/menu/icons/windowmanager_section.png
deleted file mode 100644
index b9fb93e..0000000
--- a/trunk/menu/icons/windowmanager_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/icons/wordprocessor_section.png b/trunk/menu/icons/wordprocessor_section.png
deleted file mode 100644
index d22e664..0000000
--- a/trunk/menu/icons/wordprocessor_section.png
+++ /dev/null
Binary files differ
diff --git a/trunk/menu/mandrake_desk-9.2 b/trunk/menu/mandrake_desk-9.2
deleted file mode 100644
index 848924c..0000000
--- a/trunk/menu/mandrake_desk-9.2
+++ /dev/null
@@ -1,200 +0,0 @@
-##
-# Locate a file
-?package(kdebase-progs): 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"
-
-# File manager
-?package(kdebase-progs): needs="kde" kde_filename="Home" section="/" title="Manage your files" icon="home-mdk.png" command="kfmclient openProfile filemanagement" kde_opt="\\nTerminal=0"
-
-
-
-
-
-
-## Administer your system
-# Burn a CD
-?package(k3b): needs="x11" kde_filename="k3b" section="Administer your system" title="Burn a CD" icon="k3b.png" command="k3b" mimetypes="application/x-k3b" kde_opt="\\nDocPath=k3b/index.html\\nTerminal=0\\nX-KDE-NativeMimeType=application/x-k3b\\nCategories=Qt;KDE;AudioVideo"
-
-# Configure sound settings
-?package(kdemultimedia-kmix): 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="\\nEncoding=UTF-8\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nGenericName=Sound Mixer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nCategories=Qt;KDE;AudioVideo"
-
-# Configure KDE
-?package(kdebase-progs): needs="kde" kde_filename="KControl" section="Administer your system" title="Configure your desktop" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true"
-
-
-# Mandrake Control Center
-?package(drakconf): needs="x11" icon="drakconf.png" section="Administer your system" title="Configure your computer" command="/usr/sbin/drakconf"
-
-
-# Format a floppy
-?package(kdeutils-kfloppy): 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"
-
-
-# Password change
-?package(kdeutils-kdepasswd): 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"
-
-# Use a terminal emulator
-?package(kdebase-konsole): needs="kde" kde_filename="konsole" section="Administer your system" title="Use a terminal emulator" icon="konsole.png" command="konsole" kde_opt="\\nEncoding=UTF-8\\nDocPath=konsole/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nGenericName=Terminal Program\\nX-DCOP-ServiceType=Multi\\nX-KDE-AuthorizeAction=shell_access"
-
-
-
-
-
-
-
-
-## Enjoy music & video
-# Listen to a musical CD
-?package(kdemultimedia-kscd): needs="kde" kde_filename="kscd" section="Enjoy music & video" 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"
-
-# Listen to music files
-?package(totem): needs="x11" command="/usr/bin/totem %U" section="Enjoy music & video" title="Listen to music files" icon="totem.png" mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav,audio/x-mpegurl" kde_opt="InitialPreference=15"
-
-# Record sounds
-?package(gnome-media): needs="x11" command="/usr/bin/gnome-sound-recorder" section="Enjoy music & video" title="Record sounds" icon="/usr/share/pixmaps/gnome-grecord.png" startup_notify="true"
-
-# Rip cd
-?package(kdemultimedia-kaudiocreator):command="kaudiocreator" icon="kaudiocreator.png" title="Rip a CD" needs="x11" section="Enjoy music & video"
-
-# Watch TV
-?package(xawtv): command="XawTV" icon="xawtv.png" section="Enjoy music & video" title="Watch TV" needs="x11"
-
-# Watch videos
-?package(totem): needs="x11" command="/usr/bin/totem %U" section="Enjoy music & video" title="Watch videos" icon="totem.png" mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav,audio/x-mpegurl" kde_opt="InitialPreference=15"
-
-
-
-
-
-
-
-## Play games
-# Armagetron
-?package(armagetron):command="/usr/games/armagetron" icon="armagetron.png" needs="x11" section="Play games" title="Play ArmageTron"
-
-# Chromium
-?package(chromium):command="/usr/games/chromium" icon="chromium.png" needs="x11" section="Play games" title="Play Chromium"
-
-# Canon Smash
-?package(csmash):command="/usr/bin/csmash" icon="csmash.png" needs="x11" section="Play games" title="Play Cannon Smash"
-
-# Frozen-Bubble
-?package(frozen-bubble):command="/usr/games/frozen-bubble" icon="frozen-bubble.png" needs="X11" section="Play games" title="Play Frozen-Bubble"
-
-# LBreakout
-?package(lbreakout2):needs="x11" section="Play games" title="Play LBreakout" command="/usr/games/lbreakout2" icon="lbreakout2.png"
-
-# TuXRacer
-?package(tuxracer):command="soundwrapper /usr/games/tuxracer" icon="tuxracer.png" needs="x11" section="Play games" title="Play Tuxracer"
-
-
-
-
-
-
-## Read documentation
-# Read Mandrake 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="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="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="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="documentation_section.png" needs="x11" title="Mandrake documentation in italian" section="Read documentation"
-
-# Read KDE documentation
-?package(kdebase-progs): needs="kde" kde_filename="Help" section="Read documentation" title="Read KDE documentation" icon="khelpcenter.png" command="khelpcenter" kde_opt="\\nDocPath=khelpcenter/index.html\\nTerminal=0"
-
-
-
-
-
-
-## Use office tools
-# Create a presentation
-?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_impress.png" title="Create a presentation" command="ooimpress" mimetypes="application/vnd.sun.xml.impress;application/vnd.stardivision.impress;application/mspowerpoint"
-
-# Create a text document
-?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_writer.png" title="Create a text document" command="oowriter" mimetypes="application/vnd.sun.xml.writer,application/vnd.stardivision.writer,application/msword,application/vnd.ms-word,application/x-doc,text/rtf"
-
-# Create a spreadsheet
-?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_calc.png" title="Create a spreadsheet" command="oocalc" mimetypes="application/vnd.sun.xml.calc,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/msexcel,application/vnd.ms-excel"
-
-# Diagrams
-?package(dia): needs="x11" section="Use office tools" title="Create flowcharts and diagrams" command="/usr/bin/dia" icon="dia.png"
-
-# Manage your contacts
-?package(kdepim-kaddressbook): needs="x11" kde_filename="kaddressbook" section="Use office tools" title="Manage your contacts" icon="kaddressbook.png" command="kaddressbook" mimetypes="text/x-vcard" kde_opt="\\nEncoding=UTF-8\\nDocPath=kaddressbook/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nServiceTypes=KParts/ReadOnlyPart;Browser/View\\nX-KDE-Library=libkaddressbookpart"
-
-# Manage your finances
-?package(gnucash): command="/usr/bin/gnucash" icon="gnucash.png" needs="x11" section="Use office tools" title="Manage your finances"
-
-# Manage your projects
-?package(mrproject):command="mrproject" needs="x11" section="Use office tools" title="Manage your projects" icon="taskmanagement_section.png" startup_notify="true"
-
-# Manage your time
-?package(kdepim-korganizer): needs="x11" kde_filename="korganizer" section="Use office tools" title="Manage your time" icon="korganizer.png" command="korganizer" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nServiceTypes=Browser/View\\nX-KDE-Library=libkorganizer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
-
-# Send a fax
-?package(kdebase-kdeprintfax): 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"
-
-# Write and stick notes
-?package(kdepim-knotes): needs="kde" kde_filename="knotes" section="Use office tools" title="Write and stick notes" icon="knotes.png" command="knotes" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
-
-# Set up reminder messages
-?package(kdepim-korganizer): needs="x11" kde_filename="kalarm" section="Use office tools" title="Set up reminder messages" icon="kalarm.png" command="kalarm" kde_command="kalarm -caption \"%c\" %i" kde_opt="\\nEncoding=UTF-8\\nDocPath=kalarm/index.html\\nGenericName=Reminder Message Scheduler\\nTerminal=0\\nX-DCOP-ServiceType=Unique\\nX-KDE-StartupNotify=true"
-
-# View fax
-?package(kdegraphics-kfax): needs="x11" kde_filename="kfax" section="Use office tools" title="View fax" icon="kfax.png" command="kfax" kde_command="kfax %f -caption \"%c\" %i %m" mimetypes="image/fax-g3" multiple_files="false" accept_url="false" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=kfax;\\nGenericName=Fax Viewer\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi"
-
-
-
-
-
-## Use the Internet
-# Access Newsgroups
-?package(kdenetwork-knode): 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"
-
-# Browse the Web
-?package(kdebase-progs): needs="x11" kde_filename="konqbrowser" section="Use the Internet" title="Browse the Web" icon="konqueror.png" command="konqueror --profile webbrowsing" kde_opt="\\nEncoding=UTF-8\\nDocPath=konqueror/index.html"
-
-# Chat using AIM, ICQ, MSN, Yahoo, Winpopup
-?package(gaim): needs="x11" command="gaim" icon="gaim.png" title="Chat using AIM, ICQ, MSN, Yahoo, Winpopup" section="Use the Internet"
-
-# Chat using IRC
-?package(xchat):needs="x11" section="Use the Internet" title="Chat using IRC" command="xchat" icon="xchat.png"
-
-# Connect to the Internet
-?package(kdenetwork-kppp): 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"
-
-# Create Web pages
-?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=""
-
-# Dialog using video conference
-?package(gnomemeeting): command="/usr/bin/gnomemeeting" needs="x11" icon="gnomemeeting.png" section="Use the Internet" title="Dialog using video conference"
-
-# Read and send mail
-?package(kdenetwork-kmail): 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"
-
-# Transfer files using FTP
-?package(kbear): needs="kde" kde_filename="kbear" section="Use the Internet" title="Transfer files using FTP" icon="kbear.png" command="kbear" kde_opt="\\nEncoding=UTF-8\\nGenericName=FTP Client\\nMiniIcon=kbear\\nDocPath=kbear/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
-
-
-
-
-
-
-## View, modify or create a picture
-# Manage, show and print your photos
-?package(flphoto):command="/usr/bin/flphoto" title="Manage, show and print your photos" needs="x11" section="View, modify, or create graphics" icon="graphics_section.png"
-
-# Manipulate pictures
-?package(gimp): command="gimp" icon="wilbur.png" section="View, modify, or create graphics" title="Manipulate pictures" needs="x11" mimetypes="image/gif;image/jpeg;image/png;image/tiff;image/x-xbm;image/x-xpm;image/bmp;image/fits;image/pcx;image/pix;image/pnm;"
-
-# Scan and use an OCR
-?package(kdegraphics-kooka): needs="kde" kde_filename="kooka" section="View, modify, or create graphics" title="Scan and use an OCR" 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"
-
-# Take a screenshot
-?package(kdegraphics-ksnapshot): needs="kde" kde_filename="ksnapshot" section="View, modify, or create graphics" 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"
-
diff --git a/trunk/menu/mandriva-discovery.menu b/trunk/menu/mandriva-discovery.menu
deleted file mode 100644
index 6b975c9..0000000
--- a/trunk/menu/mandriva-discovery.menu
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-<Menu>
- <Name>Mandriva Linux</Name>
- <Menu>
- <Name>Graphics</Name>
- <Exclude>
- <Filename>kde-showfoto.desktop</Filename>
- </Exclude>
- </Menu>
- <Menu>
- <Name>Internet</Name>
- <Layout>
- <Filename>mandriva-mozilla-firefox.desktop</Filename>
- <Filename>kde-konqbrowser.desktop</Filename>
- <Filename>epiphany.desktop</Filename>
- <Filename>evolution.desktop</Filename>
- <Filename>kde-KMail.desktop</Filename>
- <Filename>kde-Kontact.desktop</Filename>
- <Filename>kde-kopete.desktop</Filename>
- <Filename>gaim.desktop</Filename>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Exclude>
- <Filename>kde-kppplogview.desktop</Filename>
- <Filename>kde-Kppp.desktop</Filename>
- <Filename>kde-ksig.desktop</Filename>
- <Filename>kde-knewsticker-standalone.desktop</Filename>
- <Filename>kde-krfb.desktop</Filename>
- <Filename>kde-krdc.desktop</Filename>
- <Filename>kde-kget.desktop</Filename>
- <Filename>kde-KNode.desktop</Filename>
- <Filename>kde-ksirc.desktop</Filename>
- <Filename>kde-groupwarewizard.desktop</Filename>
- <Filename>bme.desktop</Filename>
- <Filename>gftp.desktop</Filename>
- </Exclude>
- </Menu>
- <Menu>
- <Name>Office</Name>
- <Layout>
- <Filename>template2.0.desktop</Filename>
- <Filename>writer2.0.desktop</Filename>
- <Filename>calc2.0.desktop</Filename>
- <Filename>impress2.0.desktop</Filename>
- <Filename>draw2.0.desktop</Filename>
- <Filename>base2.0.desktop</Filename>
- <Filename>web2.0.desktop</Filename>
- <Separator/>
- <Filename>kde-kwrite.desktop</Filename>
- <Filename>kde-kpdf.desktop</Filename>
- <Filename>kde-korganizer.desktop</Filename>
- <Filename>kde-kalarm.desktop</Filename>
- <Filename>kde-kcalc.desktop</Filename>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Exclude>
- <Filename>kde-kghostview.desktop</Filename>
- <Filename>kde-kate.desktop</Filename>
- <Filename>kde-kaddressbook.desktop</Filename>
- <Filename>kde-kdict.desktop</Filename>
- <Filename>kde-KCharSelect.desktop</Filename>
- <Filename>kde-multisynk.desktop</Filename>
- <Filename>mandriva-hp-sendfax.desktop</Filename>
- <Filename>kde-kpalmdoc.desktop</Filename>
- <Filename>gnome-dictionary.desktop</Filename>
- </Exclude>
- </Menu>
- <Menu>
- <Name>Multimedia</Name>
- <Exclude>
- <Filename>mandriva-echomixer.desktop</Filename>
- <Filename>mandriva-envy24control.desktop</Filename>
- <Filename>mandriva-rmedigicontrol.desktop</Filename>
- <Filename>kde-kdenlive.desktop</Filename>
- <Filename>vumeter.desktop</Filename>
- <Filename>reclevel.desktop</Filename>
- </Exclude>
- </Menu>
- <Menu>
- <Name>System</Name>
- <Layout>
- <Filename>mandriva-drakconf.desktop</Filename>
- <Filename>mandriva-rpmdrake-root.desktop</Filename>
- <Filename>kde-KControl.desktop</Filename>
- <Filename>kde-kmenuedit.desktop</Filename>
- <Filename>alacarte.desktop</Filename>
- <Filename>mandriva-drakmenustyle.desktop</Filename>
- <Filename>mandriva-ftw.desktop</Filename>
- <Filename>mandriva-mdvonline.desktop</Filename>
- <Filename>mandriva-mdvonline-bundle.desktop</Filename>
- <Separator/>
- <Merge type="menus"/>
- <Merge type="files"/>
- </Layout>
- <Exclude>
- <Filename>mandriva-mtink.desktop</Filename>
- <Filename>kde-kdf.desktop</Filename>
- <Filename>kde-kwifimanager.desktop</Filename>
- <Filename>kde-kinfocenter.desktop</Filename>
- <Filename>kde-kover.desktop</Filename>
- <Filename>kde-kwalletconfig.desktop</Filename>
- <Filename>kde-kcm_kbluetoothd.desktop</Filename>
- <Filename>mandriva-xterm.desktop</Filename>
- <Filename>kde-KFloppy.desktop</Filename>
- <Filename>kde-kcm_btpaired.desktop</Filename>
- <Filename>mandriva-userdrake.desktop</Filename>
- <Filename>mandriva-hp-toolbox.desktop</Filename>
- <Filename>kde-ksysguard.desktop</Filename>
- <Filename>mandriva-harddrake-ui.desktop</Filename>
- <Filename>mandriva-rpmdrake.desktop</Filename>
- <Filename>mandriva-drakxtools-newt-system.desktop</Filename>
- <Filename>mandriva-drakxtools-newt-user.desktop</Filename>
- <Filename>kde-krandrtray.desktop</Filename>
- <Filename>kde-kwikdisk.desktop</Filename>
- <Filename>mandriva-net_applet.desktop</Filename>
- <Filename>baobab.desktop</Filename>
- <Filename>nautilus.desktop</Filename>
- <Filename>gdmsetup.desktop</Filename>
- <Filename>gdmphotosetup.desktop</Filename>
- <Filename>gdmflexiserver.desktop</Filename>
- <Filename>gnome-system-log.desktop</Filename>
- <Filename>gnome-search-tool.desktop</Filename>
- <Filename>gfloppy.desktop</Filename>
- <Filename>gnome-system-monitor.desktop</Filename>
- </Exclude>
- </Menu>
- <Menu>
- <Name>More Applications</Name>
- <Exclude>
- <Filename>kde-kbtobexclient.desktop</Filename>
- <Filename>kde-kbtserialchat.desktop</Filename>
- <Filename>kde-kjscmd.desktop</Filename>
- <Filename>invest-chart.desktop</Filename>
- <Filename>base2.0.desktop</Filename>
- <Filename>kasumi.desktop</Filename>
- </Exclude>
- </Menu>
- <Menu>
- <Name>Documentation</Name>
- <Exclude>
- <Filename>monodoc.desktop</Filename>
- </Exclude>
- </Menu>
-</Menu>
diff --git a/trunk/menu/menu b/trunk/menu/menu
deleted file mode 100644
index fb69b89..0000000
--- a/trunk/menu/menu
+++ /dev/null
@@ -1,128 +0,0 @@
-?package(menu): needs=x11 section="/" title="Office" 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="Office" title="Accessories" icon="office_accessories_section.png" order="_mergemenu_,kcalc,oooqs,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Address Books" icon="addressbook_section.png" order="_mergemenu_,kaddressbook,_mergefile_"
-#
-?package(menu): needs=x11 section="Office" title="Communications" icon="communications_section.png" order="Fax,Phone,PDA,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Office/Communications" title="Fax" icon="communications_fax_section.png"
-?package(menu): needs=x11 section="Office/Communications" title="PDA" icon="pda_section.png" order="_mergemenu_,kpilot,_mergefile_"
-?package(menu): needs=x11 section="Office/Communications" title="Phone" icon="communications_phone_section.png"
-?package(menu): needs=x11 section="Office/Communications" title="Other" icon="communications_other_section.png"
-#
-?package(menu): needs=x11 section="Office" title="Drawing" icon="office_drawing_section.png" order="_mergemenu_,OpenOffice.org Draw,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Graphs" icon="graphs_section.png" order="_mergemenu_,Dia,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Presentations" icon="presentation_section.png" order="_mergemenu_,OpenOffice.org Impress,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Publishing" icon="publishing_section.png" order="_mergemenu_,Xpdf,GhostView,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Spreadsheets" icon="spreadsheet_section.png" order="_mergemenu_,OpenOffice.org Calc,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Tasks Management" icon="taskmanagement_section.png" order="_mergemenu_,Planner,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Time Management" icon="timemanagement_section.png" order="_mergemenu_,korganizer,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Wordprocessors" icon="wordprocessor_section.png" order="_mergemenu_,OpenOffice.org Writer,OpenOffice.org Math,_mergefile_"
-?package(menu): needs=x11 section="Office" title="Other" icon="office_section.png"
-#
-#
-?package(menu): needs=x11 section="/" title="Internet" icon="internet_section.png" order="Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,Remote Access,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Chat" icon="chat_section.png" order="_mergemenu_,ksirc,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="File Transfer" icon="file_transfer_section.png" order="_mergemenu_,kbear,Gtm,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Instant Messaging" icon="instant_messaging_section.png" order="_mergemenu_,kopete,Gaim,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Mail" icon="mail_section.png" order="_mergemenu_,Kontact,Evolution,Mozilla Thunderbird,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="News" icon="news_section.png" order="_mergemenu_,KNode,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Remote Access" icon="remote_access_section.png" order="_mergemenu_,Kppp,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Video Conference" icon="video_conferences_section.png"
-?package(menu): needs=x11 section="Internet" title="Web Browsers" icon="web_browser_section.png" order="_mergemenu_,konqbrowser,Mozilla,Mozilla Firefox,Epiphany Web Browser,Epiphany Bookmarks Editor,_mergefile_"
-?package(menu): needs=x11 section="Internet" title="Web Editors" icon="web_editors_section.png"
-?package(menu): needs=x11 section="Internet" title="Other" icon="other_networking.png"
-#
-#
-?package(menu): needs=x11 section="/" title="Multimedia" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Graphics" icon="graphics_section.png" order="_mergemenu_,The GIMP,kooka,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Sound" icon="sound_section.png" order="_mergemenu_,kscd,Totem Media Player,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Video" icon="video_section.png" order="_mergemenu_,Totem Movie Player,_mergefile_"
-?package(menu): needs=x11 section="Multimedia" title="Other" icon="multimedia_section.png"
-#
-#
-?package(menu): needs=x11 section="/" title="System" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="System" title="Archiving" icon="archiving_section.png" order="Backup,CD Burning,Compression,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="System/Archiving" title="Backup" icon="backup_section.png" order="_mergemenu_,DrakSync,_mergefile_"
-?package(menu): needs=x11 section="System/Archiving" title="CD Burning" icon="cd_burning_section.png" order="_mergemenu_,k3b,_mergefile_"
-?package(menu): needs=x11 section="System/Archiving" title="Compression" icon="compression_section.png"
-?package(menu): needs=x11 section="System/Archiving" title="Other" icon="other_archiving.png"
-#
-?package(menu): needs=x11 section="System" title="Configuration" icon="configuration_section.png" order="KControl,Configure Your Computer,Boot and Init,GNOME,Hardware,Networking,Packaging,Printing,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="System/Configuration" title="Boot and Init" icon="boot_init_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="GNOME" icon="gnome_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Hardware" icon="hardware_configuration_section.png"
-?package(menu): needs=kde section="System/Configuration" title="KDE" icon="kde_section.png" kde_opt="X-KDE-BaseGroup=settings"
-?package(menu): needs=x11 section="System/Configuration" title="Networking" icon="networking_configuration_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Packaging" icon="packaging_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Printing" icon="printing_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Users" icon="configuration_section.png"
-?package(menu): needs=x11 section="System/Configuration" title="Other" icon="other_configuration.png"
-#
-?package(menu): needs=x11 section="System" title="File Tools" icon="file_tools_section.png" order="_mergemenu_,Kfind,_mergefile_"
-?package(menu): needs=x11 section="System" title="Monitoring" icon="monitoring_section.png" order="_mergemenu_,ksysguard,_mergefile_"
-?package(menu): needs=x11 section="System" title="Terminals" icon="terminals_section.png" order="_mergemenu_,konsole,_mergefile_"
-?package(menu): needs=x11 section="System" title="Text Tools" icon="text_tools_section.png" order="_mergemenu_,kdict,_mergefile_"
-?package(menu): needs=x11 section="System" title="Other" icon="system_other_section.png"
-#
-#
-?package(menu): needs=x11 section="/" title="More Applications" icon="more_applications_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications" title="Accessibility" icon="accessibility_section.png" order="_mergemenu_,kmag,_mergefile_"
-?package(menu): needs=x11 section="More Applications" title="Communications" icon="communications_section.png"
-?package(menu): needs=x11 section="More Applications" title="Databases" icon="databases_section.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Development" icon="development_section.png" order="Development Environment,Interpreters,Tools,Code Generators,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Code Generators" icon="code_generator_section.png"
-?package(menu): needs=x11 section="More Applications/Development" title="Development Environments" icon="development_environment_section.png" order="_mergemenu_,kdevelop,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Interpreters" icon="interpreters_section.png" order="_mergemenu_,GNU Prolog,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Tools" icon="development_tools_section.png" order="_mergemenu_,Gdb,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Development" title="Other" icon="development_section.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Documentation" icon="documentation_section.png"
-?package(menu): needs=x11 section="More Applications" title="Editors" icon="editors_section.png" order="_mergemenu_,Emacs,XEmacs,VI editor,_mergefile_"
-#
-?package(menu): needs=x11 section="More Applications" title="Education" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Education" title="Economy" icon="education_economy_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Geography" icon="education_geography_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="History" icon="education_history_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Languages" icon="education_languages_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Literature" icon="education_literature_section.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Sciences" icon="education_sciences.png"
-?package(menu): needs=x11 section="More Applications/Education" title="Sports" icon="education_sport_section.png"
-?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_,GnuCash,kmymoney2,_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"
-?package(menu): needs=x11 section="More Applications/Games" title="Arcade" icon="arcade_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Boards" icon="boards_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Cards" icon="cards_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Puzzles" icon="puzzle_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Sports" icon="sport_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Strategy" icon="strategy_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Toys" icon="toys_section.png"
-?package(menu): needs=x11 section="More Applications/Games" title="Other" icon="other_amusement.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Sciences" icon="sciences_section.png" order="Artificial Intelligence,Astronomy,Biology,Chemistry,Computer Science,Data Visualization,Electricity,Geosciences,Image Processing,Mathematics,Numeric analysis,Parallel Computing,Physics,Robotics,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Artificial Intelligence" icon="artificial_intelligence_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Astronomy" icon="astronomy_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Biology" icon="biology_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Chemistry" icon="chemistry_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Computer science" icon="computer_science_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Data Visualization" icon="data_visualization_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Electricity" icon="electricity_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Geosciences" icon="geosciences_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Image Processing" icon="image_processing_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Mathematics" icon="mathematics_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Numeric Analysis" icon="numerical_analysis_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Parallel Computing" icon="parallel_computing_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Physics" icon="physics_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Robotics" icon="robotics_section.png"
-?package(menu): needs=x11 section="More Applications/Sciences" title="Other" icon="other_sciences.png"
-#
-?package(menu): needs=x11 section="More Applications" title="Other" icon="more_applications_other_section.png"
-
-
-# Needs to be owned by wm else we have empty entry in some Desktop
-?package(menu): needs=wm section="/" title="Session" icon="windowmanager_section.png"
-?package(menu): needs=wm section="Session" title="Windowmanagers" icon="windowmanager_section.png"
diff --git a/trunk/menu/menu-simplified b/trunk/menu/menu-simplified
deleted file mode 100644
index 17f74a5..0000000
--- a/trunk/menu/menu-simplified
+++ /dev/null
@@ -1,31 +0,0 @@
-?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_,_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_,_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_,_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,Ppracer,Crack Attack! - Solo,_mergefile_,_separator_,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_,_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"
-?package(menu): needs=x11 section="/" title="Read Documentation" icon="documentation_section.png" order="_mergefile_,_separator_,_mergemenu_,Other"
-?package(menu): needs=x11 section="Read Documentation" title="Read More Documentation" icon="documentation_section.png"
-?package(menu): needs=x11 section="/" title="Develop" icon="development_section.png"
-?package(menu): needs=x11 section="/" title="Use Education Software" icon="education_section.png"
-?package(menu): needs=x11 section="Use Education Software" title="Use More Education Software" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="/" title="Use Scientific Software" icon="sciences_section.png"
-?package(menu): needs=x11 section="Use Scientific Software" title="Use More Sciences Software" icon="sciences_section.png" order="Artificial Intelligence,Astronomy,Biology,Chemistry,Computer Science,Data Visualization,Electricity,Geosciences,Image Processing,Mathematics,Numeric analysis,Parallel Computing,Physics,Robotics,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="/" title="Use Emulators" icon="emulators_section.png"
-?package(menu): needs=x11 section="/" title="Use More Applications" icon="more_applications_other_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other,_mergemenu_,_mergefile_"
-?package(menu): needs=x11 section="Develop" title="Use More Development Software" icon="development_section.png" order="Development Environment,Interpreter,Tools,Code Generators,_mergemenu_,_mergefile_"
diff --git a/trunk/menu/menustyle.csh b/trunk/menu/menustyle.csh
deleted file mode 100755
index 74776db..0000000
--- a/trunk/menu/menustyle.csh
+++ /dev/null
@@ -1,17 +0,0 @@
-if ($META_CLASS == desktop ) then
- set MDV_MENU_STYLE=discovery
-else
- set MDV_MENU_STYLE=mandriva
-endif
-
-foreach file (/etc/sysconfig/menustyle $HOME/.menustyle)
- if ( -f $file ) then
- eval `sed 's|^#.*||' $file | sed 's|\([^=]*\)=\([^=]*\)|set \1=\2|g' | sed 's|$|;|' `
- endif
-end
-
-if ($MDV_MENU_STYLE == discovery && ! ${?XDG_CONFIG_DIRS}) then
- setenv XDG_CONFIG_DIRS /etc/xdg/discovery:/etc/xdg
-endif
-
-setenv MDV_MENU_STYLE $MDV_MENU_STYLE
diff --git a/trunk/menu/menustyle.sh b/trunk/menu/menustyle.sh
deleted file mode 100755
index e1b5051..0000000
--- a/trunk/menu/menustyle.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-if [ "$META_CLASS" = "desktop" ]; then
- MDV_MENU_STYLE=discovery
-else
- MDV_MENU_STYLE=mandriva
-fi
-
-[ -r /etc/sysconfig/menustyle ] && source /etc/sysconfig/menustyle
-[ -r $HOME/.menustyle ] && source $HOME/.menustyle
-
-if [ "$MDV_MENU_STYLE" = "discovery" -a "x$XDG_CONFIG_DIRS" = "x" ]; then
- XDG_CONFIG_DIRS=/etc/xdg/discovery:/etc/xdg
- export XDG_CONFIG_DIRS
-fi
-
-export MDV_MENU_STYLE
diff --git a/trunk/menu/translate_menus b/trunk/menu/translate_menus
deleted file mode 100644
index 097f9fa..0000000
--- a/trunk/menu/translate_menus
+++ /dev/null
@@ -1,109 +0,0 @@
-# /etc/menu-methods/menu-translate file for update-menus.
-#
-#
-#
-# NOTE: if you want to translate the menu entries in a different language,
-# DO NOT USE THIS FILE!!!
-# use the gnu internationalisation tools, see the menu source
-# code (menu/messages/README), and send the .po file you created
-# to me, I'll include it in a next release of menu.
-#
-#
-#synopsis:
-#
-#translate x -> y #where x and y are one of section, id, title, icon, ...
-# x-name y-name
-# ...
-#endtranslate
-#
-#The translations are done by update-menus: the menu-methods will not
-#have to be aware of this.
-#
-
-#there's:
-# translate: only translate for exact matches (RE "^$match\$"
-# subtranslate: translate for matches of RE "^$match"
-# substitute: substitute substrings: sed -s "/^$match/$repl/".
-# this only works for "substitute x->x", and
-# will give interesting results for " substitute x->y".
-#
-#the following will map all Apps/Games sections into Games
-# (the /etc/menu-methods will never even know Apps/Games exists,
-# no matter how many packages still use that):
-#
-#
-# Language translators: DO NOT USE THIS FILE! (see note on top of this file)
-
-
-substitute section->section
- Configuration System/Configuration
-
- "Applications/Publishing" Office/Publishing
- Applications/Archiving System/Archiving
- "Applications/File tools" "System/File Tools"
- Applications/Monitoring System/Monitoring
- "Applications/Text tools" "System/Text Tools"
- Applications "More Applications"
-
- Terminals System/Terminals
-
- Documentation "More Applications/Documentation"
-
- Office/PDA Office/Communications/PDA
-
- Networking/IRC Internet/Chat
- Networking/WWW "Internet/Web Browsers"
- Networking Internet
-
- Amusement "More Applications/Games"
-
- Session/WindowManagers System/Session/Windowmanagers
-
- "Office/Address books" "Office/Address Books"
- "Office/Tasks management" "Office/Tasks Management"
- "Office/Time management" "Office/Time Management"
- "Networking/File transfer" "Internet/File Transfer"
- "Internet/File transfer" "Internet/File Transfer"
- "Networking/Instant messaging" "Internet/Instant Messaging"
- "Internet/Instant messaging" "Internet/Instant Messaging"
- "Networking/Remote access" "Internet/Remote Access"
- "Internet/Remote access" "Internet/Remote Access"
- "Internet/Video conference" "Internet/Video Conference"
- "Networking/Video conference" "Internet/Video Conference"
- "Internet/Web browsers" "Internet/Web Browsers"
- "Networking/Web browsers" "Internet/Web Browsers"
- "Internet/Web editors" "Internet/Web Editors"
- "Networking/Web editors" "Internet/Web Editors"
- "System/Archiving/Cd burning" "System/Archiving/CD Burning"
- "Applications/Archiving/Cd burning" "System/Archiving/CD Burning"
- "System/File tools" "System/File Tools"
- "System/Text tools" "System/Text Tools"
- "More applications" "More Applications"
- "More applications/Development/Code generators" "More Applications/Development/Code Generators"
- "Applications/Development/Code generators" "More Applications/Development/Code Generators"
- "More applications/Development/Development environments" "More Applications/Development/Development Environments"
- "Applications/Development/Development environments" "More Applications/Development/Development Environments"
- "More applications/Sciences/Artificial intelligence" "More Applications/Sciences/Artificial Intelligence"
- "Applications/Sciences/Artificial intelligence" "More Applications/Sciences/Artificial Intelligence"
- "More applications/Sciences/Data visualization" "More Applications/Sciences/Data Visualization"
- "Applications/Sciences/Data visualization" "More Applications/Sciences/Data Visualization"
- "More applications/Sciences/Image processing" "More Applications/Sciences/Image Processing"
- "Applications/Sciences/Image processing" "More Applications/Sciences/Image Processing"
- "More applications/Sciences/Numeric analysis" "More Applications/Sciences/Numeric Analysis"
- "Applications/Sciences/Numeric analysis" "More Applications/Sciences/Numeric Analysis"
- "More applications/Sciences/Parallel computing" "More Applications/Sciences/Parallel Computing"
- "Applications/Sciences/Parallel computing" "More Applications/Sciences/Parallel Computing"
-endtranslate
-
-#
-# #this could be for those who want different names
-# translate title->title
-# Gnuplot "GnuTeken"
-# Dosemu "A better DOS than DOS (sometimes)"
-# endtranslate
-#
-#translate id->title
-# include /usr/lib/menus/LANGUAGE/finnish
-# menu/apps/editors TekstVeranderaars
-#endtranslate
-#
diff --git a/trunk/menu/translate_menus-simplified b/trunk/menu/translate_menus-simplified
deleted file mode 100644
index dde4ab6..0000000
--- a/trunk/menu/translate_menus-simplified
+++ /dev/null
@@ -1,98 +0,0 @@
-# Language translators: DO NOT USE THIS FILE! (see note on top of this file)
-
-
-substitute section->section
- "Office/Tasks management" "Organize/Use More Productivity Tools/Tasks Management"
- "Office/Time management" "Organize/Use More Productivity Tools/Time Management"
- "Office/Tasks Management" "Organize/Use More Productivity Tools/Tasks Management"
- "Office/Time Management" "Organize/Use More Productivity Tools/Time Management"
- Office "Use Office Tools/Use More Office Tools"
- "More Applications/Finances" "Organize/Use More Productivity Tools/Finances"
-
- Internet "Surf the Internet/Use More Connectivity Utilities"
-
- Multimedia/Video "Enjoy Music and Video/Discover More Entertainment Options/Video"
- Multimedia/Sound "Enjoy Music and Video/Discover More Entertainment Options/Sound"
- Multimedia/Graphics "View, Modify and Create Graphics/Use More Image Editing Tools"
-
- "More Applications/Games" "Play Games/Play More Games"
- Amusement "Play Games/Play More Games"
-
- System "Administer Your System/Use More Administration Tools"
- "More Applications/Development" "Develop/Use More Development Software"
- "More Applications/Education" "Use Education Software/Use More Education Software"
- "More Applications/Sciences" "Use Scientific Software/Use More Sciences Software"
-
- "More Applications/Accessibility" "Administer Your System/Use More Administration Tools/Accessibility"
- "More Applications/Communications" "Administer Your System/Use More Administration Tools/Communications"
-
-
- "More Applications/Other" "Use More Applications"
- "More Applications/Emulators" "Use Emulators"
- "More Applications/Documentation" "Read Documentation/Read More Documentation"
- "More Applications" "Use More Applications"
-
-
-#### below a modified copy of the main system translation map, adapted for simplified menu
-
-
- Configuration "Administer Your System/Use More Administration Tools/Configuration"
-
- "Applications/Publishing" "Use Office Tools/Use More Office Tools/Publishing"
- Applications/Archiving "Administer Your System/Use More Administration Tools/Archiving"
- "Applications/File tools" "Administer Your System/Use More Administration Tools/File tools"
- Applications/Monitoring "Administer Your System/Use More Administration Tools/Monitoring"
- "Applications/Text tools" "Administer Your System/Use More Administration Tools/Text tools"
- Applications "Use More Applications"
-
- Terminals "Administer Your System/Use More Administration Tools/Terminals"
-
- Documentation "Read Documentation/Read More Documentation"
-
- Office/PDA "Use Office Tools/Use More Office Tools/Communications/PDA"
-
- Networking/IRC "Surf the Internet/Use More Connectivity Utilities/Chat"
- Networking/WWW "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
- Networking "Surf the Internet/Use More Connectivity Utilities"
-
- Amusement "Play Games/Play More Games"
-
- Session/WindowManagers "Administrer Your System/Use More Administration Tools/Windowmanagers"
-
- "Office/Address books" "Use Office Tools/Use More Office Tools/Address Books"
- "Office/Tasks management" "Organize/Use More Productivity Tools/Tasks Management"
- "Office/Time management" "Organize/Use More Productivity Tools/Time Management"
- "Networking/File transfer" "Surf the Internet/Use More Connectivity Utilities/File Transfer"
- "Internet/File transfer" "Surf the Internet/Use More Connectivity Utilities/File Transfer"
- "Networking/Instant messaging" "Surf the Internet/Use More Connectivity Utilities/Instant Messaging"
- "Internet/Instant messaging" "Surf the Internet/Use More Connectivity Utilities/Instant Messaging"
- "Networking/Remote access" "Surf the Internet/Use More Connectivity Utilities/Remote Access"
- "Internet/Remote access" "Surf the Internet/Use More Connectivity Utilities/Remote Access"
- "Internet/Video conference" "Surf the Internet/Use More Connectivity Utilities/Video Conference"
- "Networking/Video conference" "Surf the Internet/Use More Connectivity Utilities/Video Conference"
- "Internet/Web browsers" "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
- "Networking/Web browsers" "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
- "Internet/Web editors" "Surf the Internet/Use More Connectivity Utilities/Web Editors"
- "Networking/Web editors" "Surf the Internet/Use More Connectivity Utilities/Web Editors"
- "System/Archiving/Cd burning" "Administer Your System/Use More Administration Tools/Archiving/CD Burning"
- "Applications/Archiving/Cd burning" "Administer Your System/Use More Administration Tools/Archiving/CD Burning"
- "System/File tools" "Administer Your System/Use More Administration Tools/File Tools"
- "System/Text tools" "Administer Your System/Use More Administration Tools/Text Tools"
- "More applications" "Use More Applications"
- "More applications/Development/Code generators" "Develop/Use More Development Software/Code Generators"
- "Applications/Development/Code generators" "Develop/Use More Development Software/Code Generators"
- "More applications/Development/Development environments" "Develop/Use More Development Software/Development Environments"
- "Applications/Development/Development environments" "Develop/Use More Development Software/Development Environments"
- "More applications/Sciences/Artificial intelligence" "Use Scientific Software/Use More Sciences Software/Artificial Intelligence"
- "Applications/Sciences/Artificial intelligence" "Use Scientific Software/Use More Sciences Software/Artificial Intelligence"
- "More applications/Sciences/Data visualization" "Use Scientific Software/Use More Sciences Software/Data Visualization"
- "Applications/Sciences/Data visualization" "Use Scientific Software/Use More Sciences Software/Data Visualization"
- "More applications/Sciences/Image processing" "Use Scientific Software/Use More Sciences Software/Image Processing"
- "Applications/Sciences/Image processing" "Use Scientific Software/Use More Sciences Software/Image Processing"
- "More applications/Sciences/Numeric analysis" "Use Scientific Software/Use More Sciences Software/Numeric Analysis"
- "Applications/Sciences/Numeric analysis" "Use Scientific Software/Use More Sciences Software/Numeric Analysis"
- "More applications/Sciences/Parallel computing" "Use Scientific Software/Use More Sciences Software/Parallel Computing"
- "Applications/Sciences/Parallel computing" "Use Scientific Software/Use More Sciences Software/Parallel Computing"
-
-endtranslate
-
diff --git a/trunk/menu/update-menus b/trunk/menu/update-menus
deleted file mode 100755
index bd21520..0000000
--- a/trunk/menu/update-menus
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-usage() {
-echo "Usage: update-menus [options]"
-echo " -v Be verbose about what is going on."
-echo " -u generate only user menu (useful for root user)"
-echo " -h, --help This message."
-
-exit 0
-}
-
-
-VERBOSE=0
-
-if [ "$DURING_INSTALL" = "1" ]; then
- exit 0
-fi
-
-if [ "$UID" == "0" ]; then
- USER_MENU=0
-else
- USER_MENU=1
-fi
-
-if [ $# != 0 ]; then
-
-while getopts ":vunh" option
-do
- case $option in
- v ) VERBOSE=1 ; RUN_PARTS_ARG="--verbose" ;;
- u ) USER_MENU=1 ;;
- h ) usage ;;
- esac
-done
-fi
-
-export VERBOSE
-export USER_MENU
-
-if [ -d /etc/menu.d ]; then
- run-parts $RUN_PARTS_ARG /etc/menu.d
- if [ "$USER_MENU" = "1" ]; then
- touch "$HOME/.menu-updates.stamp" 2> /dev/null
- else
- touch /var/lib/menu/.menu-updates.stamp 2> /dev/null
- fi
-fi
-
diff --git a/trunk/menu/xdg_menu b/trunk/menu/xdg_menu
deleted file mode 100755
index 099d41f..0000000
--- a/trunk/menu/xdg_menu
+++ /dev/null
@@ -1,2216 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany. All rights reserved.
-#
-# Author: nadvornik@suse.cz
-#
-#
-
-use strict;
-use Locale::gettext;
-use Getopt::Long;
-use Encode;
-use I18N::Langinfo qw(langinfo CODESET);
-use POSIX qw(locale_h);
-
-my $Version = "0.2";
-
-my $DefaultAppDirs;
-my $DefaultDirectoryDirs;
-my @KDELegacyDirs;
-
-my $format = 'WindowMaker';
-my $desktop_name;
-my $language = '';
-my $charset = 'iso-8859-1';
-my $root_cmd = 'xdg_menu_su';
-
-my $die_on_error = 0;
-my $verbose = 0;
-my $fullmenu = 0;
-
-my @language_keys;
-
-my @accessed_files;
-my @save_ARGV = @ARGV;
-
-
-my %Desktop_entries;
-my %Directory_entries;
-
-sub check_file ($)
-{
- my ($file) =@_;
-
- unless (-e $file) {
- push @accessed_files, "X $file";
- return '';
- }
-
- if (-d $file) {
- push @accessed_files, "D $file";
- return 'D';
- } else {
- push @accessed_files, "F $file";
- return 'F';
- }
-}
-
-sub add_png_extension_if_needed ($)
-{
- my ($f) = @_;
- return $f =~ /\.(png|xpm|svg)$/ ? $f : "$f.png";
-}
-
-sub scan_AppDir ($$;$)
-{
- my ($pool, $dir, $topdir) = @_;
-
- check_file($dir);
- $topdir = $dir unless defined $topdir;
-
- opendir(DIR, $dir) or return;
-
- foreach my $entry (readdir(DIR)) {
-
- if ( -f "$dir/$entry" && $entry =~ /\.desktop$/ ) {
- read_desktop_entry($pool, "$dir/$entry", $topdir);
- }
- elsif ( -d "$dir/$entry" && $entry ne '.' && $entry ne '..' && $entry ne '.hidden') {
- scan_AppDir ($pool, "$dir/$entry", $topdir);
- }
- }
- closedir DIR;
-}
-
-sub scan_DirectoryDir ($$;$)
-{
- my ($pool, $dir, $topdir) = @_;
-
- check_file($dir);
- $topdir = $dir unless defined $topdir;
-
- opendir(DIR, $dir) or return;
-
- foreach my $entry (readdir(DIR)) {
-
- if ( -f "$dir/$entry" && $entry =~ /\.directory$/ ) {
- read_directory_entry($pool, "$dir/$entry", $topdir);
- }
- elsif ( -d "$dir/$entry" && $entry ne '.' && $entry ne '..' && $entry ne '.hidden') {
- scan_DirectoryDir ($pool, "$dir/$entry", $topdir);
- }
- }
-
- closedir DIR;
-}
-
-sub read_directory_entry
-{
- my ($pool, $file, $topdir) = @_;
-
-
- unless (defined $Directory_entries{$file}) {
-
- check_file($file);
-
- open(FILE, "<$file") or return;
-
- my $in_desktop_entry = 0;
- my %entry;
- while (<FILE>) {
- if (/^\[/) {
- if (/^\[Desktop Entry\]/) {
- $in_desktop_entry = 1;
- }
- elsif (/^\[.*\]/) {
- $in_desktop_entry = 0;
- }
- }
- elsif ($in_desktop_entry && /^([^=]*)=([^[:cntrl:]]*)/) {
- $entry{$1} = $2;
- }
- }
- close(FILE);
-
- my $id = $file;
- $id =~ s/^$topdir//;
- $id =~ s/^\/*//;
- $id =~ s/\//-/g;
- $entry{'id'} = $id;
-
- $Directory_entries{$file} = \%entry;
- }
-
- my $entry = $Directory_entries{$file};
-
- $pool->{'Directory_entries'}{$entry->{'id'}} = $entry;
-}
-
-sub check_show_in ($)
-{
- my ($entry) = @_;
-
- return 1 unless defined $entry;
-
- my %OnlyShowIn;
- my %NotShowIn;
-
- if (defined $entry->{'OnlyShowIn'}) {
- foreach my $showin (split /;/, $entry->{'OnlyShowIn'}) {
- $OnlyShowIn{$showin} = 1;
- }
- return 0 unless defined $OnlyShowIn{$desktop_name};
- }
- if (defined $entry->{'NotShowIn'}) {
- foreach my $showin (split /;/, $entry->{'NotShowIn'}) {
- $NotShowIn{$showin} = 1;
- }
- return 0 if defined $NotShowIn{$desktop_name} ;
- }
-
- return 1;
-}
-
-sub read_desktop_entry
-{
- my ($pool, $file, $topdir) = @_;
-
-
- unless (defined $Desktop_entries{$file}) {
-
- check_file($file);
-
- open(FILE, "<$file") or return;
-
- my $in_desktop_entry = 0;
- my %entry;
- while (<FILE>) {
- if (/^\[/) {
- if (/^\[Desktop Entry\]/) {
- $in_desktop_entry = 1;
- }
- elsif (/^\[.*\]/) {
- $in_desktop_entry = 0;
- }
- }
- elsif ($in_desktop_entry && /^([^=]*)=([^[:cntrl:]]*)/) {
- $entry{$1} = $2;
- }
- }
- close(FILE);
-
- my $id = $file;
- $id =~ s/^$topdir//;
- $id =~ s/^\/*//;
- $id =~ s/\//-/g;
- $entry{'id'} = $id;
-
- $entry{'refcount'} = 0;
-
- $Desktop_entries{$file} = \%entry;
- }
-
- my $entry = $Desktop_entries{$file};
-
- return unless defined $entry->{'Name'};
- return unless defined $entry->{'Exec'};
- return if $entry->{'Hidden'} eq 'true';
- return if $entry->{'NoDisplay'} eq 'true';
-
- return unless check_show_in($entry);
-
- return if defined $entry->{'NotShowIn'} && $entry->{'NotShowIn'} eq $desktop_name;
-
-
- if (defined $pool) {
-
- foreach my $category (split /;/, $entry->{'Categories'}) {
- $pool->{'Categories'}{$category} = [] unless defined $pool->{'Categories'}{$category};
- push @{$pool->{'Categories'}{$category}}, $entry;
- }
-
- $pool->{'Desktop_entries'}{$entry->{'id'}} = $entry;
- }
-
- return $entry;
-}
-
-my $cached_pool;
-
-sub read_desktop_entries ($$)
-{
- my ($directory_paths, $desktop_paths) = @_;
-
- if ($cached_pool->{'Directory_paths'} eq $directory_paths &&
- $cached_pool->{'Desktop_paths'} eq $desktop_paths) {
-
- return $cached_pool;
- }
-
-
- my $pool = {'Desktop_entries' => {},
- 'Categories' => {},
- 'Directory_entries' => {},
- 'Directory_paths' => $directory_paths,
- 'Desktop_paths' => $desktop_paths
- };
-
- foreach my $dir (split /:/, $directory_paths) {
- next if $dir =~ /^\s*$/;
- scan_DirectoryDir($pool, $dir);
- }
-
- foreach my $dir (split /:/, $desktop_paths) {
- next if $dir =~ /^\s*$/;
- scan_AppDir($pool, $dir);
- }
-
- $cached_pool = $pool;
-
- return $pool;
-}
-
-sub dump_entry_list ($)
-{
- my ($list) = @_;
-
- print "list: ";
- foreach my $entry (@$list) {
- print "$entry->{id} ";
- }
- print "\n";
-
-}
-
-sub get_directory_entry ($$)
-{
- my ($entry, $pool) = @_;
-
- return $pool->{'Directory_entries'}{$entry};
-}
-
-sub interpret_Include
-{
- my ($tree, $entries, $pool) = @_;
- my %exist;
-
- my $i = 0;
-
-
- my @list = interpret_entry_node($tree, 'Or', $pool);
-
- foreach my $e (@$entries) {
- if ($e->{type} eq 'desktop') {
- $exist{$e->{desktop}} = 1;
- }
- }
-
-
-# dump_entry_list(\@list);
-
- foreach my $entry (@list) {
-
- next if $exist{$entry};
-
- push @$entries, {type => 'desktop', desktop => $entry};
- $entry->{'refcount'}++;
-
- $exist{$entry} = 1;
-
- }
-}
-
-sub interpret_Exclude
-{
- my ($tree, $entries, $pool) = @_;
-
- my $i = 0;
-
- my @list = interpret_entry_node($tree, 'Or', $pool);
-
-
- foreach my $entry (@list) {
-
- my $i = 0;
- while (defined $entries->[$i]) {
- my $exist = $entries->[$i];
- if ($exist->{type} eq 'desktop' &&
- $exist->{desktop} eq $entry) {
- splice @$entries, $i, 1;
- $entry->{'refcount'}--;
- }
- else {
- $i++;
- }
- }
- }
-}
-
-
-sub interpret_entry_node ($$$)
-{
- my ($tree, $node, $pool) = @_;
-
- my $i = 0;
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- my @subtree;
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Filename') {
- $i++;
- if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
- my $entry = $tree->[$i][2];
- if (defined $pool->{'Desktop_entries'}{$entry}) {
- push @subtree, [$pool->{'Desktop_entries'}{$entry}];
- }
- else {
- push @subtree, [];
- }
- }
- else {
- print STDERR "Filename\n";
- exit 1 if $die_on_error;
- }
- $i++;
- }
- elsif ($tree->[$i] eq 'Category') {
- $i++;
- if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
- my $category = $tree->[$i][2];
- if (defined $pool->{'Categories'}{$category}) {
- push @subtree, $pool->{'Categories'}{$category};
- }
- else {
- push @subtree, [];
- }
- }
- else {
- print STDERR "Category\n";
- exit 1 if $die_on_error;
- }
- $i++;
- }
- elsif ($tree->[$i] eq 'All') {
- $i++;
- if (values %{$pool->{'Desktop_entries'}} > 0) {
- push @subtree, [values %{$pool->{'Desktop_entries'}}];
- }
- else {
- push @subtree, [];
- }
- $i++;
- }
- elsif ($tree->[$i] eq '0') {
- $i++;
- $i++;
- }
- else {
- my @res = interpret_entry_node($tree->[$i+1], $tree->[$i], $pool);
- push @subtree, \@res;
- $i++; $i++;
- }
- }
-
- if ($node eq 'Or')
- {
-# print "or - \n";
-
- my %used;
- my @res;
- foreach my $st (@subtree) {
-# print " st: ";
-# dump_entry_list($st);
- foreach my $entry (@$st) {
- if (! defined $used{$entry}) {
- push @res, $entry;
- $used{$entry} = 1;
- }
- }
- }
-# print " res: ";
-# dump_entry_list(\@res);
- return @res;
- } elsif ($node eq 'And')
- {
- my %used;
- my @res;
-# print "and - \n";
- my $cnt = @subtree;
- my $min = @{$subtree[0]};
- my $min_idx = 0;
- my $idx = 0;
-
- foreach my $st (@subtree) {
-# print " st: ";
-# dump_entry_list($st);
-
- my $num = @$st;
- if ($num < $min) {
- $min = $num;
- $min_idx = $idx;
- }
-
- my %dupes;
- foreach my $entry (@$st) {
- next if $dupes{$entry};
- $dupes{$entry} = 1;
-
- if (! defined $used{$entry}) {
- $used{$entry} = 1;
- }
- else {
- $used{$entry} ++
- }
- }
-
- $idx ++;
- }
- return () if $cnt == 0;
- foreach my $entry (@{$subtree[$min_idx]}) {
- push @res, $entry if $used{$entry} == $cnt;
- }
-
-# print " res: ";
-# dump_entry_list(\@res);
- return @res;
- } elsif ($node eq 'Not')
- {
- my %used;
- my @res;
-# print "not - \n";
- my $cnt = @subtree;
- foreach my $st (@subtree) {
-# print " st: ";
-# dump_entry_list($st);
- foreach my $entry (@$st) {
- $used{$entry} = 1;
- }
- }
- return if $cnt == 0;
- foreach my $entry (values %{$pool->{'Desktop_entries'}}) {
- push @res, $entry if !defined $used{$entry};
- }
-
-# print " res: ";
-# dump_entry_list(\@res);
- return @res;
- } else {
- print STDERR "Can't use '$node' inside <Include> or <Exclude>\n";
- exit 1 if $die_on_error;
- return ();
- }
-}
-
-sub interpret_root ($$)
-{
- my ($tree, $topdir) = @_;
- if ($tree->[0] eq 'Menu') {
- return interpret_menu($tree->[1]);
- }
- else {
- print STDERR "No toplevel Menu\n";
- exit 1 if $die_on_error;
- return;
- }
-}
-
-
-sub interpret_menu ($;$$)
-{
- my ($tree, $directory_paths, $desktop_paths) = @_;
-
- $directory_paths = '' unless defined $directory_paths;
- $desktop_paths = '' unless defined $desktop_paths;
-
- my %menu = ('entries' => [],
- 'OnlyUnallocated' => 0,
- 'DontShowIfEmpty' => 0,
- 'Deleted' => 0);
-
- my $i = 0;
-
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'AppDir') {
- if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
- $desktop_paths .= ':' . $tree->[$i + 1][2];
- splice @$tree, $i, 2;
- }
- else {
- print STDERR "wrong AppDir\n";
- exit 1 if $die_on_error;
- $i++;
- $i++;
- }
- }
- elsif ($tree->[$i] eq 'DefaultAppDirs') {
- $desktop_paths .= ':' . $DefaultAppDirs;
- splice @$tree, $i, 2;
- }
- elsif ($tree->[$i] eq 'DirectoryDir') {
- if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
- $directory_paths .= ':' . $tree->[$i + 1][2];
- splice @$tree, $i, 2;
- }
- else {
- print STDERR "wrong DirectoryDir\n";
- exit 1 if $die_on_error;
- $i++;
- $i++;
- }
- }
- elsif ($tree->[$i] eq 'DefaultDirectoryDirs') {
- $directory_paths .= ':' . $DefaultDirectoryDirs;
- splice @$tree, $i, 2;
- }
- else {
- $i++;
- $i++;
- }
- }
-
-
- $menu{directory_paths} = $directory_paths;
- $menu{desktop_paths} = $desktop_paths;
-
- my $pool = read_desktop_entries($directory_paths, $desktop_paths);
-
-
- $i = 0;
-
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Menu') {
- $i++;
- my $submenu = interpret_menu($tree->[$i], $directory_paths, $desktop_paths);
- push @{$menu{'entries'}}, {type => 'menu', menu => $submenu};
- $i++;
- }
- elsif ($tree->[$i] eq 'Name') {
- $i++;
- if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
- $menu{'Name'} = $tree->[$i][2];
- }
- else {
- print STDERR "wrong Name\n";
- exit 1 if $die_on_error;
- }
- $i++;
- }
- elsif ($tree->[$i] eq 'Directory') {
- $i++;
- if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
- $menu{'Directory'} = get_directory_entry($tree->[$i][2], $pool);
-# print "Directory " . $tree->[$i][2] . "\n";
- }
- else {
- print STDERR "wrong Directory\n";
- exit 1 if $die_on_error;
- }
- $i++;
- }
- elsif ($tree->[$i] eq 'OnlyUnallocated') {
- $menu{'OnlyUnallocated'} = 1;
- $i++;
- $i++;
- }
- elsif ($tree->[$i] eq 'DontShowIfEmpty') {
- $menu{'DontShowIfEmpty'} = 1;
- $i++;
- $i++;
- }
- elsif ($tree->[$i] eq 'Deleted') {
- $menu{'Deleted'} = 1;
- $i++;
- $i++;
- }
- elsif ($tree->[$i] eq 'NotDeleted') {
- $menu{'Deleted'} = 0;
- $i++;
- $i++;
- }
- elsif ($tree->[$i] eq 'Include') {
- $i++;
- interpret_Include($tree->[$i], $menu{'entries'}, $pool);
- $i++;
- }
- elsif ($tree->[$i] eq 'Exclude') {
- $i++;
- interpret_Exclude($tree->[$i], $menu{'entries'}, $pool);
- $i++;
- }
- elsif ($tree->[$i] eq '0') {
- $i++;
- if ($tree->[$i] !~ /^\s*$/) {
- print STDERR "skip '$tree->[$i]'\n" ;
- exit 1 if $die_on_error;
- }
- $i++;
- }
- else {
- print STDERR "Unknown '$tree->[$i]':\n";
- $i++;
- print STDERR " '@{$tree->[$i]}'\n";
- $i++;
- exit 1 if $die_on_error;
- }
- }
-
- return \%menu;
-}
-
-
-sub read_menu ($;$)
-{
- my ($file, $basedir) = @_;
-
-
- if ($file !~ /^\// && defined $basedir) {
- $file = "$basedir/$file";
- }
-
- unless (defined $basedir) {
- $basedir = $file;
- $basedir =~ s/\/[^\/]*$//;
- }
-
- unless (check_file($file)) {
- print STDERR "WARNING: '$file' does not exist\n";
- return ['Menu', [{}]];
- }
-
- print STDERR "reading '$file'\n" if $verbose;
-
- my $parser = new XML::Parser(Style => 'Tree');
- my $tree = $parser->parsefile($file);
-
- my $DefaultMergeDir = $file;
- $DefaultMergeDir =~ s/^.*\///;
- $DefaultMergeDir =~ s/\.menu$/-merged/;
-
- read_includes($tree, $basedir, $DefaultMergeDir);
-
- return $tree
-}
-
-sub read_menu_dir ($;$)
-{
- my ($dir, $basedir) = @_;
-
- my @out;
-
- if ($dir !~ /^\// && defined $basedir) {
- $dir = "$basedir/$dir";
- }
-
-
- check_file($dir);
-
- opendir(DIR, $dir);
-
- foreach my $entry (readdir(DIR)) {
-
- if ( -f "$dir/$entry" && $entry =~ /\.menu$/ ) {
- my $menu = read_menu("$dir/$entry");
- $menu = remove_toplevel_Menu($menu);
- push @out, @$menu;
- }
- }
- closedir DIR;
-
- return \@out;
-}
-
-sub quote_xml ($)
-{
- my ($txt) = @_;
-
- $txt =~ s/&/&amp;/g;
- $txt =~ s/</&lt;/g;
- $txt =~ s/>/&gt;/g;
- return $txt;
-}
-
-sub read_legacy_dir ($;$)
-{
- my ($dir,$basedir) = @_;
- my $out;
-
- $dir =~ s/\/*$//;
-
- $basedir = $dir unless defined $basedir;
-
- return "" if check_file($dir) ne 'D';
-
- $out = "<Menu>\n";
-
- if ($dir eq $basedir) {
- my $xmldir = quote_xml($dir);
-
- $out .= "<AppDir>$xmldir</AppDir>\n";
- $out .= "<DirectoryDir>$xmldir</DirectoryDir>\n";
- }
- else {
- my $name = $dir;
- $name =~ s/\/*$//;
- $name =~ s/^.*\///;
-
- $name = quote_xml($name);
-
- $out .= "<Name>$name</Name>\n";
- }
-
-
- if (-f "$dir/.directory") {
-
- my $dir_id = "$dir/.directory";
- $dir_id =~ s/^$basedir//;
- $dir_id =~ s/^\///;
- $dir_id = quote_xml($dir_id);
-
- $out .= "<Directory>$dir_id</Directory>\n";
- }
-
- opendir(DIR, $dir);
-
- foreach my $entry (readdir(DIR)) {
-
- if ( -f "$dir/$entry" && $entry =~ /\.desktop$/ ) {
- my $id = "$dir/$entry";
- $id =~ s/^$basedir//;
- $id =~ s/^\///;
- $id =~ s/\//-/g;
- $id = quote_xml($id);
-
- my $desktop = read_desktop_entry(undef, "$dir/$entry", $basedir);
- $out .= "<Include><Filename>$id</Filename></Include>\n" unless defined $desktop->{'Categories'}
- }
- elsif ( -d "$dir/$entry" && $entry ne '.' && $entry ne '..' && $entry ne '.hidden') {
- $out .= read_legacy_dir("$dir/$entry", $basedir);
- }
- }
- closedir DIR;
- $out .= "</Menu>\n";
- return $out;
-}
-
-sub remove_toplevel_Menu ($)
-{
- my ($tree) = @_;
- if ($tree->[0] eq 'Menu') {
- shift @{$tree->[1]} if (ref($tree->[1][0]) eq 'HASH');
- return $tree->[1];
- }
- else {
- print STDERR "No toplevel Menu\n";
- exit 1 if $die_on_error;
- return;
- }
-}
-
-sub read_includes ($$$)
-{
- my ($tree, $basedir, $DefaultMergeDir) = @_;
-
- my $i = 0;
-
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'MergeFile') {
- if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
- my $add_tree = read_menu($tree->[$i + 1][2], $basedir);
- $add_tree = remove_toplevel_Menu($add_tree);
-
- splice @$tree, $i, 2, @$add_tree;
-
- }
- else {
- print STDERR "wrong MergeFile\n";
- exit 1 if $die_on_error;
- $i++;
- $i++;
- }
-
- }
- elsif ($tree->[$i] eq 'MergeDir') {
- if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
-
- my $add_tree = read_menu_dir($tree->[$i + 1][2], $basedir);
-
- splice @$tree, $i, 2, @$add_tree;
-
- }
- else {
- print STDERR "wrong MergeFile\n";
- exit 1 if $die_on_error;
- $i++;
- $i++;
- }
-
- }
- elsif ($tree->[$i] eq 'DefaultMergeDirs') {
- my $add_tree = read_menu_dir($DefaultMergeDir, $basedir);
- splice @$tree, $i, 2, @$add_tree;
- }
- elsif ($tree->[$i] eq 'LegacyDir') {
- if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
-
- my $xml = read_legacy_dir($tree->[$i + 1][2]);
- print STDERR "reading legacy directory '" . $tree->[$i + 1][2] . "'\n" if $verbose;
-
- my $parser = new XML::Parser(Style => 'Tree');
- my $add_tree = $parser->parse($xml);
- $add_tree = remove_toplevel_Menu($add_tree);
- splice @$tree, $i, 2, @$add_tree;
-
- }
- else {
- print STDERR "wrong LegacyDir\n";
- exit 1 if $die_on_error;
- $i++;
- $i++;
- }
-
- }
- elsif ($tree->[$i] eq 'KDELegacyDirs') {
- my @out;
- foreach my $dir (@KDELegacyDirs) {
- my $xml = read_legacy_dir($dir);
- print STDERR "reading legacy directory '$dir'\n" if $verbose;
-
- my $parser = new XML::Parser(Style => 'Tree');
- my $add_tree = $parser->parse($xml);
- $add_tree = remove_toplevel_Menu($add_tree);
- push @out, @$add_tree
- }
- splice @$tree, $i, 2, @out;
- }
- elsif ($tree->[$i] eq 'Menu') {
- $i++;
- read_includes($tree->[$i], $basedir, $DefaultMergeDir);
- $i++;
- }
- else {
- $i++;
- $i++;
- }
- }
-}
-
-sub get_menu_name ($)
-{
- my ($tree) = @_;
- my $name;
-
- my $i = 0;
-
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Name') {
- $i++;
- if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
- $name = $tree->[$i][2];
- last;
- }
- else {
- print STDERR "wrong Name\n";
- }
- $i++;
- }
- else {
- $i++;
- $i++;
- }
- }
-
- unless (defined $name) {
- print STDERR "Menu has no name element\n";
- }
- return $name;
-}
-
-
-sub append_menu ($$)
-{
- my ($target, $source) = @_;
-
- my $i = 0;
-
- $i++ if (ref($source->[$i]) eq 'HASH');
-
- while (defined $source->[$i]) {
- if ($source->[$i] ne 'Name') {
- push @$target, $source->[$i];
- push @$target, $source->[$i + 1];
- }
-
- $i++;
- $i++;
- }
-}
-
-
-sub merge_menus ($)
-{
- my ($tree) = @_;
-
- my %used; #menu name already used
-
- my $i = 0;
-
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Menu') {
- my $name = get_menu_name($tree->[$i + 1]);
- if (defined $used{$name}) { #second menu with the same name
- my $target = $used{$name};
-
- append_menu($tree->[$target], $tree->[$i + 1]);
-
- splice @$tree, $i, 2;
- }
- else { # first appearance
- $used{$name} = $i + 1;
- $i++;
- $i++;
- }
- }
- else {
- $i++;
- $i++;
- }
- }
-
-
- $i = 0;
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Menu') {
- merge_menus($tree->[$i + 1]);
- }
- $i++;
- $i++;
- }
-}
-
-sub read_Move ($$)
-{
- my ($tree, $hash) = @_;
-
- my $i = 0;
-
- my $old = '';
-
-
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Old') {
- $i++;
- if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
- $old = $tree->[$i][2];
- }
- else {
- print STDERR "wrong Old\n";
- exit 1 if $die_on_error;
- }
- $i++;
- }
- if ($tree->[$i] eq 'New') {
- $i++;
- if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
- $hash->{$old} = $tree->[$i][2];
- }
- else {
- print STDERR "wrong New\n";
- exit 1 if $die_on_error;
- }
- $i++;
- }
- else {
- $i++;
- $i++;
- }
- }
-}
-
-sub find_menu_in_tree ($$)
-{
- my ($path, $tree) = @_;
-
- my $root = $path;
- $root =~ s/\/.*$//;
-
- my $subpath = $path;
- $subpath =~ s/^[^\/]*\/*//;
-
- my $i = 0;
-
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Menu') {
- if ($root eq get_menu_name($tree->[$i + 1])) {
-
- if ($subpath eq '') {
- return { 'parent' => $tree, 'index' => $i, 'menu' => $tree->[$i + 1]};
- }
- return find_menu_in_tree($subpath, $tree->[$i + 1]);
- }
- }
-
- $i++;
- $i++;
- }
-
- return undef;
-}
-
-sub copy_menu ($$)
-{
- my ($path, $tree) = @_;
-
- my $tail;
- my $child;
-
- foreach my $elem (reverse split(/\//, $path)) {
- next if $elem eq '';
-
- my $menu = [{}, 'Name', [{}, 0, $elem]];
- push @$menu, ('Menu', $child) if defined $child;
-
- $tail = $menu unless defined $tail;
- $child = $menu;
- }
-
- append_menu($tail, $tree);
-
- return $child;
-}
-
-sub move_menus ($)
-{
- my ($tree) = @_;
-
-# print "@$tree\n";
- my %move;
-
- my $i = 0;
-
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Move') {
-
- read_Move($tree->[$i + 1], \%move);
- splice @$tree, $i, 2;
- }
- else {
- $i++;
- $i++;
- }
- }
-
- foreach my $source (keys %move) {
- my $sourceinfo = find_menu_in_tree($source, $tree);
-
- if (defined $sourceinfo) {
- my $target = copy_menu($move{$source}, $sourceinfo->{'menu'});
- splice @{$sourceinfo->{'parent'}}, $sourceinfo->{'index'}, 2;
- push @$tree, ('Menu', $target);
- merge_menus($tree);
- }
- }
-
- $i = 0;
- $i++ if (ref($tree->[$i]) eq 'HASH');
-
- while (defined $tree->[$i]) {
- if ($tree->[$i] eq 'Menu') {
- move_menus($tree->[$i + 1]);
- }
- $i++;
- $i++;
- }
-}
-
-sub remove_allocated ($)
-{
- my ($menu) = @_;
-
-
- my $i = 0;
- while ($i < @{$menu->{'entries'}}) {
- my $entry = $menu->{'entries'}[$i];
-
- if ($entry->{type} eq 'menu') {
- remove_allocated($entry->{menu});
- $i++;
- }
- elsif ($entry->{type} eq 'desktop' &&
- $menu->{'OnlyUnallocated'} &&
- $entry->{desktop}{'refcount'} > 1) {
-
- $entry->{desktop}{'refcount'}--;
- splice @{$menu->{'entries'}}, $i, 1;
- }
- else {
- $i++;
- }
-
-
- }
- return 0;
-}
-
-
-sub remove_empty_menus ($)
-{
- my ($menu) = @_;
-
-
- my $i = 0;
- while ($i < @{$menu->{'entries'}}) {
- my $entry = $menu->{'entries'}[$i];
-
- if ($entry->{type} eq 'menu' && remove_empty_menus($entry->{menu})) {
- splice @{$menu->{'entries'}}, $i, 1;
- }
- else {
- $i++;
- }
-
-
- }
-
- return 1 if @{$menu->{'entries'}} == 0; # && $menu->{'DontShowIfEmpty'}; #menu is empty
-
- return 0;
-}
-
-
-sub prepare_exec ($$)
-{
- my ($exec, $desktop) = @_;
-
- $exec =~ s/%f//g;
- $exec =~ s/%F//g;
- $exec =~ s/%u//g;
- $exec =~ s/%U//g;
- $exec =~ s/%d//g;
- $exec =~ s/%D//g;
- $exec =~ s/%n//g;
- $exec =~ s/%N//g;
- $exec =~ s/%i//g;
- $exec =~ s/%k//g;
- $exec =~ s/%v//g;
- $exec =~ s/%m//g;
-
- my $caption = $desktop->{Name};
-
- $exec =~ s/%c/$caption/g;
-
- $exec =~ s/%%/%/g;
-
- $exec = "xterm -e $exec" if $desktop->{Terminal} eq '1' || $desktop->{Terminal} eq 'true';
-
- $exec = "$root_cmd $exec" if $desktop->{'X-KDE-SubstituteUID'} eq '1' || $desktop->{'X-KDE-SubstituteUID'} eq 'true';
- return $exec;
-}
-
-sub get_loc_entry ($$)
-{
- my ($desktop, $entry) = @_;
-
- foreach my $key (@language_keys) {
- my $loc_entry = $entry . "[$key]";
- return $desktop->{$loc_entry} if defined $desktop->{$loc_entry} && $desktop->{$loc_entry} !~ /^\s*$/;
- }
-
- return $desktop->{$entry};
-}
-
-sub preprocess_menu ($)
-{
- # localize, sort, prepare_exec
- my ($menu) = @_;
-
- return 0 if $menu->{'Deleted'};
- return 0 unless check_show_in($menu->{'Directory'});
- return 0 if defined $menu->{'Directory'} && $menu->{'Directory'}->{'NoDisplay'} eq 'true';
-
- my $menu_name = $menu->{'Name'};
- my $menu_icon = "";
-
- if (defined $menu->{'Directory'}) {
- my $directory = $menu->{'Directory'};
- $menu_icon = $menu->{'Directory'}{'Icon'};
- my $directory_name = get_loc_entry($directory, 'Name');
-
- if (defined $directory_name) {
- Encode::from_to($directory_name, "utf8", $charset)
- if !defined $directory->{"Encoding"} || $directory->{"Encoding"} eq 'UTF-8';
-
- $menu_name = $directory_name;
- }
- }
-
- $menu->{'PrepName'} = $menu_name;
- $menu->{'PrepIcon'} = $menu_icon;
-
- my $i = 0;
- while (defined $menu->{'entries'}[$i]) {
- my $entry = $menu->{'entries'}[$i];
- if ($entry->{'type'} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{'id'};
-
- my $desktop_name = get_loc_entry($desktop, 'Name');
-
- if (defined $desktop_name) {
- Encode::from_to($desktop_name, "utf8", $charset)
- if !defined $desktop->{"Encoding"} || $desktop->{"Encoding"} eq 'UTF-8';
-
- $name = $desktop_name;
- }
-
- $desktop->{'PrepName'} = $name;
- $entry->{'Name'} = $name;
- $entry->{'PrepName'} = $name;
-
- $desktop->{'PrepExec'} = prepare_exec($desktop->{Exec}, $desktop);
- $i++;
- }
- elsif ($entry->{type} eq 'menu') {
- if (preprocess_menu ($entry->{'menu'})) {
- $entry->{'Name'} = $entry->{'menu'}{'Name'};
- $entry->{'PrepName'} = $entry->{'menu'}{'PrepName'};
- $i++;
- }
- else {
- splice @{$menu->{'entries'}}, $i, 1;
- }
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- exit 1 if $die_on_error;
- splice @{$menu->{'entries'}}, $i, 1;
- }
- }
-
- $menu->{'entries'} = [ sort {$b->{'type'} cmp $a->{'type'} || $a->{'PrepName'} cmp $b->{'PrepName'}} @{$menu->{'entries'}} ];
-
- my $i = 0;
- my $prev_entry;
- while (defined $menu->{'entries'}[$i]) {
- my $entry = $menu->{'entries'}[$i];
- if (defined $prev_entry &&
- $entry->{'type'} eq 'desktop' &&
- $prev_entry->{'type'} eq 'desktop' &&
- $prev_entry->{'PrepName'} eq $entry->{'PrepName'} &&
- $prev_entry->{'desktop'}->{'PrepExec'} eq $entry->{'desktop'}->{'PrepExec'}) {
- splice @{$menu->{'entries'}}, $i, 1;
- }
- else {
- $prev_entry = $entry;
- $i++;
- }
- }
-
- return 1;
-}
-
-sub output_twm_menu ($;$$)
-{
- my ($menu, $toplevel, $path) = @_;
-
- my $output = '';
-
- $path = '' unless defined $path;
-
- $toplevel = 1 unless defined $toplevel;
-
- my $menu_name = $menu->{'PrepName'};
- my $menu_id = "$path-" . $menu->{'Name'};
- $menu_id =~ s/\s/_/g;
-
- $menu_id = 'xdg_menu' if $toplevel;
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'menu') {
- $output .= output_twm_menu($entry->{'menu'}, 0, $menu_id);
- }
- }
-
- $output .= "menu \"$menu_id\" {\n";
- $output .= "\"$menu_name\" f.title\n";
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{'PrepName'};
- my $exec = $desktop->{'PrepExec'};
- my $color = '';
-
- $exec =~ s/"/\\"/g;
-
- $color = ' ("red":"grey")' if $desktop->{'X-KDE-SubstituteUID'} eq '1' || $desktop->{'X-KDE-SubstituteUID'} eq 'true';
-
- $output .= "\"$name\"$color f.exec \"$exec&\"\n";
- }
- elsif ($entry->{type} eq 'menu') {
- my $name = $entry->{'menu'}{'PrepName'};
- my $id = "$menu_id-" . $entry->{'menu'}{'Name'};
-
- $id =~ s/\s/_/g;
-
- $output .= "\"$name\" f.menu \"$id\"\n";
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- }
-
- }
- $output .= "}\n";
-
- return $output;
-}
-
-sub output_wmaker_menu ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $indent = 0 unless defined $indent;
-
- my $menu_name = $menu->{'PrepName'};
-
- $output .= ' ' x $indent;
- $output .= "\"$menu_name\" MENU\n";
-
- if ($indent == 0) {
- $output .= "\n#include \"user.menu\"\n\n";
- }
-
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{'PrepName'};
- my $exec = $desktop->{'PrepExec'};
-
- $output .= ' ' x $indent;
- $output .= " \"$name\" EXEC $exec\n";
- }
- elsif ($entry->{type} eq 'menu') {
- $output .= output_wmaker_menu ($entry->{'menu'}, $indent + 1);
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- }
-
- }
-
- if ($indent == 0) {
- textdomain("menu-messages");
-
- my $exit_msg = gettext("Exit");
- my $restart_msg = gettext("Restart");
- if (langinfo(CODESET) ne 'UTF-8') {
- $exit_msg = Encode::encode_utf8($exit_msg);
- $restart_msg = Encode::encode_utf8($restart_msg);
- }
- $output .= "\t\"$exit_msg\" MENU\n\t\t\"$restart_msg\" RESTART\n\t\t\"$exit_msg\" EXIT\n\"$exit_msg\" END\n";
- }
-
- $output .= ' ' x $indent;
- $output .= "\"$menu_name\" END\n";
-
- return $output;
-}
-
-sub output_fvwm2_menu ($;$$)
-{
- my ($menu, $toplevel, $path) = @_;
-
- my $output = '';
-
- $path = '' unless defined $path;
-
- $toplevel = 1 unless defined $toplevel;
-
- my $menu_name = $menu->{'PrepName'};
- my $menu_id = "$path-" . $menu->{'Name'};
- $menu_id =~ s/\s/_/g;
-
- $menu_id = 'xdg_menu' if $toplevel;
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'menu') {
- $output .= output_fvwm2_menu($entry->{'menu'}, 0, $menu_id);
- }
- }
-
- $output .= "DestroyMenu \"$menu_id\"\n";
- $output .= "AddToMenu \"$menu_id\" \"$menu_name\" Title\n";
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{'PrepName'};
- my $exec = $desktop->{'PrepExec'};
-
- $output .= "+ \"$name\" Exec $exec\n";
- }
- elsif ($entry->{type} eq 'menu') {
- my $name = $entry->{'menu'}{'PrepName'};
- my $id = "$menu_id-" . $entry->{'menu'}{'Name'};
- $id =~ s/\s/_/g;
-
- $output .= "+ \"$name\" Popup \"$id\"\n";
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- }
-
- }
- $output .= "\n";
-
- return $output;
-}
-
-sub output_blackbox_menu ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $output .= "[begin] (Menu)\n";
- $output .= "[exec] (xterm) {xterm}\n[separator]\n";
- $output .= output_blackbox_inner_menu ($menu, $indent);
- $output .= "[separator]\n";
- $output .= '[config] (Configuration)
- [workspaces] (Workspace)
- [submenu] (System Styles) {Choose a style...}
- [stylesdir] (/usr/share/blackbox/styles)
- [stylesdir] (/usr/share/fluxbox/styles)
- [stylesdir] (/usr/share/openbox/styles)
- [end]
- [submenu] (User Styles) {Choose a style...}
- [stylesdir] (~/.blackbox/styles)
- [stylesdir] (~/.fluxbox/styles)
- [stylesdir] (~/.openbox/styles)
- [end]
- [separator]
- [exec] (Run Command) {bbrun -a -w}
- [exec] (Lock Screen) {xlock}
- [restart] (Restart) {}
- [exit] (Logout)
-[end]
-';
- $output .= "[end]\n";
- return $output;
-}
-
-
-sub output_blackbox_inner_menu ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $indent = 0 unless defined $indent;
-
- my $menu_name = $menu->{'PrepName'};
-
- $output .= ' ' x $indent;
- $output .= "[submenu] ($menu_name)\n";
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{'PrepName'};
- my $exec = $desktop->{'PrepExec'};
-
- $output .= ' ' x $indent;
- $output .= " [exec] ($name) {$exec}\n";
- }
- elsif ($entry->{type} eq 'menu') {
- $output .= output_blackbox_inner_menu ($entry->{'menu'}, $indent + 1);
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- }
-
- }
- $output .= ' ' x $indent;
- $output .= "[end] # ($menu_name)\n";
-
- return $output;
-}
-
-sub output_icewm_menu ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $indent = 0 unless defined $indent;
-
- my $menu_name = $menu->{'PrepName'};
- my $menu_icon = $menu->{'PrepIcon'} || "folder" ;
-
- $output .= ' ' x $indent;
- $output .= "menu \"$menu_name\" $menu_icon.png {\n";
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{'PrepName'};
- my $exec = $desktop->{'PrepExec'};
- my $icon = add_png_extension_if_needed($desktop->{'Icon'});
-
- $output .= ' ' x $indent;
- $output .= " prog \"$name\" $icon $exec\n";
- }
- elsif ($entry->{type} eq 'menu') {
- $output .= output_icewm_menu ($entry->{'menu'}, $indent + 1);
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- }
-
- }
- $output .= ' ' x $indent;
- $output .= "}\n";
-
- return $output;
-}
-
-sub prepare_exec_xfce4 ($$)
-{
- my ($exec, $desktop) = @_;
-
- $exec =~ s/%f//g;
- $exec =~ s/%F//g;
- $exec =~ s/%u//g;
- $exec =~ s/%U//g;
- $exec =~ s/%d//g;
- $exec =~ s/%D//g;
- $exec =~ s/%n//g;
- $exec =~ s/%N//g;
- $exec =~ s/%i//g;
- $exec =~ s/%k//g;
- $exec =~ s/%v//g;
- $exec =~ s/%m//g;
-
- my $caption = $desktop->{Name};
-
- $exec =~ s/%c/$caption/g;
-
- $exec =~ s/%%/%/g;
-
- $exec =~ s/\"/&quot;/g;
-
- $exec = "$root_cmd $exec" if $desktop->{'X-KDE-SubstituteUID'} eq '1' || $desktop->{'X-KDE-SubstituteUID'} eq 'true';
- return $exec;
-}
-
-
-
-sub output_xfce4_menu ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $indent = 0 unless defined $indent;
-
- if ($indent == 0) {
- $output .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
- $output .= '<!DOCTYPE xfdesktop-menu [' . "\n";
- $output .= ' <!ENTITY menu2 SYSTEM "menu2.xml">' . "\n";
- $output .= ']>' . "\n\n";
- }
-
- my $menu_name = $menu->{'PrepName'};
- my $menu_ico = $menu->{'PrepIcon'};
- $output .= ' ' x $indent;
-
- if ($indent == 0) {
- $output .= "<xfdesktop-menu>\n"
- }
- else {
- $output .= "<menu name=\"" . quote_xml($menu_name) ."\" visible=\"yes\" icon=\"${menu_ico}.png \">\n";
- }
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{'PrepName'};
- my $exec = prepare_exec_xfce4($desktop->{Exec}, $desktop);
- my $term = ($desktop->{Terminal} eq '1' || $desktop->{Terminal} eq 'true') ? "yes" : "no";
- my $ico = $desktop->{'Icon'};
- $output .= ' ' x $indent;
- $output .= " <app name=\"" . quote_xml($name) ."\" cmd=\"$exec\" icon=\"$ico\" term=\"$term\"/>\n";
- }
- elsif ($entry->{type} eq 'menu') {
- $output .= output_xfce4_menu ($entry->{'menu'}, $indent + 1);
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- }
-
- }
- $output .= ' ' x $indent;
-
- if ($indent == 0) {
- $output .= "</xfdesktop-menu>\n";
- }
- else {
- $output .= "</menu>\n";
- }
-
- return $output;
-}
-
-sub output_openbox3_menu ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $output .= '<?xml version="1.0" encoding="UTF-8"?>
-
-<openbox_menu xmlns="http://openbox.org/"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://openbox.org/
- file:///usr/share/openbox/menu.xsd">';
- $output .= "<menu id=\"xdg\" label=\"xdg\">\n";
- $output .= output_openbox3_inner_menu ($menu, $indent);
- $output .= "</menu>\n";
- $output .= ' <menu id="root-menu" label="Openbox 3">
- <item label="xterm">
- <action name="Execute"><execute>xterm</execute></action> </item>
- <separator />
- <menu id="KDE Menu" label="KDE Menu" />
- <separator />
- <menu id="client-list-menu" />
- <separator />
- <menu id="ob-menu" label="openbox3">
- <item label="ob conf"><action name="Execute"><execute>obconf</execute></action></item>
- <item label="reconfigure"><action name="Reconfigure" /></item>
- </menu>
- <separator />
- <item label="lock screen"><action name="Execute"><execute>xlock -remote -nice 19 -mode blank -geometry 1x1 -enablesaver</execute></action></item>
- <separator />
- <item label="Exit"><action name="Exit" /></item>
- </menu>';
- $output .= "</openbox_menu>\n";
- return $output;
-}
-
-sub output_openbox3_pipe_menu ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $output .= "<openbox_pipe_menu>\n";
- $output .= output_openbox3_inner_menu ($menu, $indent);
- $output .= "</openbox_pipe_menu>\n";
- return $output;
-}
-
-sub output_openbox3_inner_menu ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $indent = 0 unless defined $indent;
- my $menu_name = $menu->{'PrepName'};
-
- $output .= ' ' x $indent;
- $output .= "<menu id=\"" . quote_xml($menu_name) . "\" label=\"".quote_xml($menu_name) . "\">\n";
-# $output .= "<menu label=\"".quote_xml($menu_name) . "\">\n";
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{'PrepName'};
- my $exec = $desktop->{'PrepExec'};
-
- $output .= ' ' x $indent;
- $output .= " <item label=\"". quote_xml($name)."\">\n";
- $output .= " <action name=\"Execute\"><execute>$exec</execute></action>\n";
- $output .= " </item>\n";
- }
- elsif ($entry->{type} eq 'menu') {
- $output .= output_openbox3_inner_menu ($entry->{'menu'}, $indent + 1);
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- }
-
- }
- $output .= ' ' x $indent;
- $output .= "</menu> <!-- $menu_name -->\n";
-
- return $output;
-}
-
-
-sub output_readable ($;$)
-{
- my ($menu, $indent) = @_;
-
- my $output = '';
-
- $indent = 0 unless defined $indent;
-
- my $menu_name = $menu->{'Name'};
-
- $output .= "\t" x $indent;
- $output .= "\"$menu_name\" MENU\n";
-
-
- foreach my $entry (@{$menu->{'entries'}}) {
- if ($entry->{type} eq 'desktop') {
- my $desktop = $entry->{desktop};
-
- my $name = $desktop->{Name};
-
- $output .= "\t" x $indent;
- $output .= "\t\"$name\"\n";
-
-
- my @v = %$desktop;
- $output .= "@v\n" if $name eq '';
- }
- elsif ($entry->{type} eq 'menu') {
- $output .= output_readable ($entry->{menu}, $indent + 1);
- }
- else {
- print STDERR "wrong menu entry type: $entry->{type}";
- }
-
- }
-
- return $output;
-}
-
-sub get_root_menu
-{
- foreach my $dir (split(/:/, $ENV{XDG_CONFIG_DIRS}), "/etc/xdg") {
- check_file("$dir/menus/applications.menu");
- return "$dir/menus/applications.menu" if -f "$dir/menus/applications.menu";
- }
- return "";
-}
-
-sub get_app_dirs
-{
- my %used;
- my $ret = '';
- my @kde_xdgdata = split(/:/, `kde-config --path xdgdata-apps`);
-
- foreach $_ (@kde_xdgdata) {
- s/\/applications\/*\s*$//;
- };
-
- foreach my $d (split(/:/, $ENV{XDG_DATA_DIRS}), @kde_xdgdata, "/usr/share", "/opt/gnome/share") {
- my $dir = $d;
- $dir =~ s/\/*$//;
- next if defined $used{$dir};
- next if check_file("$dir/applications") ne 'D';
- $ret .= ':' if $ret ne '';
- $ret .= "$dir/applications";
- $used{$dir} = 1;
- }
- return $ret;
-}
-
-sub get_desktop_dirs
-{
- my %used;
- my $ret = '';
- foreach my $dir (split(/:/, $ENV{XDG_DATA_DIRS}), "/usr/share", "/opt/kde3/share", "/opt/gnome/share") {
- next if defined $used{$dir};
- next if check_file("$dir/desktop-directories") ne 'D';
- $ret .= ':' if $ret ne '';
- $ret .= "$dir/desktop-directories";
- $used{$dir} = 1;
- }
- return $ret;
-}
-
-sub get_KDE_legacy_dirs
-{
- my %used;
- my @ret;
- foreach my $d ("/etc/opt/kde3/share/applnk", "/opt/kde3/share/applnk", reverse(split(/:/, `kde-config --path apps`))) {
- my $dir = $d;
- chomp $dir;
- $dir =~ s/\/*$//;
- next if defined $used{$dir};
- next if check_file("$dir") ne 'D';
- $used{$dir} = 1;
- push @ret, $dir;
- }
- return @ret;
-}
-
-sub prepare_language_keys ($)
-{
- my ($language) = @_;
-
- my @keys;
-
- $language =~ s/\.[^@]*//; # remove .ENCODING
-
- if ($language =~ /^([^_]*)_([^@]*)@(.*)$/) { # LANG_COUNTRY@MODIFIER
- push @keys, $1 . '_' . $2 . '@' . $3;
- push @keys, $1 . '_' . $2;
- push @keys, $1 . '@' . $3;
- push @keys, $1;
- }
- elsif ($language =~ /^([^_]*)_([^@]*)$/) { # LANG_COUNTRY
- push @keys, $1 . '_' . $2;
- push @keys, $1;
- }
- elsif ($language =~ /^([^_]*)@(.*)$/) { # LANG@MODIFIER
- push @keys, $1 . '@' . $2;
- push @keys, $1;
- }
- elsif ($language =~ /^([^_@]*)$/) { # LANG
- push @keys, $1;
- }
-
- return @keys;
-}
-
-sub check_cache
-{
- my $cachedir = $ENV{HOME};
-
- return unless -d $cachedir;
-
- $cachedir .= "/.xdg_menu_cache";
-
- return unless -f "$cachedir/inputs" && -f "$cachedir/output";
-
- my @st = stat "$cachedir/output";
- my $ref_time = $st[10]; #ctime
-
- open(FILE, "<$cachedir/inputs");
-
- my $num_opts = 0;
-
- while (<FILE>) {
- chomp;
- next if /^\s*$/;
- next if /^#/;
-
- if (/^[FD] (.*)$/) {
- my $file = $1;
- my @st = stat $file;
- my $time = $st[10]; #ctime
-
- if (!defined $time || $time >= $ref_time) {
-# print STDERR "$file: is newer\n";
- return;
- }
- }
- elsif (/^X (.*)$/) {
- my $file = $1;
-
- if (-e $file) {
-# print STDERR "$file: exists\n";
- return;
- }
- }
- elsif (/^ENV ([^ ]+) (.*)$/) {
- my $var = $1;
- my $val = $2;
-
- if ($ENV{$var} ne $val) {
-# print STDERR "$var: differs\n";
- return;
- }
- }
- elsif (/^OPT ([0-9]+) (.*)$/) {
- my $optidx = $1;
- my $val = $2;
-
- $num_opts ++;
- if ($save_ARGV[$optidx] ne $val) {
-# print STDERR "$optidx: differs\n";
- return;
- }
- }
- elsif (/^CHARSET (.*)$/) {
- my $charset = $1;
-
- if ($charset ne langinfo(CODESET)) {
-# print STDERR "charset $charset differs\n";
- return;
- }
- }
- elsif (/^LANGUAGE (.*)$/) {
- my $language = $1;
-
- if ($language ne setlocale(LC_MESSAGES)) {
-# print STDERR "language $language differs\n";
- return;
- }
- }
- elsif (/^VERSION (.*)$/) {
- my $v = $1;
-
- if ($v ne $Version) {
-# print STDERR "Version differs\n";
- return;
- }
- }
- else {
- print STDERR "Wrong cache inputs list\n";
- return;
- }
-
-
- }
-
- return if $num_opts != @save_ARGV;
-
- open(FILE, "<$cachedir/output") or return;
-
- print STDERR "Using cached output\n" if $verbose;
-
- my $buf;
- while(read(FILE, $buf, 4096)) {
- print $buf;
- }
- close(FILE);
-
- exit 0;
-}
-
-sub write_cache ($)
-{
- my ($output) = @_;
-
- my $cachedir = $ENV{HOME};
-
- return unless -d $cachedir;
-
- $cachedir .= "/.xdg_menu_cache";
-
- mkdir $cachedir;
- unlink "$cachedir/output";
-
- open(FILE, ">$cachedir/inputs") or return;
- print FILE "# this file contains list of inputs xdg_menu\n";
- print FILE "VERSION $Version\n";
- print FILE "\n\n";
- print FILE join("\n", @accessed_files);
- print FILE "\n\n";
-
- for (my $i = 0; $i < @save_ARGV; $i++) {
- print FILE "OPT $i $save_ARGV[$i]\n";
- }
-
- print FILE "ENV XDG_CONFIG_DIRS $ENV{XDG_CONFIG_DIRS}\n";
- print FILE "ENV XDG_DATA_DIRS $ENV{XDG_DATA_DIRS}\n";
-
- print FILE "CHARSET " . langinfo(CODESET) . "\n";
- print FILE "LANGUAGE " . setlocale(LC_MESSAGES) . "\n";
-
- close(FILE);
- open(FILE, ">$cachedir/output") or return;
- print FILE $output;
- close(FILE);
-}
-
-
-check_cache();
-
-use XML::Parser;
-
-$DefaultAppDirs = get_app_dirs();
-$DefaultDirectoryDirs = get_desktop_dirs();
-
-my $root_menu = get_root_menu();
-
-@KDELegacyDirs = get_KDE_legacy_dirs();
-
-$charset = langinfo(CODESET);
-$language = setlocale(LC_MESSAGES);
-
-$root_cmd = "/opt/gnome/bin/gnomesu" if -x '/opt/gnome/bin/gnomesu';
-$root_cmd = "/opt/kde3/bin/kdesu" if -x '/opt/kde3/bin/kdesu';
-
-my $help;
-
-GetOptions("format=s" => \$format,
- "fullmenu" => \$fullmenu,
- "desktop=s" => \$desktop_name,
- "charset=s" => \$charset,
- "language=s" => \$language,
- "root-menu=s" => \$root_menu,
- "die-on-error" => \$die_on_error,
- "verbose" => \$verbose,
- "help" => \$help
- );
-
-@language_keys = prepare_language_keys($language);
-
-$desktop_name = $format unless defined $desktop_name;
-
-if ($help) {
- print <<"EOF";
-
-xdg-menu - XDG menus for WindowMaker and other window managers
- http://freedesktop.org/Standards/menu-spec
-
-
-Usage:
- xdg_menu [--format <format>] [--desktop <desktop>]
- [--charset <charset>] [--language <language>]
- [--root-menu <root-menu>] [--die-on-error]
- [--fullmenu] [--help]
-
- format - output format
- possible formats: WindowMaker, fvwm2, icewm,
- blackbox, fluxbox, openbox,
- xfce4, openbox3, openbox3-pipe,
- mwm, readable
- default: WindowMaker
-
- fullmenu - output a full menu and not only a submenu
-
- desktop - desktop name for NotShowIn and OnlyShowIn
- default: the same as format
-
- charset - output charset
- default: $charset
-
- language - output language
- default: $language
-
- root-menu - location of root menu file
- default: $root_menu
-
- die-on-error - abort execution on any error,
- default: try to continue
-
- verbose - print debugging information
-
- help - print this text
-
-EOF
- exit 0;
-}
-
-
-unless ( -f $root_menu) {
- print STDERR "Can't find root menu file.\n";
- exit 1;
-}
-
-my $tree = read_menu($root_menu);
-
-merge_menus($tree);
-move_menus($tree);
-
-my $menu = interpret_root($tree, '');
-
-remove_allocated($menu);
-preprocess_menu($menu);
-remove_empty_menus($menu);
-
-my $output;
-
-if ($format eq 'WindowMaker') {
-
- $output = output_wmaker_menu($menu)
-}
-elsif ($format eq 'fvwm2') {
-
- $output = output_fvwm2_menu($menu)
-}
-elsif ($format eq 'icewm') {
- foreach my $entry (@{$menu->{'entries'}}) {
-
- if ($entry->{type} eq 'menu') {
- $output .= output_icewm_menu ($entry->{'menu'});
- }
- }
-}
-elsif ($format eq 'xfce4') {
-
- $output = output_xfce4_menu($menu)
-}
-elsif ($format eq 'blackbox' || ($format eq 'openbox') || ($format eq 'fluxbox') ) {
- if ($fullmenu) {
- $output = output_blackbox_menu($menu)
- }
- else
- {
- $output = output_blackbox_inner_menu($menu)
- }
-}
-elsif ($format eq 'openbox3') {
- if ($fullmenu) {
- $output = output_openbox3_menu($menu)
- }
- else
- {
- $output = output_openbox3_inner_menu($menu)
- }
-}
-elsif ($format eq 'openbox3-pipe') {
-
- $output = output_openbox3_pipe_menu($menu)
-}
-elsif ($format eq 'twm') {
-
- print STDERR "WARNING: twm does not support umlauts. Parameter --language '' to output plain ASCII.\n" unless $language eq '';
- $output = output_twm_menu($menu)
-}
-elsif ($format eq 'mwm') {
-
- $output = output_twm_menu($menu)
-}
-elsif ($format eq 'readable') {
-
- $output = output_readable($menu)
-}
-else
-{
- print STDERR "Unknown format $format\n";
- exit 1;
-}
-
-print $output;
-write_cache($output);
-
-exit 0;
-