Branch for updates

author: Dexter Morgan <dmorgan@mageia.org> 2011-06-02 20:30:42 +0000
committer: Dexter Morgan <dmorgan@mageia.org> 2011-06-02 20:30:42 +0000
commit: ac5099ebf8fced835c2108ce4d2d327762d0e595 (patch)
tree: c9d6bb9a8e3a7e3de6a100e2ae300922003f995e
download: common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.tar
common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.tar.gz
common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.tar.bz2
common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.tar.xz
common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.zip
451 files changed, 9061 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..b99278f
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,3194 @@
+2011-04-29 01:57
+
+	* mageia.png: update mageia.png icons (use the same icon as 
+	register-mga.png)
+
+2011-02-19 13:24  
+
+	* menu/applications.menu.in: Change from openoffice to libreoffice
+	  ( to fix menu)
+
+2011-02-09 10:05  
+
+	* menu/icons/large/mandriva.png: clean mandriva icon
+
+2011-02-09 10:02  
+
+	* menu/icons/large/mageia.png, menu/icons/mini/mageia.png: add
+	  missing icons
+
+2011-02-03 11:10  
+
+	* Makefile: Fix makefile
+
+2011-02-03 10:33  
+
+	* sounds/echokalimba.wav, sounds/endtroduction.wav,
+	  sounds/filmish.wav, sounds/genesis_take1.wav,
+	  sounds/genesis_take3.wav, sounds/heavybreather.wav,
+	  sounds/ia_ora-error.wav, sounds/ia_ora-notification.wav,
+	  sounds/ia_ora-shutdown.wav, sounds/ia_ora-startup.wav,
+	  sounds/index.theme, sounds/introduction.wav,
+	  sounds/spacebird.wav: Remove sounds
+
+2011-02-03 10:31  
+
+	* ., .gitignore, ChangeLog, Makefile, README, TRANSLATORS,
+	  backgrounds, backgrounds/xfdrake-test-card.png, bin,
+	  bin/print-cups.sh, bin/www-browser, bin/xvt, bookmarks,
+	  bookmarks/konqueror, bookmarks/konqueror/bookmarks-download.xml,
+	  bookmarks/konqueror/bookmarks-one.xml, bookmarks/mozilla,
+	  bookmarks/mozilla/mozilla-download.html,
+	  bookmarks/mozilla/mozilla-one.html, desktop, desktop/free,
+	  desktop/free/register.desktop.in, desktop/one,
+	  desktop/one/register.desktop.in, dm,
+	  dm/GdmGreeterTheme-nolist.desktop, dm/GdmGreeterTheme.desktop,
+	  dm/KdmGreeterTheme.desktop, dm/disconnect.png, dm/languages.png,
+	  dm/mdk-gdm-nolist.xml, dm/mdk-gdm.xml, dm/mdk-kde-nolist.xml,
+	  dm/mdk-kde.xml, dm/screenshot-gdm-nolist.png, dm/screenshot.png,
+	  dm/screenshot_kdm.png, dm/sessions.png, dm/system.png, faces,
+	  faces/default.png, faces/user-1.png, krootwarning,
+	  krootwarning/.cvsignore, man, man/C, man/C/chksession.8, man/cs,
+	  man/cs/chksession.8, man/et, man/et/chksession.8, man/eu,
+	  man/eu/chksession.8, man/fr, man/fr/chksession.8, man/it,
+	  man/it/chksession.8, man/ru, man/ru/chksession.8, man/uk,
+	  man/uk/chksession.8, menu, menu/applications.menu.in,
+	  menu/desktop-directories,
+	  menu/desktop-directories/mandriva-accessibility.directory.in,
+	  menu/desktop-directories/mandriva-development-databases.directory.in,
+	  menu/desktop-directories/mandriva-development-developmentenvironments.directory.in,
+	  menu/desktop-directories/mandriva-development-tools.directory.in,
+	  menu/desktop-directories/mandriva-development-webdevelopment.directory.in,
+	  menu/desktop-directories/mandriva-development.directory.in,
+	  menu/desktop-directories/mandriva-documentation.directory.in,
+	  menu/desktop-directories/mandriva-education-economy.directory.in,
+	  menu/desktop-directories/mandriva-education-geography.directory.in,
+	  menu/desktop-directories/mandriva-education-history.directory.in,
+	  menu/desktop-directories/mandriva-education-languages.directory.in,
+	  menu/desktop-directories/mandriva-education-literature.directory.in,
+	  menu/desktop-directories/mandriva-education-other.directory.in,
+	  menu/desktop-directories/mandriva-education-sciences.directory.in,
+	  menu/desktop-directories/mandriva-education-sports.directory.in,
+	  menu/desktop-directories/mandriva-education.directory.in,
+	  menu/desktop-directories/mandriva-emulators.directory.in,
+	  menu/desktop-directories/mandriva-games-adventure.directory.in,
+	  menu/desktop-directories/mandriva-games-arcade.directory.in,
+	  menu/desktop-directories/mandriva-games-boards.directory.in,
+	  menu/desktop-directories/mandriva-games-cards.directory.in,
+	  menu/desktop-directories/mandriva-games-other.directory.in,
+	  menu/desktop-directories/mandriva-games-puzzles.directory.in,
+	  menu/desktop-directories/mandriva-games-sports.directory.in,
+	  menu/desktop-directories/mandriva-games-strategy.directory.in,
+	  menu/desktop-directories/mandriva-games-toys.directory.in,
+	  menu/desktop-directories/mandriva-games.directory.in,
+	  menu/desktop-directories/mandriva-graphics-more.directory.in,
+	  menu/desktop-directories/mandriva-graphics.directory.in,
+	  menu/desktop-directories/mandriva-hidden.directory.in,
+	  menu/desktop-directories/mandriva-internet-more.directory.in,
+	  menu/desktop-directories/mandriva-internet.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications.directory.in,
+	  menu/desktop-directories/mandriva-networking.directory.in,
+	  menu/desktop-directories/mandriva-office-more.directory.in,
+	  menu/desktop-directories/mandriva-office.directory.in,
+	  menu/desktop-directories/mandriva-other.directory.in,
+	  menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in,
+	  menu/desktop-directories/mandriva-sciences-astronomy.directory.in,
+	  menu/desktop-directories/mandriva-sciences-biology.directory.in,
+	  menu/desktop-directories/mandriva-sciences-chemistry.directory.in,
+	  menu/desktop-directories/mandriva-sciences-computerscience.directory.in,
+	  menu/desktop-directories/mandriva-sciences-datavisualization.directory.in,
+	  menu/desktop-directories/mandriva-sciences-electricity.directory.in,
+	  menu/desktop-directories/mandriva-sciences-geosciences.directory.in,
+	  menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in,
+	  menu/desktop-directories/mandriva-sciences-mathematics.directory.in,
+	  menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in,
+	  menu/desktop-directories/mandriva-sciences-other.directory.in,
+	  menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in,
+	  menu/desktop-directories/mandriva-sciences-physics.directory.in,
+	  menu/desktop-directories/mandriva-sciences-robotics.directory.in,
+	  menu/desktop-directories/mandriva-sciences.directory.in,
+	  menu/desktop-directories/mandriva-soundvideo-more.directory.in,
+	  menu/desktop-directories/mandriva-soundvideo.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-gnome.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-kde.directory.in,
+	  menu/desktop-directories/mandriva-systemtools.directory.in,
+	  menu/desktop-directories/mandriva-tools-more.directory.in,
+	  menu/desktop-directories/mandriva-tools.directory.in,
+	  menu/desktop-directories/mandrivalinux.directory.in, menu/icons,
+	  menu/icons/accessibility_section.png,
+	  menu/icons/addressbook_section.png,
+	  menu/icons/adventure_section.png,
+	  menu/icons/amusement_section.png,
+	  menu/icons/applications_section.png,
+	  menu/icons/arcade_section.png, menu/icons/archiving_section.png,
+	  menu/icons/artificial_intelligence_section.png,
+	  menu/icons/astronomy_section.png, menu/icons/backup_section.png,
+	  menu/icons/biology_section.png, menu/icons/boards_section.png,
+	  menu/icons/boot_init_section.png, menu/icons/cards_section.png,
+	  menu/icons/cd_burning_section.png, menu/icons/chat_section.png,
+	  menu/icons/chemistry_section.png, menu/icons/chinese_section.png,
+	  menu/icons/code_generator_section.png,
+	  menu/icons/communications_fax_section.png,
+	  menu/icons/communications_other_section.png,
+	  menu/icons/communications_phone_section.png,
+	  menu/icons/communications_section.png,
+	  menu/icons/compression_section.png,
+	  menu/icons/computer_science_section.png,
+	  menu/icons/configuration_section.png,
+	  menu/icons/data_visualization_section.png,
+	  menu/icons/databases_section.png,
+	  menu/icons/development_environment_section.png,
+	  menu/icons/development_section.png,
+	  menu/icons/development_tools_section.png,
+	  menu/icons/documentation_section.png,
+	  menu/icons/editors_section.png,
+	  menu/icons/education_economy_section.png,
+	  menu/icons/education_geography_section.png,
+	  menu/icons/education_history_section.png,
+	  menu/icons/education_languages_section.png,
+	  menu/icons/education_literature_section.png,
+	  menu/icons/education_mathematics.png,
+	  menu/icons/education_other_section.png,
+	  menu/icons/education_sciences.png,
+	  menu/icons/education_section.png,
+	  menu/icons/education_sport_section.png,
+	  menu/icons/education_tool.png,
+	  menu/icons/electricity_section.png,
+	  menu/icons/emulators_section.png,
+	  menu/icons/file_tools_section.png,
+	  menu/icons/file_transfer_section.png,
+	  menu/icons/finances_section.png,
+	  menu/icons/geosciences_section.png, menu/icons/gnome_section.png,
+	  menu/icons/graphics_section.png, menu/icons/graphs_section.png,
+	  menu/icons/hardware_configuration_section.png,
+	  menu/icons/hardware_section.png,
+	  menu/icons/image_processing_section.png,
+	  menu/icons/instant_messaging_section.png,
+	  menu/icons/internet_section.png,
+	  menu/icons/interpreters_section.png, menu/icons/irc_section.png,
+	  menu/icons/kde_section.png, menu/icons/large,
+	  menu/icons/large/accessibility_section.png,
+	  menu/icons/large/addressbook_section.png,
+	  menu/icons/large/adventure_section.png,
+	  menu/icons/large/amusement_section.png,
+	  menu/icons/large/applications_section.png,
+	  menu/icons/large/arcade_section.png,
+	  menu/icons/large/archiving_section.png,
+	  menu/icons/large/artificial_intelligence_section.png,
+	  menu/icons/large/astronomy_section.png,
+	  menu/icons/large/backup_section.png,
+	  menu/icons/large/biology_section.png,
+	  menu/icons/large/boards_section.png,
+	  menu/icons/large/boot_init_section.png,
+	  menu/icons/large/cards_section.png,
+	  menu/icons/large/cd_burning_section.png,
+	  menu/icons/large/chat_section.png,
+	  menu/icons/large/chemistry_section.png,
+	  menu/icons/large/chinese_section.png,
+	  menu/icons/large/code_generator_section.png,
+	  menu/icons/large/communications_fax_section.png,
+	  menu/icons/large/communications_other_section.png,
+	  menu/icons/large/communications_phone_section.png,
+	  menu/icons/large/communications_section.png,
+	  menu/icons/large/compression_section.png,
+	  menu/icons/large/computer_science_section.png,
+	  menu/icons/large/configuration_section.png,
+	  menu/icons/large/data_visualization_section.png,
+	  menu/icons/large/databases_section.png,
+	  menu/icons/large/development_environment_section.png,
+	  menu/icons/large/development_section.png,
+	  menu/icons/large/development_tools_section.png,
+	  menu/icons/large/documentation_section.png,
+	  menu/icons/large/editors_section.png,
+	  menu/icons/large/education_economy_section.png,
+	  menu/icons/large/education_geography_section.png,
+	  menu/icons/large/education_history_section.png,
+	  menu/icons/large/education_languages_section.png,
+	  menu/icons/large/education_literature_section.png,
+	  menu/icons/large/education_mathematics.png,
+	  menu/icons/large/education_other_section.png,
+	  menu/icons/large/education_sciences.png,
+	  menu/icons/large/education_section.png,
+	  menu/icons/large/education_sport_section.png,
+	  menu/icons/large/education_tool.png,
+	  menu/icons/large/electricity_section.png,
+	  menu/icons/large/emulators_section.png,
+	  menu/icons/large/file_tools_section.png,
+	  menu/icons/large/file_transfer_section.png,
+	  menu/icons/large/finances_section.png,
+	  menu/icons/large/geosciences_section.png,
+	  menu/icons/large/gnome_section.png,
+	  menu/icons/large/graphics_section.png,
+	  menu/icons/large/graphs_section.png,
+	  menu/icons/large/hardware_configuration_section.png,
+	  menu/icons/large/hardware_section.png,
+	  menu/icons/large/image_processing_section.png,
+	  menu/icons/large/instant_messaging_section.png,
+	  menu/icons/large/internet_section.png,
+	  menu/icons/large/interpreters_section.png,
+	  menu/icons/large/irc_section.png,
+	  menu/icons/large/kde_section.png,
+	  menu/icons/large/mail_section.png, menu/icons/large/mandriva.png,
+	  menu/icons/large/mathematics_section.png,
+	  menu/icons/large/monitoring_section.png,
+	  menu/icons/large/more_applications_other_section.png,
+	  menu/icons/large/more_applications_section.png,
+	  menu/icons/large/multimedia_section.png,
+	  menu/icons/large/networking_configuration_section.png,
+	  menu/icons/large/networking_section.png,
+	  menu/icons/large/networking_www_section.png,
+	  menu/icons/large/news_section.png,
+	  menu/icons/large/numerical_analysis_section.png,
+	  menu/icons/large/office_accessories_section.png,
+	  menu/icons/large/office_drawing_section.png,
+	  menu/icons/large/office_section.png,
+	  menu/icons/large/other_amusement.png,
+	  menu/icons/large/other_archiving.png,
+	  menu/icons/large/other_configuration.png,
+	  menu/icons/large/other_networking.png,
+	  menu/icons/large/other_sciences.png,
+	  menu/icons/large/packaging_section.png,
+	  menu/icons/large/parallel_computing_section.png,
+	  menu/icons/large/pda_section.png,
+	  menu/icons/large/physics_section.png,
+	  menu/icons/large/presentation_section.png,
+	  menu/icons/large/printing_section.png,
+	  menu/icons/large/publishing_section.png,
+	  menu/icons/large/puzzle_section.png,
+	  menu/icons/large/remote_access_section.png,
+	  menu/icons/large/robotics_section.png,
+	  menu/icons/large/sciences_section.png,
+	  menu/icons/large/shells_section.png,
+	  menu/icons/large/sound_section.png,
+	  menu/icons/large/sport_section.png,
+	  menu/icons/large/spreadsheet_section.png,
+	  menu/icons/large/strategy_section.png,
+	  menu/icons/large/system_other_section.png,
+	  menu/icons/large/system_section.png,
+	  menu/icons/large/taskmanagement_section.png,
+	  menu/icons/large/terminals_section.png,
+	  menu/icons/large/text_tools_section.png,
+	  menu/icons/large/timemanagement_section.png,
+	  menu/icons/large/toys_section.png,
+	  menu/icons/large/video_conferences_section.png,
+	  menu/icons/large/video_section.png,
+	  menu/icons/large/web_browser_section.png,
+	  menu/icons/large/web_editors_section.png,
+	  menu/icons/large/windowmanager_section.png,
+	  menu/icons/large/wordprocessor_section.png,
+	  menu/icons/mageia.png, menu/icons/mail_section.png,
+	  menu/icons/mathematics_section.png, menu/icons/mini,
+	  menu/icons/mini/accessibility_section.png,
+	  menu/icons/mini/addressbook_section.png,
+	  menu/icons/mini/adventure_section.png,
+	  menu/icons/mini/amusement_section.png,
+	  menu/icons/mini/applications_section.png,
+	  menu/icons/mini/arcade_section.png,
+	  menu/icons/mini/archiving_section.png,
+	  menu/icons/mini/artificial_intelligence_section.png,
+	  menu/icons/mini/astronomy_section.png,
+	  menu/icons/mini/backup_section.png,
+	  menu/icons/mini/biology_section.png,
+	  menu/icons/mini/boards_section.png,
+	  menu/icons/mini/boot_init_section.png,
+	  menu/icons/mini/cards_section.png,
+	  menu/icons/mini/cd_burning_section.png,
+	  menu/icons/mini/chat_section.png,
+	  menu/icons/mini/chemistry_section.png,
+	  menu/icons/mini/chinese_section.png,
+	  menu/icons/mini/code_generator_section.png,
+	  menu/icons/mini/communications_fax_section.png,
+	  menu/icons/mini/communications_other_section.png,
+	  menu/icons/mini/communications_phone_section.png,
+	  menu/icons/mini/communications_section.png,
+	  menu/icons/mini/compression_section.png,
+	  menu/icons/mini/computer_science_section.png,
+	  menu/icons/mini/configuration_section.png,
+	  menu/icons/mini/data_visualization_section.png,
+	  menu/icons/mini/databases_section.png,
+	  menu/icons/mini/development_environment_section.png,
+	  menu/icons/mini/development_section.png,
+	  menu/icons/mini/development_tools_section.png,
+	  menu/icons/mini/documentation_section.png,
+	  menu/icons/mini/editors_section.png,
+	  menu/icons/mini/education_economy_section.png,
+	  menu/icons/mini/education_geography_section.png,
+	  menu/icons/mini/education_history_section.png,
+	  menu/icons/mini/education_languages_section.png,
+	  menu/icons/mini/education_literature_section.png,
+	  menu/icons/mini/education_mathematics.png,
+	  menu/icons/mini/education_other_section.png,
+	  menu/icons/mini/education_sciences.png,
+	  menu/icons/mini/education_section.png,
+	  menu/icons/mini/education_sport_section.png,
+	  menu/icons/mini/education_tool.png,
+	  menu/icons/mini/electricity_section.png,
+	  menu/icons/mini/emulators_section.png,
+	  menu/icons/mini/file_tools_section.png,
+	  menu/icons/mini/file_transfer_section.png,
+	  menu/icons/mini/finances_section.png,
+	  menu/icons/mini/geosciences_section.png,
+	  menu/icons/mini/gnome_section.png,
+	  menu/icons/mini/graphics_section.png,
+	  menu/icons/mini/graphs_section.png,
+	  menu/icons/mini/hardware_configuration_section.png,
+	  menu/icons/mini/hardware_section.png,
+	  menu/icons/mini/image_processing_section.png,
+	  menu/icons/mini/instant_messaging_section.png,
+	  menu/icons/mini/internet_section.png,
+	  menu/icons/mini/interpreters_section.png,
+	  menu/icons/mini/irc_section.png, menu/icons/mini/kde_section.png,
+	  menu/icons/mini/mail_section.png,
+	  menu/icons/mini/mathematics_section.png,
+	  menu/icons/mini/monitoring_section.png,
+	  menu/icons/mini/more_applications_other_section.png,
+	  menu/icons/mini/more_applications_section.png,
+	  menu/icons/mini/multimedia_section.png,
+	  menu/icons/mini/networking_configuration_section.png,
+	  menu/icons/mini/networking_section.png,
+	  menu/icons/mini/networking_www_section.png,
+	  menu/icons/mini/news_section.png,
+	  menu/icons/mini/numerical_analysis_section.png,
+	  menu/icons/mini/office_accessories_section.png,
+	  menu/icons/mini/office_drawing_section.png,
+	  menu/icons/mini/office_section.png,
+	  menu/icons/mini/other_amusement.png,
+	  menu/icons/mini/other_archiving.png,
+	  menu/icons/mini/other_configuration.png,
+	  menu/icons/mini/other_networking.png,
+	  menu/icons/mini/other_sciences.png,
+	  menu/icons/mini/packaging_section.png,
+	  menu/icons/mini/parallel_computing_section.png,
+	  menu/icons/mini/pda_section.png,
+	  menu/icons/mini/physics_section.png,
+	  menu/icons/mini/presentation_section.png,
+	  menu/icons/mini/printing_section.png,
+	  menu/icons/mini/publishing_section.png,
+	  menu/icons/mini/puzzle_section.png,
+	  menu/icons/mini/remote_access_section.png,
+	  menu/icons/mini/robotics_section.png,
+	  menu/icons/mini/sciences_section.png,
+	  menu/icons/mini/shells_section.png,
+	  menu/icons/mini/sound_section.png,
+	  menu/icons/mini/sport_section.png,
+	  menu/icons/mini/spreadsheet_section.png,
+	  menu/icons/mini/strategy_section.png,
+	  menu/icons/mini/system_other_section.png,
+	  menu/icons/mini/system_section.png,
+	  menu/icons/mini/taskmanagement_section.png,
+	  menu/icons/mini/terminals_section.png,
+	  menu/icons/mini/text_tools_section.png,
+	  menu/icons/mini/timemanagement_section.png,
+	  menu/icons/mini/toys_section.png,
+	  menu/icons/mini/video_conferences_section.png,
+	  menu/icons/mini/video_section.png,
+	  menu/icons/mini/web_browser_section.png,
+	  menu/icons/mini/web_editors_section.png,
+	  menu/icons/mini/windowmanager_section.png,
+	  menu/icons/mini/wordprocessor_section.png,
+	  menu/icons/monitoring_section.png,
+	  menu/icons/more_applications_other_section.png,
+	  menu/icons/more_applications_section.png,
+	  menu/icons/multimedia_section.png,
+	  menu/icons/networking_configuration_section.png,
+	  menu/icons/networking_section.png,
+	  menu/icons/networking_www_section.png,
+	  menu/icons/news_section.png,
+	  menu/icons/numerical_analysis_section.png,
+	  menu/icons/office_accessories_section.png,
+	  menu/icons/office_drawing_section.png,
+	  menu/icons/office_section.png, menu/icons/other_amusement.png,
+	  menu/icons/other_archiving.png,
+	  menu/icons/other_configuration.png,
+	  menu/icons/other_networking.png, menu/icons/other_sciences.png,
+	  menu/icons/packaging_section.png,
+	  menu/icons/parallel_computing_section.png,
+	  menu/icons/pda_section.png, menu/icons/physics_section.png,
+	  menu/icons/presentation_section.png,
+	  menu/icons/printing_section.png,
+	  menu/icons/publishing_section.png, menu/icons/puzzle_section.png,
+	  menu/icons/remote_access_section.png,
+	  menu/icons/robotics_section.png, menu/icons/sciences_section.png,
+	  menu/icons/shells_section.png, menu/icons/sound_section.png,
+	  menu/icons/sport_section.png, menu/icons/spreadsheet_section.png,
+	  menu/icons/strategy_section.png,
+	  menu/icons/system_other_section.png,
+	  menu/icons/system_section.png,
+	  menu/icons/taskmanagement_section.png,
+	  menu/icons/terminals_section.png,
+	  menu/icons/text_tools_section.png,
+	  menu/icons/timemanagement_section.png,
+	  menu/icons/toys_section.png,
+	  menu/icons/video_conferences_section.png,
+	  menu/icons/video_section.png, menu/icons/web_browser_section.png,
+	  menu/icons/web_editors_section.png,
+	  menu/icons/windowmanager_section.png,
+	  menu/icons/wordprocessor_section.png, menu/make-session.filter,
+	  menu/make-session.script, menu/menu.dtd, menu/menustyle.csh,
+	  menu/menustyle.sh, menu/update-menus, menu/update-menus.filter,
+	  menu/update-menus.script, menu/xdg_menu, sbin, sbin/chksession,
+	  sbin/convertsession, sbin/fndSession, sbin/kdeDesktopCleanup,
+	  sounds, sounds/echokalimba.wav, sounds/endtroduction.wav,
+	  sounds/filmish.wav, sounds/genesis_take1.wav,
+	  sounds/genesis_take3.wav, sounds/heavybreather.wav,
+	  sounds/ia_ora-error.wav, sounds/ia_ora-notification.wav,
+	  sounds/ia_ora-shutdown.wav, sounds/ia_ora-startup.wav,
+	  sounds/index.theme, sounds/introduction.wav,
+	  sounds/spacebird.wav, xinit.d, xinit.d/menu: Import Cleaned
+	  desktop-common-data
+
+2010-06-16  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- unhide Security tagged entries (Mdv bug #59087)
+
+	- uninline submenus in Tools menu
+
+2010-06-15  pzanoni  <pzanoni@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	chksession: print "default" instead of "Default" because this is what Xsession expects CCBUG: 59733
+
+2010-03-18  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	generated changelog
+
+	commit changelog after generating it
+
+	fix typo
+
+	dcommit after changelog generation
+
+	add support for git / git svn
+
+2010-03-15  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	start konsole as nofork
+
+	fix kde4 detection (pzanoni)
+
+	generalize inlining for non-top level directories
+
+	hide generated files
+
+2009-11-06  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 06 Nov 2009 03:20:15 PM CET
+
+	- Remove reference to old ooo64 .desktop files, ensure OOo start .desktop is on top of the list
+
+2009-10-27  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Tue 27 Oct 2009 12:24:01 PM CET
+
+	use new urls for register / upgrade (Mdv bug #54933)
+
+2009-08-19  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Wed 19 Aug 2009 11:02:20 AM CEST
+
+	rename icons mandrake.png to mandriva.png
+
+	fix bashism (bug #51397)
+
+2009-03-25  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- fix comments
+
+2009-03-18  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Wed 18 Mar 2009 05:40:40 PM CET
+
+	- Add support for pam-message in gdm themes (Mdv bug #45081)
+
+2009-03-16  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Replace ogg.jamendo.com with www.jamendo.com
+
+	- Icon support for fluxbot (patch from Jorge Van Hemelryck)
+
+2009-03-03  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Tue 03 Mar 2009 06:22:13 PM CET
+
+	- Add support for lxterminal
+
+2009-01-27  spuk  <spuk@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- geez.. my eyes didn't see the 'commit' in the 'changelog' make action, sorry for that, reverting
+
+	Generated by svn2cl the Ter 27 Jan 2009 20:06:35 BRST
+
+	- fixed some broken links, updated some
+
+2008-10-03  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 03 Oct 2008 07:56:51 PM CEST
+
+	- Update screenshots
+
+2008-09-29  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Mon 29 Sep 2008 09:26:02 AM CEST
+
+2008-09-26  neoclust  <neoclust@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Show systemsettings on top of  menu
+
+2008-09-11  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Thu 11 Sep 2008 06:37:48 PM CEST
+
+	- Move DiscBurning to Tools (Mdv bug #42598)
+
+	- Tweak gdm themes a little to not conflict with one/pwp backgrounds
+
+2008-08-26  pixel  <pixel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	document the options that are handled by xvt
+
+2008-08-12  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Tue 12 Aug 2008 02:48:31 PM CEST
+
+	- Add KDE4 detection (Luc Menut)
+
+	- add sound theme description file
+
+2008-08-04  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Mon 04 Aug 2008 03:36:30 PM CEST
+
+	- Change default background to .jpg file, new gtk is much more strict now
+
+2008-07-07  pixel  <pixel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Mon Jul  7 23:51:28 2008
+
+	Generated by svn2cl the Mon Jul  7 23:49:43 2008
+
+	add rpm filetrigger running fndSession when rpm install/remove dm.d or wmsession.d files
+
+2008-06-30  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Mon 30 Jun 2008 03:10:54 PM CEST
+
+	- Fix path for dm.d files (Mdv bug #41712)
+
+	add terminal as possible terminal emulator
+
+2008-06-24  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Tue 24 Jun 2008 07:37:36 PM CEST
+
+	- Update xdm Xsession to new path (Mdv bug #41645)
+
+2008-06-05  pixel  <pixel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Thu Jun  5 18:53:53 2008
+
+	add rpm filetrigger running update-menus when rpm install/remove .desktop files
+
+2008-05-05  helio  <helio@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- remove old cvs file - Updated changelog
+
+	- Enable both kdm 3 and 4 to be detected.
+
+2008-03-14  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 14 Mar 2008 06:28:53 PM CET
+
+	Change test for Register icon
+
+	Bookmarks for 2008.1
+
+2008-03-10  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Mon 10 Mar 2008 07:01:21 PM CET
+
+	Bigger faces
+
+	Update screenshots for KDM/GDM for 2008.1
+
+2008-03-05  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Wed 05 Mar 2008 08:10:45 PM CET
+
+	- Add .desktop for gdm nolist theme
+
+	Generated by svn2cl the Wed 05 Mar 2008 01:39:29 PM CET
+
+2008-03-03  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Show white background behind user list, prevent user list to look too small when there is not many users on the system
+
+2008-03-03  blino  <blino@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	fix path to icewm/twm fallbacks (migration to "new" Xorg)
+
+2008-02-29  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 29 Feb 2008 02:32:35 PM CET
+
+2008-02-29  helio  <helio@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Proper order
+
+	- Proper order
+
+2008-02-28  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Thu 28 Feb 2008 06:52:46 PM CET
+
+	Generated by svn2cl the Thu 28 Feb 2008 06:52:26 PM CET
+
+	- new faces
+
+	- Add nolist version of gdm / kdm - Fix buttons position in kdm
+
+	Add kdm version for 2008.1
+
+	Update gdm file and icons
+
+2008-02-07  danilo  <danilo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Thu 07 Feb 2008 02:18:23 PM BRST
+
+	SILENT Adding FullPath referenct insted of relative reference
+
+	Fixing the kcmshell --list and Settings:/ (under konqueror) by adding a new Menu named "Settings" in the applications.menu
+
+2008-01-08  danilo  <danilo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- dm/KdmGreeterTheme.desktop was edited to use a KDM screenshot file (screenshot_kdm.png) instead a GDM's screenshot file
+
+2007-12-19  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Wed 19 Dec 2007 07:15:10 PM CET
+
+	Generated by svn2cl the Wed 19 Dec 2007 07:13:58 PM CET
+
+	Update samples with 22kHz 16bits version
+
+2007-10-23  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Tue 23 Oct 2007 04:38:27 PM CEST
+
+	Fix query for Tools menu (Mdv bug #34957)
+
+2007-10-03  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Wed 03 Oct 2007 01:58:34 PM CEST
+
+2007-10-01  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Mon 01 Oct 2007 02:26:33 PM CEST
+
+	Change url for register launcher
+
+	No longer hide GNOME;Settings;System in SystemTools (Mdv bug #34269)
+
+2007-09-28  adamw  <adamw@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	revert my changes that were in conflict with fred's
+
+	Generated by svn2cl the Fri 28 Sep 2007 09:57:56 AM PDT
+
+	Generated by svn2cl the Fri 28 Sep 2007 09:57:33 AM PDT
+
+	adjust default icons: change 'register' icon to point to my.mandriva.com, remove 'buy it' icon (#34238, #34235)
+
+2007-09-28  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 28 Sep 2007 06:53:51 PM CEST
+
+	Rename subscribe into register
+
+	Fix last minute changed asked by marketing
+
+2007-09-27  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Thu 27 Sep 2007 04:04:13 PM CEST
+
+	Tune menu to put .desktop with only main categories at top level
+
+	Fix tarball generation
+
+2007-09-26  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Add support for OOo 64bits .desktop file - Fix typo in ParallelComputing
+
+	- Printing and PackageManager are no longer desktop dependant (Mdv bug #33766, #33436) - hide Emulator / HardwareSettings from Tools/More (Mdv bug #33765, #33906)
+
+2007-09-24  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add new icon for Register launcher
+
+2007-09-19  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Wed 19 Sep 2007 06:39:57 PM CEST
+
+	Generated by svn2cl the Wed 19 Sep 2007 06:39:47 PM CEST
+
+	Add buyit/subscribe icons
+
+	Fix localcopy cleanup
+
+	-Group kcontrol and MCC in SystemTools -hide rpmdrake in SystemTools
+
+	Fix mouseover text color
+
+2007-09-17  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Mon 17 Sep 2007 07:43:30 PM CEST
+
+	Generated by svn2cl the Mon 17 Sep 2007 07:43:19 PM CEST
+
+	Rename reboot.png to system.png and fix gdm theme accordingly
+
+	Add draw.desktop to openoffice.org layout
+
+2007-09-14  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 14 Sep 2007 06:38:47 PM CEST
+
+	Run changelog before dist
+
+	Generated by svn2cl the Fri 14 Sep 2007 06:38:14 PM CEST
+
+	Remove special casing for drakconf, it has its .desktop fixed
+
+	Import new 2008 theme and port it to gdm
+
+	use genesis take2 as startup for now
+
+	Add sound samples done by Helio Chissini de Castro
+
+	one is free for launchers
+
+	Move subcribe to free
+
+	Change default launchers for various products
+
+2007-09-13  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Use new .desktop name for OO.o layout
+
+2007-09-10  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Mon 10 Sep 2007 07:55:53 PM CEST
+
+	Fix missing some GNOME entries in system tools
+
+	Fix path for gnomesu (SUSE)
+
+2007-09-07  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 07 Sep 2007 07:28:35 PM CEST
+
+	- restore gnome/advanced entry (needed for GNOME panel) - add X-MandrivaLinux-More keyword - add inlining for More entries
+
+2007-09-03  helio  <helio@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Start kde changes
+
+2007-08-30  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix renaming of rpmdrake .desktop
+
+	Exclude Emulator from SystemTools (Mdv bug #32940)
+
+	Add missing .directory (Mdv bug #32839)
+
+	Bookmarks for 2008.0
+
+2007-08-28  pixel  <pixel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	don't call "kde-config --path xdgdata-apps" when running as root, since we don't want to modify /root. as for /usr/share/applications that's also returned in @kde_xdgdata, it is transformed to /usr/share which is already hardcoded and so unneeded.
+	this gets rid of /.kde created during install (where HOME=/)
+
+
+
+2007-08-27  pixel  <pixel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	(really) use /var/lib/menu/.xdg_menu_cache when running as root (#32847)
+
+	use /var/lib/menu/.xdg_menu_cache when running as root (#32847)
+
+2007-08-24  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Many fixes for GNOME and KDE menus
+
+	Add menu spec DTD
+
+	Validate menu files
+
+	-Remove old .directory file -Replace some Other with More
+
+2007-08-23  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Additional fixes
+
+	Don't put generated files in tarball
+
+	Fix missing title / icons
+
+	discovery menu is dead
+
+	Add dependency to build menus for tarball
+
+	New menu
+
+2007-08-06  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Die mdk-folders, die
+
+2007-07-11  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Remove "hidden=true" statement (Mdv bug 23181) from .directory files
+
+2007-05-11  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 11 May 2007 05:59:47 PM CEST
+
+	Add support for gdm 2.19.x background attribute
+
+	Fix handling for zh locales (Mdv bug #30215)
+
+2007-05-02  mrl  <mrl@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Replace $@ with $*. Closes: #30522
+
+2007-04-03  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix Other empty menu entry under KDE
+
+2007-04-02  blino  <blino@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the lun 02 avr 2007 12:20:29 CEST
+
+	use fbrun for fluxbox (#30076)
+
+	do not hardcode xterm menu entry for fluxbox (#30076)
+
+2007-03-30  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Fri 30 Mar 2007 06:50:29 PM CEST
+
+	Generated by svn2cl the Fri 30 Mar 2007 06:50:22 PM CEST
+
+	Add old version of categories, since they are still in spec
+
+	Fix typo
+
+	Generated by svn2cl the Fri 30 Mar 2007 06:34:57 PM CEST
+
+	- Hide more applications in discovery menu - Move accessilibity apps from System to More Applications in Discovery menu
+
+2007-03-30  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove duplicate entries
+
+2007-03-27  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Tue 27 Mar 2007 03:19:34 PM CEST
+
+	Fix naming for some bookmarks
+
+	Don't output error if no session file is present
+
+2007-03-22  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix Discovery menu again
+
+	Generated by svn2cl the Thu 22 Mar 2007 05:43:30 PM CET
+
+	Update menu entries for One/Discovery
+
+2007-03-21  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Wed 21 Mar 2007 06:55:10 PM CET
+
+	Updated bookmarks
+
+2007-03-20  mrl  <mrl@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Adds lock system to avoid recursive calls between xdg-open and www-browser.   Closes: #29599
+
+2007-03-15  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by svn2cl the Thu 15 Mar 2007 07:40:16 PM CET
+
+	Hide GNOME Configuration subtree, it is displayed elsewhere
+
+	Re-import old icons
+
+	Add icons for store / club
+
+	Add desktop file for Store and Club
+
+2007-03-14  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix url/name
+
+	Add wengo
+
+2007-03-13  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add icons for wengo/jamendo
+
+2007-03-13  mrl  <mrl@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Adds support for newer KDE's - Adds support for xdg-utils: if an argument is provided, it will be passed   through directly to xdg-open
+
+2007-03-09  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix corrupted CVS import
+
+2007-03-07  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Not necessary
+
+2007-03-06  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix bookmarks
+
+2007-03-05  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix bookmarks
+
+2007-03-02  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update bookmarks
+
+2007-02-21  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	New version of Mandriva star
+
+2007-02-16  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix dist target
+
+	Fix menus to use freedesktop.org official categories
+
+	Force umask
+
+	Fix target since specfile is moved in SVN
+
+2007-02-16  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove not necessary entries
+
+	Byebye
+
+2007-02-14  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove Kiosk entry
+
+2007-02-12  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Move to SVN
+
+2006-12-09  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	converted to UTF-8
+
+2006-11-16  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 16_Nov
+
+	Fix incorrect category for wordprocessors in discovery menu (Mdv bug #27084)
+
+2006-10-26  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 26_Oct
+
+	- Fix update-menus script to not output empty line - Re-add menu file stamp to prevent restarting update-menus for each   graphical login
+
+2006-10-02  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 02_Oct
+
+	- Rename root node from Mandriva Linux to Applications (Mdv bug #25389) - Add missing .directory for various entries (Mdv bug #26273)
+
+2006-09-25  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 25_Sep
+
+	- Add missing Emulator category to menu files (Mdv bug #26148)
+
+2006-09-21  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 21_Sep
+
+	- Hide more applications in one products - Increase version for Conflicts (Mdv bug #26043)
+
+2006-09-19  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 19_Sep
+
+	- Fix error in upstream category in main menu - add mandriva-discovery.menu additional menu file to hide / sort applications   for Discovery / One products
+
+2006-09-18  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 18_Sep
+
+	- Rebuild with fixed mdk-menu-message to get all translations (Mdv bug #25895)
+
+2006-09-15  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix kaspersky icons
+
+	Fix crossover favicon
+
+	Add partners directory
+
+	Fix bookmarks url
+
+2006-09-13  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Don't show GNOME configuration in standard menu, moved in preferences menu
+
+	- Update with new bookmarks
+
+2006-09-13  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix bookmarks for power*
+
+	Fix download bookmarks
+
+	Fix discovery bookmarks
+
+2006-09-08  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 08_Sep
+
+	- Update profile scripts to remove invalid dependencies - move defaults bookmarks from kde and firefox to this package
+
+2006-09-08  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Move konqueror bookmarks
+
+2006-09-04  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 04_Sep
+
+	- Improve gdm/kdm theme with new backgrounds - Don't create default desktop directories for root (Mdv bug #19711)
+
+2006-09-04  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix caps lock error
+
+	Change design as requested by design team
+
+2006-08-31  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Use kmenuedit menu file if it's generated.
+
+	Fix upgrade from 2006
+
+2006-08-30  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 30_Aug
+
+	- update-menus doesn't do anything if DURING_INSTALL is set to 1
+
+	Generated by cvs2cl the 30_Aug
+
+	- Add missing directory file for adventure (Mdv bug #24829) - Add empty menu nodes for KDE in discovery menu - Remove old X-MandrakeLinux* categories for main menu, all entries   must now use X-MandrivaLinux - fix default directories creation if translation contains spaces (Mdv bug #24677)
+
+2006-08-17  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 17_Aug
+
+	- Add discovery menu and script to support MDV_MENU_STYLE
+
+2006-08-17  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Change requires to mandriva-theme
+
+2006-08-09  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update release
+
+	Fix typo. (fix oowriter menu entry)
+
+2006-08-07  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix mdk bug #24103 (add kmenuedit.menu file)
+
+2006-07-20  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 20_Jul
+
+	- Add .directory for Archiving/Other (Mdv bug #23845)
+
+	Generated by cvs2cl the 20_Jul
+
+	- Ignore "Development" keyword, it is too broad atm (Mdv bug #23826)
+
+	Generated by cvs2cl the 20_Jul
+
+	- Fix some typo (Andrej) (Mdk bug #23842)
+
+2006-07-17  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 17_Jul
+
+	final switch to XDG menu
+
+	Final switch to XDG menu
+
+2006-07-11  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Add missing .directory (Mdv bug #23614) - fix translations for some .directories (Mdv bug #23641)
+
+2006-07-10  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add missing directory file
+
+2006-07-07  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 07_Jul
+
+	- add missing .directory - rebuild with fixed intltool
+
+2006-07-07  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 07_Jul
+
+	- fix generating icewm menu from XDG - replace broken link explaining mandriva cvs usage
+
+	fix generating icewm menu
+
+2006-06-19  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 19_Jun
+
+	- Add missing .directory files and fix videoconference one
+
+2006-06-15  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Switch to X-MandrivaLinux
+
+2006-05-29  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 29_May
+
+	- Add legacy directories and default merge directory
+
+	Add back legacy directories
+
+2006-05-17  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix errors in install script
+
+	Generated by cvs2cl the 17_May
+
+	- ship our own .directory files now - use kde .directory files when possible - add more upstream categories
+
+	-use our own .directory files -use more official categories -use kde .directory when available
+
+	Add untranslated directory files
+
+2006-05-12  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix for missing entry
+
+	Fix missing entry reported by Nicolas Chipaux
+
+2006-05-12  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 12_May
+
+	Readd screensaver files
+
+2006-05-11  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 11_May
+
+	Use new filenames for kde .desktop file
+
+	use new name for kde .desktop file
+
+2006-05-10  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 10_May
+
+	Add missing categories (laurent)
+
+2006-05-10  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix missing menu entry (fix kcontrol)
+
+2006-05-04  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 04_May
+
+	fix typo
+
+	Generated by cvs2cl the 04_May
+
+	Fix menu location
+
+	- Add applications-mdk.menu file for XDG menu system - Add xdg_menu script from SUSE to support old WM - Don't ship defaultlayout.menu anymore, it is merged into main menu - Fix typo in old menu file
+
+	Add support for mkrel
+
+2005-09-26  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 26_Sep
+
+	- Fix desktop-directory script (UTF encoded URL, hidden .directory file)   Mdk bug #18853
+
+	-create .directory as hidden file -encode url in UTF8
+
+2005-09-23  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 23_Sep
+
+	2006-1mdk
+
+	Generated by cvs2cl the 23_Sep
+
+	fixed Read Documentation entry
+
+	fix documentation menu tuxracer =>  ppracer
+
+	fix doc fix default web browser to be firefox
+
+2005-09-21  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix doc url
+
+2005-09-19  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix menu entry
+
+2005-09-19  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 19_Sep
+
+	Fix previous commit
+
+	Generated by cvs2cl the 19_Sep
+
+	- Fix loop in www-browser (patch from Andrey Borzenkov)
+
+2005-09-12  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 12_Sep
+
+	use gimp-remote, not gimp-remote-2.2
+
+	Generated by cvs2cl the 12_Sep
+
+	- Fix package name and command for gimp in simplified menu (Mdk bug #17627)
+
+2005-09-08  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add separator in simplified menu
+
+2005-08-29  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 29_Aug
+
+	Fix default directories when no translation is available
+
+	Fix when no translation is available
+
+2005-08-26  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 26_Aug
+
+	Remove desktop special case, it is no longer created
+
+	Generated by cvs2cl the 26_Aug
+
+	New scheme for default directories
+
+2005-08-24  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 24_Aug
+
+	installing scripts works better
+
+	Generated by cvs2cl the 24_Aug
+
+	- Add default directories xinit.d script
+
+	Rename .desktop.in into .desktop.template add gtk-bookmarks support
+
+2005-08-23  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update spec file
+
+2005-08-12  fwang  <fwang@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	s/Mandrake/Mandriva/
+
+	s/Mandrake/Mandriva.
+
+2005-08-10  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generate .desktop from templates and copy them to $HOME at login
+
+2005-06-06  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 06_Jun
+
+	10.3.1-1mdk
+
+2005-05-30  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 30_May
+
+	no more used
+
+	10.3-1mdk
+
+	use the new framework in /etc/X11/dm.d.
+
+2005-05-13  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 13_May
+
+	- change package name - xvt : fix typo (bug #15836) - fix typo in translation-map - remove screensaver images, moved in theme package
+
+2005-03-29  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 29_Mar
+
+	Generated by cvs2cl the 29_Mar
+
+	10.2-4mdk
+
+	test if the $BROWSER variable is set to something valid (bug #14903).
+
+2005-03-23  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 23_Mar
+
+	Forgot simplified menu
+
+	- don't use .desktop files for order directive
+
+2005-03-09  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 09_Mar
+
+	fix stripping value from GNOME
+
+	Generated by cvs2cl the 09_Mar
+
+	- change www-browser to use BROWSER variable if set or use running environment   settings if set. - xvt script to replace alternative : choose programs to start based on   running environment
+
+2005-03-09  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove alias_inline
+
+2005-03-02  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix order into simplified menu
+
+2005-03-01  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix menu order for Menuname with id
+
+	Recreate order as in 10.1
+
+	Add kdm theme
+
+2005-02-28  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add shared theme for GDM/KDM
+
+2005-02-23  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	converted to UTF-8
+
+2005-01-25  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 25_Jan
+
+	Fix small errors in default layout menu files
+
+2004-12-14  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 14_Dec
+
+	Move all menu informations (layout/icons) from menu to mandrake_desk package
+
+2004-09-29  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix "Listen to Music Files" menu entry
+
+	Update
+
+	Add missing menu entry for french mandrakelinux documentation
+
+	Update
+
+	Fix import and sort your photos
+
+2004-09-10  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add Mandrakelinux documentation
+
+2004-09-09  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove all longtitle
+
+2004-09-09  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update last changes
+
+2004-09-09  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove non task oriented description for KPhone
+
+2004-09-07  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Italian Man page
+
+2004-09-01  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update menu Fix capitalization
+
+2004-08-31  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 31_Aug
+
+	10.1-6mdk
+
+	first version
+
+	added standard rules to build packages
+
+2004-08-27  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix typo in gnome-cd entry
+
+2004-08-16  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix "Play Games" entry
+
+	Fix "Play Games" entry
+
+2004-08-11  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Add GNOME version of task oriented menu - Fix capitalisations in task oriented menu
+
+2004-08-05  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix typo
+
+	Update
+
+	Add "Make a phone call" (using kphone at present time)
+
+	Update task oriented menu
+
+2004-08-04  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	fix descriptions (use Mandrakelinux instead of simply Mandrake)
+
+	add "chksession -L" used by DrakX to configure ~/.dmrc
+
+	- don't generate /etc/X11/dm/Sessions/Default.desktop (otherwise gdm gives 2 "default" entries) - cleanup
+
+2004-03-02  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	10.0-10mdk
+
+	don't pass /etc/X11/xdm/Xsession in Exec field for the KDE sessions
+
+2004-02-27  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	call fndSession in %post
+
+	use simply chksession -k for kdm
+
+	do not generate Default session for kdm remove files before generating the sessions
+
+	10.0-9mdk
+
+	use rpm -ta to build an rpm
+
+	fix KDE sessions
+
+2004-02-27  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	s/ORC/OCR
+
+2004-02-24  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+2004-02-24  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+2004-02-24  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix icons
+
+2004-02-05  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix simplified menu
+
+	Fix title of "Organize your time" in simplified menu
+
+	Fix typos
+
+2004-01-29  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Update
+
+	Update
+
+	Remove old images
+
+	Remove old files
+
+	Remove old images
+
+2004-01-19  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add "kontact" entry
+
+2004-01-13  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Fix drakbackup menu entry
+
+	Update new simplified menu
+
+	Save old version
+
+2003-09-10  gc  <gc@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	xfdrake-test-card needs to be in .png format since we don't have have the jpeg pixbug loader during install
+
+2003-09-10  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+2003-09-06  alus  <alus@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	TYPO fix
+
+2003-09-05  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+2003-09-01  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove Record sound entry
+
+2003-08-28  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Update
+
+	Update
+
+	Update
+
+2003-08-27  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix kmix entry
+
+	Fix bad end of lines
+
+	Begin to update
+
+2003-08-27  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix bug 4572 (bad path for gdm session in fndSession)
+
+2003-08-26  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+2003-08-26  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Release 9.2-3mdk
+
+	Add default session for GDM
+
+2003-08-26  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Corrections by Bernard Lang
+
+2003-08-22  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	New images for 9.2
+
+2003-08-22  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	corrections by Bernard Lang
+
+2003-07-30  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix %post (thanks to Pixel)
+
+2003-06-13  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	gdm session format has changed, fix chksession
+
+2003-06-04  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add version in %changelog
+
+	Create a link to allow users to access to Mandrake's backgrounds from KDE
+
+2003-05-08  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Ukrainian file
+
+2003-03-14  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Update for 9.1
+
+2003-03-12  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Remove old icon
+
+	Update icons Remove one old obsolete thing
+
+2003-02-14  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	New default bacground for MDK 9.1
+
+2003-01-31  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Estonian man page
+
+2002-09-06  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update spec Add mandrake-club icon
+
+2002-09-02  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update spec file
+
+	Fix drakconf menu entry
+
+2002-08-29  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	New tux family
+
+	Remove
+
+	Update
+
+	Update
+
+	Tux family is back
+
+2002-08-27  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Update
+
+2002-08-26  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Czech and Russian man pages
+
+2002-08-23  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Update
+
+2002-08-22  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Update for 9.0
+
+	Update
+
+	Update
+
+	Update
+
+2002-08-02  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Update
+
+2002-08-01  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Add icons
+
+2002-08-01  alus  <alus@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	polish translator added
+
+2002-07-31  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update
+
+	Update
+
+	Add kdm logo
+
+	Update
+
+	Add new backgrounds
+
+	Update
+
+	Remove old xml-i18n stuff
+
+	Remove old po
+
+	Update
+
+	Update
+
+	Update
+
+	Fix typo
+
+	Rename xfdrake test card
+
+	Add default background for root
+
+	New default background
+
+	Update
+
+	Remove images
+
+	Add/remove images
+
+	Add/remove images
+
+	Remove
+
+	Remove krootwarning & krozat stuff. Moved in their own modules
+
+	Remove gtk-theme (moved in its own module)
+
+	Remove old badgrouds
+
+2002-07-31  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	-Fix GNOME entry for Crux theme applet - Fix menu entries for simplified menu
+
+2002-07-30  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update spec
+
+	Upload Laurent Montel's spec file
+
+	New defalt user image
+
+2002-07-23  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update spec
+
+2002-07-18  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add new users images for 9.0 beta 1
+
+	Remove old users icons
+
+2002-06-28  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Png icons
+
+	GNOME 2 adaption (by Goetz Waschk)
+
+2002-05-28  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix compile with qt3
+
+2002-03-15  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix default gtk theme
+
+2002-03-07  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	fix root icons (remove it)
+
+2002-03-07  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add new faces
+
+2002-03-07  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Release 8.2-12mdk
+
+2002-03-05  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+	Remove obsoletes faces
+
+	Remove old faces
+
+	Remove obsolete faces
+
+2002-03-01  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+2002-02-28  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+2002-02-26  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix default GTK theme
+
+	Change Mandrake Control Center to Control Center in GNOME
+
+2002-02-26  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+	*** empty log message ***
+
+	Install png icons instead xpm in /usr/share/pixmaps/mdk/
+
+	*** empty log message ***
+
+	*** empty log message ***
+
+2002-02-25  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 25_f�v
+
+	Fix default mdk theme with evolution
+
+2002-02-22  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Basque file
+
+2002-02-20  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix tagging
+
+	Generated by cvs2cl the 20_f�v
+
+	Really fix mdk-eazel-engine-capplet location
+
+	Generated by cvs2cl the 20_f�v
+
+	Fix location of mdk-eazel-engine capplet
+
+	Generated by cvs2cl the 20_f�v
+
+	Fix build
+
+	Fix english strings and makefile
+
+	Generated by cvs2cl the 20_f�v
+
+2002-02-18  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix and update spec
+
+	Various fix for simplified menu (fix typos, icons, remove duplicate entries with kdebase, etc.)
+
+	Fix icon for howto (simplified menu)
+
+2002-02-12  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix simplified menu
+
+2002-02-10  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Basque file
+
+2002-01-29  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add menu entry for Mdk Eazel engine Fix menu entry for Simplified menu
+
+2002-01-28  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix icons for GNOME Desktop
+
+	Release 8.2-3mdk
+
+	Release 8.2-2mdk
+
+2002-01-26  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Fix some menu entries - Use new default png icons when it is needed
+
+2002-01-24  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix path for images
+
+2002-01-14  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove space in name.
+
+2002-01-11  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Resync with package Remove generated files Fix screensaver images
+
+2001-12-04  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Arabic file
+
+2001-11-21  tvignaud  <tvignaud@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	update
+
+2001-10-25  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Georgian file
+
+2001-10-08  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Arabic file
+
+2001-10-02  siegel  <siegel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	fixed URL
+
+	fixed link for bug reports
+
+2001-09-20  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Swedish and Dutch files
+
+2001-09-20  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add support for simplified menu
+
+2001-09-20  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Clean cvs
+
+2001-09-19  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove generated files, fix package generation add mdk-eazel-engine-capplet package
+
+2001-09-19  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix icons to allow clean display on a white background
+
+	Update spec file
+
+	Add gnome-mandrake-news.desktop gnome-mandrakenews.xpm
+
+2001-09-18  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove some old faces (LN)
+
+	Update spec
+
+	Update spec
+
+	mv man.png aman.png to display it by default in DrakX
+
+2001-09-18  fcrozat  <fcrozat@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Use spec compliant desktop file
+
+2001-09-18  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Never show Netscape on Desktop
+
+	Sync
+
+2001-09-17  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+	Add icons
+
+	Add gnome-mandrake-store.desktop
+
+	*** empty log message ***
+
+	Remove hard coded icon PATH
+
+2001-09-17  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix makefile error
+
+	*** empty log message ***
+
+2001-09-17  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update mandrake.links.sh
+
+	Update mandrake.links.sh
+
+2001-09-14  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add gnome-mandrakestore.xpm and updaet gnome-mandrakecampus.xpm and gnome-mandrakeexpert.xpm
+
+2001-09-13  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Irish file
+
+2001-09-13  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update spec
+
+	Re-add mandrakecampus & mandrakeexpert icons
+
+	Update Makefile
+
+	Add mandrake-store icons
+
+	Add new xkill icon
+
+	Remove old icons
+
+	Update spec
+
+	*** empty log message ***
+
+2001-09-12  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove gnome-software-manager from Desktop
+
+	Remove xpm faces
+
+	Remove old backgrounds
+
+	Remove blue frame
+
+2001-09-06  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Irish file
+
+2001-09-04  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update Makefile, remove login/loging100.png and krozat/config.cache
+
+	Update spec
+
+	Remove all files from Special directory (which is no longer needed)
+
+	Remove some old images
+
+	Remove a lot of old icons
+
+	*** empty log message ***
+
+	Update spec
+
+2001-09-03  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Forgot to update
+
+	Fix autostart
+
+2001-09-03  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added French man page to the spec file
+
+	Added French man page, moved English page to its own directory
+
+2001-09-01  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Autostart
+
+	Autostart krootwarning
+
+2001-08-27  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update spec
+
+	Update spec
+
+	Update spec
+
+2001-08-25  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Now krootwarning is xinerama compliante
+
+2001-08-24  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add some MandrakeSoft employees :o)
+
+2001-08-24  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove
+
+2001-08-24  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update spec file
+
+2001-08-24  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Remove
+
+2001-08-24  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Final primary Krozat commit (yes, Chef, your are really honor
+
+	An other part in our Chef honoring
+
+	A new part of Krozat (in honour of our dear Chef ;)
+
+	Add krozat directory (Mandrake Linux screensaver)
+
+2001-08-22  lmontel  <lmontel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Not necessary in this directory
+
+2001-08-21  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Afrikaans strings
+
+2001-08-15  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Latvian file
+
+2001-08-13  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Fix path of kdmrc.
+
+	Generated by cvs2cl the 13_Aug
+
+2001-08-12  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Hungarian file
+
+2001-08-08  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Initial revision
+
+	Add krootwarning (KDE)
+
+2001-08-07  vincent  <vincent@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- Move face in /usr/share/mdk/faces
+
+2001-07-31  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Ignore backup files. Cleanup codes.
+
+2001-07-31  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Generated by cvs2cl the 31_Jul
+
+	no need to run autoconf!
+
+	Generated by cvs2cl the 31_Jul
+
+	8.1-1mdk
+
+	put back my change to the Xsession path that was reverted by the resync.
+
+	added rules to build test and distrib rpm.
+
+	resync with 8.0-12mdk
+
+	resync with 8.0-12mdk
+
+	resync with 8.0-12mdk
+
+	Initial revision
+
+2001-07-26  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	use /etc/X11/xdm/Xsession instead of /etc/X11/Xsession for gdm sessions.
+
+2001-07-23  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Hungarian and slovak files
+
+2001-07-12  tvignaud  <tvignaud@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	99% translated (1 missed)
+
+2001-07-12  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Greek file
+
+	updated Tajik file
+
+2001-07-09  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Tajik file
+
+2001-06-25  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated basque and indonesian files
+
+2001-06-18  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Bosnian file
+
+2001-06-13  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Chinese file
+
+2001-06-06  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Chinese and Russian files
+
+2001-05-28  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Esperanto file
+
+2001-05-20  fabman  <fabman@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated spanish .po file
+
+2001-05-15  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated vietnamese file
+
+2001-05-06  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Chinese file
+
+2001-04-25  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Japanese, Brazilian and Turkish files
+
+2001-04-16  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated slovanian file
+
+2001-04-13  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Polish file
+
+2001-04-12  daouda  <daouda@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	cleanups
+
+	remove kdelnk dir
+
+	macros bis
+
+	macros to ease rpm build from cvs
+
+	fix typo in var RPM
+
+	add define tags
+
+	define RPM var
+
+	commented kdelnk related stuffs
+
+	add eazel themes + gtkrc for rpm build
+
+	new gtkrc  :resync with spec
+
+	commit
+
+2001-04-12  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+	*** empty log message ***
+
+	Remove uneeded KDE files
+
+	Remove uneeded KDE files (provided by kdebase)
+
+2001-04-12  daouda  <daouda@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	resync specs with cvs
+
+2001-04-11  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Azeri file
+
+	Updated azeri file
+
+	Updated Italian file
+
+2001-04-09  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Danish strings
+
+2001-04-05  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Croatian file
+
+2001-04-05  kjx  <kjx@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	translate
+
+2001-04-02  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Catalan and Portuguese files
+
+	Updated hungarian file
+
+2001-04-01  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Czech and Swedish files
+
+	Updated Estonian file; added Vietnamese file
+
+2001-03-31  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Finnish and Catalan files fixed the name of the pot file (so the links on the translations web page aren't broken)
+
+2001-03-30  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Azeri, Croatian, Korean, Norwegian and Albanian files
+
+2001-03-29  siegel  <siegel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	new german version
+
+2001-03-29  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Addition of old files (to keep useful i18n strings in case they are needed in the future)
+
+	Made Bulgarian file unattributed (email of mantainer bounces)
+
+	Updated Walloon file
+
+	Now uses xml-i18n-tools to handle i18n
+
+2001-03-24  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Korean strings
+
+2001-03-21  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Portuguese strings
+
+2001-03-19  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Galician strings
+
+2001-03-17  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated the Portuguese strings
+
+2001-03-06  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Indonesian strings
+
+2001-03-02  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Call xvt.
+
+2001-01-30  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Estonian strings
+
+2001-01-26  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Esperanto strings
+
+2001-01-07  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Basque strings
+
+2000-12-29  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Converted tyo utf-8 and fixed Chinese locales naming
+
+	Converted files to UTF-8
+
+2000-12-11  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Croatian strings
+
+2000-12-05  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	small fix for Russian string
+
+2000-11-24  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Swedish files
+
+2000-11-17  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Georgian strings
+
+2000-10-28  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Brazilian strings
+
+2000-10-26  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Ukrainian strings
+
+2000-10-18  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Turkish files
+
+2000-10-17  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Azeri strings
+
+2000-10-16  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Brazilian strings
+
+2000-09-26  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Slovak strings
+
+2000-09-19  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Azeri strings
+
+2000-09-18  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Polish strings
+
+2000-09-17  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Slovenian strings
+
+2000-09-13  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Afrikaans strings
+
+	corrected email address
+
+	Added Azeri strings
+
+2000-09-10  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Russian strings
+
+2000-09-09  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Polish strings
+
+2000-09-05  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Polish strings
+
+2000-08-31  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+	*** empty log message ***
+
+	Re add a BuildRoot :(
+
+	Update mandrake_desk.spec
+
+	Update mandrake_desk.spec
+
+	Update Changelog
+
+2000-08-31  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Avoid opendir use csh internal globing...
+
+2000-08-30  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Czech strings
+
+2000-08-24  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update Spec
+
+	Update Makefile (for .desktop)
+
+	Update Spec
+
+	Update Changelog
+
+	Remove old .desktop
+
+	*** empty log message ***
+
+	Update Spec and Makefile
+
+	Add a "root" link to make GDM happy
+
+2000-08-23  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Update Makefile and spec file
+
+	Add link default.png and root.png to make KDM happy
+
+	Removed unneeded files
+
+	Convert faces/*.xpm to faces/*.png
+
+	*** empty log message ***
+
+2000-08-22  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Re fix spec
+
+	Fix Makefile and spec
+
+	*** empty log message ***
+
+	Move users icons in /usr/share/faces
+
+	*** empty log message ***
+
+	*** empty log message ***
+
+2000-08-19  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Belarussian strings
+
+2000-08-17  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Estonian strings
+
+2000-08-15  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Ukrainian strings
+
+2000-08-14  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Chinese strings
+
+	updated Bulgarian strings
+
+2000-08-14  siegel  <siegel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+2000-08-13  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Greek strings
+
+2000-08-12  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Serbian strings
+
+	updated Catalan strings
+
+	fixed an email address
+
+2000-08-10  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	small update
+
+2000-08-07  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Lithuanian strings
+
+2000-07-22  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	BM.
+
+2000-07-18  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	* sbin/chksession: Set support for KDE2 by default when generating session.
+
+	window-managers no longer needed.
+
+	window-managers is no longer needed.
+
+	* bin/DrakWM: Add -i options to launch with xinit. add -a option to provide alias for bash.
+
+2000-07-17  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	new release
+
+2000-07-16  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated
+
+	sawmill -> sawfish
+
+2000-07-11  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	A new greatest hit.
+
+	sbin/chksession: make window-managers file dynamic by simple entry in /etc/X11/wmsession.d/ sbin/convertsession: a new greatest hit. mandrake_desk.spec: %post with convertsession
+
+2000-07-07  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Spanish strings
+
+2000-07-06  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated French strings
+
+2000-07-03  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Czech and Latvian strings
+
+2000-06-30  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Norwegia nstrings
+
+2000-06-28  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Hungarian string
+
+2000-06-26  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added Arabic strings
+
+2000-06-11  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Czech strings
+
+2000-06-07  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Korean strings
+
+2000-06-05  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Esperanto strings
+
+2000-05-29  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	see changelog
+
+2000-05-27  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Serbian strings
+
+2000-05-19  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Afrikaans strings
+
+2000-05-17  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated slovakian strings fixed a lot of things in mandrake.links* files (when editing those files please use an 8bit aware editor !)
+
+2000-05-13  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated strings
+
+	Updated French strings
+
+2000-05-12  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+		* use /etc/X11/Xsession for gnome sessions.
+
+		* 1.0.3-21mdk
+
+2000-05-12  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	 removed mandrakeupdate
+
+	corrected mdkupdate entry
+
+	new mdk rel ; added gnome desktop entries
+
+2000-05-09  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	mdk release
+
+	buuug
+
+	corrected bug
+
+	netscape on desktop
+
+	updated for netscape on desktop
+
+	new release
+
+	no comment
+
+2000-05-09  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+2000-05-09  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added netscape on the desktop
+
+	no more netscape.desktop
+
+	removed netscape.desktop copy
+
+	removed gnome desktop icons...
+
+	bug fix
+
+	netscape desktop
+
+	see changelog. new release, cosmetic fix.
+
+2000-05-08  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	cosmetic fix
+
+2000-05-06  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+		* sbin/chksession: if icewm is not here by default launch twm.
+
+2000-05-05  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Galician strings
+
+2000-05-05  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+2000-05-04  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	 	mandrake_desk.spec gnome/mandrake.links :cleaned gnome desktop
+
+2000-05-02  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Romanian strings
+
+2000-04-30  siegel  <siegel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- icon adaption
+
+	- icons cleanup
+
+	- cleanup icons
+
+2000-04-30  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	 	mandrake_desk.spec :bad date
+
+	 	mandrake_desk.spec :bad release
+
+	 	ChangeLog mandrake_desk.spec :see Changelog
+
+	 	XKill.kdelnk : re added to allow newbie to kill without -9
+
+2000-04-30  siegel  <siegel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- updated german translations
+
+2000-04-29  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Britton, Esperanto and Estonian strings
+
+2000-04-28  siegel  <siegel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	- add cdwriter_supermount.xpm - correct TRANSLATOR address - use kdecolors in icons
+
+2000-04-28  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	 	ChangeLog mandrake_desk.spec :corrected xfce entry in windowmanagers.
+
+		ChangeLog mandrake_desk.spec window-managers : recovering old files
+
+	 	mandrake_desk.spec :fixed bad date
+
+	 	ChangeLog mandrake_desk.spec window-managers :corrected xfce entry
+
+2000-04-27  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	 	mandrake_desk.spec  : bad date
+
+	 	ChangeLog mandrake_desk.spec window-managers :corrected wmaker entry  	kdelnk/Updates.kdelnk :unfortunally removed, so re-added
+
+2000-04-26  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	 	ChangeLog :updated
+
+	 	icons/gnome-mandrake.png :new graphic charter  	icons/applnk.xpm icons/x11amp.xpm :useless
+
+2000-04-22  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added Esperanto strings
+
+2000-04-21  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Upload (see ChangeLog)
+
+	Update .spec
+
+	Update doc icons
+
+2000-04-20  fpons  <fpons@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+2000-04-20  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Icelandic strings
+
+2000-04-20  fpons  <fpons@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+2000-04-18  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	 	mandrake_desk.spec :corrected bad version number
+
+	 	Makefile :updated for new mdk relese
+
+	 	ChangeLog mandrake_desk.spec : new mdk release
+
+	 	window-managers : minor correction  	gnome/RpmDrake.desktop kdelnk/Gimp.kdelnk  	kdelnk/RpmDrake.kdelnk kdelnk/Updates.kdelnk  	kdelnk/XKill.kdelnk : desktops needed to be cleaned
+
+2000-04-18  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Welsh strings
+
+	Updated Irish entries
+
+2000-04-17  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Modified Files:  	mandrake_desk.spec updated
+
+	Modified Files:  	ChangeLog updated Removed Files:  	kdelnk/KAppFinder.kdelnk KAppFinder is obsolete now, due to the new menu gestion
+
+	Modified Files: 	ChangeLog updated changes from .spec to Changelog
+
+	Added Files: 	icons/default_background.jpg icons/default_logo.jpg Files added to fit with new look of kdm and gdm.
+
+2000-04-17  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Various fix.
+
+	Add /usr/bin
+
+	DrakWM a new greatest hit.
+
+	Add file.
+
+2000-04-16  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Greek strings
+
+	Updated Croatian strings
+
+	Added Finnsih strings
+
+2000-04-12  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Danish strings
+
+2000-04-11  damien  <damien@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Modified Files:  	mandrake_desk.spec added ref for /usr/share/icons/*.jpg
+
+	Modified Files:  	default_logo.jpg final logo
+
+	Added Files:  	default_background.jpg default_logo.jpg needed for new release of gdm/kdm
+
+	updated icons
+
+2000-04-10  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated German strings
+
+	updated Lithuanian strings
+
+	Updated Galician and Hungarian strings
+
+2000-04-09  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Swedish strings
+
+2000-04-07  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+2000-04-05  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+2000-04-04  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Latvian strings
+
+2000-04-04  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add default background
+
+	Add backgrounds
+
+	Add & remove backgrounds
+
+2000-03-31  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Lithuanian strings
+
+2000-03-30  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	completed Catalan strings
+
+2000-03-26  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Slovenian strings
+
+2000-03-24  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated translators list
+
+	Slovakian and Norwegian updates
+
+2000-03-20  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Finished spanish descriptions
+
+2000-03-18  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	little locale naming fix
+
+2000-03-17  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Danish descriptions
+
+2000-03-08  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Updated Dutch entries
+
+2000-03-06  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Added Chinese entries
+
+2000-03-03  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Removed empty and double Name= and Comment= lines
+
+2000-02-02  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"See_The_Changelog"
+
+2000-01-27  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+2000-01-20  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	updated Peter email address
+
+2000-01-10  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+2000-01-07  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+2000-01-07  flepied  <flepied@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	*** empty log message ***
+
+		* standard mandrake: none.
+
+2000-01-07  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+2000-01-06  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added Czech description for internet icon
+
+2000-01-05  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+2000-01-05  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added Turkish entries
+
+	added Latvian entries
+
+2000-01-05  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+2000-01-04  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+2000-01-04  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Use BBDrake & WMDrake for BlackBox & Window Maker
+
+2000-01-03  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+1999-12-31  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added German name for PPP icon
+
+1999-12-31  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+1999-12-31  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+1999-12-31  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Cut some fr name
+
+1999-12-29  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added icelandic
+
+1999-12-28  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added the Gnome menu entries to the spec file
+
+1999-12-28  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+1999-12-27  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+1999-12-27  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	corrected icons names
+
+1999-12-27  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+1999-12-26  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added catalan entry
+
+1999-12-25  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added menu entries for Gnome
+
+1999-12-25  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+1999-12-24  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added romanian entry
+
+	added galician description to internet icon
+
+1999-12-24  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+1999-12-24  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+1999-12-24  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+1999-12-23  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added Gnome desktop icons previously done in gmc package
+
+	added italian entry
+
+	added some other languages
+
+	added Bulgarian description
+
+	added HR description of kppp
+
+	added some languages
+
+	update
+
+1999-12-23  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+1999-12-23  pablo  <pablo@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	added Bulgarian entries
+
+1999-12-22  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+1999-12-22  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+1999-12-21  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+1999-12-21  baudens  <baudens@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	Add some WM. Sort in alphabetic order-
+
+1999-12-20  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+1999-12-20  prigaux  <prigaux@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	no_comment
+
+1999-12-19  chmouel  <chmouel@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	"Seethechangelog"
+
+	Initial revision
+
+1999-12-19  (no author)  <(no author)@99302b65-d5f7-0310-b3dd-f8cd6f4e3d94>
+
+	New repository initialized by cvs2svn.
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..a61455b
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,96 @@
+PACKAGE = desktop-common-data
+NAME = desktop-common-data
+TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
+mandir=/usr/share/man
+SVNROOT = svn+ssh://svn.mageia.org/svn/soft/$(PACKAGE)
+
+menus: applications.menu kde-applications.menu
+
+menu/validated-menu: menu/applications.menu.in
+	xmllint --noout --dtdvalid menu/menu.dtd $?
+
+applications.menu: menu/validated-menu
+	@echo -n "generating $@ "
+	@sed -e 's,@MAIN_DESKTOP@,GNOME,g' -e 's,@MAIN_TOOLKIT@,GTK,g' -e 's,@ALTERNATIVE_DESKTOP@,KDE,g' -e 's,@ALTERNATIVE_TOOLKIT@,Qt,g' < menu/applications.menu.in > $@
+	@xmllint --noout --dtdvalid menu/menu.dtd $@
+	@echo " OK"
+
+kde-applications.menu: menu/validated-menu
+	@echo -n "generating $@ "
+	@sed -e 's,@MAIN_DESKTOP@,KDE,g' -e 's,@MAIN_TOOLKIT@,Qt,g' -e 's,@ALTERNATIVE_DESKTOP@,GNOME,g' -e 's,@ALTERNATIVE_TOOLKIT@,GTK,g' < menu/applications.menu.in > $@
+	@xmllint --noout --dtdvalid menu/menu.dtd $@
+	@echo " OK"
+
+checktag:
+	@if [ -e ".git" ]; then \
+         if ! git diff --quiet  ; then \
+	   echo not all changes are committed, aborting ; \
+	   exit 1 ; \
+	 fi ; \
+	 if [ -e ".git/svn" ]; then \
+	   if ! git diff --quiet HEAD..trunk ; then \
+	   echo not all changes were pushed to SVN repository ; \
+	   exit 1 ; \
+	   fi ; \
+	 fi ; \
+	fi
+	@if [ "x$(VERSION)" == "x" -o "x$(RELEASE)" = "x" ]; then \
+ 	  echo usage is "make VERSION=version_number RELEASE=release_number dist" ; \
+	  exit 1 ; \
+	fi
+
+clean:
+	find . -type d -name '.xvpics' -o -name '*~' |xargs rm -rf
+	rm -f applications.menu kde-applications.menu
+
+# rules to build a distributable rpm
+
+dist: menus checktag clean changelog tag
+	rm -rf ../$(NAME)-$(VERSION)*.tar* $(NAME)-$(VERSION)
+	@if [ -e ".svn" ]; then \
+		$(MAKE) dist-svn; \
+	elif [ -e ".git" ]; then \
+		$(MAKE) dist-git; \
+	else \
+		echo "Unknown SCM (not SVN nor GIT)";\
+		exit 1; \
+	fi;
+	$(info $(NAME)-$(VERSION).tar.bz2 is ready)
+
+dist-git: 
+	@git archive --prefix=$(NAME)-$(VERSION)/ HEAD | bzip2 -9 -c >../$(NAME)-$(VERSION).tar.bz2;
+
+dist-svn: 
+	svn export -q -rBASE . $(NAME)-$(VERSION)
+	tar cfj ../$(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION)
+	rm -rf $(NAME)-$(VERSION)
+
+tag: checktag
+	@if [ -e ".svn" ]; then \
+		svn copy $(SVNROOT)/trunk $(SVNROOT)/tags/$(TAG) -m "$(TAG)"; \
+	elif [ -e ".git" -a -e ".git/svn" ]; then \
+		git svn tag $(TAG); \
+	fi;
+
+.PHONY: ChangeLog log changelog
+
+log: ChangeLog
+
+changelog: ChangeLog
+
+#svn2cl is available in our contrib.
+ChangeLog: ../common/username.xml
+	@if test -d "$$PWD/.git"; then \
+	  ../common/gitlog-to-changelog | sed -e '/\tgit-svn-id:.*/d' > $@.tmp \
+	  && mv -f $@.tmp $@ \
+	  && git commit ChangeLog -m 'generated changelog' \
+	  && if [ -e ".git/svn" ]; then \
+	    git svn dcommit ; \
+	    fi \
+	  || (rm -f  $@.tmp; \
+	 echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	 (test -f $@ || echo git-log is required to generate this file >> $@)); \
+	else \
+	 svn2cl --accum --authors ../../soft/common/username.xml; \
+	 rm -f *.bak;  \
+	fi;
diff --git a/README b/README
new file mode 100644
index 0000000..0ffea4b
--- /dev/null
+++ b/README
@@ -0,0 +1,20 @@
+Now the desktop files internationalization is handled trough xml-i18n-tools;
+so DON'T EDIT THOSE FILES DIRECTLY, they will be overwritten; instead
+edit the corresponding *.in file.
+
+In those *.in files each entry preceded by an underscore (_) means there
+can be localized entries; eg:
+
+_Foo=blablalbnla
+
+means the produced desktop file will be like:
+
+Foo=blablalbnla
+Foo[ab]=dfsdfsdf
+Foo[xy]=cpakgdoijnqd
+
+etc.
+
+The translations are taken from the po files in the po directory.
+
+Pablo Saratxaga <pablo@mandrakesoft.com>
diff --git a/TRANSLATORS b/TRANSLATORS
new file mode 100644
index 0000000..fee8715
--- /dev/null
+++ b/TRANSLATORS
@@ -0,0 +1,39 @@
+af:	Schalk W. Cronj� <schalkc@ntaba.co.za>
+ar:	Mohamed El-dawy <msdawy@hotmail.com>
+be:	Alexander Bokovoy <ab@avilink.net>
+bg:	Pavel Cholakov <pavel@linux.home.bg>
+br:	Ja�-Mai Drapier <jdrapier@mail.dotcom.fr>
+ca:	Quico Llach <quico@softcatala.org>
+cs:	Vladim�r Marek <vlmarek@volny.cz>
+cy:	Dafydd Tomos <d@fydd.org>
+da:	Troels Liebe Bentsen <tlb@iname.com>
+de:	Stefan Siegel <siegel@linux-mandrake.com>
+el:	Theodore J. Soldatos <theodore@eexi.gr>
+eo:	D. Dale Gulledge <dsplat@rochester.rr.com>
+es:	Pablo Saratxaga <pablo@mandrakesoft.com>
+et:	Riho Kurg <riho@aso.ee>
+fi:	Kim Enkovaara <kim.enkovaara@iki.fi>
+ga:	Sean Kelley <skelley@planetkc.com>
+gl:	Jesus Bravo Alvarez <jba@pobox.com>
+hr:	Andy <andrej@catv-joza.hr>
+hu:	Csaba Szigetvari <csaba.szigetvari@citicorp.com>
+id:	Mohammad DAMT <mdamt@cakraweb.com>
+is:	J�hann �orvar�arson <johann.torvardarson@lais.is>
+it:	Giuseppe Ghibo <ghibo@linux-mandrake.com>
+ko:	Cheolho Choi <forquake@hey.to>
+lt:	Mykolas Norvai�as <myka@centras.lt>
+lv:	Vitauts Stochka <vit@dpu.lv>
+nl:	Alex Vermulst <alexv@linuxfreak.com>
+no:	Terje Bjerkelia <terje@bjerkelia.com>
+pl:	Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>
+ro:	Alexandru Hartmann <ahartmann@as-computer.de>
+ru:	Aleksey Smirnov <smi@logic.ru>
+sk:	Jan Matis <damned@hq.alert.sk>
+sl:	Alen Salamun <alien@alienworld.org>
+sp:	Jankovic Tomislav <tomaja@net.yu>
+sr:	Jankovic Tomislav <tomaja@net.yu>
+sv:	Petri Hiltunen <PHI@stk.edu.stockholm.se>
+tr:	G�rkem �etin <gorkem@gelecek.com.tr>
+uk:	Dmytro Koval'ov <kov@tokyo.email.ne.jp>
+wa:	Pablo Saratxaga <pablo@mandrakesoft.com>
+zh_CN.GB2312:	Danny Zeng <danny@zeng.com.cn>
diff --git a/backgrounds/xfdrake-test-card.png b/backgrounds/xfdrake-test-card.png
new file mode 100644
index 0000000..bcb374e
--- /dev/null
+++ b/backgrounds/xfdrake-test-card.png
diff --git a/bin/print-cups.sh b/bin/print-cups.sh
new file mode 100755
index 0000000..230df13
--- /dev/null
+++ b/bin/print-cups.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+if [ -x /usr/bin/qtcups ]; then
+        qtcups $*
+else 
+        if [ -x /usr/bin/xpp ]; then
+                xpp $*
+        else 
+                lpr $*
+        fi
+fi
diff --git a/bin/www-browser b/bin/www-browser
new file mode 100755
index 0000000..9628889
--- /dev/null
+++ b/bin/www-browser
@@ -0,0 +1,92 @@
+#!/bin/sh
+#---------------------------------------------------------------
+# Project         : Mandrakelinux
+# Module          : bin
+# File            : www-browser
+# Version         : $Id: www-browser 243941 2008-08-12 12:48:22Z fcrozat $
+# Author          : Frederic Lepied
+# Created On      : Tue Aug 31 16:26:54 2004
+# Purpose         : launch a web browser
+#---------------------------------------------------------------
+
+#
+# If we got any argument, we can call xdg-open, if we haven´t already done it
+#
+if [ -n "$*" -a -z "$THROUGHXDG" ]; then
+	# Lock against bug #29599
+	export THROUGHXDG=1
+	exec xdg-open "$@"
+fi
+
+#
+# No URL specified, so we must find a proper browser for the current env
+#
+
+strip_browser_var() {
+    if [[ -n "$BROWSER" ]]; then
+	if [[ `basename "$BROWSER"` == "www-browser" ]]; then
+	    unset BROWSER
+	else
+	    set $BROWSER
+	    if ! which $1 > /dev/null 2>&1; then
+		unset BROWSER
+	    fi
+	fi
+    fi
+}
+
+strip_browser_var
+if [[ -z "$BROWSER" ]]; then
+ 
+    # using GNOME
+    if [[ -n "$GNOME_DESKTOP_SESSION_ID" ]]; then
+	BROWSER=`gconftool -g /desktop/gnome/url-handlers/http/command | sed -e 's/ %s//'`
+	if [[ `gconftool -g /desktop/gnome/url-handlers/http/needs_terminal` == "true" ]]; then
+	    BROWSER="xvt -e $BROWSER"
+	fi
+    fi
+
+    #using KDE
+    if [[ -n "$KDE_FULL_SESSION" ]]; then
+	NEWBROWSER=`kreadconfig --group General --key BrowserApplication 2>/dev/null`
+	if [[ -n "$NEWBROWSER" ]]; then
+	    BROWSER=`echo $NEWBROWSER | sed -e 's/\(.*\).desktop/\1/'`
+	    if [[ x"$KDE_SESSION_VERSION" == x"4" ]]; then   # KDE 4
+		BROWSER="dbus-send --type=method_call --dest=org.kde.klauncher /KLauncher org.kde.KLauncher.start_service_by_desktop_name string:$BROWSER array:string: array:string: string: boolean:true"
+	    else                                        # KDE 3
+		BROWSER="dcop klauncher default start_service_by_desktop_name(QString,QStringList) $BROWSER [ ]"
+	    fi
+	fi
+    fi
+
+    #using XFCE
+    if xprop -root _DT_SAVE_MODE | grep ' = \"xfce4\"$' >/dev/null 2>&1; then
+	    BROWSER="exo-open --launch WebBrowser"
+    fi
+
+
+    strip_browser_var
+    
+    [[ -z "$BROWSER" ]] && BROWSER=`which firefox 2> /dev/null` 
+    [[ -z "$BROWSER" ]] && BROWSER=`which mozilla-firefox 2> /dev/null` 
+    [[ -z "$BROWSER" ]] && [[ -n "$KDE_FULL_SESSION" ]] && which kfmclient > /dev/null 2>&1 && BROWSER="kfmclient openProfile webbrowsing"
+    [[ -z "$BROWSER" ]] && BROWSER=`which epiphany 2> /dev/null`
+    [[ -z "$BROWSER" ]] && BROWSER=`which galeon 2> /dev/null`
+    [[ -z "$BROWSER" ]] && BROWSER=`which seamonkey 2> /dev/null`
+    [[ -z "$BROWSER" ]] && which kfmclient > /dev/null 2>&1 && BROWSER="kfmclient openProfile webbrowsing"
+    [[ -z "$BROWSER" ]] && which links > /dev/null 2>&1 && BROWSER="xvt -e links"
+    [[ -z "$BROWSER" ]] && which lynx > /dev/null 2>&1 && BROWSER="xvt -e lynx"
+fi
+
+if [[ -n "$BROWSER" ]]; then 
+    if [[ -n "$THROUGHXDG" ]]; then
+	# xdg couldn't handle the url
+	exec $BROWSER $@
+    else
+	exec $BROWSER
+    fi
+else
+    echo "no web browser detected"
+fi
+
+# www-browser ends here
diff --git a/bin/xvt b/bin/xvt
new file mode 100755
index 0000000..0dd20c4
--- /dev/null
+++ b/bin/xvt
@@ -0,0 +1,68 @@
+#!/bin/sh
+#---------------------------------------------------------------
+# Project         : MandrivaLinux
+# Module          : bin
+# File            : xvt
+# Version         : $Id: xvt 266850 2010-03-15 16:54:17Z fcrozat $
+# Author          : Frederic Lepied
+# Created On      : Tue Aug 31 16:26:54 2004
+# Purpose         : launch a terminal emulator
+#---------------------------------------------------------------
+
+# allowed parameters, that must be handled by all terminals:
+#   -geometry <geometry>
+#   -T <title>
+#   -e <program>
+
+strip_terminal_var() {
+if [[ -n "$TERMINAL" ]]; then
+  if [[ `basename "$TERMINAL"` == "xvt" ]]; then
+    unset TERMINAL
+  fi
+fi
+}
+
+strip_terminal_var
+if [[ -z "$TERMINAL" ]]; then
+ 
+    # using GNOME
+    if [[ -n "$GNOME_DESKTOP_SESSION_ID" ]]; then
+	TERMINAL=`gconftool -g /desktop/gnome/applications/terminal/exec`
+    fi
+
+    #using KDE
+    if [[ -n "$KDE_FULL_SESSION" ]]; then
+	TERMINAL=`kreadconfig --file kdeglobals --group General --key TerminalApplication --default "konsole"`
+    fi
+
+    if [[ -n "$_LXSESSION_PID" ]]; then
+    	[[ -z "$TERMINAL" ]] && TERMINAL=`which lxterminal 2> /dev/null`
+    fi
+
+   strip_terminal_var 
+   
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which rxvt 2> /dev/null` 
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which xterm 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which gnome-terminal 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which konsole 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which lxterminal 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which aterm 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which Eterm 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which kterm 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which multi-gnome-terminal 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which multixterm 2> /dev/null`
+    [[ -z "$TERMINAL" ]] && TERMINAL=`which terminal 2> /dev/null`
+fi
+
+if [[ -n "$TERMINAL" ]]; then 
+  # keep the same behaviour between all terminals
+  if [[ "`basename ${TERMINAL%% *}`" = "konsole" ]]; then
+    TERMINAL="$TERMINAL --nofork"
+  fi
+
+  exec $TERMINAL "$@"
+else
+  echo "no terminal emulator detected"
+fi
+
+# xvt ends here
diff --git a/bookmarks/konqueror/bookmarks-download.xml b/bookmarks/konqueror/bookmarks-download.xml
new file mode 100644
index 0000000..1fa5713
--- /dev/null
+++ b/bookmarks/konqueror/bookmarks-download.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel folded="no" >
+<bookmark con="/usr/share/icons/favicons/empty.png" href="http://www.mageia.com/" >
+  <title>Mandriva</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/jamendo.png" href="http://www.jamendo.com/" >
+  <title>Jamendo</title>
+ </bookmark>
+  <separator/>
+ <folder folded="yes" >
+  <title>Community</title>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnu.org/software/software.html" >
+   <title>Free Software Foundation</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnu.org/" >
+   <title>The GNU Project</title>
+  </bookmark>
+  <separator/>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://freshmeat.net/" >
+   <title>Freshmeat</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gnome.org/" >
+   <title>GNOME</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.kde.org/" >
+   <title>KDE</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linux.org/" >
+   <title>Linux.org</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxfoundation.org/" >
+   <title>Linux Foundation</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxgames.com/" >
+   <title>Linux Games</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxhq.com/" >
+   <title>Linux HeadQuarters</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.kernel.org/" >
+   <title>Linux Kernel Archives</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.x.org/" >
+   <title>X.org</title>
+  </bookmark>
+ </folder>
+  <folder folded="yes" >
+  <title>News</title>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://alllinuxdevices.com/" >
+   <title>All Linux Devices</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linux.com/" >
+   <title>Linux.com</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.linuxplanet.com/" >
+   <title>Linux Planet</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://linuxtoday.com/" >
+   <title>Linux Today</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.lwn.net/" >
+   <title>Linux Weekly News</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://slashdot.org/" >
+   <title>Slashdot</title>
+  </bookmark>
+ </folder>
+ <folder folded="no" >
+  <title>Programming</title>
+  <separator/>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://gcc.gnu.org/" >
+   <title>GCC</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.gtk.org/" >
+   <title>GTK+</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://techbase.kde.org/" >
+   <title>KDE TechBase</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.opensource.org/" >
+   <title>OpenSource.org</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.perl.org/" >
+   <title>Perl.org</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.python.org/" >
+   <title>Python.org</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.qtsoftware.com/products/" >
+   <title>Qt Software</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.rpm.org/" >
+   <title>RPM.org</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://sourceforge.net/" >
+   <title>SourceForge</title>
+  </bookmark>
+ </folder>
+</xbel>
diff --git a/bookmarks/konqueror/bookmarks-one.xml b/bookmarks/konqueror/bookmarks-one.xml
new file mode 100644
index 0000000..70e53b1
--- /dev/null
+++ b/bookmarks/konqueror/bookmarks-one.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel folded="no" >
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.mageia.org/" >
+  <title>Mageia Community</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/jamendo.png" href="http://www.jamendo.com/" >
+  <title>Jamendo</title>
+ </bookmark>
+</xbel>
diff --git a/bookmarks/mozilla/mozilla-download.html b/bookmarks/mozilla/mozilla-download.html
new file mode 100644
index 0000000..32df31d
--- /dev/null
+++ b/bookmarks/mozilla/mozilla-download.html
@@ -0,0 +1,48 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1>Bookmarks</H1>
+<DL><p>
+<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Mageia</H3>
+<DL><p>
+<DT><A HREF="http://www.mageia.org/">Mageia</A>
+</DL><p>
+<DT><H3 >Community</H3>
+<DL><P>
+<DT><A HREF="http://www.gnu.org/software/software.html">Free Software Foundation</A>
+<DT><A HREF="http://www.gnu.org/">The GNU Project</A>
+<HR>
+<DT><A HREF="http://freshmeat.net/">Freshmeat</A>
+<DT><A HREF="http://www.gnome.org/">GNOME</A>
+<DT><A HREF="http://www.kde.org/">KDE</A>
+<DT><A HREF="http://www.linux.org/">Linux.org</A>
+<DT><A HREF="http://www.linuxfoundation.org/">Linux Foundation</A>
+<DT><A HREF="http://www.linuxgames.com/">Linux Games</A>
+<DT><A HREF="http://www.linuxhq.com/">Linux HeadQuarters</A>
+<DT><A HREF="http://www.kernel.org/">Linux Kernel Archives</A>
+<DT><A HREF="http://www.x.org/">X.org</A>
+</DL><P>
+<DT><H3 >News</H3>
+<DL><P>
+<DT><A HREF="http://alllinuxdevices.com/">All Linux Devices</A>
+<DT><A HREF="http://www.linux.com/">Linux.com</A>
+<DT><A HREF="http://www.linuxplanet.com/">Linux Planet</A>
+<DT><A HREF="http://linuxtoday.com/">Linux Today</A>
+<DT><A HREF="http://www.lwn.net/">Linux Weekly News</A>
+<DT><A HREF="http://slashdot.org/">Slashdot</A>
+</DL><P>
+<DT><H3 >Programming</H3>
+<DL><P>
+<DT><A HREF="http://wiki.mandriva.com/en/Development">Mandriva Cooker</A>
+<HR>
+<DT><A HREF="http://gcc.gnu.org/">GCC</A>
+<DT><A HREF="http://www.gtk.org/">GTK+</A>
+<DT><A HREF="http://techbase.kde.org/">KDE TechBase</A>
+<DT><A HREF="http://www.opensource.org/">OpenSource.org</A>
+<DT><A HREF="http://www.perl.org/">Perl.org</A>
+<DT><A HREF="http://www.python.org/">Python.org</A>
+<DT><A HREF="http://www.qtsoftware.com/products/">Qt Software</A>
+<DT><A HREF="http://www.rpm.org/">RPM.org</A>
+<DT><A HREF="http://sourceforge.net/">SourceForge</A>
+</DL><P>
+</DL><P>
diff --git a/bookmarks/mozilla/mozilla-one.html b/bookmarks/mozilla/mozilla-one.html
new file mode 100644
index 0000000..5899edd
--- /dev/null
+++ b/bookmarks/mozilla/mozilla-one.html
@@ -0,0 +1,10 @@
+<!DOCTYPE NETSCAPE-Bookmark-file-1>
+<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+<TITLE>Bookmarks</TITLE>
+<H1>Bookmarks</H1>
+<DL><p>
+<DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Mageia</H3>
+<DL><p>
+<DT><A HREF="http://www.mageia.org/">Mageia</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/gD+AP7rGNSCAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAAQAAAAEABcxq3DAAAB5klEQVQ4y5WTTWtTQRSGn7lJG5vGpulHUoiGhNgulBZNjShu/KApXboRRAgBF/YX6MJNoUv/QsVCu1IobhQqgiCCSEtK0EVNq0abDzW50KamsXdu5rqwXshC0xx4V8953zlzmBEAqaW0Nb+2RTt1KxbiwbUzQqSW0tb8aq4tsx0SjyC4+9hq1agJQWI4QCzYi1PTqO5L8jt1spVdnJhmy5OS8Qhnj/VhNBQ1wyTg7iTs7WIiOni4gOtjx3mTK/No7Qt12aDnSAdBr5tIvwcnUrYMqO7tU9B3yRZ1rIMLvz9ghwp4mslxIRpgszTAq41S836QklZ6srKBYUjioT6OOmhiDnFqYkYoxf8kpURDMDkawiUEmc/fbaYhDVrJMgxeZj6SLVQ4H/Vzor/bZg4xcmkGpUAp5qanuJ+8zGC3i2y+ws+9OjT+MFOamNJkNOTHpQnSm0VQqnmJX39s0zEWZnoyxu1EjHK1xnq+wtxymmxBZyTQy5DXTY/LyV+fQ0Qu2hO8fpfjw1YZn6cLv8/DkM9DJOCj06ER9ns5GRrgU0nn2dt1vlV2QCmEuHrnn0/5xpXTjA8H2a79QimLol7l+WqWol61e0RydtFaeJFu5w/ZlUqMIwCSs4vWwvJKe+apczy8d1P8Bjor/A30KCkYAAAAAElFTkSuQmCC" HREF="http://www.jamendo.com/">Jamendo</A>
+</DL><P>
diff --git a/desktop/default/register.desktop.in b/desktop/default/register.desktop.in
new file mode 100644
index 0000000..5f27477
--- /dev/null
+++ b/desktop/default/register.desktop.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Icon=register-mga
+_Name=Join Mageia Community
+Type=Link
+URL=http://mageia.org/contribute
diff --git a/dm/GdmGreeterTheme-nolist.desktop b/dm/GdmGreeterTheme-nolist.desktop
new file mode 100644
index 0000000..83288fd
--- /dev/null
+++ b/dm/GdmGreeterTheme-nolist.desktop
@@ -0,0 +1,11 @@
+# This is not really a .desktop file like the rest, but it's useful to treat
+# it as such
+
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=mdk-gdm-nolist.xml
+Name=Mandriva Linux
+Description=Mandriva Linux theme (without user list)
+Author=Mandriva graphic team
+Copyright=(c) 2002-2008 Mandriva
+Screenshot=screenshot-gdm-nolist.png
diff --git a/dm/GdmGreeterTheme.desktop b/dm/GdmGreeterTheme.desktop
new file mode 100644
index 0000000..c0b1bd4
--- /dev/null
+++ b/dm/GdmGreeterTheme.desktop
@@ -0,0 +1,11 @@
+# This is not really a .desktop file like the rest, but it's useful to treat
+# it as such
+
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=mdk-gdm.xml
+Name=Mandriva Linux
+Description=Mandriva Linux theme
+Author=Mandriva graphic team
+Copyright=(c) 2002-2008 Mandriva
+Screenshot=screenshot.png
diff --git a/dm/KdmGreeterTheme.desktop b/dm/KdmGreeterTheme.desktop
new file mode 100644
index 0000000..6ce3531
--- /dev/null
+++ b/dm/KdmGreeterTheme.desktop
@@ -0,0 +1,11 @@
+# This is not really a .desktop file like the rest, but it's useful to treat
+# it as such
+
+[GdmGreeterTheme]
+Encoding=UTF-8
+Greeter=mdk-kde.xml
+Name=Mandriva Linux
+Description=Mandriva Linux theme
+Author=Mandriva graphic team
+Copyright=(c) 2002-2007 Mandriva
+Screenshot=screenshot_kdm.png
diff --git a/dm/disconnect.png b/dm/disconnect.png
new file mode 100644
index 0000000..f36fd3d
--- /dev/null
+++ b/dm/disconnect.png
diff --git a/dm/languages.png b/dm/languages.png
new file mode 100644
index 0000000..e5cf9bc
--- /dev/null
+++ b/dm/languages.png
diff --git a/dm/mdk-gdm-nolist.xml b/dm/mdk-gdm-nolist.xml
new file mode 100644
index 0000000..6381640
--- /dev/null
+++ b/dm/mdk-gdm-nolist.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+  <item type="pixmap" id="background" background="true">
+    <normal file="/usr/share/mdk/backgrounds/default.jpg"/>
+    <pos x="0" y="0" width="100%" height="100%"/>
+  </item>
+  <!-- MAIN BOX -->
+  <item type="rect">
+    <normal color="#FFFFFF" alpha="0.4"/>
+    <pos y="50%" x="50%" width="600" height="276" anchor="c"/>
+    <box orientation="vertical">
+      <item type="rect">
+        <pos width="100%" height="224"/>
+        <fixed>
+          <item type="rect">
+            <pos x="50%" height="50" width="100%" anchor="n"/>
+            <fixed>
+              <item type="label">
+                <pos x="50%" y="50%" anchor="c"/>
+                <normal color="#FFFFFF" font="Sans Bold 12"/>
+                <!-- Stock label for: Welcome to %h -->
+                <stock type="welcome-label"/>
+              </item>
+            </fixed>
+          </item>
+          <item type="rect">
+            <pos anchor="n" x="50%" y="50" width="100%" height="156"/>
+            <!--            <normal color="#FF0000" alpha="0.5"/>-->
+            <fixed>
+              <!-- the login box contents, positioned freely -->
+              <item type="rect">
+                <pos width="box" height="box" x="50%" y="60%" anchor="c"/>
+                <box orientation="vertical" spacing="8" xpadding="22">
+                  <!-- Stock label for: Username: -->
+                  <item type="label" id="pam-prompt">
+                    <pos anchor="nw" x="0"/>
+                    <normal color="#FFFFFF" font="Sans 12"/>
+                    <stock type="username-label"/>
+                  </item>
+                  <!-- user entry -->
+                  <item type="entry" id="user-pw-entry">
+                    <pos height="24" width="230"/>
+                  </item>
+                  <item type="rect">
+                    <pos width="100%" height="24"/>
+                    <fixed>
+                      <item type="button" id="ok_button">
+                        <pos height="box" x="100%" anchor="e" width="box" y="50%"/>
+                        <stock type="ok"/>
+                      </item>
+                    </fixed>
+                  </item>
+		  <item type="label" id="pam-message">
+		   <pos x="50%" y="70%" anchor="c"/>
+		   <normal font="Sans 10" color="#ffffff"/>
+		   <text/>
+	          </item>
+                </box>
+              </item>
+            </fixed>
+          </item>
+        </fixed>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="2"/>
+        <normal color="#FFFFFF" alpha="0.4"/>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="50"/>
+        <fixed>
+          <item type="label" id="clock">
+            <normal color="#FFFFFF" font="Sans 12"/>
+            <pos x="22" y="50%" anchor="w"/>
+            <text>%c</text>
+          </item>
+          <item type="rect">
+            <pos x="100%" y="50%" height="30" width="box" anchor="e"/>
+            <box orientation="horizontal" spacing="20" xpadding="22">
+              <item type="rect" id="language_button" button="true">
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="languages.png" tint="#dddddd"/>
+                    <prelight file="languages.png"/>
+                    <active file="languages.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="session_button" button="true">
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="sessions.png" tint="#dddddd"/>
+                    <prelight file="sessions.png"/>
+                    <active file="sessions.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="disconnect_button" button="true">
+                <show modes="flexi,remote"/>
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="disconnect.png" tint="#dddddd"/>
+                    <prelight file="disconnect.png"/>
+                    <active file="disconnect.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="system_button" button="true">
+                <show type="system" modes="console"/>
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="system.png" tint="#dddddd"/>
+                    <prelight file="system.png"/>
+                    <active file="system.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+            </box>
+          </item>
+        </fixed>
+      </item>
+    </box>
+  </item>
+  <!-- timer -->
+  <item type="rect" id="timed-rect">
+    <show type="timed"/>
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="68%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label" id="timed-label">
+        <normal color="#ffffff" font="Sans 12"/>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: User %s will login in %d seconds -->
+        <stock type="timed-label"/>
+      </item>
+    </box>
+  </item>
+  <item type="label" id="pam-error">
+    <pos x="50%" y="75%" anchor="c"/>
+    <normal font="Sans Bold 14" color="#ffffff"/>
+    <text/>
+  </item>
+  <item type="rect" id="caps-lock-warning">
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="80%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label">
+        <normal color="#FFFFFF" font="Sans 14"/>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: You've got capslock on! -->
+        <stock type="caps-lock-warning"/>
+      </item>
+    </box>
+  </item>
+</greeter>
diff --git a/dm/mdk-gdm.xml b/dm/mdk-gdm.xml
new file mode 100644
index 0000000..bb143a0
--- /dev/null
+++ b/dm/mdk-gdm.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+  <item type="pixmap" id="background" background="true">
+    <normal file="/usr/share/mdk/backgrounds/default.jpg"/>
+    <pos x="0" y="0" width="100%" height="100%"/>
+  </item>
+  <!-- MAIN BOX -->
+  <item type="rect">
+    <normal color="#FFFFFF" alpha="0.4"/>
+    <pos y="50%" x="50%" width="600" height="276" anchor="c"/>
+    <box orientation="vertical">
+      <item type="rect">
+        <pos width="100%" height="224"/>
+        <fixed>
+          <item type="rect">
+            <pos x="50%" height="50" width="100%" anchor="n"/>
+            <fixed>
+              <item type="label">
+                <pos x="50%" y="50%" anchor="c"/>
+                <normal color="#FFFFFF" font="Sans Bold 12"/>
+                <!-- Stock label for: Welcome to %h -->
+                <stock type="welcome-label"/>
+              </item>
+            </fixed>
+          </item>
+          <item type="rect">
+            <pos anchor="n" x="50%" y="50" width="100%" height="156"/>
+            <!--            <normal color="#FF0000" alpha="0.5"/>-->
+            <fixed>
+              <item type="rect" id="userlist-background">
+                <!-- 16 pixel per user in list -->
+                <pos x="22" width="50%" height="100%"/>
+                <normal color="#ffffff" alpha="1.0"/>
+                <fixed>
+                  <item type="list" id="userlist">
+                    <pos height="100%" width="100%"/>
+                  </item>
+                </fixed>
+              </item>
+              <!-- the login box contents, positioned freely -->
+              <item type="rect">
+                <pos width="box" height="box" x="100%" y="55%" anchor="e"/>
+                <box orientation="vertical" spacing="8" xpadding="22">
+                  <!-- Stock label for: Username: -->
+                  <item type="label" id="pam-prompt">
+                    <pos anchor="nw" x="0"/>
+                    <normal color="#FFFFFF" font="Sans 12"/>
+                    <stock type="username-label"/>
+                  </item>
+                  <!-- user entry -->
+                  <item type="entry" id="user-pw-entry">
+                    <pos height="24" width="230"/>
+                  </item>
+                  <item type="rect">
+                    <pos width="100%" height="24"/>
+                    <fixed>
+                      <item type="button" id="ok_button">
+                        <pos height="box" x="100%" anchor="e" width="box" y="50%"/>
+                        <stock type="ok"/>
+                      </item>
+                    </fixed>
+                  </item>
+  		  <item type="label" id="pam-message">
+                      <pos x="0%" y="50%" anchor="nw"/>
+                      <normal font="Sans 10" color="#ffffff"/>
+                      <text/>
+                   </item>
+                </box>
+              </item>
+            </fixed>
+          </item>
+        </fixed>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="2"/>
+        <normal color="#FFFFFF" alpha="0.4"/>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="50"/>
+        <fixed>
+          <item type="label" id="clock">
+            <normal color="#FFFFFF" font="Sans 12"/>
+            <pos x="22" y="50%" anchor="w"/>
+            <text>%c</text>
+          </item>
+          <item type="rect">
+            <pos x="100%" y="50%" height="30" width="box" anchor="e"/>
+            <box orientation="horizontal" spacing="20" xpadding="22">
+              <item type="rect" id="language_button" button="true">
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="languages.png" tint="#dddddd"/>
+                    <prelight file="languages.png"/>
+                    <active file="languages.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="session_button" button="true">
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="sessions.png" tint="#dddddd"/>
+                    <prelight file="sessions.png"/>
+                    <active file="sessions.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="disconnect_button" button="true">
+                <show modes="flexi,remote"/>
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="disconnect.png" tint="#dddddd"/>
+                    <prelight file="disconnect.png"/>
+                    <active file="disconnect.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="system_button" button="true">
+                <show type="system" modes="console"/>
+                <pos width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="system.png" tint="#dddddd"/>
+                    <prelight file="system.png"/>
+                    <active file="system.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+            </box>
+          </item>
+        </fixed>
+      </item>
+    </box>
+  </item>
+  <!-- timer -->
+  <item type="rect" id="timed-rect">
+    <show type="timed"/>
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="68%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label" id="timed-label">
+        <normal color="#ffffff" font="Sans 12"/>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: User %s will login in %d seconds -->
+        <stock type="timed-label"/>
+      </item>
+    </box>
+  </item>
+  <item type="label" id="pam-error">
+    <pos x="50%" y="75%" anchor="c"/>
+    <normal font="Sans Bold 14" color="#ffffff"/>
+    <text/>
+  </item>
+  <item type="rect" id="caps-lock-warning">
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="80%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label">
+        <normal color="#FFFFFF" font="Sans 14"/>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: You've got capslock on! -->
+        <stock type="caps-lock-warning"/>
+      </item>
+    </box>
+  </item>
+</greeter>
diff --git a/dm/mdk-kde-nolist.xml b/dm/mdk-kde-nolist.xml
new file mode 100644
index 0000000..b5c666f
--- /dev/null
+++ b/dm/mdk-kde-nolist.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+  <item type="pixmap" id="background" background="true">
+    <normal file="/usr/share/mdk/backgrounds/default.png"/>
+    <pos x="0" y="0" width="100%" height="100%"/>
+  </item>
+  <!-- MAIN BOX -->
+  <item type="rect">
+    <normal color="#FFFFFF" alpha="0.4"/>
+    <pos y="50%" x="50%" width="600" height="276" anchor="c"/>
+    <box orientation="vertical">
+      <item type="rect">
+        <pos width="100%" height="224"/>
+        <fixed>
+          <item type="rect">
+            <pos x="50%" height="50" width="100%" anchor="n"/>
+            <fixed>
+              <item type="label">
+                <pos x="50%" y="50%" anchor="c"/>
+                <normal color="#FFFFFF" font="Sans 12 Bold"/>
+                <!-- Stock label for: Welcome to %h -->
+                <stock type="welcome-label"/>
+              </item>
+            </fixed>
+          </item>
+          <item type="rect">
+            <pos anchor="n" x="50%" y="50" width="100%" height="156"/>
+	    <!-- <normal color="#FF0000" alpha="0.5"/> -->
+            <fixed>
+              <!-- the login box contents, positioned freely -->
+              <item type="rect">
+                <pos width="box" height="box" x="50%" y="50%" anchor="c"/>
+                <box orientation="vertical" spacing="8" xpadding="22">
+                  <!-- Stock label for: Username: -->
+                  <item type="label">
+                    <pos anchor="nw" x="0"/>
+                    <normal color="#FFFFFF" font="Sans 12"/>
+                    <stock type="username-label"/>
+                  </item>
+                  <!-- user entry -->
+                  <item type="entry" id="user-entry">
+                    <pos height="24" width="230"/>
+                </item>
+
+                <!-- Stock label for: Password: -->
+                  <item type="label">
+                    <pos anchor="nw" x="0"/>
+                    <normal color="#FFFFFF" font="Sans 12"/>
+                    <stock type="password-label"/>
+                  </item>
+                  <!-- user entry -->
+                  <item type="entry" id="pw-entry">
+                    <pos height="24" width="230"/>
+                  </item>
+                </box>
+              </item>
+            </fixed>
+          </item>
+        </fixed>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="2"/>
+        <normal color="#FFFFFF" alpha="0.4"/>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="50"/>
+        <fixed>
+          <item type="label" id="clock">
+            <normal color="#FFFFFF" font="Sans 12"/>
+            <pos x="22" y="50%" anchor="w"/>
+            <text>%c</text>
+          </item>
+          <item type="rect">
+            <pos x="-22" y="50%" height="30" width="80" anchor="e"/>
+            <fixed>
+              <item type="rect" id="session_button" button="true">
+                <pos x="0" y="0" width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="sessions.png" tint="#dddddd"/>
+                    <prelight file="sessions.png"/>
+                    <active file="sessions.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="system_button" button="true">
+                <show type="system" modes="console"/>
+                <pos x="50" y="0" width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="system.png" tint="#dddddd"/>
+                    <prelight file="system.png"/>
+                    <active file="system.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+            </fixed>
+          </item>
+        </fixed>
+      </item>
+    </box>
+  </item>
+  <!-- timer -->
+  <item type="rect" id="timed-rect">
+    <show type="timed"/>
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="68%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label" id="timed-label">
+        <normal color="#ffffff" font="Sans 12"/>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: User %s will login in %d seconds -->
+        <stock type="timed-label"/>
+      </item>
+    </box>
+  </item>
+  <item type="label" id="pam-error">
+    <pos x="50%" y="75%" anchor="c"/>
+    <normal font="Sans Bold 14" color="#ffffff"/>
+    <text/>
+  </item>
+  <item type="rect" id="caps-lock-warning">
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="80%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label">
+        <normal color="#FFFFFF" font="Sans 14"/>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: You've got capslock on! -->
+        <stock type="caps-lock-warning"/>
+      </item>
+    </box>
+  </item>
+</greeter>
diff --git a/dm/mdk-kde.xml b/dm/mdk-kde.xml
new file mode 100644
index 0000000..229660e
--- /dev/null
+++ b/dm/mdk-kde.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+  <item type="pixmap" id="background" background="true">
+    <normal file="/usr/share/mdk/backgrounds/default.png"/>
+    <pos x="0" y="0" width="100%" height="100%"/>
+  </item>
+  <!-- MAIN BOX -->
+  <item type="rect">
+    <normal color="#FFFFFF" alpha="0.4"/>
+    <pos y="50%" x="50%" width="600" height="276" anchor="c"/>
+    <box orientation="vertical">
+      <item type="rect">
+        <pos width="100%" height="224"/>
+        <fixed>
+          <item type="rect">
+            <pos x="50%" height="50" width="100%" anchor="n"/>
+            <fixed>
+              <item type="label">
+                <pos x="50%" y="50%" anchor="c"/>
+                <normal color="#FFFFFF" font="Sans 12 Bold"/>
+                <!-- Stock label for: Welcome to %h -->
+                <stock type="welcome-label"/>
+              </item>
+            </fixed>
+          </item>
+          <item type="rect">
+            <pos anchor="n" x="50%" y="50" width="100%" height="156"/>
+            <!--            <normal color="#FF0000" alpha="0.5"/>-->
+            <fixed>
+              <item type="rect" id="userlist-background">
+                <!-- 16 pixel per user in list -->
+                <pos x="22" width="50%" height="100%"/>
+                <normal color="#ffffff" alpha="1.0"/>
+                <fixed>
+                  <item type="list" id="userlist">
+                    <pos height="100%" width="100%"/>
+                  </item>
+                </fixed>
+              </item>
+              <!-- the login box contents, positioned freely -->
+              <item type="rect">
+                <pos width="box" height="box" x="100%" y="50%" anchor="e"/>
+                <box orientation="vertical" spacing="8" xpadding="22">
+                  <!-- Stock label for: Username: -->
+                  <item type="label">
+                    <pos anchor="nw" x="0"/>
+                    <normal color="#FFFFFF" font="Sans 12"/>
+                    <stock type="username-label"/>
+                  </item>
+                  <!-- user entry -->
+                  <item type="entry" id="user-entry">
+                    <pos height="24" width="230"/>
+                </item>
+
+                <!-- Stock label for: Password: -->
+                  <item type="label">
+                    <pos anchor="nw" x="0"/>
+                    <normal color="#FFFFFF" font="Sans 12"/>
+                    <stock type="password-label"/>
+                  </item>
+                  <!-- user entry -->
+                  <item type="entry" id="pw-entry">
+                    <pos height="24" width="230"/>
+                  </item>
+                </box>
+              </item>
+            </fixed>
+          </item>
+        </fixed>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="2"/>
+        <normal color="#FFFFFF" alpha="0.4"/>
+      </item>
+      <item type="rect">
+        <pos width="100%" height="50"/>
+        <fixed>
+          <item type="label" id="clock">
+            <normal color="#FFFFFF" font="Sans 12"/>
+            <pos x="22" y="50%" anchor="w"/>
+            <text>%c</text>
+          </item>
+          <item type="rect">
+            <pos x="-22" y="50%" height="30" width="80" anchor="e"/>
+            <fixed>
+              <item type="rect" id="session_button" button="true">
+                <pos x="0" y="0" width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="sessions.png" tint="#dddddd"/>
+                    <prelight file="sessions.png"/>
+                    <active file="sessions.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+              <item type="rect" id="system_button" button="true">
+                <show type="system" modes="console"/>
+                <pos x="50" y="0" width="30" height="30"/>
+                <fixed>
+                  <item type="pixmap">
+                    <normal file="system.png" tint="#dddddd"/>
+                    <prelight file="system.png"/>
+                    <active file="system.png" tint="#b8bcdb"/>
+                  </item>
+                </fixed>
+              </item>
+            </fixed>
+          </item>
+        </fixed>
+      </item>
+    </box>
+  </item>
+  <!-- timer -->
+  <item type="rect" id="timed-rect">
+    <show type="timed"/>
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="68%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label" id="timed-label">
+        <normal color="#ffffff" font="Sans 12"/>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: User %s will login in %d seconds -->
+        <stock type="timed-label"/>
+      </item>
+    </box>
+  </item>
+  <item type="label" id="pam-error">
+    <pos x="50%" y="75%" anchor="c"/>
+    <normal font="Sans Bold 14" color="#ffffff"/>
+    <text/>
+  </item>
+  <item type="rect" id="caps-lock-warning">
+    <normal color="#FFFFFF" alpha="0"/>
+    <pos anchor="n" x="50%" y="80%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label">
+        <normal color="#FFFFFF" font="Sans 14"/>
+        <pos x="50%" anchor="n"/>
+        <!-- Stock label for: You've got capslock on! -->
+        <stock type="caps-lock-warning"/>
+      </item>
+    </box>
+  </item>
+</greeter>
diff --git a/dm/screenshot-gdm-nolist.png b/dm/screenshot-gdm-nolist.png
new file mode 100644
index 0000000..ea5b59b
--- /dev/null
+++ b/dm/screenshot-gdm-nolist.png
diff --git a/dm/screenshot.png b/dm/screenshot.png
new file mode 100644
index 0000000..b33f7fa
--- /dev/null
+++ b/dm/screenshot.png
diff --git a/dm/screenshot_kdm.png b/dm/screenshot_kdm.png
new file mode 100644
index 0000000..e152ee5
--- /dev/null
+++ b/dm/screenshot_kdm.png
diff --git a/dm/sessions.png b/dm/sessions.png
new file mode 100644
index 0000000..7be0ca6
--- /dev/null
+++ b/dm/sessions.png
diff --git a/dm/system.png b/dm/system.png
new file mode 100644
index 0000000..f93922f
--- /dev/null
+++ b/dm/system.png
diff --git a/faces/default.png b/faces/default.png
new file mode 100755
index 0000000..0254741
--- /dev/null
+++ b/faces/default.png
diff --git a/faces/user-1.png b/faces/user-1.png
new file mode 100644
index 0000000..cace13e
--- /dev/null
+++ b/faces/user-1.png
diff --git a/krootwarning/.cvsignore b/krootwarning/.cvsignore
new file mode 100644
index 0000000..70845e0
--- /dev/null
+++ b/krootwarning/.cvsignore
@@ -0,0 +1 @@
+Makefile.in
diff --git a/man/C/chksession.8 b/man/C/chksession.8
new file mode 100644
index 0000000..4ca9b70
--- /dev/null
+++ b/man/C/chksession.8
@@ -0,0 +1,103 @@
+.\" Written by Camille Bégnis 12/28/99
+.TH CHKSESSION 8 "Aug 2003" "mandrake_desk" "MandrakeSoft"
+.SH NAME
+chksession \- Add/remove sessions from display managers
+.SH SYNOPSIS
+.B chksession 
+[\fIOPTIONS\fR]...
+.SH DESCRIPTION
+.PP
+.PP
+\fBchksession\fR allows system root to control the window manager
+lists for sessions initiated by gdm and kdm display managers. It
+modifies respective configuration files to add or remove window
+managers available for the sessions, like kde, gnome, icewm...
+.TP
+\fB\-F\fR, \fB\-\-first\fR
+Print only first available entry of config file.
+.TP
+\fB\-d=DIR\fR, \fB\-\-dir=DIR\fR
+Specifies the directory DIR containing the list of window manager files.
+The default is \fI/etc/X11/wmsession.d/\fR.
+.TP
+\fB\-g\fR, \fB\-\-gdm\fR
+Update window managers list for gdm sessions using default config file or FILE specified by \fB\-d\fR option.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print a short help.
+.TP
+\fB\-k\fR, \fB\-\-kdm\fR
+Update window managers list for kdm sessions using default config file or FILE specified by \fB\-d\fR option.
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+List window managers available in config file.
+.TP
+\fB\-r=ENTRY\fR, \fB\-\-remove=ENTRY\fR
+Print to stdout the list of window managers as in config file, where ENTRY has been removed.
+.TP
+\fB\-t\fR, \fB\-\-test\fR
+Enter test mode. Not to be used unless you know precisely what you are
+doing. See TESTING.
+.TP
+\fB\-x=ENTRY\fR, \fB\-\-xsession=ENTRY\fR
+Print to stdout the script used to launch the ENTRY window manager.
+.SH "WINDOW MANAGERS CONFIGURATION FILES"
+\fBchksession\fR uses a directory containing several window manager
+description files (by default \fI/etc/X11/wmsession.d/\fR unless
+specified by option \fB\-d\fR).  Each file contains the information to
+briefly present the window manager and to start a session using it
+(see examples in \fI/etc/X11/wmsession.d/\fR).  Each file name usually
+begins with digits (2 digits), which are used to order the list of the
+window managers they describe.
+.br
+Each file contains 4 definitions followed by a script:
+.TP
+.B NAME=<name>
+specifies the name of the session in the displayed list of window managers.
+.TP
+.B ICON=<file>
+icon file (\fI.xpm or .png\fR) used for this window manager.
+.TP
+.B DESC=<text>
+short description of the window manager for a session.
+.TP
+.B EXEC=<path>
+<path> must be the absolute path of an executable file for the window
+manager.  It is used only to check that the window manager has
+actually been installed.  If this definition is missing, or if the
+file is not executable by effective uid/gid, then this window manager
+description file is ignored.
+.TP
+.B SCRIPT:
+shell script used to run the window manager chosen by the user.
+.br
+This script starts on the next line and may be composed of several
+command lines. It must be the last part of the file, since it will
+include all following lines to the end of file.
+.PP
+All other lines, preceeding the script, are ignored.
+.SH FILES
+\fB\/etc/X11/wmsession.d/\fR default directory of window manager
+description files. It is the reference used by \fBchksession\fR to update
+configuration files of both gdm and kdm display managers.
+.SH "TESTING"
+Option \fB\-t\fR or \fB\-\-test\fR may be used for testing only.  When
+this option is active the behaviour may change in various way.  For
+example: the default directory DIR containing the list of window
+manager files may then be \fI./wmsession.d/\fR rather than
+\fI/etc/X11/wmsession.d/\fR. Do not use it unless you know precisely
+what you are doing.
+.SH "REPORTING BUGS"
+Report bugs to \fBhttp://www.mandrakeexpert.com/\fR.
+.SH "SEE ALSO"
+\fIxdm\fR(1)
+.SH "AUTHOR"
+Created by Camille Bégnis 12/28/99 - Modified by Bernard Lang 08/09/03.
+.br
+Last modified: August 21, 2003.
+.SH COPYRIGHT
+Copyright \(co 1999-2003 MandrakeSoft.
+.br
+This is a GPL free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
diff --git a/man/cs/chksession.8 b/man/cs/chksession.8
new file mode 100644
index 0000000..0c69387
--- /dev/null
+++ b/man/cs/chksession.8
@@ -0,0 +1,69 @@
+.\" Written by Camille Bégnis 12/28/99
+.TH CHKSESSION 8 "Pro 1999" "mandrake_desk" "MandrakeSoft"
+.SH NÁZEV
+chksession \- Přidá/odebere sezení ze správců displeje
+.SH SYNAPSE
+.B chksession 
+[\fIVOLBA\fR]...
+.SH POPIS
+.PP
+.PP
+Program chksession umožňuje správci systému spravovat seznam sezení, poskytované správci displeje GDM a KDM. Upravuje odpovídající soubory s nastavením a přidává nebo odebírá dostupná sezení jako kde, gnome, icewm...
+.TP
+\fB\-F\fR, \fB\-\-first\fR
+Vytiskne ze souboru s nastavením pouze první dostupnou položku.
+.TP
+\fB\-f=SOUBOR\fR, \fB\-\-file=SOUBOR\fR
+Urči alternativní soubor s nastavením, jiný než soubor \fI/etc/X11/window-manager\fR
+.TP
+\fB\-g\fR, \fB\-\-gdm\fR
+Aktualizuje seznam správců oken pro sezení správce GDM, použije výchozí soubor s nastavením nebo SOUBOR určený volbou \fB\-f\fR.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Vytiskne krátkou nápovědu.
+.TP
+\fB\-k\fR, \fB\-\-kdm\fR
+Aktualizuje seznam správců oken pro sezení správce KDM, použije výchozí soubor s nastavením nebo SOUBOR určený volbou \fB\-f\fR.
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+Vypíše seznam správců oken, kteří jsou k dispozici v souboru s nastavením.
+.TP
+\fB\-r=POLOŽKA\fR, \fB\-\-remove=POLOŽKA\fR
+Vypíše na standardní výstup seznam správců oken ze souboru s nastavením, ze kterého je odstraněna POLOŽKA.
+.TP
+\fB\-t\fR, \fB\-\-test\fR
+Aktivuje testovací režim.
+.TP
+\fB\-x=POLOŽKA\fR, \fB\-\-xsession=POLOŽKA\fR
+Vypíše na standardní výstup skript, který se použije ke spuštění správce oken z POLOŽKY.
+.SH "STRUKTURA SOUBORU S NASTAVENÍM"
+Tento soubor popisuje každého správce oken, který bude k dispozici pomocí správců displeje. Každá položka je v tomto souboru oddělena řádkem se znaky \fB\-\-@@\-\-\fR.
+.PP
+.B NAME=
+název sezení, jak je zobrazen v seznamu správce displeje.
+.PP
+.B ICON=
+soubor s ikonou (\fI.xpm nebo .png\fR), který se použije pro toto sezení.
+.PP
+.B DESC=
+krátký popis sezení.
+.PP
+.B EXEC=
+testovací řetězec, který vyzkouší, zda-li je instalován správce sezení nebo ne.
+.PP
+.B SCRIPT:
+skript shellu, který spustí správce oken vybraný uživatelem.
+.SH SOUBORY
+.TP 
+\fB\/etc/X11/window-manager\fR
+výchozí soubor s nastavením, obsahuje položky pro většinu známých správců oken. Je to základ použitý programem \fBchksessio\fRn pro aktualizaci souborů s nastavením správců displeje GDM a KDM.
+.SH "CHYBY"
+Nahlaste chyby na adresu \fBhttp://www.linux-mandrake.com/bugs/\fR.
+.SH "VIZ TAKÉ"
+\fIxdm\fR(1)
+.SH COPYRIGHT
+Copyright (c) 1999 MandrakeSoft.
+.br
+Toto je volně šiřitelný software pod licencí GPL; viz zdrojový kód s podmínkami pro kopírování. 
+Je dodáván BEZ ZÁRUK; včetně záruk OBCHODOVATELNOSTI nebo VHODNOSTI PRO URČITÝ ZPŮSOB UŽITÍ.
+
diff --git a/man/et/chksession.8 b/man/et/chksession.8
new file mode 100644
index 0000000..72e0268
--- /dev/null
+++ b/man/et/chksession.8
@@ -0,0 +1,71 @@
+.\" Kirjutanud Camille Bégnis 12/28/99
+.\" 
+.\" Tõlge eesti keelde 2002: Marek Laane
+.\" bald@online.ee
+.TH "CHKSESSION" "8" "Dets. 1999" "mandrake_desk" "MandrakeSoft"
+.SH "NIMI"
+chksession \- Lisab/eemaldab aknahaldurite seansse
+.SH "KOKKUVÕTE"
+.B chksession 
+[\fIOPTION\fR]...
+.SH "KIRJELDUS"
+.PP 
+.PP 
+chksession võimaldab süsteemi administraatoril hallata seansside loendit, mida pakuvad kuvahaldurid gdm ja kdm. See võimaldab muuta vastavaid seadistustefaile, et lisada või eemaldada seansse, näiteks kde, gnome, icewm...
+.TP 
+\fB\-F\fR, \fB\-\-first\fR
+Näitab ainult seadistustefaili esimest saadaolevat kirjet.
+.TP 
+\fB\-f=FAIL\fR, \fB\-\-file=FAIL\fR
+Määrab alternatiivse seadistustefaili (vaikimisi \fI/etc/X11/window\-manager\fR)
+.TP 
+\fB\-g\fR, \fB\-\-gdm\fR
+Uuendab aknahaldurite loendit gdm\-i seansside tarbeks, kasutades vaikeseadistustefaili või FAILI, mis määrati võtmega \fB\-f\fR.
+.TP 
+\fB\-h\fR, \fB\-\-help\fR
+Näitab lühikest abiteadet.
+.TP 
+\fB\-k\fR, \fB\-\-kdm\fR
+Uuendab aknahaldurite loendit kdm\-i seansside tarbeks, kasutades vaikeseadistustefaili või FAILI, mis määrati võtmega \fB\-f\fR.
+.TP 
+\fB\-l\fR, \fB\-\-list\fR
+Loendab seadistustefailis saadaolevad aknahaldurid.
+.TP 
+\fB\-r=ENTRY\fR, \fB\-\-remove=ENTRY\fR
+Print to stdout the list of window\-managers as in config file, where ENTRY has been removed.
+.TP 
+\fB\-t\fR, \fB\-\-test\fR
+Käivitab testiresiimi.
+.TP 
+\fB\-x=ENTRY\fR, \fB\-\-xsession=ENTRY\fR
+Print to stdout the script used to launch ENTRY window\-manager.
+.SH "SEADISTUSTEFAILI STRUKTUUR"
+See fail kirjeldab iga aknahaldurit, mida pakuvad kuvahaldurid. Iga kirjet eraldab siin rida \fB\-\-@@\-\-\fR.
+.PP 
+.B NAME=
+on seansi nimi, nagu see esineb kuvahalduri loendis.
+.PP 
+.B ICON=
+on selleks seansiks kasutatav ikoonifail (\fI.xpm või .png\fR).
+.PP 
+.B DESC=
+on seansi lühikirjeldus.
+.PP 
+.B EXEC=
+on testistring, mis kontrollib, kas kuvahaldur on paigaldatud või mitte.
+.PP 
+.B SCRIPT:
+on shelliskript, mida kasutatakse valitud aknahalduri käivitamiseks.
+.SH "FAILID"
+.TP 
+\fB\/etc/X11/window\-manager\fR
+on vaikimisi seadistustefail, mis loendab tuntumad aknahaldurid. See on alus, mida kasutab \fBchksession\fR nii gdm\-i kui kdm\-i seadistustefailide uuendamiseks.
+.SH "VEARAPORT"
+Andke vigadest teada aadressil \fBhttp://www.linux\-mandrake.com/bugs/\fR.
+.SH "VAATA KA"
+\fIxdm\fR(1)
+.SH "AUTORIÕIGUS"
+Copyright \(co 1999 MandrakeSoft.
+.br 
+See on Üldise Avaliku Litsentsiga kaitstud vaba tarkvara; kopeerimistingimusi vaadake lähtetekstist. Sellega tarkvaral puudub igasugune garantii, selle kasutamine on vaid Teie enda vastutusel.
+
diff --git a/man/eu/chksession.8 b/man/eu/chksession.8
new file mode 100644
index 0000000..5f5f4ce
--- /dev/null
+++ b/man/eu/chksession.8
@@ -0,0 +1,70 @@
+.\" Camille Bégnis-ek idatzia 99/12/28
+.TH CHKSESSION 8 "1999ko abendua" "mandrake_desk" "MandrakeSoft"
+.SH IZENA
+chksession \- Pantaila-kudeatzailean saioak gehitzen/ezabatzen ditu
+.SH LABURPENA
+.B chksession 
+[\fIAUKERA\fR]...
+.SH AZALPENA
+.PP
+.PP
+chksession-ek gdm eta kdm pantaila-kudeatzaileek hornitzen duten saio-zerrenda kudeatzeko aukera ematen dio sistemaren root-ari. Horrek kde, gnome, icewm eta beste hainbat saio erabilgarri gehitzeko edo kentzeko dagozkion konfigurazio-fitxategiak aldatuko ditu.
+.TP
+\fB\-F\fR, \fB\-\-first\fR
+Konfigurazio-fitxategiaren lehenengo sarrera erabilgarria bakarrik inprimatzen du.
+.TP
+\fB\-f=FILE\fR, \fB\-\-file=FILE\fR
+\fI/etc/X11/window-manager\fR ez den beste konfigurazio-fitxategi bat zehazten du
+.TP
+\fB\-g\fR, \fB\-\-gdm\fR
+gdm saioen leiho-kudeatzaileen zerrenda eguneratzen du konfigurazio-fitxategi lehenetsia edo \fB\-f\fR aukerak zehazten duen FITXATEGIA erabiliz.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Laguntza laburra inprimatzen du.
+.TP
+\fB\-k\fR, \fB\-\-kdm\fR
+kdm saioen leiho-kudeatzaileen zerrenda eguneratzen du konfigurazio-fitxategi lehenetsia edo \fB\-f\fR aukerak zehazten duen FITXATEGIA erabiliz.
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+Konfigurazio-fitxategian erabilgarri dauden leiho-kudeatzaileak zerrendatzen ditu.
+.TP
+\fB\-r=ENTRY\fR, \fB\-\-remove=ENTRY\fR
+Leiho-kudeatzaileen zerrenda irteera estandarrean inprimatzen du, SARRERA hori kendu duen konfigurazio-fitxategian dagoen bezala.
+.TP
+\fB\-t\fR, \fB\-\-test\fR
+Proba modua sartzen du.
+.TP
+\fB\-x=ENTRY\fR, \fB\-\-xsession=ENTRY\fR
+SARRERA leiho-kudeatzailea abiarazteko erabili den script-a irteera estandarrean inprimatzen du.
+.SH "KONFIGURAZIO-FITXATEGIAREN EGITURA"
+Fitxategi honek pantaila-kudeatzaileetan erabilgarri egongo diren leiho-kudeatzaile guztiak deskribatzen ditu. Fitxategi honetako sarrerak bereizteko \fB\-\-@@\-\-\fR lerroa erabiliko da.
+.PP
+.B IZENA=
+saioaren izena da, pantaila-kudeatzailearen zerrendan bistaratutako moduan.
+.PP
+.B IKONOA=
+saio honetan erabilitako ikono-fitxategia (\fI.xpm edo .png\fR).
+.PP
+.B AZALP=
+saioaren azalpen laburra.
+.PP
+.B EXEC=
+saio-kudeatzailea instalatua izan den ala ez ikusteko testu-katea.
+.PP
+.B SCRIPT-A=
+erabiltzaileak aukeratutako leiho-kudeatzailea exekutatzeko erabili den shell script-a.
+.SH FITXATEGIAK
+.TP
+\fB\/etc/X11/window-manager\fR
+konfigurazio-fitxategi lehenetsia da, leiho-kudeatzaile ezagun gehienak zerrendatzen ditu. \fBchksessio\fRn-ek gdm eta kdm pantaila-kudeatzaileen konfigurazio-fitxategiak eguneratzeko erabiltzen duen oinarria da.
+.SH "AKATSEN BERRI-EMATEA"
+Akatsen berri hona bidali: \fBhttp://www.linux-mandrake.com/bugs/\fR.
+.SH "IKUSI BAITA ERE"
+\fIxdm\fR(1)
+.SH COPYRIGHTa
+Copyright \(co 1999/2000 MandrakeSoft.
+.br
+GPL software librea da; kopiatzeko baldintzak iturburuan ikusi.  Ez du INOLAKO
+bermerik; ez eta MERKATURATZEKO edo HELBURU PARTIKULARRETARAKO ere.
+
+
diff --git a/man/fr/chksession.8 b/man/fr/chksession.8
new file mode 100644
index 0000000..ac16d87
--- /dev/null
+++ b/man/fr/chksession.8
@@ -0,0 +1,69 @@
+.\" Écrit par Camille Bégnis 12/28/99
+.TH CHKSESSION 8 "Dec 1999" "mandrake_desk" "MandrakeSoft"
+.SH NAME
+chksession \- Ajouter/retirer des sessions de gestionnaires de connexion
+.SH SYNOPSIS
+.B chksession 
+[\fIOPTION\fR]...
+.SH DESCRIPTION
+.PP
+.PP
+chksession permet à l'administrateur de gérer la liste des sessions fournies par les gestionnaires gdm et kdm. Il modifie les fichiers de configuration respectifs pour ajouter ou retirer des sessions telles que kde, gnome, icewm...
+.TP
+\fB\-F\fR, \fB\-\-first\fR
+Affiche seulement la première entrée disponible du fichier de configuration.
+.TP
+\fB\-f=FICHIER\fR, \fB\-\-file=FICHIER\fR
+Spécifie un autre fichier de configuration, différent de \fI/etc/X11/window-manager\fR
+.TP
+\fB\-g\fR, \fB\-\-gdm\fR
+Met à jour la liste des gestionnaires de fenêtres pour les sessions gdm avec le fichier de configuration par défaut le FICHIER spécifié par l'option \fB\-f\fR.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Affiche un message d'aide.
+.TP
+\fB\-k\fR, \fB\-\-kdm\fR
+Met à jour la liste des gestionnaires de fenêtres pour les sessions kdm avec le fichier de configuration par défaut le FICHIER spécifié par l'option \fB\-f\fR.
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+Liste les gestionnaires de fenêtres disponibles dans le fichier de configuration.
+.TP
+\fB\-r=ENTRÉE\fR, \fB\-\-remove=ENTRÉE\fR
+Affiche sur la sortie standard la liste des gestionnaires de fenêtres comme dans le fichier de configuration, où ENTRÉE a été retirée.
+.TP
+\fB\-t\fR, \fB\-\-test\fR
+Entre dans le mode de test.
+.TP
+\fB\-x=ENTRÉE\fR, \fB\-\-xsession=ENTRÉE\fR
+Affiche sur la sortie standard le script utilisé pour lancer le gestionnaire de fenêtres ENTRÉE.
+.SH "STRUCTURE DU FICHIER DE CONFIGURATION"
+Ce fichier décrit chaque gestionnaire de fenêtres qui sera rendu disponible par le gestionnaire de connexion. Chaque entrée de ce fichier est séparée par une ligne \fB\-\-@@\-\-\fR.
+.PP
+.B NAME=
+est le nom de la session tel qu'affiché dans la liste du gestionnaire de connexion.
+.PP
+.B ICON=
+fichier icône (\fI.xpm oo .png\fR) utilisé pour cette session.
+.PP
+.B DESC=
+description courte de la session.
+.PP
+.B EXEC=
+teste la chaîne pour vérifier si le gestionnaire de connexion est installé ou pas.
+.PP
+.B SCRIPT:
+script shell utilisé pour lancer le gestionnaire de fenêtres choisi par l'utilisateur.
+.SH FICHIERS
+.TP 
+\fB\/etc/X11/window-manager\fR
+fichier de configuration par défaut, listant les gestionnaires de fenêtres les plus courants. C'est la base utilisée par \fBchksessio\fRn pour mettre à jour les fichiers de configuration des gestionnaires de connexion gdm et de kdm.
+.SH "RAPPORT DE BOGUES"
+Veuillez signaler les bogues à \fBhttps://qa.mandrakesoft.com/\fR.
+.SH "VOIR AUSSI"
+\fIxdm\fR(1)
+.SH COPYRIGHT
+Copyright \(co 1999 MandrakeSoft.
+.br
+This is a GPL free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
diff --git a/man/it/chksession.8 b/man/it/chksession.8
new file mode 100644
index 0000000..3434b31
--- /dev/null
+++ b/man/it/chksession.8
@@ -0,0 +1,72 @@
+.\" Scritto da Camille Bégnis 12/28/99
+.TH CHKSESSION 8 "Dec 1999" "mandrake_desk" "MandrakeSoft"
+.SH NOME
+chksession \- Aggiunge/rimuove sessioni dai display manager
+.SH SINTASSI
+.B chksession 
+[\fIOPZIONE\fR]...
+.SH DESCRIZIONE
+.PP
+.PP
+chksession permette all'amministratore di sistema di modificare l'elenco delle sessioni attivabili tramite i display manager gdm e kdm. Esso modifica i rispettivi file di configurazione per aggiungere e rimuovere le sessioni disponibili, ad es. kde, gnome, icewm...
+.TP
+\fB\-F\fR, \fB\-\-first\fR
+Stampa soltanto la prima voce disponibile nel file di configurazione.
+.TP
+\fB\-f=FILE\fR, \fB\-\-file=FILE\fR
+Specifica un file di configurazione alternativo, diverso da \fI/etc/X11/window-manager\fR
+.TP
+\fB\-g\fR, \fB\-\-gdm\fR
+Aggiorna l'elenco dei window-manager attivabili tramite gdm usando il file di configurazione predefinito o il FILE specificato dall'opzione \fB\-f\fR.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Stampa un breve testo di aiuto.
+.TP
+\fB\-k\fR, \fB\-\-kdm\fR
+Aggiorna l'elenco dei window-manager attivabili tramite kdm usando il file di configurazione predefinito o il FILE specificato dall'opzione \fB\-f\fR.
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+Elenca i window-manager disponibili nel file di configurazione.
+.TP
+\fB\-r=ENTRY\fR, \fB\-\-remove=ENTRY\fR
+Stampa su stdout la lista di tutti i window-manager presenti nel file di configurazione, tranne ENTRY.
+.TP
+\fB\-t\fR, \fB\-\-test\fR
+Entra nella modalità di test.
+.TP
+\fB\-x=ENTRY\fR, \fB\-\-xsession=ENTRY\fR
+Stampa su stdout lo script usato per lanciare il window-manager ENTRY.
+.SH "STRUTTURA DEL FILE DI CONFIGURAZIONE"
+Questo file descrive ogni window manager che sarà reso disponibile attraverso i display manager. Ogni voce di questo file è separata da una linea \fB\-\-@@\-\-\fR .
+.PP
+.B NAME=
+è il nome della sessione come visualizzata nella lista del display manager.
+.PP
+.B ICON=
+file dell'icona (\fI.xpm o .png\fR) usato per questa sessione.
+.PP
+.B DESC=
+breve descrizione della sessione.
+.PP
+.B EXEC=
+stringa di test per controllare se il session manager è stato installato o no.
+.PP
+.B SCRIPT:
+shell script usato per eseguire il window-manager scelto dall'utente.
+.SH FILE
+.TP 
+\fB\/etc/X11/window-manager\fR
+file di configurazione di default, in cui è elencata la maggior parte dei window-manager più conosciuti. E' la base usata da \fBchksessio\fRn per aggiornare i file di configurazione dei display manager kdm e gdm.
+.SH "SEGNALAZIONE BUG"
+Segnalate i bug a \fBhttp://www.linux-mandrake.com/bugs/\fR.
+.SH "VEDI ANCHE"
+\fIxdm\fR(1)
+.SH COPYRIGHT
+Copyright \(co 1999 MandrakeSoft.
+.br
+This is a GPL free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+.SH TRADUTTORE
+Salvatore Di Pietro
+salvuz@despammed.com
diff --git a/man/ru/chksession.8 b/man/ru/chksession.8
new file mode 100644
index 0000000..828e3c5
--- /dev/null
+++ b/man/ru/chksession.8
@@ -0,0 +1,82 @@
+.\" Написано Camille Bégnis 12/28/99
+.TH CHKSESSION 8 "Декабрь 1999" "mandrake_desk" "MandrakeSoft"
+.SH НАЗВАНИЕ
+chksession \- добавляет/удаляет сессии из менеджеров экрана
+.SH СИНТАКСИС
+.B chksession 
+[\fIОПЦИЯ\fR]...
+.SH ОПИСАНИЕ
+.PP
+.PP
+Chksession позволяет системному администратору управлять списком сессий, предоставляемого такими менеджерами экрана как gdm и kdm. Она изменяет
+соответствующие конфигурационные файлы, добавляя или удаляя доступные сессии
+типа kde, gnome, icewm...
+.TP
+\fB\-F\fR, \fB\-\-first\fR
+Выводит только первую доступную позицию файла config.
+.TP
+\fB\-f=ФАЙЛ\fR, \fB\-\-file=ФАЙЛ\fR
+Задает альтернативный файл config, отличный от \fI/etc/X11/window-manager\fR
+.TP
+\fB\-g\fR, \fB\-\-gdm\fR
+Обновляет список оконных менеджеров для сессий gdm, используя файл config
+по умолчанию или ФАЙЛ, заданный опцией \fB\-f\fR .
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Выводит короткую подсказку.
+.TP
+\fB\-k\fR, \fB\-\-kdm\fR
+Обновляет список оконных менеджеров для сессий kdm, используя файл config
+по умолчанию или ФАЙЛ, заданный опцией \fB\-f\fR .
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+Составляет список оконных менеджеров, доступных в файле config.
+.TP
+\fB\-r=ПОЗИЦИЯ\fR, \fB\-\-remove=ПОЗИЦИЯ\fR
+Выводит в stdout список оконных менеджеров, как в файле config, где ПОЗИЦИЯ
+будет удалена.
+.TP
+\fB\-t\fR, \fB\-\-test\fR
+Вход в тестовый режим.
+.TP
+\fB\-x=ПОЗИЦИЯ\fR, \fB\-\-xsession=ПОЗИЦИЯ\fR
+Выводит в stdout скрипт, используемый для запуска ПОЗИЦИИ оконного менеджера.
+.SH "СТРУКТУРА ФАЙЛА CONFIG"
+Этот файл описывает каждый оконный менеджер, который будет сделан доступным
+через менеджеры экрана. Каждая позиция этого файла разделяется строкой
+\fB\-\-@@\-\-\fR .
+.PP
+.B NAME=
+это название сессии, как отображается в списке оконного менеджера.
+.PP
+.B ICON=
+файл значка (\fI.xpm или .png\fR), используемого для этой сессии.
+.PP
+.B DESC=
+короткое описание сессии.
+.PP
+.B EXEC=
+тестовая строка, чтобы проверить, был ли установлен менеджер сессий или нет.
+.PP
+.B SCRIPT:
+скрипт командного процессора, используемый для запуска оконного менеджера,
+выбранного пользователем.
+.SH ФАЙЛЫ
+.TP 
+\fB\/etc/X11/window-manager\fR
+файл config по умолчанию, содержащий перечень почти всех известных оконных
+менеджеров. Он является основой, используемой \fBchksession\fR для обновления
+файлов config обоих менеджеров экрана gdm и kdm.
+.SH "СООБЩЕНИЯ ОБ ОШИБКАХ"
+Сообщайте об ошибках на \fBhttp://www.linux-mandrake.com/bugs/\fR.
+.SH "СМ. ТАКЖЕ"
+\fIxdm\fR(1)
+.SH COPYRIGHT
+Copyright \(co 1999 MandrakeSoft.
+.br
+Это GPL открытое программное обеспечение, условия копирования смотрите в
+исходных текстах. Ничего НЕ гарантируется, даже РАБОСПОСОБНОСТЬ или ПРИГОДНОСТЬ
+ДЛЯ ЛИЧНЫХ ЦЕЛЕЙ.
+.SH ПЕРЕВОД
+Павел Марьянов <acid_jack@ukr.net>
+
diff --git a/man/uk/chksession.8 b/man/uk/chksession.8
new file mode 100644
index 0000000..d5b3f90
--- /dev/null
+++ b/man/uk/chksession.8
@@ -0,0 +1,86 @@
+.\" Written by Camille Bégnis 12/28/99
+.TH CHKSESSION 8 "Dec 1999" "mandrake_desk" "MandrakeSoft"
+.SH НАЗВА
+chksession \- додає/прибирає сесії з менеджерів дисплеїв
+.SH ВИКОРИСТАННЯ
+.B chksession 
+[\fIПАРАМЕТР\fR]...
+.SH ОПИС
+.PP
+.PP
+chksession надає можливість системному адміністратору керувати
+списками сесій, які надаються обома менеджерами дисплеїв gdm і
+kdm. Команда змінює відповідні файли конфіґурації щоб додати чи
+прибрати сесії доступні для використання як  kde, gnome, icewm...
+.TP
+\fB\-F\fR, \fB\-\-first\fR
+Друкує тільки перший пункт з конфіґураційного файла.
+.TP
+\fB\-f=FILE\fR, \fB\-\-file=ФАЙЛ\fR
+Використовувати інший конфіґураційний файл, відмінний від  \fI/etc/X11/window-manager\fR
+.TP
+\fB\-g\fR, \fB\-\-gdm\fR
+Поновити список віконних менеджерів для сесій gdm використовуючи або
+стандартний конфіґураційний файл або ФАЙЛ вказаний параметром  \fB\-f\fR.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Друкує коротку підказку.
+.TP
+\fB\-k\fR, \fB\-\-kdm\fR
+Поновити список віконних менеджерів для сесій kdm використовуючи або
+стандартний конфіґураційний файл або ФАЙЛ вказаний параметром  \fB\-f\fR.
+.TP
+\fB\-l\fR, \fB\-\-list\fR
+Перечислити віконні менеджер з конфіґураційного файла.
+.TP
+\fB\-r=ENTRY\fR, \fB\-\-remove=ПУНКТ\fR
+Друкує на стандартний вивід список віконних менеджерів з
+конфіґураційного файла, з яких прибрано ПУНКТ.
+.TP
+\fB\-t\fR, \fB\-\-test\fR
+Перейти в режим тестування.
+.TP
+\fB\-x=ENTRY\fR, \fB\-\-xsession=ПУНКТ\fR
+Друкує на стандартний вивід скрипт, який використовується для запуску
+віконного менеджера, вказаного в ПУНКТ'і.
+.SH "СТРУКТУРА КОНФІҐУРАЦІЙНОГО ФАЙЛА"
+Цей файл описує кожен віконний менеджер, який буде доступний для
+менеджерів дисплеїв. Кожен пункт в цьому файлі відділяється від інших
+рядком  \fB\-\-@@\-\-\fR .
+.PP
+.B NAME=
+назва сесії, яка показується в списку менеджера дисплеїв.
+.PP
+.B ICON=
+файл піктограми (\fI.xpm чи .png\fR) яка використовується для цієї сесії.
+.PP
+.B DESC=
+короткий опис сесії.
+.PP
+.B EXEC=
+командний рядок для перевірки чи встановлений менеджер сесій чи ні.
+.PP
+.B SCRIPT:
+командний скрипт для запуску вибраного користувачем віконного менеджера.
+.SH ФАЙЛИ
+.TP 
+\fB\/etc/X11/window-manager\fR
+стандартний конфіґураційний файл, містить список всіх найбільш відомих
+віконних менеджерів. Це \-\- головний файл, який використовується
+\fBchksessio\fRn для поновлення конфіґураційних файлів обох менеджерів
+дисплеїв gdm і kdm.
+.SH "ЗВІТИ ПРО ПОМИЛКИ"
+Повідомляйте про помилки за адресою \fBhttp://www.linux-mandrake.com/bugs/\fR.
+.SH "ДИВ. ТАКОЖ"
+\fIxdm\fR(1)
+.SH АВТОРСЬКІ ПРАВА
+Copyright \(co 1999 MandrakeSoft.
+.br
+Це вільне програмне забезпечення на правах GPL. Зверніться до вихідних
+текстів за інформацією про умови розповсюдження. НЕ надається
+гарантії, навіть щодо можливості ПРОДАЖУ чи ПРИГОДНОСТІ певним цілям.
+
+.SH
+ПЕРЕКЛАД
+.br
+Дмитро Ковальов, <kov@tokyo.emai.ne.jp>
diff --git a/menu/applications.menu.in b/menu/applications.menu.in
new file mode 100644
index 0000000..4373389
--- /dev/null
+++ b/menu/applications.menu.in
@@ -0,0 +1,1016 @@
+<?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 inline="false">Internet</Menuname>
+    <Menuname inline="false">Office</Menuname>
+    <Menuname inline="false">Graphics</Menuname>
+    <Menuname inline="false">SoundVideo</Menuname>
+    <Menuname inline="false">Tools</Menuname>
+    <Menuname inline="false">Development</Menuname>
+    <Menuname inline="false">Games</Menuname>
+    <Menuname inline="false">Education</Menuname>
+    <Menuname inline="false">Sciences</Menuname>
+    <Menuname inline="false">Documentation</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+    <Separator/>
+    <Filename>rpmdrake.desktop</Filename>
+  </Layout>
+  <DefaultLayout inline="true" inline_limit="1">
+    <Merge type="files"/>
+    <Menuname>More</Menuname>
+    <Merge type="menus"/>
+  </DefaultLayout>
+  <DefaultMergeDirs/>
+  <KDELegacyDirs/>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>mandrivalinux.directory</Directory>
+  <Include>
+    <Category>X-MandrivaLinux</Category>
+    <Filename>rpmdrake.desktop</Filename>
+  </Include>
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>mandriva-internet.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Or>
+            <Category>@MAIN_DESKTOP@</Category>
+            <Category>@MAIN_TOOLKIT@</Category>
+            <Category>X-MandrivaLinux-CrossDesktop</Category>
+          </Or>
+          <Not>
+            <Category>Email</Category>
+            <Category>Dialup</Category>
+            <Category>InstantMessaging</Category>
+            <Category>Chat</Category>
+            <Category>IRCClient</Category>
+            <Category>FileTransfer</Category>
+            <Category>HamRadio</Category>
+            <Category>News</Category>
+            <Category>P2P</Category>
+            <Category>RemoteAccess</Category>
+            <Category>Telephony</Category>
+            <Category>VideoConference</Category>
+            <Category>WebBrowser</Category>
+            <Category>@ALTERNATIVE_DESKTOP@</Category>
+            <Category>@ALTERNATIVE_TOOLKIT@</Category>
+          </Not>
+        </Or>
+        <Or>
+          <Category>X-MandrivaLinux-Internet</Category>
+          <Category>Network</Category>
+        </Or>
+        <Not>
+          <Category>WebDevelopment</Category>
+          <Category>X-MandrivaLinux-More</Category>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>mandriva-internet-more.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <And>
+          <Or>
+            <Not>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Not>
+            <Category>X-MandrivaLinux-More</Category>
+          </Or>
+          <Not>
+            <Category>WebDevelopment</Category>
+          </Not>
+          <Category>Network</Category>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Office</Name>
+    <Directory>mandriva-office.directory</Directory>
+    <Layout>
+      <Filename>libreoffice-startcenter.desktop</Filename>
+      <Filename>libreoffice-writer.desktop</Filename>
+      <Filename>libreoffice-calc.desktop</Filename>
+      <Filename>libreoffice-impress.desktop</Filename>
+      <Filename>libreoffice-base.desktop</Filename>
+      <Filename>libreoffice-draw.desktop</Filename>
+      <Filename>web.desktop</Filename>
+      <Separator/>
+      <Merge type="files"/>
+      <Menuname>More</Menuname>
+      <Merge type="menus"/>
+    </Layout>
+    <Include>
+      <And>
+        <Or>
+          <Or>
+            <Category>@MAIN_DESKTOP@</Category>
+            <Category>@MAIN_TOOLKIT@</Category>
+            <Category>X-MandrivaLinux-CrossDesktop</Category>
+          </Or>
+          <Not>
+            <Category>Calendar</Category>
+            <Category>ContactManagement</Category>
+            <Category>Database</Category>
+            <Category>Dictionary</Category>
+            <Category>Chart</Category>
+            <Category>Email</Category>
+            <Category>Finance</Category>
+            <Category>FlowChart</Category>
+            <Category>PDA</Category>
+            <Category>ProjectManagement</Category>
+            <Category>Presentation</Category>
+            <Category>Spreadsheet</Category>
+            <Category>WordProcessor</Category>
+            <Category>Photography</Category>
+            <Category>Publishing</Category>
+            <Category>Viewer</Category>
+            <Category>@ALTERNATIVE_DESKTOP@</Category>
+            <Category>@ALTERNATIVE_TOOLKIT@</Category>
+          </Not>
+        </Or>
+        <Or>
+          <Category>X-MandrivaLinux-Office</Category>
+          <Category>Office</Category>
+        </Or>
+        <Not>
+          <Category>Utility</Category>
+          <Category>X-MandrivaLinux-More</Category>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>mandriva-office-more.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <And>
+          <Or>
+            <Not>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Not>
+            <Category>X-MandrivaLinux-More</Category>
+          </Or>
+          <Or>
+            <Category>Office</Category>
+            <Category>X-MandrivaLinux-Office-Other</Category>
+          </Or>
+          <Not>
+            <Category>Utility</Category>
+          </Not>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>mandriva-graphics.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Or>
+            <Category>@MAIN_DESKTOP@</Category>
+            <Category>@MAIN_TOOLKIT@</Category>
+            <Category>X-MandrivaLinux-CrossDesktop</Category>
+          </Or>
+          <Not>
+            <Category>2DGraphics</Category>
+            <Category>VectorGraphics</Category>
+            <Category>RasterGraphics</Category>
+            <Category>3DGraphics</Category>
+            <Category>Scanning</Category>
+            <Category>OCR</Category>
+            <Category>Photography</Category>
+            <Category>Publishing</Category>
+            <Category>Viewer</Category>
+            <Category>@ALTERNATIVE_DESKTOP@</Category>
+            <Category>@ALTERNATIVE_TOOLKIT@</Category>
+          </Not>
+        </Or>
+        <Or>
+          <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
+          <Category>Graphics</Category>
+        </Or>
+        <Not>
+          <Category>X-MandrivaLinux-More</Category>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>mandriva-graphics-more.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <And>
+          <Or>
+            <Not>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Not>
+            <Category>X-MandrivaLinux-More</Category>
+          </Or>
+          <Category>Graphics</Category>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>SoundVideo</Name>
+    <Directory>mandriva-soundvideo.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Or>
+            <Category>@MAIN_DESKTOP@</Category>
+            <Category>@MAIN_TOOLKIT@</Category>
+            <Category>X-MandrivaLinux-CrossDesktop</Category>
+          </Or>
+          <Not>
+            <Category>Database</Category>
+            <Category>HamRadio</Category>
+            <Category>Midi</Category>
+            <Category>Mixer</Category>
+            <Category>Sequencer</Category>
+            <Category>Tuner</Category>
+            <Category>TV</Category>
+            <Category>AudioVideoEditing</Category>
+            <Category>Player</Category>
+            <Category>Recorder</Category>
+            <Category>Music</Category>
+            <Category>@ALTERNATIVE_DESKTOP@</Category>
+            <Category>@ALTERNATIVE_TOOLKIT@</Category>
+          </Not>
+        </Or>
+        <Or>
+          <Category>X-MandrivaLinux-Multimedia</Category>
+          <Category>X-MandrivaLinux-Multimedia-Sound</Category>
+          <Category>X-MandrivaLinux-Multimedia-Video</Category>
+          <Category>AudioVideo</Category>
+          <Category>Audio</Category>
+          <Category>Video</Category>
+        </Or>
+        <Not>
+          <Category>X-MandrivaLinux-More</Category>
+          <Category>DiscBurning</Category>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>More</Name>
+      <Directory>mandriva-soundvideo-more.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <And>
+          <Or>
+            <Not>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+              <Category>DiscBurning</Category>
+            </Not>
+            <Category>X-MandrivaLinux-More</Category>
+          </Or>
+          <Or>
+            <Category>X-MandrivaLinux-Multimedia-Other</Category>
+            <Category>X-MandrivaLinux-Multimedia-Sound</Category>
+            <Category>X-MandrivaLinux-Multimedia-Video</Category>
+            <Category>AudioVideo</Category>
+            <Category>Video</Category>
+            <Category>Audio</Category>
+          </Or>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Tools</Name>
+    <Directory>mandriva-tools.directory</Directory>
+    <Layout>
+      <Menuname inline="false">SystemTools</Menuname>
+      <Menuname inline="false">Accessibility</Menuname>
+      <Menuname inline="false">Emulators</Menuname>
+      <Separator/>
+      <Merge type="files"/>
+      <Menuname>More</Menuname>
+      <Merge type="menus"/>
+    </Layout>
+    <Include>
+      <And>
+        <Or>
+          <Or>
+            <Category>@MAIN_DESKTOP@</Category>
+            <Category>@MAIN_TOOLKIT@</Category>
+            <Category>X-MandrivaLinux-CrossDesktop</Category>
+          </Or>
+          <Not>
+            <Category>TextTools</Category>
+            <Category>TelephonyTools</Category>
+            <Category>Archiving</Category>
+            <Category>Calculator</Category>
+            <Category>Clock</Category>
+            <Category>TextEditor</Category>
+            <Category>@ALTERNATIVE_DESKTOP@</Category>
+            <Category>@ALTERNATIVE_TOOLKIT@</Category>
+          </Not>
+        </Or>
+        <Or>
+          <Category>Utility</Category>
+          <Category>TextEditor</Category>
+          <Category>TerminalEmulator</Category>
+          <Category>Settings</Category>
+          <Category>DiscBurning</Category>
+        </Or>
+        <Not>
+          <And>
+            <Or>
+              <Category>Accessibility</Category>
+              <Category>Monitor</Category>
+              <Category>System</Category>
+              <Category>TerminalEmulator</Category>
+              <Category>Emulator</Category>
+              <Category>HardwareSettings</Category>
+              <Category>PackageManager</Category>
+              <Category>X-MandrivaLinux-More</Category>
+              <Category>Printing</Category>
+              <Category>X-KDE-settings-accessibility</Category>
+              <Category>X-KDE-settings-components</Category>
+              <Category>X-KDE-settings-desktop</Category>
+              <Category>X-KDE-settings-looknfeel</Category>
+              <Category>X-KDE-settings-network</Category>
+              <Category>X-KDE-settings-webbrowsing</Category>
+              <Category>X-KDE-settings-peripherals</Category>
+              <Category>X-KDE-settings-hardware</Category>
+              <Category>X-KDE-settings-power</Category>
+              <Category>X-KDE-settings-security</Category>
+              <Category>X-KDE-settings-sound</Category>
+              <Category>X-KDE-settings-system</Category>
+              <Category>X-KDE-information</Category>
+              <And>
+                <Category>GNOME</Category>
+                <Category>Settings</Category>
+              </And>
+            </Or>
+            <Not>
+              <Category>TextEditor</Category>
+              <Category>TerminalEmulator</Category>
+            </Not>
+          </And>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>SystemTools</Name>
+      <Directory>mandriva-systemtools.directory</Directory>
+      <Layout>
+        <Filename>mageia-drakconf.desktop</Filename>
+        <Filename>kde4-systemsettings.desktop</Filename>
+        <Separator/>
+        <Merge type="all"/>
+      </Layout>
+      <Include>
+        <And>
+          <!-- never show those, they are in a separate menu for GNOME and not relevant for KDE -->
+          <Not>
+            <Category>GNOME</Category>
+          </Not>
+          <Category>HardwareSettings</Category>
+        </And>
+        <And>
+          <Or>
+            <Or>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Or>
+            <Not>
+              <Category>FileTools</Category>
+              <Category>FileSystem</Category>
+              <Category>Applet</Category>
+              <Category>@ALTERNATIVE_DESKTOP@</Category>
+              <Category>@ALTERNATIVE_TOOLKIT@</Category>
+            </Not>
+          </Or>
+          <Or>
+            <And>
+              <Category>System</Category>
+              <Not>
+                <Category>Emulator</Category>
+                <Category>TerminalEmulator</Category>
+              </Not>
+            </And>
+            <Category>Monitor</Category>
+          </Or>
+        </And>
+        <Category>PackageManager</Category>
+        <Category>Printing</Category>
+      </Include>
+      <Exclude>
+        <Filename>rpmdrake.desktop</Filename>
+      </Exclude>
+    </Menu>
+    <Menu>
+      <Name>Accessibility</Name>
+      <Directory>mandriva-accessibility.directory</Directory>
+      <Include>
+        <And>
+          <Not>
+            <Category>Settings</Category>
+          </Not>
+          <Or>
+            <Category>Accessibility</Category>
+          </Or>
+        </And>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Emulators</Name>
+      <Directory>mandriva-emulators.directory</Directory>
+      <Include>
+        <Category>Emulator</Category>
+      </Include>
+    </Menu>
+    <!-- always present, just to ensure GNOME preferences don't appear in any menu -->
+    <Menu>
+      <Name>GNOME Preferences</Name>
+      <Directory>mandriva-system-configuration-gnome.directory</Directory>
+      <Include>
+        <And>
+          <Category>GNOME</Category>
+          <Or>
+            <Category>Settings</Category>
+            <Category>DesktopSettings</Category>
+          </Or>
+        </And>
+        <Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
+        <Category>X-MandrivaLinux-System-Configuration-GNOME</Category>
+      </Include>
+    </Menu>
+    <!-- always present, just to ensure KDE preferences don't appear in any menu -->
+    <Menu>
+      <Name>KDE Preferences</Name>
+      <Directory>mandriva-system-configuration-kde.directory</Directory>
+      <MergeFile>/etc/xdg/kde/menus/kde-settings.menu</MergeFile>
+    </Menu>
+    <Menu>
+      <Name>KDE Info Center</Name>
+      <Directory>mandriva-system-configuration-kde.directory</Directory>
+      <MergeFile>/etc/xdg/kde/menus/kde-information.menu</MergeFile>
+    </Menu>
+    <Menu>
+      <Name>More</Name>
+      <Directory>mandriva-tools-more.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <And>
+          <Or>
+            <Not>
+              <Category>@MAIN_DESKTOP@</Category>
+              <Category>@MAIN_TOOLKIT@</Category>
+              <Category>X-MandrivaLinux-CrossDesktop</Category>
+            </Not>
+            <Category>X-MandrivaLinux-More</Category>
+          </Or>
+          <Not>
+            <And>
+              <Category>GNOME</Category>
+              <Category>Settings</Category>
+            </And>
+            <Category>Accessibility</Category>
+            <Category>HardwareSettings</Category>
+            <Category>Emulator</Category>
+            <Category>PackageManager</Category>
+            <Category>Printing</Category>
+          </Not>
+          <Or>
+            <Category>Utility</Category>
+            <And>
+              <Category>System</Category>
+              <Category>Emulator</Category>
+            </And>
+            <Category>TextEditor</Category>
+            <Category>Settings</Category>
+            <Category>Monitor</Category>
+            <Category>DiscBurning</Category>
+          </Or>
+        </And>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Development</Name>
+    <Layout>
+      <Menuname>Databases</Menuname>
+      <Menuname>Development Environment</Menuname>
+      <Menuname>Web Development</Menuname>
+      <Menuname>Interpreters</Menuname>
+      <Menuname>Tools</Menuname>
+      <Menuname>Code Generators</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-development.directory</Directory>
+    <Include>
+      <And>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Development</Category>
+          <Category>Development</Category>
+        </Or>
+        <Not>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
+            <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
+            <Category>Building</Category>
+            <Category>Profiling</Category>
+            <Category>Debugger</Category>
+            <Category>RevisionControl</Category>
+            <Category>Translation</Category>
+            <Category>IDE</Category>
+            <Category>GUIDesigner</Category>
+            <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
+            <Category>WebDevelopment</Category>
+          </Or>
+        </Not>
+      </And>
+    </Include>
+    <Menu>
+      <Name>Databases</Name>
+      <Directory>mandriva-development-databases.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
+          <Category>Database</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Development Environments</Name>
+      <Directory>mandriva-development-developmentenvironments.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
+          <Category>IDE</Category>
+          <Category>GUIDesigner</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Web Development</Name>
+      <Directory>mandriva-development-webdevelopment.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-WebEditors</Category>
+          <Category>WebDevelopment</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Tools</Name>
+      <Directory>mandriva-development-tools.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
+          <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
+          <Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</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>
+  <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-games.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Games</Category>
+        <Category>Game</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Adventure</Name>
+      <Directory>mandriva-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-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-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-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-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-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-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-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-games-toys.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
+          <Category>Amusement</Category>
+        </Or>
+      </Include>
+    </Menu>
+  </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-education.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Education</Category>
+        <Category>Education</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Economy</Name>
+      <Directory>mandriva-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-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-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-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-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-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-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-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>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-sciences.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
+      <Category>Science</Category>
+    </Include>
+    <Menu>
+      <Name>Artificial Intelligence</Name>
+      <Directory>mandriva-sciences-artificialintelligence.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
+        <Category>ArtificialIntelligence</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Astronomy</Name>
+      <Directory>mandriva-sciences-astronomy.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
+        <Category>Astronomy</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Biology</Name>
+      <Directory>mandriva-sciences-biology.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
+        <Category>Biology</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Chemistry</Name>
+      <Directory>mandriva-sciences-chemistry.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
+        <Category>Chemistry</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Computer Science</Name>
+      <Directory>mandriva-sciences-computerscience.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
+        <Category>ComputerScience</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Data Visualization</Name>
+      <Directory>mandriva-sciences-datavisualization.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
+        <Category>DataVisualization</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Electricity</Name>
+      <Directory>mandriva-sciences-electricity.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
+        <Category>Electricity</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Geosciences</Name>
+      <Directory>mandriva-sciences-geosciences.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
+        <Category>Geoscience</Category>
+        <Category>Geology</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Image Processing</Name>
+      <Directory>mandriva-sciences-imageprocessing.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
+        <Category>ImageProcessing</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Mathematics</Name>
+      <Directory>mandriva-sciences-mathematics.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
+        <Category>Math</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Numeric Analysis</Name>
+      <Directory>mandriva-sciences-numericanalysis.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
+        <Category>NumericAnalysis</Category>
+        <Category>NumericalAnalysis</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Parallel Computing</Name>
+      <Directory>mandriva-sciences-parallelcomputing.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComputing</Category>
+        <Category>ParallelComputing</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Physics</Name>
+      <Directory>mandriva-sciences-physics.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
+        <Category>Physics</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Robotics</Name>
+      <Directory>mandriva-sciences-robotics.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
+        <Category>Robotics</Category>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-sciences-other.directory</Directory>
+      <Include>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
+        <Category>MedicalSoftware</Category>
+        <Category>Electronics</Category>
+        <Category>Engineering</Category>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Documentation</Name>
+    <Directory>mandriva-documentation.directory</Directory>
+    <Include>
+      <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
+      <Category>Documentation</Category>
+    </Include>
+  </Menu>
+  <!--
+  <Menu>
+    <Name>Other</Name>
+    <Directory>mandriva-other.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+	    <All/>
+    </Include>
+    <Exclude>
+	    <Category>Core</Category>
+    </Exclude>
+  </Menu>
+  -->
+  <Menu>
+    <Name>.hidden</Name>
+    <Directory>mandriva-hidden.directory</Directory>
+    <Include>
+      <Category>X-MandrivaLinux-.hidden</Category>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Settings</Name>
+    <Directory>kde-settings.directory</Directory>
+    <MergeFile>/etc/xdg/kde/menus/kde-settings.menu</MergeFile>
+  </Menu>
+  <MergeFile>applications-kmenuedit.menu</MergeFile>
+</Menu>
diff --git a/menu/desktop-directories/mandriva-accessibility.directory.in b/menu/desktop-directories/mandriva-accessibility.directory.in
new file mode 100644
index 0000000..f43220c
--- /dev/null
+++ b/menu/desktop-directories/mandriva-accessibility.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Accessibility
+Icon=accessibility_section
diff --git a/menu/desktop-directories/mandriva-development-databases.directory.in b/menu/desktop-directories/mandriva-development-databases.directory.in
new file mode 100644
index 0000000..53be655
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development-databases.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Databases
+Icon=databases_section
diff --git a/menu/desktop-directories/mandriva-development-developmentenvironments.directory.in b/menu/desktop-directories/mandriva-development-developmentenvironments.directory.in
new file mode 100644
index 0000000..dd6b40e
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development-developmentenvironments.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Development Environments
+Icon=development_environment_section
diff --git a/menu/desktop-directories/mandriva-development-tools.directory.in b/menu/desktop-directories/mandriva-development-tools.directory.in
new file mode 100644
index 0000000..df038a7
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development-tools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Tools
+Icon=development_tools_section
diff --git a/menu/desktop-directories/mandriva-development-webdevelopment.directory.in b/menu/desktop-directories/mandriva-development-webdevelopment.directory.in
new file mode 100644
index 0000000..477debd
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development-webdevelopment.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Web Development
+Icon=web_editors_section
diff --git a/menu/desktop-directories/mandriva-development.directory.in b/menu/desktop-directories/mandriva-development.directory.in
new file mode 100644
index 0000000..410858c
--- /dev/null
+++ b/menu/desktop-directories/mandriva-development.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Development
+Icon=development_section
diff --git a/menu/desktop-directories/mandriva-documentation.directory.in b/menu/desktop-directories/mandriva-documentation.directory.in
new file mode 100644
index 0000000..c4e892d
--- /dev/null
+++ b/menu/desktop-directories/mandriva-documentation.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Documentation
+Icon=documentation_section
diff --git a/menu/desktop-directories/mandriva-education-economy.directory.in b/menu/desktop-directories/mandriva-education-economy.directory.in
new file mode 100644
index 0000000..582e3c5
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-economy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Economy
+Icon=education_economy_section
diff --git a/menu/desktop-directories/mandriva-education-geography.directory.in b/menu/desktop-directories/mandriva-education-geography.directory.in
new file mode 100644
index 0000000..738fd42
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-geography.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Geography
+Icon=education_geography_section
diff --git a/menu/desktop-directories/mandriva-education-history.directory.in b/menu/desktop-directories/mandriva-education-history.directory.in
new file mode 100644
index 0000000..80b37e1
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-history.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=History
+Icon=education_history_section
diff --git a/menu/desktop-directories/mandriva-education-languages.directory.in b/menu/desktop-directories/mandriva-education-languages.directory.in
new file mode 100644
index 0000000..c8ad555
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-languages.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Languages
+Icon=education_languages_section
diff --git a/menu/desktop-directories/mandriva-education-literature.directory.in b/menu/desktop-directories/mandriva-education-literature.directory.in
new file mode 100644
index 0000000..8643eb9
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-literature.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Literature
+Icon=education_literature_section
diff --git a/menu/desktop-directories/mandriva-education-other.directory.in b/menu/desktop-directories/mandriva-education-other.directory.in
new file mode 100644
index 0000000..18dc436
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=education_other_section
diff --git a/menu/desktop-directories/mandriva-education-sciences.directory.in b/menu/desktop-directories/mandriva-education-sciences.directory.in
new file mode 100644
index 0000000..b8c71b7
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-sciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sciences
+Icon=education_sciences
diff --git a/menu/desktop-directories/mandriva-education-sports.directory.in b/menu/desktop-directories/mandriva-education-sports.directory.in
new file mode 100644
index 0000000..877f2bc
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education-sports.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sports
+Icon=education_sport_section
diff --git a/menu/desktop-directories/mandriva-education.directory.in b/menu/desktop-directories/mandriva-education.directory.in
new file mode 100644
index 0000000..edca46a
--- /dev/null
+++ b/menu/desktop-directories/mandriva-education.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Education
+Icon=education_section
diff --git a/menu/desktop-directories/mandriva-emulators.directory.in b/menu/desktop-directories/mandriva-emulators.directory.in
new file mode 100644
index 0000000..273fdab
--- /dev/null
+++ b/menu/desktop-directories/mandriva-emulators.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Emulators
+Icon=emulators_section
diff --git a/menu/desktop-directories/mandriva-games-adventure.directory.in b/menu/desktop-directories/mandriva-games-adventure.directory.in
new file mode 100644
index 0000000..2aa1562
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-adventure.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Adventure
+Icon=adventure_section
diff --git a/menu/desktop-directories/mandriva-games-arcade.directory.in b/menu/desktop-directories/mandriva-games-arcade.directory.in
new file mode 100644
index 0000000..c1b0e90
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-arcade.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Arcade
+Icon=arcade_section
diff --git a/menu/desktop-directories/mandriva-games-boards.directory.in b/menu/desktop-directories/mandriva-games-boards.directory.in
new file mode 100644
index 0000000..18954fa
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-boards.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Boards
+Icon=boards_section
diff --git a/menu/desktop-directories/mandriva-games-cards.directory.in b/menu/desktop-directories/mandriva-games-cards.directory.in
new file mode 100644
index 0000000..2ac788f
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-cards.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Cards
+Icon=cards_section
diff --git a/menu/desktop-directories/mandriva-games-other.directory.in b/menu/desktop-directories/mandriva-games-other.directory.in
new file mode 100644
index 0000000..39f3a69
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_amusement
diff --git a/menu/desktop-directories/mandriva-games-puzzles.directory.in b/menu/desktop-directories/mandriva-games-puzzles.directory.in
new file mode 100644
index 0000000..8ce0de8
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-puzzles.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Puzzles
+Icon=puzzle_section
diff --git a/menu/desktop-directories/mandriva-games-sports.directory.in b/menu/desktop-directories/mandriva-games-sports.directory.in
new file mode 100644
index 0000000..abf35c7
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-sports.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sports
+Icon=sport_section
diff --git a/menu/desktop-directories/mandriva-games-strategy.directory.in b/menu/desktop-directories/mandriva-games-strategy.directory.in
new file mode 100644
index 0000000..e034101
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-strategy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Strategy
+Icon=strategy_section
diff --git a/menu/desktop-directories/mandriva-games-toys.directory.in b/menu/desktop-directories/mandriva-games-toys.directory.in
new file mode 100644
index 0000000..6565d42
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games-toys.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Toys
+Icon=toys_section
diff --git a/menu/desktop-directories/mandriva-games.directory.in b/menu/desktop-directories/mandriva-games.directory.in
new file mode 100644
index 0000000..018fb82
--- /dev/null
+++ b/menu/desktop-directories/mandriva-games.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Games
+Icon=amusement_section
diff --git a/menu/desktop-directories/mandriva-graphics-more.directory.in b/menu/desktop-directories/mandriva-graphics-more.directory.in
new file mode 100644
index 0000000..404ebb8
--- /dev/null
+++ b/menu/desktop-directories/mandriva-graphics-more.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=More
+Icon=graphics_section
diff --git a/menu/desktop-directories/mandriva-graphics.directory.in b/menu/desktop-directories/mandriva-graphics.directory.in
new file mode 100644
index 0000000..5dfcef9
--- /dev/null
+++ b/menu/desktop-directories/mandriva-graphics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Graphics
+Icon=graphics_section
diff --git a/menu/desktop-directories/mandriva-hidden.directory.in b/menu/desktop-directories/mandriva-hidden.directory.in
new file mode 100644
index 0000000..d45295c
--- /dev/null
+++ b/menu/desktop-directories/mandriva-hidden.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=.hidden
+NoDisplay=true
+_Comment=Please don't remove or modify
+Icon=go
diff --git a/menu/desktop-directories/mandriva-internet-more.directory.in b/menu/desktop-directories/mandriva-internet-more.directory.in
new file mode 100644
index 0000000..d8c7289
--- /dev/null
+++ b/menu/desktop-directories/mandriva-internet-more.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=More
+Icon=other_networking
diff --git a/menu/desktop-directories/mandriva-internet.directory.in b/menu/desktop-directories/mandriva-internet.directory.in
new file mode 100644
index 0000000..e6bf925
--- /dev/null
+++ b/menu/desktop-directories/mandriva-internet.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Internet
+Icon=internet_section
diff --git a/menu/desktop-directories/mandriva-moreapplications.directory.in b/menu/desktop-directories/mandriva-moreapplications.directory.in
new file mode 100644
index 0000000..92b384f
--- /dev/null
+++ b/menu/desktop-directories/mandriva-moreapplications.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=More Applications
+Icon=more_applications_section
diff --git a/menu/desktop-directories/mandriva-networking.directory.in b/menu/desktop-directories/mandriva-networking.directory.in
new file mode 100644
index 0000000..b920097
--- /dev/null
+++ b/menu/desktop-directories/mandriva-networking.directory.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Networking
diff --git a/menu/desktop-directories/mandriva-office-more.directory.in b/menu/desktop-directories/mandriva-office-more.directory.in
new file mode 100644
index 0000000..5fb3eec
--- /dev/null
+++ b/menu/desktop-directories/mandriva-office-more.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=More
+Icon=office_section
diff --git a/menu/desktop-directories/mandriva-office.directory.in b/menu/desktop-directories/mandriva-office.directory.in
new file mode 100644
index 0000000..97a7706
--- /dev/null
+++ b/menu/desktop-directories/mandriva-office.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Office
+Icon=office_section
diff --git a/menu/desktop-directories/mandriva-other.directory.in b/menu/desktop-directories/mandriva-other.directory.in
new file mode 100644
index 0000000..85301a2
--- /dev/null
+++ b/menu/desktop-directories/mandriva-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=more_applications_other_section
diff --git a/menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in b/menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in
new file mode 100644
index 0000000..7cb1564
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Artificial Intelligence
+Icon=artificial_intelligence_section
diff --git a/menu/desktop-directories/mandriva-sciences-astronomy.directory.in b/menu/desktop-directories/mandriva-sciences-astronomy.directory.in
new file mode 100644
index 0000000..a90b846
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-astronomy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Astronomy
+Icon=astronomy_section
diff --git a/menu/desktop-directories/mandriva-sciences-biology.directory.in b/menu/desktop-directories/mandriva-sciences-biology.directory.in
new file mode 100644
index 0000000..080fe41
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-biology.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Biology
+Icon=biology_section
diff --git a/menu/desktop-directories/mandriva-sciences-chemistry.directory.in b/menu/desktop-directories/mandriva-sciences-chemistry.directory.in
new file mode 100644
index 0000000..6d26b77
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-chemistry.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Chemistry
+Icon=chemistry_section
diff --git a/menu/desktop-directories/mandriva-sciences-computerscience.directory.in b/menu/desktop-directories/mandriva-sciences-computerscience.directory.in
new file mode 100644
index 0000000..3af7cb0
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-computerscience.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Computer Science
+Icon=computer_science_section
diff --git a/menu/desktop-directories/mandriva-sciences-datavisualization.directory.in b/menu/desktop-directories/mandriva-sciences-datavisualization.directory.in
new file mode 100644
index 0000000..34474cc
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-datavisualization.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Data Visualization
+Icon=data_visualization_section
diff --git a/menu/desktop-directories/mandriva-sciences-electricity.directory.in b/menu/desktop-directories/mandriva-sciences-electricity.directory.in
new file mode 100644
index 0000000..dfbfd6f
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-electricity.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Electricity
+Icon=electricity_section
diff --git a/menu/desktop-directories/mandriva-sciences-geosciences.directory.in b/menu/desktop-directories/mandriva-sciences-geosciences.directory.in
new file mode 100644
index 0000000..1163474
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-geosciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Geosciences
+Icon=geosciences_section
diff --git a/menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in b/menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in
new file mode 100644
index 0000000..27c465a
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Image Processing
+Icon=image_processing_section
diff --git a/menu/desktop-directories/mandriva-sciences-mathematics.directory.in b/menu/desktop-directories/mandriva-sciences-mathematics.directory.in
new file mode 100644
index 0000000..e63c918
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-mathematics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Mathematics
+Icon=mathematics_section
diff --git a/menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in b/menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in
new file mode 100644
index 0000000..8fb6220
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Numeric Analysis
+Icon=numerical_analysis_section
diff --git a/menu/desktop-directories/mandriva-sciences-other.directory.in b/menu/desktop-directories/mandriva-sciences-other.directory.in
new file mode 100644
index 0000000..1662a74
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_sciences
diff --git a/menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in b/menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in
new file mode 100644
index 0000000..37e9ff5
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Parallel Computing
+Icon=parallel_computing_section
diff --git a/menu/desktop-directories/mandriva-sciences-physics.directory.in b/menu/desktop-directories/mandriva-sciences-physics.directory.in
new file mode 100644
index 0000000..c1b1df4
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-physics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Physics
+Icon=physics_section
diff --git a/menu/desktop-directories/mandriva-sciences-robotics.directory.in b/menu/desktop-directories/mandriva-sciences-robotics.directory.in
new file mode 100644
index 0000000..225c8d5
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences-robotics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Robotics
+Icon=robotics_section
diff --git a/menu/desktop-directories/mandriva-sciences.directory.in b/menu/desktop-directories/mandriva-sciences.directory.in
new file mode 100644
index 0000000..c662b55
--- /dev/null
+++ b/menu/desktop-directories/mandriva-sciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sciences
+Icon=sciences_section
diff --git a/menu/desktop-directories/mandriva-soundvideo-more.directory.in b/menu/desktop-directories/mandriva-soundvideo-more.directory.in
new file mode 100644
index 0000000..e0f013f
--- /dev/null
+++ b/menu/desktop-directories/mandriva-soundvideo-more.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=More
+Icon=multimedia_section
diff --git a/menu/desktop-directories/mandriva-soundvideo.directory.in b/menu/desktop-directories/mandriva-soundvideo.directory.in
new file mode 100644
index 0000000..055b5cc
--- /dev/null
+++ b/menu/desktop-directories/mandriva-soundvideo.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sound & Video
+Icon=multimedia_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in b/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in
new file mode 100644
index 0000000..1fa5fe7
--- /dev/null
+++ b/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Advanced
+_Comment=Advanced Settings
+Icon=advanced-directory
diff --git a/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in b/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in
new file mode 100644
index 0000000..bb5ff38
--- /dev/null
+++ b/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=GNOME
+Icon=gnome_section
+NoDisplay=true
diff --git a/menu/desktop-directories/mandriva-system-configuration-kde.directory.in b/menu/desktop-directories/mandriva-system-configuration-kde.directory.in
new file mode 100644
index 0000000..f732c46
--- /dev/null
+++ b/menu/desktop-directories/mandriva-system-configuration-kde.directory.in
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=KDE
+X-KDE-BaseGroup=settings
+Icon=kde_section
+NoDisplay=true
diff --git a/menu/desktop-directories/mandriva-systemtools.directory.in b/menu/desktop-directories/mandriva-systemtools.directory.in
new file mode 100644
index 0000000..8894e31
--- /dev/null
+++ b/menu/desktop-directories/mandriva-systemtools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=System Tools
+Icon=configuration_section
diff --git a/menu/desktop-directories/mandriva-tools-more.directory.in b/menu/desktop-directories/mandriva-tools-more.directory.in
new file mode 100644
index 0000000..6d11a29
--- /dev/null
+++ b/menu/desktop-directories/mandriva-tools-more.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=More
+Icon=system_section
diff --git a/menu/desktop-directories/mandriva-tools.directory.in b/menu/desktop-directories/mandriva-tools.directory.in
new file mode 100644
index 0000000..99112c6
--- /dev/null
+++ b/menu/desktop-directories/mandriva-tools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Tools
+Icon=system_section
diff --git a/menu/desktop-directories/mandrivalinux.directory.in b/menu/desktop-directories/mandrivalinux.directory.in
new file mode 100644
index 0000000..926cada
--- /dev/null
+++ b/menu/desktop-directories/mandrivalinux.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Applications
+Icon=mandriva
diff --git a/menu/icons/accessibility_section.png b/menu/icons/accessibility_section.png
new file mode 100644
index 0000000..dc2de58
--- /dev/null
+++ b/menu/icons/accessibility_section.png
diff --git a/menu/icons/addressbook_section.png b/menu/icons/addressbook_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/addressbook_section.png
diff --git a/menu/icons/adventure_section.png b/menu/icons/adventure_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/adventure_section.png
diff --git a/menu/icons/amusement_section.png b/menu/icons/amusement_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/amusement_section.png
diff --git a/menu/icons/applications_section.png b/menu/icons/applications_section.png
new file mode 100644
index 0000000..6f60235
--- /dev/null
+++ b/menu/icons/applications_section.png
diff --git a/menu/icons/arcade_section.png b/menu/icons/arcade_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/arcade_section.png
diff --git a/menu/icons/archiving_section.png b/menu/icons/archiving_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/archiving_section.png
diff --git a/menu/icons/artificial_intelligence_section.png b/menu/icons/artificial_intelligence_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/artificial_intelligence_section.png
diff --git a/menu/icons/astronomy_section.png b/menu/icons/astronomy_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/astronomy_section.png
diff --git a/menu/icons/backup_section.png b/menu/icons/backup_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/backup_section.png
diff --git a/menu/icons/biology_section.png b/menu/icons/biology_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/biology_section.png
diff --git a/menu/icons/boards_section.png b/menu/icons/boards_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/boards_section.png
diff --git a/menu/icons/boot_init_section.png b/menu/icons/boot_init_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/boot_init_section.png
diff --git a/menu/icons/cards_section.png b/menu/icons/cards_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/cards_section.png
diff --git a/menu/icons/cd_burning_section.png b/menu/icons/cd_burning_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/cd_burning_section.png
diff --git a/menu/icons/chat_section.png b/menu/icons/chat_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/chat_section.png
diff --git a/menu/icons/chemistry_section.png b/menu/icons/chemistry_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/chemistry_section.png
diff --git a/menu/icons/chinese_section.png b/menu/icons/chinese_section.png
new file mode 100644
index 0000000..6487bde
--- /dev/null
+++ b/menu/icons/chinese_section.png
diff --git a/menu/icons/code_generator_section.png b/menu/icons/code_generator_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/code_generator_section.png
diff --git a/menu/icons/communications_fax_section.png b/menu/icons/communications_fax_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/communications_fax_section.png
diff --git a/menu/icons/communications_other_section.png b/menu/icons/communications_other_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/communications_other_section.png
diff --git a/menu/icons/communications_phone_section.png b/menu/icons/communications_phone_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/communications_phone_section.png
diff --git a/menu/icons/communications_section.png b/menu/icons/communications_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/communications_section.png
diff --git a/menu/icons/compression_section.png b/menu/icons/compression_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/compression_section.png
diff --git a/menu/icons/computer_science_section.png b/menu/icons/computer_science_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/computer_science_section.png
diff --git a/menu/icons/configuration_section.png b/menu/icons/configuration_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/configuration_section.png
diff --git a/menu/icons/data_visualization_section.png b/menu/icons/data_visualization_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/data_visualization_section.png
diff --git a/menu/icons/databases_section.png b/menu/icons/databases_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/databases_section.png
diff --git a/menu/icons/development_environment_section.png b/menu/icons/development_environment_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/development_environment_section.png
diff --git a/menu/icons/development_section.png b/menu/icons/development_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/development_section.png
diff --git a/menu/icons/development_tools_section.png b/menu/icons/development_tools_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/development_tools_section.png
diff --git a/menu/icons/documentation_section.png b/menu/icons/documentation_section.png
new file mode 100644
index 0000000..1fa9044
--- /dev/null
+++ b/menu/icons/documentation_section.png
diff --git a/menu/icons/editors_section.png b/menu/icons/editors_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/editors_section.png
diff --git a/menu/icons/education_economy_section.png b/menu/icons/education_economy_section.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_economy_section.png
diff --git a/menu/icons/education_geography_section.png b/menu/icons/education_geography_section.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_geography_section.png
diff --git a/menu/icons/education_history_section.png b/menu/icons/education_history_section.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_history_section.png
diff --git a/menu/icons/education_languages_section.png b/menu/icons/education_languages_section.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_languages_section.png
diff --git a/menu/icons/education_literature_section.png b/menu/icons/education_literature_section.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_literature_section.png
diff --git a/menu/icons/education_mathematics.png b/menu/icons/education_mathematics.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_mathematics.png
diff --git a/menu/icons/education_other_section.png b/menu/icons/education_other_section.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_other_section.png
diff --git a/menu/icons/education_sciences.png b/menu/icons/education_sciences.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_sciences.png
diff --git a/menu/icons/education_section.png b/menu/icons/education_section.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_section.png
diff --git a/menu/icons/education_sport_section.png b/menu/icons/education_sport_section.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_sport_section.png
diff --git a/menu/icons/education_tool.png b/menu/icons/education_tool.png
new file mode 100644
index 0000000..1fbab40
--- /dev/null
+++ b/menu/icons/education_tool.png
diff --git a/menu/icons/electricity_section.png b/menu/icons/electricity_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/electricity_section.png
diff --git a/menu/icons/emulators_section.png b/menu/icons/emulators_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/emulators_section.png
diff --git a/menu/icons/file_tools_section.png b/menu/icons/file_tools_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/file_tools_section.png
diff --git a/menu/icons/file_transfer_section.png b/menu/icons/file_transfer_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/file_transfer_section.png
diff --git a/menu/icons/finances_section.png b/menu/icons/finances_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/finances_section.png
diff --git a/menu/icons/geosciences_section.png b/menu/icons/geosciences_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/geosciences_section.png
diff --git a/menu/icons/gnome_section.png b/menu/icons/gnome_section.png
new file mode 100644
index 0000000..f2f9254
--- /dev/null
+++ b/menu/icons/gnome_section.png
diff --git a/menu/icons/graphics_section.png b/menu/icons/graphics_section.png
new file mode 100644
index 0000000..cbab725
--- /dev/null
+++ b/menu/icons/graphics_section.png
diff --git a/menu/icons/graphs_section.png b/menu/icons/graphs_section.png
new file mode 100644
index 0000000..cbab725
--- /dev/null
+++ b/menu/icons/graphs_section.png
diff --git a/menu/icons/hardware_configuration_section.png b/menu/icons/hardware_configuration_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/hardware_configuration_section.png
diff --git a/menu/icons/hardware_section.png b/menu/icons/hardware_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/hardware_section.png
diff --git a/menu/icons/hicolor/128x128/apps/register-mga.png b/menu/icons/hicolor/128x128/apps/register-mga.png
new file mode 100644
index 0000000..c6ddadb
--- /dev/null
+++ b/menu/icons/hicolor/128x128/apps/register-mga.png
diff --git a/menu/icons/hicolor/16x16/apps/register-mga.png b/menu/icons/hicolor/16x16/apps/register-mga.png
new file mode 100644
index 0000000..5f47ced
--- /dev/null
+++ b/menu/icons/hicolor/16x16/apps/register-mga.png
diff --git a/menu/icons/hicolor/22x22/apps/register-mga.png b/menu/icons/hicolor/22x22/apps/register-mga.png
new file mode 100644
index 0000000..e8e90f4
--- /dev/null
+++ b/menu/icons/hicolor/22x22/apps/register-mga.png
diff --git a/menu/icons/hicolor/32x32/apps/register-mga.png b/menu/icons/hicolor/32x32/apps/register-mga.png
new file mode 100644
index 0000000..6769fda
--- /dev/null
+++ b/menu/icons/hicolor/32x32/apps/register-mga.png
diff --git a/menu/icons/hicolor/48x48/apps/register-mga.png b/menu/icons/hicolor/48x48/apps/register-mga.png
new file mode 100644
index 0000000..ac9c121
--- /dev/null
+++ b/menu/icons/hicolor/48x48/apps/register-mga.png
diff --git a/menu/icons/hicolor/64x64/apps/register-mga.png b/menu/icons/hicolor/64x64/apps/register-mga.png
new file mode 100644
index 0000000..9bdea3b
--- /dev/null
+++ b/menu/icons/hicolor/64x64/apps/register-mga.png
diff --git a/menu/icons/image_processing_section.png b/menu/icons/image_processing_section.png
new file mode 100644
index 0000000..cbab725
--- /dev/null
+++ b/menu/icons/image_processing_section.png
diff --git a/menu/icons/instant_messaging_section.png b/menu/icons/instant_messaging_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/instant_messaging_section.png
diff --git a/menu/icons/internet_section.png b/menu/icons/internet_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/internet_section.png
diff --git a/menu/icons/interpreters_section.png b/menu/icons/interpreters_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/interpreters_section.png
diff --git a/menu/icons/irc_section.png b/menu/icons/irc_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/irc_section.png
diff --git a/menu/icons/kde_section.png b/menu/icons/kde_section.png
new file mode 100644
index 0000000..ff9d36f
--- /dev/null
+++ b/menu/icons/kde_section.png
diff --git a/menu/icons/large/accessibility_section.png b/menu/icons/large/accessibility_section.png
new file mode 100644
index 0000000..a439318
--- /dev/null
+++ b/menu/icons/large/accessibility_section.png
diff --git a/menu/icons/large/addressbook_section.png b/menu/icons/large/addressbook_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/addressbook_section.png
diff --git a/menu/icons/large/adventure_section.png b/menu/icons/large/adventure_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/adventure_section.png
diff --git a/menu/icons/large/amusement_section.png b/menu/icons/large/amusement_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/amusement_section.png
diff --git a/menu/icons/large/applications_section.png b/menu/icons/large/applications_section.png
new file mode 100644
index 0000000..9e0e967
--- /dev/null
+++ b/menu/icons/large/applications_section.png
diff --git a/menu/icons/large/arcade_section.png b/menu/icons/large/arcade_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/arcade_section.png
diff --git a/menu/icons/large/archiving_section.png b/menu/icons/large/archiving_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/archiving_section.png
diff --git a/menu/icons/large/artificial_intelligence_section.png b/menu/icons/large/artificial_intelligence_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/artificial_intelligence_section.png
diff --git a/menu/icons/large/astronomy_section.png b/menu/icons/large/astronomy_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/astronomy_section.png
diff --git a/menu/icons/large/backup_section.png b/menu/icons/large/backup_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/backup_section.png
diff --git a/menu/icons/large/biology_section.png b/menu/icons/large/biology_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/biology_section.png
diff --git a/menu/icons/large/boards_section.png b/menu/icons/large/boards_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/boards_section.png
diff --git a/menu/icons/large/boot_init_section.png b/menu/icons/large/boot_init_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/boot_init_section.png
diff --git a/menu/icons/large/cards_section.png b/menu/icons/large/cards_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/cards_section.png
diff --git a/menu/icons/large/cd_burning_section.png b/menu/icons/large/cd_burning_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/cd_burning_section.png
diff --git a/menu/icons/large/chat_section.png b/menu/icons/large/chat_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/chat_section.png
diff --git a/menu/icons/large/chemistry_section.png b/menu/icons/large/chemistry_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/chemistry_section.png
diff --git a/menu/icons/large/chinese_section.png b/menu/icons/large/chinese_section.png
new file mode 100644
index 0000000..58bc82b
--- /dev/null
+++ b/menu/icons/large/chinese_section.png
diff --git a/menu/icons/large/code_generator_section.png b/menu/icons/large/code_generator_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/code_generator_section.png
diff --git a/menu/icons/large/communications_fax_section.png b/menu/icons/large/communications_fax_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/communications_fax_section.png
diff --git a/menu/icons/large/communications_other_section.png b/menu/icons/large/communications_other_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/communications_other_section.png
diff --git a/menu/icons/large/communications_phone_section.png b/menu/icons/large/communications_phone_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/communications_phone_section.png
diff --git a/menu/icons/large/communications_section.png b/menu/icons/large/communications_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/communications_section.png
diff --git a/menu/icons/large/compression_section.png b/menu/icons/large/compression_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/compression_section.png
diff --git a/menu/icons/large/computer_science_section.png b/menu/icons/large/computer_science_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/computer_science_section.png
diff --git a/menu/icons/large/configuration_section.png b/menu/icons/large/configuration_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/configuration_section.png
diff --git a/menu/icons/large/data_visualization_section.png b/menu/icons/large/data_visualization_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/data_visualization_section.png
diff --git a/menu/icons/large/databases_section.png b/menu/icons/large/databases_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/databases_section.png
diff --git a/menu/icons/large/development_environment_section.png b/menu/icons/large/development_environment_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/development_environment_section.png
diff --git a/menu/icons/large/development_section.png b/menu/icons/large/development_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/development_section.png
diff --git a/menu/icons/large/development_tools_section.png b/menu/icons/large/development_tools_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/development_tools_section.png
diff --git a/menu/icons/large/documentation_section.png b/menu/icons/large/documentation_section.png
new file mode 100644
index 0000000..e359629
--- /dev/null
+++ b/menu/icons/large/documentation_section.png
diff --git a/menu/icons/large/editors_section.png b/menu/icons/large/editors_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/editors_section.png
diff --git a/menu/icons/large/education_economy_section.png b/menu/icons/large/education_economy_section.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_economy_section.png
diff --git a/menu/icons/large/education_geography_section.png b/menu/icons/large/education_geography_section.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_geography_section.png
diff --git a/menu/icons/large/education_history_section.png b/menu/icons/large/education_history_section.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_history_section.png
diff --git a/menu/icons/large/education_languages_section.png b/menu/icons/large/education_languages_section.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_languages_section.png
diff --git a/menu/icons/large/education_literature_section.png b/menu/icons/large/education_literature_section.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_literature_section.png
diff --git a/menu/icons/large/education_mathematics.png b/menu/icons/large/education_mathematics.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_mathematics.png
diff --git a/menu/icons/large/education_other_section.png b/menu/icons/large/education_other_section.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_other_section.png
diff --git a/menu/icons/large/education_sciences.png b/menu/icons/large/education_sciences.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_sciences.png
diff --git a/menu/icons/large/education_section.png b/menu/icons/large/education_section.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_section.png
diff --git a/menu/icons/large/education_sport_section.png b/menu/icons/large/education_sport_section.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_sport_section.png
diff --git a/menu/icons/large/education_tool.png b/menu/icons/large/education_tool.png
new file mode 100644
index 0000000..aa2a379
--- /dev/null
+++ b/menu/icons/large/education_tool.png
diff --git a/menu/icons/large/electricity_section.png b/menu/icons/large/electricity_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/electricity_section.png
diff --git a/menu/icons/large/emulators_section.png b/menu/icons/large/emulators_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/emulators_section.png
diff --git a/menu/icons/large/file_tools_section.png b/menu/icons/large/file_tools_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/file_tools_section.png
diff --git a/menu/icons/large/file_transfer_section.png b/menu/icons/large/file_transfer_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/file_transfer_section.png
diff --git a/menu/icons/large/finances_section.png b/menu/icons/large/finances_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/finances_section.png
diff --git a/menu/icons/large/geosciences_section.png b/menu/icons/large/geosciences_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/geosciences_section.png
diff --git a/menu/icons/large/gnome_section.png b/menu/icons/large/gnome_section.png
new file mode 100644
index 0000000..b23e3ea
--- /dev/null
+++ b/menu/icons/large/gnome_section.png
diff --git a/menu/icons/large/graphics_section.png b/menu/icons/large/graphics_section.png
new file mode 100644
index 0000000..5163805
--- /dev/null
+++ b/menu/icons/large/graphics_section.png
diff --git a/menu/icons/large/graphs_section.png b/menu/icons/large/graphs_section.png
new file mode 100644
index 0000000..5163805
--- /dev/null
+++ b/menu/icons/large/graphs_section.png
diff --git a/menu/icons/large/hardware_configuration_section.png b/menu/icons/large/hardware_configuration_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/hardware_configuration_section.png
diff --git a/menu/icons/large/hardware_section.png b/menu/icons/large/hardware_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/hardware_section.png
diff --git a/menu/icons/large/image_processing_section.png b/menu/icons/large/image_processing_section.png
new file mode 100644
index 0000000..5163805
--- /dev/null
+++ b/menu/icons/large/image_processing_section.png
diff --git a/menu/icons/large/instant_messaging_section.png b/menu/icons/large/instant_messaging_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/instant_messaging_section.png
diff --git a/menu/icons/large/internet_section.png b/menu/icons/large/internet_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/internet_section.png
diff --git a/menu/icons/large/interpreters_section.png b/menu/icons/large/interpreters_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/interpreters_section.png
diff --git a/menu/icons/large/irc_section.png b/menu/icons/large/irc_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/irc_section.png
diff --git a/menu/icons/large/kde_section.png b/menu/icons/large/kde_section.png
new file mode 100644
index 0000000..e5b046a
--- /dev/null
+++ b/menu/icons/large/kde_section.png
diff --git a/menu/icons/large/mageia.png b/menu/icons/large/mageia.png
new file mode 100644
index 0000000..ac9c121
--- /dev/null
+++ b/menu/icons/large/mageia.png
diff --git a/menu/icons/large/mail_section.png b/menu/icons/large/mail_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/mail_section.png
diff --git a/menu/icons/large/mathematics_section.png b/menu/icons/large/mathematics_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/mathematics_section.png
diff --git a/menu/icons/large/monitoring_section.png b/menu/icons/large/monitoring_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/monitoring_section.png
diff --git a/menu/icons/large/more_applications_other_section.png b/menu/icons/large/more_applications_other_section.png
new file mode 100644
index 0000000..9e0e967
--- /dev/null
+++ b/menu/icons/large/more_applications_other_section.png
diff --git a/menu/icons/large/more_applications_section.png b/menu/icons/large/more_applications_section.png
new file mode 100644
index 0000000..9e0e967
--- /dev/null
+++ b/menu/icons/large/more_applications_section.png
diff --git a/menu/icons/large/multimedia_section.png b/menu/icons/large/multimedia_section.png
new file mode 100644
index 0000000..5163805
--- /dev/null
+++ b/menu/icons/large/multimedia_section.png
diff --git a/menu/icons/large/networking_configuration_section.png b/menu/icons/large/networking_configuration_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/networking_configuration_section.png
diff --git a/menu/icons/large/networking_section.png b/menu/icons/large/networking_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/networking_section.png
diff --git a/menu/icons/large/networking_www_section.png b/menu/icons/large/networking_www_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/networking_www_section.png
diff --git a/menu/icons/large/news_section.png b/menu/icons/large/news_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/news_section.png
diff --git a/menu/icons/large/numerical_analysis_section.png b/menu/icons/large/numerical_analysis_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/numerical_analysis_section.png
diff --git a/menu/icons/large/office_accessories_section.png b/menu/icons/large/office_accessories_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/office_accessories_section.png
diff --git a/menu/icons/large/office_drawing_section.png b/menu/icons/large/office_drawing_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/office_drawing_section.png
diff --git a/menu/icons/large/office_section.png b/menu/icons/large/office_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/office_section.png
diff --git a/menu/icons/large/other_amusement.png b/menu/icons/large/other_amusement.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/other_amusement.png
diff --git a/menu/icons/large/other_archiving.png b/menu/icons/large/other_archiving.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/other_archiving.png
diff --git a/menu/icons/large/other_configuration.png b/menu/icons/large/other_configuration.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/other_configuration.png
diff --git a/menu/icons/large/other_networking.png b/menu/icons/large/other_networking.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/other_networking.png
diff --git a/menu/icons/large/other_sciences.png b/menu/icons/large/other_sciences.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/other_sciences.png
diff --git a/menu/icons/large/packaging_section.png b/menu/icons/large/packaging_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/packaging_section.png
diff --git a/menu/icons/large/parallel_computing_section.png b/menu/icons/large/parallel_computing_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/parallel_computing_section.png
diff --git a/menu/icons/large/pda_section.png b/menu/icons/large/pda_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/pda_section.png
diff --git a/menu/icons/large/physics_section.png b/menu/icons/large/physics_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/physics_section.png
diff --git a/menu/icons/large/presentation_section.png b/menu/icons/large/presentation_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/presentation_section.png
diff --git a/menu/icons/large/printing_section.png b/menu/icons/large/printing_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/printing_section.png
diff --git a/menu/icons/large/publishing_section.png b/menu/icons/large/publishing_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/publishing_section.png
diff --git a/menu/icons/large/puzzle_section.png b/menu/icons/large/puzzle_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/puzzle_section.png
diff --git a/menu/icons/large/remote_access_section.png b/menu/icons/large/remote_access_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/remote_access_section.png
diff --git a/menu/icons/large/robotics_section.png b/menu/icons/large/robotics_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/robotics_section.png
diff --git a/menu/icons/large/sciences_section.png b/menu/icons/large/sciences_section.png
new file mode 100644
index 0000000..a8a83ae
--- /dev/null
+++ b/menu/icons/large/sciences_section.png
diff --git a/menu/icons/large/shells_section.png b/menu/icons/large/shells_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/shells_section.png
diff --git a/menu/icons/large/sound_section.png b/menu/icons/large/sound_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/sound_section.png
diff --git a/menu/icons/large/sport_section.png b/menu/icons/large/sport_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/sport_section.png
diff --git a/menu/icons/large/spreadsheet_section.png b/menu/icons/large/spreadsheet_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/spreadsheet_section.png
diff --git a/menu/icons/large/strategy_section.png b/menu/icons/large/strategy_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/strategy_section.png
diff --git a/menu/icons/large/system_other_section.png b/menu/icons/large/system_other_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/system_other_section.png
diff --git a/menu/icons/large/system_section.png b/menu/icons/large/system_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/system_section.png
diff --git a/menu/icons/large/taskmanagement_section.png b/menu/icons/large/taskmanagement_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/taskmanagement_section.png
diff --git a/menu/icons/large/terminals_section.png b/menu/icons/large/terminals_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/terminals_section.png
diff --git a/menu/icons/large/text_tools_section.png b/menu/icons/large/text_tools_section.png
new file mode 100644
index 0000000..3c7271e
--- /dev/null
+++ b/menu/icons/large/text_tools_section.png
diff --git a/menu/icons/large/timemanagement_section.png b/menu/icons/large/timemanagement_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/timemanagement_section.png
diff --git a/menu/icons/large/toys_section.png b/menu/icons/large/toys_section.png
new file mode 100644
index 0000000..df76dc1
--- /dev/null
+++ b/menu/icons/large/toys_section.png
diff --git a/menu/icons/large/video_conferences_section.png b/menu/icons/large/video_conferences_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/video_conferences_section.png
diff --git a/menu/icons/large/video_section.png b/menu/icons/large/video_section.png
new file mode 100644
index 0000000..5163805
--- /dev/null
+++ b/menu/icons/large/video_section.png
diff --git a/menu/icons/large/web_browser_section.png b/menu/icons/large/web_browser_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/web_browser_section.png
diff --git a/menu/icons/large/web_editors_section.png b/menu/icons/large/web_editors_section.png
new file mode 100644
index 0000000..5b02246
--- /dev/null
+++ b/menu/icons/large/web_editors_section.png
diff --git a/menu/icons/large/windowmanager_section.png b/menu/icons/large/windowmanager_section.png
new file mode 100644
index 0000000..a5f36cd
--- /dev/null
+++ b/menu/icons/large/windowmanager_section.png
diff --git a/menu/icons/large/wordprocessor_section.png b/menu/icons/large/wordprocessor_section.png
new file mode 100644
index 0000000..a27631b
--- /dev/null
+++ b/menu/icons/large/wordprocessor_section.png
diff --git a/menu/icons/mageia.png b/menu/icons/mageia.png
new file mode 100644
index 0000000..6769fda
--- /dev/null
+++ b/menu/icons/mageia.png
diff --git a/menu/icons/mail_section.png b/menu/icons/mail_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/mail_section.png
diff --git a/menu/icons/mathematics_section.png b/menu/icons/mathematics_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/mathematics_section.png
diff --git a/menu/icons/mini/accessibility_section.png b/menu/icons/mini/accessibility_section.png
new file mode 100644
index 0000000..e03dea0
--- /dev/null
+++ b/menu/icons/mini/accessibility_section.png
diff --git a/menu/icons/mini/addressbook_section.png b/menu/icons/mini/addressbook_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/addressbook_section.png
diff --git a/menu/icons/mini/adventure_section.png b/menu/icons/mini/adventure_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/adventure_section.png
diff --git a/menu/icons/mini/amusement_section.png b/menu/icons/mini/amusement_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/amusement_section.png
diff --git a/menu/icons/mini/applications_section.png b/menu/icons/mini/applications_section.png
new file mode 100644
index 0000000..55ac049
--- /dev/null
+++ b/menu/icons/mini/applications_section.png
diff --git a/menu/icons/mini/arcade_section.png b/menu/icons/mini/arcade_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/arcade_section.png
diff --git a/menu/icons/mini/archiving_section.png b/menu/icons/mini/archiving_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/archiving_section.png
diff --git a/menu/icons/mini/artificial_intelligence_section.png b/menu/icons/mini/artificial_intelligence_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/artificial_intelligence_section.png
diff --git a/menu/icons/mini/astronomy_section.png b/menu/icons/mini/astronomy_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/astronomy_section.png
diff --git a/menu/icons/mini/backup_section.png b/menu/icons/mini/backup_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/backup_section.png
diff --git a/menu/icons/mini/biology_section.png b/menu/icons/mini/biology_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/biology_section.png
diff --git a/menu/icons/mini/boards_section.png b/menu/icons/mini/boards_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/boards_section.png
diff --git a/menu/icons/mini/boot_init_section.png b/menu/icons/mini/boot_init_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/boot_init_section.png
diff --git a/menu/icons/mini/cards_section.png b/menu/icons/mini/cards_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/cards_section.png
diff --git a/menu/icons/mini/cd_burning_section.png b/menu/icons/mini/cd_burning_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/cd_burning_section.png
diff --git a/menu/icons/mini/chat_section.png b/menu/icons/mini/chat_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/chat_section.png
diff --git a/menu/icons/mini/chemistry_section.png b/menu/icons/mini/chemistry_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/chemistry_section.png
diff --git a/menu/icons/mini/chinese_section.png b/menu/icons/mini/chinese_section.png
new file mode 100644
index 0000000..7df21e6
--- /dev/null
+++ b/menu/icons/mini/chinese_section.png
diff --git a/menu/icons/mini/code_generator_section.png b/menu/icons/mini/code_generator_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/code_generator_section.png
diff --git a/menu/icons/mini/communications_fax_section.png b/menu/icons/mini/communications_fax_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/communications_fax_section.png
diff --git a/menu/icons/mini/communications_other_section.png b/menu/icons/mini/communications_other_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/communications_other_section.png
diff --git a/menu/icons/mini/communications_phone_section.png b/menu/icons/mini/communications_phone_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/communications_phone_section.png
diff --git a/menu/icons/mini/communications_section.png b/menu/icons/mini/communications_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/communications_section.png
diff --git a/menu/icons/mini/compression_section.png b/menu/icons/mini/compression_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/compression_section.png
diff --git a/menu/icons/mini/computer_science_section.png b/menu/icons/mini/computer_science_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/computer_science_section.png
diff --git a/menu/icons/mini/configuration_section.png b/menu/icons/mini/configuration_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/configuration_section.png
diff --git a/menu/icons/mini/data_visualization_section.png b/menu/icons/mini/data_visualization_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/data_visualization_section.png
diff --git a/menu/icons/mini/databases_section.png b/menu/icons/mini/databases_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/databases_section.png
diff --git a/menu/icons/mini/development_environment_section.png b/menu/icons/mini/development_environment_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/development_environment_section.png
diff --git a/menu/icons/mini/development_section.png b/menu/icons/mini/development_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/development_section.png
diff --git a/menu/icons/mini/development_tools_section.png b/menu/icons/mini/development_tools_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/development_tools_section.png
diff --git a/menu/icons/mini/documentation_section.png b/menu/icons/mini/documentation_section.png
new file mode 100644
index 0000000..a3bac8c
--- /dev/null
+++ b/menu/icons/mini/documentation_section.png
diff --git a/menu/icons/mini/editors_section.png b/menu/icons/mini/editors_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/editors_section.png
diff --git a/menu/icons/mini/education_economy_section.png b/menu/icons/mini/education_economy_section.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_economy_section.png
diff --git a/menu/icons/mini/education_geography_section.png b/menu/icons/mini/education_geography_section.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_geography_section.png
diff --git a/menu/icons/mini/education_history_section.png b/menu/icons/mini/education_history_section.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_history_section.png
diff --git a/menu/icons/mini/education_languages_section.png b/menu/icons/mini/education_languages_section.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_languages_section.png
diff --git a/menu/icons/mini/education_literature_section.png b/menu/icons/mini/education_literature_section.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_literature_section.png
diff --git a/menu/icons/mini/education_mathematics.png b/menu/icons/mini/education_mathematics.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_mathematics.png
diff --git a/menu/icons/mini/education_other_section.png b/menu/icons/mini/education_other_section.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_other_section.png
diff --git a/menu/icons/mini/education_sciences.png b/menu/icons/mini/education_sciences.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_sciences.png
diff --git a/menu/icons/mini/education_section.png b/menu/icons/mini/education_section.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_section.png
diff --git a/menu/icons/mini/education_sport_section.png b/menu/icons/mini/education_sport_section.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_sport_section.png
diff --git a/menu/icons/mini/education_tool.png b/menu/icons/mini/education_tool.png
new file mode 100644
index 0000000..cd55d1c
--- /dev/null
+++ b/menu/icons/mini/education_tool.png
diff --git a/menu/icons/mini/electricity_section.png b/menu/icons/mini/electricity_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/electricity_section.png
diff --git a/menu/icons/mini/emulators_section.png b/menu/icons/mini/emulators_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/emulators_section.png
diff --git a/menu/icons/mini/file_tools_section.png b/menu/icons/mini/file_tools_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/file_tools_section.png
diff --git a/menu/icons/mini/file_transfer_section.png b/menu/icons/mini/file_transfer_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/file_transfer_section.png
diff --git a/menu/icons/mini/finances_section.png b/menu/icons/mini/finances_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/finances_section.png
diff --git a/menu/icons/mini/geosciences_section.png b/menu/icons/mini/geosciences_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/geosciences_section.png
diff --git a/menu/icons/mini/gnome_section.png b/menu/icons/mini/gnome_section.png
new file mode 100644
index 0000000..7ac4019
--- /dev/null
+++ b/menu/icons/mini/gnome_section.png
diff --git a/menu/icons/mini/graphics_section.png b/menu/icons/mini/graphics_section.png
new file mode 100644
index 0000000..76f4167
--- /dev/null
+++ b/menu/icons/mini/graphics_section.png
diff --git a/menu/icons/mini/graphs_section.png b/menu/icons/mini/graphs_section.png
new file mode 100644
index 0000000..76f4167
--- /dev/null
+++ b/menu/icons/mini/graphs_section.png
diff --git a/menu/icons/mini/hardware_configuration_section.png b/menu/icons/mini/hardware_configuration_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/hardware_configuration_section.png
diff --git a/menu/icons/mini/hardware_section.png b/menu/icons/mini/hardware_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/hardware_section.png
diff --git a/menu/icons/mini/image_processing_section.png b/menu/icons/mini/image_processing_section.png
new file mode 100644
index 0000000..76f4167
--- /dev/null
+++ b/menu/icons/mini/image_processing_section.png
diff --git a/menu/icons/mini/instant_messaging_section.png b/menu/icons/mini/instant_messaging_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/instant_messaging_section.png
diff --git a/menu/icons/mini/internet_section.png b/menu/icons/mini/internet_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/internet_section.png
diff --git a/menu/icons/mini/interpreters_section.png b/menu/icons/mini/interpreters_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/interpreters_section.png
diff --git a/menu/icons/mini/irc_section.png b/menu/icons/mini/irc_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/irc_section.png
diff --git a/menu/icons/mini/kde_section.png b/menu/icons/mini/kde_section.png
new file mode 100644
index 0000000..ea341e7
--- /dev/null
+++ b/menu/icons/mini/kde_section.png
diff --git a/menu/icons/mini/mageia.png b/menu/icons/mini/mageia.png
new file mode 100644
index 0000000..5f47ced
--- /dev/null
+++ b/menu/icons/mini/mageia.png
diff --git a/menu/icons/mini/mail_section.png b/menu/icons/mini/mail_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/mail_section.png
diff --git a/menu/icons/mini/mathematics_section.png b/menu/icons/mini/mathematics_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/mathematics_section.png
diff --git a/menu/icons/mini/monitoring_section.png b/menu/icons/mini/monitoring_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/monitoring_section.png
diff --git a/menu/icons/mini/more_applications_other_section.png b/menu/icons/mini/more_applications_other_section.png
new file mode 100644
index 0000000..55ac049
--- /dev/null
+++ b/menu/icons/mini/more_applications_other_section.png
diff --git a/menu/icons/mini/more_applications_section.png b/menu/icons/mini/more_applications_section.png
new file mode 100644
index 0000000..55ac049
--- /dev/null
+++ b/menu/icons/mini/more_applications_section.png
diff --git a/menu/icons/mini/multimedia_section.png b/menu/icons/mini/multimedia_section.png
new file mode 100644
index 0000000..76f4167
--- /dev/null
+++ b/menu/icons/mini/multimedia_section.png
diff --git a/menu/icons/mini/networking_configuration_section.png b/menu/icons/mini/networking_configuration_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/networking_configuration_section.png
diff --git a/menu/icons/mini/networking_section.png b/menu/icons/mini/networking_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/networking_section.png
diff --git a/menu/icons/mini/networking_www_section.png b/menu/icons/mini/networking_www_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/networking_www_section.png
diff --git a/menu/icons/mini/news_section.png b/menu/icons/mini/news_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/news_section.png
diff --git a/menu/icons/mini/numerical_analysis_section.png b/menu/icons/mini/numerical_analysis_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/numerical_analysis_section.png
diff --git a/menu/icons/mini/office_accessories_section.png b/menu/icons/mini/office_accessories_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/office_accessories_section.png
diff --git a/menu/icons/mini/office_drawing_section.png b/menu/icons/mini/office_drawing_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/office_drawing_section.png
diff --git a/menu/icons/mini/office_section.png b/menu/icons/mini/office_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/office_section.png
diff --git a/menu/icons/mini/other_amusement.png b/menu/icons/mini/other_amusement.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/other_amusement.png
diff --git a/menu/icons/mini/other_archiving.png b/menu/icons/mini/other_archiving.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/other_archiving.png
diff --git a/menu/icons/mini/other_configuration.png b/menu/icons/mini/other_configuration.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/other_configuration.png
diff --git a/menu/icons/mini/other_networking.png b/menu/icons/mini/other_networking.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/other_networking.png
diff --git a/menu/icons/mini/other_sciences.png b/menu/icons/mini/other_sciences.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/other_sciences.png
diff --git a/menu/icons/mini/packaging_section.png b/menu/icons/mini/packaging_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/packaging_section.png
diff --git a/menu/icons/mini/parallel_computing_section.png b/menu/icons/mini/parallel_computing_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/parallel_computing_section.png
diff --git a/menu/icons/mini/pda_section.png b/menu/icons/mini/pda_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/pda_section.png
diff --git a/menu/icons/mini/physics_section.png b/menu/icons/mini/physics_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/physics_section.png
diff --git a/menu/icons/mini/presentation_section.png b/menu/icons/mini/presentation_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/presentation_section.png
diff --git a/menu/icons/mini/printing_section.png b/menu/icons/mini/printing_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/printing_section.png
diff --git a/menu/icons/mini/publishing_section.png b/menu/icons/mini/publishing_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/publishing_section.png
diff --git a/menu/icons/mini/puzzle_section.png b/menu/icons/mini/puzzle_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/puzzle_section.png
diff --git a/menu/icons/mini/remote_access_section.png b/menu/icons/mini/remote_access_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/remote_access_section.png
diff --git a/menu/icons/mini/robotics_section.png b/menu/icons/mini/robotics_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/robotics_section.png
diff --git a/menu/icons/mini/sciences_section.png b/menu/icons/mini/sciences_section.png
new file mode 100644
index 0000000..c5227df
--- /dev/null
+++ b/menu/icons/mini/sciences_section.png
diff --git a/menu/icons/mini/shells_section.png b/menu/icons/mini/shells_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/shells_section.png
diff --git a/menu/icons/mini/sound_section.png b/menu/icons/mini/sound_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/sound_section.png
diff --git a/menu/icons/mini/sport_section.png b/menu/icons/mini/sport_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/sport_section.png
diff --git a/menu/icons/mini/spreadsheet_section.png b/menu/icons/mini/spreadsheet_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/spreadsheet_section.png
diff --git a/menu/icons/mini/strategy_section.png b/menu/icons/mini/strategy_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/strategy_section.png
diff --git a/menu/icons/mini/system_other_section.png b/menu/icons/mini/system_other_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/system_other_section.png
diff --git a/menu/icons/mini/system_section.png b/menu/icons/mini/system_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/system_section.png
diff --git a/menu/icons/mini/taskmanagement_section.png b/menu/icons/mini/taskmanagement_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/taskmanagement_section.png
diff --git a/menu/icons/mini/terminals_section.png b/menu/icons/mini/terminals_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/terminals_section.png
diff --git a/menu/icons/mini/text_tools_section.png b/menu/icons/mini/text_tools_section.png
new file mode 100644
index 0000000..5e50cde
--- /dev/null
+++ b/menu/icons/mini/text_tools_section.png
diff --git a/menu/icons/mini/timemanagement_section.png b/menu/icons/mini/timemanagement_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/timemanagement_section.png
diff --git a/menu/icons/mini/toys_section.png b/menu/icons/mini/toys_section.png
new file mode 100644
index 0000000..1cdfb38
--- /dev/null
+++ b/menu/icons/mini/toys_section.png
diff --git a/menu/icons/mini/video_conferences_section.png b/menu/icons/mini/video_conferences_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/video_conferences_section.png
diff --git a/menu/icons/mini/video_section.png b/menu/icons/mini/video_section.png
new file mode 100644
index 0000000..76f4167
--- /dev/null
+++ b/menu/icons/mini/video_section.png
diff --git a/menu/icons/mini/web_browser_section.png b/menu/icons/mini/web_browser_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/web_browser_section.png
diff --git a/menu/icons/mini/web_editors_section.png b/menu/icons/mini/web_editors_section.png
new file mode 100644
index 0000000..1f8fe9c
--- /dev/null
+++ b/menu/icons/mini/web_editors_section.png
diff --git a/menu/icons/mini/windowmanager_section.png b/menu/icons/mini/windowmanager_section.png
new file mode 100644
index 0000000..1ef2e47
--- /dev/null
+++ b/menu/icons/mini/windowmanager_section.png
diff --git a/menu/icons/mini/wordprocessor_section.png b/menu/icons/mini/wordprocessor_section.png
new file mode 100644
index 0000000..faee603
--- /dev/null
+++ b/menu/icons/mini/wordprocessor_section.png
diff --git a/menu/icons/monitoring_section.png b/menu/icons/monitoring_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/monitoring_section.png
diff --git a/menu/icons/more_applications_other_section.png b/menu/icons/more_applications_other_section.png
new file mode 100644
index 0000000..6f60235
--- /dev/null
+++ b/menu/icons/more_applications_other_section.png
diff --git a/menu/icons/more_applications_section.png b/menu/icons/more_applications_section.png
new file mode 100644
index 0000000..6f60235
--- /dev/null
+++ b/menu/icons/more_applications_section.png
diff --git a/menu/icons/multimedia_section.png b/menu/icons/multimedia_section.png
new file mode 100644
index 0000000..cbab725
--- /dev/null
+++ b/menu/icons/multimedia_section.png
diff --git a/menu/icons/networking_configuration_section.png b/menu/icons/networking_configuration_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/networking_configuration_section.png
diff --git a/menu/icons/networking_section.png b/menu/icons/networking_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/networking_section.png
diff --git a/menu/icons/networking_www_section.png b/menu/icons/networking_www_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/networking_www_section.png
diff --git a/menu/icons/news_section.png b/menu/icons/news_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/news_section.png
diff --git a/menu/icons/numerical_analysis_section.png b/menu/icons/numerical_analysis_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/numerical_analysis_section.png
diff --git a/menu/icons/office_accessories_section.png b/menu/icons/office_accessories_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/office_accessories_section.png
diff --git a/menu/icons/office_drawing_section.png b/menu/icons/office_drawing_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/office_drawing_section.png
diff --git a/menu/icons/office_section.png b/menu/icons/office_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/office_section.png
diff --git a/menu/icons/other_amusement.png b/menu/icons/other_amusement.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/other_amusement.png
diff --git a/menu/icons/other_archiving.png b/menu/icons/other_archiving.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/other_archiving.png
diff --git a/menu/icons/other_configuration.png b/menu/icons/other_configuration.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/other_configuration.png
diff --git a/menu/icons/other_networking.png b/menu/icons/other_networking.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/other_networking.png
diff --git a/menu/icons/other_sciences.png b/menu/icons/other_sciences.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/other_sciences.png
diff --git a/menu/icons/packaging_section.png b/menu/icons/packaging_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/packaging_section.png
diff --git a/menu/icons/parallel_computing_section.png b/menu/icons/parallel_computing_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/parallel_computing_section.png
diff --git a/menu/icons/pda_section.png b/menu/icons/pda_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/pda_section.png
diff --git a/menu/icons/physics_section.png b/menu/icons/physics_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/physics_section.png
diff --git a/menu/icons/presentation_section.png b/menu/icons/presentation_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/presentation_section.png
diff --git a/menu/icons/printing_section.png b/menu/icons/printing_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/printing_section.png
diff --git a/menu/icons/publishing_section.png b/menu/icons/publishing_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/publishing_section.png
diff --git a/menu/icons/puzzle_section.png b/menu/icons/puzzle_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/puzzle_section.png
diff --git a/menu/icons/remote_access_section.png b/menu/icons/remote_access_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/remote_access_section.png
diff --git a/menu/icons/robotics_section.png b/menu/icons/robotics_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/robotics_section.png
diff --git a/menu/icons/sciences_section.png b/menu/icons/sciences_section.png
new file mode 100644
index 0000000..c61a344
--- /dev/null
+++ b/menu/icons/sciences_section.png
diff --git a/menu/icons/shells_section.png b/menu/icons/shells_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/shells_section.png
diff --git a/menu/icons/sound_section.png b/menu/icons/sound_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/sound_section.png
diff --git a/menu/icons/sport_section.png b/menu/icons/sport_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/sport_section.png
diff --git a/menu/icons/spreadsheet_section.png b/menu/icons/spreadsheet_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/spreadsheet_section.png
diff --git a/menu/icons/strategy_section.png b/menu/icons/strategy_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/strategy_section.png
diff --git a/menu/icons/system_other_section.png b/menu/icons/system_other_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/system_other_section.png
diff --git a/menu/icons/system_section.png b/menu/icons/system_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/system_section.png
diff --git a/menu/icons/taskmanagement_section.png b/menu/icons/taskmanagement_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/taskmanagement_section.png
diff --git a/menu/icons/terminals_section.png b/menu/icons/terminals_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/terminals_section.png
diff --git a/menu/icons/text_tools_section.png b/menu/icons/text_tools_section.png
new file mode 100644
index 0000000..793d68f
--- /dev/null
+++ b/menu/icons/text_tools_section.png
diff --git a/menu/icons/timemanagement_section.png b/menu/icons/timemanagement_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/timemanagement_section.png
diff --git a/menu/icons/toys_section.png b/menu/icons/toys_section.png
new file mode 100644
index 0000000..ca31948
--- /dev/null
+++ b/menu/icons/toys_section.png
diff --git a/menu/icons/video_conferences_section.png b/menu/icons/video_conferences_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/video_conferences_section.png
diff --git a/menu/icons/video_section.png b/menu/icons/video_section.png
new file mode 100644
index 0000000..cbab725
--- /dev/null
+++ b/menu/icons/video_section.png
diff --git a/menu/icons/web_browser_section.png b/menu/icons/web_browser_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/web_browser_section.png
diff --git a/menu/icons/web_editors_section.png b/menu/icons/web_editors_section.png
new file mode 100644
index 0000000..a9a9d2e
--- /dev/null
+++ b/menu/icons/web_editors_section.png
diff --git a/menu/icons/windowmanager_section.png b/menu/icons/windowmanager_section.png
new file mode 100644
index 0000000..4d9a9dc
--- /dev/null
+++ b/menu/icons/windowmanager_section.png
diff --git a/menu/icons/wordprocessor_section.png b/menu/icons/wordprocessor_section.png
new file mode 100644
index 0000000..7abe204
--- /dev/null
+++ b/menu/icons/wordprocessor_section.png
diff --git a/menu/make-session.filter b/menu/make-session.filter
new file mode 100644
index 0000000..f9bf2a5
--- /dev/null
+++ b/menu/make-session.filter
@@ -0,0 +1 @@
+^.(/usr/share/X11/dm\.d/|/etc/X11/wmsession\.d/)
diff --git a/menu/make-session.script b/menu/make-session.script
new file mode 100755
index 0000000..9cce4a2
--- /dev/null
+++ b/menu/make-session.script
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/sbin/fndSession
diff --git a/menu/menu.dtd b/menu/menu.dtd
new file mode 100644
index 0000000..1bca3ed
--- /dev/null
+++ b/menu/menu.dtd
@@ -0,0 +1,84 @@
+<!-- For explanations see http://www.freedesktop.org/standards/menu-spec -->
+<!ELEMENT Menu (
+	Name, (
+	  Directory
+	| DefaultAppDirs
+	| AppDir
+	| DefaultDirectoryDirs
+	| DirectoryDir
+	| LegacyDir
+	| KDELegacyDirs
+	| MergeFile
+	| DefaultMergeDirs
+	| MergeDir
+	| OnlyUnallocated
+	| NotOnlyUnallocated
+	| Deleted
+	| NotDeleted
+	| Include
+	| Exclude
+	| Move
+	| Menu
+	| Layout
+	| DefaultLayout
+	)*
+)>
+
+<!ELEMENT Name (#PCDATA)>
+
+<!ELEMENT Directory (#PCDATA)>
+
+<!ELEMENT DefaultAppDirs EMPTY>
+<!ELEMENT AppDir         (#PCDATA)>
+
+<!ELEMENT DefaultDirectoryDirs EMPTY>
+<!ELEMENT DirectoryDir         (#PCDATA)>
+
+<!ELEMENT LegacyDir     (#PCDATA)>
+<!ATTLIST LegacyDir     prefix CDATA #IMPLIED>
+<!ELEMENT KDELegacyDirs EMPTY>
+
+<!ELEMENT MergeFile        (#PCDATA)>
+<!ATTLIST MergeFile type (path|parent) #IMPLIED>
+
+<!ELEMENT DefaultMergeDirs EMPTY>
+<!ELEMENT MergeDir         (#PCDATA)>
+
+<!ELEMENT OnlyUnallocated    EMPTY>
+<!ELEMENT NotOnlyUnallocated EMPTY>
+
+<!ELEMENT Deleted    EMPTY>
+<!ELEMENT NotDeleted EMPTY>
+
+<!ELEMENT Exclude  ((Category|Filename|And|Or|Not|All)*)> 
+<!ELEMENT Include  ((Category|Filename|And|Or|Not|All)*)>
+
+<!ELEMENT And      ((Category|Filename|And|Or|Not|All)*)>
+<!ELEMENT Or       ((Category|Filename|And|Or|Not|All)*)>
+<!ELEMENT Not      ((Category|Filename|And|Or|Not|All)*)>
+<!ELEMENT Filename (#PCDATA)>
+<!ELEMENT Category (#PCDATA)>
+<!ELEMENT All      EMPTY>
+
+<!ELEMENT Move ((Old,New)*)>
+<!ELEMENT Old  (#PCDATA)>
+<!ELEMENT New  (#PCDATA)>
+
+<!ELEMENT Layout ((Filename|Menuname|Separator|Merge)*)>
+<!ELEMENT DefaultLayout ((Filename|Menuname|Separator|Merge)*)>
+<!ATTLIST DefaultLayout show_empty (true|false) #IMPLIED>
+<!ATTLIST DefaultLayout inline (true|false) #IMPLIED>
+<!ATTLIST DefaultLayout inline_limit CDATA #IMPLIED>
+<!ATTLIST DefaultLayout inline_header (true|false) #IMPLIED>
+<!ATTLIST DefaultLayout inline_alias (true|false) #IMPLIED>
+
+<!ELEMENT Menuname (#PCDATA)>
+<!ATTLIST Menuname inline (true|false) #IMPLIED>
+<!ATTLIST Menuname inline_limit CDATA #IMPLIED>
+<!ATTLIST Menuname inline_header (true|false) #IMPLIED>
+<!ATTLIST Menuname inline_alias (true|false) #IMPLIED>
+
+<!ELEMENT Separator EMPTY>
+
+<!ELEMENT Merge EMPTY>
+<!ATTLIST Merge type (menus|files|all) #REQUIRED>
diff --git a/menu/menustyle.csh b/menu/menustyle.csh
new file mode 100755
index 0000000..a3e6960
--- /dev/null
+++ b/menu/menustyle.csh
@@ -0,0 +1,13 @@
+set MGA_MENU_STYLE=mageia
+
+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 ($MGA_MENU_STYLE  == discovery && ! ${?XDG_CONFIG_DIRS}) then
+	set MGA_MENU_STYLE=mageia
+endif
+
+setenv MGA_MENU_STYLE $MGA_MENU_STYLE
diff --git a/menu/menustyle.sh b/menu/menustyle.sh
new file mode 100755
index 0000000..6096ab2
--- /dev/null
+++ b/menu/menustyle.sh
@@ -0,0 +1,10 @@
+MGA_MENU_STYLE=mageia
+
+[ -r /etc/sysconfig/menustyle ] && . /etc/sysconfig/menustyle
+[ -r $HOME/.menustyle ] && . $HOME/.menustyle
+
+if [ "$MGA_MENU_STYLE" = "discovery" ]; then
+	MGA_MENU_STYLE=mageia
+fi
+
+export MGA_MENU_STYLE
diff --git a/menu/update-menus b/menu/update-menus
new file mode 100755
index 0000000..bd21520
--- /dev/null
+++ b/menu/update-menus
@@ -0,0 +1,48 @@
+#!/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/menu/update-menus.filter b/menu/update-menus.filter
new file mode 100644
index 0000000..809cc56
--- /dev/null
+++ b/menu/update-menus.filter
@@ -0,0 +1 @@
+^.(/usr|/opt/kde3)/share/applications/.*\.desktop$
diff --git a/menu/update-menus.script b/menu/update-menus.script
new file mode 100755
index 0000000..7f15cb0
--- /dev/null
+++ b/menu/update-menus.script
@@ -0,0 +1,2 @@
+#!/bin/sh
+update-menus
diff --git a/menu/xdg_menu b/menu/xdg_menu
new file mode 100755
index 0000000..931b373
--- /dev/null
+++ b/menu/xdg_menu
@@ -0,0 +1,2300 @@
+#!/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 findicon
+{
+
+#	my $theme = "hicolor";
+
+	my $iconname = shift;
+
+
+	my $home = $ENV{"HOME"};
+	my $xdg_data_dirs = $ENV{"XDG_DATA_DIRS"};
+
+	my (@xdg_data_dirs);
+	@xdg_data_dirs = split(":",$xdg_data_dirs);
+
+	my (@icon_search_path);
+
+	my (@categorylist);
+	@categorylist = ("apps", "places", "devices", "actions", "animations", "categories", "emblems", "emotes", "filesystems", "intl", "mimetypes", "status", "stock");
+
+	my (@sizelist);
+	@sizelist = (16, 22, 24, 26, 32, 36, 48, 64, 72, 128, 192, 256);
+
+	my $thisdir = $home."/.icons";
+	( -d $thisdir ) && push @icon_search_path, $thisdir;
+
+
+
+	foreach my $dir (@xdg_data_dirs)
+	{
+		my $theme = "hicolor";
+		my $size;
+		my $category;
+		foreach $size (@sizelist)
+		{
+			foreach $category (@categorylist)
+			{
+				$thisdir = $dir."/icons/".$theme."/".$size."x".$size."/".$category;
+				( -d $thisdir ) && push @icon_search_path, $thisdir;
+			}
+		}
+		$thisdir = $dir."/icons/mini";
+		( -d $thisdir ) && push @icon_search_path, $thisdir;
+		$thisdir = $dir."/icons";
+		( -d $thisdir ) && push @icon_search_path, $thisdir;
+		$thisdir = $dir."/icons/large";
+		( -d $thisdir ) && push @icon_search_path, $thisdir;
+		$theme = "gnome";
+		foreach $size (@sizelist)
+		{
+			foreach $category (@categorylist)
+			{
+				$thisdir = $dir."/icons/".$theme."/".$size."x".$size."/".$category;
+				( -d $thisdir ) && push @icon_search_path, $thisdir;
+			}
+		}
+	}
+
+	push @icon_search_path, "/usr/share/pixmaps";
+
+	my $filename;
+
+	if ( -f $iconname )
+	{
+		return $iconname;
+	}
+	else
+	{
+
+		foreach my $dir (@icon_search_path)
+		{
+			foreach my $ext ('','.png','.xpm')
+			{
+				$filename = $dir."/".$iconname.$ext;
+				( -f $filename ) && return $filename;
+			}
+		}
+	}
+}
+
+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 = '';
+        my $run = $format eq 'fluxbox' ? 'fbrun -nearmouse' : 'bbrun -a -w';
+
+    $output .= "[begin] (Menu)\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) {' . $run . '}
+        [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'};
+	$menu_name =~ s/\)/\\\)/g;
+	my $menu_icon = findicon($menu->{'PrepIcon'} || "folder");
+	
+	$output .= ' ' x $indent;
+	$output .= "[submenu] ($menu_name) <$menu_icon>\n";
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{'PrepName'};
+			$name =~ s/\)/\\\)/g;
+			my $exec = $desktop->{'PrepExec'};
+			my $icon = findicon($desktop->{'Icon'});
+			
+			$output .= ' ' x $indent;
+			$output .= "    [exec] ($name) {$exec} <$icon>\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} : '/var/lib/menu';
+	
+	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} : '/var/lib/menu';
+	
+	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 = "/usr/bin/gnomesu" if -x '/usr/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;
+
diff --git a/sbin/chksession b/sbin/chksession
new file mode 100644
index 0000000..196414f
--- /dev/null
+++ b/sbin/chksession
@@ -0,0 +1,167 @@
+#!/usr/bin/perl
+# (c) Mandriva, Chmouel Boudjnah <chmouel@mandriva.com>
+# Copyright under GPL blah blah blah.
+## For info, see "chksession --help" or  "man chksession"
+
+# Modified by Bernard Lang on August 21, 2003.
+
+
+my @lf;
+
+sub usage {
+  my $e = shift @_;
+  $0 =~ s|.*/||;
+  print {  $e ? STDERR : STDOUT } << "EOF";
+Usage: $0 [OPTION]...
+
+	      -F --first:   Print only first available entry.
+	      -t, --test:   Go in test mode.
+	      -l, --list:   List window-managers.
+	      -L:           List window-managers including the order number
+	      -d=DIR, --dir=DIR:   Specifies a directory of w-m configuration files.
+			 Default is /etc/X11/wmsession.d/
+	      -x=ENTRY, --xsession=ENTRY: Produce window-managers script of ENTRY.
+	      -k,  --kdm3:   Produce window-managers list for kdm3 sessions.
+	      -K,  --kdm4:   Produce window-managers list for kdm4 sessions.
+	      -g,  --gdm:   Produce window-managers script for gdm sessions.
+	      -h, --help:   Produce this help.
+
+EOF
+  exit($e);
+}
+
+sub cat {   # returns content of argument file as a single string
+  my ($f) = @_;
+  local *F;
+  open F, $f or die "Can't open $f\n";
+  local $/ = "";
+  <F>
+  }
+  
+sub parse_file {         # parse a session descriptor file
+    my ($fn) = @_;
+     $_ = cat ($fn);
+     ($n = $1) =~ s| ||g if /^NAME=(.*)/m;
+     $e = $1 if /^EXEC=(.*)/m;
+#     $d = $1 if /^DESC=(.*)/m;
+#     $i = $1 if /^ICON=(.*)/m;
+     $s = $1 while /SCRIPT:(.*?)$/gs; chomp $s;
+     if (-x $e) { $script{$n} = $s; $exe{$n} = $e; push @lf, $n; ($order{$n}) = $fn =~ m/(^[0-9][0-9])/; }
+#     if (-x $e) { $script{$n} = $s; $exec{$n} = $e; $desc{$n} = $d; $icon{$n} = $i; push @lf, $n; }
+}
+
+sub gen_desktops {
+    my ($d, $usesession) = @_;
+    -d $d or system("mkdir -p $d");
+    system("rm -f $d/*");
+
+    for my $file (@lf) {
+	open FH, ">$d/$order{$file}$file.desktop" or die "Can't write to $d/$order{$file}.desktop\n";
+	print FH "[Desktop Entry]\n";
+	print FH "Encoding=UTF-8\n";
+	print FH "Name=$file\n";
+	print FH "Comment=$file\n";
+	print FH "TryExec=$exe{$file}\n" if $exe{$file};
+	if ($usesession) {
+	    print FH "Exec=/usr/share/X11/xdm/Xsession $file\n";
+	} else {
+	    print FH "Exec=$file\n";
+	}
+	print FH "Icon=\n";
+	print FH "Type=Application\n";
+	close FH;
+	chmod 0755, $file;
+    }
+}
+
+usage(1)
+  if @ARGV < 1;
+
+while ($ARGV[0] =~ /^--/ || $ARGV[0] =~ /^-/) {
+  $_ = shift;
+  if (/^--xsession=([^ ]+)/ || /^-x=([^ ]+)/) {
+    $xsession = $1;
+  } elsif (/^--first/ || /^-F/) {
+    $first++;
+  } elsif (/^--gdm/ || /^-g/) {
+    die "You should be root to build gdm session\n" if $< != 0;
+    $gdm++;
+  } elsif (/^--list/ || /^-l/) {
+    $list++;
+  } elsif (/^-L/) {
+    $list_order++;
+  } elsif (/^--kdm3/ || /^-k/) {
+    $kdm3++;
+  } elsif (/^--kdm4/ || /^-K/) {
+    $kdm4++;
+  } elsif (/^--test/ || /^-t/) {
+    $test++;
+  } elsif (/^--dir=([^ ]+)/ || /^-d=([^ ]+)/) {
+    $dir = $1;
+  } elsif (/^--help/ || /^-h/ || /^-\?/) {
+    usage(0);
+  } else {
+    print STDERR "Unrecognized switch: $_\n";
+    usage(1);
+  }
+}
+  
+# Parse all relevant files in session directory $dir
+$dir = $test ? './wmsession.d/' : '/etc/X11/wmsession.d/' unless $dir;
+chdir $dir; 
+for (<*>) {
+    next if /.*~/;
+    next if /.*\.rpm(save|old)/;
+    parse_file ("$_");
+}
+
+my ($e) = eval {cat("/etc/sysconfig/desktop")} =~ /DESKTOP=(\S+)/;
+# The first string (without spaces) in the file is copied to $e.
+
+# If $e is one of the names in @lf, then it is placed first (leftmost).
+# Order of names in @lf is otherwise unchanged.
+@lf = sort { $b =~ /^$e$/i <=> $a =~ /^$e$/i } @lf;
+
+
+if ($kdm3) {
+    gen_desktops('/opt/kde3/share/apps/kdm/sessions', 0);
+}
+
+if ($kdm4) {
+    gen_desktops('/usr/share/apps/kdm/sessions', 0);
+}
+
+if ($gdm) {
+    gen_desktops('/etc/X11/dm/Sessions', 1);
+}
+
+if ($xsession) {
+  if ($script{$xsession}) {
+    print "#!/bin/sh\n";
+    print $script{$xsession}
+  } else {
+    print "xterm -geometry 100x25+0+0 &\n";
+	if ( -x '/usr/bin/icewm' ) {
+		print "icewm\n";
+	} elsif ( -x '/usr/bin/twm' ) {
+		print "twm\n";
+	} else {
+		print "xterm -geometry 67x14+384+446\n";
+	}
+  }
+  exit (0);
+}
+
+@lf ? print shift @lf, "\n" : print "default\n"
+  if $first;
+
+if ($list) { 
+  if (@lf) {
+    print join(' ', @lf, 'default', 'failsafe'), "\n";
+ } else {
+    print "default\n";
+  }
+} elsif ($list_order) { 
+    print join(' ', map { "$_=$order{$_}" } @lf), "\n";
+}
+
diff --git a/sbin/convertsession b/sbin/convertsession
new file mode 100644
index 0000000..05ea57e
--- /dev/null
+++ b/sbin/convertsession
@@ -0,0 +1,31 @@
+#!/usr/bin/perl
+# -*- Mode: cperl -*-
+# Copyright (C) 2000 by Chmouel Boudjnah <chmouel@mandriva.com>
+# Redistribution of this file is permitted under the terms of the GNU 
+# Public License (GPL)
+## description: Convert a file /etc/X11/window-managers to a
+##		/etc/X11/wmsession.d/ style files.
+
+my $dir = '/etc/X11/wmsession.d/';
+
+if ($ARGV[0] =~ /-f/ ) {
+    $file = $ARGV[1];
+} else {
+    $file = '/etc/X11/window-managers';
+}
+
+my $cnt = 0;
+
+open F, $file or die "Can't open $file\n";
+while (<F>) {
+    $/ = "--@@--";
+    s|--@@--||g;
+    if ($cnt != 0) {
+	$content = "$_";
+	$n = $1 if /^NAME=(.*)/m;
+	open C, ">$dir/$cnt$n" or die "Can't open $dir/$cnt$n\n";
+	print C $content;
+	close C;
+    }
+    $cnt++;
+}
diff --git a/sbin/fndSession b/sbin/fndSession
new file mode 100755
index 0000000..f4f1c1d
--- /dev/null
+++ b/sbin/fndSession
@@ -0,0 +1,29 @@
+#!/bin/sh
+#---------------------------------------------------------------
+# Project         : Mandriva Linux
+# Module          : sbin
+# File            : fndSession
+# Version         : $Id: fndSession 243102 2008-06-30 13:10:12Z fcrozat $
+# Author          : Frederic Lepied
+# Created On      : Mon May 30 10:43:12 2005
+# Purpose         : find sessions for display managers
+#---------------------------------------------------------------
+
+umask 022
+
+FILES=`/bin/ls /usr/share/X11/dm.d/*.conf 2> /dev/null`
+
+if [ $? != 0 ]; then
+	exit 0
+fi
+
+for f in $FILES; do
+    EXEC=
+    FNDSESSION_EXEC=
+    eval `grep 'EXEC=' "$f"`
+    if [ -x "$EXEC" -a -n "$FNDSESSION_EXEC" ]; then
+	$FNDSESSION_EXEC
+    fi
+done
+
+# fndSession ends here
diff --git a/sbin/kdeDesktopCleanup b/sbin/kdeDesktopCleanup
new file mode 100755
index 0000000..323dcc5
--- /dev/null
+++ b/sbin/kdeDesktopCleanup
@@ -0,0 +1,30 @@
+#!/usr/bin/perl
+# (c) Mandriva,  Pixel <pixel@mandriva.com>
+# Copyright under GPL
+
+@dirs = (qw(/etc/skel /root), glob("/home/*"));
+@path = split ":", "/sbin:/usr/sbin:/usr/X11R6/bin:/bin:/usr/bin";
+
+foreach $f (map { grep { /\.kdelnk$/ } eval { all("$_/Desktop") } } @dirs) {
+    open F, $f or next;
+    L: foreach (<F>) {
+	  if (/^Exec=(?:kdesu\s+-c\s+)?"?(\S+)/) {
+	      -x "$_/$1" and last L foreach '', @path;
+	  } elsif (m|^URL=file:(/.*)|) {	  
+	      -e $1 and last;
+	  } else { next }
+	  print STDERR "removing $f\n";
+	  unlink $f;
+	  last;
+      }
+}
+
+sub all {
+    my $d = shift;
+    local *F;
+    opendir F, $d or die "all: can't open dir $d: $!\n";
+    my @l = grep { $_ ne '.' && $_ ne '..' } readdir F;
+    closedir F;
+
+    map { "$d/$_" } @l;
+}
diff --git a/xinit.d/menu b/xinit.d/menu
new file mode 100755
index 0000000..41b8c99
--- /dev/null
+++ b/xinit.d/menu
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# move old menus if still existing
+if [ ! -f $HOME/.mdk-menu-migrated ]; then
+if [ -f $HOME/.config/menus/applications-mdk.menu ]; then
+	mv $HOME/.config/menus/applications-mdk.menu $HOME/.config/menus/applications-mdk.menu.obsolete
+	if [ -L $HOME/.config/menus/applications.menu ]; then
+		mv $HOME/.config/menus/applications.menu $HOME/.config/menus/applications.menu.obsolete
+	fi
+fi
+
+if [ -d $HOME/.local/share/applications/Mandrakelinux ]; then
+	mkdir -p $HOME/.local/share/applications-obsolete/ 2> /dev/null
+	mv $HOME/.local/share/applications/Mandrakelinux $HOME/.local/share/applications-obsolete/Mandrakelinux 
+fi
+
+if [ -d $HOME/.local/share/applications/MandrivaLinux ]; then
+	mkdir -p $HOME/.local/share/applications-obsolete/ 2> /dev/null
+	mv $HOME/.local/share/applications/MandrivaLinux $HOME/.local/share/applications-obsolete/MandrivaLinux 
+fi
+
+if [ -d $HOME/.local/share/desktop-directories ]; then
+	mkdir -p $HOME/.local/share/desktop-directories-obsolete 
+	mv $HOME/.local/share/desktop-directories/mandrake* $HOME/.local/share/desktop-directories-obsolete/ 2> /dev/null
+fi
+touch $HOME/.mdk-menu-migrated
+fi
+
+USER_STAMP=$HOME/.menu-updates.stamp
+SYSTEM_STAMP=/var/lib/menu/.menu-updates.stamp
+MENU_DIR=$HOME/.config/menus
+APPS_DIR=$HOME/.local/share/applications
+
+RETVAL=0
+
+if [ \( -d "$MENU_DIR" -o -d "$APP_DIR" \) -o -f "$USER_STAMP" -a -f "$SYSTEM_STAMP" ]; then
+    if [ ! -f "$USER_STAMP" ]; then
+            RETVAL=1;
+    elif [ "$SYSTEM_STAMP" -nt "$USER_STAMP" ]; then
+            RETVAL=1;
+    elif [ "$MENU_DIR" -nt "$USER_STAMP" ]; then
+	    RETVAL=1;
+    elif [ "$APPS_DIR" -nt "$USER_STAMP" ]; then
+            RETVAL=1;
+    fi
+    if [ $RETVAL -eq 1 ]; then
+        echo "Running update-menus..."
+        update-menus -u
+	echo "menu generation finished"
+    fi
+fi
+
+
+# menu ends here
author	Dexter Morgan <dmorgan@mageia.org>	2011-06-02 20:30:42 +0000
committer	Dexter Morgan <dmorgan@mageia.org>	2011-06-02 20:30:42 +0000
commit	ac5099ebf8fced835c2108ce4d2d327762d0e595 (patch)
tree	c9d6bb9a8e3a7e3de6a100e2ae300922003f995e
download	common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.tar common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.tar.gz common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.tar.bz2 common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.tar.xz common-data-ac5099ebf8fced835c2108ce4d2d327762d0e595.zip