V2007_1_1mdv

558 files changed, 10597 insertions, 0 deletions

diff --git a/trunk/.cvsignore b/trunk/.cvsignore
new file mode 100644
index 0000000..24ccb63
--- /dev/null
+++ b/trunk/.cvsignore
@@ -0,0 +1 @@
+mandrake_desk*.tar.bz2
diff --git a/trunk/ChangeLog b/trunk/ChangeLog
new file mode 100644
index 0000000..c3e8045
--- /dev/null
+++ b/trunk/ChangeLog
@@ -0,0 +1,2695 @@
+2006-11-16 17:42  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-discovery.menu: Fix
+	  incorrect category for wordprocessors in discovery menu (Mdv bug
+	  #27084)
+
+2006-10-26 18:04  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/update-menus, xinit.d/menu: - 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 19:28  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-discovery.menu,
+	  menu/applications-mdk.menu,
+	  menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-development-other.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education-history.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-other.directory.in,
+	  menu/desktop-directories/mandriva-multimedia-other.directory.in,
+	  menu/desktop-directories/mandriva-office-communications-other.directory.in,
+	  menu/desktop-directories/mandriva-office-other.directory.in,
+	  menu/desktop-directories/mandriva-other.directory.in,
+	  menu/desktop-directories/mandriva-system-archiving-backup.directory.in,
+	  menu/desktop-directories/mandrivalinux.directory.in: - Rename
+	  root node from Mandriva Linux to Applications (Mdv bug #25389) -
+	  Add missing .directory for various entries (Mdv bug #26273)
+
+2006-09-25 14:33  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-discovery.menu,
+	  menu/applications-mdk.menu,
+	  menu/desktop-directories/mandriva-moreapplications-emulators.directory.in:
+	  - Add missing Emulator category to menu files (Mdv bug #26148)
+
+2006-09-21 12:20  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/mandriva-discovery.menu: - Hide
+	  more applications in one products - Increase version for
+	  Conflicts (Mdv bug #26043)
+
+2006-09-19 20:08  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-discovery.menu,
+	  menu/applications-mdk.menu, menu/mandriva-discovery.menu: - 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 16:25  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: - Rebuild with fixed mdk-menu-message
+	  to get all translations (Mdv bug #25895)
+
+2006-09-15 09:59  Laurent Montel <lmontel at mandriva.com>
+
+	* bookmarks/konqueror/: bookmarks-powerpack.xml,
+	  bookmarks-powerpackplus.xml: Fix kaspersky icons
+
+2006-09-15 09:53  Laurent Montel <lmontel at mandriva.com>
+
+	* bookmarks/konqueror/: bookmarks-powerpack.xml,
+	  bookmarks-powerpackplus.xml: Fix crossover favicon
+
+2006-09-15 08:48  Laurent Montel <lmontel at mandriva.com>
+
+	* bookmarks/konqueror/: bookmarks-powerpack.xml,
+	  bookmarks-powerpackplus.xml: Add partners directory
+
+2006-09-15 08:33  Laurent Montel <lmontel at mandriva.com>
+
+	* bookmarks/konqueror/: bookmarks-discovery.xml,
+	  bookmarks-download.xml, bookmarks-powerpack.xml,
+	  bookmarks-powerpackplus.xml: Fix bookmarks url
+
+2006-09-13 20:05  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-mdk.menu: - Don't
+	  show GNOME configuration in standard menu, moved in preferences
+	  menu
+
+2006-09-13 16:19  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec,
+	  bookmarks/mozilla/mozilla-discovery-download.html,
+	  bookmarks/mozilla/mozilla-discovery.html,
+	  bookmarks/mozilla/mozilla-download.html,
+	  bookmarks/mozilla/mozilla-powerpack.html,
+	  bookmarks/mozilla/mozilla-powerpackplus.html: - Update with new
+	  bookmarks
+
+2006-09-13 09:46  Laurent Montel <lmontel at mandriva.com>
+
+	* bookmarks/konqueror/: bookmarks-powerpack.xml,
+	  bookmarks-powerpackplus.xml: Fix bookmarks for power*
+
+2006-09-13 08:58  Laurent Montel <lmontel at mandriva.com>
+
+	* bookmarks/konqueror/bookmarks-download.xml: Fix download
+	  bookmarks
+
+2006-09-13 08:56  Laurent Montel <lmontel at mandriva.com>
+
+	* bookmarks/konqueror/bookmarks-discovery.xml: Fix discovery
+	  bookmarks
+
+2006-09-08 19:11  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec,
+	  bookmarks/mozilla/mozilla-discovery-download.html,
+	  bookmarks/mozilla/mozilla-powerpack.html,
+	  bookmarks/mozilla/mozilla-powerpackplus.html, menu/menustyle.csh,
+	  menu/menustyle.sh: - Update profile scripts to remove invalid
+	  dependencies - move defaults bookmarks from kde and firefox to
+	  this package
+
+2006-09-08 14:19  Laurent Montel <lmontel at mandriva.com>
+
+	* bookmarks/konqueror/: bookmarks-discovery.xml,
+	  bookmarks-download.xml, bookmarks-powerpack.xml,
+	  bookmarks-powerpackplus.xml: Move konqueror bookmarks
+
+2006-09-04 18:32  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, dm/mdk-gdm.xml, dm/mdk-kde.xml,
+	  xinit.d/desktop-directories: - Improve gdm/kdm theme with new
+	  backgrounds - Don't create default desktop directories for root
+	  (Mdv bug #19711)
+
+2006-09-04 11:46  Laurent Montel <lmontel at mandriva.com>
+
+	* dm/mdk-kde.xml: Fix caps lock error
+
+2006-09-04 10:29  Laurent Montel <lmontel at mandriva.com>
+
+	* dm/mdk-kde.xml: Change design as requested by design team
+
+2006-08-31 17:46  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-discovery.menu: Use
+	  kmenuedit menu file if it's generated.
+
+2006-08-31 17:33  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec: Fix upgrade from 2006
+
+2006-08-30 18:54  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/update-menus: - update-menus
+	  doesn't do anything if DURING_INSTALL is set to 1
+
+2006-08-30 18:01  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-discovery.menu,
+	  menu/applications-mdk.menu, menu/menustyle.csh,
+	  menu/menustyle.sh,
+	  menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in,
+	  xinit.d/desktop-directories: - 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 19:56  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-discovery.menu,
+	  menu/menustyle.csh, menu/menustyle.sh: - Add discovery menu and
+	  script to support MDV_MENU_STYLE
+
+2006-08-17 13:45  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec: Change requires to mandriva-theme
+
+2006-08-09 11:56  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec: Update release
+
+2006-08-09 11:46  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/applications-mdk.menu: Fix typo. (fix oowriter menu entry)
+
+2006-08-07 11:49  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-mdk.menu: Fix mdk bug
+	  #24103 (add kmenuedit.menu file)
+
+2006-07-20 18:33  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec,
+	  menu/desktop-directories/mandriva-system-archiving-other.directory.in:
+	  - Add .directory for Archiving/Other (Mdv bug #23845)
+
+2006-07-20 18:29  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-mdk.menu: - Ignore
+	  "Development" keyword, it is too broad atm (Mdv bug #23826)
+
+2006-07-20 17:47  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-mdk.menu: - Fix some
+	  typo (Andrej) (Mdk bug #23842)
+
+2006-07-17 18:23  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-mdk.menu,
+	  xinit.d/menu: final switch to XDG menu
+
+2006-07-17 11:01  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, xinit.d/menu: Final switch to XDG menu
+
+2006-07-11 13:35  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: - Add missing .directory (Mdv bug
+	  #23614) - fix translations for some .directories (Mdv bug #23641)
+
+2006-07-10 15:29  Frederic Crozat <fcrozat at mandriva.com>
+
+	*
+	  menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in:
+	  Add missing directory file
+
+2006-07-07 15:44  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec,
+	  menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in:
+	  - add missing .directory - rebuild with fixed intltool
+
+2006-07-07 12:07  Pixel <pixel at mandriva.com>
+
+	* desktop-common-data.spec: - fix generating icewm menu from XDG -
+	  replace broken link explaining mandriva cvs usage
+
+2006-07-07 12:06  Pixel <pixel at mandriva.com>
+
+	* menu/xdg_menu: fix generating icewm menu
+
+2006-06-19 18:51  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-mdk.menu,
+	  menu/desktop-directories/mandriva-hidden.directory.in,
+	  menu/desktop-directories/mandriva-internet-chat.directory.in,
+	  menu/desktop-directories/mandriva-internet-filetransfer.directory.in,
+	  menu/desktop-directories/mandriva-internet-instantmessaging.directory.in,
+	  menu/desktop-directories/mandriva-internet-mail.directory.in,
+	  menu/desktop-directories/mandriva-internet-news.directory.in,
+	  menu/desktop-directories/mandriva-internet-other.directory.in,
+	  menu/desktop-directories/mandriva-internet-remoteaccess.directory.in,
+	  menu/desktop-directories/mandriva-internet-videoconference.directory.in,
+	  menu/desktop-directories/mandriva-internet-webbrowsers.directory.in,
+	  menu/desktop-directories/mandriva-internet-webeditors.directory.in,
+	  menu/desktop-directories/mandriva-internet.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-communications.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-databases.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-development.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-documentation.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-editors.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education-other.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-education.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-finances.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-games-other.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-games.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications-sciences.directory.in,
+	  menu/desktop-directories/mandriva-moreapplications.directory.in,
+	  menu/desktop-directories/mandriva-multimedia-graphics.directory.in,
+	  menu/desktop-directories/mandriva-multimedia-sound.directory.in,
+	  menu/desktop-directories/mandriva-multimedia-video.directory.in,
+	  menu/desktop-directories/mandriva-multimedia.directory.in,
+	  menu/desktop-directories/mandriva-office-accessories.directory.in,
+	  menu/desktop-directories/mandriva-office-addressbooks.directory.in,
+	  menu/desktop-directories/mandriva-office-communications-fax.directory.in,
+	  menu/desktop-directories/mandriva-office-communications-pda.directory.in,
+	  menu/desktop-directories/mandriva-office-communications-phone.directory.in,
+	  menu/desktop-directories/mandriva-office-communications.directory.in,
+	  menu/desktop-directories/mandriva-office-drawing.directory.in,
+	  menu/desktop-directories/mandriva-office-graphs.directory.in,
+	  menu/desktop-directories/mandriva-office-presentations.directory.in,
+	  menu/desktop-directories/mandriva-office-publishing.directory.in,
+	  menu/desktop-directories/mandriva-office-spreadsheets.directory.in,
+	  menu/desktop-directories/mandriva-office-tasksmanagement.directory.in,
+	  menu/desktop-directories/mandriva-office-timemanagement.directory.in,
+	  menu/desktop-directories/mandriva-office-wordprocessors.directory.in,
+	  menu/desktop-directories/mandriva-office.directory.in,
+	  menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in,
+	  menu/desktop-directories/mandriva-system-archiving-compression.directory.in,
+	  menu/desktop-directories/mandriva-system-archiving.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-gnome.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-hardware.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-kde.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-networking.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-other.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-packaging.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration-printing.directory.in,
+	  menu/desktop-directories/mandriva-system-configuration.directory.in,
+	  menu/desktop-directories/mandriva-system-filetools.directory.in,
+	  menu/desktop-directories/mandriva-system-monitoring.directory.in,
+	  menu/desktop-directories/mandriva-system-terminals.directory.in,
+	  menu/desktop-directories/mandriva-system-texttools.directory.in,
+	  menu/desktop-directories/mandriva-system.directory.in: - Add
+	  missing .directory files and fix videoconference one
+
+2006-06-15 15:47  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-mdk.menu: Switch to
+	  X-MandrivaLinux
+
+2006-05-29 14:07  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: - Add legacy directories and default
+	  merge directory
+
+2006-05-29 14:06  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/applications-mdk.menu: Add back legacy directories
+
+2006-05-17 19:09  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: Fix errors in install script
+
+2006-05-17 19:01  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: - ship our own .directory files now -
+	  use kde .directory files when possible - add more upstream
+	  categories
+
+2006-05-17 18:35  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/applications-mdk.menu: -use our own .directory files -use
+	  more official categories -use kde .directory when available
+
+2006-05-17 18:31  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/desktop-directories/: mandriva-hidden.directory.in,
+	  mandriva-internet-chat.directory.in,
+	  mandriva-internet-filetransfer.directory.in,
+	  mandriva-internet-instantmessaging.directory.in,
+	  mandriva-internet-mail.directory.in,
+	  mandriva-internet-news.directory.in,
+	  mandriva-internet-other.directory.in,
+	  mandriva-internet-remoteaccess.directory.in,
+	  mandriva-internet-videoconference.directory.in,
+	  mandriva-internet-webbrowsers.directory.in,
+	  mandriva-internet-webeditors.directory.in,
+	  mandriva-internet.directory.in,
+	  mandriva-moreapplications-accessibility.directory.in,
+	  mandriva-moreapplications-communications.directory.in,
+	  mandriva-moreapplications-databases.directory.in,
+	  mandriva-moreapplications-development-developmentenvironments.directory.in,
+	  mandriva-moreapplications-development-tools.directory.in,
+	  mandriva-moreapplications-development.directory.in,
+	  mandriva-moreapplications-documentation.directory.in,
+	  mandriva-moreapplications-editors.directory.in,
+	  mandriva-moreapplications-education-languages.directory.in,
+	  mandriva-moreapplications-education-other.directory.in,
+	  mandriva-moreapplications-education-sciences.directory.in,
+	  mandriva-moreapplications-education.directory.in,
+	  mandriva-moreapplications-finances.directory.in,
+	  mandriva-moreapplications-games-arcade.directory.in,
+	  mandriva-moreapplications-games-boards.directory.in,
+	  mandriva-moreapplications-games-cards.directory.in,
+	  mandriva-moreapplications-games-other.directory.in,
+	  mandriva-moreapplications-games-puzzles.directory.in,
+	  mandriva-moreapplications-games-toys.directory.in,
+	  mandriva-moreapplications-games.directory.in,
+	  mandriva-moreapplications-sciences-mathematics.directory.in,
+	  mandriva-moreapplications-sciences.directory.in,
+	  mandriva-moreapplications.directory.in,
+	  mandriva-multimedia-graphics.directory.in,
+	  mandriva-multimedia-sound.directory.in,
+	  mandriva-multimedia-video.directory.in,
+	  mandriva-multimedia.directory.in,
+	  mandriva-networking.directory.in,
+	  mandriva-office-accessories.directory.in,
+	  mandriva-office-addressbooks.directory.in,
+	  mandriva-office-communications-fax.directory.in,
+	  mandriva-office-communications-pda.directory.in,
+	  mandriva-office-communications-phone.directory.in,
+	  mandriva-office-communications.directory.in,
+	  mandriva-office-drawing.directory.in,
+	  mandriva-office-graphs.directory.in,
+	  mandriva-office-presentations.directory.in,
+	  mandriva-office-publishing.directory.in,
+	  mandriva-office-spreadsheets.directory.in,
+	  mandriva-office-tasksmanagement.directory.in,
+	  mandriva-office-timemanagement.directory.in,
+	  mandriva-office-wordprocessors.directory.in,
+	  mandriva-office.directory.in,
+	  mandriva-system-archiving-cdburning.directory.in,
+	  mandriva-system-archiving-compression.directory.in,
+	  mandriva-system-archiving.directory.in,
+	  mandriva-system-configuration-bootandinit.directory.in,
+	  mandriva-system-configuration-gnome-accessibility.directory.in,
+	  mandriva-system-configuration-gnome-advanced.directory.in,
+	  mandriva-system-configuration-gnome.directory.in,
+	  mandriva-system-configuration-hardware.directory.in,
+	  mandriva-system-configuration-kde.directory.in,
+	  mandriva-system-configuration-networking.directory.in,
+	  mandriva-system-configuration-other.directory.in,
+	  mandriva-system-configuration-packaging.directory.in,
+	  mandriva-system-configuration-printing.directory.in,
+	  mandriva-system-configuration.directory.in,
+	  mandriva-system-filetools.directory.in,
+	  mandriva-system-monitoring.directory.in,
+	  mandriva-system-terminals.directory.in,
+	  mandriva-system-texttools.directory.in,
+	  mandriva-system.directory.in: Add untranslated directory files
+
+2006-05-12 17:34  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec: Fix for missing entry
+
+2006-05-12 17:30  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/applications-mdk.menu: Fix missing entry reported by Nicolas
+	  Chipaux
+
+2006-05-12 11:24  Frederic Crozat <fcrozat at mandriva.com>
+
+	* screensavers/: 01.png, 02.png, 03.png, 04.png, 05.png, 06.png,
+	  07.png, 08.png, 09.png, 1.png, 10.png, 11.png, 12.png, 13.png,
+	  14.png, 15.png, 16.png, 17.png, 18.png, 19.png, 2.png, 20.png,
+	  21.png, 22.png, 23.png, 24.png, 25.png, 26.png, 27.png, 3.png,
+	  4.png, 5.png, 6.png, 7.png, 8.png, 9.png: Readd screensaver files
+
+2006-05-11 18:08  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: Use new filenames for kde .desktop file
+
+2006-05-11 18:07  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/applications-mdk.menu: use new name for kde .desktop file
+
+2006-05-10 11:17  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: Add missing categories (laurent)
+
+2006-05-10 11:04  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/applications-mdk.menu: Fix missing menu entry (fix kcontrol)
+
+2006-05-04 18:26  Frederic Crozat <fcrozat at mandriva.com>
+
+	* Makefile: fix typo
+
+2006-05-04 18:23  Frederic Crozat <fcrozat at mandriva.com>
+
+	* Makefile, desktop-common-data.spec: Fix menu location
+
+2006-05-04 18:19  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/applications-mdk.menu, menu/menu,
+	  menu/update-menus, menu/xdg_menu: - 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
+
+2006-05-04 18:18  Frederic Crozat <fcrozat at mandriva.com>
+
+	* Makefile: Add support for mkrel
+
+2005-09-26 15:13  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: - Fix desktop-directory script (UTF
+	  encoded URL, hidden .directory file)	 Mdk bug #18853
+
+2005-09-26 15:12  Frederic Crozat <fcrozat at mandriva.com>
+
+	* xinit.d/desktop-directories: -create .directory as hidden file
+	  -encode url in UTF8
+
+2005-09-23 16:36  Frederic Lepied <flepied at mandriva.com>
+
+	* desktop-common-data.spec: 2006-1mdk
+
+2005-09-23 16:33  Frederic Lepied <flepied at mandriva.com>
+
+	* menu/menu-simplified: fixed Read Documentation entry
+
+2005-09-23 14:35  Frederic Lepied <flepied at mandriva.com>
+
+	* menu/menu-simplified: fix documentation menu tuxracer =>  ppracer
+
+2005-09-23 14:34  Frederic Lepied <flepied at mandriva.com>
+
+	* menu/desktop-common-data: fix doc fix default web browser to be
+	  firefox
+
+2005-09-21 13:45  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/desktop-common-data: Fix doc url
+
+2005-09-19 19:43  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec, menu/menu: Fix menu entry
+
+2005-09-19 12:07  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, bin/www-browser: Fix previous commit
+
+2005-09-19 10:48  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, bin/www-browser: - Fix loop in
+	  www-browser (patch from Andrey Borzenkov)
+
+2005-09-12 16:43  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/desktop-common-data: use gimp-remote, not gimp-remote-2.2
+
+2005-09-12 16:14  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec, menu/desktop-common-data: - Fix package
+	  name and command for gimp in simplified menu (Mdk bug #17627)
+
+2005-09-08 15:46  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec, menu/menu-simplified: Add separator in
+	  simplified menu
+
+2005-08-29 11:57  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: Fix default directories when no
+	  translation is available
+
+2005-08-29 11:56  Frederic Crozat <fcrozat at mandriva.com>
+
+	* xinit.d/desktop-directories: Fix when no translation is available
+
+2005-08-26 19:34  Frederic Crozat <fcrozat at mandriva.com>
+
+	* xinit.d/desktop-directories: Remove desktop special case, it is
+	  no longer created
+
+2005-08-26 19:19  Frederic Crozat <fcrozat at mandriva.com>
+
+	* xinit.d/desktop-directories, desktop-common-data.spec: New scheme
+	  for default directories
+
+2005-08-24 20:01  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: installing scripts works better
+
+2005-08-24 19:48  Frederic Crozat <fcrozat at mandriva.com>
+
+	* desktop-common-data.spec: - Add default directories xinit.d
+	  script
+
+2005-08-24 19:29  Frederic Crozat <fcrozat at mandriva.com>
+
+	* xinit.d/desktop-directories: Rename .desktop.in into
+	  .desktop.template add gtk-bookmarks support
+
+2005-08-23 18:56  Laurent Montel <lmontel at mandriva.com>
+
+	* desktop-common-data.spec: Update spec file
+
+2005-08-12 19:58  Funda Wang <fundawang at linux.net.cn>
+
+	* sbin/: chksession, convertsession, kdeDesktopCleanup:
+	  s/Mandrake/Mandriva/
+
+2005-08-12 19:57  Funda Wang <fundawang at linux.net.cn>
+
+	* dm/: GdmGreeterTheme.desktop, KdmGreeterTheme.desktop:
+	  s/Mandrake/Mandriva.
+
+2005-08-10 07:51  Frederic Crozat <fcrozat at mandriva.com>
+
+	* xinit.d/desktop-directories: Generate .desktop from templates and
+	  copy them to $HOME at login
+
+2005-06-06 06:44  Frederic Lepied <flepied at mandriva.com>
+
+	* desktop-common-data.spec: 10.3.1-1mdk
+
+2005-05-30 04:42  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec: no more used
+
+2005-05-30 04:41  Frederic Lepied <flepied at mandriva.com>
+
+	* desktop-common-data.spec: 10.3-1mdk
+
+2005-05-30 04:41  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/fndSession: use the new framework in /etc/X11/dm.d.
+
+2005-05-13 09:12  Frederic Crozat <fcrozat at mandriva.com>
+
+	* Makefile, desktop-common-data.spec, bin/xvt,
+	  menu/desktop-common-data, menu/mandrake_desk,
+	  menu/translate_menus, menu/translate_menus-simplified: - change
+	  package name - xvt : fix typo (bug #15836) - fix typo in
+	  translation-map - remove screensaver images, moved in theme
+	  package
+
+2005-03-29 18:29  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec: 10.2-4mdk
+
+2005-03-29 18:26  Frederic Lepied <flepied at mandriva.com>
+
+	* bin/www-browser: test if the $BROWSER variable is set to
+	  something valid (bug #14903).
+
+2005-03-23 17:44  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/menu-simplified: Forgot simplified menu
+
+2005-03-23 16:48  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/menu: - don't use .desktop files for
+	  order directive
+
+2005-03-09 15:04  Frederic Crozat <fcrozat at mandriva.com>
+
+	* bin/www-browser: fix stripping value from GNOME
+
+2005-03-09 14:43  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, bin/www-browser, bin/xvt: - 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 14:37  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec, menu/menu, menu/menu-simplified: Remove
+	  alias_inline
+
+2005-03-02 10:57  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec, menu/menu-simplified: Fix order into
+	  simplified menu
+
+2005-03-01 17:20  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec, menu/menu: Fix menu order for Menuname with
+	  id
+
+2005-03-01 16:18  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec, menu/menu: Recreate order as in 10.1
+
+2005-03-01 09:43  Laurent Montel <lmontel at mandriva.com>
+
+	* dm/: KdmGreeterTheme.desktop, mdk-kde.xml: Add kdm theme
+
+2005-02-28 18:08  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, dm/GdmGreeterTheme.desktop,
+	  dm/disconnect.png, dm/languages.png, dm/mdk-gdm.xml,
+	  dm/reboot.png, dm/screenshot.png, dm/sessions.png, dm/star.png,
+	  dm/system.png: Add shared theme for GDM/KDM
+
+2005-01-25 19:16  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/defaultlayout-simplified.menu,
+	  menu/defaultlayout.menu: Fix small errors in default layout menu
+	  files
+
+2004-12-14 16:01  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/defaultlayout-simplified.menu,
+	  menu/defaultlayout.menu, menu/menu, menu/menu-simplified,
+	  menu/translate_menus, menu/translate_menus-simplified,
+	  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/mail_section.png,
+	  menu/icons/mandrake.png, menu/icons/mathematics_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/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/mandrake.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/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/mandrake.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: Move all menu
+	  informations (layout/icons) from menu to mandrake_desk package
+
+2004-09-29 11:51  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Fix "Listen to Music
+	  Files" menu entry
+
+2004-09-29 10:08  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-09-29 10:08  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Add missing menu entry for french
+	  mandrakelinux documentation
+
+2004-09-29 09:25  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-09-29 09:24  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Fix import and sort your photos
+
+2004-09-10 08:48  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Add Mandrakelinux
+	  documentation
+
+2004-09-09 12:35  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Remove all longtitle
+
+2004-09-09 12:27  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Update last changes
+
+2004-09-09 12:19  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Remove non task oriented description for
+	  KPhone
+
+2004-09-07 10:40  Pablo Saratxaga <pablo at mandriva.com>
+
+	* man/it/chksession.8: Added Italian Man page
+
+2004-09-01 08:31  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk: Update menu Fix capitalization
+
+2004-08-31 09:37  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec: 10.1-6mdk
+
+2004-08-31 09:36  Frederic Lepied <flepied at mandriva.com>
+
+	* bin/www-browser: first version
+
+2004-08-31 09:35  Frederic Lepied <flepied at mandriva.com>
+
+	* Makefile: added standard rules to build packages
+
+2004-08-27 11:51  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Fix typo in gnome-cd
+	  entry
+
+2004-08-16 04:18  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec: Fix "Play Games" entry
+
+2004-08-16 04:12  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk: Fix "Play Games" entry
+
+2004-08-11 12:31  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: - Add GNOME version of
+	  task oriented menu - Fix capitalisations in task oriented menu
+
+2004-08-05 11:21  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Fix typo
+
+2004-08-05 09:24  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-08-05 09:23  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Add "Make a phone call" (using kphone at
+	  present time)
+
+2004-08-05 08:41  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Update task oriented menu
+
+2004-08-04 09:52  Pixel <pixel at mandriva.com>
+
+	* mandrake_desk.spec: fix descriptions (use Mandrakelinux instead
+	  of simply Mandrake)
+
+2004-08-04 09:49  Pixel <pixel at mandriva.com>
+
+	* mandrake_desk.spec, sbin/chksession: add "chksession -L" used by
+	  DrakX to configure ~/.dmrc
+
+2004-08-04 09:39  Pixel <pixel at mandriva.com>
+
+	* sbin/chksession: - don't generate
+	  /etc/X11/dm/Sessions/Default.desktop (otherwise gdm gives 2
+	  "default" entries) - cleanup
+
+2004-03-02 09:43  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec: 10.0-10mdk
+
+2004-03-02 09:42  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/chksession: don't pass /etc/X11/xdm/Xsession in Exec field
+	  for the KDE sessions
+
+2004-02-27 18:28  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec: call fndSession in %post
+
+2004-02-27 18:26  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/fndSession: use simply chksession -k for kdm
+
+2004-02-27 18:24  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/chksession: do not generate Default session for kdm remove
+	  files before generating the sessions
+
+2004-02-27 18:00  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec: 10.0-9mdk
+
+2004-02-27 17:59  Frederic Lepied <flepied at mandriva.com>
+
+	* Makefile: use rpm -ta to build an rpm
+
+2004-02-27 17:56  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/chksession: fix KDE sessions
+
+2004-02-27 17:20  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-02-27 09:44  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk: s/ORC/OCR
+
+2004-02-24 11:14  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-02-24 11:09  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-02-24 11:05  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk: Fix icons
+
+2004-02-05 15:54  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Fix simplified menu
+
+2004-02-05 14:49  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Fix title of "Organize your time" in
+	  simplified menu
+
+2004-02-05 14:26  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Fix typos
+
+2004-01-29 18:21  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-01-29 17:29  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-01-29 17:11  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: default-9.1.png, default-root-9.1.png,
+	  default-root.png, default.png, discovery-1280x1024.png,
+	  discovery-root-1280x1024.png, discovery-root.png, discovery.png,
+	  download-1280x1024.png, download-root-1280x1024.png,
+	  download-root.png, download.png, pwp-ps-1280x1024.png,
+	  pwp-ps-root-1280x1024.png, pwp-ps-root.png, pwp-ps.png: Remove
+	  old images
+
+2004-01-19 16:39  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk: Add "kontact" entry
+
+2004-01-13 18:43  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2004-01-13 18:29  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk: Fix drakbackup menu entry
+
+2004-01-13 17:48  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk: Update new simplified menu
+
+2004-01-13 14:07  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk-9.2: Save old version
+
+2003-09-10 17:11  Guillaume Cottenceau
+
+	* Makefile, mandrake_desk.spec, backgrounds/xfdrake-test-card.jpg,
+	  backgrounds/xfdrake-test-card.png: xfdrake-test-card needs to be
+	  in .png format since we don't have have the jpeg pixbug loader
+	  during install
+
+2003-09-10 17:09  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Update
+
+2003-09-06 15:29  Arkadiusz Lipiec <alipiec at elka.pw.edu.pl>
+
+	* README: TYPO fix
+
+2003-09-05 17:53  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Update
+
+2003-09-01 16:40  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Remove Record sound entry
+
+2003-08-28 22:33  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Update
+
+2003-08-28 19:23  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Update
+
+2003-08-28 17:54  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Update
+
+2003-08-28 11:54  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Update
+
+2003-08-27 19:15  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Fix kmix entry
+
+2003-08-27 18:49  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Fix bad end of lines
+
+2003-08-27 18:23  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Begin to update
+
+2003-08-27 17:15  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, sbin/fndSession: Fix bug 4572 (bad path for
+	  gdm session in fndSession)
+
+2003-08-26 18:21  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2003-08-26 18:13  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec: Release 9.2-3mdk
+
+2003-08-26 18:09  Frederic Crozat <fcrozat at mandriva.com>
+
+	* sbin/chksession: Add default session for GDM
+
+2003-08-26 17:46  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/chksession: Corrections by Bernard Lang
+
+2003-08-22 15:02  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2003-08-22 14:04  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: default-9.1.png, default-root-9.1.png,
+	  discovery-1280x1024.png, discovery-root-1280x1024.png,
+	  discovery-root.png, discovery.png, download-1280x1024.png,
+	  download-root-1280x1024.png, download-root.png, download.png,
+	  pwp-ps-1280x1024.png, pwp-ps-root-1280x1024.png, pwp-ps-root.png,
+	  pwp-ps.png: New images for 9.2
+
+2003-08-22 09:25  Frederic Lepied <flepied at mandriva.com>
+
+	* man/C/chksession.8: corrections by Bernard Lang
+
+2003-07-30 17:31  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Fix %post (thanks to Pixel)
+
+2003-06-13 18:52  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, sbin/chksession: gdm session format has
+	  changed, fix chksession
+
+2003-06-04 12:09  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Add version in %changelog
+
+2003-06-04 12:08  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Create a link to allow users to access to
+	  Mandrake's backgrounds from KDE
+
+2003-05-08 11:42  Pablo Saratxaga <pablo at mandriva.com>
+
+	* man/uk/chksession.8: Added Ukrainian file
+
+2003-03-14 12:37  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2003-03-14 12:36  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Update for 9.1
+
+2003-03-12 15:43  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2003-02-14 11:43  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, backgrounds/default-root.png,
+	  backgrounds/default.png: New default bacground for MDK 9.1
+
+2003-01-31 13:07  Pablo Saratxaga <pablo at mandriva.com>
+
+	* man/et/chksession.8: Added Estonian man page
+
+2002-09-06 15:16  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec Add mandrake-club icon
+
+2002-09-02 13:36  Laurent Montel <lmontel at mandriva.com>
+
+	* mandrake_desk.spec: Update spec file
+
+2002-09-02 13:25  Laurent Montel <lmontel at mandriva.com>
+
+	* menu/mandrake_desk: Fix drakconf menu entry
+
+2002-08-29 18:24  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-29 18:22  David Baudens <baudens at mandriva.com>
+
+	* faces/: ic-tux1.png, ic-tux2.png, ic-tux3.png, ic-tux4.png,
+	  ic-tux5.png, ic-tuxgeneric.png: New tux family
+
+2002-08-29 18:21  David Baudens <baudens at mandriva.com>
+
+	* faces/: ic-util-tux1.png, ic-util-tux2.png, ic-util-tux2bis.png,
+	  ic-util-tux3.png, ic-util-tux4.png, ic-util-tuxgeneric.png:
+	  Remove
+
+2002-08-29 17:38  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-29 11:58  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-29 11:58  David Baudens <baudens at mandriva.com>
+
+	* faces/: ic-util-tux1.png, ic-util-tux2.png, ic-util-tux2bis.png,
+	  ic-util-tux3.png, ic-util-tux4.png, ic-util-tuxgeneric.png: Tux
+	  family is back
+
+2002-08-27 15:32  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-27 15:29  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-26 17:29  Pablo Saratxaga <pablo at mandriva.com>
+
+	* man/: cs/chksession.8, ru/chksession.8: Added Czech and Russian
+	  man pages
+
+2002-08-23 16:49  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-23 16:13  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, backgrounds/xfdrake-test-card.jpg: Update
+
+2002-08-22 17:16  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-22 17:12  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/xfdrake-test-card.jpg: Update for 9.0
+
+2002-08-22 11:10  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-02 14:03  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-01 17:57  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-08-01 12:12  Arkadiusz Lipiec <alipiec at elka.pw.edu.pl>
+
+	* TRANSLATORS: polish translator added
+
+2002-07-31 18:06  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-07-31 17:54  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-07-31 17:50  David Baudens <baudens at mandriva.com>
+
+	* kde/kdm-mdk-logo.png: Add kdm logo
+
+2002-07-31 17:16  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-07-31 17:12  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: flower.jpg, nature.jpg: Add new backgrounds
+
+2002-07-31 16:46  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-07-31 16:02  David Baudens <baudens at mandriva.com>
+
+	* xml-i18n-extract.in, xml-i18n-merge.in, xml-i18n-update.in:
+	  Remove old xml-i18n stuff
+
+2002-07-31 15:58  David Baudens <baudens at mandriva.com>
+
+	* Makefile, mandrake_desk.spec: Update
+
+2002-07-31 15:20  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update
+
+2002-07-31 15:13  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, bin/DrakWM, bin/createbackground.sh: Update
+
+2002-07-31 14:55  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: XFdrake-test-card.jpg, xfdrake-test-card.jpg: Fix
+	  typo
+
+2002-07-31 14:53  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: XFdrake-image-test.jpg, XFdrake-test-card.jpg:
+	  Rename xfdrake test card
+
+2002-07-31 14:49  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/default-root.png: Add default background for root
+
+2002-07-31 14:42  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/default.png: New default background
+
+2002-07-31 14:41  David Baudens <baudens at mandriva.com>
+
+	* README.CVS, mandrake_desk.spec: Update
+
+2002-07-31 13:19  David Baudens <baudens at mandriva.com>
+
+	* gtkrc, krootwarning/AUTHORS, krootwarning/COPYING,
+	  krootwarning/INSTALL, krootwarning/Makefile.am,
+	  krootwarning/Makefile.dist, krootwarning/README,
+	  krootwarning/TODO, krootwarning/configure.files,
+	  krootwarning/configure.in, krootwarning/configure.in.in,
+	  krootwarning/krootwarning.kdevprj,
+	  krootwarning/krootwarning.kdevses, krootwarning/krootwarning.lsm,
+	  krootwarning/messages.log, krootwarning/subdirs: Remove
+	  krootwarning & krozat stuff. Moved in their own modules
+
+2002-07-31 11:14  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: ICE-1024.png, ICE-1280.png, ICE-1600.png,
+	  ICE-640.png, ICE-800.png: Remove old badgrouds
+
+2002-07-31 11:03  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: -Fix GNOME entry for Crux
+	  theme applet - Fix menu entries for simplified menu
+
+2002-07-30 10:01  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2002-07-30 09:59  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Upload Laurent Montel's spec file
+
+2002-07-30 09:52  David Baudens <baudens at mandriva.com>
+
+	* faces/default.png: New defalt user image
+
+2002-07-23 14:52  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2002-07-18 17:56  David Baudens <baudens at mandriva.com>
+
+	* faces/: default.png, ic-bird.png, ic-bird2.png, ic-cat.png,
+	  ic-dog.png, ic-fish.png, ic-flower1.png, ic-flower2.png,
+	  ic-flower3.png, ic-flower4.png, ic-flower5.png, ic-nature1.png,
+	  ic-nature2.png, ic-nature3.png, ic-nature4.png, ic-nature5.png:
+	  Add new users images for 9.0 beta 1
+
+2002-07-18 17:52  David Baudens <baudens at mandriva.com>
+
+	* faces/: aman.png, cinderella.png, dog.png, donuts.png, fish.png,
+	  moon.png, mouse.png, mouse2.png, roller.png, sun.png, woman.png:
+	  Remove old users icons
+
+2002-06-28 11:28  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/mandrake_desk: Png icons
+
+2002-06-28 10:33  Frederic Crozat <fcrozat at mandriva.com>
+
+	* menu/mandrake_desk: GNOME 2 adaption (by Goetz Waschk)
+
+2002-03-15 15:10  Frederic Crozat <fcrozat at mandriva.com>
+
+	* gtkrc, mandrake_desk.spec: Fix default gtk theme
+
+2002-03-07 15:50  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, faces/root: fix root icons (remove it)
+
+2002-03-07 15:32  David Baudens <baudens at mandriva.com>
+
+	* faces/: aman.png, woman.png: Add new faces
+
+2002-03-07 15:21  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec: Release 8.2-12mdk
+
+2002-03-05 19:38  David Baudens <baudens at mandriva.com>
+
+	* faces/: aman.png, avn-rat.png, cinderella.png, dadou-fish.png,
+	  dear-chief-moon.png, dog.png, donuts.png, fish.png,
+	  gwegwe-rat.png, lmonspread-dog.png, ln-cendrillon.png, moon.png,
+	  mouse.png, mouse2.png, renaud-sun.png, roller.png, sun.png,
+	  vince-donut.png, warly-roller.png, woman.png: [no log message]
+
+2002-03-05 19:23  David Baudens <baudens at mandriva.com>
+
+	* faces/aman.png: Remove obsoletes faces
+
+2002-03-05 18:42  David Baudens <baudens at mandriva.com>
+
+	* faces/: user-curly-mdk.png, user-girl-mdk.png, user-hat-mdk.png,
+	  utildame.png, utilmons.png: Remove old faces
+
+2002-03-05 18:35  David Baudens <baudens at mandriva.com>
+
+	* faces/: tux.png, tuxbaby.png, tuxbox.png, tuxcoocker.png,
+	  tuxdad.png, tuxgirl.png, tuxhead1.png, tuxhead2.png, tuxmam.png,
+	  tuxmecano.png: Remove obsolete faces
+
+2002-03-01 16:35  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: [no log message]
+
+2002-02-28 04:19  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: [no log message]
+
+2002-02-26 16:28  Frederic Crozat <fcrozat at mandriva.com>
+
+	* gtkrc, mandrake_desk.spec: Fix default GTK theme
+
+2002-02-26 14:43  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec: Change Mandrake Control Center to Control
+	  Center in GNOME
+
+2002-02-26 03:20  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: [no log message]
+
+2002-02-26 03:05  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: [no log message]
+
+2002-02-26 02:54  David Baudens <baudens at mandriva.com>
+
+	* Makefile: Install png icons instead xpm in
+	  /usr/share/pixmaps/mdk/
+
+2002-02-26 02:49  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: [no log message]
+
+2002-02-25 17:09  Frederic Crozat <fcrozat at mandriva.com>
+
+	* gtkrc, mandrake_desk.spec: Fix default mdk theme with evolution
+
+2002-02-22 21:13  Pablo Saratxaga <pablo at mandriva.com>
+
+	* man/eu/chksession.8: Added Basque file
+
+2002-02-20 19:20  Frederic Crozat <fcrozat at mandriva.com>
+
+	* Makefile: Fix tagging
+
+2002-02-20 19:12  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec: Really fix mdk-eazel-engine-capplet location
+
+2002-02-20 19:06  Frederic Crozat <fcrozat at mandriva.com>
+
+	* Makefile, mandrake_desk.spec: Fix location of mdk-eazel-engine
+	  capplet
+
+2002-02-20 14:36  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec: Fix build
+
+2002-02-20 14:31  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Fix english strings and
+	  makefile
+
+2002-02-18 22:51  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Fix and update spec
+
+2002-02-18 05:26  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Various fix for simplified menu (fix typos,
+	  icons, remove duplicate entries with kdebase, etc.)
+
+2002-02-18 05:12  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Fix icon for howto (simplified menu)
+
+2002-02-12 18:16  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Fix simplified menu
+
+2002-01-29 16:14  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, menu/mandrake_desk: Add menu entry for Mdk
+	  Eazel engine Fix menu entry for Simplified menu
+
+2002-01-28 17:38  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec: Fix icons for GNOME Desktop
+
+2002-01-28 14:00  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec: Release 8.2-3mdk
+
+2002-01-28 13:59  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec: Release 8.2-2mdk
+
+2002-01-26 21:50  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: - Fix some menu entries - Use new default png
+	  icons when it is needed
+
+2002-01-14 11:37  Chmouel Boudjnah
+
+	* sbin/chksession: Remove space in name.
+
+2002-01-11 18:03  Frederic Crozat <fcrozat at mandriva.com>
+
+	* Makefile, mandrake_desk.spec, man/C/chksession.8,
+	  menu/mandrake_desk: Resync with package Remove generated files
+	  Fix screensaver images
+
+2001-10-02 10:32  Stefan Siegel <siegel at linux-mandrake.com>
+
+	* README.CVS: fixed URL
+
+2001-10-02 10:29  Stefan Siegel <siegel at linux-mandrake.com>
+
+	* man/: C/chksession.8, fr/chksession.8: fixed link for bug reports
+
+2001-09-20 12:08  David Baudens <baudens at mandriva.com>
+
+	* menu/mandrake_desk: Add support for simplified menu
+
+2001-09-20 10:02  Frederic Crozat <fcrozat at mandriva.com>
+
+	* .cvsignore, krootwarning/.cvsignore: Clean cvs
+
+2001-09-19 20:34  Frederic Crozat <fcrozat at mandriva.com>
+
+	* mandrake_desk.spec, krootwarning/Makefile.in,
+	  krootwarning/acinclude.m4, krootwarning/aclocal.m4,
+	  krootwarning/config.h.in, krootwarning/configure,
+	  krootwarning/stamp-h.in: Remove generated files, fix package
+	  generation add mdk-eazel-engine-capplet package
+
+2001-09-19 13:25  David Baudens <baudens at mandriva.com>
+
+	* faces/: aman.png, avn-rat.png, dadou-fish.png,
+	  dear-chief-moon.png, gwegwe-rat.png, lmonspread-dog.png,
+	  ln-cendrillon.png, renaud-sun.png, vince-donut.png,
+	  warly-roller.png, woman.png: Fix icons to allow clean display on
+	  a white background
+
+2001-09-19 11:16  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec file
+
+2001-09-18 18:08  David Baudens <baudens at mandriva.com>
+
+	* faces/: tuxegg.png, user-brunette-mdk.png, user-default-mdk.png,
+	  user-tie-mdk.png, user-woman-blond-mdk.png: Remove some old faces
+	  (LN)
+
+2001-09-18 16:36  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2001-09-18 16:35  David Baudens <baudens at mandriva.com>
+
+	* faces/: aman.png, man.png: mv man.png aman.png to display it by
+	  default in DrakX
+
+2001-09-17 15:27  Laurent Montel <lmontel at mandriva.com>
+
+	* krootwarning/Makefile.am: Fix makefile error
+
+2001-09-14 13:55  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Add gnome-mandrakestore.xpm and updaet
+	  gnome-mandrakecampus.xpm and gnome-mandrakeexpert.xpm
+
+2001-09-13 19:32  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2001-09-13 17:04  David Baudens <baudens at mandriva.com>
+
+	* Makefile: Update Makefile
+
+2001-09-13 16:00  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2001-09-13 15:52  David Baudens <baudens at mandriva.com>
+
+	* Makefile, mandrake_desk.spec: [no log message]
+
+2001-09-12 17:42  David Baudens <baudens at mandriva.com>
+
+	* faces/: tux.xpm, tuxbaby.xpm, tuxbox.xpm, tuxcoocker.xpm,
+	  tuxdad.xpm, tuxegg.xpm, tuxgirl.xpm, tuxhead1.xpm, tuxhead2.xpm,
+	  tuxmam.xpm, tuxmecano.xpm, user-brunette-mdk.xpm,
+	  user-curly-mdk.xpm, user-default-mdk.xpm, user-girl-mdk.xpm,
+	  user-hat-mdk.xpm, user-tie-mdk.xpm, user-woman-blond-mdk.xpm,
+	  utildame.xpm, utilmons.xpm: Remove xpm faces
+
+2001-09-12 17:31  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: DKP1-1024.png, DKP1-1280.png, DKP1-1600.png,
+	  DKP1-640.png, DKP1-800.png, DKP2-1024.png, DKP2-1280.png,
+	  DKP2-640.png, DKP2-800.png, DKP3-1024.png, DKP3-1280.png,
+	  DKP3-1600.png, DKP3-640.png, DKP3-800.png, DKP4-1024.png,
+	  DKP4-1280.png, DKP4-1600.png, DKP4-640.png, DKP4-800.png,
+	  PP1-1024.png, PP1-1280.png, PP1-1600.png, PP1-640.png,
+	  PP1-800.png, PP2-1024.png, PP2-1280.png, PP2-1600.png,
+	  PP2-640.png, PP2-800.png, PP3-1024.png, PP3-1280.png,
+	  PP3-1600.png, PP3-640.png, PP3-800.png, PP4-1024.png,
+	  PP4-1280.png, PP4-1600.png, PP4-640.png, PP4-800.png,
+	  default_background.jpg, logoMDK1-1024.png, logoMDK1-1280.png,
+	  logoMDK1-1600.png, logoMDK1-800.png,
+	  mandrake_background1_1024.jpg, mandrake_background2_1024.jpg,
+	  mandrake_background3_1024.jpg, mandrake_background4_1024.jpg,
+	  mandrake_background_blue_1024.jpg, nature-1024.png,
+	  nature-1280.png, nature-1600.png, nature-640.png, nature-800.png:
+	  Remove old backgrounds
+
+2001-09-04 17:43  David Baudens <baudens at mandriva.com>
+
+	* Makefile: Update Makefile, remove login/loging100.png and
+	  krozat/config.cache
+
+2001-09-04 17:35  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2001-09-04 17:18  David Baudens <baudens at mandriva.com>
+
+	* default_background.jpg, default_logo.jpg, mandrake-small.xpm:
+	  Remove some old images
+
+2001-09-04 16:58  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2001-09-03 03:10  Pablo Saratxaga <pablo at mandriva.com>
+
+	* mandrake_desk.spec: added French man page to the spec file
+
+2001-09-03 03:02  Pablo Saratxaga <pablo at mandriva.com>
+
+	* Makefile, man/chksession.8, man/C/chksession.8,
+	  man/fr/chksession.8: Added French man page, moved English page to
+	  its own directory
+
+2001-09-01 16:01  Laurent Montel <lmontel at mandriva.com>
+
+	* krootwarning/Makefile.in: Autostart
+
+2001-08-27 14:06  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2001-08-27 12:51  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2001-08-27 12:40  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec
+
+2001-08-24 19:11  David Baudens <baudens at mandriva.com>
+
+	* faces/: avn-rat.png, dadou-fish.png, dear-chief-moon.png,
+	  gwegwe-rat.png, lmonspread-dog.png, ln-cendrillon.png, man.png,
+	  renaud-sun.png, vince-donut.png, warly-roller.png, woman.png: Add
+	  some MandrakeSoft employees :o)
+
+2001-08-24 18:39  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update spec file
+
+2001-08-13 15:20  Chmouel Boudjnah
+
+	* sbin/fndSession: Fix path of kdmrc.
+
+2001-08-08 15:49  David Baudens <baudens at mandriva.com>
+
+	* krootwarning/: Makefile.dist, TODO, AUTHORS, COPYING, INSTALL,
+	  Makefile.am, Makefile.in, README, acinclude.m4, aclocal.m4,
+	  config.h.in, configure, configure.files, configure.in,
+	  configure.in.in, krootwarning.kdevprj, krootwarning.kdevses,
+	  krootwarning.lsm, messages.log, stamp-h.in, subdirs: v 0.1
+
+2001-08-08 15:19  David Baudens <baudens at mandriva.com>
+
+	* krootwarning/: AUTHORS, COPYING, INSTALL, Makefile.am,
+	  Makefile.dist, Makefile.in, README, TODO, acinclude.m4,
+	  aclocal.m4, config.h.in, configure, configure.files,
+	  configure.in, configure.in.in, krootwarning.kdevprj,
+	  krootwarning.kdevses, krootwarning.lsm, messages.log, stamp-h.in,
+	  subdirs: Add krootwarning (KDE)
+
+2001-08-07 19:17  vincent
+
+	* mandrake_desk.spec: - Move face in /usr/share/mdk/faces
+
+2001-07-31 15:29  Chmouel Boudjnah
+
+	* sbin/chksession: Ignore backup files. Cleanup codes.
+
+2001-07-31 09:21  Frederic Lepied <flepied at mandriva.com>
+
+	* Makefile: no need to run autoconf!
+
+2001-07-31 09:19  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec: 8.1-1mdk
+
+2001-07-31 09:17  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/chksession: put back my change to the Xsession path that was
+	  reverted by the resync.
+
+2001-07-31 09:16  Frederic Lepied <flepied at mandriva.com>
+
+	* Makefile: added rules to build test and distrib rpm.
+
+2001-07-31 09:15  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake-small.xpm: resync with 8.0-12mdk
+
+2001-07-31 08:00  Frederic Lepied <flepied at mandriva.com>
+
+	* gtkrc: resync with 8.0-12mdk
+
+2001-07-31 07:52  Frederic Lepied <flepied at mandriva.com>
+
+	* Makefile, TRANSLATORS, mandrake_desk.spec,
+	  backgrounds/DKP1-1024.png, backgrounds/DKP1-1280.png,
+	  backgrounds/DKP1-1600.png, backgrounds/DKP1-640.png,
+	  backgrounds/DKP1-800.png, backgrounds/DKP2-1024.png,
+	  backgrounds/DKP2-1280.png, backgrounds/DKP2-640.png,
+	  backgrounds/DKP2-800.png, backgrounds/DKP3-1024.png,
+	  backgrounds/DKP3-1280.png, backgrounds/DKP3-1600.png,
+	  backgrounds/DKP3-640.png, backgrounds/DKP3-800.png,
+	  backgrounds/DKP4-1024.png, backgrounds/DKP4-1280.png,
+	  backgrounds/DKP4-1600.png, backgrounds/DKP4-640.png,
+	  backgrounds/DKP4-800.png, backgrounds/ICE-1024.png,
+	  backgrounds/ICE-1280.png, backgrounds/ICE-1600.png,
+	  backgrounds/ICE-640.png, backgrounds/ICE-800.png,
+	  backgrounds/PP1-1024.png, backgrounds/PP1-1280.png,
+	  backgrounds/PP1-1600.png, backgrounds/PP1-640.png,
+	  backgrounds/PP1-800.png, backgrounds/PP2-1024.png,
+	  backgrounds/PP2-1280.png, backgrounds/PP2-1600.png,
+	  backgrounds/PP2-640.png, backgrounds/PP2-800.png,
+	  backgrounds/PP3-1024.png, backgrounds/PP3-1280.png,
+	  backgrounds/PP3-1600.png, backgrounds/PP3-640.png,
+	  backgrounds/PP3-800.png, backgrounds/PP4-1024.png,
+	  backgrounds/PP4-1280.png, backgrounds/PP4-1600.png,
+	  backgrounds/PP4-640.png, backgrounds/PP4-800.png,
+	  backgrounds/XFdrake-image-test.jpg,
+	  backgrounds/logoMDK1-1024.png, backgrounds/logoMDK1-1280.png,
+	  backgrounds/logoMDK1-1600.png, backgrounds/logoMDK1-800.png,
+	  backgrounds/nature-1024.png, backgrounds/nature-1280.png,
+	  backgrounds/nature-1600.png, backgrounds/nature-640.png,
+	  backgrounds/nature-800.png, bin/DrakWM, bin/createbackground.sh,
+	  bin/print-cups.sh, sbin/chksession: resync with 8.0-12mdk
+
+2001-07-26 11:35  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/chksession: use /etc/X11/xdm/Xsession instead of
+	  /etc/X11/Xsession for gdm sessions.
+
+2001-05-06 19:20  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Updated Chinese file
+
+2001-04-12 06:41  Daouda Lo <daouda at mandriva.com>
+
+	* mandrake_desk.spec: cleanups
+
+2001-04-12 06:26  Daouda Lo <daouda at mandriva.com>
+
+	* Makefile: remove kdelnk dir
+
+2001-04-12 06:25  Daouda Lo <daouda at mandriva.com>
+
+	* mandrake_desk.spec: macros bis
+
+2001-04-12 06:23  Daouda Lo <daouda at mandriva.com>
+
+	* mandrake_desk.spec: macros to ease rpm build from cvs
+
+2001-04-12 06:16  Daouda Lo <daouda at mandriva.com>
+
+	* Makefile: fix typo in var RPM
+
+2001-04-12 06:15  Daouda Lo <daouda at mandriva.com>
+
+	* mandrake_desk.spec: add define tags
+
+2001-04-12 06:14  Daouda Lo <daouda at mandriva.com>
+
+	* Makefile: define RPM var
+
+2001-04-12 06:11  Daouda Lo <daouda at mandriva.com>
+
+	* Makefile: commented kdelnk related stuffs
+
+2001-04-12 06:08  Daouda Lo <daouda at mandriva.com>
+
+	* Makefile: add eazel themes + gtkrc for rpm build
+
+2001-04-12 06:08  Daouda Lo <daouda at mandriva.com>
+
+	* gtkrc: new gtkrc  :resync with spec
+
+2001-04-12 06:06  Daouda Lo <daouda at mandriva.com>
+
+	* mandrake_desk.spec: commit
+
+2001-04-12 02:57  David Baudens <baudens at mandriva.com>
+
+	* faces/: root, tux.png, tux.xpm, tuxbaby.png, tuxbaby.xpm,
+	  tuxbox.png, tuxbox.xpm, tuxcoocker.png, tuxcoocker.xpm,
+	  tuxdad.png, tuxdad.xpm, tuxegg.png, tuxegg.xpm, tuxgirl.png,
+	  tuxgirl.xpm, tuxhead1.png, tuxhead1.xpm, tuxhead2.png,
+	  tuxhead2.xpm, tuxmam.png, tuxmam.xpm, tuxmecano.png,
+	  tuxmecano.xpm, user-brunette-mdk.png, user-brunette-mdk.xpm,
+	  user-curly-mdk.png, user-curly-mdk.xpm, user-default-mdk.png,
+	  user-default-mdk.xpm, user-girl-mdk.png, user-girl-mdk.xpm,
+	  user-hat-mdk.png, user-hat-mdk.xpm, user-tie-mdk.png,
+	  user-tie-mdk.xpm, user-woman-blond-mdk.png,
+	  user-woman-blond-mdk.xpm, utildame.png, utildame.xpm,
+	  utilmons.png, utilmons.xpm: [no log message]
+
+2001-04-12 02:52  David Baudens <baudens at mandriva.com>
+
+	* faces/: user-brunette-mdk.png, user-curly-mdk.png,
+	  user-default-mdk.png, user-girl-mdk.png, user-hat-mdk.png,
+	  user-tie-mdk.png, user-woman-blond-mdk.png: [no log message]
+
+2001-04-12 00:53  Daouda Lo <daouda at mandriva.com>
+
+	* mandrake_desk.spec: resync specs with cvs
+
+2001-03-29 10:14  Pablo Saratxaga <pablo at mandriva.com>
+
+	* Makefile, README, TRANSLATORS, xml-i18n-extract.in,
+	  xml-i18n-merge.in, xml-i18n-update.in: Now uses xml-i18n-tools to
+	  handle i18n
+
+2001-03-24 13:29  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Updated Korean strings
+
+2001-03-17 17:09  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: updated the Portuguese strings
+
+2001-03-02 20:45  Chmouel Boudjnah
+
+	* bin/DrakWM: Call xvt.
+
+2001-01-07 07:23  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: updated Basque strings
+
+2000-11-17 14:31  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Georgian strings
+
+2000-10-16 02:01  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: updated Brazilian strings
+
+2000-09-13 21:19  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: corrected email address
+
+2000-09-13 12:55  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Azeri strings
+
+2000-09-05 22:48  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: updated Polish strings
+
+2000-08-31 22:39  David Baudens <baudens at mandriva.com>
+
+	* kde/.kderc: [no log message]
+
+2000-08-31 19:20  David Baudens <baudens at mandriva.com>
+
+	* kde/.kderc: [no log message]
+
+2000-08-31 12:31  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Re add a BuildRoot :(
+
+2000-08-31 12:25  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update mandrake_desk.spec
+
+2000-08-31 03:51  Chmouel Boudjnah
+
+	* sbin/chksession: Avoid opendir use csh internal globing...
+
+2000-08-24 11:51  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update Spec
+
+2000-08-24 11:16  David Baudens <baudens at mandriva.com>
+
+	* Makefile: Update Makefile (for .desktop)
+
+2000-08-24 11:10  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update Spec
+
+2000-08-24 11:04  David Baudens <baudens at mandriva.com>
+
+	* faces/: default.png, root, root.png: [no log message]
+
+2000-08-24 10:11  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update Spec and Makefile
+
+2000-08-24 10:08  David Baudens <baudens at mandriva.com>
+
+	* faces/root: Add a "root" link to make GDM happy
+
+2000-08-23 19:30  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update Makefile and spec file
+
+2000-08-23 19:28  David Baudens <baudens at mandriva.com>
+
+	* faces/: default.png, root.png: Add link default.png and root.png
+	  to make KDM happy
+
+2000-08-23 10:44  David Baudens <baudens at mandriva.com>
+
+	* faces/: user-brunette-mdk.xpm, user-curly-mdk.xpm,
+	  user-default-mdk.xpm, user-girl-mdk.xpm, user-hat-mdk.xpm,
+	  user-tie-mdk.xpm, user-woman-blond-mdk.xpm: Removed unneeded
+	  files
+
+2000-08-23 10:40  David Baudens <baudens at mandriva.com>
+
+	* faces/: user-brunette-mdk.png, user-curly-mdk.png,
+	  user-default-mdk.png, user-girl-mdk.png, user-hat-mdk.png,
+	  user-tie-mdk.png, user-woman-blond-mdk.png: Convert faces/*.xpm
+	  to faces/*.png
+
+2000-08-23 10:39  David Baudens <baudens at mandriva.com>
+
+	* Makefile, README.CVS, TRANSLATORS, default_background.jpg,
+	  default_logo.jpg, mandrake_desk.spec: [no log message]
+
+2000-08-22 19:10  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Re fix spec
+
+2000-08-22 19:06  David Baudens <baudens at mandriva.com>
+
+	* Makefile, mandrake_desk.spec: Fix Makefile and spec
+
+2000-08-22 18:51  David Baudens <baudens at mandriva.com>
+
+	* faces/: user-brunette-mdk.xpm, user-curly-mdk.xpm,
+	  user-default-mdk.xpm, user-girl-mdk.xpm, user-hat-mdk.xpm,
+	  user-tie-mdk.xpm, user-woman-blond-mdk.xpm: Move users icons in
+	  /usr/share/faces
+
+2000-08-22 18:46  David Baudens <baudens at mandriva.com>
+
+	* Makefile, README.CVS, TRANSLATORS, default_background.jpg,
+	  default_logo.jpg, mandrake_desk.spec: [no log message]
+
+2000-08-22 18:41  David Baudens <baudens at mandriva.com>
+
+	* Makefile, mandrake_desk.spec: [no log message]
+
+2000-08-19 11:28  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Belarussian strings
+
+2000-08-12 11:47  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: fixed an email address
+
+2000-07-22 21:28  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec: BM.
+
+2000-07-18 23:31  Chmouel Boudjnah
+
+	* mandrake_desk.spec, sbin/chksession: * sbin/chksession: Set
+	  support for KDE2 by default when generating session.
+
+2000-07-18 11:42  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec: window-managers no longer needed.
+
+2000-07-18 11:41  Chmouel Boudjnah
+
+	* window-managers: window-managers is no longer needed.
+
+2000-07-18 11:39  Chmouel Boudjnah
+
+	* mandrake_desk.spec, bin/DrakWM: * bin/DrakWM: Add -i options to
+	  launch with xinit.  add -a option to provide alias for bash.
+
+2000-07-17 13:20  Dam's
+
+	* mandrake_desk.spec: new release
+
+2000-07-16 14:11  Dam's
+
+	* window-managers: sawmill -> sawfish
+
+2000-07-11 23:43  Chmouel Boudjnah
+
+	* sbin/convertsession: A new greatest hit.
+
+2000-07-11 23:43  Chmouel Boudjnah
+
+	* mandrake_desk.spec, sbin/chksession: 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-06-26 16:00  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: added Arabic strings
+
+2000-06-07 18:37  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Korean strings
+
+2000-05-29 13:23  Dam's
+
+	* mandrake_desk.spec: see changelog
+
+2000-05-27 21:42  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Updated Serbian strings
+
+2000-05-19 01:43  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Afrikaans strings
+
+2000-05-12 16:16  Frederic Lepied <flepied at mandriva.com>
+
+	* sbin/chksession:	* use /etc/X11/Xsession for gnome sessions.
+
+2000-05-12 16:16  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec:	* 1.0.3-21mdk
+
+2000-05-12 11:21  Dam's
+
+	* mandrake_desk.spec: new mdk rel ; added gnome desktop entries
+
+2000-05-09 23:33  Dam's
+
+	* mandrake_desk.spec: mdk release
+
+2000-05-09 19:58  Dam's
+
+	* mandrake_desk.spec: new release
+
+2000-05-09 19:53  Pixel <pixel at mandriva.com>
+
+	* sbin/kdeDesktopCleanup: [no log message]
+
+2000-05-09 19:38  Dam's
+
+	* mandrake_desk.spec: no more netscape.desktop
+
+2000-05-09 19:38  Dam's
+
+	* Makefile: removed netscape.desktop copy
+
+2000-05-09 17:00  Dam's
+
+	* mandrake_desk.spec: removed gnome desktop icons...
+
+2000-05-09 10:15  Dam's
+
+	* mandrake_desk.spec: see changelog. new release, cosmetic fix.
+
+2000-05-06 22:55  Chmouel Boudjnah
+
+	* mandrake_desk.spec, sbin/chksession:	* sbin/chksession: if icewm
+	  is not here by default launch twm.
+
+2000-05-05 12:21  Pixel <pixel at mandriva.com>
+
+	* mandrake_desk.spec, sbin/kdeDesktopCleanup: no_comment
+
+2000-05-04 16:09  Dam's
+
+	* mandrake_desk.spec:
+		  mandrake_desk.spec gnome/mandrake.links :cleaned gnome
+	  desktop
+
+2000-04-30 17:28  Dam's
+
+	* mandrake_desk.spec:
+		  mandrake_desk.spec :bad date
+
+2000-04-30 17:16  Dam's
+
+	* mandrake_desk.spec:
+		  mandrake_desk.spec :bad release
+
+2000-04-30 17:15  Dam's
+
+	* mandrake_desk.spec:
+		  ChangeLog mandrake_desk.spec :see Changelog
+
+2000-04-29 19:26  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Updated Britton, Esperanto and Estonian strings
+
+2000-04-28 16:40  Stefan Siegel <siegel at linux-mandrake.com>
+
+	* TRANSLATORS: - add cdwriter_supermount.xpm - correct TRANSLATOR
+	  address - use kdecolors in icons
+
+2000-04-28 14:40  Dam's
+
+	* mandrake_desk.spec:
+		  ChangeLog mandrake_desk.spec :corrected xfce entry in
+	  windowmanagers.
+
+2000-04-28 12:15  Dam's
+
+	* mandrake_desk.spec, window-managers:
+		  ChangeLog mandrake_desk.spec window-managers : recovering
+	  old files
+
+2000-04-28 10:27  Dam's
+
+	* mandrake_desk.spec:
+		  mandrake_desk.spec :fixed bad date
+
+2000-04-28 10:15  Dam's
+
+	* mandrake_desk.spec, window-managers:
+		  ChangeLog mandrake_desk.spec window-managers :corrected
+	  xfce entry
+
+2000-04-27 15:57  Dam's
+
+	* mandrake_desk.spec:
+		  mandrake_desk.spec  : bad date
+
+2000-04-27 15:46  Dam's
+
+	* mandrake_desk.spec, window-managers:
+		  ChangeLog mandrake_desk.spec window-managers :corrected
+	  wmaker entry
+		  kdelnk/Updates.kdelnk :unfortunally removed, so re-added
+
+2000-04-21 17:55  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, window-managers: Upload (see ChangeLog)
+
+2000-04-21 05:58  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec: Update .spec
+
+2000-04-20 19:15  Fançois Pons
+
+	* mandrake_desk.spec, window-managers: [no log message]
+
+2000-04-20 16:48  Fançois Pons
+
+	* mandrake_desk.spec, window-managers: [no log message]
+
+2000-04-18 15:24  Dam's
+
+	* mandrake_desk.spec:
+		  mandrake_desk.spec :corrected bad version number
+
+2000-04-18 15:21  Dam's
+
+	* Makefile:
+		  Makefile :updated for new mdk relese
+
+2000-04-18 15:18  Dam's
+
+	* mandrake_desk.spec:
+		  ChangeLog mandrake_desk.spec : new mdk release
+
+2000-04-18 14:26  Dam's
+
+	* window-managers:
+		  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 11:20  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Welsh strings
+
+2000-04-17 15:22  Dam's
+
+	* mandrake_desk.spec:
+	  Modified Files:	  mandrake_desk.spec updated
+
+2000-04-17 04:56  Chmouel Boudjnah
+
+	* window-managers: Various fix.
+
+2000-04-17 00:49  Chmouel Boudjnah
+
+	* mandrake_desk.spec: Add /usr/bin
+
+2000-04-17 00:46  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec: DrakWM a new greatest hit.
+
+2000-04-17 00:45  Chmouel Boudjnah
+
+	* bin/DrakWM: Add file.
+
+2000-04-16 21:37  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Greek strings
+
+2000-04-16 15:12  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Finnsih strings
+
+2000-04-11 18:55  Dam's
+
+	* mandrake_desk.spec:
+	  Modified Files:	  mandrake_desk.spec added ref for
+	  /usr/share/icons/*.jpg
+
+2000-04-11 18:21  Dam's
+
+	* default_logo.jpg:
+	  Modified Files:	  default_logo.jpg final logo
+
+2000-04-11 17:46  Dam's
+
+	* default_background.jpg, default_logo.jpg:
+	  Added Files:	  default_background.jpg default_logo.jpg needed
+	  for new release of gdm/kdm
+
+2000-04-11 17:43  Dam's
+
+	* Makefile, mandrake_desk.spec:
+
+	  updated icons
+
+2000-04-09 01:42  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Swedish strings
+
+2000-04-07 03:46  Chmouel Boudjnah
+
+	* window-managers: "Seethechangelog"
+
+2000-04-05 23:49  Chmouel Boudjnah
+
+	* mandrake_desk.spec, Makefile: "Seethechangelog"
+
+2000-04-05 23:46  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec: "Seethechangelog"
+
+2000-04-05 23:41  Chmouel Boudjnah
+
+	* mandrake_desk.spec: "Seethechangelog"
+
+2000-04-05 23:38  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec, window-managers: "Seethechangelog"
+
+2000-04-04 15:57  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/default_background.jpg: Add default background
+
+2000-04-04 15:55  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: mandrake_background3_1024.jpg,
+	  mandrake_background4_1024.jpg: Add backgrounds
+
+2000-04-04 15:53  David Baudens <baudens at mandriva.com>
+
+	* backgrounds/: mandrake_background1_1024.jpg,
+	  mandrake_background2_1024.jpg, mandrake_background_1024-1.jpg,
+	  mandrake_background_1024-2.jpg, mandrake_background_1024-3.jpg,
+	  mandrake_background_1024.jpg, mandrake_background_800.jpg,
+	  mandrake_background_blue_1024.jpg: Add & remove backgrounds
+
+2000-03-26 20:00  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Slovenian strings
+
+2000-03-24 13:18  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: updated translators list
+
+2000-03-06 11:08  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: Added Chinese entries
+
+2000-02-02 05:51  Chmouel Boudjnah
+
+	* mandrake_desk.spec, window-managers: "See_The_Changelog"
+
+2000-01-27 15:50  Chmouel Boudjnah
+
+	* mandrake_desk.spec: "Seethechangelog"
+
+2000-01-27 15:44  Chmouel Boudjnah
+
+	* backgrounds/: mandrake_background_1024-1.jpg,
+	  mandrake_background_1024-2.jpg, mandrake_background_1024-3.jpg:
+	  "Seethechangelog"
+
+2000-01-20 11:18  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: updated Peter email address
+
+2000-01-10 00:20  Pixel <pixel at mandriva.com>
+
+	* mandrake_desk.spec: no_comment
+
+2000-01-07 10:59  Pixel <pixel at mandriva.com>
+
+	* mandrake_desk.spec, window-managers: no_comment
+
+2000-01-07 10:23  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec: [no log message]
+
+2000-01-07 10:20  Frederic Lepied <flepied at mandriva.com>
+
+	* mandrake_desk.spec:	* standard mandrake: none.
+
+2000-01-07 07:54  Pixel <pixel at mandriva.com>
+
+	* mandrake_desk.spec, sbin/chksession: no_comment
+
+2000-01-05 23:38  Pixel <pixel at mandriva.com>
+
+	* mandrake_desk.spec, sbin/kdeDesktopCleanup: no_comment
+
+2000-01-05 19:16  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: added Turkish entries
+
+2000-01-05 17:03  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: added Latvian entries
+
+2000-01-05 00:49  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec: "Seethechangelog"
+
+2000-01-04 13:24  David Baudens <baudens at mandriva.com>
+
+	* mandrake_desk.spec, window-managers: Use BBDrake & WMDrake for
+	  BlackBox & Window Maker
+
+2000-01-03 02:36  Chmouel Boudjnah
+
+	* mandrake_desk.spec, window-managers: "Seethechangelog"
+
+1999-12-31 03:28  Chmouel Boudjnah
+
+	* Makefile: "Seethechangelog"
+
+1999-12-28 23:45  Pablo Saratxaga <pablo at mandriva.com>
+
+	* mandrake_desk.spec: added the Gnome menu entries to the spec file
+
+1999-12-28 17:27  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec, sbin/chksession: "Seethechangelog"
+
+1999-12-28 16:12  Chmouel Boudjnah
+
+	* man/chksession.8: "Seethechangelog"
+
+1999-12-27 17:18  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec, sbin/chksession: "Seethechangelog"
+
+1999-12-27 12:57  Chmouel Boudjnah
+
+	* mandrake_desk.spec: "Seethechangelog"
+
+1999-12-27 12:53  Chmouel Boudjnah
+
+	* mandrake_desk.spec: "Seethechangelog"
+
+1999-12-27 12:21  Chmouel Boudjnah
+
+	* bin/linuxconf_kdesu: "Seethechangelog"
+
+1999-12-25 20:30  Pablo Saratxaga <pablo at mandriva.com>
+
+	* Makefile, mandrake_desk.spec: added menu entries for Gnome
+
+1999-12-25 20:13  Chmouel Boudjnah
+
+	* window-managers, mandrake_desk.spec: "Seethechangelog"
+
+1999-12-25 20:09  Chmouel Boudjnah
+
+	* mandrake_desk.spec: "Seethechangelog"
+
+1999-12-25 18:25  Chmouel Boudjnah
+
+	* window-managers, mandrake_desk.spec, sbin/kdeDesktopCleanup:
+	  "Seethechangelog"
+
+1999-12-24 13:00  Pixel <pixel at mandriva.com>
+
+	* mandrake_desk.spec: no_comment
+
+1999-12-23 23:34  Pablo Saratxaga <pablo at mandriva.com>
+
+	* mandrake_desk.spec: added Gnome desktop icons previously done in
+	  gmc package
+
+1999-12-23 01:38  Chmouel Boudjnah
+
+	* mandrake_desk.spec: "Seethechangelog"
+
+1999-12-23 00:59  Pablo Saratxaga <pablo at mandriva.com>
+
+	* TRANSLATORS: added Bulgarian entries
+
+1999-12-22 03:28  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec: "Seethechangelog"
+
+1999-12-22 03:21  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec, sbin/fndSession, sbin/chksession,
+	  window-managers: "Seethechangelog"
+
+1999-12-22 03:08  Chmouel Boudjnah
+
+	* bin/fndSession, sbin/Xsession: "Seethechangelog"
+
+1999-12-21 13:18  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec: "Seethechangelog"
+
+1999-12-21 02:00  David Baudens <baudens at mandriva.com>
+
+	* sbin/: Xsession, fndSession:
+	  Add some WM.	Sort in alphabetic order-
+
+1999-12-20 14:59  Pixel <pixel at mandriva.com>
+
+	* Makefile, mandrake_desk.spec: no_comment
+
+1999-12-19 19:55  Chmouel Boudjnah
+
+	* bin/fndSession: "Seethechangelog"
+
+1999-12-19 19:50  Chmouel Boudjnah
+
+	* Makefile, mandrake_desk.spec, README.CVS: "Seethechangelog"
+
+1999-12-19 19:09  Chmouel Boudjnah
+
+	* sbin/fndSession: "Seethechangelog"
+
+1999-12-19 19:05  Chmouel Boudjnah
+
+	* bin/fndSession, mandrake_desk.spec: "Seethechangelog"
+
+1999-12-19 19:02  Chmouel Boudjnah
+
+	* Makefile, TRANSLATORS, backgrounds/mandrake_background_1024.jpg,
+	  backgrounds/mandrake_background_800.jpg, bin/linuxconf_kdesu,
+	  sbin/kdeDesktopCleanup: Initial revision
+
+1999-12-19 19:02  Chmouel Boudjnah
+
+	* Makefile, TRANSLATORS, backgrounds/mandrake_background_1024.jpg,
+	  backgrounds/mandrake_background_800.jpg, bin/linuxconf_kdesu,
+	  sbin/kdeDesktopCleanup: first
+
diff --git a/trunk/Makefile b/trunk/Makefile
new file mode 100644
index 0000000..f9c048a
--- /dev/null
+++ b/trunk/Makefile
@@ -0,0 +1,50 @@
+PACKAGE = desktop-common-data
+NAME = desktop-common-data
+TAG := $(shell echo "V$(VERSION)_$(RELEASE)" | tr -- '-.' '__')
+mandir=/usr/share/man
+SVNROOT = svn+ssh://svn.mandriva.com/svn/soft/$(PACKAGE)
+
+checktag:
+	@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
+
+# rules to build a test rpm
+
+localdist: cleandist dir localcopy tar
+
+cleandist: checktag
+	rm -rf $(PACKAGE)-$(VERSION) $(PACKAGE)-$(VERSION).tar.bz2
+
+dir: checktag
+	mkdir $(PACKAGE)-$(VERSION)
+
+localcopy: checktag
+	find . -not -name "$(PACKAGE)-$(VERSION)"|cpio -pd $(PACKAGE)-$(VERSION)/
+	find $(PACKAGE)-$(VERSION) -type d -name CVS -o -name .cvsignore -name '*~' -o name '.svn' |xargs rm -rf
+
+tar: checktag
+	tar cvf $(PACKAGE)-$(VERSION).tar $(PACKAGE)-$(VERSION)
+	bzip2 -9vf $(PACKAGE)-$(VERSION).tar
+	rm -rf $(PACKAGE)-$(VERSION)
+
+# rules to build a distributable rpm
+
+dist: checktag cleandist svntag export tar
+
+
+export: checktag
+	svn export $(SVNROOT)/tags/$(TAG) $(PACKAGE)-$(VERSION)
+
+svntag: checktag 
+	svn copy $(SVNROOT)/trunk $(SVNROOT)/tags/$(TAG) -m "$(TAG)"
+
+changelog: ../common/username
+#svn2cl is available in our contrib.
+	svn2cl --authors ../common/username.xml --accum
+	rm -f ChangeLog.bak
+	svn commit -m "Generated by svn2cl the `date '+%c'`" ChangeLog
diff --git a/trunk/README b/trunk/README
new file mode 100644
index 0000000..0ffea4b
--- /dev/null
+++ b/trunk/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/trunk/TRANSLATORS b/trunk/TRANSLATORS
new file mode 100644
index 0000000..fee8715
--- /dev/null
+++ b/trunk/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/trunk/backgrounds/flower.jpg b/trunk/backgrounds/flower.jpg
new file mode 100644
index 0000000..b0ab9a9
--- /dev/null
+++ b/trunk/backgrounds/flower.jpg
diff --git a/trunk/backgrounds/nature.jpg b/trunk/backgrounds/nature.jpg
new file mode 100644
index 0000000..0b74ca2
--- /dev/null
+++ b/trunk/backgrounds/nature.jpg
diff --git a/trunk/backgrounds/xfdrake-test-card.png b/trunk/backgrounds/xfdrake-test-card.png
new file mode 100644
index 0000000..bcb374e
--- /dev/null
+++ b/trunk/backgrounds/xfdrake-test-card.png
diff --git a/trunk/bin/print-cups.sh b/trunk/bin/print-cups.sh
new file mode 100644
index 0000000..230df13
--- /dev/null
+++ b/trunk/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/trunk/bin/www-browser b/trunk/bin/www-browser
new file mode 100755
index 0000000..28e4b1a
--- /dev/null
+++ b/trunk/bin/www-browser
@@ -0,0 +1,63 @@
+#!/bin/sh
+#---------------------------------------------------------------
+# Project         : Mandrakelinux
+# Module          : bin
+# File            : www-browser
+# Version         : $Id$
+# Author          : Frederic Lepied
+# Created On      : Tue Aug 31 16:26:54 2004
+# Purpose         : launch a web browser
+#---------------------------------------------------------------
+
+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=`grep -m 1 'BrowserApplication=' $HOME/.kde/share/config/kdeglobals 2>/dev/null`
+	[[ -z "$NEWBROWSER" ]] && NEWBROWSER=`grep -m 1 'BrowserApplication=' /etc/kde/kdeglobals 2>/dev/null`
+	if [[ -n "$NEWBROWSER" ]]; then
+	    BROWSER=`echo $NEWBROWSER | sed -e 's/BrowserApplication=//' -e 's/!//'`
+	fi
+    fi
+
+    strip_browser_var
+    
+    [[ -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 mozilla 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 
+    exec $BROWSER "$@"
+else
+    echo "no web browser detected"
+fi
+
+# www-browser ends here
diff --git a/trunk/bin/xvt b/trunk/bin/xvt
new file mode 100755
index 0000000..d380bbc
--- /dev/null
+++ b/trunk/bin/xvt
@@ -0,0 +1,57 @@
+#!/bin/sh
+#---------------------------------------------------------------
+# Project         : Mandrakelinux
+# Module          : bin
+# File            : xvt
+# Version         : $Id$
+# Author          : Frederic Lepied
+# Created On      : Tue Aug 31 16:26:54 2004
+# Purpose         : launch a terminal emulator
+#---------------------------------------------------------------
+
+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
+	NEWTERMINAL=`grep -m 1 'TerminalApplication=' $HOME/.kde/share/config/kdeglobals 2>/dev/null`
+	[[ -z "$NEWTERMINAL" ]] && NEWTERMINAL=`grep -m 1 'TerminalApplication=' /etc/kde/kdeglobals 2>/dev/null`
+	if [[ -n "$NEWTERMINAL" ]]; then
+  	  TERMINAL=`echo $NEWTERMINAL| sed -e 's/TerminalApplication=//' -e 's/!//'`
+	fi
+        [[ -z "$TERMINAL" ]] && which konsole 2> /dev/null && TERMINAL="konsole"
+    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 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`
+fi
+
+if [[ -n "$TERMINAL" ]]; then 
+  exec $TERMINAL "$@"
+else
+  echo "no terminal emulator detected"
+fi
+
+# www-browser ends here
diff --git a/trunk/bookmarks/konqueror/bookmarks-discovery.xml b/trunk/bookmarks/konqueror/bookmarks-discovery.xml
new file mode 100644
index 0000000..a029f66
--- /dev/null
+++ b/trunk/bookmarks/konqueror/bookmarks-discovery.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel folded="no" >
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
+  <title>Mandriva</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
+  <title>Mandrivastore</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://club.mandriva.com" >
+  <title>Mandrivaclub</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://support.mandriva.com/" >
+  <title>Mandrivaexpert</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://online.mandriva.com/" >
+  <title>Mandrivaonline</title>
+ </bookmark>
+</xbel>
diff --git a/trunk/bookmarks/konqueror/bookmarks-download.xml b/trunk/bookmarks/konqueror/bookmarks-download.xml
new file mode 100644
index 0000000..a029f66
--- /dev/null
+++ b/trunk/bookmarks/konqueror/bookmarks-download.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel folded="no" >
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
+  <title>Mandriva</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
+  <title>Mandrivastore</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://club.mandriva.com" >
+  <title>Mandrivaclub</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://support.mandriva.com/" >
+  <title>Mandrivaexpert</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://online.mandriva.com/" >
+  <title>Mandrivaonline</title>
+ </bookmark>
+</xbel>
diff --git a/trunk/bookmarks/konqueror/bookmarks-powerpack.xml b/trunk/bookmarks/konqueror/bookmarks-powerpack.xml
new file mode 100644
index 0000000..72db977
--- /dev/null
+++ b/trunk/bookmarks/konqueror/bookmarks-powerpack.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel folded="no" >
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
+  <title>Mandriva</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
+  <title>Mandrivastore</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://club.mandriva.com/" >
+  <title>Mandrivaclub</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://support.mandriva.com/" >
+  <title>Mandrivaexpert</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://online.mandriva.com/" >
+  <title>Mandrivaonline</title>
+ </bookmark>
+<bookmark icon="/usr/share/icons/favicons/lindvd.ico" href="http://www.intervideo-europe.com/ieso/lindvd.htm" >
+  <title>LinDVD</title>
+ </bookmark>
+ <folder folded="yes" >
+  <title>Partners</title>
+<bookmark icon="/usr/share/icons/favicons/lindvd.ico" href="http://www.intervideo-europe.com/ieso/lindvd.htm" >
+  <title>LinDVD</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/bitdefender.ico" href="http://store.mandriva.com/index.php?cPath=25_121" >
+  <title>Bitdefender</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/kaspersky.gif" href="http://www.kaspersky.com/" >
+  <title>Kaspersky</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/index.php?cPath=25_112" >
+  <title>Arkeia</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/crossover.png" href="http://store.mandriva.com/index.php?cPath=25_38" >
+  <title>Crossover  (codeweavers)</title>
+ </bookmark>
+<bookmark icon="/usr/share/icons/favicons/intel.png" href="http://store.mandriva.com/index.php?cPath=25_119" >
+  <title>Intel(R) Compilers</title>
+ </bookmark>
+ </folder>
+ <separator/>
+ <bookmark icon="/usr/share/icons/favicons/lpi_org.png" href="http://www.lpi.org/" >
+  <title>LPI</title>
+ </bookmark>
+ <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.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://rpmfind.net/" >
+   <title>RpmFind.net</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.x.org/" >
+   <title>Xorg</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://www.ofb.biz/" >
+   <title>OfB.biz</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.osnews.com/" >
+   <title>OSNews.com</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>
+  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/en/cookerdevel.php3" >
+   <title>Mandrake Linux Cooker</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://qa.mandriva.com/wiki" >
+   <title>Mandrake Linux Development Community</title>
+  </bookmark>
+  <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://developer.kde.org/" >
+   <title>KDE - Developer's Corner</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.trolltech.com/products/qt/" >
+   <title>Qt Overview</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/trunk/bookmarks/konqueror/bookmarks-powerpackplus.xml b/trunk/bookmarks/konqueror/bookmarks-powerpackplus.xml
new file mode 100644
index 0000000..72db977
--- /dev/null
+++ b/trunk/bookmarks/konqueror/bookmarks-powerpackplus.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xbel>
+<xbel folded="no" >
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/" >
+  <title>Mandriva</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/" >
+  <title>Mandrivastore</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://club.mandriva.com/" >
+  <title>Mandrivaclub</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://support.mandriva.com/" >
+  <title>Mandrivaexpert</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://online.mandriva.com/" >
+  <title>Mandrivaonline</title>
+ </bookmark>
+<bookmark icon="/usr/share/icons/favicons/lindvd.ico" href="http://www.intervideo-europe.com/ieso/lindvd.htm" >
+  <title>LinDVD</title>
+ </bookmark>
+ <folder folded="yes" >
+  <title>Partners</title>
+<bookmark icon="/usr/share/icons/favicons/lindvd.ico" href="http://www.intervideo-europe.com/ieso/lindvd.htm" >
+  <title>LinDVD</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/bitdefender.ico" href="http://store.mandriva.com/index.php?cPath=25_121" >
+  <title>Bitdefender</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/kaspersky.gif" href="http://www.kaspersky.com/" >
+  <title>Kaspersky</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://store.mandriva.com/index.php?cPath=25_112" >
+  <title>Arkeia</title>
+ </bookmark>
+ <bookmark icon="/usr/share/icons/favicons/crossover.png" href="http://store.mandriva.com/index.php?cPath=25_38" >
+  <title>Crossover  (codeweavers)</title>
+ </bookmark>
+<bookmark icon="/usr/share/icons/favicons/intel.png" href="http://store.mandriva.com/index.php?cPath=25_119" >
+  <title>Intel(R) Compilers</title>
+ </bookmark>
+ </folder>
+ <separator/>
+ <bookmark icon="/usr/share/icons/favicons/lpi_org.png" href="http://www.lpi.org/" >
+  <title>LPI</title>
+ </bookmark>
+ <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.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://rpmfind.net/" >
+   <title>RpmFind.net</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.x.org/" >
+   <title>Xorg</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://www.ofb.biz/" >
+   <title>OfB.biz</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/empty.png" href="http://www.osnews.com/" >
+   <title>OSNews.com</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>
+  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://www.mandriva.com/en/cookerdevel.php3" >
+   <title>Mandrake Linux Cooker</title>
+  </bookmark>
+  <bookmark icon="/usr/share/icons/favicons/STAR_TRANSP.png" href="http://qa.mandriva.com/wiki" >
+   <title>Mandrake Linux Development Community</title>
+  </bookmark>
+  <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://developer.kde.org/" >
+   <title>KDE - Developer's Corner</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.trolltech.com/products/qt/" >
+   <title>Qt Overview</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/trunk/bookmarks/mozilla/mozilla-discovery.html b/trunk/bookmarks/mozilla/mozilla-discovery.html
new file mode 100644
index 0000000..d19eeca
--- /dev/null
+++ b/trunk/bookmarks/mozilla/mozilla-discovery.html
@@ -0,0 +1,27 @@
+<!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">Mandriva</H3>
+<DL><p>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/">Mandriva</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://store.mandriva.com/">Store</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://club.mandriva.com/">Club</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://support.mandriva.com/">Expert</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="https://online.mandriva.com/">Online</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://kiosk.mandriva.com/">Kiosk</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAeFgAAIBdAACecwAAiGsbALSDAAC1hAAAqYo3ANOaAADZnwAA4aQAAOiqAADwrwAA8LEHAPCyCADwtBAA8bYXAPG3GADyuR8A8rkgAPK9LgDzvjAA9MM/AM+tUQD0w0AA9MdPAPXITwD0yFAA9cpXAPXLWAD1zF8A9c1gAPXPaAD10GgA99JvAPfScAD31HcA99Z/APfYgwD32IUA+NyPAPjckAD54Z8A+eGgAPrmsAD7678A++vAAPzwzwD99d8A/vrvAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8PDBsAAAAAAAAAAAAXBwQBAwgMDwAAAAAAHwwICgwMCwUCBQwbAAAAFAwMDBQWDAwMCQIIDAAAHwwMJTEyMjIoDAwFAw8AAAwMHjIvGxgvMiIMCwEfAAANDBUsDwwMGjItDAwEAAAgEQwMDBIeKjEyIgwMBwAAJwwMDCgyMjIxKQwMChcAACcMDB4yMSMYDAwMDAgAAB8jDgwiMigMDB4wFAwMAAAPHhQMEzEyLS0yMRMMHwAADBIjEQwTKy4uKRMMFAAAABsMGCUUDQwMDw4MHgAAAAAADwwSGyUnJyIlAAAAAAAAAAAZDQ4eAAAAAAAAAAAAAP/DAAD+AQAA8AAAAOAAAADAAAAAwAAAAMABAACAAQAAgAEAAIADAAAAAwAAAAMAAAAHAAAADwAAgD8AAMP/AAA=" HREF="http://www.skype.com/">Skype</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEW3NwvgPwFhqAtcjx1gnRe0TSrMViVYgStglCx+KzdZazqVOEZkUk1UZ0nLcExZiEN1NlCQRFarQFxVVlWrZFKfS2BYW2R/Vm1fYWdqamqoc2dsZnKMY3daXIpub4p1e4aPcoKJiYm8l4xdY5NkaZhxa5dtcpx7e5SHh5WZmZl3e6B8g6GFiKSWiqWJkaaWmqi6r6yNl7OTmrSinbOdo7GnqrSypbessrm5uryiq8Ccssios8S1vMK9wcfAxcu8xdLEytLM0dfR1drKzuDN2ebc3uLY4+ng4uXm7Pfs8fT///8AAAAAAIAAgAAAgICAAACAAICAgACAgIDAwMAAAP8A/wAA////AAD/AP///wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBbTJOAAAACHRFWHRDb21tZW50APbMlr8AAACqSURBVHjaXY/LDoIwEEXreyELNdqNQGIgbQzExFfsAkuZpNTc//8gCwJGZzGTOXPnxfBn7BOegGui6YEmZ3yqBkUB8gqjO6Co+p1xaPvVfQDh0XovM3n24JQhn43mQC5FmhaWOQfJltsKUogkuYAVdrcOpmMO4QVJXrCsXG2CxYQjiqI4vtV+6Cvcc/4AeSDr7jDV7C2vtl9rqMVEPaD2s8rS91vtNGxTwRuBjD1T6ZStKQAAAABJRU5ErkJggg==" HREF="http://www.transgaming.com/">Transgaming</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAuQA9ALkASQDcAFUA/wAAPbkAc0j/AEhz/wAAktwAa4//AACq/wAlqv8Aa8b/AI7U/wDU8P8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAKAwAAAAAAAAAAAAkAAAAACgIDAAAAAAAAAAsLCQAAAAoCAgMAAAAAAAsLCwsJAAAKAgICAwAAAA4LDQ0LCwkACgQEBAQDAAAADg8NDAsAAAoEBAQEBAMAAAAODA4AAAAKBAQEBAQEAwAAAA4AAAAACgUFBgUFBQUDAAAAAAAAAAoFBQYKBQUFBQMAAAAAAAAKBQUGAQoFBQUFAwAAAAAACgcHBgEACgcHBwcDAAAAAAoHBwYBAAAKBwcHBwMAAAAKCAgGAQAAAAoICAgIAwAACggIBgEAAAAACggICAgDAH//AAA//wAAH+cAAA/DAAAHgQAAAwEAAAGDAAAAxwAAAG8AAAA/AAAAHwAAAA8AAAQHAAAGAwAABwEAAAeBAAA=" HREF="http://www.intervideo.com/jsp/LinDVD.jsp">LinDVD (Intervideo)</A>
+<DT><H3>Partners</H3>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAeFgAAIBdAACecwAAiGsbALSDAAC1hAAAqYo3ANOaAADZnwAA4aQAAOiqAADwrwAA8LEHAPCyCADwtBAA8bYXAPG3GADyuR8A8rkgAPK9LgDzvjAA9MM/AM+tUQD0w0AA9MdPAPXITwD0yFAA9cpXAPXLWAD1zF8A9c1gAPXPaAD10GgA99JvAPfScAD31HcA99Z/APfYgwD32IUA+NyPAPjckAD54Z8A+eGgAPrmsAD7678A++vAAPzwzwD99d8A/vrvAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8PDBsAAAAAAAAAAAAXBwQBAwgMDwAAAAAAHwwICgwMCwUCBQwbAAAAFAwMDBQWDAwMCQIIDAAAHwwMJTEyMjIoDAwFAw8AAAwMHjIvGxgvMiIMCwEfAAANDBUsDwwMGjItDAwEAAAgEQwMDBIeKjEyIgwMBwAAJwwMDCgyMjIxKQwMChcAACcMDB4yMSMYDAwMDAgAAB8jDgwiMigMDB4wFAwMAAAPHhQMEzEyLS0yMRMMHwAADBIjEQwTKy4uKRMMFAAAABsMGCUUDQwMDw4MHgAAAAAADwwSGyUnJyIlAAAAAAAAAAAZDQ4eAAAAAAAAAAAAAP/DAAD+AQAA8AAAAOAAAADAAAAAwAAAAMABAACAAQAAgAEAAIADAAAAAwAAAAMAAAAHAAAADwAAgD8AAMP/AAA=" HREF="http://www.skype.com/">Skype</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEW3NwvgPwFhqAtcjx1gnRe0TSrMViVYgStglCx+KzdZazqVOEZkUk1UZ0nLcExZiEN1NlCQRFarQFxVVlWrZFKfS2BYW2R/Vm1fYWdqamqoc2dsZnKMY3daXIpub4p1e4aPcoKJiYm8l4xdY5NkaZhxa5dtcpx7e5SHh5WZmZl3e6B8g6GFiKSWiqWJkaaWmqi6r6yNl7OTmrSinbOdo7GnqrSypbessrm5uryiq8Ccssios8S1vMK9wcfAxcu8xdLEytLM0dfR1drKzuDN2ebc3uLY4+ng4uXm7Pfs8fT///8AAAAAAIAAgAAAgICAAACAAICAgACAgIDAwMAAAP8A/wAA////AAD/AP///wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBbTJOAAAACHRFWHRDb21tZW50APbMlr8AAACqSURBVHjaXY/LDoIwEEXreyELNdqNQGIgbQzExFfsAkuZpNTc//8gCwJGZzGTOXPnxfBn7BOegGui6YEmZ3yqBkUB8gqjO6Co+p1xaPvVfQDh0XovM3n24JQhn43mQC5FmhaWOQfJltsKUogkuYAVdrcOpmMO4QVJXrCsXG2CxYQjiqI4vtV+6Cvcc/4AeSDr7jDV7C2vtl9rqMVEPaD2s8rS91vtNGxTwRuBjD1T6ZStKQAAAABJRU5ErkJggg==" HREF="http://www.transgaming.com/">Transgaming / Cedega</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAuQA9ALkASQDcAFUA/wAAPbkAc0j/AEhz/wAAktwAa4//AACq/wAlqv8Aa8b/AI7U/wDU8P8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAKAwAAAAAAAAAAAAkAAAAACgIDAAAAAAAAAAsLCQAAAAoCAgMAAAAAAAsLCwsJAAAKAgICAwAAAA4LDQ0LCwkACgQEBAQDAAAADg8NDAsAAAoEBAQEBAMAAAAODA4AAAAKBAQEBAQEAwAAAA4AAAAACgUFBgUFBQUDAAAAAAAAAAoFBQYKBQUFBQMAAAAAAAAKBQUGAQoFBQUFAwAAAAAACgcHBgEACgcHBwcDAAAAAAoHBwYBAAAKBwcHBwMAAAAKCAgGAQAAAAoICAgIAwAACggIBgEAAAAACggICAgDAH//AAA//wAAH+cAAA/DAAAHgQAAAwEAAAGDAAAAxwAAAG8AAAA/AAAAHwAAAA8AAAQHAAAGAwAABwEAAAeBAAA=" HREF="http://www.intervideo.com/jsp/LinDVD.jsp">LinDVD (InterVideo)</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJycnIjQ0NGMyMjO3JSUr9S0tNv0yMjLSNDQ0hTQ0ND8aGhoQAAAAAAAAAAAAAAAAAAAAAAAAAAAnJycTKysraRQUGtEDBCD/AAE3/wACS/8AA1X/AANW/w0PTPokJTnbMjIyjzQ0NDEAAAAAAAAAAAAAAAAAAAAAIyMmkwoLKf8AAlj/AAV5/wAFif8ABpD/AAaT/wAGlf8ABpj/AAaU/xoddPkxMTOtJycnIgAAAAAAAAAAJyc3dAUIVP8AA1X/AAI7/wABK/8AAib/AgQ2/wMHT/8FCWP/BAl1/wIJi/8ACKr/Gx918DQ0NHUAAAAAFBQUEwkJF98AAAX/AAAa/wADTP8DCX//CRGw/xIbz/8YIuH/GSLo/xIc4v8KE9L/BQ7I/wMMyv8rLl3ZNDQ0PxcYGmcAABf/AAJA/wAFd/8DCpv/DBW8/xki3P8hK+//FyHd/wsTrP8MEYD/FBuQ/xEatf8IEs3/FBy8+jQ0NIUWFhuuAAEx/wADU/8BCI7/CRGz/xQe1/8SG9P/Bw6L/xkeZv9BSJ//VF/k/z9L+/8ZJOn/ChO3/w4Zzv8zMzfSExMg/wACT/8AAjn/Awuf/wkSwP8FDJr/DBBR/0BGlv93gu3/g4/+/1Fd9P8QGbH/Cg9g/xcfpf8MGOz/NjqV/QoKHf8AA2D/AAEp/wYNnv8JEbD/BQhF/0dQwP98h/7/jJn8/0tW6P8HDYf/HyNV/0ZS1/8uPP7/FSP//y0yl/UWFindAANb/wACT/8FCmf/ExvM/wIGYP8xN3n/g4/7/15p6P8EC5X/KC1R/3B85f9YZv//MUD//xwp//82OGq3BAQQfwACU/8ABHf/AQMx/xYezP8LEZ3/CAo8/2JrvP9veuP/Bwxv/zU7Z/9xf/r/T17//y07//8hLv//NDQ0YwUFBx4CBET/AAR5/wADVf8MEXn/GCDP/wADZ/8bH0f/bXnk/xshjf8JCiP/TFjX/ztK//8jMf//Ji6czycnJyIAAAAAERItnQAEaP8ABH//AgRC/xQcxf8FC5T/AANP/zA2gP81P87/AQRS/z5DjPEmNf//IC3+/ywsM2kAAAAAAAAAAAcHCBURE0rUAAR7/wAEc/8GC2z/CxTB/wAEev8SFE3zISZ3pwkQrf8JCQwyLTbT6yUpa4gnJycTAAAAAAAAAAAAAAAABgYJFRARQp0CB3//DBF19RYbfKYEDK7/Ehdw7AAAAAAKD3edAAAAAAkKERMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQUNGgwOQ2wAAAAACg1ZhRcchdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AcAAMADAADAAQAAgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAIABAADAVwAA8n8AAA==" HREF="http://store.mandriva.com/index.php?cPath=25_121">Bitdefender</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIAAAIiIiIAISAAAgAAAgAhEgAAIAACACERIAIAAAIAIRESIAAAAgAhEREgAAICACERERIAICIAIRERESIAAAAhEREREgAAACERERERIAAAIRESERESAAAhERIhEREgACEREgIRERIAIiIiACIiIgAAAAAAAAAAD//wAAnwEAAI8BAACHgQAAgwEAAIABAACAAQAAgAkAAIAfAACAHwAAgA8AAIAHAACAAwAAgQEAAIGBAAD//wAA"HREF="http://www.kaspersky.com/">Kaspersky</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAazBTAHZDYgB+SmoAhFpyAHNucQCOiY0AoZmdALKurwDFw8UA19TWAOLh4gDq6OkAaBlIAAAAAAAAAAAAAAAAzLu7wAAAALmYiImawAALl2ZmZmiwAAp1VWZVV6AAot3d3dFWkAA93d3d0UaQAN0lVV3RRpAA3SdmbdFGkAA93d3d0VegAKPd3d3RWKAADJdmXdJpwAAMmHZN1JsAAH3d3d3YsAAAfd3dE4AAAAAMzMwAAAAAAAAAAAAAAAD8BwAA8AEAAOABAADgAQAAwAEAAMABAADAAQAAwAEAAMABAADAAQAA4AEAAOADAADABwAAwB8AAOD/AAD//wAA" HREF="http://store.mandriva.com/index.php?cPath=25_112">Arkeia</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrGQQAhTQBAII0BwCKNwAAfzUOAIg4AQCPPgAAkD8AAI5CAwCLRQMAkkgCAJdJAQCZSgAAmUoBAJhJBQCXSgIAmEoCAJZMBQCZTA0Amk4OAJ5VEQCgVxIAhVUpAHxYOABRVV8Aq2otAKpuNgCucTcAsHI5AEZpiwCwfEwAtn5KALqEUgC6hlUAHHXoAB598gAgf+wAL4fWADuLxQAihvEAx5xzAMecdAApkdEAyJ94ACeQ6gAoku4Ay6N+ACmX8QAnlvcANp3cACma8QAtoOYAz6uKACud8gDSr48AOaH4ACyj+QDTsZIALaX5AC2m+QAvqPMALaf5AC6n+QAuqPkA1bWWAEOn+QAvqvoAL6v6ADSr+QAwrPoA17ibADCt+gAxrfoAcrnnAE+4+wBZuPoATrn7AF2++wDgyLEAd7/1AHfA+wCCx/kA5dG/AInJ+wCLzvwA6NXFAIjP/ACg2PwAp9n9AKvZ/ACw3v0A7+PXALXf/QDN6f4A3fH+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAX19fX19fXwBfX19fX19fX19fX19fXx0mQ19HMypfX19fX18yNTg6PT9CRUdIPF9fLV8vXwIEGF87PkRKTUwxX19fXwUDAV9fX19LVFdWX19fXwgHBl9fX19fUVxeWklfX19fDhMSX19fX19ZXVhfX19fFBwgHl9fX19fUFNPX19fXxsoRjlfX19fXzdBX19fX18hQFtVLhoJXyUwLF9fX19fXzZSTikZDQwMEQ8LX19fX19fNCsfFRAWF18KX19fX19fX19fX19fJ19fX19fX19fX19fX19fJF9fX19fX19fX19fX19fI19fX19fX19fX19fX19fIl9fX19fX19fX/7/AAD8RwAA4AMAAFEBAADjwwAAx8EAAOPjAADD4wAAw+cAAMBHAADgAwAA8BcAAP+/AAD/fwAA/v8AAP3/AAA=" HREF="http://store.mandriva.com/index.php?cPath=25_38">Crossover (CodeWeavers)</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAGBgAAAEACADIBgAAFgAAACgAAAAYAAAAMAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuHAkAMRwKAC4dCgAuHQsAMCAOAB4eHwA1IxEAJSQlACQjKABtKwAAcSsAACcmLQB5OgAALy8zAH5GAAB/RgAAXUAaADk5PwBeQx4AYEMfAD0+QgAyO08AhEsTAGFKKwBhSiwAQkRHAEZERgCxXQAATEtNALNfAAC1XwAATUxNALVgAAC2YgAAt2MAALtlAABtWDwAcFg+ALpqAABSVFcAvG4AALxwAAC9cQAAvnIAALlrEwC/dAAAWFldAL92AgC+dwgAXV1hAMN5BQDAeQsAY2JjAMJ7DwDEfQwAw30NAMR9DgDCfRAAw30QAMF9EQDDfREAwn4RAMJ+EgDDfhIAxH8QAMR/EQBlZWkA14UBANOFBgDVhQcAwIAaANSHCwDBgR4Aa2xtAMWGIwDHhyIAx4cjAFxqhADbjRIAyIkiAF1thABgbogAdHR3AHZ0dwDXkB0A2JAdAHZ2eQDZkiEAyo4vABpzpgDeliIAxY89AH19gADMkjoAaniSAH1+gQBneZUA2ZgvAISDhgBygJsAhoeJAOShOQAAf9EAiImMAIuJjADRnE8Ai4uNANSeTwCKjI4AAIPTAEGNqQAAhtIAjZCSAJGRkgDVpVoAFJXCAJaWmACWlpkAMJHMAJmZnQBVm7cAm52dAJ+fnwArmtcApaWlAHOntQDsuWkAKqDjAKaoqQAzo+AAJqLpANi2ggAhqOUAAK3qADKo4gCvr68Arq6yAK6vswCxsbQAIbDsALGztADdv48AtbW3ACey9AC8tLsAu7m7AI+6ygC4ursAL7jyAEW27gCcuc0AKrv0ABm5/wApwPMAr7vPAEPA7wD4z5EAyMfJAAnT/ADJycoAMM/5AC7R+gDKy80AwsvRAEzP9QDP0NEAXtT3ANLR0wDq2b0A69i/AEDa+wA92/wAU9r5AE/a/QAg4v8AKOH/AEzg+gDZ2dcAVOH6ACHo/wBP4voA7t7LANva2gBN5voA3NzbANzc3ABr4voA3N3eAODe3gA/7P8A3uDgAFnq/wDf4eAA4eDiAOHh4QDx5dQA4eLgAP/h2QDz5tUA5ePkAPTo2ADm5ucA2eP0APns2AD57NoA9OrgAOjo6gDp6ekA6enqAN7m9gDf6fsA+e7oAO7u8ADt7vEA8fHxAP/z6QDy8vMA8/PyAPXz8wDy9PQA9fT1APT19QD5+PgA//7sAPn4+gD//PEA+Pj/AP//9AD9/PwA+/38AP39/QD+/f0A///5AP//+gD9/v4A/v7+AP7//wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiRUT0tLS0tMLMjt7e2Sr7+wrKa6spuVABdHQDk5OTk8Hcbt7e3hbrOqpLSroJeBABdHQDk5OTk8Hcbt7e3txXOurbehlIZ7ABdHQDk5OTk8Hcbt7e3t7dd4nr2Zi4+CABdHQDk5OTk8Hcbt7e3t7e3tfYWYhH92ABdHQDk5OTk8Hcbt7e3t7e3t7ZBZb21mABdHQDk5OTk8Hcbt7e3t7e3t7e3p06OWABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt3u3t7e3t7e3t7e3tABdHQDk5OTk6HszSsbu4ydjt7e3t7e3tABdHQDk5OTk6HsvRuYqnk5/t7e3t7e3tABdHQDk5OTk8HcPt7e3t7e3t7e3t7e3tABdHQTk5PT48G9/KFId1eYx0U1xxSTRWABdHNjU8Kig3IuMV5FINCwURMUIaJ2wZABhEKy8gaYMmI+iaB8Tt7e3t7eV33O3tAhJVqVuNqOJ+CV7tHJGIal/t7e3t7e3tAxBXzbXsckicCmAu1npwaGLt7e3t7e3tAhNhayFdWEZlDGPVCM/t7e3t7e3t7e3tABhFMjMpLTBDDlGlZGcfne3t7evt5uDbARdHOD0/PTtOD02JjnyigO3n3drUzsC2BCVUT0tLS0paFlDt7e3q2cG+vLzCx8/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" HREF="http://store.mandriva.com/index.php?cPath=25_119">Intel® Compilers</A>
+</DL><P>
+</DL><P>
diff --git a/trunk/bookmarks/mozilla/mozilla-download.html b/trunk/bookmarks/mozilla/mozilla-download.html
new file mode 100644
index 0000000..6c4acfe
--- /dev/null
+++ b/trunk/bookmarks/mozilla/mozilla-download.html
@@ -0,0 +1,15 @@
+<!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">Mandriva</H3>
+<DL><p>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/">Mandriva</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://store.mandriva.com/">Store</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://club.mandriva.com/">Club</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://support.mandriva.com/">Expert</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="https://online.mandriva.com/">Online</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://kiosk.mandriva.com/">Kiosk</A>
+</DL><P>
+</DL><P>
diff --git a/trunk/bookmarks/mozilla/mozilla-powerpack.html b/trunk/bookmarks/mozilla/mozilla-powerpack.html
new file mode 100644
index 0000000..4e3fc4d
--- /dev/null
+++ b/trunk/bookmarks/mozilla/mozilla-powerpack.html
@@ -0,0 +1,69 @@
+<!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">Mandriva</H3>
+<DL><p>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/">Mandriva</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://store.mandriva.com/">Store</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://club.mandriva.com/">Club</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://support.mandriva.com/">Expert</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="https://online.mandriva.com/">Online</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://kiosk.mandriva.com/">Kiosk</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAeFgAAIBdAACecwAAiGsbALSDAAC1hAAAqYo3ANOaAADZnwAA4aQAAOiqAADwrwAA8LEHAPCyCADwtBAA8bYXAPG3GADyuR8A8rkgAPK9LgDzvjAA9MM/AM+tUQD0w0AA9MdPAPXITwD0yFAA9cpXAPXLWAD1zF8A9c1gAPXPaAD10GgA99JvAPfScAD31HcA99Z/APfYgwD32IUA+NyPAPjckAD54Z8A+eGgAPrmsAD7678A++vAAPzwzwD99d8A/vrvAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8PDBsAAAAAAAAAAAAXBwQBAwgMDwAAAAAAHwwICgwMCwUCBQwbAAAAFAwMDBQWDAwMCQIIDAAAHwwMJTEyMjIoDAwFAw8AAAwMHjIvGxgvMiIMCwEfAAANDBUsDwwMGjItDAwEAAAgEQwMDBIeKjEyIgwMBwAAJwwMDCgyMjIxKQwMChcAACcMDB4yMSMYDAwMDAgAAB8jDgwiMigMDB4wFAwMAAAPHhQMEzEyLS0yMRMMHwAADBIjEQwTKy4uKRMMFAAAABsMGCUUDQwMDw4MHgAAAAAADwwSGyUnJyIlAAAAAAAAAAAZDQ4eAAAAAAAAAAAAAP/DAAD+AQAA8AAAAOAAAADAAAAAwAAAAMABAACAAQAAgAEAAIADAAAAAwAAAAMAAAAHAAAADwAAgD8AAMP/AAA=" HREF="http://www.skype.com/">Skype</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEW3NwvgPwFhqAtcjx1gnRe0TSrMViVYgStglCx+KzdZazqVOEZkUk1UZ0nLcExZiEN1NlCQRFarQFxVVlWrZFKfS2BYW2R/Vm1fYWdqamqoc2dsZnKMY3daXIpub4p1e4aPcoKJiYm8l4xdY5NkaZhxa5dtcpx7e5SHh5WZmZl3e6B8g6GFiKSWiqWJkaaWmqi6r6yNl7OTmrSinbOdo7GnqrSypbessrm5uryiq8Ccssios8S1vMK9wcfAxcu8xdLEytLM0dfR1drKzuDN2ebc3uLY4+ng4uXm7Pfs8fT///8AAAAAAIAAgAAAgICAAACAAICAgACAgIDAwMAAAP8A/wAA////AAD/AP///wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBbTJOAAAACHRFWHRDb21tZW50APbMlr8AAACqSURBVHjaXY/LDoIwEEXreyELNdqNQGIgbQzExFfsAkuZpNTc//8gCwJGZzGTOXPnxfBn7BOegGui6YEmZ3yqBkUB8gqjO6Co+p1xaPvVfQDh0XovM3n24JQhn43mQC5FmhaWOQfJltsKUogkuYAVdrcOpmMO4QVJXrCsXG2CxYQjiqI4vtV+6Cvcc/4AeSDr7jDV7C2vtl9rqMVEPaD2s8rS91vtNGxTwRuBjD1T6ZStKQAAAABJRU5ErkJggg==" HREF="http://www.transgaming.com/">Transgaming</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAuQA9ALkASQDcAFUA/wAAPbkAc0j/AEhz/wAAktwAa4//AACq/wAlqv8Aa8b/AI7U/wDU8P8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAKAwAAAAAAAAAAAAkAAAAACgIDAAAAAAAAAAsLCQAAAAoCAgMAAAAAAAsLCwsJAAAKAgICAwAAAA4LDQ0LCwkACgQEBAQDAAAADg8NDAsAAAoEBAQEBAMAAAAODA4AAAAKBAQEBAQEAwAAAA4AAAAACgUFBgUFBQUDAAAAAAAAAAoFBQYKBQUFBQMAAAAAAAAKBQUGAQoFBQUFAwAAAAAACgcHBgEACgcHBwcDAAAAAAoHBwYBAAAKBwcHBwMAAAAKCAgGAQAAAAoICAgIAwAACggIBgEAAAAACggICAgDAH//AAA//wAAH+cAAA/DAAAHgQAAAwEAAAGDAAAAxwAAAG8AAAA/AAAAHwAAAA8AAAQHAAAGAwAABwEAAAeBAAA=" HREF="http://www.intervideo.com/jsp/LinDVD.jsp">LinDVD (Intervideo)</A>
+<DT><H3>Partners</H3>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAeFgAAIBdAACecwAAiGsbALSDAAC1hAAAqYo3ANOaAADZnwAA4aQAAOiqAADwrwAA8LEHAPCyCADwtBAA8bYXAPG3GADyuR8A8rkgAPK9LgDzvjAA9MM/AM+tUQD0w0AA9MdPAPXITwD0yFAA9cpXAPXLWAD1zF8A9c1gAPXPaAD10GgA99JvAPfScAD31HcA99Z/APfYgwD32IUA+NyPAPjckAD54Z8A+eGgAPrmsAD7678A++vAAPzwzwD99d8A/vrvAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8PDBsAAAAAAAAAAAAXBwQBAwgMDwAAAAAAHwwICgwMCwUCBQwbAAAAFAwMDBQWDAwMCQIIDAAAHwwMJTEyMjIoDAwFAw8AAAwMHjIvGxgvMiIMCwEfAAANDBUsDwwMGjItDAwEAAAgEQwMDBIeKjEyIgwMBwAAJwwMDCgyMjIxKQwMChcAACcMDB4yMSMYDAwMDAgAAB8jDgwiMigMDB4wFAwMAAAPHhQMEzEyLS0yMRMMHwAADBIjEQwTKy4uKRMMFAAAABsMGCUUDQwMDw4MHgAAAAAADwwSGyUnJyIlAAAAAAAAAAAZDQ4eAAAAAAAAAAAAAP/DAAD+AQAA8AAAAOAAAADAAAAAwAAAAMABAACAAQAAgAEAAIADAAAAAwAAAAMAAAAHAAAADwAAgD8AAMP/AAA=" HREF="http://www.skype.com/">Skype</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEW3NwvgPwFhqAtcjx1gnRe0TSrMViVYgStglCx+KzdZazqVOEZkUk1UZ0nLcExZiEN1NlCQRFarQFxVVlWrZFKfS2BYW2R/Vm1fYWdqamqoc2dsZnKMY3daXIpub4p1e4aPcoKJiYm8l4xdY5NkaZhxa5dtcpx7e5SHh5WZmZl3e6B8g6GFiKSWiqWJkaaWmqi6r6yNl7OTmrSinbOdo7GnqrSypbessrm5uryiq8Ccssios8S1vMK9wcfAxcu8xdLEytLM0dfR1drKzuDN2ebc3uLY4+ng4uXm7Pfs8fT///8AAAAAAIAAgAAAgICAAACAAICAgACAgIDAwMAAAP8A/wAA////AAD/AP///wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBbTJOAAAACHRFWHRDb21tZW50APbMlr8AAACqSURBVHjaXY/LDoIwEEXreyELNdqNQGIgbQzExFfsAkuZpNTc//8gCwJGZzGTOXPnxfBn7BOegGui6YEmZ3yqBkUB8gqjO6Co+p1xaPvVfQDh0XovM3n24JQhn43mQC5FmhaWOQfJltsKUogkuYAVdrcOpmMO4QVJXrCsXG2CxYQjiqI4vtV+6Cvcc/4AeSDr7jDV7C2vtl9rqMVEPaD2s8rS91vtNGxTwRuBjD1T6ZStKQAAAABJRU5ErkJggg==" HREF="http://www.transgaming.com/">Transgaming / Cedega</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAuQA9ALkASQDcAFUA/wAAPbkAc0j/AEhz/wAAktwAa4//AACq/wAlqv8Aa8b/AI7U/wDU8P8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAKAwAAAAAAAAAAAAkAAAAACgIDAAAAAAAAAAsLCQAAAAoCAgMAAAAAAAsLCwsJAAAKAgICAwAAAA4LDQ0LCwkACgQEBAQDAAAADg8NDAsAAAoEBAQEBAMAAAAODA4AAAAKBAQEBAQEAwAAAA4AAAAACgUFBgUFBQUDAAAAAAAAAAoFBQYKBQUFBQMAAAAAAAAKBQUGAQoFBQUFAwAAAAAACgcHBgEACgcHBwcDAAAAAAoHBwYBAAAKBwcHBwMAAAAKCAgGAQAAAAoICAgIAwAACggIBgEAAAAACggICAgDAH//AAA//wAAH+cAAA/DAAAHgQAAAwEAAAGDAAAAxwAAAG8AAAA/AAAAHwAAAA8AAAQHAAAGAwAABwEAAAeBAAA=" HREF="http://www.intervideo.com/jsp/LinDVD.jsp">LinDVD (InterVideo)</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJycnIjQ0NGMyMjO3JSUr9S0tNv0yMjLSNDQ0hTQ0ND8aGhoQAAAAAAAAAAAAAAAAAAAAAAAAAAAnJycTKysraRQUGtEDBCD/AAE3/wACS/8AA1X/AANW/w0PTPokJTnbMjIyjzQ0NDEAAAAAAAAAAAAAAAAAAAAAIyMmkwoLKf8AAlj/AAV5/wAFif8ABpD/AAaT/wAGlf8ABpj/AAaU/xoddPkxMTOtJycnIgAAAAAAAAAAJyc3dAUIVP8AA1X/AAI7/wABK/8AAib/AgQ2/wMHT/8FCWP/BAl1/wIJi/8ACKr/Gx918DQ0NHUAAAAAFBQUEwkJF98AAAX/AAAa/wADTP8DCX//CRGw/xIbz/8YIuH/GSLo/xIc4v8KE9L/BQ7I/wMMyv8rLl3ZNDQ0PxcYGmcAABf/AAJA/wAFd/8DCpv/DBW8/xki3P8hK+//FyHd/wsTrP8MEYD/FBuQ/xEatf8IEs3/FBy8+jQ0NIUWFhuuAAEx/wADU/8BCI7/CRGz/xQe1/8SG9P/Bw6L/xkeZv9BSJ//VF/k/z9L+/8ZJOn/ChO3/w4Zzv8zMzfSExMg/wACT/8AAjn/Awuf/wkSwP8FDJr/DBBR/0BGlv93gu3/g4/+/1Fd9P8QGbH/Cg9g/xcfpf8MGOz/NjqV/QoKHf8AA2D/AAEp/wYNnv8JEbD/BQhF/0dQwP98h/7/jJn8/0tW6P8HDYf/HyNV/0ZS1/8uPP7/FSP//y0yl/UWFindAANb/wACT/8FCmf/ExvM/wIGYP8xN3n/g4/7/15p6P8EC5X/KC1R/3B85f9YZv//MUD//xwp//82OGq3BAQQfwACU/8ABHf/AQMx/xYezP8LEZ3/CAo8/2JrvP9veuP/Bwxv/zU7Z/9xf/r/T17//y07//8hLv//NDQ0YwUFBx4CBET/AAR5/wADVf8MEXn/GCDP/wADZ/8bH0f/bXnk/xshjf8JCiP/TFjX/ztK//8jMf//Ji6czycnJyIAAAAAERItnQAEaP8ABH//AgRC/xQcxf8FC5T/AANP/zA2gP81P87/AQRS/z5DjPEmNf//IC3+/ywsM2kAAAAAAAAAAAcHCBURE0rUAAR7/wAEc/8GC2z/CxTB/wAEev8SFE3zISZ3pwkQrf8JCQwyLTbT6yUpa4gnJycTAAAAAAAAAAAAAAAABgYJFRARQp0CB3//DBF19RYbfKYEDK7/Ehdw7AAAAAAKD3edAAAAAAkKERMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQUNGgwOQ2wAAAAACg1ZhRcchdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AcAAMADAADAAQAAgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAIABAADAVwAA8n8AAA==" HREF="http://store.mandriva.com/index.php?cPath=25_121">Bitdefender</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIAAAIiIiIAISAAAgAAAgAhEgAAIAACACERIAIAAAIAIRESIAAAAgAhEREgAAICACERERIAICIAIRERESIAAAAhEREREgAAACERERERIAAAIRESERESAAAhERIhEREgACEREgIRERIAIiIiACIiIgAAAAAAAAAAD//wAAnwEAAI8BAACHgQAAgwEAAIABAACAAQAAgAkAAIAfAACAHwAAgA8AAIAHAACAAwAAgQEAAIGBAAD//wAA"HREF="http://www.kaspersky.com/">Kaspersky</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAazBTAHZDYgB+SmoAhFpyAHNucQCOiY0AoZmdALKurwDFw8UA19TWAOLh4gDq6OkAaBlIAAAAAAAAAAAAAAAAzLu7wAAAALmYiImawAALl2ZmZmiwAAp1VWZVV6AAot3d3dFWkAA93d3d0UaQAN0lVV3RRpAA3SdmbdFGkAA93d3d0VegAKPd3d3RWKAADJdmXdJpwAAMmHZN1JsAAH3d3d3YsAAAfd3dE4AAAAAMzMwAAAAAAAAAAAAAAAD8BwAA8AEAAOABAADgAQAAwAEAAMABAADAAQAAwAEAAMABAADAAQAA4AEAAOADAADABwAAwB8AAOD/AAD//wAA" HREF="http://store.mandriva.com/index.php?cPath=25_112">Arkeia</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrGQQAhTQBAII0BwCKNwAAfzUOAIg4AQCPPgAAkD8AAI5CAwCLRQMAkkgCAJdJAQCZSgAAmUoBAJhJBQCXSgIAmEoCAJZMBQCZTA0Amk4OAJ5VEQCgVxIAhVUpAHxYOABRVV8Aq2otAKpuNgCucTcAsHI5AEZpiwCwfEwAtn5KALqEUgC6hlUAHHXoAB598gAgf+wAL4fWADuLxQAihvEAx5xzAMecdAApkdEAyJ94ACeQ6gAoku4Ay6N+ACmX8QAnlvcANp3cACma8QAtoOYAz6uKACud8gDSr48AOaH4ACyj+QDTsZIALaX5AC2m+QAvqPMALaf5AC6n+QAuqPkA1bWWAEOn+QAvqvoAL6v6ADSr+QAwrPoA17ibADCt+gAxrfoAcrnnAE+4+wBZuPoATrn7AF2++wDgyLEAd7/1AHfA+wCCx/kA5dG/AInJ+wCLzvwA6NXFAIjP/ACg2PwAp9n9AKvZ/ACw3v0A7+PXALXf/QDN6f4A3fH+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAX19fX19fXwBfX19fX19fX19fX19fXx0mQ19HMypfX19fX18yNTg6PT9CRUdIPF9fLV8vXwIEGF87PkRKTUwxX19fXwUDAV9fX19LVFdWX19fXwgHBl9fX19fUVxeWklfX19fDhMSX19fX19ZXVhfX19fFBwgHl9fX19fUFNPX19fXxsoRjlfX19fXzdBX19fX18hQFtVLhoJXyUwLF9fX19fXzZSTikZDQwMEQ8LX19fX19fNCsfFRAWF18KX19fX19fX19fX19fJ19fX19fX19fX19fX19fJF9fX19fX19fX19fX19fI19fX19fX19fX19fX19fIl9fX19fX19fX/7/AAD8RwAA4AMAAFEBAADjwwAAx8EAAOPjAADD4wAAw+cAAMBHAADgAwAA8BcAAP+/AAD/fwAA/v8AAP3/AAA=" HREF="http://store.mandriva.com/index.php?cPath=25_38">Crossover (CodeWeavers)</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAGBgAAAEACADIBgAAFgAAACgAAAAYAAAAMAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuHAkAMRwKAC4dCgAuHQsAMCAOAB4eHwA1IxEAJSQlACQjKABtKwAAcSsAACcmLQB5OgAALy8zAH5GAAB/RgAAXUAaADk5PwBeQx4AYEMfAD0+QgAyO08AhEsTAGFKKwBhSiwAQkRHAEZERgCxXQAATEtNALNfAAC1XwAATUxNALVgAAC2YgAAt2MAALtlAABtWDwAcFg+ALpqAABSVFcAvG4AALxwAAC9cQAAvnIAALlrEwC/dAAAWFldAL92AgC+dwgAXV1hAMN5BQDAeQsAY2JjAMJ7DwDEfQwAw30NAMR9DgDCfRAAw30QAMF9EQDDfREAwn4RAMJ+EgDDfhIAxH8QAMR/EQBlZWkA14UBANOFBgDVhQcAwIAaANSHCwDBgR4Aa2xtAMWGIwDHhyIAx4cjAFxqhADbjRIAyIkiAF1thABgbogAdHR3AHZ0dwDXkB0A2JAdAHZ2eQDZkiEAyo4vABpzpgDeliIAxY89AH19gADMkjoAaniSAH1+gQBneZUA2ZgvAISDhgBygJsAhoeJAOShOQAAf9EAiImMAIuJjADRnE8Ai4uNANSeTwCKjI4AAIPTAEGNqQAAhtIAjZCSAJGRkgDVpVoAFJXCAJaWmACWlpkAMJHMAJmZnQBVm7cAm52dAJ+fnwArmtcApaWlAHOntQDsuWkAKqDjAKaoqQAzo+AAJqLpANi2ggAhqOUAAK3qADKo4gCvr68Arq6yAK6vswCxsbQAIbDsALGztADdv48AtbW3ACey9AC8tLsAu7m7AI+6ygC4ursAL7jyAEW27gCcuc0AKrv0ABm5/wApwPMAr7vPAEPA7wD4z5EAyMfJAAnT/ADJycoAMM/5AC7R+gDKy80AwsvRAEzP9QDP0NEAXtT3ANLR0wDq2b0A69i/AEDa+wA92/wAU9r5AE/a/QAg4v8AKOH/AEzg+gDZ2dcAVOH6ACHo/wBP4voA7t7LANva2gBN5voA3NzbANzc3ABr4voA3N3eAODe3gA/7P8A3uDgAFnq/wDf4eAA4eDiAOHh4QDx5dQA4eLgAP/h2QDz5tUA5ePkAPTo2ADm5ucA2eP0APns2AD57NoA9OrgAOjo6gDp6ekA6enqAN7m9gDf6fsA+e7oAO7u8ADt7vEA8fHxAP/z6QDy8vMA8/PyAPXz8wDy9PQA9fT1APT19QD5+PgA//7sAPn4+gD//PEA+Pj/AP//9AD9/PwA+/38AP39/QD+/f0A///5AP//+gD9/v4A/v7+AP7//wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiRUT0tLS0tMLMjt7e2Sr7+wrKa6spuVABdHQDk5OTk8Hcbt7e3hbrOqpLSroJeBABdHQDk5OTk8Hcbt7e3txXOurbehlIZ7ABdHQDk5OTk8Hcbt7e3t7dd4nr2Zi4+CABdHQDk5OTk8Hcbt7e3t7e3tfYWYhH92ABdHQDk5OTk8Hcbt7e3t7e3t7ZBZb21mABdHQDk5OTk8Hcbt7e3t7e3t7e3p06OWABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt3u3t7e3t7e3t7e3tABdHQDk5OTk6HszSsbu4ydjt7e3t7e3tABdHQDk5OTk6HsvRuYqnk5/t7e3t7e3tABdHQDk5OTk8HcPt7e3t7e3t7e3t7e3tABdHQTk5PT48G9/KFId1eYx0U1xxSTRWABdHNjU8Kig3IuMV5FINCwURMUIaJ2wZABhEKy8gaYMmI+iaB8Tt7e3t7eV33O3tAhJVqVuNqOJ+CV7tHJGIal/t7e3t7e3tAxBXzbXsckicCmAu1npwaGLt7e3t7e3tAhNhayFdWEZlDGPVCM/t7e3t7e3t7e3tABhFMjMpLTBDDlGlZGcfne3t7evt5uDbARdHOD0/PTtOD02JjnyigO3n3drUzsC2BCVUT0tLS0paFlDt7e3q2cG+vLzCx8/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" HREF="http://store.mandriva.com/index.php?cPath=25_119">Intel® Compilers</A>
+</DL><P>
+</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.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://rpmfind.net/">RpmFind.net</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://www.ofb.biz/">OfB.biz</A>
+<DT><A HREF="http://www.osnews.com/">OSNews.com</A>
+<DT><A HREF="http://slashdot.org/">Slashdot</A>
+</DL><P>
+<DT><H3 >Programming</H3>
+<DL><P>
+<DT><A HREF="http://www.mandrivalinux.com/en/cookerdevel.php3">Mandriva Linux Cooker</A>
+<DT><A HREF="http://qa.mandriva.com/wiki">Mandriva Linux Development Community</A>
+<HR>
+<DT><A HREF="http://gcc.gnu.org/">GCC</A>
+<DT><A HREF="http://www.gtk.org/">GTK+</A>
+<DT><A HREF="http://developer.kde.org/">KDE - Developer's Corner</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.trolltech.com/products/qt/">Qt Overview</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/trunk/bookmarks/mozilla/mozilla-powerpackplus.html b/trunk/bookmarks/mozilla/mozilla-powerpackplus.html
new file mode 100644
index 0000000..e882bbe
--- /dev/null
+++ b/trunk/bookmarks/mozilla/mozilla-powerpackplus.html
@@ -0,0 +1,81 @@
+<!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">Mandriva</H3>
+<DL><p>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://www.mandriva.com/">Mandriva</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://store.mandriva.com/">Store</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://club.mandriva.com/">Club</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://support.mandriva.com/">Expert</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="https://online.mandriva.com/">Online</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAANbY1E9YMgAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAP9SURBVHjatFVbbFRVFF33NdPODH2J0wfgNFPE6gehEaUBoQFD/JAQTUPihzHR6BjSaoiREHwkQvzxp6GmUhweqUJCUaKJ8KvpR1MNwWKLrdha2qFYYEpbps/hzp17XGfuVIpKZz7qSU/vvefuu9bZe619RhFCIOvxufoqIE4AyqN40/4jm0/UrMGPKAqSBM9VcQXPfB8Oh1csLYGFHhTzulKDzx7L5d3zS0fwmVIHgcexrQ4wEshL3pYEpUtHYKIJGyuBwibAtwJ5VtTH1Uey+VSncAK2GOAOL3H+BgWnOSewW9xMRTQqnVjO65PnnS8C24Fki7wLZkcgXVRmVGCZWoHbd4EpfIgY3zQoNAyvLs5t9fyXzzkO5GwAcltQJP7MzY4AWIvhRDc25ABVtXwsIHASmJ4ERrsBvxcofg2I97GgBgmfALi0KXZ6NY1UFgqFRhYjUGQfRJuDdX4x2IQttMnqTwBbT8ujOVnYJEzduPlXCAzuAX66DBaSosOGZpyF7v4Gr0+d+U8COWYOF7V5tYkabC8HlodoS4uYJFHU9JWkCjNQuX1XHidLNtMDDLcDN3qZ7XVgjlXT9Slm+iVejtTfRyDHbFP+LY9r0o8drLNrPcUUTiYSGPMEFEXx8FFOkunLuIExYOwgEJ0Cfi/is47w5N49LF+jvjAdT32s2DrkMvWBCwbKCa5JJyqpOkDVHcUFgc1LJKfgVoSvuB4dZiYPU7di9IqqSHv82UEGvyA9qP9LdUO7i6RuYKaLoNe4QF30PCeDJHc4d4Uk0yQn8TRLco2mmA7iV7tqqMPcOpSGOcXdH5930b1xLL8W7hwfymwKywwSdJJ5Jy0wnGx4JEEn8NBDwK0CXLbXDf5obo6kA74gcMs/bbpguM+inOCqJCCQqjka/C2T4lRMpavG/Thn7fz5hlXKtHCCwCcf1AfOaFm5Cx7WOMB4KTwbnBa4t3ubRPZ8sHznRQJu6V9ih/oXazRnaO6vUMEW1hMsDXc+zuMmyvrGfCmN8Rir4J1xMpMEvgTUOSEf4pk6GWitfBdexnq5xYESWo4eFwYumOv7fomvG1krekqq+32VCNAcRTyiFMa5VdJocLoxE4Hq2geLwvUW4Lq1arRttqZv1vYk0jEN1a80nutrfePjNSO+91NwhcxG0+DRTIN1EpkJNNdbF+ee2tc5W3Unvd7GeYi1jc0Hrnnp6AdXv95tBm/mHIDGDDQVqzwThZG4n3VEZHGC2outneFwVPYaQc8/KDi4q/ng1W/fVoLRmo9gmDSZbAaw5dGVUWQC/5DN8Rt88dMDke/ecQdck/stGHYmDbL/TV4wAjsb3gv3P/1cx2hgKPV7l+m4/j/HXwIMAKacWjiFjDFxAAAAAElFTkSuQmCC" HREF="http://kiosk.mandriva.com/">Kiosk</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAeFgAAIBdAACecwAAiGsbALSDAAC1hAAAqYo3ANOaAADZnwAA4aQAAOiqAADwrwAA8LEHAPCyCADwtBAA8bYXAPG3GADyuR8A8rkgAPK9LgDzvjAA9MM/AM+tUQD0w0AA9MdPAPXITwD0yFAA9cpXAPXLWAD1zF8A9c1gAPXPaAD10GgA99JvAPfScAD31HcA99Z/APfYgwD32IUA+NyPAPjckAD54Z8A+eGgAPrmsAD7678A++vAAPzwzwD99d8A/vrvAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8PDBsAAAAAAAAAAAAXBwQBAwgMDwAAAAAAHwwICgwMCwUCBQwbAAAAFAwMDBQWDAwMCQIIDAAAHwwMJTEyMjIoDAwFAw8AAAwMHjIvGxgvMiIMCwEfAAANDBUsDwwMGjItDAwEAAAgEQwMDBIeKjEyIgwMBwAAJwwMDCgyMjIxKQwMChcAACcMDB4yMSMYDAwMDAgAAB8jDgwiMigMDB4wFAwMAAAPHhQMEzEyLS0yMRMMHwAADBIjEQwTKy4uKRMMFAAAABsMGCUUDQwMDw4MHgAAAAAADwwSGyUnJyIlAAAAAAAAAAAZDQ4eAAAAAAAAAAAAAP/DAAD+AQAA8AAAAOAAAADAAAAAwAAAAMABAACAAQAAgAEAAIADAAAAAwAAAAMAAAAHAAAADwAAgD8AAMP/AAA=" HREF="http://www.skype.com/">Skype</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEW3NwvgPwFhqAtcjx1gnRe0TSrMViVYgStglCx+KzdZazqVOEZkUk1UZ0nLcExZiEN1NlCQRFarQFxVVlWrZFKfS2BYW2R/Vm1fYWdqamqoc2dsZnKMY3daXIpub4p1e4aPcoKJiYm8l4xdY5NkaZhxa5dtcpx7e5SHh5WZmZl3e6B8g6GFiKSWiqWJkaaWmqi6r6yNl7OTmrSinbOdo7GnqrSypbessrm5uryiq8Ccssios8S1vMK9wcfAxcu8xdLEytLM0dfR1drKzuDN2ebc3uLY4+ng4uXm7Pfs8fT///8AAAAAAIAAgAAAgICAAACAAICAgACAgIDAwMAAAP8A/wAA////AAD/AP///wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBbTJOAAAACHRFWHRDb21tZW50APbMlr8AAACqSURBVHjaXY/LDoIwEEXreyELNdqNQGIgbQzExFfsAkuZpNTc//8gCwJGZzGTOXPnxfBn7BOegGui6YEmZ3yqBkUB8gqjO6Co+p1xaPvVfQDh0XovM3n24JQhn43mQC5FmhaWOQfJltsKUogkuYAVdrcOpmMO4QVJXrCsXG2CxYQjiqI4vtV+6Cvcc/4AeSDr7jDV7C2vtl9rqMVEPaD2s8rS91vtNGxTwRuBjD1T6ZStKQAAAABJRU5ErkJggg==" HREF="http://www.transgaming.com/">Transgaming</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAuQA9ALkASQDcAFUA/wAAPbkAc0j/AEhz/wAAktwAa4//AACq/wAlqv8Aa8b/AI7U/wDU8P8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAKAwAAAAAAAAAAAAkAAAAACgIDAAAAAAAAAAsLCQAAAAoCAgMAAAAAAAsLCwsJAAAKAgICAwAAAA4LDQ0LCwkACgQEBAQDAAAADg8NDAsAAAoEBAQEBAMAAAAODA4AAAAKBAQEBAQEAwAAAA4AAAAACgUFBgUFBQUDAAAAAAAAAAoFBQYKBQUFBQMAAAAAAAAKBQUGAQoFBQUFAwAAAAAACgcHBgEACgcHBwcDAAAAAAoHBwYBAAAKBwcHBwMAAAAKCAgGAQAAAAoICAgIAwAACggIBgEAAAAACggICAgDAH//AAA//wAAH+cAAA/DAAAHgQAAAwEAAAGDAAAAxwAAAG8AAAA/AAAAHwAAAA8AAAQHAAAGAwAABwEAAAeBAAA=" HREF="http://www.intervideo.com/jsp/LinDVD.jsp">LinDVD (Intervideo)</A>
+<DT><H3>Partners</H3>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAABAAAAAAAAeFgAAIBdAACecwAAiGsbALSDAAC1hAAAqYo3ANOaAADZnwAA4aQAAOiqAADwrwAA8LEHAPCyCADwtBAA8bYXAPG3GADyuR8A8rkgAPK9LgDzvjAA9MM/AM+tUQD0w0AA9MdPAPXITwD0yFAA9cpXAPXLWAD1zF8A9c1gAPXPaAD10GgA99JvAPfScAD31HcA99Z/APfYgwD32IUA+NyPAPjckAD54Z8A+eGgAPrmsAD7678A++vAAPzwzwD99d8A/vrvAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8PDBsAAAAAAAAAAAAXBwQBAwgMDwAAAAAAHwwICgwMCwUCBQwbAAAAFAwMDBQWDAwMCQIIDAAAHwwMJTEyMjIoDAwFAw8AAAwMHjIvGxgvMiIMCwEfAAANDBUsDwwMGjItDAwEAAAgEQwMDBIeKjEyIgwMBwAAJwwMDCgyMjIxKQwMChcAACcMDB4yMSMYDAwMDAgAAB8jDgwiMigMDB4wFAwMAAAPHhQMEzEyLS0yMRMMHwAADBIjEQwTKy4uKRMMFAAAABsMGCUUDQwMDw4MHgAAAAAADwwSGyUnJyIlAAAAAAAAAAAZDQ4eAAAAAAAAAAAAAP/DAAD+AQAA8AAAAOAAAADAAAAAwAAAAMABAACAAQAAgAEAAIADAAAAAwAAAAMAAAAHAAAADwAAgD8AAMP/AAA=" HREF="http://www.skype.com/">Skype</A>
+<DT><A ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAADAFBMVEW3NwvgPwFhqAtcjx1gnRe0TSrMViVYgStglCx+KzdZazqVOEZkUk1UZ0nLcExZiEN1NlCQRFarQFxVVlWrZFKfS2BYW2R/Vm1fYWdqamqoc2dsZnKMY3daXIpub4p1e4aPcoKJiYm8l4xdY5NkaZhxa5dtcpx7e5SHh5WZmZl3e6B8g6GFiKSWiqWJkaaWmqi6r6yNl7OTmrSinbOdo7GnqrSypbessrm5uryiq8Ccssios8S1vMK9wcfAxcu8xdLEytLM0dfR1drKzuDN2ebc3uLY4+ng4uXm7Pfs8fT///8AAAAAAIAAgAAAgICAAACAAICAgACAgIDAwMAAAP8A/wAA////AAD/AP///wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBbTJOAAAACHRFWHRDb21tZW50APbMlr8AAACqSURBVHjaXY/LDoIwEEXreyELNdqNQGIgbQzExFfsAkuZpNTc//8gCwJGZzGTOXPnxfBn7BOegGui6YEmZ3yqBkUB8gqjO6Co+p1xaPvVfQDh0XovM3n24JQhn43mQC5FmhaWOQfJltsKUogkuYAVdrcOpmMO4QVJXrCsXG2CxYQjiqI4vtV+6Cvcc/4AeSDr7jDV7C2vtl9rqMVEPaD2s8rS91vtNGxTwRuBjD1T6ZStKQAAAABJRU5ErkJggg==" HREF="http://www.transgaming.com/">Transgaming / Cedega</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABVAAAAuQA9ALkASQDcAFUA/wAAPbkAc0j/AEhz/wAAktwAa4//AACq/wAlqv8Aa8b/AI7U/wDU8P8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAAAAAAAAAAAAAAAAAKAwAAAAAAAAAAAAkAAAAACgIDAAAAAAAAAAsLCQAAAAoCAgMAAAAAAAsLCwsJAAAKAgICAwAAAA4LDQ0LCwkACgQEBAQDAAAADg8NDAsAAAoEBAQEBAMAAAAODA4AAAAKBAQEBAQEAwAAAA4AAAAACgUFBgUFBQUDAAAAAAAAAAoFBQYKBQUFBQMAAAAAAAAKBQUGAQoFBQUFAwAAAAAACgcHBgEACgcHBwcDAAAAAAoHBwYBAAAKBwcHBwMAAAAKCAgGAQAAAAoICAgIAwAACggIBgEAAAAACggICAgDAH//AAA//wAAH+cAAA/DAAAHgQAAAwEAAAGDAAAAxwAAAG8AAAA/AAAAHwAAAA8AAAQHAAAGAwAABwEAAAeBAAA=" HREF="http://www.intervideo.com/jsp/LinDVD.jsp">LinDVD (InterVideo)</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAQAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJycnIjQ0NGMyMjO3JSUr9S0tNv0yMjLSNDQ0hTQ0ND8aGhoQAAAAAAAAAAAAAAAAAAAAAAAAAAAnJycTKysraRQUGtEDBCD/AAE3/wACS/8AA1X/AANW/w0PTPokJTnbMjIyjzQ0NDEAAAAAAAAAAAAAAAAAAAAAIyMmkwoLKf8AAlj/AAV5/wAFif8ABpD/AAaT/wAGlf8ABpj/AAaU/xoddPkxMTOtJycnIgAAAAAAAAAAJyc3dAUIVP8AA1X/AAI7/wABK/8AAib/AgQ2/wMHT/8FCWP/BAl1/wIJi/8ACKr/Gx918DQ0NHUAAAAAFBQUEwkJF98AAAX/AAAa/wADTP8DCX//CRGw/xIbz/8YIuH/GSLo/xIc4v8KE9L/BQ7I/wMMyv8rLl3ZNDQ0PxcYGmcAABf/AAJA/wAFd/8DCpv/DBW8/xki3P8hK+//FyHd/wsTrP8MEYD/FBuQ/xEatf8IEs3/FBy8+jQ0NIUWFhuuAAEx/wADU/8BCI7/CRGz/xQe1/8SG9P/Bw6L/xkeZv9BSJ//VF/k/z9L+/8ZJOn/ChO3/w4Zzv8zMzfSExMg/wACT/8AAjn/Awuf/wkSwP8FDJr/DBBR/0BGlv93gu3/g4/+/1Fd9P8QGbH/Cg9g/xcfpf8MGOz/NjqV/QoKHf8AA2D/AAEp/wYNnv8JEbD/BQhF/0dQwP98h/7/jJn8/0tW6P8HDYf/HyNV/0ZS1/8uPP7/FSP//y0yl/UWFindAANb/wACT/8FCmf/ExvM/wIGYP8xN3n/g4/7/15p6P8EC5X/KC1R/3B85f9YZv//MUD//xwp//82OGq3BAQQfwACU/8ABHf/AQMx/xYezP8LEZ3/CAo8/2JrvP9veuP/Bwxv/zU7Z/9xf/r/T17//y07//8hLv//NDQ0YwUFBx4CBET/AAR5/wADVf8MEXn/GCDP/wADZ/8bH0f/bXnk/xshjf8JCiP/TFjX/ztK//8jMf//Ji6czycnJyIAAAAAERItnQAEaP8ABH//AgRC/xQcxf8FC5T/AANP/zA2gP81P87/AQRS/z5DjPEmNf//IC3+/ywsM2kAAAAAAAAAAAcHCBURE0rUAAR7/wAEc/8GC2z/CxTB/wAEev8SFE3zISZ3pwkQrf8JCQwyLTbT6yUpa4gnJycTAAAAAAAAAAAAAAAABgYJFRARQp0CB3//DBF19RYbfKYEDK7/Ehdw7AAAAAAKD3edAAAAAAkKERMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQUNGgwOQ2wAAAAACg1ZhRcchdAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AcAAMADAADAAQAAgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAAIABAADAVwAA8n8AAA==" HREF="http://store.mandriva.com/index.php?cPath=25_121">Bitdefender</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACIAAAIiIiIAISAAAgAAAgAhEgAAIAACACERIAIAAAIAIRESIAAAAgAhEREgAAICACERERIAICIAIRERESIAAAAhEREREgAAACERERERIAAAIRESERESAAAhERIhEREgACEREgIRERIAIiIiACIiIgAAAAAAAAAAD//wAAnwEAAI8BAACHgQAAgwEAAIABAACAAQAAgAkAAIAfAACAHwAAgA8AAIAHAACAAwAAgQEAAIGBAAD//wAA"HREF="http://www.kaspersky.com/">Kaspersky</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAazBTAHZDYgB+SmoAhFpyAHNucQCOiY0AoZmdALKurwDFw8UA19TWAOLh4gDq6OkAaBlIAAAAAAAAAAAAAAAAzLu7wAAAALmYiImawAALl2ZmZmiwAAp1VWZVV6AAot3d3dFWkAA93d3d0UaQAN0lVV3RRpAA3SdmbdFGkAA93d3d0VegAKPd3d3RWKAADJdmXdJpwAAMmHZN1JsAAH3d3d3YsAAAfd3dE4AAAAAMzMwAAAAAAAAAAAAAAAD8BwAA8AEAAOABAADgAQAAwAEAAMABAADAAQAAwAEAAMABAADAAQAA4AEAAOADAADABwAAwB8AAOD/AAD//wAA" HREF="http://store.mandriva.com/index.php?cPath=25_112">Arkeia</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABrGQQAhTQBAII0BwCKNwAAfzUOAIg4AQCPPgAAkD8AAI5CAwCLRQMAkkgCAJdJAQCZSgAAmUoBAJhJBQCXSgIAmEoCAJZMBQCZTA0Amk4OAJ5VEQCgVxIAhVUpAHxYOABRVV8Aq2otAKpuNgCucTcAsHI5AEZpiwCwfEwAtn5KALqEUgC6hlUAHHXoAB598gAgf+wAL4fWADuLxQAihvEAx5xzAMecdAApkdEAyJ94ACeQ6gAoku4Ay6N+ACmX8QAnlvcANp3cACma8QAtoOYAz6uKACud8gDSr48AOaH4ACyj+QDTsZIALaX5AC2m+QAvqPMALaf5AC6n+QAuqPkA1bWWAEOn+QAvqvoAL6v6ADSr+QAwrPoA17ibADCt+gAxrfoAcrnnAE+4+wBZuPoATrn7AF2++wDgyLEAd7/1AHfA+wCCx/kA5dG/AInJ+wCLzvwA6NXFAIjP/ACg2PwAp9n9AKvZ/ACw3v0A7+PXALXf/QDN6f4A3fH+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAX19fX19fXwBfX19fX19fX19fX19fXx0mQ19HMypfX19fX18yNTg6PT9CRUdIPF9fLV8vXwIEGF87PkRKTUwxX19fXwUDAV9fX19LVFdWX19fXwgHBl9fX19fUVxeWklfX19fDhMSX19fX19ZXVhfX19fFBwgHl9fX19fUFNPX19fXxsoRjlfX19fXzdBX19fX18hQFtVLhoJXyUwLF9fX19fXzZSTikZDQwMEQ8LX19fX19fNCsfFRAWF18KX19fX19fX19fX19fJ19fX19fX19fX19fX19fJF9fX19fX19fX19fX19fI19fX19fX19fX19fX19fIl9fX19fX19fX/7/AAD8RwAA4AMAAFEBAADjwwAAx8EAAOPjAADD4wAAw+cAAMBHAADgAwAA8BcAAP+/AAD/fwAA/v8AAP3/AAA=" HREF="http://store.mandriva.com/index.php?cPath=25_38">Crossover (CodeWeavers)</A>
+<DT><A ICON="data:image/x-icon;base64,AAABAAEAGBgAAAEACADIBgAAFgAAACgAAAAYAAAAMAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuHAkAMRwKAC4dCgAuHQsAMCAOAB4eHwA1IxEAJSQlACQjKABtKwAAcSsAACcmLQB5OgAALy8zAH5GAAB/RgAAXUAaADk5PwBeQx4AYEMfAD0+QgAyO08AhEsTAGFKKwBhSiwAQkRHAEZERgCxXQAATEtNALNfAAC1XwAATUxNALVgAAC2YgAAt2MAALtlAABtWDwAcFg+ALpqAABSVFcAvG4AALxwAAC9cQAAvnIAALlrEwC/dAAAWFldAL92AgC+dwgAXV1hAMN5BQDAeQsAY2JjAMJ7DwDEfQwAw30NAMR9DgDCfRAAw30QAMF9EQDDfREAwn4RAMJ+EgDDfhIAxH8QAMR/EQBlZWkA14UBANOFBgDVhQcAwIAaANSHCwDBgR4Aa2xtAMWGIwDHhyIAx4cjAFxqhADbjRIAyIkiAF1thABgbogAdHR3AHZ0dwDXkB0A2JAdAHZ2eQDZkiEAyo4vABpzpgDeliIAxY89AH19gADMkjoAaniSAH1+gQBneZUA2ZgvAISDhgBygJsAhoeJAOShOQAAf9EAiImMAIuJjADRnE8Ai4uNANSeTwCKjI4AAIPTAEGNqQAAhtIAjZCSAJGRkgDVpVoAFJXCAJaWmACWlpkAMJHMAJmZnQBVm7cAm52dAJ+fnwArmtcApaWlAHOntQDsuWkAKqDjAKaoqQAzo+AAJqLpANi2ggAhqOUAAK3qADKo4gCvr68Arq6yAK6vswCxsbQAIbDsALGztADdv48AtbW3ACey9AC8tLsAu7m7AI+6ygC4ursAL7jyAEW27gCcuc0AKrv0ABm5/wApwPMAr7vPAEPA7wD4z5EAyMfJAAnT/ADJycoAMM/5AC7R+gDKy80AwsvRAEzP9QDP0NEAXtT3ANLR0wDq2b0A69i/AEDa+wA92/wAU9r5AE/a/QAg4v8AKOH/AEzg+gDZ2dcAVOH6ACHo/wBP4voA7t7LANva2gBN5voA3NzbANzc3ABr4voA3N3eAODe3gA/7P8A3uDgAFnq/wDf4eAA4eDiAOHh4QDx5dQA4eLgAP/h2QDz5tUA5ePkAPTo2ADm5ucA2eP0APns2AD57NoA9OrgAOjo6gDp6ekA6enqAN7m9gDf6fsA+e7oAO7u8ADt7vEA8fHxAP/z6QDy8vMA8/PyAPXz8wDy9PQA9fT1APT19QD5+PgA//7sAPn4+gD//PEA+Pj/AP//9AD9/PwA+/38AP39/QD+/f0A///5AP//+gD9/v4A/v7+AP7//wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiRUT0tLS0tMLMjt7e2Sr7+wrKa6spuVABdHQDk5OTk8Hcbt7e3hbrOqpLSroJeBABdHQDk5OTk8Hcbt7e3txXOurbehlIZ7ABdHQDk5OTk8Hcbt7e3t7dd4nr2Zi4+CABdHQDk5OTk8Hcbt7e3t7e3tfYWYhH92ABdHQDk5OTk8Hcbt7e3t7e3t7ZBZb21mABdHQDk5OTk8Hcbt7e3t7e3t7e3p06OWABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt7e3t7e3t7e3t7e3tABdHQDk5OTk8Hcbt3u3t7e3t7e3t7e3tABdHQDk5OTk6HszSsbu4ydjt7e3t7e3tABdHQDk5OTk6HsvRuYqnk5/t7e3t7e3tABdHQDk5OTk8HcPt7e3t7e3t7e3t7e3tABdHQTk5PT48G9/KFId1eYx0U1xxSTRWABdHNjU8Kig3IuMV5FINCwURMUIaJ2wZABhEKy8gaYMmI+iaB8Tt7e3t7eV33O3tAhJVqVuNqOJ+CV7tHJGIal/t7e3t7e3tAxBXzbXsckicCmAu1npwaGLt7e3t7e3tAhNhayFdWEZlDGPVCM/t7e3t7e3t7e3tABhFMjMpLTBDDlGlZGcfne3t7evt5uDbARdHOD0/PTtOD02JjnyigO3n3drUzsC2BCVUT0tLS0paFlDt7e3q2cG+vLzCx8/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" HREF="http://store.mandriva.com/index.php?cPath=25_119">Intel® Compilers</A>
+</DL><P>
+</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.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://rpmfind.net/">RpmFind.net</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://www.ofb.biz/">OfB.biz</A>
+<DT><A HREF="http://www.osnews.com/">OSNews.com</A>
+<DT><A HREF="http://slashdot.org/">Slashdot</A>
+</DL><P>
+<DT><H3 >Programming</H3>
+<DL><P>
+<DT><A HREF="http://www.mandrivalinux.com/en/cookerdevel.php3">Mandriva Linux Cooker</A>
+<DT><A HREF="http://qa.mandriva.com/wiki">Mandriva Linux Development Community</A>
+<HR>
+<DT><A HREF="http://gcc.gnu.org/">GCC</A>
+<DT><A HREF="http://www.gtk.org/">GTK+</A>
+<DT><A HREF="http://developer.kde.org/">KDE - Developer's Corner</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.trolltech.com/products/qt/">Qt Overview</A>
+<DT><A HREF="http://www.rpm.org/">RPM.org</A>
+<DT><A HREF="http://sourceforge.net/">SourceForge</A>
+</DL><P>
+<DT><H3 >Server</H3>
+<DL><P>
+<DT><A HREF="http://www.apache.org/">Apache</A>
+<DT><A HREF="http://kolab.kde.org/">Kolab</A>
+<DT><A HREF="http://www.mysql.com/">MySQL</A>
+<DT><A HREF="http://www.php.net/">PHP</A>
+<DT><A HREF="http://www.postfix.com/">Postfix</A>
+<DT><A HREF="http://www.postgresql.org/">PostgreSQL</A>
+<DT><A HREF="http://www.proftpd.org/">ProFTPD</A>
+<DT><A HREF="http://www.openldap.org/">OpenLDAP</A>
+<DT><A HREF="http://samba.org/samba/samba.html">Samba</A>
+</DL><P>
+</DL><P>
diff --git a/trunk/dm/GdmGreeterTheme.desktop b/trunk/dm/GdmGreeterTheme.desktop
new file mode 100644
index 0000000..d61548d
--- /dev/null
+++ b/trunk/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-2005 Mandriva
+Screenshot=screenshot.png
diff --git a/trunk/dm/KdmGreeterTheme.desktop b/trunk/dm/KdmGreeterTheme.desktop
new file mode 100644
index 0000000..da216af
--- /dev/null
+++ b/trunk/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-2005 Mandriva
+Screenshot=screenshot.png
diff --git a/trunk/dm/disconnect.png b/trunk/dm/disconnect.png
new file mode 100644
index 0000000..ecb9949
--- /dev/null
+++ b/trunk/dm/disconnect.png
diff --git a/trunk/dm/languages.png b/trunk/dm/languages.png
new file mode 100644
index 0000000..a6d79f3
--- /dev/null
+++ b/trunk/dm/languages.png
diff --git a/trunk/dm/mdk-gdm.xml b/trunk/dm/mdk-gdm.xml
new file mode 100644
index 0000000..14d7d16
--- /dev/null
+++ b/trunk/dm/mdk-gdm.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+  <item type="pixmap">
+    <normal file="/usr/share/mdk/backgrounds/default.png"/>
+    <pos x="0" y="0" width="100%" height="100%"/>
+  </item>
+
+  <item type="rect">
+    <pos x="0" y="90%" width="100%" height="10%"/>
+    <fixed>
+      <item type="rect">
+        <normal color="#ffffff"/>
+        <pos x="0" y="4" width="100%" height="100%"/>
+        <box orientation="horizontal" spacing="10" xpadding="10">
+          <item type="rect" id="language_button" button="true">
+            <normal color="#ffffff"/>
+	    <pos y="50%" anchor="w" width="box" height="box"/>
+            <box orientation="horizontal" spacing="10" xpadding="10">
+	      <item type="pixmap">
+	        <normal file="languages.png" tint="#dddddd"/>
+	        <prelight file="languages.png"/>
+		<active file="languages.png" tint="#b8bcdb"/>
+	        <pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: _Language -->
+		<stock type="language"/>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="session_button" button="true">
+            <normal color="#ffffff"/>
+	    <pos y="50%" anchor="w" width="box" height="box"/>
+            <box orientation="horizontal" spacing="10" xpadding="10">
+	      <item type="pixmap">
+	        <normal file="sessions.png" tint="#dddddd"/>
+	        <prelight file="sessions.png"/>
+		<active file="sessions.png" tint="#b8bcdb"/>
+		<pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: _Session -->
+		<stock type="session"/>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="system_button" button="true">
+            <normal color="#ffffff"/>
+	    <show modes="console" type="system"/>
+	    <pos y="50%" anchor="w" width="box" height="box"/>
+            <box orientation="horizontal" spacing="10" xpadding="10">
+	      <item type="pixmap">
+	        <normal file="system.png" tint="#dddddd"/>
+	        <prelight file="system.png"/>
+		<active file="system.png" tint="#b8bcdb"/>
+	        <pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: _Actions -->
+		<stock type="system"/>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="disconnect_button" button="true">
+            <normal color="#ffffff"/>
+	    <show modes="flexi,remote"/>
+	    <pos y="50%" anchor="w" width="box" height="box"/>
+            <box orientation="horizontal" spacing="10" xpadding="10">
+	      <item type="pixmap">
+	        <normal file="disconnect.png" tint="#dddddd"/>
+		<prelight file="disconnect.png"/>
+		<active file="disconnect.png" tint="#b8bcdb"/>
+	        <pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: D_isconnect -->
+		<stock type="disconnect"/>
+	        <show modes="remote"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: _Quit -->
+		<stock type="quit"/>
+	        <show modes="flexi"/>
+	      </item>
+            </box>
+          </item>
+        </box>
+      </item>
+    </fixed>
+  </item>
+
+  <item type="label" id="clock">
+    <normal color="#0d2d84" font="Sans 16"/>
+    <pos x="-10" y="95%" anchor="e"/>
+    <text>%c</text>
+  </item>
+
+  <item type="rect" id="caps-lock-warning">
+    <normal color="#ffffff" alpha="0"/>
+    <pos anchor="c" x="50%" y="50%" 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>
+
+  <item type="rect">
+    <show type="timed"/>
+    <normal color="#ffffff" alpha="0"/>
+    <pos anchor="c" x="50%" y="70%" 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 14"/>
+        <pos x="50%" anchor="n"/>
+	<!-- Stock label for: User %s will login in %d seconds -->
+	<stock type="timed-label"/>
+      </item>
+    </box>
+  </item>
+
+  <item type="rect">
+    <normal color="#ffffff" alpha="0"/>
+    <pos anchor="c" x="50%" y="40%" width="box" height="box"/>
+    <box orientation="vertical" min-width="350" xpadding="30" ypadding="30" spacing="10">
+      <item type="label">
+        <pos anchor="n" x="50%"/>
+        <normal color="#FFFFFF" font="Sans 18"/>
+	<!-- Stock label for: Welcome to %h -->
+	<stock type="welcome-label"/>
+      </item>
+      <item type="label" id="pam-prompt">
+        <pos anchor="nw" x="10%" />
+        <normal color="#FFFFFF" font="Sans 14"/>
+	<!-- Stock label for: Username: -->
+	<stock type="username-label"/>
+      </item>
+      <item type="rect">
+	<normal color="#FFFFFF"/>
+        <pos anchor="n" x="50%" height="24" width="80%"/>
+	<fixed>
+	  <item type="entry" id="user-pw-entry">
+            <pos anchor="nw" x="1" y="1" height="-2" width="-2"/>
+	  </item>
+	</fixed>
+      </item>
+      <item type="label" id="pam-message">
+        <pos anchor="n" x="50%"/>
+        <normal color="#FFFFFF" font="Sans 12"/>
+	<text></text>
+      </item>
+    </box>
+    <fixed>
+      <item type="label" id="pam-error">
+        <pos anchor="n" x="50%" y="110%"/>
+        <normal color="#ffffff" font="Sans 16"/>
+        <text></text>
+      </item>
+    </fixed>
+  </item>
+</greeter>
diff --git a/trunk/dm/mdk-kde.xml b/trunk/dm/mdk-kde.xml
new file mode 100644
index 0000000..2af1ebc
--- /dev/null
+++ b/trunk/dm/mdk-kde.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+  <item type="pixmap">
+    <normal file="/usr/share/mdk/backgrounds/default.png"/>
+    <pos x="0" y="0" width="100%" height="100%"/>
+  </item>
+
+  <item type="rect">
+    <pos x="0" y="90%" width="100%" height="10%"/>
+    <fixed>
+      <item type="rect">
+        <normal color="#ffffff"/>
+        <pos x="0" y="4" width="100%" height="100%"/>
+        <box orientation="horizontal" spacing="10" xpadding="10">
+          <item type="rect" id="language_button" button="true">
+            <normal color="#ffffff"/>
+	    <pos y="50%" anchor="w" width="box" height="box"/>
+            <box orientation="horizontal" spacing="10" xpadding="10">
+	      <item type="pixmap">
+	        <normal file="languages.png" tint="#dddddd"/>
+	        <prelight file="languages.png"/>
+		<active file="languages.png" tint="#b8bcdb"/>
+	        <pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: _Language -->
+		<stock type="language"/>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="session_button" button="true">
+            <normal color="#ffffff"/>
+	    <pos y="50%" anchor="w" width="box" height="box"/>
+            <box orientation="horizontal" spacing="10" xpadding="10">
+	      <item type="pixmap">
+	        <normal file="sessions.png" tint="#dddddd"/>
+	        <prelight file="sessions.png"/>
+		<active file="sessions.png" tint="#b8bcdb"/>
+		<pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: _Session -->
+		<stock type="session"/>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="system_button" button="true">
+            <normal color="#ffffff"/>
+	    <show modes="console" type="system"/>
+	    <pos y="50%" anchor="w" width="box" height="box"/>
+            <box orientation="horizontal" spacing="10" xpadding="10">
+	      <item type="pixmap">
+	        <normal file="system.png" tint="#dddddd"/>
+	        <prelight file="system.png"/>
+		<active file="system.png" tint="#b8bcdb"/>
+	        <pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: _Actions -->
+		<stock type="system"/>
+	      </item>
+            </box>
+          </item>
+          <item type="rect" id="disconnect_button" button="true">
+            <normal color="#ffffff"/>
+	    <show modes="flexi,remote"/>
+	    <pos y="50%" anchor="w" width="box" height="box"/>
+            <box orientation="horizontal" spacing="10" xpadding="10">
+	      <item type="pixmap">
+	        <normal file="disconnect.png" tint="#dddddd"/>
+		<prelight file="disconnect.png"/>
+		<active file="disconnect.png" tint="#b8bcdb"/>
+	        <pos y="50%" anchor="w"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: D_isconnect -->
+		<stock type="disconnect"/>
+	        <show modes="remote"/>
+	      </item>
+	      <item type="label">
+	        <normal color="#21449c" font="Sans 14"/>
+		<prelight color="#666666" font="Sans 14"/>
+		<active color="#0d2d84" font="Sans 14"/>
+	        <pos y="50%" anchor="w"/>
+		<!-- Stock label for: _Quit -->
+		<stock type="quit"/>
+	        <show modes="flexi"/>
+	      </item>
+            </box>
+          </item>
+        </box>
+      </item>
+    </fixed>
+  </item>
+
+  <item type="label" id="clock">
+    <normal color="#0d2d84" font="Sans 16"/>
+    <pos x="-10" y="95%" anchor="e"/>
+    <text>%c</text>
+  </item>
+
+  <item type="rect" id="caps-lock-warning">
+    <normal color="#ffffff" alpha="0.0"/>
+    <pos anchor="c" x="50%" y="50%" 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>
+
+  <item type="rect">
+    <show type="timed"/>
+    <normal color="#ffffff" alpha="0"/>
+    <pos anchor="c" x="50%" y="70%" width="box" height="box"/>
+    <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+      <item type="label" id="timed-label">
+        <normal color="#000000" font="Sans 14"/>
+        <pos x="50%" anchor="n"/>
+	<!-- Stock label for: User %s will login in %d seconds -->
+	<stock type="timed-label"/>
+      </item>
+    </box>
+  </item>
+
+  <item type="rect">
+    <normal color="#ffffff" alpha="0"/>
+    <pos anchor="c" x="50%" y="40%" width="box" height="box"/>
+    <box orientation="vertical" min-width="350" xpadding="30" ypadding="30" spacing="10">
+      <item type="label">
+        <pos anchor="n" x="50%"/>
+        <normal color="#FFFFFF" font="Sans 18"/>
+	<!-- Stock label for: Welcome to %h -->
+	<stock type="welcome-label"/>
+</item>
+      <item type="rect" id="talker">
+      <normal color="#FFFFFF" alpha="0" font="Sans 16"/>
+      <pos anchor="n" x="50%" width="box" height="box"/>
+      <!-- box orientation="vertical" xpadding="0" ypadding="0" spacing="10" -->
+      <box orientation="horizontal" xpadding="0" ypadding="0" spacing="0">
+        <item type="rect">
+	<normal color="#FF8080" alpha="0.0"/>
+	<pos anchor="w" y="50%" width="box" height="box"/>
+        <box orientation="vertical" xpadding="0" ypadding="0" spacing="14">
+          <item type="label">
+            <pos anchor="ne" x="100%"/>
+            <normal color="#FFFFFF" font="Sans 14"/>
+     	 	<!-- Stock label for: Username: -->
+     	 	<stock type="username-label"/>
+          </item>
+          <item type="label">
+            <pos anchor="ne" x="100%"/>
+            <normal color="#FFFFFF" font="Sans 14"/>
+     	 	<!-- Stock label for: Password: -->
+     	 	<stock type="password-label"/>
+          </item>
+        </box>
+	</item>
+        <item type="rect">
+	<normal color="#FF80FF" alpha="0.0"/>
+	<pos anchor="w" y="50%" width="box" height="box"/>
+        <box orientation="vertical" xpadding="0" ypadding="0" spacing="10">
+    		  <item type="entry" id="user-entry">
+            <pos anchor="n" x="50%" height="24" width="150"/>
+    		  </item>
+    		  <item type="entry" id="pw-entry">
+            <pos anchor="n" x="50%" height="24" width="150"/>
+    		  </item>
+        </box>
+	</item>
+      </box>
+      </item>
+    </box>
+    <fixed>
+      <item type="label" id="pam-error">
+        <pos anchor="n" x="50%" y="110%"/>
+        <normal color="#ffffff" font="Sans 12"/>
+        <text></text>
+      </item>
+    </fixed>
+  </item>
+</greeter>
diff --git a/trunk/dm/reboot.png b/trunk/dm/reboot.png
new file mode 100644
index 0000000..705cd03
--- /dev/null
+++ b/trunk/dm/reboot.png
diff --git a/trunk/dm/screenshot.png b/trunk/dm/screenshot.png
new file mode 100644
index 0000000..a921894
--- /dev/null
+++ b/trunk/dm/screenshot.png
diff --git a/trunk/dm/sessions.png b/trunk/dm/sessions.png
new file mode 100644
index 0000000..0058814
--- /dev/null
+++ b/trunk/dm/sessions.png
diff --git a/trunk/dm/star.png b/trunk/dm/star.png
new file mode 100644
index 0000000..a015ab8
--- /dev/null
+++ b/trunk/dm/star.png
diff --git a/trunk/dm/system.png b/trunk/dm/system.png
new file mode 100644
index 0000000..7423ea3
--- /dev/null
+++ b/trunk/dm/system.png
diff --git a/trunk/faces/default.png b/trunk/faces/default.png
new file mode 100644
index 0000000..de08e51
--- /dev/null
+++ b/trunk/faces/default.png
diff --git a/trunk/faces/ic-bird.png b/trunk/faces/ic-bird.png
new file mode 100644
index 0000000..ad8f7f7
--- /dev/null
+++ b/trunk/faces/ic-bird.png
diff --git a/trunk/faces/ic-bird2.png b/trunk/faces/ic-bird2.png
new file mode 100644
index 0000000..e52d381
--- /dev/null
+++ b/trunk/faces/ic-bird2.png
diff --git a/trunk/faces/ic-cat.png b/trunk/faces/ic-cat.png
new file mode 100644
index 0000000..84ca14c
--- /dev/null
+++ b/trunk/faces/ic-cat.png
diff --git a/trunk/faces/ic-dog.png b/trunk/faces/ic-dog.png
new file mode 100644
index 0000000..877ed4a
--- /dev/null
+++ b/trunk/faces/ic-dog.png
diff --git a/trunk/faces/ic-fish.png b/trunk/faces/ic-fish.png
new file mode 100644
index 0000000..201fd10
--- /dev/null
+++ b/trunk/faces/ic-fish.png
diff --git a/trunk/faces/ic-flower1.png b/trunk/faces/ic-flower1.png
new file mode 100644
index 0000000..9d6f5ca
--- /dev/null
+++ b/trunk/faces/ic-flower1.png
diff --git a/trunk/faces/ic-flower2.png b/trunk/faces/ic-flower2.png
new file mode 100644
index 0000000..fc4b12a
--- /dev/null
+++ b/trunk/faces/ic-flower2.png
diff --git a/trunk/faces/ic-flower3.png b/trunk/faces/ic-flower3.png
new file mode 100644
index 0000000..142fc0a
--- /dev/null
+++ b/trunk/faces/ic-flower3.png
diff --git a/trunk/faces/ic-flower4.png b/trunk/faces/ic-flower4.png
new file mode 100644
index 0000000..b012085
--- /dev/null
+++ b/trunk/faces/ic-flower4.png
diff --git a/trunk/faces/ic-flower5.png b/trunk/faces/ic-flower5.png
new file mode 100644
index 0000000..b4cda81
--- /dev/null
+++ b/trunk/faces/ic-flower5.png
diff --git a/trunk/faces/ic-nature1.png b/trunk/faces/ic-nature1.png
new file mode 100644
index 0000000..187c294
--- /dev/null
+++ b/trunk/faces/ic-nature1.png
diff --git a/trunk/faces/ic-nature2.png b/trunk/faces/ic-nature2.png
new file mode 100644
index 0000000..4daf6ab
--- /dev/null
+++ b/trunk/faces/ic-nature2.png
diff --git a/trunk/faces/ic-nature3.png b/trunk/faces/ic-nature3.png
new file mode 100644
index 0000000..57e2dc7
--- /dev/null
+++ b/trunk/faces/ic-nature3.png
diff --git a/trunk/faces/ic-nature4.png b/trunk/faces/ic-nature4.png
new file mode 100644
index 0000000..63e977a
--- /dev/null
+++ b/trunk/faces/ic-nature4.png
diff --git a/trunk/faces/ic-nature5.png b/trunk/faces/ic-nature5.png
new file mode 100644
index 0000000..0e24010
--- /dev/null
+++ b/trunk/faces/ic-nature5.png
diff --git a/trunk/faces/ic-tux1.png b/trunk/faces/ic-tux1.png
new file mode 100644
index 0000000..caf8951
--- /dev/null
+++ b/trunk/faces/ic-tux1.png
diff --git a/trunk/faces/ic-tux2.png b/trunk/faces/ic-tux2.png
new file mode 100644
index 0000000..3ef1eb5
--- /dev/null
+++ b/trunk/faces/ic-tux2.png
diff --git a/trunk/faces/ic-tux3.png b/trunk/faces/ic-tux3.png
new file mode 100644
index 0000000..0edbfaa
--- /dev/null
+++ b/trunk/faces/ic-tux3.png
diff --git a/trunk/faces/ic-tux4.png b/trunk/faces/ic-tux4.png
new file mode 100644
index 0000000..8b0a2ea
--- /dev/null
+++ b/trunk/faces/ic-tux4.png
diff --git a/trunk/faces/ic-tux5.png b/trunk/faces/ic-tux5.png
new file mode 100644
index 0000000..36887b3
--- /dev/null
+++ b/trunk/faces/ic-tux5.png
diff --git a/trunk/faces/ic-tuxgeneric.png b/trunk/faces/ic-tuxgeneric.png
new file mode 100644
index 0000000..f561bf0
--- /dev/null
+++ b/trunk/faces/ic-tuxgeneric.png
diff --git a/trunk/kde/kdm-mdk-logo.png b/trunk/kde/kdm-mdk-logo.png
new file mode 100644
index 0000000..725f3a3
--- /dev/null
+++ b/trunk/kde/kdm-mdk-logo.png
diff --git a/trunk/kdelnk/Cd-Rom.kdelnk b/trunk/kdelnk/Cd-Rom.kdelnk
new file mode 100644
index 0000000..754356c
--- /dev/null
+++ b/trunk/kdelnk/Cd-Rom.kdelnk
@@ -0,0 +1,35 @@
+# KDE Config File
+[KDE Desktop Entry]
+Name=Cd-Rom_supermount
+Comment[bg]=CD-ROM óñòðîéñòâî
+Comment[br]=Trobarzhell lenn CD-ROM
+Comment[ca]=Dispositiu de CD-ROM
+Comment[cs]=CD-ROM mechanika
+Comment[da]=CD-ROM Enhed
+Comment[de]=CD-ROM Laufwerk
+Comment[es]=Dispositivo lector de CDROMs
+Comment[et]=CD-ROM seade
+Comment[fi]=Tiedostosysteemi
+Comment[fr]=Périphérique lecteur de CDROMs
+Comment[ga]=Gaireas Dlúthdhiosca ROM
+Comment[gl]=Dispositivo CD-ROM
+Comment[hr]=CD-ROM ureðaj
+Comment[hu]=CD-ROM meghajtó
+Comment[id]=CD-ROM Anda
+Comment[is]=Geisladrif
+Comment[it]=Lettore CDROM
+Comment[lt]=CDROM árenginys
+Comment[lv]=CDROM iekârta
+Comment[nl]=CDROM drive
+Comment[no]=CDROM enhet
+Comment[pl]=Urz±dzenie
+Comment[pt]=Dispositivo com Sistema de Ficheiros
+Comment[ro]=Lector CDROM
+Comment[sk]=CD-ROM mechanika
+Comment[tr]=CD-ROM otomatik baðlama
+Comment[uk]=ëÏÍÐÁËÔ ÄÉÓË
+Comment[wa]=Éndjin lijheu di plakes lazer
+Type=Link
+URL=/mnt/cdrom
+MiniIcon=cdrom_supermount.xpm
+Icon=cdrom_supermount.xpm
diff --git a/trunk/kdelnk/floppy.kdelnk b/trunk/kdelnk/floppy.kdelnk
new file mode 100644
index 0000000..52dccf3
--- /dev/null
+++ b/trunk/kdelnk/floppy.kdelnk
@@ -0,0 +1,34 @@
+# KDE Config File
+[KDE Desktop Entry]
+Name=Floppy
+Name[bg]=Ôëîïè óñòðîéñòâî
+Name[br]=Trobarzhell pladennigoù
+Name[ca]=Dispositiu de disquet
+Name[cs]=Disketová mechanika
+Name[de]=3"-Zoll Laufwerk
+Name[es]=Dispositivo disquetera
+Name[et]=Flopiseade
+Name[fi]=Tiedostosysteemi
+Name[fr]=Lecteur de disquettes
+Name[ga]=Gaireas flapach
+Name[gl]=Dispositivo lector de disquetes
+Name[hr]=Disketni ureðaj
+Name[hu]=Hajlékonylemez meghajtó (floppy)
+Name[id]=Isi Disket Anda
+Name[is]=Disklinga drif
+Name[it]=Unità floppy
+Name[lt]=Diskeliø árenginys
+Name[lv]=Diskeðu iekârta
+Name[nl]=Floppy drive
+Name[no]=Diskett enhet
+Name[pl]=Urz±dzenie
+Name[pt]=Dispositivo com Sistema de Ficheiros
+Name[ro]=Lector de dischete
+Name[sk]=Disketová mechanika
+Name[tr]=Disket sürücü
+Name[uk]=äÉÓËÅÔÁ
+Name[wa]=Mineu di plaketes
+Icon=3floppy_mount.xpm
+MiniIcon=3floppy_supermount.xpm
+Type=Link
+URL=/mnt/floppy
diff --git a/trunk/krootwarning/.cvsignore b/trunk/krootwarning/.cvsignore
new file mode 100644
index 0000000..70845e0
--- /dev/null
+++ b/trunk/krootwarning/.cvsignore
@@ -0,0 +1 @@
+Makefile.in
diff --git a/trunk/man/C/chksession.8 b/trunk/man/C/chksession.8
new file mode 100644
index 0000000..4ca9b70
--- /dev/null
+++ b/trunk/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/trunk/man/cs/chksession.8 b/trunk/man/cs/chksession.8
new file mode 100644
index 0000000..0c69387
--- /dev/null
+++ b/trunk/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/trunk/man/et/chksession.8 b/trunk/man/et/chksession.8
new file mode 100644
index 0000000..72e0268
--- /dev/null
+++ b/trunk/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/trunk/man/eu/chksession.8 b/trunk/man/eu/chksession.8
new file mode 100644
index 0000000..5f5f4ce
--- /dev/null
+++ b/trunk/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/trunk/man/fr/chksession.8 b/trunk/man/fr/chksession.8
new file mode 100644
index 0000000..ac16d87
--- /dev/null
+++ b/trunk/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/trunk/man/it/chksession.8 b/trunk/man/it/chksession.8
new file mode 100644
index 0000000..3434b31
--- /dev/null
+++ b/trunk/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/trunk/man/ru/chksession.8 b/trunk/man/ru/chksession.8
new file mode 100644
index 0000000..828e3c5
--- /dev/null
+++ b/trunk/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/trunk/man/uk/chksession.8 b/trunk/man/uk/chksession.8
new file mode 100644
index 0000000..d5b3f90
--- /dev/null
+++ b/trunk/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/trunk/menu/applications-discovery.menu b/trunk/menu/applications-discovery.menu
new file mode 100644
index 0000000..3baaf10
--- /dev/null
+++ b/trunk/menu/applications-discovery.menu
@@ -0,0 +1,243 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <Layout>
+    <Menuname>Games</Menuname>
+    <Menuname>Graphics</Menuname>
+    <Menuname>Internet</Menuname>
+    <Menuname>Multimedia</Menuname>
+    <Menuname>Office</Menuname>
+    <Menuname>System</Menuname>
+    <Menuname>Help</Menuname>
+    <Menuname>More Applications</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </Layout>
+  <DefaultLayout inline="true" inline_limit="1" inline_header="false">
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </DefaultLayout>
+  <DefaultMergeDirs/>
+  <KDELegacyDirs/>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>mandrivalinux.directory</Directory>
+  <Include>
+    <Or>
+      <Category>X-MandrivaLinux</Category>
+      <Category>X-MandrivaLinux-Other</Category>
+    </Or>
+  </Include>
+  <Menu>
+    <Name>Games</Name>
+    <Directory>mandriva-moreapplications-games.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Games</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Adventure</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Arcade</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Boards</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Cards</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Puzzles</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Sports</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Strategy</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
+        <Category>Game</Category>
+        <Category>Amusement</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Graphics</Name>
+    <Directory>mandriva-multimedia-graphics.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
+        <Category>Graphics</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Internet</Name>
+    <Directory>mandriva-internet.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-Internet</Category>
+        <Category>X-MandrivaLinux-Internet-Chat</Category>
+        <Category>X-MandrivaLinux-Internet-FileTransfer</Category>
+        <Category>X-MandrivaLinux-Internet-InstantMessaging</Category>
+        <Category>X-MandrivaLinux-Internet-Mail</Category>
+        <Category>X-MandrivaLinux-Internet-News</Category>
+        <Category>X-MandrivaLinux-Internet-VideoConference</Category>
+        <Category>X-MandrivaLinux-Internet-Other</Category>
+        <Category>X-MandrivaLinux-Internet-RemoteAccess</Category>
+        <Category>X-MandrivaLinux-Internet-WebBrowsers</Category>
+        <Category>X-MandrivaLinux-Internet-WebEditors</Category>
+        <Category>Network</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Layout>
+      <Menuname>Sound</Menuname>
+      <Menuname>Video</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-multimedia.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-Multimedia</Category>
+        <Category>X-MandrivaLinux-Multimedia-Sound</Category>
+        <Category>X-MandrivaLinux-Multimedia-Video</Category>
+        <Category>X-MandrivaLinux-Multimedia-Other</Category>
+        <Category>Audio</Category>
+        <Category>Video</Category>
+        <Category>AudioVideo</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>Office</Name>
+    <Directory>mandriva-office.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Editors</Category>
+        <Category>X-MandrivaLinux-Office</Category>
+        <Category>X-MandrivaLinux-Office-Accessories</Category>
+        <Category>X-MandrivaLinux-Office-AddressBooks</Category>
+        <Category>X-MandrivaLinux-Office-Communications</Category>
+        <Category>X-MandrivaLinux-Office-Communications-Fax</Category>
+        <Category>X-MandrivaLinux-Office-Communications-PDA</Category>
+        <Category>X-MandrivaLinux-Office-Communications-Phone</Category>
+        <Category>X-MandrivaLinux-Office-Communications-Other</Category>
+        <Category>X-MandrivaLinux-Office-Drawing</Category>
+        <Category>X-MandrivaLinux-Office-Graphs</Category>
+        <Category>X-MandrivaLinux-Office-Presentations</Category>
+        <Category>X-MandrivaLinux-Office-Publishing</Category>
+        <Category>X-MandrivaLinux-Office-Spreadsheets</Category>
+        <Category>X-MandrivaLinux-Office-TasksManagement</Category>
+        <Category>X-MandrivaLinux-Office-TimeManagement</Category>
+        <Category>X-MandrivaLinux-Office-Other</Category>
+        <Category>X-MandrivaLinux-Office-Wordprocessors</Category>
+        <Category>Office</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>System</Name>
+    <Directory>mandriva-system.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-System</Category>
+        <Category>X-MandrivaLinux-System-Archiving</Category>
+        <Category>X-MandrivaLinux-System-Archiving-Backup</Category>
+        <Category>X-MandrivaLinux-System-Archiving-CDBurning</Category>
+        <Category>X-MandrivaLinux-System-Archiving-Compression</Category>
+        <Category>X-MandrivaLinux-System-Archiving-Other</Category>
+        <Category>X-MandrivaLinux-System-FileTools</Category>
+        <Category>X-MandrivaLinux-System-Monitoring</Category>
+        <Category>X-MandrivaLinux-System-Session</Category>
+        <Category>X-MandrivaLinux-System-Session-Windowmanagers</Category>
+        <Category>X-MandrivaLinux-System-Terminals</Category>
+        <Category>X-MandrivaLinux-System-TextTools</Category>
+        <Category>X-MandrivaLinux-System-Configuration</Category>
+        <Category>X-MandrivaLinux-System-Configuration-BootandInit</Category>
+        <Category>X-MandrivaLinux-System-Configuration-Hardware</Category>
+        <Category>X-MandrivaLinux-System-Configuration-Networking</Category>
+        <Category>X-MandrivaLinux-System-Configuration-Packaging</Category>
+        <Category>X-MandrivaLinux-System-Configuration-Printing</Category>
+        <Category>X-MandrivaLinux-System-Configuration-Users</Category>
+        <Category>X-MandrivaLinux-System-Configuration-Other</Category>
+        <Category>Settings</Category>
+        <Category>System</Category>
+        <Category>Utility</Category>
+      </Or>
+    </Include>
+<!-- Empty node for KDE -->
+    <Menu>
+      <Name>ScreenSaver</Name>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Documentation</Name>
+    <Directory>mandriva-moreapplications-documentation.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
+        <Category>Documentation</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <Menu>
+    <Name>More Applications</Name>
+    <Directory>mandriva-moreapplications.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Accessibility</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Communications</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Finances</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Emulators</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Development</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Other</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education-Economy</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education-History</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education-Languages</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education-Literature</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education-Sports</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
+        <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
+        <Category>Development</Category>
+        <Category>Education</Category>
+        <Category>Electronics</Category>
+        <Category>Engineering</Category>
+      </Or>
+    </Include>
+  </Menu>
+<!-- Empty nodes used by KDE -->
+  <Menu>
+    <Name>Settings</Name>
+  </Menu>
+  <Menu>
+    <Name>Information</Name>
+  </Menu>
+  <Menu>
+    <Name>.hidden</Name>
+    <Directory>mandriva-hidden.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-.hidden</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <MergeFile>/etc/xdg/discovery/menus/mandriva-discovery.menu</MergeFile>
+  <MergeFile>applications-kmenuedit.menu</MergeFile>
+</Menu>
diff --git a/trunk/menu/applications-mdk.menu b/trunk/menu/applications-mdk.menu
new file mode 100644
index 0000000..511f231
--- /dev/null
+++ b/trunk/menu/applications-mdk.menu
@@ -0,0 +1,1606 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://standards.freedesktop.org/menu-spec/menu-1.0.dtd">
+<Menu>
+  <Name>Applications</Name>
+  <Layout>
+    <Menuname>Office</Menuname>
+    <Menuname>Internet</Menuname>
+    <Menuname>Multimedia</Menuname>
+    <Menuname>System</Menuname>
+    <Menuname>More Applications</Menuname>
+    <Menuname>Other</Menuname>
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </Layout>
+  <DefaultLayout inline="true" inline_limit="1" inline_header="false">
+    <Merge type="menus"/>
+    <Merge type="files"/>
+  </DefaultLayout>
+  <DefaultMergeDirs/>
+  <DefaultAppDirs/>
+  <DefaultDirectoryDirs/>
+  <Directory>mandrivalinux.directory</Directory>
+  <Include>
+    <Or>
+      <Category>X-MandrivaLinux</Category>
+    </Or>
+  </Include>
+  <Menu>
+    <Name>Office</Name>
+    <Layout>
+      <Menuname>Wordprocessors</Menuname>
+      <Menuname>Spreadsheets</Menuname>
+      <Menuname>Presentations</Menuname>
+      <Menuname>Drawing</Menuname>
+      <Menuname>Graphs</Menuname>
+      <Menuname>Publishing</Menuname>
+      <Menuname>Tasks Management</Menuname>
+      <Menuname>Time Management</Menuname>
+      <Menuname>Address Books</Menuname>
+      <Menuname>Communications</Menuname>
+      <Menuname>Accessories</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-office.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-Office</Category>
+        <Category>Office</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Accessories</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-kcalc.desktop</Filename>
+        <Filename>MandrivaLinux-Office-Accessories-oooqs.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-accessories.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Accessories</Category>
+          <Category>Calculator</Category>
+          <Category>Dictionary</Category>
+          <Category>Clock</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Address Books</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-kaddressbook.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-addressbooks.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-AddressBooks</Category>
+          <Category>ContactManagement</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Communications</Name>
+      <Layout>
+        <Menuname>Fax</Menuname>
+        <Menuname>Phone</Menuname>
+        <Menuname>PDA</Menuname>
+        <Menuname>Other</Menuname>
+        <Merge type="menus"/>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-communications.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Communications</Category>
+        </Or>
+      </Include>
+      <Menu>
+        <Name>Fax</Name>
+        <Directory>mandriva-office-communications-fax.directory</Directory>
+        <Include>
+          <Category>X-MandrivaLinux-Office-Communications-Fax</Category>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>PDA</Name>
+        <Layout>
+          <Merge type="menus"/>
+          <Filename>kde-kpilot.desktop</Filename>
+          <Merge type="files"/>
+        </Layout>
+        <Directory>mandriva-office-communications-pda.directory</Directory>
+        <Include>
+          <Or>
+            <Category>PDA</Category>
+            <Category>X-MandrivaLinux-Office-Communications-PDA</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Phone</Name>
+        <Directory>mandriva-office-communications-phone.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-Office-Communications-Phone</Category>
+            <Category>TelephonyTool</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Other</Name>
+        <Directory>mandriva-office-communications-other.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-Office-Communications-Other</Category>
+          </Or>
+        </Include>
+      </Menu>
+    </Menu>
+    <Menu>
+      <Name>Drawing</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Office-Drawing-OpenOffice.org Draw.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-drawing.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Drawing</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Graphs</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Office-Graphs-Dia.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-graphs.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Graphs</Category>
+          <Category>Chart</Category>
+          <Category>FlowChart</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Presentations</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Office-Presentations-OpenOffice.org Impress.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-presentations.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Presentations</Category>
+          <Category>Presentation</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Publishing</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Office-Publishing-Xpdf.desktop</Filename>
+        <Filename>MandrivaLinux-Office-Publishing-GhostView.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-publishing.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Publishing</Category>
+          <Category>Scanning</Category>
+          <Category>OCR</Category>
+          <And>
+            <Category>Office</Category>
+            <Category>Viewer</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Spreadsheets</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Office-Spreadsheets-OpenOffice.org Calc.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-spreadsheets.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Spreadsheets</Category>
+          <Category>Spreadsheet</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Tasks Management</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Office-TasksManagement-Planner.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-tasksmanagement.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-TasksManagement</Category>
+          <Category>ProjectManagement</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Time Management</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-korganizer.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-timemanagement.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-TimeManagement</Category>
+          <Category>Calendar</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-office-other.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Other</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Wordprocessors</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Office-Wordprocessors-OpenOffice.org Writer.desktop</Filename>
+        <Filename>MandrivaLinux-Office-Wordprocessors-OpenOffice.org Math.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-office-wordprocessors.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Office-Wordprocessors</Category>
+          <Category>WordProcessor</Category>
+        </Or>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Internet</Name>
+    <Layout>
+      <Menuname>Web Browsers</Menuname>
+      <Menuname>Mail</Menuname>
+      <Menuname>Instant Messaging</Menuname>
+      <Menuname>Chat</Menuname>
+      <Menuname>News</Menuname>
+      <Menuname>File Transfer</Menuname>
+      <Menuname>Video Conference</Menuname>
+      <Menuname>Web Editors</Menuname>
+      <Menuname>Remote Access</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-internet.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-Internet</Category>
+        <Category>Network</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Chat</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-ksirc.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-internet-chat.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-Chat</Category>
+          <Category>IRCClient</Category>
+          <Category>Chat</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>File Transfer</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Internet-FileTransfer-kbear.desktop</Filename>
+        <Filename>MandrivaLinux-Internet-FileTransfer-Gtm.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-internet-filetransfer.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-FileTransfer</Category>
+          <Category>FileTransfer</Category>
+          <Category>P2P</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Instant Messaging</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-kopete.desktop</Filename>
+        <Filename>MandrivaLinux-Internet-InstantMessaging-Gaim.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-internet-instantmessaging.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-InstantMessaging</Category>
+          <Category>InstantMessaging</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Mail</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-Kontact.desktop</Filename>
+        <Filename>evolution.desktop</Filename>
+        <Filename>MandrivaLinux-Internet-Mail-Mozilla Thunderbird.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-internet-mail.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-Mail</Category>
+          <Category>Email</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>News</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-KNode.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-internet-news.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-News</Category>
+          <Category>News</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Video Conference</Name>
+      <Directory>mandriva-internet-videoconference.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-VideoConference</Category>
+          <Category>Telephony</Category>
+          <Category>VideoConference</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-internet-other.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-Other</Category>
+          <And>
+            <Category>Network</Category>
+            <Category>HamRadio</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Remote Access</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-Kppp.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-internet-remoteaccess.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-RemoteAccess</Category>
+          <Category>RemoteAccess</Category>
+          <Category>Dialup</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Web Browsers</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-konqbrowser.desktop</Filename>
+        <Filename>MandrivaLinux-Internet-WebBrowsers-Mozilla Firefox.desktop</Filename>
+        <Filename>MandrivaLinux-Internet-WebBrowsers-Mozilla.desktop</Filename>
+        <Filename>MandrivaLinux-Internet-WebBrowsers-Epiphany Web Browser.desktop</Filename>
+        <Filename>MandrivaLinux-Internet-WebBrowsers-Epiphany Bookmarks Editor.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-internet-webbrowsers.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-WebBrowsers</Category>
+          <Category>WebBrowser</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Web Editors</Name>
+      <Directory>mandriva-internet-webeditors.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Internet-WebEditors</Category>
+          <Category>WebDevelopment</Category>
+        </Or>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>More Applications</Name>
+    <Layout>
+      <Menuname>Accessibility</Menuname>
+      <Menuname>Development</Menuname>
+      <Menuname>Editors</Menuname>
+      <Menuname>Emulators</Menuname>
+      <Menuname>Finances</Menuname>
+      <Menuname>Databases</Menuname>
+      <Menuname>Education</Menuname>
+      <Menuname>Sciences</Menuname>
+      <Menuname>Games</Menuname>
+      <Menuname>Documentation</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-moreapplications.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-MoreApplications</Category>
+        <Category>Utility</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Accessibility</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-kmag.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-moreapplications-accessibility.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Accessibility</Category>
+          <Category>Accessibility</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Communications</Name>
+      <Directory>mandriva-moreapplications-communications.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Communications</Category>
+          <Category>Communications</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Finances</Name>
+      <Directory>mandriva-moreapplications-finances.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Finances</Category>
+          <Category>Finance</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Databases</Name>
+      <Directory>mandriva-moreapplications-databases.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Databases</Category>
+          <Category>Database</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Emulators</Name>
+      <Directory>mandriva-moreapplications-emulators.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Emulators</Category>
+          <And>
+            <Category>System</Category>
+            <Category>Emulator</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Development</Name>
+      <Layout>
+        <Menuname>Development Environment</Menuname>
+        <Menuname>Interpreters</Menuname>
+        <Menuname>Tools</Menuname>
+        <Menuname>Code Generators</Menuname>
+        <Menuname>Other</Menuname>
+        <Merge type="menus"/>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-moreapplications-development.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Development</Category>
+          <Category>Development</Category>
+        </Or>
+      </Include>
+      <Menu>
+        <Name>Development Environments</Name>
+        <Layout>
+          <Merge type="menus"/>
+          <Filename>kde-kdevelop.desktop</Filename>
+          <Merge type="files"/>
+        </Layout>
+        <Directory>mandriva-moreapplications-development-developmentenvironments.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Development-DevelopmentEnvironments</Category>
+            <Category>IDE</Category>
+            <Category>GUIDesigner</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Interpreters</Name>
+        <Layout>
+          <Merge type="menus"/>
+          <Filename>MandrivaLinux-MoreApplications-Development-Interpreters-GNU Prolog.desktop</Filename>
+          <Merge type="files"/>
+        </Layout>
+        <Directory>mandriva-moreapplications-development-interpreters.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Development-Interpreters</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Tools</Name>
+        <Layout>
+          <Merge type="menus"/>
+          <Filename>MandrivaLinux-MoreApplications-Development-Tools-Gdb.desktop</Filename>
+          <Merge type="files"/>
+        </Layout>
+        <Directory>mandriva-moreapplications-development-tools.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Development-Tools</Category>
+            <Category>Building</Category>
+            <Category>Profiling</Category>
+            <Category>Debugger</Category>
+            <Category>RevisionControl</Category>
+            <And>
+              <Category>Development</Category>
+              <Category>Translation</Category>
+            </And>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Other</Name>
+        <Directory>mandriva-moreapplications-development-other.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Development-Other</Category>
+          </Or>
+        </Include>
+      </Menu>
+    </Menu>
+    <Menu>
+      <Name>Documentation</Name>
+      <Directory>mandriva-moreapplications-documentation.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Documentation</Category>
+          <Category>Documentation</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-moreapplications-other.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Other</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Editors</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-MoreApplications-Editors-Emacs.desktop</Filename>
+        <Filename>MandrivaLinux-MoreApplications-Editors-XEmacs.desktop</Filename>
+        <Filename>MandrivaLinux-MoreApplications-Editors-VI editor.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-moreapplications-editors.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Editors</Category>
+          <Category>TextEditor</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Education</Name>
+      <Layout>
+        <Menuname>Economy</Menuname>
+        <Menuname>Geography</Menuname>
+        <Menuname>History</Menuname>
+        <Menuname>Languages</Menuname>
+        <Menuname>Literature</Menuname>
+        <Menuname>Sciences</Menuname>
+        <Menuname>Sports</Menuname>
+        <Menuname>Other</Menuname>
+        <Merge type="menus"/>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-moreapplications-education.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Education</Category>
+          <Category>Education</Category>
+        </Or>
+      </Include>
+      <Menu>
+        <Name>Economy</Name>
+        <Directory>mandriva-moreapplications-education-economy.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Education-Economy</Category>
+            <Category>Economy</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Geography</Name>
+        <Directory>mandriva-moreapplications-education-geography.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Education-Geography</Category>
+            <Category>Geography</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>History</Name>
+        <Directory>mandriva-moreapplications-education-history.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Education-History</Category>
+            <Category>History</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Languages</Name>
+        <Directory>mandriva-moreapplications-education-languages.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Education-Languages</Category>
+            <Category>Languages</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Literature</Name>
+        <Directory>mandriva-moreapplications-education-literature.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Education-Literature</Category>
+            <Category>Literature</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Sciences</Name>
+        <Directory>mandriva-moreapplications-education-sciences.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Education-Sciences</Category>
+            <And>
+              <Category>Science</Category>
+              <Category>Education</Category>
+            </And>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Sports</Name>
+        <Directory>mandriva-moreapplications-education-sports.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Education-Sports</Category>
+            <Category>Sports</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Other</Name>
+        <Directory>mandriva-moreapplications-education-other.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Education-Other</Category>
+            <Category>Art</Category>
+            <Category>Construction</Category>
+            <Category>Teaching</Category>
+            <And>
+              <Category>Education</Category>
+              <Category>Music</Category>
+            </And>
+          </Or>
+        </Include>
+      </Menu>
+    </Menu>
+    <Menu>
+      <Name>Games</Name>
+      <Layout>
+        <Menuname>Adventure</Menuname>
+        <Menuname>Arcade</Menuname>
+        <Menuname>Boards</Menuname>
+        <Menuname>Cards</Menuname>
+        <Menuname>Puzzles</Menuname>
+        <Menuname>Sports</Menuname>
+        <Menuname>Strategy</Menuname>
+        <Menuname>Toys</Menuname>
+        <Merge type="menus"/>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-moreapplications-games.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Games</Category>
+          <Category>Game</Category>
+        </Or>
+      </Include>
+      <Menu>
+        <Name>Adventure</Name>
+        <Directory>mandriva-moreapplications-games-adventure.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Adventure</Category>
+            <Category>AdventureGame</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Arcade</Name>
+        <Directory>mandriva-moreapplications-games-arcade.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Arcade</Category>
+            <Category>ArcadeGame</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Boards</Name>
+        <Directory>mandriva-moreapplications-games-boards.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Boards</Category>
+            <Category>BoardGame</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Cards</Name>
+        <Directory>mandriva-moreapplications-games-cards.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Cards</Category>
+            <Category>CardGame</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Puzzles</Name>
+        <Directory>mandriva-moreapplications-games-puzzles.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Puzzles</Category>
+            <Category>LogicGame</Category>
+            <Category>BlocksGame</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Sports</Name>
+        <Directory>mandriva-moreapplications-games-sports.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Sports</Category>
+            <Category>SportsGame</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Strategy</Name>
+        <Directory>mandriva-moreapplications-games-strategy.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Strategy</Category>
+            <Category>StrategyGame</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Other</Name>
+        <Directory>mandriva-moreapplications-games-other.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Other</Category>
+            <Category>KidsGame</Category>
+            <Category>RolePlaying</Category>
+            <Category>Simulation</Category>
+            <Category>ActionGame</Category>
+            <And>
+              <Category>Game</Category>
+              <Category>Emulator</Category>
+            </And>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Toys</Name>
+        <Directory>mandriva-moreapplications-games-toys.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Games-Toys</Category>
+            <Category>Amusement</Category>
+          </Or>
+        </Include>
+      </Menu>
+    </Menu>
+    <Menu>
+      <Name>Sciences</Name>
+      <Layout>
+        <Menuname>Artificial Intelligence</Menuname>
+        <Menuname>Astronomy</Menuname>
+        <Menuname>Biology</Menuname>
+        <Menuname>Chemistry</Menuname>
+        <Menuname>Computer Science</Menuname>
+        <Menuname>Data Visualization</Menuname>
+        <Menuname>Electricity</Menuname>
+        <Menuname>Geosciences</Menuname>
+        <Menuname>Image Processing</Menuname>
+        <Menuname>Mathematics</Menuname>
+        <Menuname>Numeric analysis</Menuname>
+        <Menuname>Parallel Computing</Menuname>
+        <Menuname>Physics</Menuname>
+        <Menuname>Robotics</Menuname>
+        <Menuname>Other</Menuname>
+        <Merge type="menus"/>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-moreapplications-sciences.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-MoreApplications-Sciences</Category>
+          <Category>Science</Category>
+        </Or>
+      </Include>
+      <Menu>
+        <Name>Artificial Intelligence</Name>
+        <Directory>mandriva-moreapplications-sciences-artificialintelligence.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-ArtificialIntelligence</Category>
+            <Category>ArtificialIntelligence</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Astronomy</Name>
+        <Directory>mandriva-moreapplications-sciences-astronomy.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Astronomy</Category>
+            <Category>Astronomy</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Biology</Name>
+        <Directory>mandriva-moreapplications-sciences-biology.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Biology</Category>
+            <Category>Biology</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Chemistry</Name>
+        <Directory>mandriva-moreapplications-sciences-chemistry.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Chemistry</Category>
+            <Category>Chemistry</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Computer Science</Name>
+        <Directory>mandriva-moreapplications-sciences-computerscience.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-ComputerScience</Category>
+            <Category>ComputerScience</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Data Visualization</Name>
+        <Directory>mandriva-moreapplications-sciences-datavisualization.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-DataVisualization</Category>
+            <Category>DataVisualization</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Electricity</Name>
+        <Directory>mandriva-moreapplications-sciences-electricity.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Electricity</Category>
+            <Category>Electricity</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Geosciences</Name>
+        <Directory>mandriva-moreapplications-sciences-geosciences.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Geosciences</Category>
+            <Category>Geoscience</Category>
+            <Category>Geology</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Image Processing</Name>
+        <Directory>mandriva-moreapplications-sciences-imageprocessing.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-ImageProcessing</Category>
+            <Category>ImageProcessing</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Mathematics</Name>
+        <Directory>mandriva-moreapplications-sciences-mathematics.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Mathematics</Category>
+            <Category>Math</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Numeric Analysis</Name>
+        <Directory>mandriva-moreapplications-sciences-numericanalysis.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-NumericAnalysis</Category>
+            <Category>NumericAnalysis</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Parallel Computing</Name>
+        <Directory>mandriva-moreapplications-sciences-parallelcomputing.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-ParallelComptuting</Category>
+            <Category>ParallelComptuting</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Physics</Name>
+        <Directory>mandriva-moreapplications-sciences-physics.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Physics</Category>
+            <Category>Physics</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Robotics</Name>
+        <Directory>mandriva-moreapplications-sciences-robotics.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Robotics</Category>
+            <Category>Robotics</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Other</Name>
+        <Directory>mandriva-moreapplications-sciences-other.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-MoreApplications-Sciences-Other</Category>
+            <Category>MedicalSoftware</Category>
+            <Category>Electronics</Category>
+            <Category>Engineering</Category>
+          </Or>
+        </Include>
+      </Menu>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Layout>
+      <Menuname>Sound</Menuname>
+      <Menuname>Video</Menuname>
+      <Menuname>Graphics</Menuname>
+      <Menuname>Other</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-multimedia.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-Multimedia</Category>
+        <Category>AudioVideo</Category>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Graphics</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Multimedia-Graphics-The GIMP.desktop</Filename>
+        <Filename>kde-kooka.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-multimedia-graphics.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Multimedia-Graphics</Category>
+          <Category>Graphics</Category>
+          <Category>Photography</Category>
+          <Category>3DGraphics</Category>
+          <Category>2DGraphics</Category>
+          <Category>VectorGraphics</Category>
+          <Category>RasterGraphics</Category>
+          <And>
+            <Category>Graphics</Category>
+            <Category>Viewer</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Sound</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-kscd.desktop</Filename>
+        <Filename>MandrivaLinux-Multimedia-Sound-Totem Media Player.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-multimedia-sound.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Multimedia-Sound</Category>
+          <Category>Audio</Category>
+          <Category>Midi</Category>
+          <Category>Mixer</Category>
+          <Category>Sequencer</Category>
+          <Category>Tuner</Category>
+          <And>
+            <Category>Audio</Category>
+            <Or>
+              <Category>AudioVideoEditing</Category>
+              <Category>Player</Category>
+              <Category>Recorder</Category>
+              <Category>HamRadio</Category>
+            </Or>
+          </And>
+          <And>
+            <Category>AudioVideo</Category>
+            <Category>Music</Category>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Video</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>MandrivaLinux-Multimedia-Video-Totem Movie Player.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-multimedia-video.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Multimedia-Video</Category>
+          <Category>Video</Category>
+          <Category>TV</Category>
+          <And>
+            <Category>Video</Category>
+            <Or>
+              <Category>AudioVideoEditing</Category>
+              <Category>Player</Category>
+              <Category>Recorder</Category>
+            </Or>
+          </And>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Other</Name>
+      <Directory>mandriva-multimedia-other.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-Multimedia-Other</Category>
+        </Or>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>System</Name>
+    <Layout>
+      <Menuname>Terminals</Menuname>
+      <Menuname>Text Tools</Menuname>
+      <Menuname>Configuration</Menuname>
+      <Menuname>Archiving</Menuname>
+      <Menuname>File Tools</Menuname>
+      <Menuname>Monitoring</Menuname>
+      <Menuname>Session</Menuname>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Directory>mandriva-system.directory</Directory>
+    <OnlyUnallocated/>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-System</Category>
+        <Category>System</Category>
+        <Category>Filesystem</Category>
+        <And>
+          <Category>System</Category>
+          <Category>Security</Category>
+        </And>
+      </Or>
+    </Include>
+    <Menu>
+      <Name>Archiving</Name>
+      <Layout>
+        <Menuname>Backup</Menuname>
+        <Menuname>CD Burning</Menuname>
+        <Menuname>Compression</Menuname>
+        <Menuname>Other</Menuname>
+        <Merge type="menus"/>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-system-archiving.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-System-Archiving</Category>
+        </Or>
+      </Include>
+      <Menu>
+        <Name>Backup</Name>
+        <Layout>
+          <Merge type="menus"/>
+          <Filename>MandrivaLinux-System-Archiving-Backup-DrakSync.desktop</Filename>
+          <Merge type="files"/>
+        </Layout>
+        <Directory>mandriva-system-archiving-backup.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Archiving-Backup</Category>
+            <Category>Archiving</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>CD Burning</Name>
+        <Layout>
+          <Merge type="menus"/>
+          <Filename>kde-k3b.desktop</Filename>
+          <Merge type="files"/>
+        </Layout>
+        <Directory>mandriva-system-archiving-cdburning.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Archiving-CDBurning</Category>
+            <Category>DiscBurning</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Compression</Name>
+        <Directory>mandriva-system-archiving-compression.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Archiving-Compression</Category>
+            <Category>Compression</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Other</Name>
+        <Directory>mandriva-system-archiving-other.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Archiving-Other</Category>
+          </Or>
+        </Include>
+      </Menu>
+    </Menu>
+    <Menu>
+      <Name>Configuration</Name>
+      <Layout>
+        <Filename>kde-KControl.desktop</Filename>
+        <Filename>MandrivaLinux-System-Configuration-Configure Your Computer.desktop</Filename>
+        <Menuname>Boot and Init</Menuname>
+        <Menuname>KDE</Menuname>
+        <Menuname>GNOME</Menuname>
+        <Menuname>Hardware</Menuname>
+        <Menuname>Networking</Menuname>
+        <Menuname>Packaging</Menuname>
+        <Menuname>Printing</Menuname>
+        <Merge type="menus"/>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-system-configuration.directory</Directory>
+      <OnlyUnallocated/>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-System-Configuration</Category>
+          <And>
+            <Category>Settings</Category>
+            <Category>DesktopSettings</Category>
+            <Category>HardwareSettings</Category>
+            <Not>
+              <Category>GNOME</Category>
+              <Category>KDE</Category>
+            </Not>
+          </And>
+        </Or>
+      </Include>
+      <Menu>
+        <Name>Boot and Init</Name>
+        <Directory>mandriva-system-configuration-bootandinit.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Configuration-BootandInit</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Hardware</Name>
+        <Directory>mandriva-system-configuration-hardware.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Configuration-Hardware</Category>
+            <Category>HardwareSettings</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>GNOME</Name>
+        <Directory>mandriva-system-configuration-gnome.directory</Directory>
+        <Include>
+          <Category>X-MandrivaLinux-System-Configuration-GNOME</Category>
+        </Include>
+        <Menu>
+          <Name>Advanced</Name>
+          <Directory>mandriva-system-configuration-gnome-advanced.directory</Directory>
+          <Include>
+            <Category>X-MandrivaLinux-System-Configuration-GNOME-Advanced</Category>
+          </Include>
+        </Menu>
+      </Menu>
+      <Menu>
+        <Name>KDE</Name>
+        <Directory>mandriva-system-configuration-kde.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Configuration-KDE</Category>
+          </Or>
+        </Include>
+        <Menu>
+          <Name>Accessibility</Name>
+          <Directory>kde-settings-accessibility.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-Accessibility</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>Components</Name>
+          <Directory>kde-settings-components.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-Components</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>Information</Name>
+          <Directory>kde-settings-hardware.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-Information</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>LookNFeel</Name>
+          <Directory>kde-settings-looknfeel.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-LookNFeel</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>Network</Name>
+          <Directory>kde-settings-network.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-Network</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>Peripherals</Name>
+          <Directory>kde-settings-peripherals.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-Peripherals</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>PowerControl</Name>
+          <Directory>kde-settings-power.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-PowerControl</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>Security</Name>
+          <Directory>kde-settings-security.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-Security</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>Sound</Name>
+          <Directory>kde-settings-sound.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-Sound</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>WebBrowsing</Name>
+          <Directory>kde-settings-webbrowsing.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-WebBrowsing</Category>
+            </Or>
+          </Include>
+        </Menu>
+        <Menu>
+          <Name>System</Name>
+          <Directory>kde-settings-system.directory</Directory>
+          <Include>
+            <Or>
+              <Category>X-MandrivaLinux-System-Configuration-KDE-System</Category>
+            </Or>
+          </Include>
+        </Menu>
+      </Menu>
+      <Menu>
+        <Name>Networking</Name>
+        <Directory>mandriva-system-configuration-networking.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Configuration-Networking</Category>
+            <And>
+              <Category>Settings</Category>
+              <Category>Network</Category>
+            </And>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Packaging</Name>
+        <Directory>mandriva-system-configuration-packaging.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Configuration-Packaging</Category>
+            <Category>PackageManager</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Printing</Name>
+        <Directory>mandriva-system-configuration-printing.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Configuration-Printing</Category>
+            <Category>Printing</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Users</Name>
+        <Directory>mandriva-system-configuration-users.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Configuration-Users</Category>
+          </Or>
+        </Include>
+      </Menu>
+      <Menu>
+        <Name>Other</Name>
+        <Directory>mandriva-system-configuration-other.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Configuration-Other</Category>
+            <And>
+              <Category>Settings</Category>
+              <Category>Security</Category>
+            </And>
+          </Or>
+        </Include>
+      </Menu>
+    </Menu>
+    <Menu>
+      <Name>File Tools</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-Kfind.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-system-filetools.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-System-FileTools</Category>
+          <Category>FileTool</Category>
+          <Category>FileManager</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Monitoring</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-ksysguard.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-system-monitoring.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-System-Monitoring</Category>
+          <Category>Monitor</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Session</Name>
+      <Directory>mandriva-system-session.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-System-Session</Category>
+        </Or>
+      </Include>
+      <Menu>
+        <Name>Windowmanagers</Name>
+        <Directory>mandriva-system-session-windowmanagers.directory</Directory>
+        <Include>
+          <Or>
+            <Category>X-MandrivaLinux-System-Session-Windowmanagers</Category>
+          </Or>
+        </Include>
+      </Menu>
+    </Menu>
+    <Menu>
+      <Name>Terminals</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-konsole.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-system-terminals.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-System-Terminals</Category>
+          <Category>TerminalEmulator</Category>
+        </Or>
+      </Include>
+    </Menu>
+    <Menu>
+      <Name>Text Tools</Name>
+      <Layout>
+        <Merge type="menus"/>
+        <Filename>kde-kdict.desktop</Filename>
+        <Merge type="files"/>
+      </Layout>
+      <Directory>mandriva-system-texttools.directory</Directory>
+      <Include>
+        <Or>
+          <Category>X-MandrivaLinux-System-TextTools</Category>
+          <Category>TextTool</Category>
+        </Or>
+      </Include>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>Other</Name>
+    <Directory>mandriva-other.directory</Directory>
+    <OnlyUnallocated/>
+<!--
+    <Include>
+	    <Or>
+		    <Category>X-MandrivaLinux-Other</Category>
+	    </Or>
+    </Include>-->
+    <KDELegacyDirs/>
+  </Menu>
+  <Menu>
+    <Name>.hidden</Name>
+    <Directory>mandriva-hidden.directory</Directory>
+    <Include>
+      <Or>
+        <Category>X-MandrivaLinux-.hidden</Category>
+      </Or>
+    </Include>
+  </Menu>
+  <MergeFile>applications-kmenuedit.menu</MergeFile>
+</Menu>
diff --git a/trunk/menu/defaultlayout-simplified.menu b/trunk/menu/defaultlayout-simplified.menu
new file mode 100644
index 0000000..2a6b074
--- /dev/null
+++ b/trunk/menu/defaultlayout-simplified.menu
@@ -0,0 +1,22 @@
+<Menu>
+<Name>Mandrakelinux</Name>
+<Layout>
+<Menuname>Use Office Tools</Menuname>
+<Menuname>Organize</Menuname>
+<Menuname>Surf the Internet</Menuname>
+<Menuname>Enjoy Music and Video</Menuname>
+<Menuname>View, Modify and Create Graphics</Menuname>
+<Menuname>Play Games</Menuname>
+<Menuname>Administer Your System</Menuname>
+<Menuname>Read Documentation</Menuname>
+<Menuname>Develop</Menuname>
+<Menuname>Use Education Software</Menuname>
+<Menuname>Use Scientific Software</Menuname>
+<Menuname>Use Emulators</Menuname>
+<Menuname>Use More Applications</Menuname>
+<Merge type="menus"/>
+<Merge type="files"/>
+<Separator/>
+<Menuname>Other</Menuname>
+</Layout>
+</Menu>
diff --git a/trunk/menu/defaultlayout.menu b/trunk/menu/defaultlayout.menu
new file mode 100644
index 0000000..d981f45
--- /dev/null
+++ b/trunk/menu/defaultlayout.menu
@@ -0,0 +1,13 @@
+<Menu>
+<Name>Mandrakelinux</Name>
+<Layout>
+<Menuname>Office</Menuname>
+<Menuname>Internet</Menuname>
+<Menuname>Multimedia</Menuname>
+<Menuname>System</Menuname>
+<Menuname>More Applications</Menuname>
+<Menuname>Other</Menuname>
+<Merge type="menus"/>
+<Merge type="files"/>
+</Layout>
+</Menu>
diff --git a/trunk/menu/desktop-common-data b/trunk/menu/desktop-common-data
new file mode 100644
index 0000000..fbef1ac
--- /dev/null
+++ b/trunk/menu/desktop-common-data
@@ -0,0 +1,255 @@
+## Use Office Tools
+# Create a Text Document
+?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_writer.png" title="Create a Text Document" command="oowriter" mimetypes="application/vnd.sun.xml.writer,application/vnd.stardivision.writer,application/msword,application/vnd.ms-word,application/x-doc,text/rtf"
+
+# Create a Spreadsheet
+?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_calc.png" title="Create a Spreadsheet" command="oocalc" mimetypes="application/vnd.sun.xml.calc,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/msexcel,application/vnd.ms-excel"
+
+# Create a Presentation
+?package(OpenOffice.org): needs="x11" section="Use Office Tools" icon="ooo_impress.png" title="Create a Presentation" command="ooimpress" mimetypes="application/vnd.sun.xml.impress;application/vnd.stardivision.impress;application/mspowerpoint"
+
+# Create a Drawing
+?package(OpenOffice.org): needs=x11 section="Use Office Tools" icon="ooo_draw.png" title="Create a Drawing" command="oodraw" mimetypes="application/vnd.sun.xml.draw,application/vnd.stardivision.draw"
+
+
+# Diagrams
+?package(koffice-kivio): needs="kde" kde_filename="kivio" section="Use Office Tools" title="Create Flowcharts and Diagrams" icon="kivio.png" command="kivio" kde_command="kivio %u" mimetypes="application/x-kivio" multiple_files="false" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nGenericName=Flowchart & Diagram Editing\\nX-KDE-NativeMimeType=application/x-kivio\\nDocPath=kivio/index.html\\nX-DCOP-ServiceType=Multi"
+?package(dia): needs="gnome" section="Use Office Tools" title="Create Flowcharts and Diagrams" icon="dia.png" command="dia" mimetypes="application/x-kivio" 
+
+# Design a Layout
+?package(scribus): needs="x11" section="Use Office Tools" command="scribus" title="Design a Layout" needs="x11" icon="wordprocessor_section.png"
+
+# Consult an Address Book
+?package(evolution): needs="gnome" section="Use Office Tools" title="Consult an Address Book" icon="evolution.png" command="evolution -c contacts" 
+
+?package(kdepim-kaddressbook): needs="kde" kde_filename="kontact-kaddressbook" section="Use Office Tools" title="Consult an Address Book" icon="kontact-mdk.png" command="kontact --module kaddressbook" kde_command="kontact --module kaddressbook %u" mimetypes="text/x-vcard,text/x-ldif" multiple_files="false" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nDocPath=kaddressbook/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=kaddressbook\\nServiceTypes=KParts/ReadOnlyPart,Browser/View,DCOP/AddressBook\\nX-KDE-Library=libkaddressbookpart\\n"
+
+# Send a Fax
+?package(kdebase-kdeprintfax): needs="kde" kde_filename="kdeprintfax" section="Use Office Tools" title="Send a Fax" icon="kdeprintfax.png" command="kdeprintfax     %u" kde_command="kdeprintfax -caption \"%c\" %i %m %u" kde_opt="\\nEncoding=UTF-8\\nGenericName=Fax Utility\\nMiniIcon=kdeprintfax\\nTerminal=0\\nX-DCOP-ServiceType=Multi\\n"
+
+# View a Fax
+?package(kdegraphics-kfax): needs="x11" kde_filename="kfax" section="Use Office Tools" title="View a Fax" icon="kfax.png" command="kfax" kde_command="kfax %f   -caption \"%c\" %i %m" mimetypes="image/fax-g3" multiple_files="false" accept_url="false" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=kfax;\\nGenericName=Fax Viewer\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
+
+# Synchronize Your PDA
+?package(kdepim-kpilot): needs="kde" kde_filename="kpilot" section="Use Office Tools" title="Synchronize Your PDA" icon="kpilot.png" command="kpilot" kde_opt="\\nEncoding=UTF-8\\nGenericName=PalmPilot Tool\\nDocPath=kpilot/index.html\\nTerminal=0\\nMiniIcon=kpilot\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
+?package(gnome-pilot): needs="gnome" section="Use Office Tools" title="Synchronize Your PDA" icon="/usr/share/pixmaps/gnome-palm.png" command="gpilotd-control-applet" 
+
+# Use a Calculator
+?package(kdeutils-kcalc): needs="kde" kde_filename="kcalc" section="Use Office Tools" title="Use a Calculator" icon="kcalc.png" command="kcalc" kde_command="kcalc  -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kcalc/index.html\\nGenericName=Scientific Calculator\\nTerminal=0\\nX-KDE-StartupNotify=true\\n"
+?package(gcalctool): needs="gnome" section="Use Office Tools" title="Use a Calculator" icon="gcalctool.png" command="gcalctool" 
+
+# Search Dictionaries and Encyclopedias
+?package(kdenetwork-kdict): needs="x11" kde_filename="kdict" section="Use Office Tools" title="Search Dictionaries and Encyclopedias" icon="kdict.png" command="kdict" kde_command="kdict -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nTerminal=0\\nGenericName=Online Dictionary\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nDocPath=kdict/index.html\\n"
+
+
+## Organize
+# Write Notes
+?package(kdepim-knotes): needs="x11" kde_filename="kontact-knotes" section="Organize" title="Write Notes" icon="kontact-mdk.png" command="kontact --module knotes" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
+
+# Manage Tasks
+?package(kdepim-korganizer): needs="kde" kde_filename="kontact-korganizer" section="Organize" title="Manage Tasks" icon="kontact-mdk.png" command="kontact --module todo" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nGenericName=Personal Organizer\\nServiceTypes=Browser/View,DCOP/Organizer\\nX-KDE-Library=libkorganizerpart\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=korganizer\\n"
+
+?package(evolution): needs="gnome" section="Organize" title="Manage Tasks" icon="evolution.png" command="evolution -c tasks" 
+
+# Organize Your Time
+?package(kdepim-korganizer): needs="kde" kde_filename="kontact-korganizer-time" section="Organize" title="Organize Your Time" icon="kontact-mdk.png" command="kontact --module korganizer" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nGenericName=Personal Organizer\\nServiceTypes=Browser/View,DCOP/Organizer\\nX-KDE-Library=libkorganizerpart\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=korganizer\\n"
+
+?package(evolution): needs="gnome" section="Organize" title="Organize Your Time" icon="evolution.png" command="evolution -c calendar" 
+
+# Track Time Spent on Tasks
+?package(kdepim-karm): needs="x11" kde_filename="karm" section="Organize" title="Track Time Spent on Tasks" icon="karm.png" command="karm" kde_command="karm  -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nGenericName=Personal Time Tracker\\nTerminalOptions=\\nPath=\\nDocPath=karm/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
+
+# Manage Projects
+?package(planner):command="planner" needs="x11" section="Organize" title="Manage Projects" icon="/usr/share/pixmaps/gnome-planner.png" startup_notify="true"
+
+# Manage Your Finances
+?package(gnucash): command="/usr/bin/gnucash" icon="gnucash.png" needs="X11" section="Organize" title="Manage Your Finances"
+
+
+
+## Surf the Internet
+# Connect to the Internet
+?package(kdenetwork-kppp): needs="x11" kde_filename="Kppp" section="Surf the Internet" title="Dial up" icon="kppp.png" command="kppp" kde_command="kppp %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Internet Dial-up Tool\\nBinaryPattern=kppp;\\nDocPath=kppp/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
+
+# Browse the Web
+?package(mozilla-firefox): needs="x11" command="/usr/bin/mozilla-firefox" icon="mozilla-firefox.png" section="Surf the Internet" title="Browse the Web" startup_notify="true" longtitle="Lightweight Web Browser" accept_url="true" mimetypes="text/html,text/xml,application/xhtml+xml,application/vnd.mozilla.xul+xml,text/mml"
+
+?package(epiphany): needs="gnome" section="Surf the Internet" title="Browse the Web" icon="epiphany.png" command="epiphany" startup_notify="true"
+
+# Read and Send E-mail
+?package(kdepim-kmail): needs="kde" kde_filename="kontact-KMail" section="Surf the Internet" title="Read and Send E-mail" icon="kontact-mdk.png" command="kontact --module kmail" kde_command="kontact --module kmail -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kmail/index.html\\nGenericName=Mail Client\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nX-DCOP-ServiceName=kmail\\nServiceTypes=DCOP/ResourceBackend/IMAP\\n"
+
+?package(evolution): needs="gnome" section="Surf the Internet" title="Read and Send E-mail" icon="evolution.png" command="evolution -c mail" startup_notify="true" 
+
+# Chat
+?package(kdenetwork-kopete): needs="kde" kde_filename="kopete" section="Surf the Internet" title="Chat" icon="kopete.png" command="kopete" kde_command="kopete %i %m -caption \"%c\"" kde_opt="\\nGenericName=Instant Messenger\\nTerminal=0\\n"
+?package(gaim): needs="gnome" section="Surf the Internet" title="Chat" icon="gaim.png" command="gaim" startup_notify="true"
+
+# Read and Send Newsgroup Messages
+?package(kdepim-knode): needs="kde" kde_filename="kontact-KNode" section="Surf the Internet" title="Read and Send Newsgroup Messages" icon="kontact-mdk.png" command="kontact --module knode" kde_command="kontact --module kmail -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nTerminal=0\\nDocPath=knode/index.html\\nGenericName=News Reader\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
+
+?package(pan): needs="gnome" section="Surf the Internet" title="Read and Send Newsgroup Messages" icon="pan.png" command="pan" startup_notify="true"
+
+# Make a Phone Call
+?package(kphone): needs="x11" kde_filename="kphone" section="Surf the Internet" title="Make a Phone Call" icon="kphone.png" command="kphone" kde_opt="\\nDocPath=kphone/index.html\\nTerminal=0"
+
+# Organize a Video Conference
+?package(gnomemeeting): command="/usr/bin/gnomemeeting" needs="x11" icon="gnomemeeting.png" section="Surf the Internet" title="Organize a Video Conference" startup_notify="true"
+
+# Create Your Own Web Site
+?package(quanta): needs="x11" kde_filename="quanta" section="Surf the Internet" title="Create Your Own Web Site" icon="quanta.png" command="quanta" mimetypes="text/html" kde_opt="\\nEncoding=UTF-8\\nDocPath=quanta/index.html\\nGenericName=Web Development Environment\\n"
+
+# Transfer Files With FTP
+?package(kbear): needs="kde" kde_filename="kbear" section="Surf the Internet" title="Transfer files with FTP" icon="kbear.png" command="kbear" kde_opt="\\nEncoding=UTF-8\\nGenericName=FTP Client\\nMiniIcon=kbear\\nDocPath=kbear/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
+
+?package(gftp): needs="gnome" section="Surf the Internet" title="Transfer Files With FTP" icon="gftp.png" command="gftp" 
+
+
+
+## Enjoy Music and Video
+# Adjust Volume
+?package(kdemultimedia-kmix): needs="kde" kde_filename="kmix" section="Enjoy Music and Video" title="Adjust Volume" icon="kmix.png" command="kmix" kde_command="kmix -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nGenericName=Sound Mixer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
+
+?package(gnome-media): needs="gnome" section="Enjoy Music and Video" title="Adjust Volume" icon="/usr/share/pixmaps/gnome-mixer.png" command="gnome-volume-control" 
+
+# Listen to Audio CDs
+?package(kdemultimedia-kscd): needs="kde" kde_filename="kscd" section="Enjoy Music and Video" title="Listen to Audio CDs" icon="kscd.png" command="kscd" kde_command="kscd -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nGenericName=CD Player\\nBinaryPattern=kscd;\\nDocPath=kscd/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
+
+?package(gnome-media): needs="gnome" section="Enjoy Music and Video" title="Listen to Audio CDs" icon="/usr/share/pixmaps/gnome-cd.png" command="gnome-cd" 
+
+# Listen to Music Files
+?package(amarok): needs="kde" kde_filename="amarok" section="Enjoy Music and Video" title="Listen to Music Files" icon="amarok.png" command="amarok" kde_command="amarok %U" mimetypes="application/x-ogg,audio/x-vorbis,audio/basic,audio/x-mod,audio/x-mp3,audio/x-scpls,audio/x-mpegurl,audio/x-sid,audio/x-wav" multiple_files="true" accept_url="true" kde_opt="\\nVersion=0.9.4\\nEncoding=UTF-8\\nInitialPreference=15\\nGenericName=Audio Player\\nDocPath=amarok/index.html\\nTerminal=false\\nActions=Enqueue;\\nX-KDE-StartupNotify=false"
+
+?package(rhythmbox): needs="gnome" section="Enjoy Music and Video" title="Listen to Music Files" icon="rhythmbox.png" command="rhythmbox" startup_notify="true" 
+
+# Rip Audio CDs
+?package(kdemultimedia-kaudiocreator): needs="kde" kde_filename="kaudiocreator" section="Enjoy Music and Video" title="Rip Audio CDs" icon="kaudiocreator.png" command="kaudiocreator" mimetypes="" kde_opt="\\nGenericName=CD Ripper\\nTerminalOptions=\\nPath=\\nTerminal=0\\n"
+
+?package(sound-juicer): needs="gnome" section="Enjoy Music and Video" title="Rip Audio CDs" icon="sound-juicer.png" command="sound-juicer" 
+
+# Record Sounds
+?package(gnome-media): needs="x11" command="/usr/bin/gnome-sound-recorder" section="Enjoy Music and Video" title="Record Sounds" icon="/usr/share/pixmaps/gnome-grecord.png" startup_notify="true"
+
+# Mix Music
+?package(audacity): command="/usr/bin/audacity" needs="X11" icon="audacity.png" section="Enjoy Music and Video" title="Mix Music"
+
+# Compose Music
+?package(rosegarden4): needs="x11" kde_filename="rosegarden" section="Enjoy Music and Video" title="Compose Music" icon="rosegarden.png" command="rosegarden" kde_command="rosegarden -caption \"%c\" %i %m" mimetypes="audio/x-rosegarden,audio/x-rosegarden-device" kde_opt="\\nX-KDE-NativeMimeType=audio/x-rosegarden\\nMiniIcon=rosegarden.png\\nDocPath=rosegarden/index.html\\nTerminal=0"
+
+# Watch Videos
+?package(kaffeine): needs="kde" kde_filename="kaffeine" section="Enjoy Music and Video" title="Watch Videos" icon="kaffeine.png" command="kaffeine" mimetypes="application/x-ogg;audio/basic;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-wma;audio/x-ogg;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-scpls;audio/x-wav;video/x-matroska;audio/x-matroska;video/mpeg;video/msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-avi;video/x-fli;video/x-flic;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;application/x-mplayer2;application/smil;application/x-kaffeine" kde_opt="\\nEncoding=UTF-8\\nGenericName=Mediaplayer\\nServiceTypes=\\nTerminal=false\\nInitialPreference=15"
+
+?package(totem): command="/usr/bin/totem" needs="gnome" section="Enjoy Music and Video" icon="totem.png" mimetypes="video/dv,video/mpeg,video/msvideo,video/quicktime,video/x-anim,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,video/x-nsv,video/x-flc,video/x-fli,application/ogg,application/x-ogg,audio/basic,audio/x-mp3,audio/x-mpeg,audio/mpeg,audio/x-wav,audio/x-mpegurl,audio/x-scpls,audio/x-m4a,audio/x-ms-asf,audio/x-ms-asx,audio/x-ms-wax,application/vnd.rn-realmedia,audio/x-real-audio,audio-x-pn-realaudio,application/x-flac,audio/x-flac,misc/ultravox,application/x-matroska" accept_url="true" multiple_files="true" title="Watch Videos" startup_notify="true"   
+
+# Edit Videos
+?package(kdenlive): needs="x11" kde_filename="kdenlive" section="Enjoy Music and Video" title="Edit Videos" icon="kdenlive.png" command="kdenlive" kde_command="kdenlive -caption \"%c\" %i %m  " kde_opt="\\nEncoding=UTF-8\\nDocPath=kdenlive/index.html\\nTerminal=0"
+
+# Watch Television
+?package(kdetv): needs="x11" kde_filename="kdetv" section="Enjoy Music and Video" title="Watch Television" icon="kdetv.png" command="kdetv" kde_command="kdetv -caption \"%c\" %i %m" mimetypes="text/x-tv-channels" kde_opt="\\nEncoding=UTF-8\\nMiniIcon=kdetv\\nGenericName=TV Viewer\\nTerminal=0"
+
+
+## View, Modify and Create Graphics
+# View Images and Photos
+?package(kdegraphics-kuickshow): needs="kde" kde_filename="kuickshow" section="View, Modify and Create Graphics" title="View Images and Photos" icon="kuickshow.png" command="kuickshow" kde_command="kuickshow %i %m -caption \"%c\" %U" mimetypes="image/gif,image/x-xpm,image/x-xbm,image/jpeg,image/png,image/tiff,image/x-bmp,image/x-psd,image/x-eim,image/x-portable-bitmap,image/x-portable-pixmap,image/x-portable-greymap" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nDocPath=kuickshow/index.html\\nTerminal=0\\nInitialPreference=15\\nGenericName=Image Viewer\\nX-DCOP-ServiceType=Multi"
+
+?package(gqview): needs="gnome" section="View, Modify and Create Graphics" title="View Images and Photos" icon="gqview.png" command="gqview" 
+
+# Edit Images and Photos
+?package(gimp): command="/usr/bin/gimp-remote" icon="wilber-icon.png" section="View, Modify and Create Graphics" title="Edit Images and Photos" needs="x11" mimetypes="image/gif;image/jpeg;image/png;image/tiff;image/x-xbm;image/x-xpm;image/bmp;image/fits;image/pcx;image/pix;image/pnm;image/x-bmp;image/x-xcf" startup_notify="true"
+
+# Scan and Use Optical Character Recognition (OCR) 
+?package(kdegraphics-kooka): needs="x11" kde_filename="kooka" section="View, Modify and Create Graphics" title="Scan and Use Optical Character Recognition (OCR)" icon="scanner.png" command="kooka" kde_command="kooka %i %m %U" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kooka\\nDocPath=kooka/index.html\\nGenericName=Scan & OCR Program\\nX-DCOP-ServiceType=Multi\\n"
+
+# Import and Sort Your Photos
+?package(digikam): needs="kde" kde_filename="digikam" section="View, Modify and Create Graphics" title="Import and Sort Your Photos" icon="digikam.png" command="digikam" kde_command="digikam -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=digikam/index.html\\nTerminal=0"
+
+?package(gtkam): needs="gnome" section="View, Modify and Create Graphics" title="Import and Sort Your Photos" icon="gtkam.png" command="gtkam" 
+
+# Create a Screenshot
+?package(kdegraphics-ksnapshot): needs="kde" kde_filename="ksnapshot" section="View, Modify and Create Graphics" title="Create a Screenshot" icon="ksnapshot.png" command="ksnapshot" kde_command="ksnapshot -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Screen Capture Program\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nDocPath=ksnapshot/index.html\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
+?package(gnome-panel): needs="gnome" section="View, Modify and Create Graphics" title="Create a Screenshot" icon="/usr/share/pixmaps/gnome-screenshot.png" command="gnome-panel-screenshot" 
+
+## Play games
+# Frozen-Bubble
+?package(frozen-bubble):command="/usr/games/frozen-bubble" icon="frozen-bubble.png"   needs="X11" section="Play Games" title="Frozen-Bubble" 
+
+# Armagetron
+?package(armagetron):command="/usr/games/armagetron" 		  icon="armagetron.png" 		  needs="x11" 		  section="Play Games" 		  title="ArmageTron" 
+
+# CannonSmash
+?package(csmash):command="/usr/bin/csmash" icon="csmash.png"   needs="x11" section="Play Games" title="Cannon Smash"
+
+# Chromium B.S.U
+?package(chromium):command="/usr/games/chromium" icon="chromium.png"   needs="x11" section="Play Games" title="Chromium" 
+
+# LBreakout 2
+?package(lbreakout2):needs=x11 section="Play Games" title="LBreakout 2" command="/usr/games/lbreakout2" icon="lbreakout2.png"
+
+# TuxRacer
+?package(tuxracer):command="soundwrapper /usr/games/tuxracer" icon="tuxracer.png" needs="x11" section="Play Games"  title="Tuxracer"
+
+# CrackAttack
+?package(crack-attack): command="/usr/games/crack-attack-solo" icon="crack-attack.png" section="Play Games" title="Crack Attack! - Solo" needs="x11"
+
+
+## Administer Your System
+# Configure Your Desktop
+?package(kdebase-progs): needs="kde" kde_filename="KControl" section="Administer Your System" title="Configure Your Desktop" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nEncoding=UTF-8\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nNoDisplay=false"
+
+?package(gnome-control-center): needs="gnome" section="Administer Your System" title="Configure Your Desktop" icon="control-center2.png" command="gnome-control-center" 
+
+# Configure Your Computer 
+?package(drakconf): needs="x11" icon="drakconf.png" section="Administer Your System" title="Configure Your Computer" command="/usr/sbin/drakconf"
+
+# Change Your Password
+?package(kdeutils-kdepasswd): needs="kde" kde_filename="kdepasswd" section="Administer Your System" title="Change Your Password" icon="password.png" command="kdepasswd" kde_opt="\\nEncoding=UTF-8\\nTerminalOptions=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
+
+?package(usermode): needs="gnome" section="Administer Your System" title="Change Your Password" icon="userpasswd.xpm" command="userpasswd" 
+
+# Burn CDs/DVDs
+?package(k3b): needs="x11" kde_filename="k3b" section="Administer Your System" title="Burn CDs-DVDs" icon="k3b.png" command="k3b" mimetypes="application/x-k3b" kde_opt="\\nDocPath=k3b/index.html\\nTerminal=false\\nX-KDE-NativeMimeType=application/x-k3b\\n"
+
+# Design a CD Cover
+?package(kover): needs="x11" kde_filename="kover" section="Administer Your System" title="Design a CD Cover" icon="kover.png" command="kover" kde_command="kover" kde_mimetype="application/x-kover" kde_opt="\\nTerminal=0"
+
+# Backup Your Data
+?package(drakxtools): needs="x11" icon="drakconf.png" section="Administer Your System" title="Backup Your Data" command="/usr/sbin/drakbackup"
+
+# Compress and Decompress Files
+?package(kdeutils-ark): needs="kde" kde_filename="ark" section="Administer Your System" title="Compress and Decompress Files" icon="ark.png" command="ark" kde_command="ark -caption \"%c\" %i %m %U" mimetypes="application/x-gzip,application/x-lha,application/x-tar,application/x-tgz,application/x-tbz,application/x-zip,application/x-bzip,application/x-tzo,application/x-lzop,application/x-rar,application/x-zoo,application/x-tarz,application/x-archive,application/x-bzip2,application/x-jar,application/x-deb" multiple_files="true" accept_url="true" kde_opt="\\nEncoding=UTF-8\\nGenericName=Archiving Tool\\nTerminalOptions=\\nPath=\\nDocPath=ark/index.html\\nTerminal=0\\nSwallowExec=\\nSwallowTitle=\\nBinaryPattern=ark;\\nX-DCOP-ServiceType=Unique\\n"
+
+?package(file-roller): needs="gnome" section="Administer Your System" title="Compress and Decompress Files" icon="file-roller.png" command="file-roller" startup_notify="true"
+
+# Format Floppies
+?package(kdeutils-kfloppy): needs="kde" kde_filename="KFloppy" section="Administer Your System" title="Format Floppies" icon="kfloppy.png" command="kfloppy" kde_command="kfloppy -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nGenericName=Floppy Formatter\\nBinaryPattern=kfloppy;\\nDocPath=kfloppy/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi\\n"
+
+?package(gfloppy): needs="gnome" section="Administer Your System" title="Format Floppies" icon="gfloppy.png" command="gfloppy" 
+
+# Use a Terminal Emulator
+?package(kdebase-konsole): needs="kde" kde_filename="konsole" section="Administer Your System" title="Use a Terminal Emulator" icon="konsole.png" command="konsole" kde_opt="\\nEncoding=UTF-8\\nDocPath=konsole/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nGenericName=Terminal Program\\nX-DCOP-ServiceType=Multi\\nX-KDE-AuthorizeAction=shell_access\\n"
+
+?package(gnome-terminal): needs="gnome" section="Administer Your System" title="Use a Terminal Emulator" icon="gnome-terminal.png" command="gnome-terminal" 
+
+# .hidden
+?package(kdepim-kontact): needs="kde" kde_filename="kontact-summary" section=.hidden title="Kontact" icon="kontact-mdk.png" command="kontact --module summary" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\n"
+
+
+
+## Read documentation
+# Mandriva Linux documentation in german
+#?package(mandrake-doc-de): command="/usr/bin/www-browser /usr/share/doc/mandriva/de/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in German" section="Read Documentation"
+
+# Mandriva Linux documentation in english
+?package(mandriva-doc-Discovery-en): command="/usr/bin/www-browser /usr/share/doc/mandriva/en/Discovery/Discovery.html/index.html" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in English" section="Read Documentation"
+
+# Mandriva Linux documentation in spanish
+#?package(mandrake-doc-es): command="/usr/bin/www-browser /usr/share/doc/mandriva/es/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in Spanish" section="Read Documentation"
+
+# Mandriva Linux documentation in spanish
+?package(mandriva-doc-Discovery-fr): command="/usr/bin/www-browser /usr/share/doc/mandriva/fr/Discovery/Discovery.html/index.html" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in French" section="Read Documentation"
+
+# Mandriva Linux documentation in italian
+#?package(mandrake-doc-it): command="/usr/bin/www-browser /usr/share/doc/mandriva/it/" icon="documentation_section.png" needs="x11" title="Mandriva Linux Documentation in Italian" section="Read Documentation"
+
+# Mandriva Linux documentation in chinese
+#?package(mandrake-doc-zh_cn): command="/usr/bin/www-browser /usr/share/doc/mandriva/zh_cn/" icon="documentation_section.png" needs="x11" title="Mandriva Linux documentation in Chinese" section="Read Documentation"
diff --git a/trunk/menu/desktop-directories/mandriva-hidden.directory.in b/trunk/menu/desktop-directories/mandriva-hidden.directory.in
new file mode 100644
index 0000000..d45295c
--- /dev/null
+++ b/trunk/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/trunk/menu/desktop-directories/mandriva-internet-chat.directory.in b/trunk/menu/desktop-directories/mandriva-internet-chat.directory.in
new file mode 100644
index 0000000..a38ac09
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-chat.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Chat
+Icon=chat_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-filetransfer.directory.in b/trunk/menu/desktop-directories/mandriva-internet-filetransfer.directory.in
new file mode 100644
index 0000000..241d150
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-filetransfer.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=File Transfer
+Icon=file_transfer_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in b/trunk/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
new file mode 100644
index 0000000..543bf14
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Instant Messaging
+Icon=instant_messaging_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-mail.directory.in b/trunk/menu/desktop-directories/mandriva-internet-mail.directory.in
new file mode 100644
index 0000000..2370cf1
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-mail.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Mail
+Icon=mail_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-news.directory.in b/trunk/menu/desktop-directories/mandriva-internet-news.directory.in
new file mode 100644
index 0000000..9c3be3d
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-news.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=News
+Icon=news_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-other.directory.in b/trunk/menu/desktop-directories/mandriva-internet-other.directory.in
new file mode 100644
index 0000000..f79943a
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_networking
diff --git a/trunk/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in b/trunk/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
new file mode 100644
index 0000000..ccfc817
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Remote Access
+Icon=remote_access_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-videoconference.directory.in b/trunk/menu/desktop-directories/mandriva-internet-videoconference.directory.in
new file mode 100644
index 0000000..3aa8bed
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-videoconference.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Video Conference
+Icon=video_conferences_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in b/trunk/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
new file mode 100644
index 0000000..712821a
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Web Browsers
+Icon=web_browser_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet-webeditors.directory.in b/trunk/menu/desktop-directories/mandriva-internet-webeditors.directory.in
new file mode 100644
index 0000000..1930c53
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-internet-webeditors.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Web Editors
+Icon=web_editors_section
diff --git a/trunk/menu/desktop-directories/mandriva-internet.directory.in b/trunk/menu/desktop-directories/mandriva-internet.directory.in
new file mode 100644
index 0000000..e6bf925
--- /dev/null
+++ b/trunk/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/trunk/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in
new file mode 100644
index 0000000..f43220c
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Accessibility
+Icon=accessibility_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-communications.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-communications.directory.in
new file mode 100644
index 0000000..a52c0ba
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-communications.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Communications
+Icon=communications_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-databases.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-databases.directory.in
new file mode 100644
index 0000000..53be655
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-databases.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Databases
+Icon=databases_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in
new file mode 100644
index 0000000..dd6b40e
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-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/trunk/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
new file mode 100644
index 0000000..c03f2b7
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Interpreters
+Icon=interpreters_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
new file mode 100644
index 0000000..f7a909b
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=development_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in
new file mode 100644
index 0000000..df038a7
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Tools
+Icon=development_tools_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-development.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-development.directory.in
new file mode 100644
index 0000000..410858c
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-development.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Development
+Icon=development_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in
new file mode 100644
index 0000000..c4e892d
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Documentation
+Icon=documentation_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-editors.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-editors.directory.in
new file mode 100644
index 0000000..9d61e53
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-editors.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Editors
+Icon=editors_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
new file mode 100644
index 0000000..582e3c5
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Economy
+Icon=education_economy_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
new file mode 100644
index 0000000..738fd42
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Geography
+Icon=education_geography_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
new file mode 100644
index 0000000..80b37e1
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=History
+Icon=education_history_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in
new file mode 100644
index 0000000..c8ad555
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Languages
+Icon=education_languages_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
new file mode 100644
index 0000000..8643eb9
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Literature
+Icon=education_literature_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in
new file mode 100644
index 0000000..18dc436
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=education_other_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in
new file mode 100644
index 0000000..b8c71b7
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sciences
+Icon=education_sciences
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
new file mode 100644
index 0000000..877f2bc
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sports
+Icon=education_sport_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-education.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-education.directory.in
new file mode 100644
index 0000000..edca46a
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-education.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Education
+Icon=education_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in
new file mode 100644
index 0000000..273fdab
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Emulators
+Icon=emulators_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-finances.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-finances.directory.in
new file mode 100644
index 0000000..ed2c40f
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-finances.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Finances
+Icon=finances_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in
new file mode 100644
index 0000000..2aa1562
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Adventure
+Icon=adventure_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in
new file mode 100644
index 0000000..c1b0e90
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Arcade
+Icon=arcade_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in
new file mode 100644
index 0000000..18954fa
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Boards
+Icon=boards_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in
new file mode 100644
index 0000000..2ac788f
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Cards
+Icon=cards_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in
new file mode 100644
index 0000000..39f3a69
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_amusement
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in
new file mode 100644
index 0000000..8ce0de8
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Puzzles
+Icon=puzzle_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in
new file mode 100644
index 0000000..abf35c7
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sports
+Icon=sport_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in
new file mode 100644
index 0000000..e034101
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Strategy
+Icon=strategy_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in
new file mode 100644
index 0000000..6565d42
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Toys
+Icon=toys_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-games.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-games.directory.in
new file mode 100644
index 0000000..018fb82
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-games.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Games
+Icon=amusement_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-other.directory.in
new file mode 100644
index 0000000..85301a2
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=more_applications_other_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in
new file mode 100644
index 0000000..7cb1564
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-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/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in
new file mode 100644
index 0000000..a90b846
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Astronomy
+Icon=astronomy_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in
new file mode 100644
index 0000000..080fe41
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Biology
+Icon=biology_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in
new file mode 100644
index 0000000..6d26b77
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Chemistry
+Icon=chemistry_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in
new file mode 100644
index 0000000..3af7cb0
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-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/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in
new file mode 100644
index 0000000..34474cc
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-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/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in
new file mode 100644
index 0000000..dfbfd6f
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Electricity
+Icon=electricity_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in
new file mode 100644
index 0000000..1163474
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Geosciences
+Icon=geosciences_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in
new file mode 100644
index 0000000..27c465a
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-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/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in
new file mode 100644
index 0000000..e63c918
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Mathematics
+Icon=mathematics_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in
new file mode 100644
index 0000000..8fb6220
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-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/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in
new file mode 100644
index 0000000..1662a74
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_sciences
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in
new file mode 100644
index 0000000..37e9ff5
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-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/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in
new file mode 100644
index 0000000..c1b1df4
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Physics
+Icon=physics_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in
new file mode 100644
index 0000000..225c8d5
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Robotics
+Icon=robotics_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in
new file mode 100644
index 0000000..c662b55
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sciences
+Icon=sciences_section
diff --git a/trunk/menu/desktop-directories/mandriva-moreapplications.directory.in b/trunk/menu/desktop-directories/mandriva-moreapplications.directory.in
new file mode 100644
index 0000000..92b384f
--- /dev/null
+++ b/trunk/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/trunk/menu/desktop-directories/mandriva-multimedia-graphics.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia-graphics.directory.in
new file mode 100644
index 0000000..5dfcef9
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-multimedia-graphics.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Graphics
+Icon=graphics_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia-other.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia-other.directory.in
new file mode 100644
index 0000000..010bf91
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-multimedia-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=multimedia_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia-sound.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia-sound.directory.in
new file mode 100644
index 0000000..b0206ed
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-multimedia-sound.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Sound
+Icon=sound_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia-video.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia-video.directory.in
new file mode 100644
index 0000000..5ba7030
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-multimedia-video.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Video
+Icon=video_section
diff --git a/trunk/menu/desktop-directories/mandriva-multimedia.directory.in b/trunk/menu/desktop-directories/mandriva-multimedia.directory.in
new file mode 100644
index 0000000..ccaaa00
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-multimedia.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Multimedia
+Icon=multimedia_section
diff --git a/trunk/menu/desktop-directories/mandriva-networking.directory.in b/trunk/menu/desktop-directories/mandriva-networking.directory.in
new file mode 100644
index 0000000..b920097
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-networking.directory.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Networking
diff --git a/trunk/menu/desktop-directories/mandriva-office-accessories.directory.in b/trunk/menu/desktop-directories/mandriva-office-accessories.directory.in
new file mode 100644
index 0000000..4b4b8f8
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-accessories.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Accessories
+Icon=office_accessories_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-addressbooks.directory.in b/trunk/menu/desktop-directories/mandriva-office-addressbooks.directory.in
new file mode 100644
index 0000000..e4efce6
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-addressbooks.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Address Books
+Icon=addressbook_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications-fax.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications-fax.directory.in
new file mode 100644
index 0000000..b40260d
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-communications-fax.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Fax
+Icon=communications_fax_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications-other.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications-other.directory.in
new file mode 100644
index 0000000..cb4e4af
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-communications-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=communications_other_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications-pda.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications-pda.directory.in
new file mode 100644
index 0000000..c513475
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-communications-pda.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=PDA
+Icon=pda_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications-phone.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications-phone.directory.in
new file mode 100644
index 0000000..c85e2a6
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-communications-phone.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Phone
+Icon=communications_phone_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-communications.directory.in b/trunk/menu/desktop-directories/mandriva-office-communications.directory.in
new file mode 100644
index 0000000..a52c0ba
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-communications.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Communications
+Icon=communications_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-drawing.directory.in b/trunk/menu/desktop-directories/mandriva-office-drawing.directory.in
new file mode 100644
index 0000000..e5e6736
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-drawing.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Drawing
+Icon=office_drawing_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-graphs.directory.in b/trunk/menu/desktop-directories/mandriva-office-graphs.directory.in
new file mode 100644
index 0000000..e0c5d5d
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-graphs.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Graphs
+Icon=graphs_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-other.directory.in b/trunk/menu/desktop-directories/mandriva-office-other.directory.in
new file mode 100644
index 0000000..db3f56b
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=office_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-presentations.directory.in b/trunk/menu/desktop-directories/mandriva-office-presentations.directory.in
new file mode 100644
index 0000000..c3102ef
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-presentations.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Presentations
+Icon=presentation_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-publishing.directory.in b/trunk/menu/desktop-directories/mandriva-office-publishing.directory.in
new file mode 100644
index 0000000..ecab9f6
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-publishing.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Publishing
+Icon=publishing_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-spreadsheets.directory.in b/trunk/menu/desktop-directories/mandriva-office-spreadsheets.directory.in
new file mode 100644
index 0000000..b64f8e6
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-spreadsheets.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Spreadsheets
+Icon=spreadsheet_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in b/trunk/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
new file mode 100644
index 0000000..3cc120f
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Tasks Management
+Icon=taskmanagement_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-timemanagement.directory.in b/trunk/menu/desktop-directories/mandriva-office-timemanagement.directory.in
new file mode 100644
index 0000000..ad8c6e9
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-timemanagement.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Time Management
+Icon=timemanagement_section
diff --git a/trunk/menu/desktop-directories/mandriva-office-wordprocessors.directory.in b/trunk/menu/desktop-directories/mandriva-office-wordprocessors.directory.in
new file mode 100644
index 0000000..c2e96e2
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-office-wordprocessors.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Wordprocessors
+Icon=wordprocessor_section
diff --git a/trunk/menu/desktop-directories/mandriva-office.directory.in b/trunk/menu/desktop-directories/mandriva-office.directory.in
new file mode 100644
index 0000000..97a7706
--- /dev/null
+++ b/trunk/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/trunk/menu/desktop-directories/mandriva-other.directory.in b/trunk/menu/desktop-directories/mandriva-other.directory.in
new file mode 100644
index 0000000..85301a2
--- /dev/null
+++ b/trunk/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/trunk/menu/desktop-directories/mandriva-system-archiving-backup.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
new file mode 100644
index 0000000..4fd55f1
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Backup
+Icon=backup_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
new file mode 100644
index 0000000..5cae6d0
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=CD Burning
+Icon=cd_burning_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving-compression.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving-compression.directory.in
new file mode 100644
index 0000000..ef08446
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-archiving-compression.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Compression
+Icon=compression_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving-other.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving-other.directory.in
new file mode 100644
index 0000000..1a0f328
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-archiving-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_archiving
diff --git a/trunk/menu/desktop-directories/mandriva-system-archiving.directory.in b/trunk/menu/desktop-directories/mandriva-system-archiving.directory.in
new file mode 100644
index 0000000..20e5d95
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-archiving.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Archiving
+Icon=archiving_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
new file mode 100644
index 0000000..d818d52
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Boot and Init
+Icon=boot_init_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in
new file mode 100644
index 0000000..abc84b4
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-accessibility.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Accessibility
+Icon=accessibility-directory
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-gnome-advanced.directory.in
new file mode 100644
index 0000000..1fa5fe7
--- /dev/null
+++ b/trunk/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/trunk/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in
new file mode 100644
index 0000000..4118eb1
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-gnome.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=GNOME
+Icon=gnome_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
new file mode 100644
index 0000000..86cb531
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Hardware
+Icon=hardware_configuration_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-kde.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-kde.directory.in
new file mode 100644
index 0000000..40183dc
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-kde.directory.in
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=KDE
+X-KDE-BaseGroup=settings
+Icon=kde_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-networking.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-networking.directory.in
new file mode 100644
index 0000000..72ec939
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-networking.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Networking
+Icon=networking_configuration_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-other.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-other.directory.in
new file mode 100644
index 0000000..51b50ad
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-other.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Other
+Icon=other_configuration
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
new file mode 100644
index 0000000..37c3ceb
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Packaging
+Icon=packaging_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration-printing.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration-printing.directory.in
new file mode 100644
index 0000000..d9988df
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration-printing.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Printing
+Icon=printing_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-configuration.directory.in b/trunk/menu/desktop-directories/mandriva-system-configuration.directory.in
new file mode 100644
index 0000000..a3b404b
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-configuration.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Configuration
+Icon=configuration_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-filetools.directory.in b/trunk/menu/desktop-directories/mandriva-system-filetools.directory.in
new file mode 100644
index 0000000..4306fb7
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-filetools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=File Tools
+Icon=file_tools_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-monitoring.directory.in b/trunk/menu/desktop-directories/mandriva-system-monitoring.directory.in
new file mode 100644
index 0000000..df68be5
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-monitoring.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Monitoring
+Icon=monitoring_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-terminals.directory.in b/trunk/menu/desktop-directories/mandriva-system-terminals.directory.in
new file mode 100644
index 0000000..ed56f96
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-terminals.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Terminals
+Icon=terminals_section
diff --git a/trunk/menu/desktop-directories/mandriva-system-texttools.directory.in b/trunk/menu/desktop-directories/mandriva-system-texttools.directory.in
new file mode 100644
index 0000000..da94ea2
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system-texttools.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Text Tools
+Icon=text_tools_section
diff --git a/trunk/menu/desktop-directories/mandriva-system.directory.in b/trunk/menu/desktop-directories/mandriva-system.directory.in
new file mode 100644
index 0000000..b84cb66
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandriva-system.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=System
+Icon=system_section
diff --git a/trunk/menu/desktop-directories/mandrivalinux.directory.in b/trunk/menu/desktop-directories/mandrivalinux.directory.in
new file mode 100644
index 0000000..926cada
--- /dev/null
+++ b/trunk/menu/desktop-directories/mandrivalinux.directory.in
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Type=Directory
+Encoding=UTF-8
+_Name=Applications
+Icon=mandriva
diff --git a/trunk/menu/icons/accessibility_section.png b/trunk/menu/icons/accessibility_section.png
new file mode 100644
index 0000000..18d276f
--- /dev/null
+++ b/trunk/menu/icons/accessibility_section.png
diff --git a/trunk/menu/icons/addressbook_section.png b/trunk/menu/icons/addressbook_section.png
new file mode 100644
index 0000000..6b3e60a
--- /dev/null
+++ b/trunk/menu/icons/addressbook_section.png
diff --git a/trunk/menu/icons/adventure_section.png b/trunk/menu/icons/adventure_section.png
new file mode 100644
index 0000000..fc68ca0
--- /dev/null
+++ b/trunk/menu/icons/adventure_section.png
diff --git a/trunk/menu/icons/amusement_section.png b/trunk/menu/icons/amusement_section.png
new file mode 100644
index 0000000..f30969f
--- /dev/null
+++ b/trunk/menu/icons/amusement_section.png
diff --git a/trunk/menu/icons/applications_section.png b/trunk/menu/icons/applications_section.png
new file mode 100644
index 0000000..9140a71
--- /dev/null
+++ b/trunk/menu/icons/applications_section.png
diff --git a/trunk/menu/icons/arcade_section.png b/trunk/menu/icons/arcade_section.png
new file mode 100644
index 0000000..3003afa
--- /dev/null
+++ b/trunk/menu/icons/arcade_section.png
diff --git a/trunk/menu/icons/archiving_section.png b/trunk/menu/icons/archiving_section.png
new file mode 100644
index 0000000..6f81dab
--- /dev/null
+++ b/trunk/menu/icons/archiving_section.png
diff --git a/trunk/menu/icons/artificial_intelligence_section.png b/trunk/menu/icons/artificial_intelligence_section.png
new file mode 100644
index 0000000..0a1d0cf
--- /dev/null
+++ b/trunk/menu/icons/artificial_intelligence_section.png
diff --git a/trunk/menu/icons/astronomy_section.png b/trunk/menu/icons/astronomy_section.png
new file mode 100644
index 0000000..5a7f0a0
--- /dev/null
+++ b/trunk/menu/icons/astronomy_section.png
diff --git a/trunk/menu/icons/backup_section.png b/trunk/menu/icons/backup_section.png
new file mode 100644
index 0000000..2d8db19
--- /dev/null
+++ b/trunk/menu/icons/backup_section.png
diff --git a/trunk/menu/icons/biology_section.png b/trunk/menu/icons/biology_section.png
new file mode 100644
index 0000000..8a9b9be
--- /dev/null
+++ b/trunk/menu/icons/biology_section.png
diff --git a/trunk/menu/icons/boards_section.png b/trunk/menu/icons/boards_section.png
new file mode 100644
index 0000000..601d1ef
--- /dev/null
+++ b/trunk/menu/icons/boards_section.png
diff --git a/trunk/menu/icons/boot_init_section.png b/trunk/menu/icons/boot_init_section.png
new file mode 100644
index 0000000..283038a
--- /dev/null
+++ b/trunk/menu/icons/boot_init_section.png
diff --git a/trunk/menu/icons/cards_section.png b/trunk/menu/icons/cards_section.png
new file mode 100644
index 0000000..68a4e36
--- /dev/null
+++ b/trunk/menu/icons/cards_section.png
diff --git a/trunk/menu/icons/cd_burning_section.png b/trunk/menu/icons/cd_burning_section.png
new file mode 100644
index 0000000..7053283
--- /dev/null
+++ b/trunk/menu/icons/cd_burning_section.png
diff --git a/trunk/menu/icons/chat_section.png b/trunk/menu/icons/chat_section.png
new file mode 100644
index 0000000..9cc2a8b
--- /dev/null
+++ b/trunk/menu/icons/chat_section.png
diff --git a/trunk/menu/icons/chemistry_section.png b/trunk/menu/icons/chemistry_section.png
new file mode 100644
index 0000000..7abf315
--- /dev/null
+++ b/trunk/menu/icons/chemistry_section.png
diff --git a/trunk/menu/icons/chinese_section.png b/trunk/menu/icons/chinese_section.png
new file mode 100644
index 0000000..6487bde
--- /dev/null
+++ b/trunk/menu/icons/chinese_section.png
diff --git a/trunk/menu/icons/code_generator_section.png b/trunk/menu/icons/code_generator_section.png
new file mode 100644
index 0000000..fb063ca
--- /dev/null
+++ b/trunk/menu/icons/code_generator_section.png
diff --git a/trunk/menu/icons/communications_fax_section.png b/trunk/menu/icons/communications_fax_section.png
new file mode 100644
index 0000000..839451b
--- /dev/null
+++ b/trunk/menu/icons/communications_fax_section.png
diff --git a/trunk/menu/icons/communications_other_section.png b/trunk/menu/icons/communications_other_section.png
new file mode 100644
index 0000000..354976c
--- /dev/null
+++ b/trunk/menu/icons/communications_other_section.png
diff --git a/trunk/menu/icons/communications_phone_section.png b/trunk/menu/icons/communications_phone_section.png
new file mode 100644
index 0000000..05aff8e
--- /dev/null
+++ b/trunk/menu/icons/communications_phone_section.png
diff --git a/trunk/menu/icons/communications_section.png b/trunk/menu/icons/communications_section.png
new file mode 100644
index 0000000..510d302
--- /dev/null
+++ b/trunk/menu/icons/communications_section.png
diff --git a/trunk/menu/icons/compression_section.png b/trunk/menu/icons/compression_section.png
new file mode 100644
index 0000000..8f7197a
--- /dev/null
+++ b/trunk/menu/icons/compression_section.png
diff --git a/trunk/menu/icons/computer_science_section.png b/trunk/menu/icons/computer_science_section.png
new file mode 100644
index 0000000..310b91f
--- /dev/null
+++ b/trunk/menu/icons/computer_science_section.png
diff --git a/trunk/menu/icons/configuration_section.png b/trunk/menu/icons/configuration_section.png
new file mode 100644
index 0000000..54979c4
--- /dev/null
+++ b/trunk/menu/icons/configuration_section.png
diff --git a/trunk/menu/icons/data_visualization_section.png b/trunk/menu/icons/data_visualization_section.png
new file mode 100644
index 0000000..b1fcbef
--- /dev/null
+++ b/trunk/menu/icons/data_visualization_section.png
diff --git a/trunk/menu/icons/databases_section.png b/trunk/menu/icons/databases_section.png
new file mode 100644
index 0000000..d3f9299
--- /dev/null
+++ b/trunk/menu/icons/databases_section.png
diff --git a/trunk/menu/icons/development_environment_section.png b/trunk/menu/icons/development_environment_section.png
new file mode 100644
index 0000000..4585dd4
--- /dev/null
+++ b/trunk/menu/icons/development_environment_section.png
diff --git a/trunk/menu/icons/development_section.png b/trunk/menu/icons/development_section.png
new file mode 100644
index 0000000..fc33637
--- /dev/null
+++ b/trunk/menu/icons/development_section.png
diff --git a/trunk/menu/icons/development_tools_section.png b/trunk/menu/icons/development_tools_section.png
new file mode 100644
index 0000000..0be303e
--- /dev/null
+++ b/trunk/menu/icons/development_tools_section.png
diff --git a/trunk/menu/icons/documentation_section.png b/trunk/menu/icons/documentation_section.png
new file mode 100644
index 0000000..27aa0dc
--- /dev/null
+++ b/trunk/menu/icons/documentation_section.png
diff --git a/trunk/menu/icons/editors_section.png b/trunk/menu/icons/editors_section.png
new file mode 100644
index 0000000..499b97d
--- /dev/null
+++ b/trunk/menu/icons/editors_section.png
diff --git a/trunk/menu/icons/education_economy_section.png b/trunk/menu/icons/education_economy_section.png
new file mode 100644
index 0000000..bd958a3
--- /dev/null
+++ b/trunk/menu/icons/education_economy_section.png
diff --git a/trunk/menu/icons/education_geography_section.png b/trunk/menu/icons/education_geography_section.png
new file mode 100644
index 0000000..bfa3c38
--- /dev/null
+++ b/trunk/menu/icons/education_geography_section.png
diff --git a/trunk/menu/icons/education_history_section.png b/trunk/menu/icons/education_history_section.png
new file mode 100644
index 0000000..7b55ca4
--- /dev/null
+++ b/trunk/menu/icons/education_history_section.png
diff --git a/trunk/menu/icons/education_languages_section.png b/trunk/menu/icons/education_languages_section.png
new file mode 100644
index 0000000..1457811
--- /dev/null
+++ b/trunk/menu/icons/education_languages_section.png
diff --git a/trunk/menu/icons/education_literature_section.png b/trunk/menu/icons/education_literature_section.png
new file mode 100644
index 0000000..c4c7e48
--- /dev/null
+++ b/trunk/menu/icons/education_literature_section.png
diff --git a/trunk/menu/icons/education_mathematics.png b/trunk/menu/icons/education_mathematics.png
new file mode 100644
index 0000000..9ef0469
--- /dev/null
+++ b/trunk/menu/icons/education_mathematics.png
diff --git a/trunk/menu/icons/education_other_section.png b/trunk/menu/icons/education_other_section.png
new file mode 100644
index 0000000..6fea767
--- /dev/null
+++ b/trunk/menu/icons/education_other_section.png
diff --git a/trunk/menu/icons/education_sciences.png b/trunk/menu/icons/education_sciences.png
new file mode 100644
index 0000000..b858fab
--- /dev/null
+++ b/trunk/menu/icons/education_sciences.png
diff --git a/trunk/menu/icons/education_section.png b/trunk/menu/icons/education_section.png
new file mode 100644
index 0000000..96a5826
--- /dev/null
+++ b/trunk/menu/icons/education_section.png
diff --git a/trunk/menu/icons/education_sport_section.png b/trunk/menu/icons/education_sport_section.png
new file mode 100644
index 0000000..d150eb7
--- /dev/null
+++ b/trunk/menu/icons/education_sport_section.png
diff --git a/trunk/menu/icons/education_tool.png b/trunk/menu/icons/education_tool.png
new file mode 100644
index 0000000..b13cc87
--- /dev/null
+++ b/trunk/menu/icons/education_tool.png
diff --git a/trunk/menu/icons/electricity_section.png b/trunk/menu/icons/electricity_section.png
new file mode 100644
index 0000000..1b8f225
--- /dev/null
+++ b/trunk/menu/icons/electricity_section.png
diff --git a/trunk/menu/icons/emulators_section.png b/trunk/menu/icons/emulators_section.png
new file mode 100644
index 0000000..a1c8399
--- /dev/null
+++ b/trunk/menu/icons/emulators_section.png
diff --git a/trunk/menu/icons/file_tools_section.png b/trunk/menu/icons/file_tools_section.png
new file mode 100644
index 0000000..b4a1139
--- /dev/null
+++ b/trunk/menu/icons/file_tools_section.png
diff --git a/trunk/menu/icons/file_transfer_section.png b/trunk/menu/icons/file_transfer_section.png
new file mode 100644
index 0000000..f672912
--- /dev/null
+++ b/trunk/menu/icons/file_transfer_section.png
diff --git a/trunk/menu/icons/finances_section.png b/trunk/menu/icons/finances_section.png
new file mode 100644
index 0000000..b23df72
--- /dev/null
+++ b/trunk/menu/icons/finances_section.png
diff --git a/trunk/menu/icons/geosciences_section.png b/trunk/menu/icons/geosciences_section.png
new file mode 100644
index 0000000..d0611cd
--- /dev/null
+++ b/trunk/menu/icons/geosciences_section.png
diff --git a/trunk/menu/icons/gnome_section.png b/trunk/menu/icons/gnome_section.png
new file mode 100644
index 0000000..f2f9254
--- /dev/null
+++ b/trunk/menu/icons/gnome_section.png
diff --git a/trunk/menu/icons/graphics_section.png b/trunk/menu/icons/graphics_section.png
new file mode 100644
index 0000000..7511e1e
--- /dev/null
+++ b/trunk/menu/icons/graphics_section.png
diff --git a/trunk/menu/icons/graphs_section.png b/trunk/menu/icons/graphs_section.png
new file mode 100644
index 0000000..242430d
--- /dev/null
+++ b/trunk/menu/icons/graphs_section.png
diff --git a/trunk/menu/icons/hardware_configuration_section.png b/trunk/menu/icons/hardware_configuration_section.png
new file mode 100644
index 0000000..1e9a2ab
--- /dev/null
+++ b/trunk/menu/icons/hardware_configuration_section.png
diff --git a/trunk/menu/icons/hardware_section.png b/trunk/menu/icons/hardware_section.png
new file mode 100644
index 0000000..f1775b7
--- /dev/null
+++ b/trunk/menu/icons/hardware_section.png
diff --git a/trunk/menu/icons/image_processing_section.png b/trunk/menu/icons/image_processing_section.png
new file mode 100644
index 0000000..9f9b8b7
--- /dev/null
+++ b/trunk/menu/icons/image_processing_section.png
diff --git a/trunk/menu/icons/instant_messaging_section.png b/trunk/menu/icons/instant_messaging_section.png
new file mode 100644
index 0000000..36f9d08
--- /dev/null
+++ b/trunk/menu/icons/instant_messaging_section.png
diff --git a/trunk/menu/icons/internet_section.png b/trunk/menu/icons/internet_section.png
new file mode 100644
index 0000000..ee4dab8
--- /dev/null
+++ b/trunk/menu/icons/internet_section.png
diff --git a/trunk/menu/icons/interpreters_section.png b/trunk/menu/icons/interpreters_section.png
new file mode 100644
index 0000000..b5f7094
--- /dev/null
+++ b/trunk/menu/icons/interpreters_section.png
diff --git a/trunk/menu/icons/irc_section.png b/trunk/menu/icons/irc_section.png
new file mode 100644
index 0000000..90f5488
--- /dev/null
+++ b/trunk/menu/icons/irc_section.png
diff --git a/trunk/menu/icons/kde_section.png b/trunk/menu/icons/kde_section.png
new file mode 100644
index 0000000..ff9d36f
--- /dev/null
+++ b/trunk/menu/icons/kde_section.png
diff --git a/trunk/menu/icons/large/accessibility_section.png b/trunk/menu/icons/large/accessibility_section.png
new file mode 100644
index 0000000..b51e00b
--- /dev/null
+++ b/trunk/menu/icons/large/accessibility_section.png
diff --git a/trunk/menu/icons/large/addressbook_section.png b/trunk/menu/icons/large/addressbook_section.png
new file mode 100644
index 0000000..a525e7b
--- /dev/null
+++ b/trunk/menu/icons/large/addressbook_section.png
diff --git a/trunk/menu/icons/large/adventure_section.png b/trunk/menu/icons/large/adventure_section.png
new file mode 100644
index 0000000..cbb3192
--- /dev/null
+++ b/trunk/menu/icons/large/adventure_section.png
diff --git a/trunk/menu/icons/large/amusement_section.png b/trunk/menu/icons/large/amusement_section.png
new file mode 100644
index 0000000..51038db
--- /dev/null
+++ b/trunk/menu/icons/large/amusement_section.png
diff --git a/trunk/menu/icons/large/applications_section.png b/trunk/menu/icons/large/applications_section.png
new file mode 100644
index 0000000..8d5f554
--- /dev/null
+++ b/trunk/menu/icons/large/applications_section.png
diff --git a/trunk/menu/icons/large/arcade_section.png b/trunk/menu/icons/large/arcade_section.png
new file mode 100644
index 0000000..5052c2d
--- /dev/null
+++ b/trunk/menu/icons/large/arcade_section.png
diff --git a/trunk/menu/icons/large/archiving_section.png b/trunk/menu/icons/large/archiving_section.png
new file mode 100644
index 0000000..5ca5700
--- /dev/null
+++ b/trunk/menu/icons/large/archiving_section.png
diff --git a/trunk/menu/icons/large/artificial_intelligence_section.png b/trunk/menu/icons/large/artificial_intelligence_section.png
new file mode 100644
index 0000000..30f48ce
--- /dev/null
+++ b/trunk/menu/icons/large/artificial_intelligence_section.png
diff --git a/trunk/menu/icons/large/astronomy_section.png b/trunk/menu/icons/large/astronomy_section.png
new file mode 100644
index 0000000..751558b
--- /dev/null
+++ b/trunk/menu/icons/large/astronomy_section.png
diff --git a/trunk/menu/icons/large/backup_section.png b/trunk/menu/icons/large/backup_section.png
new file mode 100644
index 0000000..cf08148
--- /dev/null
+++ b/trunk/menu/icons/large/backup_section.png
diff --git a/trunk/menu/icons/large/biology_section.png b/trunk/menu/icons/large/biology_section.png
new file mode 100644
index 0000000..9707049
--- /dev/null
+++ b/trunk/menu/icons/large/biology_section.png
diff --git a/trunk/menu/icons/large/boards_section.png b/trunk/menu/icons/large/boards_section.png
new file mode 100644
index 0000000..e2f857c
--- /dev/null
+++ b/trunk/menu/icons/large/boards_section.png
diff --git a/trunk/menu/icons/large/boot_init_section.png b/trunk/menu/icons/large/boot_init_section.png
new file mode 100644
index 0000000..eec582f
--- /dev/null
+++ b/trunk/menu/icons/large/boot_init_section.png
diff --git a/trunk/menu/icons/large/cards_section.png b/trunk/menu/icons/large/cards_section.png
new file mode 100644
index 0000000..8c38517
--- /dev/null
+++ b/trunk/menu/icons/large/cards_section.png
diff --git a/trunk/menu/icons/large/cd_burning_section.png b/trunk/menu/icons/large/cd_burning_section.png
new file mode 100644
index 0000000..a75175a
--- /dev/null
+++ b/trunk/menu/icons/large/cd_burning_section.png
diff --git a/trunk/menu/icons/large/chat_section.png b/trunk/menu/icons/large/chat_section.png
new file mode 100644
index 0000000..1009e00
--- /dev/null
+++ b/trunk/menu/icons/large/chat_section.png
diff --git a/trunk/menu/icons/large/chemistry_section.png b/trunk/menu/icons/large/chemistry_section.png
new file mode 100644
index 0000000..9305201
--- /dev/null
+++ b/trunk/menu/icons/large/chemistry_section.png
diff --git a/trunk/menu/icons/large/chinese_section.png b/trunk/menu/icons/large/chinese_section.png
new file mode 100644
index 0000000..304f308
--- /dev/null
+++ b/trunk/menu/icons/large/chinese_section.png
diff --git a/trunk/menu/icons/large/code_generator_section.png b/trunk/menu/icons/large/code_generator_section.png
new file mode 100644
index 0000000..01d7ed6
--- /dev/null
+++ b/trunk/menu/icons/large/code_generator_section.png
diff --git a/trunk/menu/icons/large/communications_fax_section.png b/trunk/menu/icons/large/communications_fax_section.png
new file mode 100644
index 0000000..1007128
--- /dev/null
+++ b/trunk/menu/icons/large/communications_fax_section.png
diff --git a/trunk/menu/icons/large/communications_other_section.png b/trunk/menu/icons/large/communications_other_section.png
new file mode 100644
index 0000000..f01bc2d
--- /dev/null
+++ b/trunk/menu/icons/large/communications_other_section.png
diff --git a/trunk/menu/icons/large/communications_phone_section.png b/trunk/menu/icons/large/communications_phone_section.png
new file mode 100644
index 0000000..d9c9c9f
--- /dev/null
+++ b/trunk/menu/icons/large/communications_phone_section.png
diff --git a/trunk/menu/icons/large/communications_section.png b/trunk/menu/icons/large/communications_section.png
new file mode 100644
index 0000000..362fc23
--- /dev/null
+++ b/trunk/menu/icons/large/communications_section.png
diff --git a/trunk/menu/icons/large/compression_section.png b/trunk/menu/icons/large/compression_section.png
new file mode 100644
index 0000000..e6772c8
--- /dev/null
+++ b/trunk/menu/icons/large/compression_section.png
diff --git a/trunk/menu/icons/large/computer_science_section.png b/trunk/menu/icons/large/computer_science_section.png
new file mode 100644
index 0000000..a84ca67
--- /dev/null
+++ b/trunk/menu/icons/large/computer_science_section.png
diff --git a/trunk/menu/icons/large/configuration_section.png b/trunk/menu/icons/large/configuration_section.png
new file mode 100644
index 0000000..ba22103
--- /dev/null
+++ b/trunk/menu/icons/large/configuration_section.png
diff --git a/trunk/menu/icons/large/data_visualization_section.png b/trunk/menu/icons/large/data_visualization_section.png
new file mode 100644
index 0000000..6c7c73c
--- /dev/null
+++ b/trunk/menu/icons/large/data_visualization_section.png
diff --git a/trunk/menu/icons/large/databases_section.png b/trunk/menu/icons/large/databases_section.png
new file mode 100644
index 0000000..a2371ad
--- /dev/null
+++ b/trunk/menu/icons/large/databases_section.png
diff --git a/trunk/menu/icons/large/development_environment_section.png b/trunk/menu/icons/large/development_environment_section.png
new file mode 100644
index 0000000..b77ead3
--- /dev/null
+++ b/trunk/menu/icons/large/development_environment_section.png
diff --git a/trunk/menu/icons/large/development_section.png b/trunk/menu/icons/large/development_section.png
new file mode 100644
index 0000000..5b60abd
--- /dev/null
+++ b/trunk/menu/icons/large/development_section.png
diff --git a/trunk/menu/icons/large/development_tools_section.png b/trunk/menu/icons/large/development_tools_section.png
new file mode 100644
index 0000000..f92a808
--- /dev/null
+++ b/trunk/menu/icons/large/development_tools_section.png
diff --git a/trunk/menu/icons/large/documentation_section.png b/trunk/menu/icons/large/documentation_section.png
new file mode 100644
index 0000000..a2c946e
--- /dev/null
+++ b/trunk/menu/icons/large/documentation_section.png
diff --git a/trunk/menu/icons/large/editors_section.png b/trunk/menu/icons/large/editors_section.png
new file mode 100644
index 0000000..2ba7bc2
--- /dev/null
+++ b/trunk/menu/icons/large/editors_section.png
diff --git a/trunk/menu/icons/large/education_economy_section.png b/trunk/menu/icons/large/education_economy_section.png
new file mode 100644
index 0000000..3edae59
--- /dev/null
+++ b/trunk/menu/icons/large/education_economy_section.png
diff --git a/trunk/menu/icons/large/education_geography_section.png b/trunk/menu/icons/large/education_geography_section.png
new file mode 100644
index 0000000..50a32eb
--- /dev/null
+++ b/trunk/menu/icons/large/education_geography_section.png
diff --git a/trunk/menu/icons/large/education_history_section.png b/trunk/menu/icons/large/education_history_section.png
new file mode 100644
index 0000000..8c722e7
--- /dev/null
+++ b/trunk/menu/icons/large/education_history_section.png
diff --git a/trunk/menu/icons/large/education_languages_section.png b/trunk/menu/icons/large/education_languages_section.png
new file mode 100644
index 0000000..df32f35
--- /dev/null
+++ b/trunk/menu/icons/large/education_languages_section.png
diff --git a/trunk/menu/icons/large/education_literature_section.png b/trunk/menu/icons/large/education_literature_section.png
new file mode 100644
index 0000000..78b533c
--- /dev/null
+++ b/trunk/menu/icons/large/education_literature_section.png
diff --git a/trunk/menu/icons/large/education_mathematics.png b/trunk/menu/icons/large/education_mathematics.png
new file mode 100644
index 0000000..6026c20
--- /dev/null
+++ b/trunk/menu/icons/large/education_mathematics.png
diff --git a/trunk/menu/icons/large/education_other_section.png b/trunk/menu/icons/large/education_other_section.png
new file mode 100644
index 0000000..006730a
--- /dev/null
+++ b/trunk/menu/icons/large/education_other_section.png
diff --git a/trunk/menu/icons/large/education_sciences.png b/trunk/menu/icons/large/education_sciences.png
new file mode 100644
index 0000000..2caacb7
--- /dev/null
+++ b/trunk/menu/icons/large/education_sciences.png
diff --git a/trunk/menu/icons/large/education_section.png b/trunk/menu/icons/large/education_section.png
new file mode 100644
index 0000000..c56099a
--- /dev/null
+++ b/trunk/menu/icons/large/education_section.png
diff --git a/trunk/menu/icons/large/education_sport_section.png b/trunk/menu/icons/large/education_sport_section.png
new file mode 100644
index 0000000..0b6e59a
--- /dev/null
+++ b/trunk/menu/icons/large/education_sport_section.png
diff --git a/trunk/menu/icons/large/education_tool.png b/trunk/menu/icons/large/education_tool.png
new file mode 100644
index 0000000..9ea3024
--- /dev/null
+++ b/trunk/menu/icons/large/education_tool.png
diff --git a/trunk/menu/icons/large/electricity_section.png b/trunk/menu/icons/large/electricity_section.png
new file mode 100644
index 0000000..c96bfec
--- /dev/null
+++ b/trunk/menu/icons/large/electricity_section.png
diff --git a/trunk/menu/icons/large/emulators_section.png b/trunk/menu/icons/large/emulators_section.png
new file mode 100644
index 0000000..34b05a2
--- /dev/null
+++ b/trunk/menu/icons/large/emulators_section.png
diff --git a/trunk/menu/icons/large/file_tools_section.png b/trunk/menu/icons/large/file_tools_section.png
new file mode 100644
index 0000000..f45ce9e
--- /dev/null
+++ b/trunk/menu/icons/large/file_tools_section.png
diff --git a/trunk/menu/icons/large/file_transfer_section.png b/trunk/menu/icons/large/file_transfer_section.png
new file mode 100644
index 0000000..7904a10
--- /dev/null
+++ b/trunk/menu/icons/large/file_transfer_section.png
diff --git a/trunk/menu/icons/large/finances_section.png b/trunk/menu/icons/large/finances_section.png
new file mode 100644
index 0000000..5a828c3
--- /dev/null
+++ b/trunk/menu/icons/large/finances_section.png
diff --git a/trunk/menu/icons/large/geosciences_section.png b/trunk/menu/icons/large/geosciences_section.png
new file mode 100644
index 0000000..4d8ddc0
--- /dev/null
+++ b/trunk/menu/icons/large/geosciences_section.png
diff --git a/trunk/menu/icons/large/gnome_section.png b/trunk/menu/icons/large/gnome_section.png
new file mode 100644
index 0000000..0958e57
--- /dev/null
+++ b/trunk/menu/icons/large/gnome_section.png
diff --git a/trunk/menu/icons/large/graphics_section.png b/trunk/menu/icons/large/graphics_section.png
new file mode 100644
index 0000000..618c01f
--- /dev/null
+++ b/trunk/menu/icons/large/graphics_section.png
diff --git a/trunk/menu/icons/large/graphs_section.png b/trunk/menu/icons/large/graphs_section.png
new file mode 100644
index 0000000..bb00a78
--- /dev/null
+++ b/trunk/menu/icons/large/graphs_section.png
diff --git a/trunk/menu/icons/large/hardware_configuration_section.png b/trunk/menu/icons/large/hardware_configuration_section.png
new file mode 100644
index 0000000..daa4820
--- /dev/null
+++ b/trunk/menu/icons/large/hardware_configuration_section.png
diff --git a/trunk/menu/icons/large/hardware_section.png b/trunk/menu/icons/large/hardware_section.png
new file mode 100644
index 0000000..2c9da56
--- /dev/null
+++ b/trunk/menu/icons/large/hardware_section.png
diff --git a/trunk/menu/icons/large/image_processing_section.png b/trunk/menu/icons/large/image_processing_section.png
new file mode 100644
index 0000000..6c7971a
--- /dev/null
+++ b/trunk/menu/icons/large/image_processing_section.png
diff --git a/trunk/menu/icons/large/instant_messaging_section.png b/trunk/menu/icons/large/instant_messaging_section.png
new file mode 100644
index 0000000..fd5d7b8
--- /dev/null
+++ b/trunk/menu/icons/large/instant_messaging_section.png
diff --git a/trunk/menu/icons/large/internet_section.png b/trunk/menu/icons/large/internet_section.png
new file mode 100644
index 0000000..d2c306a
--- /dev/null
+++ b/trunk/menu/icons/large/internet_section.png
diff --git a/trunk/menu/icons/large/interpreters_section.png b/trunk/menu/icons/large/interpreters_section.png
new file mode 100644
index 0000000..811b12f
--- /dev/null
+++ b/trunk/menu/icons/large/interpreters_section.png
diff --git a/trunk/menu/icons/large/irc_section.png b/trunk/menu/icons/large/irc_section.png
new file mode 100644
index 0000000..64b15ac
--- /dev/null
+++ b/trunk/menu/icons/large/irc_section.png
diff --git a/trunk/menu/icons/large/kde_section.png b/trunk/menu/icons/large/kde_section.png
new file mode 100644
index 0000000..ffd82d7
--- /dev/null
+++ b/trunk/menu/icons/large/kde_section.png
diff --git a/trunk/menu/icons/large/mail_section.png b/trunk/menu/icons/large/mail_section.png
new file mode 100644
index 0000000..ceb01ef
--- /dev/null
+++ b/trunk/menu/icons/large/mail_section.png
diff --git a/trunk/menu/icons/large/mandrake.png b/trunk/menu/icons/large/mandrake.png
new file mode 100644
index 0000000..b3b811c
--- /dev/null
+++ b/trunk/menu/icons/large/mandrake.png
diff --git a/trunk/menu/icons/large/mathematics_section.png b/trunk/menu/icons/large/mathematics_section.png
new file mode 100644
index 0000000..2f49d29
--- /dev/null
+++ b/trunk/menu/icons/large/mathematics_section.png
diff --git a/trunk/menu/icons/large/monitoring_section.png b/trunk/menu/icons/large/monitoring_section.png
new file mode 100644
index 0000000..1c669e9
--- /dev/null
+++ b/trunk/menu/icons/large/monitoring_section.png
diff --git a/trunk/menu/icons/large/more_applications_other_section.png b/trunk/menu/icons/large/more_applications_other_section.png
new file mode 100644
index 0000000..6d6b95e
--- /dev/null
+++ b/trunk/menu/icons/large/more_applications_other_section.png
diff --git a/trunk/menu/icons/large/more_applications_section.png b/trunk/menu/icons/large/more_applications_section.png
new file mode 100644
index 0000000..6d6b95e
--- /dev/null
+++ b/trunk/menu/icons/large/more_applications_section.png
diff --git a/trunk/menu/icons/large/multimedia_section.png b/trunk/menu/icons/large/multimedia_section.png
new file mode 100644
index 0000000..2112b8d
--- /dev/null
+++ b/trunk/menu/icons/large/multimedia_section.png
diff --git a/trunk/menu/icons/large/networking_configuration_section.png b/trunk/menu/icons/large/networking_configuration_section.png
new file mode 100644
index 0000000..278f4b2
--- /dev/null
+++ b/trunk/menu/icons/large/networking_configuration_section.png
diff --git a/trunk/menu/icons/large/networking_section.png b/trunk/menu/icons/large/networking_section.png
new file mode 100644
index 0000000..00150e9
--- /dev/null
+++ b/trunk/menu/icons/large/networking_section.png
diff --git a/trunk/menu/icons/large/networking_www_section.png b/trunk/menu/icons/large/networking_www_section.png
new file mode 100644
index 0000000..982315a
--- /dev/null
+++ b/trunk/menu/icons/large/networking_www_section.png
diff --git a/trunk/menu/icons/large/news_section.png b/trunk/menu/icons/large/news_section.png
new file mode 100644
index 0000000..b3055eb
--- /dev/null
+++ b/trunk/menu/icons/large/news_section.png
diff --git a/trunk/menu/icons/large/numerical_analysis_section.png b/trunk/menu/icons/large/numerical_analysis_section.png
new file mode 100644
index 0000000..a656f84
--- /dev/null
+++ b/trunk/menu/icons/large/numerical_analysis_section.png
diff --git a/trunk/menu/icons/large/office_accessories_section.png b/trunk/menu/icons/large/office_accessories_section.png
new file mode 100644
index 0000000..231f630
--- /dev/null
+++ b/trunk/menu/icons/large/office_accessories_section.png
diff --git a/trunk/menu/icons/large/office_drawing_section.png b/trunk/menu/icons/large/office_drawing_section.png
new file mode 100644
index 0000000..85b8243
--- /dev/null
+++ b/trunk/menu/icons/large/office_drawing_section.png
diff --git a/trunk/menu/icons/large/office_section.png b/trunk/menu/icons/large/office_section.png
new file mode 100644
index 0000000..34f8887
--- /dev/null
+++ b/trunk/menu/icons/large/office_section.png
diff --git a/trunk/menu/icons/large/other_amusement.png b/trunk/menu/icons/large/other_amusement.png
new file mode 100644
index 0000000..6d2f9a4
--- /dev/null
+++ b/trunk/menu/icons/large/other_amusement.png
diff --git a/trunk/menu/icons/large/other_archiving.png b/trunk/menu/icons/large/other_archiving.png
new file mode 100644
index 0000000..a1d1672
--- /dev/null
+++ b/trunk/menu/icons/large/other_archiving.png
diff --git a/trunk/menu/icons/large/other_configuration.png b/trunk/menu/icons/large/other_configuration.png
new file mode 100644
index 0000000..8a369bc
--- /dev/null
+++ b/trunk/menu/icons/large/other_configuration.png
diff --git a/trunk/menu/icons/large/other_networking.png b/trunk/menu/icons/large/other_networking.png
new file mode 100644
index 0000000..17112af
--- /dev/null
+++ b/trunk/menu/icons/large/other_networking.png
diff --git a/trunk/menu/icons/large/other_sciences.png b/trunk/menu/icons/large/other_sciences.png
new file mode 100644
index 0000000..a8db7cc
--- /dev/null
+++ b/trunk/menu/icons/large/other_sciences.png
diff --git a/trunk/menu/icons/large/packaging_section.png b/trunk/menu/icons/large/packaging_section.png
new file mode 100644
index 0000000..b190bef
--- /dev/null
+++ b/trunk/menu/icons/large/packaging_section.png
diff --git a/trunk/menu/icons/large/parallel_computing_section.png b/trunk/menu/icons/large/parallel_computing_section.png
new file mode 100644
index 0000000..2207b63
--- /dev/null
+++ b/trunk/menu/icons/large/parallel_computing_section.png
diff --git a/trunk/menu/icons/large/pda_section.png b/trunk/menu/icons/large/pda_section.png
new file mode 100644
index 0000000..10bfd3c
--- /dev/null
+++ b/trunk/menu/icons/large/pda_section.png
diff --git a/trunk/menu/icons/large/physics_section.png b/trunk/menu/icons/large/physics_section.png
new file mode 100644
index 0000000..2873f76
--- /dev/null
+++ b/trunk/menu/icons/large/physics_section.png
diff --git a/trunk/menu/icons/large/presentation_section.png b/trunk/menu/icons/large/presentation_section.png
new file mode 100644
index 0000000..909a6bb
--- /dev/null
+++ b/trunk/menu/icons/large/presentation_section.png
diff --git a/trunk/menu/icons/large/printing_section.png b/trunk/menu/icons/large/printing_section.png
new file mode 100644
index 0000000..37b24e8
--- /dev/null
+++ b/trunk/menu/icons/large/printing_section.png
diff --git a/trunk/menu/icons/large/publishing_section.png b/trunk/menu/icons/large/publishing_section.png
new file mode 100644
index 0000000..4804c1e
--- /dev/null
+++ b/trunk/menu/icons/large/publishing_section.png
diff --git a/trunk/menu/icons/large/puzzle_section.png b/trunk/menu/icons/large/puzzle_section.png
new file mode 100644
index 0000000..94d1321
--- /dev/null
+++ b/trunk/menu/icons/large/puzzle_section.png
diff --git a/trunk/menu/icons/large/remote_access_section.png b/trunk/menu/icons/large/remote_access_section.png
new file mode 100644
index 0000000..1b795c8
--- /dev/null
+++ b/trunk/menu/icons/large/remote_access_section.png
diff --git a/trunk/menu/icons/large/robotics_section.png b/trunk/menu/icons/large/robotics_section.png
new file mode 100644
index 0000000..ce1e868
--- /dev/null
+++ b/trunk/menu/icons/large/robotics_section.png
diff --git a/trunk/menu/icons/large/sciences_section.png b/trunk/menu/icons/large/sciences_section.png
new file mode 100644
index 0000000..e1cf469
--- /dev/null
+++ b/trunk/menu/icons/large/sciences_section.png
diff --git a/trunk/menu/icons/large/shells_section.png b/trunk/menu/icons/large/shells_section.png
new file mode 100644
index 0000000..794a17f
--- /dev/null
+++ b/trunk/menu/icons/large/shells_section.png
diff --git a/trunk/menu/icons/large/sound_section.png b/trunk/menu/icons/large/sound_section.png
new file mode 100644
index 0000000..0757872
--- /dev/null
+++ b/trunk/menu/icons/large/sound_section.png
diff --git a/trunk/menu/icons/large/sport_section.png b/trunk/menu/icons/large/sport_section.png
new file mode 100644
index 0000000..d813cd8
--- /dev/null
+++ b/trunk/menu/icons/large/sport_section.png
diff --git a/trunk/menu/icons/large/spreadsheet_section.png b/trunk/menu/icons/large/spreadsheet_section.png
new file mode 100644
index 0000000..840bf45
--- /dev/null
+++ b/trunk/menu/icons/large/spreadsheet_section.png
diff --git a/trunk/menu/icons/large/strategy_section.png b/trunk/menu/icons/large/strategy_section.png
new file mode 100644
index 0000000..dc29d60
--- /dev/null
+++ b/trunk/menu/icons/large/strategy_section.png
diff --git a/trunk/menu/icons/large/system_other_section.png b/trunk/menu/icons/large/system_other_section.png
new file mode 100644
index 0000000..6f3124c
--- /dev/null
+++ b/trunk/menu/icons/large/system_other_section.png
diff --git a/trunk/menu/icons/large/system_section.png b/trunk/menu/icons/large/system_section.png
new file mode 100644
index 0000000..9805474
--- /dev/null
+++ b/trunk/menu/icons/large/system_section.png
diff --git a/trunk/menu/icons/large/taskmanagement_section.png b/trunk/menu/icons/large/taskmanagement_section.png
new file mode 100644
index 0000000..3083897
--- /dev/null
+++ b/trunk/menu/icons/large/taskmanagement_section.png
diff --git a/trunk/menu/icons/large/terminals_section.png b/trunk/menu/icons/large/terminals_section.png
new file mode 100644
index 0000000..39e70e7
--- /dev/null
+++ b/trunk/menu/icons/large/terminals_section.png
diff --git a/trunk/menu/icons/large/text_tools_section.png b/trunk/menu/icons/large/text_tools_section.png
new file mode 100644
index 0000000..520efff
--- /dev/null
+++ b/trunk/menu/icons/large/text_tools_section.png
diff --git a/trunk/menu/icons/large/timemanagement_section.png b/trunk/menu/icons/large/timemanagement_section.png
new file mode 100644
index 0000000..3d2fc18
--- /dev/null
+++ b/trunk/menu/icons/large/timemanagement_section.png
diff --git a/trunk/menu/icons/large/toys_section.png b/trunk/menu/icons/large/toys_section.png
new file mode 100644
index 0000000..fd7f914
--- /dev/null
+++ b/trunk/menu/icons/large/toys_section.png
diff --git a/trunk/menu/icons/large/video_conferences_section.png b/trunk/menu/icons/large/video_conferences_section.png
new file mode 100644
index 0000000..a882620
--- /dev/null
+++ b/trunk/menu/icons/large/video_conferences_section.png
diff --git a/trunk/menu/icons/large/video_section.png b/trunk/menu/icons/large/video_section.png
new file mode 100644
index 0000000..5cb4d11
--- /dev/null
+++ b/trunk/menu/icons/large/video_section.png
diff --git a/trunk/menu/icons/large/web_browser_section.png b/trunk/menu/icons/large/web_browser_section.png
new file mode 100644
index 0000000..d62e8f6
--- /dev/null
+++ b/trunk/menu/icons/large/web_browser_section.png
diff --git a/trunk/menu/icons/large/web_editors_section.png b/trunk/menu/icons/large/web_editors_section.png
new file mode 100644
index 0000000..22c2282
--- /dev/null
+++ b/trunk/menu/icons/large/web_editors_section.png
diff --git a/trunk/menu/icons/large/windowmanager_section.png b/trunk/menu/icons/large/windowmanager_section.png
new file mode 100644
index 0000000..04b39af
--- /dev/null
+++ b/trunk/menu/icons/large/windowmanager_section.png
diff --git a/trunk/menu/icons/large/wordprocessor_section.png b/trunk/menu/icons/large/wordprocessor_section.png
new file mode 100644
index 0000000..6b89666
--- /dev/null
+++ b/trunk/menu/icons/large/wordprocessor_section.png
diff --git a/trunk/menu/icons/mail_section.png b/trunk/menu/icons/mail_section.png
new file mode 100644
index 0000000..4895e87
--- /dev/null
+++ b/trunk/menu/icons/mail_section.png
diff --git a/trunk/menu/icons/mandrake.png b/trunk/menu/icons/mandrake.png
new file mode 100644
index 0000000..0b3199f
--- /dev/null
+++ b/trunk/menu/icons/mandrake.png
diff --git a/trunk/menu/icons/mathematics_section.png b/trunk/menu/icons/mathematics_section.png
new file mode 100644
index 0000000..77ed070
--- /dev/null
+++ b/trunk/menu/icons/mathematics_section.png
diff --git a/trunk/menu/icons/mini/accessibility_section.png b/trunk/menu/icons/mini/accessibility_section.png
new file mode 100644
index 0000000..e2d3958
--- /dev/null
+++ b/trunk/menu/icons/mini/accessibility_section.png
diff --git a/trunk/menu/icons/mini/addressbook_section.png b/trunk/menu/icons/mini/addressbook_section.png
new file mode 100644
index 0000000..7c90ed7
--- /dev/null
+++ b/trunk/menu/icons/mini/addressbook_section.png
diff --git a/trunk/menu/icons/mini/adventure_section.png b/trunk/menu/icons/mini/adventure_section.png
new file mode 100644
index 0000000..84e4155
--- /dev/null
+++ b/trunk/menu/icons/mini/adventure_section.png
diff --git a/trunk/menu/icons/mini/amusement_section.png b/trunk/menu/icons/mini/amusement_section.png
new file mode 100644
index 0000000..71a09d9
--- /dev/null
+++ b/trunk/menu/icons/mini/amusement_section.png
diff --git a/trunk/menu/icons/mini/applications_section.png b/trunk/menu/icons/mini/applications_section.png
new file mode 100644
index 0000000..df2acaf
--- /dev/null
+++ b/trunk/menu/icons/mini/applications_section.png
diff --git a/trunk/menu/icons/mini/arcade_section.png b/trunk/menu/icons/mini/arcade_section.png
new file mode 100644
index 0000000..0b9edeb
--- /dev/null
+++ b/trunk/menu/icons/mini/arcade_section.png
diff --git a/trunk/menu/icons/mini/archiving_section.png b/trunk/menu/icons/mini/archiving_section.png
new file mode 100644
index 0000000..9b974cf
--- /dev/null
+++ b/trunk/menu/icons/mini/archiving_section.png
diff --git a/trunk/menu/icons/mini/artificial_intelligence_section.png b/trunk/menu/icons/mini/artificial_intelligence_section.png
new file mode 100644
index 0000000..ae9e01f
--- /dev/null
+++ b/trunk/menu/icons/mini/artificial_intelligence_section.png
diff --git a/trunk/menu/icons/mini/astronomy_section.png b/trunk/menu/icons/mini/astronomy_section.png
new file mode 100644
index 0000000..a900f92
--- /dev/null
+++ b/trunk/menu/icons/mini/astronomy_section.png
diff --git a/trunk/menu/icons/mini/backup_section.png b/trunk/menu/icons/mini/backup_section.png
new file mode 100644
index 0000000..bef6ec6
--- /dev/null
+++ b/trunk/menu/icons/mini/backup_section.png
diff --git a/trunk/menu/icons/mini/biology_section.png b/trunk/menu/icons/mini/biology_section.png
new file mode 100644
index 0000000..1afcad1
--- /dev/null
+++ b/trunk/menu/icons/mini/biology_section.png
diff --git a/trunk/menu/icons/mini/boards_section.png b/trunk/menu/icons/mini/boards_section.png
new file mode 100644
index 0000000..b74790a
--- /dev/null
+++ b/trunk/menu/icons/mini/boards_section.png
diff --git a/trunk/menu/icons/mini/boot_init_section.png b/trunk/menu/icons/mini/boot_init_section.png
new file mode 100644
index 0000000..25b02c2
--- /dev/null
+++ b/trunk/menu/icons/mini/boot_init_section.png
diff --git a/trunk/menu/icons/mini/cards_section.png b/trunk/menu/icons/mini/cards_section.png
new file mode 100644
index 0000000..1bf7be5
--- /dev/null
+++ b/trunk/menu/icons/mini/cards_section.png
diff --git a/trunk/menu/icons/mini/cd_burning_section.png b/trunk/menu/icons/mini/cd_burning_section.png
new file mode 100644
index 0000000..4dd1cee
--- /dev/null
+++ b/trunk/menu/icons/mini/cd_burning_section.png
diff --git a/trunk/menu/icons/mini/chat_section.png b/trunk/menu/icons/mini/chat_section.png
new file mode 100644
index 0000000..3aa85bd
--- /dev/null
+++ b/trunk/menu/icons/mini/chat_section.png
diff --git a/trunk/menu/icons/mini/chemistry_section.png b/trunk/menu/icons/mini/chemistry_section.png
new file mode 100644
index 0000000..a29fac3
--- /dev/null
+++ b/trunk/menu/icons/mini/chemistry_section.png
diff --git a/trunk/menu/icons/mini/chinese_section.png b/trunk/menu/icons/mini/chinese_section.png
new file mode 100644
index 0000000..bcd698f
--- /dev/null
+++ b/trunk/menu/icons/mini/chinese_section.png
diff --git a/trunk/menu/icons/mini/code_generator_section.png b/trunk/menu/icons/mini/code_generator_section.png
new file mode 100644
index 0000000..8500349
--- /dev/null
+++ b/trunk/menu/icons/mini/code_generator_section.png
diff --git a/trunk/menu/icons/mini/communications_fax_section.png b/trunk/menu/icons/mini/communications_fax_section.png
new file mode 100644
index 0000000..5d53f2a
--- /dev/null
+++ b/trunk/menu/icons/mini/communications_fax_section.png
diff --git a/trunk/menu/icons/mini/communications_other_section.png b/trunk/menu/icons/mini/communications_other_section.png
new file mode 100644
index 0000000..63084b2
--- /dev/null
+++ b/trunk/menu/icons/mini/communications_other_section.png
diff --git a/trunk/menu/icons/mini/communications_phone_section.png b/trunk/menu/icons/mini/communications_phone_section.png
new file mode 100644
index 0000000..8c20abb
--- /dev/null
+++ b/trunk/menu/icons/mini/communications_phone_section.png
diff --git a/trunk/menu/icons/mini/communications_section.png b/trunk/menu/icons/mini/communications_section.png
new file mode 100644
index 0000000..d906d7e
--- /dev/null
+++ b/trunk/menu/icons/mini/communications_section.png
diff --git a/trunk/menu/icons/mini/compression_section.png b/trunk/menu/icons/mini/compression_section.png
new file mode 100644
index 0000000..d613c10
--- /dev/null
+++ b/trunk/menu/icons/mini/compression_section.png
diff --git a/trunk/menu/icons/mini/computer_science_section.png b/trunk/menu/icons/mini/computer_science_section.png
new file mode 100644
index 0000000..6e4b0ff
--- /dev/null
+++ b/trunk/menu/icons/mini/computer_science_section.png
diff --git a/trunk/menu/icons/mini/configuration_section.png b/trunk/menu/icons/mini/configuration_section.png
new file mode 100644
index 0000000..f8b81d2
--- /dev/null
+++ b/trunk/menu/icons/mini/configuration_section.png
diff --git a/trunk/menu/icons/mini/data_visualization_section.png b/trunk/menu/icons/mini/data_visualization_section.png
new file mode 100644
index 0000000..42d6d7c
--- /dev/null
+++ b/trunk/menu/icons/mini/data_visualization_section.png
diff --git a/trunk/menu/icons/mini/databases_section.png b/trunk/menu/icons/mini/databases_section.png
new file mode 100644
index 0000000..7b373db
--- /dev/null
+++ b/trunk/menu/icons/mini/databases_section.png
diff --git a/trunk/menu/icons/mini/development_environment_section.png b/trunk/menu/icons/mini/development_environment_section.png
new file mode 100644
index 0000000..b33ed65
--- /dev/null
+++ b/trunk/menu/icons/mini/development_environment_section.png
diff --git a/trunk/menu/icons/mini/development_section.png b/trunk/menu/icons/mini/development_section.png
new file mode 100644
index 0000000..f10e7e4
--- /dev/null
+++ b/trunk/menu/icons/mini/development_section.png
diff --git a/trunk/menu/icons/mini/development_tools_section.png b/trunk/menu/icons/mini/development_tools_section.png
new file mode 100644
index 0000000..2b93e5d
--- /dev/null
+++ b/trunk/menu/icons/mini/development_tools_section.png
diff --git a/trunk/menu/icons/mini/documentation_section.png b/trunk/menu/icons/mini/documentation_section.png
new file mode 100644
index 0000000..e26b85e
--- /dev/null
+++ b/trunk/menu/icons/mini/documentation_section.png
diff --git a/trunk/menu/icons/mini/editors_section.png b/trunk/menu/icons/mini/editors_section.png
new file mode 100644
index 0000000..2194fc8
--- /dev/null
+++ b/trunk/menu/icons/mini/editors_section.png
diff --git a/trunk/menu/icons/mini/education_economy_section.png b/trunk/menu/icons/mini/education_economy_section.png
new file mode 100644
index 0000000..7efff4e
--- /dev/null
+++ b/trunk/menu/icons/mini/education_economy_section.png
diff --git a/trunk/menu/icons/mini/education_geography_section.png b/trunk/menu/icons/mini/education_geography_section.png
new file mode 100644
index 0000000..9769d5d
--- /dev/null
+++ b/trunk/menu/icons/mini/education_geography_section.png
diff --git a/trunk/menu/icons/mini/education_history_section.png b/trunk/menu/icons/mini/education_history_section.png
new file mode 100644
index 0000000..a16c1e6
--- /dev/null
+++ b/trunk/menu/icons/mini/education_history_section.png
diff --git a/trunk/menu/icons/mini/education_languages_section.png b/trunk/menu/icons/mini/education_languages_section.png
new file mode 100644
index 0000000..5cc46f7
--- /dev/null
+++ b/trunk/menu/icons/mini/education_languages_section.png
diff --git a/trunk/menu/icons/mini/education_literature_section.png b/trunk/menu/icons/mini/education_literature_section.png
new file mode 100644
index 0000000..fd1fe2c
--- /dev/null
+++ b/trunk/menu/icons/mini/education_literature_section.png
diff --git a/trunk/menu/icons/mini/education_mathematics.png b/trunk/menu/icons/mini/education_mathematics.png
new file mode 100644
index 0000000..cb40172
--- /dev/null
+++ b/trunk/menu/icons/mini/education_mathematics.png
diff --git a/trunk/menu/icons/mini/education_other_section.png b/trunk/menu/icons/mini/education_other_section.png
new file mode 100644
index 0000000..cc3319f
--- /dev/null
+++ b/trunk/menu/icons/mini/education_other_section.png
diff --git a/trunk/menu/icons/mini/education_sciences.png b/trunk/menu/icons/mini/education_sciences.png
new file mode 100644
index 0000000..63a1578
--- /dev/null
+++ b/trunk/menu/icons/mini/education_sciences.png
diff --git a/trunk/menu/icons/mini/education_section.png b/trunk/menu/icons/mini/education_section.png
new file mode 100644
index 0000000..104a592
--- /dev/null
+++ b/trunk/menu/icons/mini/education_section.png
diff --git a/trunk/menu/icons/mini/education_sport_section.png b/trunk/menu/icons/mini/education_sport_section.png
new file mode 100644
index 0000000..e5fa00b
--- /dev/null
+++ b/trunk/menu/icons/mini/education_sport_section.png
diff --git a/trunk/menu/icons/mini/education_tool.png b/trunk/menu/icons/mini/education_tool.png
new file mode 100644
index 0000000..c59488a
--- /dev/null
+++ b/trunk/menu/icons/mini/education_tool.png
diff --git a/trunk/menu/icons/mini/electricity_section.png b/trunk/menu/icons/mini/electricity_section.png
new file mode 100644
index 0000000..b505c9b
--- /dev/null
+++ b/trunk/menu/icons/mini/electricity_section.png
diff --git a/trunk/menu/icons/mini/emulators_section.png b/trunk/menu/icons/mini/emulators_section.png
new file mode 100644
index 0000000..0174b35
--- /dev/null
+++ b/trunk/menu/icons/mini/emulators_section.png
diff --git a/trunk/menu/icons/mini/file_tools_section.png b/trunk/menu/icons/mini/file_tools_section.png
new file mode 100644
index 0000000..545b0bd
--- /dev/null
+++ b/trunk/menu/icons/mini/file_tools_section.png
diff --git a/trunk/menu/icons/mini/file_transfer_section.png b/trunk/menu/icons/mini/file_transfer_section.png
new file mode 100644
index 0000000..8f3ed86
--- /dev/null
+++ b/trunk/menu/icons/mini/file_transfer_section.png
diff --git a/trunk/menu/icons/mini/finances_section.png b/trunk/menu/icons/mini/finances_section.png
new file mode 100644
index 0000000..e7bdec0
--- /dev/null
+++ b/trunk/menu/icons/mini/finances_section.png
diff --git a/trunk/menu/icons/mini/geosciences_section.png b/trunk/menu/icons/mini/geosciences_section.png
new file mode 100644
index 0000000..7338593
--- /dev/null
+++ b/trunk/menu/icons/mini/geosciences_section.png
diff --git a/trunk/menu/icons/mini/gnome_section.png b/trunk/menu/icons/mini/gnome_section.png
new file mode 100644
index 0000000..ede32ec
--- /dev/null
+++ b/trunk/menu/icons/mini/gnome_section.png
diff --git a/trunk/menu/icons/mini/graphics_section.png b/trunk/menu/icons/mini/graphics_section.png
new file mode 100644
index 0000000..9c2753a
--- /dev/null
+++ b/trunk/menu/icons/mini/graphics_section.png
diff --git a/trunk/menu/icons/mini/graphs_section.png b/trunk/menu/icons/mini/graphs_section.png
new file mode 100644
index 0000000..b34a124
--- /dev/null
+++ b/trunk/menu/icons/mini/graphs_section.png
diff --git a/trunk/menu/icons/mini/hardware_configuration_section.png b/trunk/menu/icons/mini/hardware_configuration_section.png
new file mode 100644
index 0000000..a985ad0
--- /dev/null
+++ b/trunk/menu/icons/mini/hardware_configuration_section.png
diff --git a/trunk/menu/icons/mini/hardware_section.png b/trunk/menu/icons/mini/hardware_section.png
new file mode 100644
index 0000000..e844864
--- /dev/null
+++ b/trunk/menu/icons/mini/hardware_section.png
diff --git a/trunk/menu/icons/mini/image_processing_section.png b/trunk/menu/icons/mini/image_processing_section.png
new file mode 100644
index 0000000..e308210
--- /dev/null
+++ b/trunk/menu/icons/mini/image_processing_section.png
diff --git a/trunk/menu/icons/mini/instant_messaging_section.png b/trunk/menu/icons/mini/instant_messaging_section.png
new file mode 100644
index 0000000..6be8d44
--- /dev/null
+++ b/trunk/menu/icons/mini/instant_messaging_section.png
diff --git a/trunk/menu/icons/mini/internet_section.png b/trunk/menu/icons/mini/internet_section.png
new file mode 100644
index 0000000..9136637
--- /dev/null
+++ b/trunk/menu/icons/mini/internet_section.png
diff --git a/trunk/menu/icons/mini/interpreters_section.png b/trunk/menu/icons/mini/interpreters_section.png
new file mode 100644
index 0000000..e2910a6
--- /dev/null
+++ b/trunk/menu/icons/mini/interpreters_section.png
diff --git a/trunk/menu/icons/mini/irc_section.png b/trunk/menu/icons/mini/irc_section.png
new file mode 100644
index 0000000..2c394c8
--- /dev/null
+++ b/trunk/menu/icons/mini/irc_section.png
diff --git a/trunk/menu/icons/mini/kde_section.png b/trunk/menu/icons/mini/kde_section.png
new file mode 100644
index 0000000..d674ca7
--- /dev/null
+++ b/trunk/menu/icons/mini/kde_section.png
diff --git a/trunk/menu/icons/mini/mail_section.png b/trunk/menu/icons/mini/mail_section.png
new file mode 100644
index 0000000..3c0f393
--- /dev/null
+++ b/trunk/menu/icons/mini/mail_section.png
diff --git a/trunk/menu/icons/mini/mandrake.png b/trunk/menu/icons/mini/mandrake.png
new file mode 100644
index 0000000..4507510
--- /dev/null
+++ b/trunk/menu/icons/mini/mandrake.png
diff --git a/trunk/menu/icons/mini/mathematics_section.png b/trunk/menu/icons/mini/mathematics_section.png
new file mode 100644
index 0000000..4685410
--- /dev/null
+++ b/trunk/menu/icons/mini/mathematics_section.png
diff --git a/trunk/menu/icons/mini/monitoring_section.png b/trunk/menu/icons/mini/monitoring_section.png
new file mode 100644
index 0000000..a04b436
--- /dev/null
+++ b/trunk/menu/icons/mini/monitoring_section.png
diff --git a/trunk/menu/icons/mini/more_applications_other_section.png b/trunk/menu/icons/mini/more_applications_other_section.png
new file mode 100644
index 0000000..200f7a6
--- /dev/null
+++ b/trunk/menu/icons/mini/more_applications_other_section.png
diff --git a/trunk/menu/icons/mini/more_applications_section.png b/trunk/menu/icons/mini/more_applications_section.png
new file mode 100644
index 0000000..200f7a6
--- /dev/null
+++ b/trunk/menu/icons/mini/more_applications_section.png
diff --git a/trunk/menu/icons/mini/multimedia_section.png b/trunk/menu/icons/mini/multimedia_section.png
new file mode 100644
index 0000000..9b4979d
--- /dev/null
+++ b/trunk/menu/icons/mini/multimedia_section.png
diff --git a/trunk/menu/icons/mini/networking_configuration_section.png b/trunk/menu/icons/mini/networking_configuration_section.png
new file mode 100644
index 0000000..f10f6fd
--- /dev/null
+++ b/trunk/menu/icons/mini/networking_configuration_section.png
diff --git a/trunk/menu/icons/mini/networking_section.png b/trunk/menu/icons/mini/networking_section.png
new file mode 100644
index 0000000..1f9c6fa
--- /dev/null
+++ b/trunk/menu/icons/mini/networking_section.png
diff --git a/trunk/menu/icons/mini/networking_www_section.png b/trunk/menu/icons/mini/networking_www_section.png
new file mode 100644
index 0000000..a9dae1e
--- /dev/null
+++ b/trunk/menu/icons/mini/networking_www_section.png
diff --git a/trunk/menu/icons/mini/news_section.png b/trunk/menu/icons/mini/news_section.png
new file mode 100644
index 0000000..6afdf91
--- /dev/null
+++ b/trunk/menu/icons/mini/news_section.png
diff --git a/trunk/menu/icons/mini/numerical_analysis_section.png b/trunk/menu/icons/mini/numerical_analysis_section.png
new file mode 100644
index 0000000..b5eefc1
--- /dev/null
+++ b/trunk/menu/icons/mini/numerical_analysis_section.png
diff --git a/trunk/menu/icons/mini/office_accessories_section.png b/trunk/menu/icons/mini/office_accessories_section.png
new file mode 100644
index 0000000..9cbf688
--- /dev/null
+++ b/trunk/menu/icons/mini/office_accessories_section.png
diff --git a/trunk/menu/icons/mini/office_drawing_section.png b/trunk/menu/icons/mini/office_drawing_section.png
new file mode 100644
index 0000000..69b53d8
--- /dev/null
+++ b/trunk/menu/icons/mini/office_drawing_section.png
diff --git a/trunk/menu/icons/mini/office_section.png b/trunk/menu/icons/mini/office_section.png
new file mode 100644
index 0000000..ad01280
--- /dev/null
+++ b/trunk/menu/icons/mini/office_section.png
diff --git a/trunk/menu/icons/mini/other_amusement.png b/trunk/menu/icons/mini/other_amusement.png
new file mode 100644
index 0000000..559636e
--- /dev/null
+++ b/trunk/menu/icons/mini/other_amusement.png
diff --git a/trunk/menu/icons/mini/other_archiving.png b/trunk/menu/icons/mini/other_archiving.png
new file mode 100644
index 0000000..31a30bf
--- /dev/null
+++ b/trunk/menu/icons/mini/other_archiving.png
diff --git a/trunk/menu/icons/mini/other_configuration.png b/trunk/menu/icons/mini/other_configuration.png
new file mode 100644
index 0000000..54d9839
--- /dev/null
+++ b/trunk/menu/icons/mini/other_configuration.png
diff --git a/trunk/menu/icons/mini/other_networking.png b/trunk/menu/icons/mini/other_networking.png
new file mode 100644
index 0000000..74766d0
--- /dev/null
+++ b/trunk/menu/icons/mini/other_networking.png
diff --git a/trunk/menu/icons/mini/other_sciences.png b/trunk/menu/icons/mini/other_sciences.png
new file mode 100644
index 0000000..61d18b7
--- /dev/null
+++ b/trunk/menu/icons/mini/other_sciences.png
diff --git a/trunk/menu/icons/mini/packaging_section.png b/trunk/menu/icons/mini/packaging_section.png
new file mode 100644
index 0000000..3a19324
--- /dev/null
+++ b/trunk/menu/icons/mini/packaging_section.png
diff --git a/trunk/menu/icons/mini/parallel_computing_section.png b/trunk/menu/icons/mini/parallel_computing_section.png
new file mode 100644
index 0000000..1f28902
--- /dev/null
+++ b/trunk/menu/icons/mini/parallel_computing_section.png
diff --git a/trunk/menu/icons/mini/pda_section.png b/trunk/menu/icons/mini/pda_section.png
new file mode 100644
index 0000000..cba8ec5
--- /dev/null
+++ b/trunk/menu/icons/mini/pda_section.png
diff --git a/trunk/menu/icons/mini/physics_section.png b/trunk/menu/icons/mini/physics_section.png
new file mode 100644
index 0000000..c7f338e
--- /dev/null
+++ b/trunk/menu/icons/mini/physics_section.png
diff --git a/trunk/menu/icons/mini/presentation_section.png b/trunk/menu/icons/mini/presentation_section.png
new file mode 100644
index 0000000..6f5709e
--- /dev/null
+++ b/trunk/menu/icons/mini/presentation_section.png
diff --git a/trunk/menu/icons/mini/printing_section.png b/trunk/menu/icons/mini/printing_section.png
new file mode 100644
index 0000000..9dee710
--- /dev/null
+++ b/trunk/menu/icons/mini/printing_section.png
diff --git a/trunk/menu/icons/mini/publishing_section.png b/trunk/menu/icons/mini/publishing_section.png
new file mode 100644
index 0000000..88f1192
--- /dev/null
+++ b/trunk/menu/icons/mini/publishing_section.png
diff --git a/trunk/menu/icons/mini/puzzle_section.png b/trunk/menu/icons/mini/puzzle_section.png
new file mode 100644
index 0000000..94ee70d
--- /dev/null
+++ b/trunk/menu/icons/mini/puzzle_section.png
diff --git a/trunk/menu/icons/mini/remote_access_section.png b/trunk/menu/icons/mini/remote_access_section.png
new file mode 100644
index 0000000..e284407
--- /dev/null
+++ b/trunk/menu/icons/mini/remote_access_section.png
diff --git a/trunk/menu/icons/mini/robotics_section.png b/trunk/menu/icons/mini/robotics_section.png
new file mode 100644
index 0000000..b13ce44
--- /dev/null
+++ b/trunk/menu/icons/mini/robotics_section.png
diff --git a/trunk/menu/icons/mini/sciences_section.png b/trunk/menu/icons/mini/sciences_section.png
new file mode 100644
index 0000000..5c56aa7
--- /dev/null
+++ b/trunk/menu/icons/mini/sciences_section.png
diff --git a/trunk/menu/icons/mini/shells_section.png b/trunk/menu/icons/mini/shells_section.png
new file mode 100644
index 0000000..93c7721
--- /dev/null
+++ b/trunk/menu/icons/mini/shells_section.png
diff --git a/trunk/menu/icons/mini/sound_section.png b/trunk/menu/icons/mini/sound_section.png
new file mode 100644
index 0000000..4ca4318
--- /dev/null
+++ b/trunk/menu/icons/mini/sound_section.png
diff --git a/trunk/menu/icons/mini/sport_section.png b/trunk/menu/icons/mini/sport_section.png
new file mode 100644
index 0000000..20fd2b7
--- /dev/null
+++ b/trunk/menu/icons/mini/sport_section.png
diff --git a/trunk/menu/icons/mini/spreadsheet_section.png b/trunk/menu/icons/mini/spreadsheet_section.png
new file mode 100644
index 0000000..557ce03
--- /dev/null
+++ b/trunk/menu/icons/mini/spreadsheet_section.png
diff --git a/trunk/menu/icons/mini/strategy_section.png b/trunk/menu/icons/mini/strategy_section.png
new file mode 100644
index 0000000..a3d6344
--- /dev/null
+++ b/trunk/menu/icons/mini/strategy_section.png
diff --git a/trunk/menu/icons/mini/system_other_section.png b/trunk/menu/icons/mini/system_other_section.png
new file mode 100644
index 0000000..997adab
--- /dev/null
+++ b/trunk/menu/icons/mini/system_other_section.png
diff --git a/trunk/menu/icons/mini/system_section.png b/trunk/menu/icons/mini/system_section.png
new file mode 100644
index 0000000..a1c5a43
--- /dev/null
+++ b/trunk/menu/icons/mini/system_section.png
diff --git a/trunk/menu/icons/mini/taskmanagement_section.png b/trunk/menu/icons/mini/taskmanagement_section.png
new file mode 100644
index 0000000..a151c94
--- /dev/null
+++ b/trunk/menu/icons/mini/taskmanagement_section.png
diff --git a/trunk/menu/icons/mini/terminals_section.png b/trunk/menu/icons/mini/terminals_section.png
new file mode 100644
index 0000000..3f7d9ea
--- /dev/null
+++ b/trunk/menu/icons/mini/terminals_section.png
diff --git a/trunk/menu/icons/mini/text_tools_section.png b/trunk/menu/icons/mini/text_tools_section.png
new file mode 100644
index 0000000..622d3f9
--- /dev/null
+++ b/trunk/menu/icons/mini/text_tools_section.png
diff --git a/trunk/menu/icons/mini/timemanagement_section.png b/trunk/menu/icons/mini/timemanagement_section.png
new file mode 100644
index 0000000..5f4073e
--- /dev/null
+++ b/trunk/menu/icons/mini/timemanagement_section.png
diff --git a/trunk/menu/icons/mini/toys_section.png b/trunk/menu/icons/mini/toys_section.png
new file mode 100644
index 0000000..ca3077a
--- /dev/null
+++ b/trunk/menu/icons/mini/toys_section.png
diff --git a/trunk/menu/icons/mini/video_conferences_section.png b/trunk/menu/icons/mini/video_conferences_section.png
new file mode 100644
index 0000000..6f5b66d
--- /dev/null
+++ b/trunk/menu/icons/mini/video_conferences_section.png
diff --git a/trunk/menu/icons/mini/video_section.png b/trunk/menu/icons/mini/video_section.png
new file mode 100644
index 0000000..074cc97
--- /dev/null
+++ b/trunk/menu/icons/mini/video_section.png
diff --git a/trunk/menu/icons/mini/web_browser_section.png b/trunk/menu/icons/mini/web_browser_section.png
new file mode 100644
index 0000000..84abb8f
--- /dev/null
+++ b/trunk/menu/icons/mini/web_browser_section.png
diff --git a/trunk/menu/icons/mini/web_editors_section.png b/trunk/menu/icons/mini/web_editors_section.png
new file mode 100644
index 0000000..99c8db8
--- /dev/null
+++ b/trunk/menu/icons/mini/web_editors_section.png
diff --git a/trunk/menu/icons/mini/windowmanager_section.png b/trunk/menu/icons/mini/windowmanager_section.png
new file mode 100644
index 0000000..70c0ba9
--- /dev/null
+++ b/trunk/menu/icons/mini/windowmanager_section.png
diff --git a/trunk/menu/icons/mini/wordprocessor_section.png b/trunk/menu/icons/mini/wordprocessor_section.png
new file mode 100644
index 0000000..617ccd6
--- /dev/null
+++ b/trunk/menu/icons/mini/wordprocessor_section.png
diff --git a/trunk/menu/icons/monitoring_section.png b/trunk/menu/icons/monitoring_section.png
new file mode 100644
index 0000000..51f85dc
--- /dev/null
+++ b/trunk/menu/icons/monitoring_section.png
diff --git a/trunk/menu/icons/more_applications_other_section.png b/trunk/menu/icons/more_applications_other_section.png
new file mode 100644
index 0000000..88b7904
--- /dev/null
+++ b/trunk/menu/icons/more_applications_other_section.png
diff --git a/trunk/menu/icons/more_applications_section.png b/trunk/menu/icons/more_applications_section.png
new file mode 100644
index 0000000..88b7904
--- /dev/null
+++ b/trunk/menu/icons/more_applications_section.png
diff --git a/trunk/menu/icons/multimedia_section.png b/trunk/menu/icons/multimedia_section.png
new file mode 100644
index 0000000..9e394a3
--- /dev/null
+++ b/trunk/menu/icons/multimedia_section.png
diff --git a/trunk/menu/icons/networking_configuration_section.png b/trunk/menu/icons/networking_configuration_section.png
new file mode 100644
index 0000000..8f8df46
--- /dev/null
+++ b/trunk/menu/icons/networking_configuration_section.png
diff --git a/trunk/menu/icons/networking_section.png b/trunk/menu/icons/networking_section.png
new file mode 100644
index 0000000..be00baa
--- /dev/null
+++ b/trunk/menu/icons/networking_section.png
diff --git a/trunk/menu/icons/networking_www_section.png b/trunk/menu/icons/networking_www_section.png
new file mode 100644
index 0000000..8ce7fc1
--- /dev/null
+++ b/trunk/menu/icons/networking_www_section.png
diff --git a/trunk/menu/icons/news_section.png b/trunk/menu/icons/news_section.png
new file mode 100644
index 0000000..728fb7a
--- /dev/null
+++ b/trunk/menu/icons/news_section.png
diff --git a/trunk/menu/icons/numerical_analysis_section.png b/trunk/menu/icons/numerical_analysis_section.png
new file mode 100644
index 0000000..9cec33f
--- /dev/null
+++ b/trunk/menu/icons/numerical_analysis_section.png
diff --git a/trunk/menu/icons/office_accessories_section.png b/trunk/menu/icons/office_accessories_section.png
new file mode 100644
index 0000000..0e408bd
--- /dev/null
+++ b/trunk/menu/icons/office_accessories_section.png
diff --git a/trunk/menu/icons/office_drawing_section.png b/trunk/menu/icons/office_drawing_section.png
new file mode 100644
index 0000000..2080bc2
--- /dev/null
+++ b/trunk/menu/icons/office_drawing_section.png
diff --git a/trunk/menu/icons/office_section.png b/trunk/menu/icons/office_section.png
new file mode 100644
index 0000000..20c61ff
--- /dev/null
+++ b/trunk/menu/icons/office_section.png
diff --git a/trunk/menu/icons/other_amusement.png b/trunk/menu/icons/other_amusement.png
new file mode 100644
index 0000000..fb66635
--- /dev/null
+++ b/trunk/menu/icons/other_amusement.png
diff --git a/trunk/menu/icons/other_archiving.png b/trunk/menu/icons/other_archiving.png
new file mode 100644
index 0000000..bbc4b0f
--- /dev/null
+++ b/trunk/menu/icons/other_archiving.png
diff --git a/trunk/menu/icons/other_configuration.png b/trunk/menu/icons/other_configuration.png
new file mode 100644
index 0000000..fff49dd
--- /dev/null
+++ b/trunk/menu/icons/other_configuration.png
diff --git a/trunk/menu/icons/other_networking.png b/trunk/menu/icons/other_networking.png
new file mode 100644
index 0000000..ab0fd13
--- /dev/null
+++ b/trunk/menu/icons/other_networking.png
diff --git a/trunk/menu/icons/other_sciences.png b/trunk/menu/icons/other_sciences.png
new file mode 100644
index 0000000..df1a7b4
--- /dev/null
+++ b/trunk/menu/icons/other_sciences.png
diff --git a/trunk/menu/icons/packaging_section.png b/trunk/menu/icons/packaging_section.png
new file mode 100644
index 0000000..2706dea
--- /dev/null
+++ b/trunk/menu/icons/packaging_section.png
diff --git a/trunk/menu/icons/parallel_computing_section.png b/trunk/menu/icons/parallel_computing_section.png
new file mode 100644
index 0000000..a37b9ec
--- /dev/null
+++ b/trunk/menu/icons/parallel_computing_section.png
diff --git a/trunk/menu/icons/pda_section.png b/trunk/menu/icons/pda_section.png
new file mode 100644
index 0000000..6bbacf1
--- /dev/null
+++ b/trunk/menu/icons/pda_section.png
diff --git a/trunk/menu/icons/physics_section.png b/trunk/menu/icons/physics_section.png
new file mode 100644
index 0000000..5fd6b60
--- /dev/null
+++ b/trunk/menu/icons/physics_section.png
diff --git a/trunk/menu/icons/presentation_section.png b/trunk/menu/icons/presentation_section.png
new file mode 100644
index 0000000..bd71e7c
--- /dev/null
+++ b/trunk/menu/icons/presentation_section.png
diff --git a/trunk/menu/icons/printing_section.png b/trunk/menu/icons/printing_section.png
new file mode 100644
index 0000000..420563e
--- /dev/null
+++ b/trunk/menu/icons/printing_section.png
diff --git a/trunk/menu/icons/publishing_section.png b/trunk/menu/icons/publishing_section.png
new file mode 100644
index 0000000..21738a2
--- /dev/null
+++ b/trunk/menu/icons/publishing_section.png
diff --git a/trunk/menu/icons/puzzle_section.png b/trunk/menu/icons/puzzle_section.png
new file mode 100644
index 0000000..8367733
--- /dev/null
+++ b/trunk/menu/icons/puzzle_section.png
diff --git a/trunk/menu/icons/remote_access_section.png b/trunk/menu/icons/remote_access_section.png
new file mode 100644
index 0000000..525fcb1
--- /dev/null
+++ b/trunk/menu/icons/remote_access_section.png
diff --git a/trunk/menu/icons/robotics_section.png b/trunk/menu/icons/robotics_section.png
new file mode 100644
index 0000000..9fcf78c
--- /dev/null
+++ b/trunk/menu/icons/robotics_section.png
diff --git a/trunk/menu/icons/sciences_section.png b/trunk/menu/icons/sciences_section.png
new file mode 100644
index 0000000..1676fc3
--- /dev/null
+++ b/trunk/menu/icons/sciences_section.png
diff --git a/trunk/menu/icons/shells_section.png b/trunk/menu/icons/shells_section.png
new file mode 100644
index 0000000..d214a7a
--- /dev/null
+++ b/trunk/menu/icons/shells_section.png
diff --git a/trunk/menu/icons/sound_section.png b/trunk/menu/icons/sound_section.png
new file mode 100644
index 0000000..6072de8
--- /dev/null
+++ b/trunk/menu/icons/sound_section.png
diff --git a/trunk/menu/icons/sport_section.png b/trunk/menu/icons/sport_section.png
new file mode 100644
index 0000000..3258e82
--- /dev/null
+++ b/trunk/menu/icons/sport_section.png
diff --git a/trunk/menu/icons/spreadsheet_section.png b/trunk/menu/icons/spreadsheet_section.png
new file mode 100644
index 0000000..5e394bb
--- /dev/null
+++ b/trunk/menu/icons/spreadsheet_section.png
diff --git a/trunk/menu/icons/strategy_section.png b/trunk/menu/icons/strategy_section.png
new file mode 100644
index 0000000..355c080
--- /dev/null
+++ b/trunk/menu/icons/strategy_section.png
diff --git a/trunk/menu/icons/system_other_section.png b/trunk/menu/icons/system_other_section.png
new file mode 100644
index 0000000..020adee
--- /dev/null
+++ b/trunk/menu/icons/system_other_section.png
diff --git a/trunk/menu/icons/system_section.png b/trunk/menu/icons/system_section.png
new file mode 100644
index 0000000..8c3426c
--- /dev/null
+++ b/trunk/menu/icons/system_section.png
diff --git a/trunk/menu/icons/taskmanagement_section.png b/trunk/menu/icons/taskmanagement_section.png
new file mode 100644
index 0000000..cf3be48
--- /dev/null
+++ b/trunk/menu/icons/taskmanagement_section.png
diff --git a/trunk/menu/icons/terminals_section.png b/trunk/menu/icons/terminals_section.png
new file mode 100644
index 0000000..11cd164
--- /dev/null
+++ b/trunk/menu/icons/terminals_section.png
diff --git a/trunk/menu/icons/text_tools_section.png b/trunk/menu/icons/text_tools_section.png
new file mode 100644
index 0000000..8fc2092
--- /dev/null
+++ b/trunk/menu/icons/text_tools_section.png
diff --git a/trunk/menu/icons/timemanagement_section.png b/trunk/menu/icons/timemanagement_section.png
new file mode 100644
index 0000000..dcb6fb3
--- /dev/null
+++ b/trunk/menu/icons/timemanagement_section.png
diff --git a/trunk/menu/icons/toys_section.png b/trunk/menu/icons/toys_section.png
new file mode 100644
index 0000000..11f558a
--- /dev/null
+++ b/trunk/menu/icons/toys_section.png
diff --git a/trunk/menu/icons/video_conferences_section.png b/trunk/menu/icons/video_conferences_section.png
new file mode 100644
index 0000000..132eba9
--- /dev/null
+++ b/trunk/menu/icons/video_conferences_section.png
diff --git a/trunk/menu/icons/video_section.png b/trunk/menu/icons/video_section.png
new file mode 100644
index 0000000..a4d324d
--- /dev/null
+++ b/trunk/menu/icons/video_section.png
diff --git a/trunk/menu/icons/web_browser_section.png b/trunk/menu/icons/web_browser_section.png
new file mode 100644
index 0000000..c01ff68
--- /dev/null
+++ b/trunk/menu/icons/web_browser_section.png
diff --git a/trunk/menu/icons/web_editors_section.png b/trunk/menu/icons/web_editors_section.png
new file mode 100644
index 0000000..b5eb19e
--- /dev/null
+++ b/trunk/menu/icons/web_editors_section.png
diff --git a/trunk/menu/icons/windowmanager_section.png b/trunk/menu/icons/windowmanager_section.png
new file mode 100644
index 0000000..b9fb93e
--- /dev/null
+++ b/trunk/menu/icons/windowmanager_section.png
diff --git a/trunk/menu/icons/wordprocessor_section.png b/trunk/menu/icons/wordprocessor_section.png
new file mode 100644
index 0000000..d22e664
--- /dev/null
+++ b/trunk/menu/icons/wordprocessor_section.png
diff --git a/trunk/menu/mandrake_desk-9.2 b/trunk/menu/mandrake_desk-9.2
new file mode 100644
index 0000000..848924c
--- /dev/null
+++ b/trunk/menu/mandrake_desk-9.2
@@ -0,0 +1,200 @@
+##
+# Locate a file
+?package(kdebase-progs): needs="kde" kde_filename="Kfind" section="/" title="Find files" icon="kfind.png" command="kfind" kde_command="kfind -caption \"%c\" %i %m %f" multiple_files="false" accept_url="false" kde_opt="\\nBinaryPattern=kfind;\\nProtocols=file;\\nDocPath=kfind/index.html\\nTerminalOptions=\\nPath=\\nExtensions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
+# File manager
+?package(kdebase-progs): needs="kde" kde_filename="Home" section="/" title="Manage your files" icon="home-mdk.png" command="kfmclient openProfile filemanagement" kde_opt="\\nTerminal=0"
+
+
+
+
+
+
+## Administer your system
+# Burn a CD 
+?package(k3b): needs="x11" kde_filename="k3b" section="Administer your system" title="Burn a CD" icon="k3b.png" command="k3b" mimetypes="application/x-k3b" kde_opt="\\nDocPath=k3b/index.html\\nTerminal=0\\nX-KDE-NativeMimeType=application/x-k3b\\nCategories=Qt;KDE;AudioVideo"
+
+# Configure sound settings
+?package(kdemultimedia-kmix): needs="kde" kde_filename="kmix" section="Administer your system" title="Configure sound settings" icon="kmix.png" command="kmix" kde_command="kmix -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nEncoding=UTF-8\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nGenericName=Sound Mixer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nCategories=Qt;KDE;AudioVideo"
+
+# Configure KDE
+?package(kdebase-progs): needs="kde" kde_filename="KControl" section="Administer your system" title="Configure your desktop" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true"
+
+
+# Mandrake Control Center
+?package(drakconf): needs="x11" icon="drakconf.png" section="Administer your system" title="Configure your computer" command="/usr/sbin/drakconf"
+
+
+# Format a floppy
+?package(kdeutils-kfloppy): needs="kde" kde_filename="KFloppy" section="Administer your system" title="Format a floppy" icon="kfloppy.png" command="kfloppy" kde_command="kfloppy -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kfloppy;\\nProtocols=\\nDocPath=kfloppy/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
+
+# Password change
+?package(kdeutils-kdepasswd): needs="x11" kde_filename="kdepasswd" section="Administer your system" title="Change your password" icon="password.png" command="kdepasswd" kde_opt="\\nTerminalOptions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
+# Use a terminal emulator 
+?package(kdebase-konsole): needs="kde" kde_filename="konsole" section="Administer your system" title="Use a terminal emulator" icon="konsole.png" command="konsole" kde_opt="\\nEncoding=UTF-8\\nDocPath=konsole/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nGenericName=Terminal Program\\nX-DCOP-ServiceType=Multi\\nX-KDE-AuthorizeAction=shell_access"
+
+
+
+
+
+
+
+
+## Enjoy music & video
+# Listen to a musical CD
+?package(kdemultimedia-kscd): needs="kde" kde_filename="kscd" section="Enjoy music & video" title="Listen to a CD" icon="kscd.png" command="kscd" kde_command="kscd -caption \"%c\" %i %m" kde_opt="\\nBinaryPattern=kscd;\\nProtocols=\\nDocPath=kscd/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
+# Listen to music files
+?package(totem): needs="x11" command="/usr/bin/totem %U" section="Enjoy music & video" title="Listen to music files" icon="totem.png" mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav,audio/x-mpegurl" kde_opt="InitialPreference=15"
+
+# Record sounds 
+?package(gnome-media): needs="x11" command="/usr/bin/gnome-sound-recorder" section="Enjoy music & video" title="Record sounds" icon="/usr/share/pixmaps/gnome-grecord.png" startup_notify="true"
+
+# Rip cd
+?package(kdemultimedia-kaudiocreator):command="kaudiocreator" icon="kaudiocreator.png" title="Rip a CD" needs="x11" section="Enjoy music & video"
+
+# Watch TV
+?package(xawtv): command="XawTV" icon="xawtv.png" section="Enjoy music & video" title="Watch TV" needs="x11"
+
+# Watch videos
+?package(totem): needs="x11" command="/usr/bin/totem %U" section="Enjoy music & video" title="Watch videos" icon="totem.png" mimetypes="video/mpeg,video/msvideo,video/quicktime,video/x-avi,video/x-ms-asf,video/x-ms-wmv,video/x-msvideo,application/x-ogg,audio/x-mp3,audio/x-mpeg,video/x-fli,audio/x-wav,audio/x-mpegurl" kde_opt="InitialPreference=15"
+
+
+
+
+
+
+
+## Play games
+# Armagetron
+?package(armagetron):command="/usr/games/armagetron" icon="armagetron.png" needs="x11" section="Play games" title="Play ArmageTron"
+
+# Chromium
+?package(chromium):command="/usr/games/chromium" icon="chromium.png" needs="x11" section="Play games" title="Play Chromium"
+
+# Canon Smash
+?package(csmash):command="/usr/bin/csmash" icon="csmash.png" needs="x11" section="Play games" title="Play Cannon Smash"
+
+# Frozen-Bubble
+?package(frozen-bubble):command="/usr/games/frozen-bubble" icon="frozen-bubble.png" needs="X11" section="Play games" title="Play Frozen-Bubble"
+
+# LBreakout
+?package(lbreakout2):needs="x11" section="Play games" title="Play LBreakout" command="/usr/games/lbreakout2" icon="lbreakout2.png"
+
+# TuXRacer
+?package(tuxracer):command="soundwrapper /usr/games/tuxracer" icon="tuxracer.png" needs="x11" section="Play games" title="Play Tuxracer"
+
+
+
+
+
+
+## Read documentation
+# Read Mandrake documentation
+?package(mandrake_doc-de): command="sh -c '$BROWSER /usr/share/doc/mandrake/de/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in german" section="Read documentation"
+
+?package(mandrake_doc-en): command="sh -c '$BROWSER /usr/share/doc/mandrake/en/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in english" section="Read documentation"
+
+?package(mandrake_doc-es): command="sh -c '$BROWSER /usr/share/doc/mandrake/es/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in spanish" section="Read documentation"
+
+?package(mandrake_doc-fr): command="sh -c '$BROWSER /usr/share/doc/mandrake/fr/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in french" section="Read documentation"
+
+?package(mandrake_doc-it): command="sh -c '$BROWSER /usr/share/doc/mandrake/it/index.html'" icon="documentation_section.png" needs="x11" title="Mandrake documentation in italian" section="Read documentation"
+
+# Read KDE documentation
+?package(kdebase-progs): needs="kde" kde_filename="Help" section="Read documentation" title="Read KDE documentation" icon="khelpcenter.png" command="khelpcenter" kde_opt="\\nDocPath=khelpcenter/index.html\\nTerminal=0"
+
+
+
+
+
+
+## Use office tools
+# Create a presentation
+?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_impress.png" title="Create a presentation" command="ooimpress" mimetypes="application/vnd.sun.xml.impress;application/vnd.stardivision.impress;application/mspowerpoint"
+
+# Create a text document
+?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_writer.png" title="Create a text document" command="oowriter" mimetypes="application/vnd.sun.xml.writer,application/vnd.stardivision.writer,application/msword,application/vnd.ms-word,application/x-doc,text/rtf"
+
+# Create a spreadsheet
+?package(OpenOffice.org): needs="x11" section="Use office tools" icon="ooo_calc.png" title="Create a spreadsheet" command="oocalc" mimetypes="application/vnd.sun.xml.calc,application/vnd.stardivision.calc,application/vnd.stardivision.chart,application/msexcel,application/vnd.ms-excel"
+
+# Diagrams
+?package(dia): needs="x11" section="Use office tools" title="Create flowcharts and diagrams" command="/usr/bin/dia" icon="dia.png"
+
+# Manage your contacts
+?package(kdepim-kaddressbook): needs="x11" kde_filename="kaddressbook" section="Use office tools" title="Manage your contacts" icon="kaddressbook.png" command="kaddressbook" mimetypes="text/x-vcard" kde_opt="\\nEncoding=UTF-8\\nDocPath=kaddressbook/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique\\nServiceTypes=KParts/ReadOnlyPart;Browser/View\\nX-KDE-Library=libkaddressbookpart"
+
+# Manage your finances
+?package(gnucash): command="/usr/bin/gnucash" icon="gnucash.png" needs="x11" section="Use office tools" title="Manage your finances"
+
+# Manage your projects
+?package(mrproject):command="mrproject" needs="x11" section="Use office tools" title="Manage your projects" icon="taskmanagement_section.png" startup_notify="true"
+
+# Manage your time
+?package(kdepim-korganizer): needs="x11" kde_filename="korganizer" section="Use office tools" title="Manage your time" icon="korganizer.png" command="korganizer" mimetypes="text/calendar,text/x-vcalendar" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=korganizer;\\nTerminalOptions=\\nPath=\\nDocPath=korganizer/index.html\\nTerminal=0\\nServiceTypes=Browser/View\\nX-KDE-Library=libkorganizer\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
+
+# Send a fax
+?package(kdebase-kdeprintfax): needs="kde" kde_filename="kdeprintfax" section="Use office tools" title="Send a fax" icon="kdeprintfax.png" command="kdeprintfax %u" kde_command="kdeprintfax -caption \"%c\" %i %m %u" kde_opt="\\nMiniIcon=kdeprintfax\\nTerminal=0"
+
+# Write and stick notes
+?package(kdepim-knotes): needs="kde" kde_filename="knotes" section="Use office tools" title="Write and stick notes" icon="knotes.png" command="knotes" kde_opt="\\nEncoding=UTF-8\\nDocPath=knotes/index.html\\nTerminal=0\\nGenericName=Popup Notes\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
+
+# Set up reminder messages
+?package(kdepim-korganizer): needs="x11" kde_filename="kalarm" section="Use office tools" title="Set up reminder messages" icon="kalarm.png" command="kalarm" kde_command="kalarm -caption \"%c\" %i" kde_opt="\\nEncoding=UTF-8\\nDocPath=kalarm/index.html\\nGenericName=Reminder Message Scheduler\\nTerminal=0\\nX-DCOP-ServiceType=Unique\\nX-KDE-StartupNotify=true"
+
+# View fax
+?package(kdegraphics-kfax): needs="x11" kde_filename="kfax" section="Use office tools" title="View fax" icon="kfax.png" command="kfax" kde_command="kfax %f   -caption \"%c\" %i %m" mimetypes="image/fax-g3" multiple_files="false" accept_url="false" kde_opt="\\nEncoding=UTF-8\\nBinaryPattern=kfax;\\nGenericName=Fax Viewer\\nTerminalOptions=\\nPath=\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Multi"
+
+
+
+
+
+## Use the Internet
+# Access Newsgroups
+?package(kdenetwork-knode): needs="kde" kde_filename="KNode" section="Use the Internet" title="Access newsgroups" icon="knode.png" command="knode" kde_command="knode -caption \"%c\" %i %m" kde_opt="\\nDocPath=knode/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
+# Browse the Web
+?package(kdebase-progs): needs="x11" kde_filename="konqbrowser" section="Use the Internet" title="Browse the Web" icon="konqueror.png" command="konqueror --profile webbrowsing" kde_opt="\\nEncoding=UTF-8\\nDocPath=konqueror/index.html"
+
+# Chat using AIM, ICQ, MSN, Yahoo, Winpopup
+?package(gaim): needs="x11" command="gaim" icon="gaim.png" title="Chat using AIM, ICQ, MSN, Yahoo, Winpopup" section="Use the Internet"
+
+# Chat using IRC
+?package(xchat):needs="x11" section="Use the Internet" title="Chat using IRC" command="xchat" icon="xchat.png"
+
+# Connect to the Internet
+?package(kdenetwork-kppp): needs="x11" kde_filename="Kppp" section="Use the Internet" title="Connect to the Internet" icon="kppp.png" command="kppp" kde_command="kppp %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kppp;\\nProtocols=\\nDocPath=kppp/index.html\\nTerminalOptions=\\nPath=\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
+# Create Web pages
+?package(quanta): needs="kde" kde_filename="quanta" section="Use the Internet" title="Create Web pages" icon="quanta.png" command="quanta" mimetypes="text/html" kde_opt=""
+
+# Dialog using video conference
+?package(gnomemeeting): command="/usr/bin/gnomemeeting" needs="x11" icon="gnomemeeting.png" section="Use the Internet" title="Dialog using video conference"
+
+# Read and send mail
+?package(kdenetwork-kmail): needs="kde" kde_filename="KMail" section="Use the Internet" title="Read and send mail" icon="kmail.png" command="kmail" kde_command="kmail -caption \"%c\" %i %m" kde_opt="\\nDocPath=kmail/index.html\\nTerminal=0\\nKDE-X-StartupNotify=true"
+
+# Transfer files using FTP
+?package(kbear): needs="kde" kde_filename="kbear" section="Use the Internet" title="Transfer files using FTP" icon="kbear.png" command="kbear" kde_opt="\\nEncoding=UTF-8\\nGenericName=FTP Client\\nMiniIcon=kbear\\nDocPath=kbear/index.html\\nTerminal=0\\nX-KDE-StartupNotify=true\\nX-DCOP-ServiceType=Unique"
+
+
+
+
+
+
+## View, modify or create a picture
+# Manage, show and print your photos
+?package(flphoto):command="/usr/bin/flphoto" title="Manage, show and print your photos" needs="x11" section="View, modify, or create graphics" icon="graphics_section.png"
+
+# Manipulate pictures
+?package(gimp): command="gimp" icon="wilbur.png" section="View, modify, or create graphics" title="Manipulate pictures" needs="x11" mimetypes="image/gif;image/jpeg;image/png;image/tiff;image/x-xbm;image/x-xpm;image/bmp;image/fits;image/pcx;image/pix;image/pnm;"
+
+# Scan and use an OCR
+?package(kdegraphics-kooka): needs="kde" kde_filename="kooka" section="View, modify, or create graphics" title="Scan and use an OCR" icon="scanner.png" command="kooka" kde_command="kooka %i %m %U" multiple_files="true" accept_url="true" kde_opt="\\nTerminalOptions=\\nPath=\\nTerminal=0\\nBinaryPattern=kooka\\nDocPath=kooka/kooka.html"
+
+# Take a screenshot
+?package(kdegraphics-ksnapshot): needs="kde" kde_filename="ksnapshot" section="View, modify, or create graphics" title="Take a screenshot" icon="ksnapshot.png" command="ksnapshot" kde_command="ksnapshot %i %m" mimetypes="" kde_opt="\\nBinaryPattern=\\nTerminalOptions=\\nPath=\\nTerminal=0\\nDocPath=ksnapshot/index.html\\nKDE-X-StartupNotify=true"
+
diff --git a/trunk/menu/mandriva-discovery.menu b/trunk/menu/mandriva-discovery.menu
new file mode 100644
index 0000000..6b975c9
--- /dev/null
+++ b/trunk/menu/mandriva-discovery.menu
@@ -0,0 +1,147 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+<Menu>
+  <Name>Mandriva Linux</Name>
+  <Menu>
+    <Name>Graphics</Name>
+    <Exclude>
+      <Filename>kde-showfoto.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Internet</Name>
+    <Layout>
+      <Filename>mandriva-mozilla-firefox.desktop</Filename>
+      <Filename>kde-konqbrowser.desktop</Filename>
+      <Filename>epiphany.desktop</Filename>
+      <Filename>evolution.desktop</Filename>
+      <Filename>kde-KMail.desktop</Filename>
+      <Filename>kde-Kontact.desktop</Filename>
+      <Filename>kde-kopete.desktop</Filename>
+      <Filename>gaim.desktop</Filename>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Exclude>
+      <Filename>kde-kppplogview.desktop</Filename>
+      <Filename>kde-Kppp.desktop</Filename>
+      <Filename>kde-ksig.desktop</Filename>
+      <Filename>kde-knewsticker-standalone.desktop</Filename>
+      <Filename>kde-krfb.desktop</Filename>
+      <Filename>kde-krdc.desktop</Filename>
+      <Filename>kde-kget.desktop</Filename>
+      <Filename>kde-KNode.desktop</Filename>
+      <Filename>kde-ksirc.desktop</Filename>
+      <Filename>kde-groupwarewizard.desktop</Filename>
+      <Filename>bme.desktop</Filename>
+      <Filename>gftp.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Office</Name>
+    <Layout>
+      <Filename>template2.0.desktop</Filename>
+      <Filename>writer2.0.desktop</Filename>
+      <Filename>calc2.0.desktop</Filename>
+      <Filename>impress2.0.desktop</Filename>
+      <Filename>draw2.0.desktop</Filename>
+      <Filename>base2.0.desktop</Filename>
+      <Filename>web2.0.desktop</Filename>
+      <Separator/>
+      <Filename>kde-kwrite.desktop</Filename>
+      <Filename>kde-kpdf.desktop</Filename>
+      <Filename>kde-korganizer.desktop</Filename>
+      <Filename>kde-kalarm.desktop</Filename>
+      <Filename>kde-kcalc.desktop</Filename>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Exclude>
+      <Filename>kde-kghostview.desktop</Filename>
+      <Filename>kde-kate.desktop</Filename>
+      <Filename>kde-kaddressbook.desktop</Filename>
+      <Filename>kde-kdict.desktop</Filename>
+      <Filename>kde-KCharSelect.desktop</Filename>
+      <Filename>kde-multisynk.desktop</Filename>
+      <Filename>mandriva-hp-sendfax.desktop</Filename>
+      <Filename>kde-kpalmdoc.desktop</Filename>
+      <Filename>gnome-dictionary.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Exclude>
+      <Filename>mandriva-echomixer.desktop</Filename>
+      <Filename>mandriva-envy24control.desktop</Filename>
+      <Filename>mandriva-rmedigicontrol.desktop</Filename>
+      <Filename>kde-kdenlive.desktop</Filename>
+      <Filename>vumeter.desktop</Filename>
+      <Filename>reclevel.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>System</Name>
+    <Layout>
+      <Filename>mandriva-drakconf.desktop</Filename>
+      <Filename>mandriva-rpmdrake-root.desktop</Filename>
+      <Filename>kde-KControl.desktop</Filename>
+      <Filename>kde-kmenuedit.desktop</Filename>
+      <Filename>alacarte.desktop</Filename>
+      <Filename>mandriva-drakmenustyle.desktop</Filename>
+      <Filename>mandriva-ftw.desktop</Filename>
+      <Filename>mandriva-mdvonline.desktop</Filename>
+      <Filename>mandriva-mdvonline-bundle.desktop</Filename>
+      <Separator/>
+      <Merge type="menus"/>
+      <Merge type="files"/>
+    </Layout>
+    <Exclude>
+      <Filename>mandriva-mtink.desktop</Filename>
+      <Filename>kde-kdf.desktop</Filename>
+      <Filename>kde-kwifimanager.desktop</Filename>
+      <Filename>kde-kinfocenter.desktop</Filename>
+      <Filename>kde-kover.desktop</Filename>
+      <Filename>kde-kwalletconfig.desktop</Filename>
+      <Filename>kde-kcm_kbluetoothd.desktop</Filename>
+      <Filename>mandriva-xterm.desktop</Filename>
+      <Filename>kde-KFloppy.desktop</Filename>
+      <Filename>kde-kcm_btpaired.desktop</Filename>
+      <Filename>mandriva-userdrake.desktop</Filename>
+      <Filename>mandriva-hp-toolbox.desktop</Filename>
+      <Filename>kde-ksysguard.desktop</Filename>
+      <Filename>mandriva-harddrake-ui.desktop</Filename>
+      <Filename>mandriva-rpmdrake.desktop</Filename>
+      <Filename>mandriva-drakxtools-newt-system.desktop</Filename>
+      <Filename>mandriva-drakxtools-newt-user.desktop</Filename>
+      <Filename>kde-krandrtray.desktop</Filename>
+      <Filename>kde-kwikdisk.desktop</Filename>
+      <Filename>mandriva-net_applet.desktop</Filename>
+      <Filename>baobab.desktop</Filename>
+      <Filename>nautilus.desktop</Filename>
+      <Filename>gdmsetup.desktop</Filename>
+      <Filename>gdmphotosetup.desktop</Filename>
+      <Filename>gdmflexiserver.desktop</Filename>
+      <Filename>gnome-system-log.desktop</Filename>
+      <Filename>gnome-search-tool.desktop</Filename>
+      <Filename>gfloppy.desktop</Filename>
+      <Filename>gnome-system-monitor.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>More Applications</Name>
+    <Exclude>
+      <Filename>kde-kbtobexclient.desktop</Filename>
+      <Filename>kde-kbtserialchat.desktop</Filename>
+      <Filename>kde-kjscmd.desktop</Filename>
+      <Filename>invest-chart.desktop</Filename>
+      <Filename>base2.0.desktop</Filename>
+      <Filename>kasumi.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Documentation</Name>
+    <Exclude>
+      <Filename>monodoc.desktop</Filename>
+    </Exclude>
+  </Menu>
+</Menu>
diff --git a/trunk/menu/menu b/trunk/menu/menu
new file mode 100644
index 0000000..fb69b89
--- /dev/null
+++ b/trunk/menu/menu
@@ -0,0 +1,128 @@
+?package(menu): needs=x11 section="/" title="Office" icon="office_section.png" order="Wordprocessors,Spreadsheets,Presentations,Drawing,Graphs,Publishing,Tasks Management,Time Management,Address Books,Communications,Accessories,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Accessories" icon="office_accessories_section.png" order="_mergemenu_,kcalc,oooqs,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Address Books" icon="addressbook_section.png" order="_mergemenu_,kaddressbook,_mergefile_"
+#
+?package(menu): needs=x11 section="Office" title="Communications" icon="communications_section.png" order="Fax,Phone,PDA,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Office/Communications" title="Fax" icon="communications_fax_section.png"
+?package(menu): needs=x11 section="Office/Communications" title="PDA" icon="pda_section.png" order="_mergemenu_,kpilot,_mergefile_"
+?package(menu): needs=x11 section="Office/Communications" title="Phone" icon="communications_phone_section.png"
+?package(menu): needs=x11 section="Office/Communications" title="Other" icon="communications_other_section.png"
+#
+?package(menu): needs=x11 section="Office" title="Drawing" icon="office_drawing_section.png" order="_mergemenu_,OpenOffice.org Draw,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Graphs" icon="graphs_section.png" order="_mergemenu_,Dia,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Presentations" icon="presentation_section.png" order="_mergemenu_,OpenOffice.org Impress,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Publishing" icon="publishing_section.png" order="_mergemenu_,Xpdf,GhostView,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Spreadsheets" icon="spreadsheet_section.png" order="_mergemenu_,OpenOffice.org Calc,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Tasks Management" icon="taskmanagement_section.png" order="_mergemenu_,Planner,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Time Management" icon="timemanagement_section.png" order="_mergemenu_,korganizer,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Wordprocessors" icon="wordprocessor_section.png" order="_mergemenu_,OpenOffice.org Writer,OpenOffice.org Math,_mergefile_"
+?package(menu): needs=x11 section="Office" title="Other" icon="office_section.png"
+#
+#
+?package(menu): needs=x11 section="/" title="Internet" icon="internet_section.png" order="Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,Remote Access,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Chat" icon="chat_section.png" order="_mergemenu_,ksirc,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="File Transfer" icon="file_transfer_section.png" order="_mergemenu_,kbear,Gtm,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Instant Messaging" icon="instant_messaging_section.png" order="_mergemenu_,kopete,Gaim,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Mail" icon="mail_section.png" order="_mergemenu_,Kontact,Evolution,Mozilla Thunderbird,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="News" icon="news_section.png" order="_mergemenu_,KNode,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Remote Access" icon="remote_access_section.png" order="_mergemenu_,Kppp,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Video Conference" icon="video_conferences_section.png"
+?package(menu): needs=x11 section="Internet" title="Web Browsers" icon="web_browser_section.png" order="_mergemenu_,konqbrowser,Mozilla,Mozilla Firefox,Epiphany Web Browser,Epiphany Bookmarks Editor,_mergefile_"
+?package(menu): needs=x11 section="Internet" title="Web Editors" icon="web_editors_section.png"
+?package(menu): needs=x11 section="Internet" title="Other" icon="other_networking.png"
+#
+#
+?package(menu): needs=x11 section="/" title="Multimedia" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Multimedia" title="Graphics" icon="graphics_section.png" order="_mergemenu_,The GIMP,kooka,_mergefile_"
+?package(menu): needs=x11 section="Multimedia" title="Sound" icon="sound_section.png" order="_mergemenu_,kscd,Totem Media Player,_mergefile_"
+?package(menu): needs=x11 section="Multimedia" title="Video" icon="video_section.png" order="_mergemenu_,Totem Movie Player,_mergefile_"
+?package(menu): needs=x11 section="Multimedia" title="Other" icon="multimedia_section.png"
+#
+#
+?package(menu): needs=x11 section="/" title="System" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="System" title="Archiving" icon="archiving_section.png" order="Backup,CD Burning,Compression,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="System/Archiving" title="Backup" icon="backup_section.png" order="_mergemenu_,DrakSync,_mergefile_"
+?package(menu): needs=x11 section="System/Archiving" title="CD Burning" icon="cd_burning_section.png" order="_mergemenu_,k3b,_mergefile_"
+?package(menu): needs=x11 section="System/Archiving" title="Compression" icon="compression_section.png"
+?package(menu): needs=x11 section="System/Archiving" title="Other" icon="other_archiving.png"
+#
+?package(menu): needs=x11 section="System" title="Configuration" icon="configuration_section.png" order="KControl,Configure Your Computer,Boot and Init,GNOME,Hardware,Networking,Packaging,Printing,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="System/Configuration" title="Boot and Init" icon="boot_init_section.png"
+?package(menu): needs=x11 section="System/Configuration" title="GNOME" icon="gnome_section.png"
+?package(menu): needs=x11 section="System/Configuration" title="Hardware" icon="hardware_configuration_section.png"
+?package(menu): needs=kde section="System/Configuration" title="KDE" icon="kde_section.png" kde_opt="X-KDE-BaseGroup=settings" 
+?package(menu): needs=x11 section="System/Configuration" title="Networking" icon="networking_configuration_section.png"
+?package(menu): needs=x11 section="System/Configuration" title="Packaging" icon="packaging_section.png"
+?package(menu): needs=x11 section="System/Configuration" title="Printing" icon="printing_section.png"
+?package(menu): needs=x11 section="System/Configuration" title="Users" icon="configuration_section.png"
+?package(menu): needs=x11 section="System/Configuration" title="Other" icon="other_configuration.png"
+#
+?package(menu): needs=x11 section="System" title="File Tools" icon="file_tools_section.png" order="_mergemenu_,Kfind,_mergefile_"
+?package(menu): needs=x11 section="System" title="Monitoring" icon="monitoring_section.png" order="_mergemenu_,ksysguard,_mergefile_"
+?package(menu): needs=x11 section="System" title="Terminals" icon="terminals_section.png" order="_mergemenu_,konsole,_mergefile_"
+?package(menu): needs=x11 section="System" title="Text Tools" icon="text_tools_section.png" order="_mergemenu_,kdict,_mergefile_"
+?package(menu): needs=x11 section="System" title="Other" icon="system_other_section.png"
+#
+#
+?package(menu): needs=x11 section="/" title="More Applications" icon="more_applications_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="More Applications" title="Accessibility" icon="accessibility_section.png" order="_mergemenu_,kmag,_mergefile_"
+?package(menu): needs=x11 section="More Applications" title="Communications" icon="communications_section.png"
+?package(menu): needs=x11 section="More Applications" title="Databases" icon="databases_section.png"
+#
+?package(menu): needs=x11 section="More Applications" title="Development" icon="development_section.png" order="Development Environment,Interpreters,Tools,Code Generators,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Development" title="Code Generators" icon="code_generator_section.png"
+?package(menu): needs=x11 section="More Applications/Development" title="Development Environments" icon="development_environment_section.png" order="_mergemenu_,kdevelop,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Development" title="Interpreters" icon="interpreters_section.png" order="_mergemenu_,GNU Prolog,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Development" title="Tools" icon="development_tools_section.png" order="_mergemenu_,Gdb,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Development" title="Other" icon="development_section.png"
+#
+?package(menu): needs=x11 section="More Applications" title="Documentation" icon="documentation_section.png"
+?package(menu): needs=x11 section="More Applications" title="Editors" icon="editors_section.png" order="_mergemenu_,Emacs,XEmacs,VI editor,_mergefile_"
+#
+?package(menu): needs=x11 section="More Applications" title="Education" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Education" title="Economy" icon="education_economy_section.png"
+?package(menu): needs=x11 section="More Applications/Education" title="Geography" icon="education_geography_section.png"
+?package(menu): needs=x11 section="More Applications/Education" title="History" icon="education_history_section.png"
+?package(menu): needs=x11 section="More Applications/Education" title="Languages" icon="education_languages_section.png"
+?package(menu): needs=x11 section="More Applications/Education" title="Literature" icon="education_literature_section.png"
+?package(menu): needs=x11 section="More Applications/Education" title="Sciences" icon="education_sciences.png"
+?package(menu): needs=x11 section="More Applications/Education" title="Sports" icon="education_sport_section.png"
+?package(menu): needs=x11 section="More Applications/Education" title="Other" icon="education_other_section.png"
+#
+?package(menu): needs=x11 section="More Applications" title="Emulators" icon="emulators_section.png"
+?package(menu): needs=x11 section="More Applications" title="Finances" icon="finances_section.png" order="_mergemenu_,GnuCash,kmymoney2,_mergefile_"
+#
+?package(menu): needs=x11 section="More Applications" title="Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Games" title="Adventure" icon="adventure_section.png"
+?package(menu): needs=x11 section="More Applications/Games" title="Arcade" icon="arcade_section.png"
+?package(menu): needs=x11 section="More Applications/Games" title="Boards" icon="boards_section.png"
+?package(menu): needs=x11 section="More Applications/Games" title="Cards" icon="cards_section.png"
+?package(menu): needs=x11 section="More Applications/Games" title="Puzzles" icon="puzzle_section.png"
+?package(menu): needs=x11 section="More Applications/Games" title="Sports" icon="sport_section.png"
+?package(menu): needs=x11 section="More Applications/Games" title="Strategy" icon="strategy_section.png"
+?package(menu): needs=x11 section="More Applications/Games" title="Toys" icon="toys_section.png"
+?package(menu): needs=x11 section="More Applications/Games" title="Other" icon="other_amusement.png"
+#
+?package(menu): needs=x11 section="More Applications" title="Sciences" icon="sciences_section.png" order="Artificial Intelligence,Astronomy,Biology,Chemistry,Computer Science,Data Visualization,Electricity,Geosciences,Image Processing,Mathematics,Numeric analysis,Parallel Computing,Physics,Robotics,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Artificial Intelligence" icon="artificial_intelligence_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Astronomy" icon="astronomy_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Biology" icon="biology_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Chemistry" icon="chemistry_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Computer science" icon="computer_science_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Data Visualization" icon="data_visualization_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Electricity" icon="electricity_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Geosciences" icon="geosciences_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Image Processing" icon="image_processing_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Mathematics" icon="mathematics_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Numeric Analysis" icon="numerical_analysis_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Parallel Computing" icon="parallel_computing_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Physics" icon="physics_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Robotics" icon="robotics_section.png"
+?package(menu): needs=x11 section="More Applications/Sciences" title="Other" icon="other_sciences.png"
+#
+?package(menu): needs=x11 section="More Applications" title="Other" icon="more_applications_other_section.png"
+
+
+# Needs to be owned by wm else we have empty entry in some Desktop
+?package(menu): needs=wm section="/" title="Session" icon="windowmanager_section.png"
+?package(menu): needs=wm section="Session" title="Windowmanagers" icon="windowmanager_section.png"
diff --git a/trunk/menu/menu-simplified b/trunk/menu/menu-simplified
new file mode 100644
index 0000000..17f74a5
--- /dev/null
+++ b/trunk/menu/menu-simplified
@@ -0,0 +1,31 @@
+?package(menu): needs=x11 section="/" title="Use Office Tools" icon="office_section.png" order="_mergemenu_,Create a Text Document,Create a Spreadsheet,Create a Presentation,Create a Drawing,kivio,Design a Layout,kontact-kaddressbook,kdeprintfax,kfax,kpilot,kcalc,kdict,_mergefile_,_separator_,Use More Office Tools,_separator_,Other"
+?package(menu): needs=x11 section="Use Office Tools" title="Use More Office Tools" icon="office_section.png" order="Wordprocessors,Spreadsheets,Presentations,Drawing,Graphs,Publishing,Tasks Management,Time Management,Address Books,Communications,Accessories,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="/" title="Organize" icon="timemanagement_section.png" order="_mergemenu_,kontact-knotes,kontact-korganizer,kontact-korganizer-time,karm,Manage Projects,Manage Your Finances,_mergefile_,_separator_,Use More Productivity Tools,_separator_,Other"
+?package(menu): needs=x11 section="Organize" title="Use More Productivity Tools" icon="timemanagement_section.png"
+?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Finances" icon="finances_section.png"
+?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Tasks Management" icon="taskmanagement_section.png"
+?package(menu): needs=x11 section="Organize/Use More Productivity Tools" title="Time Management" icon="timemanagement_section.png"
+?package(menu): needs=x11 section="/" title="Surf the Internet" icon="internet_section.png" order="_mergemenu_,konqueror,kontact-KMail,kopete,kontact-KNode,Organize a Video Conference,kphone,quanta,kbear,Kppp,_mergefile_,_separator_,Use More Internet Software,_separator_,Use More Connectivity Utilities,_separator_,Other"
+?package(menu): needs=x11 section="Surf the Internet" title="Use More Connectivity Utilities" icon="internet_section.png" order="Remote Access,Web Browsers,Mail,Instant Messaging,Chat,News,File Transfer,Video Conference,Web Editors,_separator,Other,_mergemenu_,_mergefile_" excludefiles="Mandrakelinux-Internet-InstantMessaging-kopete.desktop"
+?package(menu): needs=x11 section="/" title="Enjoy Music and Video" icon="multimedia_section.png" order="_mergemenu_,kmix,kscd,amarok,kaudiocreator,Record Sounds,Mix Music,rosegarden,kaffeine,kdenlive,kdetv,_mergefile_,_separator_,Discover More Entertainment Options,_separator_,Other"
+?package(menu): needs=x11 section="Enjoy Music and Video" title="Discover More Entertainment Options" icon="multimedia_section.png" order="Sound,Video,Graphics,Other,_mergemenu_,_mergefile_" 
+?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Sound" icon="sound_section.png"  excludefiles="Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kmix.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kscd.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-Totem Media Player.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-kaudiocreator.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-Audacity.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-amarok.desktop,Mandrakelinux-EnjoyMusicandVideo-DiscoverMoreEntertainmentOptions-rosegarden.desktop"
+?package(menu): needs=x11 section="Enjoy Music and Video/Discover More Entertainment Options" title="Video" icon="video_section.png" 
+?package(menu): needs=x11 section="/" title="View, Modify and Create Graphics" icon="graphics_section.png" order="_mergemenu_,kuickshow,Edit Images and Photos,kooka,digikam,ksnapshot,_mergefile_,_separator_,Use More Image Editing Tools,_separator_,Other"
+?package(menu): needs=x11 section="View, Modify and Create Graphics" title="Use More Image Editing Tools" icon="graphics_section.png"
+?package(menu): needs=x11 section="/" title="Play Games" icon="amusement_section.png" order="_mergemenu_,Frozen-Bubble,ArmageTron,Cannon Smash,Chromium,LBreakout 2,Ppracer,Crack Attack! - Solo,_mergefile_,_separator_,Play More Games,_separator_,Other"
+?package(menu): needs=x11 section="Play Games" title="Play More Games" icon="amusement_section.png" order="Adventure,Arcade,Boards,Cards,Puzzles,Sports,Strategy,Toys,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="/" title="Administer Your System" icon="configuration_section.png" order="_mergemenu_,KControl,Configure Your Computer,kdepasswd,k3b,Backup Your Data,ark,KFloppy,konsole,_mergefile_,_separator_,Use More Administration Tools,_separator_,Other"
+?package(menu): needs=x11 section="Administer Your System" title="Use More Administration Tools" icon="system_section.png" order="Terminals,Text Tools,Configuration,Archiving,File Tools,Monitoring,Session,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Administer Your System/Use More Administration Tools" title="Accessibility" icon="accessibility_section.png" 
+?package(menu): needs=x11 section="Administer Your System/Use More Administration Tools" title="Communications" icon="communications_section.png"
+?package(menu): needs=x11 section="/" title="Read Documentation" icon="documentation_section.png" order="_mergefile_,_separator_,_mergemenu_,Other"
+?package(menu): needs=x11 section="Read Documentation" title="Read More Documentation" icon="documentation_section.png"
+?package(menu): needs=x11 section="/" title="Develop" icon="development_section.png"
+?package(menu): needs=x11 section="/" title="Use Education Software" icon="education_section.png"
+?package(menu): needs=x11 section="Use Education Software" title="Use More Education Software" icon="education_section.png" order="Economy,Geography,History,Languages,Literature,Sciences,Sports,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="/" title="Use Scientific Software" icon="sciences_section.png"
+?package(menu): needs=x11 section="Use Scientific Software" title="Use More Sciences Software" icon="sciences_section.png" order="Artificial Intelligence,Astronomy,Biology,Chemistry,Computer Science,Data Visualization,Electricity,Geosciences,Image Processing,Mathematics,Numeric analysis,Parallel Computing,Physics,Robotics,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="/" title="Use Emulators" icon="emulators_section.png"
+?package(menu): needs=x11 section="/" title="Use More Applications" icon="more_applications_other_section.png" order="Accessibility,Development,Editors,Emulators,Finances,Databases,Education,Sciences,Communications,Games,Documentation,Other,_mergemenu_,_mergefile_"
+?package(menu): needs=x11 section="Develop" title="Use More Development Software" icon="development_section.png" order="Development Environment,Interpreter,Tools,Code Generators,_mergemenu_,_mergefile_"
diff --git a/trunk/menu/menustyle.csh b/trunk/menu/menustyle.csh
new file mode 100755
index 0000000..74776db
--- /dev/null
+++ b/trunk/menu/menustyle.csh
@@ -0,0 +1,17 @@
+if ($META_CLASS == desktop ) then 
+	set MDV_MENU_STYLE=discovery 
+else
+	set MDV_MENU_STYLE=mandriva
+endif
+
+foreach file (/etc/sysconfig/menustyle $HOME/.menustyle)
+ if ( -f $file ) then
+   eval `sed 's|^#.*||' $file | sed 's|\([^=]*\)=\([^=]*\)|set \1=\2|g' | sed 's|$|;|' `
+ endif
+end
+
+if ($MDV_MENU_STYLE  == discovery && ! ${?XDG_CONFIG_DIRS}) then
+	setenv XDG_CONFIG_DIRS /etc/xdg/discovery:/etc/xdg
+endif
+
+setenv MDV_MENU_STYLE $MDV_MENU_STYLE
diff --git a/trunk/menu/menustyle.sh b/trunk/menu/menustyle.sh
new file mode 100755
index 0000000..e1b5051
--- /dev/null
+++ b/trunk/menu/menustyle.sh
@@ -0,0 +1,15 @@
+if [ "$META_CLASS" = "desktop" ]; then 
+	MDV_MENU_STYLE=discovery 
+else
+	MDV_MENU_STYLE=mandriva
+fi
+
+[ -r /etc/sysconfig/menustyle ] && source /etc/sysconfig/menustyle
+[ -r $HOME/.menustyle ] && source $HOME/.menustyle
+
+if [ "$MDV_MENU_STYLE" = "discovery" -a "x$XDG_CONFIG_DIRS" = "x" ]; then
+	XDG_CONFIG_DIRS=/etc/xdg/discovery:/etc/xdg
+	export XDG_CONFIG_DIRS
+fi
+
+export MDV_MENU_STYLE
diff --git a/trunk/menu/translate_menus b/trunk/menu/translate_menus
new file mode 100644
index 0000000..097f9fa
--- /dev/null
+++ b/trunk/menu/translate_menus
@@ -0,0 +1,109 @@
+#  /etc/menu-methods/menu-translate file for update-menus.
+#
+#
+#
+#  NOTE: if you want to translate the menu entries in a different language,
+#        DO NOT USE THIS FILE!!!
+#        use the gnu internationalisation tools, see the menu source
+#	 code (menu/messages/README), and send the .po file you created
+#	 to me, I'll include it in a next release of menu. 
+#
+#
+#synopsis:
+#
+#translate x -> y    #where x and y are one of section, id, title, icon, ...
+#  x-name  y-name
+#  ...
+#endtranslate
+#
+#The translations are done by update-menus: the menu-methods will not
+#have to be aware of this.
+#
+
+#there's:
+#  translate:     only translate for exact matches (RE "^$match\$"
+#  subtranslate:  translate for matches of RE "^$match"
+#  substitute:    substitute substrings: sed -s "/^$match/$repl/".
+#                 this only works for "substitute x->x", and
+#		  will give interesting results for " substitute x->y".
+# 
+#the following will map all Apps/Games sections into Games
+# (the /etc/menu-methods will never even know Apps/Games exists,
+#  no matter how many packages still use that):
+#
+#
+# Language translators: DO NOT USE THIS FILE! (see note on top of this file)
+
+
+substitute section->section
+  Configuration  System/Configuration
+
+  "Applications/Publishing"                               Office/Publishing
+  Applications/Archiving                                  System/Archiving
+  "Applications/File tools"                               "System/File Tools"
+  Applications/Monitoring                                 System/Monitoring
+  "Applications/Text tools"                               "System/Text Tools"
+  Applications                                            "More Applications"
+
+  Terminals                                               System/Terminals
+
+  Documentation                                           "More Applications/Documentation"
+
+  Office/PDA                                              Office/Communications/PDA
+
+  Networking/IRC                                          Internet/Chat
+  Networking/WWW                                          "Internet/Web Browsers"
+  Networking                                              Internet
+
+  Amusement                                               "More Applications/Games"
+
+  Session/WindowManagers                                  System/Session/Windowmanagers
+
+  "Office/Address books"                                  "Office/Address Books"
+  "Office/Tasks management"                               "Office/Tasks Management"
+  "Office/Time management"                                "Office/Time Management"
+  "Networking/File transfer"                              "Internet/File Transfer"
+  "Internet/File transfer"                                "Internet/File Transfer"
+  "Networking/Instant messaging"                          "Internet/Instant Messaging"
+  "Internet/Instant messaging"                            "Internet/Instant Messaging"
+  "Networking/Remote access"                              "Internet/Remote Access"
+  "Internet/Remote access"                                "Internet/Remote Access"
+  "Internet/Video conference"                             "Internet/Video Conference"
+  "Networking/Video conference"                           "Internet/Video Conference"
+  "Internet/Web browsers"                                 "Internet/Web Browsers"
+  "Networking/Web browsers"                               "Internet/Web Browsers"
+  "Internet/Web editors"                                  "Internet/Web Editors"
+  "Networking/Web editors"                                "Internet/Web Editors"
+  "System/Archiving/Cd burning"                           "System/Archiving/CD Burning"
+  "Applications/Archiving/Cd burning"                     "System/Archiving/CD Burning"
+  "System/File tools"                                     "System/File Tools"
+  "System/Text tools"                                     "System/Text Tools"
+  "More applications"                                     "More Applications"
+  "More applications/Development/Code generators"         "More Applications/Development/Code Generators"
+  "Applications/Development/Code generators"              "More Applications/Development/Code Generators"
+  "More applications/Development/Development environments" "More Applications/Development/Development Environments"
+  "Applications/Development/Development environments"    "More Applications/Development/Development Environments"
+  "More applications/Sciences/Artificial intelligence"    "More Applications/Sciences/Artificial Intelligence"
+  "Applications/Sciences/Artificial intelligence"         "More Applications/Sciences/Artificial Intelligence"
+  "More applications/Sciences/Data visualization"         "More Applications/Sciences/Data Visualization"
+  "Applications/Sciences/Data visualization"              "More Applications/Sciences/Data Visualization"
+  "More applications/Sciences/Image processing"           "More Applications/Sciences/Image Processing"
+  "Applications/Sciences/Image processing"                "More Applications/Sciences/Image Processing"
+  "More applications/Sciences/Numeric analysis"           "More Applications/Sciences/Numeric Analysis"
+  "Applications/Sciences/Numeric analysis"                "More Applications/Sciences/Numeric Analysis"
+  "More applications/Sciences/Parallel computing"         "More Applications/Sciences/Parallel Computing"
+  "Applications/Sciences/Parallel computing"              "More Applications/Sciences/Parallel Computing"
+endtranslate
+
+# 
+# #this could be for those who want different names
+# translate title->title
+#   Gnuplot    "GnuTeken"
+#   Dosemu     "A better DOS than DOS (sometimes)"
+# endtranslate
+# 
+#translate id->title
+#  include /usr/lib/menus/LANGUAGE/finnish
+#  menu/apps/editors  TekstVeranderaars
+#endtranslate
+# 
diff --git a/trunk/menu/translate_menus-simplified b/trunk/menu/translate_menus-simplified
new file mode 100644
index 0000000..dde4ab6
--- /dev/null
+++ b/trunk/menu/translate_menus-simplified
@@ -0,0 +1,98 @@
+# Language translators: DO NOT USE THIS FILE! (see note on top of this file)
+
+
+substitute section->section
+  "Office/Tasks management"                               "Organize/Use More Productivity Tools/Tasks Management"
+  "Office/Time management"                               "Organize/Use More Productivity Tools/Time Management"
+  "Office/Tasks Management"                               "Organize/Use More Productivity Tools/Tasks Management"
+  "Office/Time Management"                               "Organize/Use More Productivity Tools/Time Management"
+  Office                                                  "Use Office Tools/Use More Office Tools"
+  "More Applications/Finances"                            "Organize/Use More Productivity Tools/Finances"
+
+  Internet                                                "Surf the Internet/Use More Connectivity Utilities"
+
+  Multimedia/Video                                              "Enjoy Music and Video/Discover More Entertainment Options/Video"
+  Multimedia/Sound                                              "Enjoy Music and Video/Discover More Entertainment Options/Sound"
+  Multimedia/Graphics                                           "View, Modify and Create Graphics/Use More Image Editing Tools"
+
+  "More Applications/Games"                                                    "Play Games/Play More Games"
+  Amusement                                               "Play Games/Play More Games"
+
+  System                                                        "Administer Your System/Use More Administration Tools"
+  "More Applications/Development"                              "Develop/Use More Development Software"
+  "More Applications/Education"                              "Use Education Software/Use More Education Software"
+  "More Applications/Sciences"                              "Use Scientific Software/Use More Sciences Software"
+
+  "More Applications/Accessibility"                         "Administer Your System/Use More Administration Tools/Accessibility"
+  "More Applications/Communications"                         "Administer Your System/Use More Administration Tools/Communications"
+
+  
+  "More Applications/Other"                                           "Use More Applications"
+  "More Applications/Emulators"                                 "Use Emulators"
+  "More Applications/Documentation"                             "Read Documentation/Read More Documentation"
+  "More Applications"                                           "Use More Applications"
+
+
+#### below a modified copy of the main system translation map, adapted for simplified menu
+
+
+  Configuration  "Administer Your System/Use More Administration Tools/Configuration"
+
+  "Applications/Publishing"                               "Use Office Tools/Use More Office Tools/Publishing"
+  Applications/Archiving                                  "Administer Your System/Use More Administration Tools/Archiving"
+  "Applications/File tools"                               "Administer Your System/Use More Administration Tools/File tools"
+  Applications/Monitoring                                 "Administer Your System/Use More Administration Tools/Monitoring"
+  "Applications/Text tools"                               "Administer Your System/Use More Administration Tools/Text tools"
+  Applications                                            "Use More Applications"
+
+  Terminals                                               "Administer Your System/Use More Administration Tools/Terminals"
+
+  Documentation                                           "Read Documentation/Read More Documentation"
+
+  Office/PDA                                              "Use Office Tools/Use More Office Tools/Communications/PDA"
+
+  Networking/IRC                                          "Surf the Internet/Use More Connectivity Utilities/Chat"
+  Networking/WWW                                          "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
+  Networking                                              "Surf the Internet/Use More Connectivity Utilities"
+
+  Amusement                                               "Play Games/Play More Games"
+
+  Session/WindowManagers                                  "Administrer Your System/Use More Administration Tools/Windowmanagers"
+
+  "Office/Address books"                                  "Use Office Tools/Use More Office Tools/Address Books"
+  "Office/Tasks management"                               "Organize/Use More Productivity Tools/Tasks Management"
+  "Office/Time management"                                "Organize/Use More Productivity Tools/Time Management"
+  "Networking/File transfer"                              "Surf the Internet/Use More Connectivity Utilities/File Transfer"
+  "Internet/File transfer"                                "Surf the Internet/Use More Connectivity Utilities/File Transfer"
+  "Networking/Instant messaging"                          "Surf the Internet/Use More Connectivity Utilities/Instant Messaging"
+  "Internet/Instant messaging"                            "Surf the Internet/Use More Connectivity Utilities/Instant Messaging"
+  "Networking/Remote access"                              "Surf the Internet/Use More Connectivity Utilities/Remote Access"
+  "Internet/Remote access"                                "Surf the Internet/Use More Connectivity Utilities/Remote Access"
+  "Internet/Video conference"                             "Surf the Internet/Use More Connectivity Utilities/Video Conference"
+  "Networking/Video conference"                           "Surf the Internet/Use More Connectivity Utilities/Video Conference"
+  "Internet/Web browsers"                                 "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
+  "Networking/Web browsers"                               "Surf the Internet/Use More Connectivity Utilities/Web Browsers"
+  "Internet/Web editors"                                  "Surf the Internet/Use More Connectivity Utilities/Web Editors"
+  "Networking/Web editors"                                "Surf the Internet/Use More Connectivity Utilities/Web Editors"
+  "System/Archiving/Cd burning"                           "Administer Your System/Use More Administration Tools/Archiving/CD Burning"
+  "Applications/Archiving/Cd burning"                     "Administer Your System/Use More Administration Tools/Archiving/CD Burning"
+  "System/File tools"                                     "Administer Your System/Use More Administration Tools/File Tools"
+  "System/Text tools"                                     "Administer Your System/Use More Administration Tools/Text Tools"
+  "More applications"                                     "Use More Applications"
+  "More applications/Development/Code generators"         "Develop/Use More Development Software/Code Generators"
+  "Applications/Development/Code generators"              "Develop/Use More Development Software/Code Generators"
+  "More applications/Development/Development environments" "Develop/Use More Development Software/Development Environments"
+  "Applications/Development/Development environments"    "Develop/Use More Development Software/Development Environments"
+  "More applications/Sciences/Artificial intelligence"    "Use Scientific Software/Use More Sciences Software/Artificial Intelligence"
+  "Applications/Sciences/Artificial intelligence"         "Use Scientific Software/Use More Sciences Software/Artificial Intelligence"
+  "More applications/Sciences/Data visualization"         "Use Scientific Software/Use More Sciences Software/Data Visualization"
+  "Applications/Sciences/Data visualization"              "Use Scientific Software/Use More Sciences Software/Data Visualization"
+  "More applications/Sciences/Image processing"           "Use Scientific Software/Use More Sciences Software/Image Processing"
+  "Applications/Sciences/Image processing"                "Use Scientific Software/Use More Sciences Software/Image Processing"
+  "More applications/Sciences/Numeric analysis"           "Use Scientific Software/Use More Sciences Software/Numeric Analysis"
+  "Applications/Sciences/Numeric analysis"                "Use Scientific Software/Use More Sciences Software/Numeric Analysis"
+  "More applications/Sciences/Parallel computing"         "Use Scientific Software/Use More Sciences Software/Parallel Computing"
+  "Applications/Sciences/Parallel computing"              "Use Scientific Software/Use More Sciences Software/Parallel Computing"
+
+endtranslate
+
diff --git a/trunk/menu/update-menus b/trunk/menu/update-menus
new file mode 100755
index 0000000..bd21520
--- /dev/null
+++ b/trunk/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/trunk/menu/xdg_menu b/trunk/menu/xdg_menu
new file mode 100755
index 0000000..099d41f
--- /dev/null
+++ b/trunk/menu/xdg_menu
@@ -0,0 +1,2216 @@
+#!/usr/bin/perl
+
+# Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany. All rights reserved.
+#
+# Author: nadvornik@suse.cz
+#
+#
+
+use strict;
+use Locale::gettext;
+use Getopt::Long;
+use Encode;
+use I18N::Langinfo qw(langinfo CODESET);
+use POSIX qw(locale_h);
+
+my $Version = "0.2";
+
+my $DefaultAppDirs;
+my $DefaultDirectoryDirs;
+my @KDELegacyDirs;
+
+my $format = 'WindowMaker';
+my $desktop_name;
+my $language = '';
+my $charset = 'iso-8859-1';
+my $root_cmd = 'xdg_menu_su';
+
+my $die_on_error = 0;
+my $verbose = 0;
+my $fullmenu = 0;
+
+my @language_keys;
+
+my @accessed_files;
+my @save_ARGV = @ARGV;
+
+
+my %Desktop_entries;
+my %Directory_entries;
+
+sub check_file ($)
+{
+	my ($file) =@_;
+	
+	unless (-e $file) {
+		push @accessed_files, "X $file";
+		return '';
+	}
+	
+	if (-d $file) {
+		push @accessed_files, "D $file";
+		return 'D';
+	} else {
+		push @accessed_files, "F $file";
+		return 'F';
+	}
+}
+
+sub add_png_extension_if_needed ($)
+{
+	my ($f) = @_;
+	return $f =~ /\.(png|xpm|svg)$/ ? $f : "$f.png";
+}
+
+sub scan_AppDir ($$;$)
+{
+	my ($pool, $dir, $topdir) = @_;
+	
+	check_file($dir);
+	$topdir = $dir unless defined $topdir;
+
+	opendir(DIR, $dir) or return;
+
+	foreach my $entry (readdir(DIR)) {
+
+		if ( -f "$dir/$entry" && $entry =~ /\.desktop$/ ) {
+			read_desktop_entry($pool, "$dir/$entry", $topdir);
+		}
+		elsif ( -d "$dir/$entry" && $entry ne '.' && $entry ne '..' && $entry ne '.hidden') {
+			scan_AppDir ($pool, "$dir/$entry", $topdir);
+		}
+	}
+	closedir DIR;
+}
+
+sub scan_DirectoryDir ($$;$)
+{
+	my ($pool, $dir, $topdir) = @_;
+
+	check_file($dir);
+	$topdir = $dir unless defined $topdir;
+
+	opendir(DIR, $dir) or return;
+
+	foreach my $entry (readdir(DIR)) {
+
+		if ( -f "$dir/$entry" && $entry =~ /\.directory$/ ) {
+			read_directory_entry($pool, "$dir/$entry", $topdir);
+		}
+		elsif ( -d "$dir/$entry" && $entry ne '.' && $entry ne '..' && $entry ne '.hidden') {
+			scan_DirectoryDir ($pool, "$dir/$entry", $topdir);
+		}
+	}
+	
+	closedir DIR;
+}
+
+sub read_directory_entry
+{
+	my ($pool, $file, $topdir) = @_;
+	
+
+	unless (defined $Directory_entries{$file}) {
+
+		check_file($file);
+
+		open(FILE, "<$file") or return;
+
+		my $in_desktop_entry = 0;
+		my %entry;
+		while (<FILE>) {
+			if (/^\[/) {
+				if (/^\[Desktop Entry\]/) {
+					$in_desktop_entry = 1;
+				}
+				elsif (/^\[.*\]/) {
+					$in_desktop_entry = 0;
+				}
+			}
+			elsif ($in_desktop_entry && /^([^=]*)=([^[:cntrl:]]*)/) {
+				$entry{$1} = $2;
+			}
+		}
+		close(FILE);
+
+		my $id = $file;
+		$id =~ s/^$topdir//;
+		$id =~ s/^\/*//;
+		$id =~ s/\//-/g;
+		$entry{'id'} = $id;
+
+		$Directory_entries{$file} = \%entry;
+	}
+
+	my $entry = $Directory_entries{$file};
+	
+	$pool->{'Directory_entries'}{$entry->{'id'}} = $entry;
+}
+
+sub check_show_in ($)
+{
+	my ($entry) = @_;
+
+	return 1 unless defined $entry;
+
+	my %OnlyShowIn;
+	my %NotShowIn;
+	
+	if (defined $entry->{'OnlyShowIn'}) {
+		foreach my $showin (split /;/, $entry->{'OnlyShowIn'}) {
+			$OnlyShowIn{$showin} = 1;
+		}
+		return 0 unless defined $OnlyShowIn{$desktop_name};
+	}
+	if (defined $entry->{'NotShowIn'}) {
+		foreach my $showin (split /;/, $entry->{'NotShowIn'}) {
+			$NotShowIn{$showin} = 1;
+		}
+		return 0 if defined $NotShowIn{$desktop_name} ;
+	}
+	
+	return 1;
+}
+
+sub read_desktop_entry
+{
+	my ($pool, $file, $topdir) = @_;
+
+
+	unless (defined $Desktop_entries{$file}) {
+
+		check_file($file);
+	
+		open(FILE, "<$file") or return;
+
+		my $in_desktop_entry = 0;
+		my %entry;
+		while (<FILE>) {
+			if (/^\[/) {
+				if (/^\[Desktop Entry\]/) {
+					$in_desktop_entry = 1;
+				}
+				elsif (/^\[.*\]/) {
+					$in_desktop_entry = 0;
+				}
+			}
+			elsif ($in_desktop_entry && /^([^=]*)=([^[:cntrl:]]*)/) {
+				$entry{$1} = $2;
+			}
+		}
+		close(FILE);
+
+		my $id = $file;
+		$id =~ s/^$topdir//;
+		$id =~ s/^\/*//;
+		$id =~ s/\//-/g;
+		$entry{'id'} = $id;
+
+		$entry{'refcount'} = 0;
+		
+		$Desktop_entries{$file} = \%entry;
+	}
+
+	my $entry = $Desktop_entries{$file};
+
+	return unless defined $entry->{'Name'};	
+	return unless defined $entry->{'Exec'};	
+	return if $entry->{'Hidden'} eq 'true';	
+	return if $entry->{'NoDisplay'} eq 'true';	
+
+	return unless check_show_in($entry);
+
+	return if defined $entry->{'NotShowIn'} && $entry->{'NotShowIn'} eq $desktop_name;	
+	
+	
+	if (defined $pool) {
+	
+		foreach my $category (split /;/, $entry->{'Categories'}) {
+		        $pool->{'Categories'}{$category} = [] unless defined $pool->{'Categories'}{$category};
+			push @{$pool->{'Categories'}{$category}}, $entry;
+		}
+
+		$pool->{'Desktop_entries'}{$entry->{'id'}} = $entry;
+	}
+
+	return $entry;
+}
+
+my $cached_pool;
+
+sub read_desktop_entries ($$)
+{
+	my ($directory_paths, $desktop_paths) = @_;
+
+	if ($cached_pool->{'Directory_paths'} eq $directory_paths &&
+	    $cached_pool->{'Desktop_paths'} eq $desktop_paths) {
+	
+		return $cached_pool;
+	}
+
+	
+	my $pool = {'Desktop_entries' => {},
+		       'Categories' => {},
+		       'Directory_entries' => {},
+		       'Directory_paths' => $directory_paths,
+		       'Desktop_paths' => $desktop_paths
+		       };
+		       
+	foreach my $dir (split /:/, $directory_paths) {
+		next if $dir =~ /^\s*$/;
+		scan_DirectoryDir($pool, $dir);
+	}
+	
+	foreach my $dir (split /:/, $desktop_paths) {
+		next if $dir =~ /^\s*$/;
+		scan_AppDir($pool, $dir);
+	}
+
+	$cached_pool = $pool;
+	
+	return $pool;
+}
+
+sub dump_entry_list ($)
+{
+	my ($list) = @_;
+
+	print "list: ";	
+	foreach my $entry (@$list) {
+		print "$entry->{id} ";
+	}
+	print "\n";
+
+}
+
+sub get_directory_entry ($$)
+{
+	my ($entry, $pool) = @_;
+	
+	return $pool->{'Directory_entries'}{$entry};
+}
+
+sub interpret_Include
+{
+	my ($tree, $entries, $pool) = @_;
+	my %exist;
+	
+	my $i = 0;
+
+
+	my @list = interpret_entry_node($tree, 'Or', $pool);
+
+	foreach my $e (@$entries) {
+		if ($e->{type} eq 'desktop') {
+			$exist{$e->{desktop}} = 1;
+		}
+	}
+
+
+#	dump_entry_list(\@list);
+
+	foreach my $entry (@list) {
+		
+		next if $exist{$entry};
+		
+		push @$entries, {type => 'desktop', desktop => $entry};
+		$entry->{'refcount'}++;
+		
+		$exist{$entry} = 1;
+			
+	}
+}
+
+sub interpret_Exclude
+{
+	my ($tree, $entries, $pool) = @_;
+	
+	my $i = 0;
+
+	my @list = interpret_entry_node($tree, 'Or', $pool);
+
+
+	foreach my $entry (@list) {
+		
+		my $i = 0;
+		while (defined $entries->[$i]) {
+			my $exist = $entries->[$i];
+			if ($exist->{type} eq 'desktop' &&
+			    $exist->{desktop} eq $entry) {
+				splice @$entries, $i, 1;
+				$entry->{'refcount'}--;
+			}
+			else {
+				$i++;
+			}
+		}
+	}
+}
+
+
+sub interpret_entry_node ($$$)
+{
+	my ($tree, $node, $pool) = @_;
+
+	my $i = 0;
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+	
+	my @subtree;
+	
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Filename') {
+			$i++;
+			if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
+				my $entry = $tree->[$i][2];
+				if (defined $pool->{'Desktop_entries'}{$entry}) {
+					push @subtree, [$pool->{'Desktop_entries'}{$entry}];
+				}
+				else {
+					push @subtree, [];
+				}
+			}
+			else {
+				 print STDERR "Filename\n";
+				 exit 1 if $die_on_error;
+			}
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'Category') {
+			$i++;
+			if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
+				my $category = $tree->[$i][2];
+				if (defined $pool->{'Categories'}{$category}) {
+					push @subtree, $pool->{'Categories'}{$category};
+				}
+				else {
+					push @subtree, [];
+				}
+			}
+			else {
+				 print STDERR "Category\n";
+				 exit 1 if $die_on_error;
+			}
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'All') {
+			$i++;
+			if (values %{$pool->{'Desktop_entries'}} > 0) {
+				push @subtree, [values %{$pool->{'Desktop_entries'}}];
+			}
+			else {
+				push @subtree, [];
+			}
+			$i++;
+		}
+		elsif ($tree->[$i] eq '0') {
+			$i++;
+			$i++;
+		}
+		else {
+			my @res = interpret_entry_node($tree->[$i+1], $tree->[$i], $pool);
+			push @subtree, \@res;
+			$i++; $i++;
+		}
+	}
+
+	if ($node eq 'Or')
+	{
+#		print "or - \n";
+
+		my %used;
+		my @res;
+		foreach my $st (@subtree) {
+#			print "  st: ";
+#			dump_entry_list($st);
+			foreach my $entry (@$st) {
+				if (! defined $used{$entry}) {
+					push @res, $entry;
+					$used{$entry} = 1;
+				}
+			}
+		}
+#		print " res: ";
+#		dump_entry_list(\@res);
+		return @res;
+	} elsif ($node eq 'And')
+	{
+		my %used;
+		my @res;
+#		print "and - \n";
+		my $cnt = @subtree;
+		my $min = @{$subtree[0]};
+		my $min_idx = 0;
+		my $idx = 0;
+		
+		foreach my $st (@subtree) {
+#			print "  st: ";
+#			dump_entry_list($st);
+
+			my $num = @$st;
+			if ($num < $min) {
+				$min = $num;
+				$min_idx = $idx;
+			}
+			
+			my %dupes;
+			foreach my $entry (@$st) {
+				next if $dupes{$entry};
+				$dupes{$entry} = 1;
+				
+				if (! defined $used{$entry}) {
+					$used{$entry} = 1;
+				}
+				else {
+					$used{$entry} ++
+				}
+			}
+			
+			$idx ++;
+		}
+		return () if $cnt == 0;
+		foreach my $entry (@{$subtree[$min_idx]}) {
+			push @res, $entry if $used{$entry} == $cnt;
+		}
+		
+#		print " res: ";
+#		dump_entry_list(\@res);
+		return @res;
+	} elsif ($node eq 'Not')
+	{
+		my %used;
+		my @res;
+#		print "not - \n";
+		my $cnt = @subtree;
+		foreach my $st (@subtree) {
+#			print "  st: ";
+#			dump_entry_list($st);
+			foreach my $entry (@$st) {
+				$used{$entry} = 1;
+			}
+		}
+		return if $cnt == 0;
+		foreach my $entry (values %{$pool->{'Desktop_entries'}}) {
+			push @res, $entry if !defined $used{$entry};
+		}
+		
+#		print " res: ";
+#		dump_entry_list(\@res);
+		return @res;
+	} else {
+		print STDERR "Can't use '$node' inside <Include> or <Exclude>\n";
+		exit 1 if $die_on_error;
+		return ();
+	}
+}
+
+sub interpret_root ($$)
+{
+	my ($tree, $topdir) = @_;
+	if ($tree->[0] eq 'Menu') {
+		return interpret_menu($tree->[1]);
+	}
+	else {
+		print STDERR "No toplevel Menu\n";
+		exit 1 if $die_on_error;
+		return;
+	}
+}
+
+
+sub interpret_menu ($;$$)
+{
+	my ($tree, $directory_paths, $desktop_paths) = @_;
+	
+	$directory_paths = '' unless defined $directory_paths;
+	$desktop_paths = '' unless defined $desktop_paths;
+	
+	my %menu = ('entries' => [], 
+	            'OnlyUnallocated' => 0,
+		    'DontShowIfEmpty' => 0,
+		    'Deleted' => 0);
+
+	my $i = 0;
+
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'AppDir') {
+			if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
+				$desktop_paths .= ':' . $tree->[$i + 1][2];
+				splice @$tree, $i, 2;
+			}
+			else {
+				print STDERR "wrong AppDir\n";
+				exit 1 if $die_on_error;
+				$i++;
+				$i++;
+			}
+		}
+		elsif ($tree->[$i] eq 'DefaultAppDirs') {
+			$desktop_paths .= ':' . $DefaultAppDirs;
+			splice @$tree, $i, 2;
+		}
+		elsif ($tree->[$i] eq 'DirectoryDir') {
+			if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
+				$directory_paths .= ':' . $tree->[$i + 1][2];
+				splice @$tree, $i, 2;
+			}
+			else {
+				print STDERR "wrong DirectoryDir\n";
+				exit 1 if $die_on_error;
+				$i++;
+				$i++;
+			}
+		}
+		elsif ($tree->[$i] eq 'DefaultDirectoryDirs') {
+			$directory_paths .= ':' . $DefaultDirectoryDirs;
+			splice @$tree, $i, 2;
+		}
+		else {
+			$i++;
+			$i++;
+		}
+	}
+
+	
+	$menu{directory_paths} = $directory_paths;
+	$menu{desktop_paths} = $desktop_paths;
+	
+	my $pool = read_desktop_entries($directory_paths, $desktop_paths);
+
+
+	$i = 0;
+
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Menu') {
+			$i++;
+			my $submenu = interpret_menu($tree->[$i], $directory_paths, $desktop_paths);
+			push @{$menu{'entries'}}, {type => 'menu', menu => $submenu};
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'Name') {
+			$i++;
+			if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
+				$menu{'Name'} = $tree->[$i][2];
+			}
+			else {
+				 print STDERR "wrong Name\n";
+				 exit 1 if $die_on_error;
+			}
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'Directory') {
+			$i++;
+			if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
+				$menu{'Directory'} = get_directory_entry($tree->[$i][2], $pool);
+#				print "Directory " . $tree->[$i][2] . "\n"; 
+			}
+			else {
+				 print STDERR "wrong Directory\n";
+				 exit 1 if $die_on_error;
+			}
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'OnlyUnallocated') {
+			$menu{'OnlyUnallocated'} = 1;
+			$i++;
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'DontShowIfEmpty') {
+			$menu{'DontShowIfEmpty'} = 1;
+			$i++;
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'Deleted') {
+			$menu{'Deleted'} = 1;
+			$i++;
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'NotDeleted') {
+			$menu{'Deleted'} = 0;
+			$i++;
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'Include') {
+			$i++;
+			interpret_Include($tree->[$i], $menu{'entries'}, $pool);
+			$i++;
+		}
+		elsif ($tree->[$i] eq 'Exclude') {
+			$i++;
+			interpret_Exclude($tree->[$i], $menu{'entries'}, $pool);
+			$i++;
+		}
+		elsif ($tree->[$i] eq '0') {
+			$i++;
+			if ($tree->[$i] !~ /^\s*$/) {
+				print STDERR "skip '$tree->[$i]'\n" ;
+				exit 1 if $die_on_error;
+			}
+			$i++;
+		}
+		else {
+			print STDERR "Unknown '$tree->[$i]':\n";
+			$i++;
+			print STDERR "        '@{$tree->[$i]}'\n";
+			$i++;
+			exit 1 if $die_on_error;
+		}
+	}
+	
+	return \%menu;
+}
+
+		
+sub read_menu ($;$)
+{
+	my ($file, $basedir) = @_;
+
+	
+	if ($file !~ /^\// && defined $basedir) {
+		$file = "$basedir/$file";
+	}
+
+	unless (defined $basedir) {
+		$basedir = $file;
+		$basedir =~ s/\/[^\/]*$//;
+	}
+
+	unless (check_file($file)) {
+		print STDERR "WARNING: '$file' does not exist\n";
+		return ['Menu', [{}]];
+	}	
+
+	print STDERR "reading '$file'\n" if $verbose; 
+
+	my $parser = new XML::Parser(Style => 'Tree');
+	my $tree = $parser->parsefile($file);
+	
+	my $DefaultMergeDir = $file;
+	$DefaultMergeDir =~ s/^.*\///;
+	$DefaultMergeDir =~ s/\.menu$/-merged/;
+	
+	read_includes($tree, $basedir, $DefaultMergeDir);
+	
+	return $tree
+}
+
+sub read_menu_dir ($;$)
+{
+	my ($dir, $basedir) = @_;
+
+	my @out;
+	
+	if ($dir !~ /^\// && defined $basedir) {
+		$dir = "$basedir/$dir";
+	}
+
+
+	check_file($dir);
+	
+	opendir(DIR, $dir);
+
+	foreach my $entry (readdir(DIR)) {
+
+		if ( -f "$dir/$entry" && $entry =~ /\.menu$/ ) {
+			my $menu = read_menu("$dir/$entry");
+			$menu = remove_toplevel_Menu($menu);
+			push @out, @$menu;
+		}
+	}
+	closedir DIR;
+
+	return \@out;
+}
+
+sub quote_xml ($)
+{
+	my ($txt) = @_;
+	
+	$txt =~ s/&/&amp;/g;
+	$txt =~ s/</&lt;/g;
+	$txt =~ s/>/&gt;/g;
+	return $txt;
+}
+
+sub read_legacy_dir ($;$)
+{
+	my ($dir,$basedir) = @_;
+	my $out;
+
+	$dir =~ s/\/*$//;
+	
+	$basedir = $dir unless defined $basedir;
+	
+	return "" if check_file($dir) ne 'D';
+	
+	$out = "<Menu>\n";
+	
+	if ($dir eq $basedir) {
+		my $xmldir = quote_xml($dir);
+	
+		$out .= "<AppDir>$xmldir</AppDir>\n";
+		$out .= "<DirectoryDir>$xmldir</DirectoryDir>\n";
+	}
+	else {
+		my $name = $dir;
+		$name =~ s/\/*$//;
+		$name =~ s/^.*\///;
+		
+		$name = quote_xml($name); 
+		
+		$out .= "<Name>$name</Name>\n"; 
+	}
+	
+	
+	if (-f "$dir/.directory") {
+
+		my $dir_id = "$dir/.directory";
+		$dir_id =~ s/^$basedir//;
+		$dir_id =~ s/^\///;
+		$dir_id = quote_xml($dir_id);
+		
+		$out .= "<Directory>$dir_id</Directory>\n";
+	}
+
+	opendir(DIR, $dir);
+
+	foreach my $entry (readdir(DIR)) {
+
+		if ( -f "$dir/$entry" && $entry =~ /\.desktop$/ ) {
+			my $id = "$dir/$entry";
+			$id =~ s/^$basedir//;
+			$id =~ s/^\///;
+			$id =~ s/\//-/g;
+			$id = quote_xml($id);
+			
+			my $desktop = read_desktop_entry(undef, "$dir/$entry", $basedir);
+			$out .= "<Include><Filename>$id</Filename></Include>\n" unless defined $desktop->{'Categories'}
+		}
+		elsif ( -d "$dir/$entry" && $entry ne '.' && $entry ne '..' && $entry ne '.hidden') {
+			$out .= read_legacy_dir("$dir/$entry", $basedir);
+		}
+	}
+	closedir DIR;
+	$out .= "</Menu>\n";
+	return $out;
+}
+
+sub remove_toplevel_Menu ($)
+{
+	my ($tree) = @_;
+	if ($tree->[0] eq 'Menu') {
+		shift @{$tree->[1]} if (ref($tree->[1][0]) eq 'HASH');
+		return $tree->[1];
+	}
+	else {
+		print STDERR "No toplevel Menu\n";
+		exit 1 if $die_on_error;
+		return;
+	}
+}
+
+sub read_includes ($$$)
+{
+	my ($tree, $basedir, $DefaultMergeDir) = @_;
+
+	my $i = 0;
+
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'MergeFile') {
+			if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
+				my $add_tree = read_menu($tree->[$i + 1][2], $basedir);
+				$add_tree = remove_toplevel_Menu($add_tree);
+				
+				splice @$tree, $i, 2, @$add_tree;
+				
+			}
+			else {
+				print STDERR "wrong MergeFile\n";
+				exit 1 if $die_on_error;
+				$i++;
+				$i++;
+			}
+			
+		}
+		elsif ($tree->[$i] eq 'MergeDir') {
+			if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
+				
+				my $add_tree = read_menu_dir($tree->[$i + 1][2], $basedir);
+				
+				splice @$tree, $i, 2, @$add_tree;
+				
+			}
+			else {
+				print STDERR "wrong MergeFile\n";
+				exit 1 if $die_on_error;
+				$i++;
+				$i++;
+			}
+			
+		}
+		elsif ($tree->[$i] eq 'DefaultMergeDirs') {
+			my $add_tree = read_menu_dir($DefaultMergeDir, $basedir);
+			splice @$tree, $i, 2, @$add_tree;
+		}
+		elsif ($tree->[$i] eq 'LegacyDir') {
+			if (ref($tree->[$i + 1][0]) eq 'HASH' and $tree->[$i + 1][1] eq '0') {
+				
+				my $xml = read_legacy_dir($tree->[$i + 1][2]);
+				print STDERR "reading legacy directory '" . $tree->[$i + 1][2] . "'\n" if $verbose; 
+
+				my $parser = new XML::Parser(Style => 'Tree');
+				my $add_tree = $parser->parse($xml);
+				$add_tree = remove_toplevel_Menu($add_tree);
+				splice @$tree, $i, 2, @$add_tree;
+				
+			}
+			else {
+				print STDERR "wrong LegacyDir\n";
+				exit 1 if $die_on_error;
+				$i++;
+				$i++;
+			}
+			
+		}
+		elsif ($tree->[$i] eq 'KDELegacyDirs') {
+			my @out;
+			foreach my $dir (@KDELegacyDirs) {
+				my $xml = read_legacy_dir($dir);
+				print STDERR "reading legacy directory '$dir'\n" if $verbose; 
+				
+				my $parser = new XML::Parser(Style => 'Tree');
+				my $add_tree = $parser->parse($xml);
+				$add_tree = remove_toplevel_Menu($add_tree);
+				push @out, @$add_tree
+			}
+			splice @$tree, $i, 2, @out;
+		}
+		elsif ($tree->[$i] eq 'Menu') {
+			$i++;
+			read_includes($tree->[$i], $basedir, $DefaultMergeDir);
+			$i++;
+		}
+		else {
+			$i++;
+			$i++;
+		}
+	}
+}
+
+sub get_menu_name ($)
+{
+	my ($tree) = @_;
+	my $name;
+	
+	my $i = 0;
+
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Name') {
+			$i++;
+			if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
+				$name = $tree->[$i][2];
+				last;
+			}
+			else {
+				 print STDERR "wrong Name\n";
+			}
+			$i++;
+		}
+		else {
+			$i++;
+			$i++;
+		}
+	}
+	
+	unless (defined $name) {
+		print STDERR "Menu has no name element\n";
+	}
+	return $name;
+}
+
+
+sub append_menu ($$)
+{
+	my ($target, $source) = @_;
+	
+	my $i = 0;
+	
+	$i++ if (ref($source->[$i]) eq 'HASH');
+	
+	while (defined $source->[$i]) {
+		if ($source->[$i] ne 'Name') {
+			push @$target, $source->[$i];
+			push @$target, $source->[$i + 1];
+		}
+		
+		$i++;
+		$i++;
+	}
+}
+
+			
+sub merge_menus ($)
+{
+	my ($tree) = @_;
+	
+	my %used; #menu name already used
+
+	my $i = 0;
+
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Menu') {
+			my $name = get_menu_name($tree->[$i + 1]);
+			if (defined $used{$name}) { #second menu with the same name
+				my $target = $used{$name};
+				
+				append_menu($tree->[$target], $tree->[$i + 1]);
+				
+				splice @$tree, $i, 2;
+			}
+			else { # first appearance
+				$used{$name} = $i + 1;
+				$i++;
+				$i++;
+			}
+		}
+		else {
+			$i++;
+			$i++;
+		}
+	}
+
+
+	$i = 0;
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+	
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Menu') {
+			merge_menus($tree->[$i + 1]);
+		}
+		$i++;
+		$i++;
+	}
+}
+
+sub read_Move ($$)
+{
+	my ($tree, $hash) = @_;
+	
+	my $i = 0;
+	
+	my $old = '';
+	
+
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Old') {
+			$i++;
+			if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
+				$old = $tree->[$i][2];
+			}
+			else {
+				print STDERR "wrong Old\n";
+				exit 1 if $die_on_error;
+			}
+			$i++;
+		}
+		if ($tree->[$i] eq 'New') {
+			$i++;
+			if (ref($tree->[$i][0]) eq 'HASH' and $tree->[$i][1] eq '0') {
+				$hash->{$old} = $tree->[$i][2];
+			}
+			else {
+				print STDERR "wrong New\n";
+				exit 1 if $die_on_error;
+			}
+			$i++;
+		}
+		else {
+			$i++;
+			$i++;
+		}
+	}
+}
+
+sub find_menu_in_tree ($$)
+{
+	my ($path, $tree) = @_;
+	
+	my $root = $path;
+	$root =~ s/\/.*$//;
+	
+	my $subpath = $path;
+	$subpath =~ s/^[^\/]*\/*//; 	
+	
+	my $i = 0;
+
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Menu') {
+			if ($root eq get_menu_name($tree->[$i + 1])) {
+			
+				if ($subpath eq '') {
+					return { 'parent' => $tree, 'index' => $i, 'menu' => $tree->[$i + 1]}; 
+				}
+				return find_menu_in_tree($subpath, $tree->[$i + 1]);
+			}
+		}
+		
+		$i++;
+		$i++;
+	}
+	
+	return undef;
+}
+
+sub copy_menu ($$)
+{
+	my ($path, $tree) = @_;
+	
+	my $tail;
+	my $child;
+	
+	foreach my $elem (reverse split(/\//, $path)) {
+		next if $elem eq '';
+		
+		my $menu = [{}, 'Name', [{}, 0, $elem]];
+		push @$menu, ('Menu', $child) if defined $child;
+		
+		$tail = $menu unless defined $tail;
+		$child = $menu;
+	}
+	
+	append_menu($tail, $tree);
+	
+	return $child;
+}
+
+sub move_menus ($)
+{
+	my ($tree) = @_;
+
+#	print "@$tree\n";	
+	my %move;
+
+	my $i = 0;
+
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Move') {
+		
+			read_Move($tree->[$i + 1], \%move);
+			splice @$tree, $i, 2;		
+		}
+		else {
+			$i++;
+			$i++;
+		}
+	}
+
+	foreach my $source (keys %move) {
+		my $sourceinfo = find_menu_in_tree($source, $tree);
+		
+		if (defined $sourceinfo) {
+			my $target = copy_menu($move{$source}, $sourceinfo->{'menu'});
+			splice @{$sourceinfo->{'parent'}}, $sourceinfo->{'index'}, 2; 
+			push @$tree, ('Menu', $target);
+			merge_menus($tree);
+		}			
+	}
+
+	$i = 0;
+	$i++ if (ref($tree->[$i]) eq 'HASH');
+	
+	while (defined $tree->[$i]) {
+		if ($tree->[$i] eq 'Menu') {
+			move_menus($tree->[$i + 1]);
+		}
+		$i++;
+		$i++;
+	}
+}
+
+sub remove_allocated ($)
+{
+	my ($menu) = @_;
+
+
+	my $i = 0;
+	while ($i < @{$menu->{'entries'}}) {
+		my $entry = $menu->{'entries'}[$i];
+	
+		if ($entry->{type} eq 'menu') {
+			 remove_allocated($entry->{menu});
+			 $i++;
+		} 
+		elsif ($entry->{type} eq 'desktop' && 
+		       $menu->{'OnlyUnallocated'} &&
+		       $entry->{desktop}{'refcount'} > 1) {
+		       
+		        $entry->{desktop}{'refcount'}--;
+			splice @{$menu->{'entries'}}, $i, 1;
+		}
+		else {
+			$i++;
+		}
+		
+		
+	}
+	return 0;
+}
+
+
+sub remove_empty_menus ($)
+{
+	my ($menu) = @_;
+
+
+	my $i = 0;
+	while ($i < @{$menu->{'entries'}}) {
+		my $entry = $menu->{'entries'}[$i];
+	
+		if ($entry->{type} eq 'menu' && remove_empty_menus($entry->{menu})) {
+			splice @{$menu->{'entries'}}, $i, 1;
+		}
+		else {
+			$i++;
+		}
+		
+		
+	}
+	
+	return 1 if @{$menu->{'entries'}} == 0; # && $menu->{'DontShowIfEmpty'}; #menu is empty
+	
+	return 0;
+}
+
+
+sub prepare_exec ($$)
+{
+	my ($exec, $desktop) = @_;
+	
+	$exec =~ s/%f//g;
+	$exec =~ s/%F//g;
+	$exec =~ s/%u//g;
+	$exec =~ s/%U//g;
+	$exec =~ s/%d//g;
+	$exec =~ s/%D//g;
+	$exec =~ s/%n//g;
+	$exec =~ s/%N//g;
+	$exec =~ s/%i//g;
+	$exec =~ s/%k//g;
+	$exec =~ s/%v//g;
+	$exec =~ s/%m//g;
+	
+	my $caption = $desktop->{Name};
+	
+	$exec =~ s/%c/$caption/g;
+
+	$exec =~ s/%%/%/g;
+
+	$exec = "xterm -e $exec" if $desktop->{Terminal} eq '1' || $desktop->{Terminal} eq 'true';
+
+	$exec = "$root_cmd $exec" if $desktop->{'X-KDE-SubstituteUID'} eq '1' || $desktop->{'X-KDE-SubstituteUID'} eq 'true';
+	return $exec;
+}
+
+sub get_loc_entry ($$)
+{
+	my ($desktop, $entry) = @_;
+	
+	foreach my $key (@language_keys) {
+		my $loc_entry = $entry . "[$key]";
+		return $desktop->{$loc_entry} if defined $desktop->{$loc_entry} && $desktop->{$loc_entry} !~ /^\s*$/;
+	}
+	
+	return $desktop->{$entry};
+}
+
+sub preprocess_menu ($)
+{
+	# localize, sort, prepare_exec
+	my ($menu) = @_;
+	
+	return 0 if $menu->{'Deleted'};
+	return 0 unless check_show_in($menu->{'Directory'});
+	return 0 if defined $menu->{'Directory'} && $menu->{'Directory'}->{'NoDisplay'} eq 'true';
+	
+	my $menu_name = $menu->{'Name'};
+	my $menu_icon = "";
+	
+	if (defined $menu->{'Directory'}) {
+		my $directory = $menu->{'Directory'};
+		$menu_icon = $menu->{'Directory'}{'Icon'};
+		my $directory_name = get_loc_entry($directory, 'Name');
+		
+		if (defined $directory_name) {
+			Encode::from_to($directory_name, "utf8", $charset) 
+				if !defined $directory->{"Encoding"} || $directory->{"Encoding"} eq 'UTF-8';
+				
+			$menu_name = $directory_name;
+		}
+	}
+
+	$menu->{'PrepName'} = $menu_name;
+	$menu->{'PrepIcon'} = $menu_icon;
+
+	my $i = 0;
+	while (defined $menu->{'entries'}[$i]) {
+		my $entry = $menu->{'entries'}[$i];
+		if ($entry->{'type'} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{'id'};
+			
+			my $desktop_name = get_loc_entry($desktop, 'Name');
+			
+			if (defined $desktop_name) {
+				Encode::from_to($desktop_name, "utf8", $charset) 
+					if !defined $desktop->{"Encoding"} || $desktop->{"Encoding"} eq 'UTF-8';
+				
+				$name = $desktop_name;
+			} 
+			
+			$desktop->{'PrepName'} = $name;
+			$entry->{'Name'} = $name;
+			$entry->{'PrepName'} = $name;
+			
+			$desktop->{'PrepExec'} = prepare_exec($desktop->{Exec}, $desktop);
+			$i++;
+		} 
+		elsif ($entry->{type} eq 'menu') {
+			if (preprocess_menu ($entry->{'menu'})) {
+				$entry->{'Name'} = $entry->{'menu'}{'Name'};
+				$entry->{'PrepName'} = $entry->{'menu'}{'PrepName'};
+				$i++;
+			}
+			else {
+				splice @{$menu->{'entries'}}, $i, 1;
+			}
+		}
+		else {
+			print STDERR "wrong menu entry type: $entry->{type}";
+			exit 1 if $die_on_error;
+			splice @{$menu->{'entries'}}, $i, 1;			
+		}
+	}
+	
+	$menu->{'entries'} = [ sort {$b->{'type'} cmp $a->{'type'} || $a->{'PrepName'} cmp $b->{'PrepName'}} @{$menu->{'entries'}} ];
+
+	my $i = 0;
+	my $prev_entry;
+	while (defined $menu->{'entries'}[$i]) {
+		my $entry = $menu->{'entries'}[$i];
+		if (defined $prev_entry && 
+		    $entry->{'type'} eq 'desktop' &&
+		    $prev_entry->{'type'} eq 'desktop' &&
+		    $prev_entry->{'PrepName'} eq $entry->{'PrepName'} &&
+		    $prev_entry->{'desktop'}->{'PrepExec'} eq $entry->{'desktop'}->{'PrepExec'}) {
+			splice @{$menu->{'entries'}}, $i, 1;
+		}
+		else {
+			$prev_entry = $entry;
+			$i++;
+		}
+	}
+	
+	return 1;
+}
+
+sub output_twm_menu ($;$$)
+{
+	my ($menu, $toplevel, $path) = @_;
+	
+	my $output = '';
+	
+	$path = '' unless defined $path;
+	
+	$toplevel = 1 unless defined $toplevel;
+
+	my $menu_name = $menu->{'PrepName'};
+	my $menu_id = "$path-" . $menu->{'Name'};
+	$menu_id =~ s/\s/_/g;
+	
+	$menu_id = 'xdg_menu' if $toplevel;
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'menu') {
+			$output .= output_twm_menu($entry->{'menu'}, 0, $menu_id);
+		}
+	}
+
+	$output .= "menu \"$menu_id\" {\n";
+	$output .= "\"$menu_name\" f.title\n";
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{'PrepName'};
+			my $exec = $desktop->{'PrepExec'};
+			my $color = '';
+
+			$exec =~ s/"/\\"/g;
+			
+			$color = ' ("red":"grey")' if $desktop->{'X-KDE-SubstituteUID'} eq '1' || $desktop->{'X-KDE-SubstituteUID'} eq 'true';
+
+			$output .= "\"$name\"$color f.exec \"$exec&\"\n";
+		} 
+		elsif ($entry->{type} eq 'menu') {
+			my $name = $entry->{'menu'}{'PrepName'};
+			my $id = "$menu_id-" . $entry->{'menu'}{'Name'};
+
+			$id =~ s/\s/_/g;
+
+			$output .= "\"$name\" f.menu \"$id\"\n";
+		}
+		else {
+			print STDERR "wrong menu entry type: $entry->{type}";
+		}
+		
+	}
+	$output .= "}\n";
+	
+	return $output;
+}
+
+sub output_wmaker_menu ($;$)
+{
+	my ($menu, $indent) = @_;
+	
+	my $output = '';
+	
+	$indent = 0 unless defined $indent;
+
+	my $menu_name = $menu->{'PrepName'};
+	
+	$output .= ' ' x $indent;
+	$output .= "\"$menu_name\" MENU\n";
+
+	if ($indent == 0) {
+		$output .= "\n#include \"user.menu\"\n\n";
+	}
+
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{'PrepName'};
+			my $exec = $desktop->{'PrepExec'};
+			
+			$output .= ' ' x $indent;
+			$output .= " \"$name\" EXEC $exec\n";
+		} 
+		elsif ($entry->{type} eq 'menu') {
+			$output .= output_wmaker_menu ($entry->{'menu'}, $indent + 1);
+		}
+		else {
+			print STDERR "wrong menu entry type: $entry->{type}";
+		}
+		
+	}
+
+	if ($indent == 0) {
+		textdomain("menu-messages");
+
+		my $exit_msg = gettext("Exit");
+		my $restart_msg = gettext("Restart");
+		if (langinfo(CODESET) ne 'UTF-8') {
+			$exit_msg = Encode::encode_utf8($exit_msg);
+			$restart_msg = Encode::encode_utf8($restart_msg);
+		}
+		$output .= "\t\"$exit_msg\" MENU\n\t\t\"$restart_msg\"  RESTART\n\t\t\"$exit_msg\"  EXIT\n\"$exit_msg\" END\n";
+	}
+
+	$output .= ' ' x $indent;
+	$output .= "\"$menu_name\" END\n";
+	
+	return $output;
+}
+
+sub output_fvwm2_menu ($;$$)
+{
+	my ($menu, $toplevel, $path) = @_;
+	
+	my $output = '';
+	
+	$path = '' unless defined $path;
+	
+	$toplevel = 1 unless defined $toplevel;
+
+	my $menu_name = $menu->{'PrepName'};
+	my $menu_id = "$path-" . $menu->{'Name'};
+	$menu_id =~ s/\s/_/g;
+	
+	$menu_id = 'xdg_menu' if $toplevel;
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'menu') {
+			$output .= output_fvwm2_menu($entry->{'menu'}, 0, $menu_id);
+		}
+	}
+
+	$output .= "DestroyMenu \"$menu_id\"\n";
+	$output .= "AddToMenu \"$menu_id\" \"$menu_name\" Title\n";
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{'PrepName'};
+			my $exec = $desktop->{'PrepExec'};
+			
+			$output .= "+		 \"$name\" Exec $exec\n";
+		} 
+		elsif ($entry->{type} eq 'menu') {
+			my $name = $entry->{'menu'}{'PrepName'};
+			my $id = "$menu_id-" . $entry->{'menu'}{'Name'};
+			$id =~ s/\s/_/g;
+
+			$output .= "+		 \"$name\" Popup \"$id\"\n";
+		}
+		else {
+			print STDERR "wrong menu entry type: $entry->{type}";
+		}
+		
+	}
+	$output .= "\n";
+	
+	return $output;
+}
+
+sub output_blackbox_menu ($;$)
+{
+        my ($menu, $indent) = @_;
+
+        my $output = '';
+
+    $output .= "[begin] (Menu)\n";
+    $output .= "[exec] (xterm) {xterm}\n[separator]\n";
+        $output .= output_blackbox_inner_menu ($menu, $indent);
+    $output .= "[separator]\n";
+    $output .= '[config] (Configuration)
+                [workspaces] (Workspace)
+                [submenu] (System Styles) {Choose a style...}
+                        [stylesdir] (/usr/share/blackbox/styles)
+			[stylesdir] (/usr/share/fluxbox/styles)
+			[stylesdir] (/usr/share/openbox/styles)
+                [end]
+                [submenu] (User Styles) {Choose a style...}
+                        [stylesdir] (~/.blackbox/styles)
+			[stylesdir] (~/.fluxbox/styles)
+			[stylesdir] (~/.openbox/styles)
+                [end]
+        [separator]
+        [exec] (Run Command) {bbrun -a -w}
+        [exec] (Lock Screen) {xlock}
+        [restart] (Restart) {}
+        [exit] (Logout)
+[end]
+';
+    $output .= "[end]\n";
+        return $output;
+}
+
+
+sub output_blackbox_inner_menu ($;$)
+{
+	my ($menu, $indent) = @_;
+	
+	my $output = '';
+	
+	$indent = 0 unless defined $indent;
+
+	my $menu_name = $menu->{'PrepName'};
+	
+	$output .= ' ' x $indent;
+	$output .= "[submenu] ($menu_name)\n";
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{'PrepName'};
+			my $exec = $desktop->{'PrepExec'};
+			
+			$output .= ' ' x $indent;
+			$output .= "    [exec] ($name) {$exec}\n";
+		} 
+		elsif ($entry->{type} eq 'menu') {
+			$output .= output_blackbox_inner_menu ($entry->{'menu'}, $indent + 1);
+		}
+		else {
+			print STDERR "wrong menu entry type: $entry->{type}";
+		}
+		
+	}
+	$output .= ' ' x $indent;
+	$output .= "[end] # ($menu_name)\n";
+	
+	return $output;
+}
+
+sub output_icewm_menu ($;$)
+{
+	my ($menu, $indent) = @_;
+	
+	my $output = '';
+	
+	$indent = 0 unless defined $indent;
+
+	my $menu_name = $menu->{'PrepName'};
+	my $menu_icon = $menu->{'PrepIcon'} || "folder" ;
+	
+	$output .= ' ' x $indent;
+	$output .= "menu \"$menu_name\" $menu_icon.png {\n";
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{'PrepName'};
+			my $exec = $desktop->{'PrepExec'};
+			my $icon = add_png_extension_if_needed($desktop->{'Icon'});
+			
+			$output .= ' ' x $indent;
+			$output .= " prog \"$name\" $icon $exec\n";
+		} 
+		elsif ($entry->{type} eq 'menu') {
+			$output .= output_icewm_menu ($entry->{'menu'}, $indent + 1);
+		}
+		else {
+			print STDERR "wrong menu entry type: $entry->{type}";
+		}
+		
+	}
+	$output .= ' ' x $indent;
+	$output .= "}\n";
+	
+	return $output;
+}
+
+sub prepare_exec_xfce4 ($$)
+{
+	my ($exec, $desktop) = @_;
+	
+	$exec =~ s/%f//g;
+	$exec =~ s/%F//g;
+	$exec =~ s/%u//g;
+	$exec =~ s/%U//g;
+	$exec =~ s/%d//g;
+	$exec =~ s/%D//g;
+	$exec =~ s/%n//g;
+	$exec =~ s/%N//g;
+	$exec =~ s/%i//g;
+	$exec =~ s/%k//g;
+	$exec =~ s/%v//g;
+	$exec =~ s/%m//g;
+	
+	my $caption = $desktop->{Name};
+	
+	$exec =~ s/%c/$caption/g;
+
+	$exec =~ s/%%/%/g;
+	
+	$exec =~ s/\"/&quot;/g;
+
+	$exec = "$root_cmd $exec" if $desktop->{'X-KDE-SubstituteUID'} eq '1' || $desktop->{'X-KDE-SubstituteUID'} eq 'true';
+	return $exec;
+}
+
+
+
+sub output_xfce4_menu ($;$)
+{
+	my ($menu, $indent) = @_;
+	
+	my $output = '';
+	
+	$indent = 0 unless defined $indent;
+	
+	if ($indent == 0) {
+		$output .= '<?xml version="1.0" encoding="UTF-8"?>' . "\n";
+		$output .= '<!DOCTYPE xfdesktop-menu [' . "\n";
+    		$output .= '	<!ENTITY menu2 SYSTEM "menu2.xml">' . "\n";
+		$output .= ']>' . "\n\n";
+	}
+	
+	my $menu_name = $menu->{'PrepName'};
+	my $menu_ico  = $menu->{'PrepIcon'};
+	$output .= ' ' x $indent;
+	
+	if ($indent == 0) {
+		$output .= "<xfdesktop-menu>\n"
+	}
+	else {
+		$output .= "<menu name=\"" . quote_xml($menu_name) ."\" visible=\"yes\" icon=\"${menu_ico}.png \">\n";
+	}
+	
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{'PrepName'};
+			my $exec = prepare_exec_xfce4($desktop->{Exec}, $desktop);
+			my $term = ($desktop->{Terminal} eq '1' || $desktop->{Terminal} eq 'true') ? "yes" : "no";
+			my $ico = $desktop->{'Icon'};
+			$output .= ' ' x $indent;
+			$output .= " <app name=\"" . quote_xml($name) ."\" cmd=\"$exec\" icon=\"$ico\"  term=\"$term\"/>\n";
+		} 
+		elsif ($entry->{type} eq 'menu') {
+			$output .= output_xfce4_menu ($entry->{'menu'}, $indent + 1);
+		}
+		else {
+			print STDERR "wrong menu entry type: $entry->{type}";
+		}
+		
+	}
+	$output .= ' ' x $indent;
+	
+	if ($indent == 0) {
+		$output .= "</xfdesktop-menu>\n";
+	}
+	else {
+		$output .= "</menu>\n";
+	}
+	
+	return $output;
+}
+
+sub output_openbox3_menu ($;$)
+{
+        my ($menu, $indent) = @_;
+
+        my $output = '';
+
+    $output .= '<?xml version="1.0" encoding="UTF-8"?>
+
+<openbox_menu xmlns="http://openbox.org/"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://openbox.org/
+                file:///usr/share/openbox/menu.xsd">';
+    $output .= "<menu id=\"xdg\" label=\"xdg\">\n";
+        $output .= output_openbox3_inner_menu ($menu, $indent);
+    $output .= "</menu>\n";
+    $output .= '    <menu id="root-menu" label="Openbox 3">
+ <item label="xterm">
+ <action name="Execute"><execute>xterm</execute></action> </item>
+ <separator />
+ <menu id="KDE Menu" label="KDE Menu" />
+ <separator />
+ <menu id="client-list-menu" />
+ <separator />
+ <menu id="ob-menu" label="openbox3">
+     <item label="ob conf"><action name="Execute"><execute>obconf</execute></action></item>
+     <item label="reconfigure"><action name="Reconfigure" /></item>
+ </menu>
+ <separator />
+ <item label="lock screen"><action name="Execute"><execute>xlock -remote -nice 19 -mode blank -geometry 1x1 -enablesaver</execute></action></item>
+ <separator />
+ <item label="Exit"><action name="Exit" /></item>
+ </menu>';
+    $output .= "</openbox_menu>\n";
+        return $output;
+}
+
+sub output_openbox3_pipe_menu ($;$)
+{
+        my ($menu, $indent) = @_;
+
+        my $output = '';
+
+    $output .= "<openbox_pipe_menu>\n";
+        $output .= output_openbox3_inner_menu ($menu, $indent);
+    $output .= "</openbox_pipe_menu>\n";
+        return $output;
+}
+
+sub output_openbox3_inner_menu ($;$)
+{
+        my ($menu, $indent) = @_;
+
+        my $output = '';
+
+        $indent = 0 unless defined $indent;
+        my $menu_name = $menu->{'PrepName'};
+
+        $output .= ' ' x $indent;
+        $output .= "<menu id=\"" . quote_xml($menu_name) . "\" label=\"".quote_xml($menu_name) . "\">\n";
+#       $output .= "<menu label=\"".quote_xml($menu_name) . "\">\n";
+
+        foreach my $entry (@{$menu->{'entries'}}) {
+                if ($entry->{type} eq 'desktop') {
+                        my $desktop = $entry->{desktop};
+
+                        my $name = $desktop->{'PrepName'};
+                        my $exec = $desktop->{'PrepExec'};
+
+                        $output .= ' ' x $indent;
+                        $output .= "     <item label=\"". quote_xml($name)."\">\n";
+            $output .= "       <action name=\"Execute\"><execute>$exec</execute></action>\n";
+                        $output .= "     </item>\n";
+                }
+                elsif ($entry->{type} eq 'menu') {
+                        $output .= output_openbox3_inner_menu ($entry->{'menu'}, $indent + 1);
+                }
+                else {
+                        print STDERR "wrong menu entry type: $entry->{type}";
+                }
+
+        }
+        $output .= ' ' x $indent;
+        $output .= "</menu> <!-- $menu_name -->\n";
+
+        return $output;
+}
+
+
+sub output_readable ($;$)
+{
+	my ($menu, $indent) = @_;
+	
+	my $output = '';
+	
+	$indent = 0 unless defined $indent;
+
+	my $menu_name = $menu->{'Name'};
+	
+	$output .= "\t" x $indent;
+	$output .= "\"$menu_name\" MENU\n";
+	
+
+	foreach my $entry (@{$menu->{'entries'}}) {
+		if ($entry->{type} eq 'desktop') {
+			my $desktop = $entry->{desktop};
+			
+			my $name = $desktop->{Name};
+
+			$output .= "\t" x $indent;
+			$output .= "\t\"$name\"\n";
+			
+			
+			my @v = %$desktop;
+			$output .= "@v\n" if $name  eq '';
+		} 
+		elsif ($entry->{type} eq 'menu') {
+			$output .= output_readable ($entry->{menu}, $indent + 1);
+		}
+		else {
+			print STDERR "wrong menu entry type: $entry->{type}";
+		}
+		
+	}
+	
+	return $output;
+}
+
+sub get_root_menu
+{
+	foreach my $dir (split(/:/, $ENV{XDG_CONFIG_DIRS}), "/etc/xdg") {
+		check_file("$dir/menus/applications.menu");
+		return "$dir/menus/applications.menu" if -f "$dir/menus/applications.menu";
+	}
+	return "";
+}
+
+sub get_app_dirs 
+{
+	my %used;
+	my $ret = '';
+	my @kde_xdgdata = split(/:/, `kde-config --path xdgdata-apps`);
+	
+	foreach $_ (@kde_xdgdata) {
+	    s/\/applications\/*\s*$//;
+	};
+	
+	foreach my $d (split(/:/, $ENV{XDG_DATA_DIRS}), @kde_xdgdata, "/usr/share", "/opt/gnome/share") {
+		my $dir = $d;
+		$dir =~ s/\/*$//;
+		next if defined $used{$dir};
+		next if check_file("$dir/applications") ne 'D';
+		$ret .= ':' if $ret ne '';
+		$ret .= "$dir/applications";
+		$used{$dir} = 1;
+	}
+	return $ret;
+}
+
+sub get_desktop_dirs 
+{
+	my %used;
+	my $ret = '';
+	foreach my $dir (split(/:/, $ENV{XDG_DATA_DIRS}), "/usr/share", "/opt/kde3/share", "/opt/gnome/share") {
+		next if defined $used{$dir};
+		next if check_file("$dir/desktop-directories") ne 'D';
+		$ret .= ':' if $ret ne '';
+		$ret .= "$dir/desktop-directories";
+		$used{$dir} = 1;
+	}
+	return $ret;
+}
+
+sub get_KDE_legacy_dirs 
+{
+	my %used;
+	my @ret;
+	foreach my $d ("/etc/opt/kde3/share/applnk", "/opt/kde3/share/applnk", reverse(split(/:/, `kde-config --path apps`))) {
+		my $dir = $d;
+		chomp $dir;
+		$dir =~ s/\/*$//;
+		next if defined $used{$dir};
+		next if check_file("$dir") ne 'D';
+		$used{$dir} = 1;
+		push @ret, $dir;
+	}
+	return @ret;
+}
+
+sub prepare_language_keys ($)
+{
+	my ($language) = @_;
+	
+	my @keys;
+
+	$language =~ s/\.[^@]*//;  # remove .ENCODING
+
+	if ($language =~ /^([^_]*)_([^@]*)@(.*)$/) { # LANG_COUNTRY@MODIFIER
+		push @keys, $1 . '_' . $2 . '@' . $3;
+		push @keys, $1 . '_' . $2;
+		push @keys, $1 . '@' . $3;
+		push @keys, $1;
+	}
+	elsif ($language =~ /^([^_]*)_([^@]*)$/) { # LANG_COUNTRY
+		push @keys, $1 . '_' . $2;
+		push @keys, $1;
+	}
+	elsif ($language =~ /^([^_]*)@(.*)$/) { # LANG@MODIFIER
+		push @keys, $1 . '@' . $2;
+		push @keys, $1;
+	}
+	elsif ($language =~ /^([^_@]*)$/) { # LANG
+		push @keys, $1;
+	}
+	
+	return @keys;
+}
+
+sub check_cache
+{
+	my $cachedir = $ENV{HOME};
+	
+	return unless -d $cachedir;
+	
+	$cachedir .= "/.xdg_menu_cache";
+
+	return unless -f "$cachedir/inputs" && -f "$cachedir/output";
+	
+	my @st = stat "$cachedir/output";
+	my $ref_time = $st[10]; #ctime
+
+	open(FILE, "<$cachedir/inputs");
+	
+	my $num_opts = 0;
+	
+	while (<FILE>) {
+		chomp;
+		next if /^\s*$/;
+		next if /^#/;
+		
+		if (/^[FD] (.*)$/) {
+			my $file = $1;
+			my @st = stat $file;
+			my $time = $st[10]; #ctime
+			
+			if (!defined $time || $time >= $ref_time) {
+#				print STDERR "$file: is newer\n";
+				return;
+			}
+		}
+		elsif (/^X (.*)$/) {
+			my $file = $1;
+			
+			if (-e $file) {
+#				print STDERR "$file: exists\n";
+				return;
+			}
+		}
+		elsif (/^ENV ([^ ]+) (.*)$/) {
+			my $var = $1;
+			my $val = $2;
+			
+			if ($ENV{$var} ne $val) {
+#				print STDERR "$var: differs\n";
+				return;
+			}
+		}
+		elsif (/^OPT ([0-9]+) (.*)$/) {
+			my $optidx = $1;
+			my $val = $2;
+			
+			$num_opts ++;
+			if ($save_ARGV[$optidx] ne $val) {
+#				print STDERR "$optidx: differs\n";
+				return;
+			}
+		}
+		elsif (/^CHARSET (.*)$/) {
+			my $charset = $1;
+			
+			if ($charset ne langinfo(CODESET)) {
+#				print STDERR "charset $charset differs\n";
+				return;
+			}
+		}
+		elsif (/^LANGUAGE (.*)$/) {
+			my $language = $1;
+			
+			if ($language ne setlocale(LC_MESSAGES)) {
+#				print STDERR "language $language differs\n";
+				return;
+			}
+		}
+		elsif (/^VERSION (.*)$/) {
+			my $v = $1;
+			
+			if ($v ne $Version) {
+#				print STDERR "Version differs\n";
+				return;
+			}
+		}
+		else {
+			print STDERR "Wrong cache inputs list\n";
+			return;
+		}
+		
+		
+	}
+	
+	return if $num_opts != @save_ARGV;
+	
+	open(FILE, "<$cachedir/output") or return;
+
+	print STDERR "Using cached output\n" if $verbose;
+
+	my $buf;
+	while(read(FILE, $buf, 4096)) {
+		print $buf;
+	}
+	close(FILE);	
+	
+	exit 0;
+}
+
+sub write_cache ($)
+{
+	my ($output) = @_;
+
+	my $cachedir = $ENV{HOME};
+	
+	return unless -d $cachedir;
+	
+	$cachedir .= "/.xdg_menu_cache";
+
+	mkdir $cachedir;
+	unlink "$cachedir/output";
+	
+	open(FILE, ">$cachedir/inputs") or return;
+	print FILE "# this file contains list of inputs xdg_menu\n";
+	print FILE "VERSION $Version\n";
+	print FILE "\n\n";
+	print FILE join("\n",  @accessed_files);
+	print FILE "\n\n";
+	
+	for (my $i = 0; $i < @save_ARGV; $i++) {
+		print FILE "OPT $i $save_ARGV[$i]\n";
+	}
+
+	print FILE "ENV XDG_CONFIG_DIRS $ENV{XDG_CONFIG_DIRS}\n";
+	print FILE "ENV XDG_DATA_DIRS $ENV{XDG_DATA_DIRS}\n";
+
+	print FILE "CHARSET " . langinfo(CODESET) . "\n";
+	print FILE "LANGUAGE " . setlocale(LC_MESSAGES) . "\n";
+	
+	close(FILE);
+	open(FILE, ">$cachedir/output") or return;
+	print FILE $output;
+	close(FILE);
+}
+
+
+check_cache();
+
+use XML::Parser;
+
+$DefaultAppDirs = get_app_dirs();
+$DefaultDirectoryDirs = get_desktop_dirs();
+
+my $root_menu = get_root_menu();
+
+@KDELegacyDirs = get_KDE_legacy_dirs();
+
+$charset = langinfo(CODESET);
+$language = setlocale(LC_MESSAGES);
+
+$root_cmd = "/opt/gnome/bin/gnomesu" if -x '/opt/gnome/bin/gnomesu';
+$root_cmd = "/opt/kde3/bin/kdesu" if -x '/opt/kde3/bin/kdesu';
+
+my $help;
+
+GetOptions("format=s" => \$format,
+	   "fullmenu" => \$fullmenu,
+	   "desktop=s" => \$desktop_name,
+	   "charset=s" => \$charset,
+	   "language=s" => \$language,
+	   "root-menu=s" => \$root_menu,
+	   "die-on-error" => \$die_on_error,
+	   "verbose" => \$verbose,
+	   "help" => \$help
+	   );
+
+@language_keys = prepare_language_keys($language);
+
+$desktop_name = $format unless defined $desktop_name;
+
+if ($help) {
+	print <<"EOF"; 
+
+xdg-menu - XDG menus for WindowMaker and other window managers
+           http://freedesktop.org/Standards/menu-spec
+
+
+Usage:
+	xdg_menu [--format <format>] [--desktop <desktop>] 
+	         [--charset <charset>] [--language <language>]  
+		 [--root-menu <root-menu>] [--die-on-error]
+		 [--fullmenu] [--help]
+		 
+		format - output format
+		         possible formats: WindowMaker, fvwm2, icewm,
+		                           blackbox, fluxbox, openbox, 
+					   xfce4, openbox3, openbox3-pipe,
+					   mwm, readable
+			 default: WindowMaker
+		
+	 	fullmenu  - output a full menu and not only a submenu
+
+		desktop - desktop name for NotShowIn and OnlyShowIn
+			 default: the same as format
+			 
+		charset - output charset
+			 default: $charset
+			 
+		language - output language
+			 default: $language
+			 
+		root-menu - location of root menu file
+			 default: $root_menu
+			 
+		die-on-error - abort execution on any error, 
+			 default: try to continue
+
+		verbose - print debugging information
+			 
+		help - print this text
+
+EOF
+	exit 0;
+}
+
+
+unless ( -f $root_menu) {
+	print STDERR "Can't find root menu file.\n";
+	exit 1;
+}
+	      
+my $tree = read_menu($root_menu);
+
+merge_menus($tree);
+move_menus($tree);
+
+my $menu = interpret_root($tree, '');
+
+remove_allocated($menu);
+preprocess_menu($menu);
+remove_empty_menus($menu);
+
+my $output;
+
+if ($format eq 'WindowMaker') {
+
+	$output = output_wmaker_menu($menu) 
+}
+elsif ($format eq 'fvwm2') {
+
+	$output = output_fvwm2_menu($menu) 
+}
+elsif ($format eq 'icewm') {
+	foreach my $entry (@{$menu->{'entries'}}) {
+	
+	 	if ($entry->{type} eq 'menu') {
+				$output .= output_icewm_menu ($entry->{'menu'});
+		}
+	}
+}
+elsif ($format eq 'xfce4') {
+
+        $output = output_xfce4_menu($menu)
+}
+elsif ($format eq 'blackbox' || ($format eq 'openbox') || ($format eq 'fluxbox') ) {
+  	if ($fullmenu) {
+        $output = output_blackbox_menu($menu) 
+	}
+	else
+	{
+	$output = output_blackbox_inner_menu($menu)
+	}
+}
+elsif ($format eq 'openbox3') {
+        if ($fullmenu) {
+        $output = output_openbox3_menu($menu)
+        }
+        else
+        {
+        $output = output_openbox3_inner_menu($menu)
+        }
+}
+elsif ($format eq 'openbox3-pipe') {
+
+        $output = output_openbox3_pipe_menu($menu)
+}
+elsif ($format eq 'twm') {
+
+	print STDERR "WARNING: twm does not support umlauts. Parameter --language '' to output plain ASCII.\n" unless $language eq '';
+        $output = output_twm_menu($menu)
+}
+elsif ($format eq 'mwm') {
+
+        $output = output_twm_menu($menu)
+}
+elsif ($format eq 'readable') {
+
+	$output = output_readable($menu) 
+}
+else
+{
+	print STDERR "Unknown format $format\n";
+	exit 1;
+}
+
+print $output;
+write_cache($output);
+
+exit 0;
+
diff --git a/trunk/sbin/chksession b/trunk/sbin/chksession
new file mode 100644
index 0000000..2d68860
--- /dev/null
+++ b/trunk/sbin/chksession
@@ -0,0 +1,160 @@
+#!/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,  --kdm:   Produce window-managers list for kdm 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=/etc/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 (/^--kdmsess/ || /^-k/) {
+    $kdm++;
+  } 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 ($kdm) {
+    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/X11R6/bin/icewm' ) {
+		print "icewm\n";
+	} elsif ( -x '/usr/X11R6/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/trunk/sbin/convertsession b/trunk/sbin/convertsession
new file mode 100644
index 0000000..05ea57e
--- /dev/null
+++ b/trunk/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/trunk/sbin/fndSession b/trunk/sbin/fndSession
new file mode 100755
index 0000000..e6f6b44
--- /dev/null
+++ b/trunk/sbin/fndSession
@@ -0,0 +1,23 @@
+#!/bin/sh
+#---------------------------------------------------------------
+# Project         : Mandriva Linux
+# Module          : sbin
+# File            : fndSession
+# Version         : $Id$
+# Author          : Frederic Lepied
+# Created On      : Mon May 30 10:43:12 2005
+# Purpose         : find sessions for display managers
+#---------------------------------------------------------------
+
+umask 022
+
+for f in /etc/X11/dm.d/*.conf; 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/trunk/sbin/kdeDesktopCleanup b/trunk/sbin/kdeDesktopCleanup
new file mode 100755
index 0000000..323dcc5
--- /dev/null
+++ b/trunk/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/trunk/screensavers/01.png b/trunk/screensavers/01.png
new file mode 100644
index 0000000..e206110
--- /dev/null
+++ b/trunk/screensavers/01.png
diff --git a/trunk/screensavers/02.png b/trunk/screensavers/02.png
new file mode 100644
index 0000000..b81f530
--- /dev/null
+++ b/trunk/screensavers/02.png
diff --git a/trunk/screensavers/03.png b/trunk/screensavers/03.png
new file mode 100644
index 0000000..16feeeb
--- /dev/null
+++ b/trunk/screensavers/03.png
diff --git a/trunk/screensavers/04.png b/trunk/screensavers/04.png
new file mode 100644
index 0000000..0fead7d
--- /dev/null
+++ b/trunk/screensavers/04.png
diff --git a/trunk/screensavers/05.png b/trunk/screensavers/05.png
new file mode 100644
index 0000000..bd4a89b
--- /dev/null
+++ b/trunk/screensavers/05.png
diff --git a/trunk/screensavers/06.png b/trunk/screensavers/06.png
new file mode 100644
index 0000000..774fc81
--- /dev/null
+++ b/trunk/screensavers/06.png
diff --git a/trunk/screensavers/07.png b/trunk/screensavers/07.png
new file mode 100644
index 0000000..66e0e36
--- /dev/null
+++ b/trunk/screensavers/07.png
diff --git a/trunk/screensavers/08.png b/trunk/screensavers/08.png
new file mode 100644
index 0000000..b506f28
--- /dev/null
+++ b/trunk/screensavers/08.png
diff --git a/trunk/screensavers/09.png b/trunk/screensavers/09.png
new file mode 100644
index 0000000..8df966a
--- /dev/null
+++ b/trunk/screensavers/09.png
diff --git a/trunk/screensavers/1.png b/trunk/screensavers/1.png
new file mode 100644
index 0000000..29e36a5
--- /dev/null
+++ b/trunk/screensavers/1.png
diff --git a/trunk/screensavers/10.png b/trunk/screensavers/10.png
new file mode 100644
index 0000000..601814a
--- /dev/null
+++ b/trunk/screensavers/10.png
diff --git a/trunk/screensavers/11.png b/trunk/screensavers/11.png
new file mode 100644
index 0000000..1a8bc6b
--- /dev/null
+++ b/trunk/screensavers/11.png
diff --git a/trunk/screensavers/12.png b/trunk/screensavers/12.png
new file mode 100644
index 0000000..bbd3f42
--- /dev/null
+++ b/trunk/screensavers/12.png
diff --git a/trunk/screensavers/13.png b/trunk/screensavers/13.png
new file mode 100644
index 0000000..354a6fe
--- /dev/null
+++ b/trunk/screensavers/13.png
diff --git a/trunk/screensavers/14.png b/trunk/screensavers/14.png
new file mode 100644
index 0000000..d7725bc
--- /dev/null
+++ b/trunk/screensavers/14.png
diff --git a/trunk/screensavers/15.png b/trunk/screensavers/15.png
new file mode 100644
index 0000000..1e76b14
--- /dev/null
+++ b/trunk/screensavers/15.png
diff --git a/trunk/screensavers/16.png b/trunk/screensavers/16.png
new file mode 100644
index 0000000..66317f2
--- /dev/null
+++ b/trunk/screensavers/16.png
diff --git a/trunk/screensavers/17.png b/trunk/screensavers/17.png
new file mode 100644
index 0000000..8b66ce2
--- /dev/null
+++ b/trunk/screensavers/17.png
diff --git a/trunk/screensavers/18.png b/trunk/screensavers/18.png
new file mode 100644
index 0000000..3e11a90
--- /dev/null
+++ b/trunk/screensavers/18.png
diff --git a/trunk/screensavers/19.png b/trunk/screensavers/19.png
new file mode 100644
index 0000000..58840fa
--- /dev/null
+++ b/trunk/screensavers/19.png
diff --git a/trunk/screensavers/2.png b/trunk/screensavers/2.png
new file mode 100644
index 0000000..1f1b809
--- /dev/null
+++ b/trunk/screensavers/2.png
diff --git a/trunk/screensavers/20.png b/trunk/screensavers/20.png
new file mode 100644
index 0000000..72a3884
--- /dev/null
+++ b/trunk/screensavers/20.png
diff --git a/trunk/screensavers/21.png b/trunk/screensavers/21.png
new file mode 100644
index 0000000..b8088de
--- /dev/null
+++ b/trunk/screensavers/21.png
diff --git a/trunk/screensavers/22.png b/trunk/screensavers/22.png
new file mode 100644
index 0000000..0bf8852
--- /dev/null
+++ b/trunk/screensavers/22.png
diff --git a/trunk/screensavers/23.png b/trunk/screensavers/23.png
new file mode 100644
index 0000000..05e7e4f
--- /dev/null
+++ b/trunk/screensavers/23.png
diff --git a/trunk/screensavers/24.png b/trunk/screensavers/24.png
new file mode 100644
index 0000000..01b58f4
--- /dev/null
+++ b/trunk/screensavers/24.png
diff --git a/trunk/screensavers/25.png b/trunk/screensavers/25.png
new file mode 100644
index 0000000..65a77c5
--- /dev/null
+++ b/trunk/screensavers/25.png
diff --git a/trunk/screensavers/26.png b/trunk/screensavers/26.png
new file mode 100644
index 0000000..4f3a3fd
--- /dev/null
+++ b/trunk/screensavers/26.png
diff --git a/trunk/screensavers/27.png b/trunk/screensavers/27.png
new file mode 100644
index 0000000..8c2e689
--- /dev/null
+++ b/trunk/screensavers/27.png
diff --git a/trunk/screensavers/3.png b/trunk/screensavers/3.png
new file mode 100644
index 0000000..4e1651a
--- /dev/null
+++ b/trunk/screensavers/3.png
diff --git a/trunk/screensavers/4.png b/trunk/screensavers/4.png
new file mode 100644
index 0000000..e5a01d5
--- /dev/null
+++ b/trunk/screensavers/4.png
diff --git a/trunk/screensavers/5.png b/trunk/screensavers/5.png
new file mode 100644
index 0000000..e1520b5
--- /dev/null
+++ b/trunk/screensavers/5.png
diff --git a/trunk/screensavers/6.png b/trunk/screensavers/6.png
new file mode 100644
index 0000000..f15fd78
--- /dev/null
+++ b/trunk/screensavers/6.png
diff --git a/trunk/screensavers/7.png b/trunk/screensavers/7.png
new file mode 100644
index 0000000..7eceb90
--- /dev/null
+++ b/trunk/screensavers/7.png
diff --git a/trunk/screensavers/8.png b/trunk/screensavers/8.png
new file mode 100644
index 0000000..6a05b06
--- /dev/null
+++ b/trunk/screensavers/8.png
diff --git a/trunk/screensavers/9.png b/trunk/screensavers/9.png
new file mode 100644
index 0000000..fb66a36
--- /dev/null
+++ b/trunk/screensavers/9.png
diff --git a/trunk/xinit.d/desktop-directories b/trunk/xinit.d/desktop-directories
new file mode 100755
index 0000000..ffe7512
--- /dev/null
+++ b/trunk/xinit.d/desktop-directories
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+MDK_FOLDERS="$HOME/.mdk-folders"
+
+if [ "$UID" != "0" -a ! -e $MDK_FOLDERS ]; then
+. /etc/profile.d/10lang.sh
+   locale=C
+   if [ ! -z "$LC_ALL" ]; then
+        locale=$LC_ALL
+   elif [ ! -z "$LC_CTYPE" ]; then
+        locale=$LC_CTYPE
+   elif [ ! -z "$LANG" ]; then
+        locale=$LANG
+   fi
+   CHARSET=`locale charmap`
+
+   [ -d $MDK_FOLDERS ] || mkdir -p "$MDK_FOLDERS"
+
+    for file in /usr/share/mdk/menu/*-mdk.desktop.template ; do
+	    TARGET_DIR=`grep -m1 -F Name[$locale]= $file | sed -e 's|.*=||g'`
+	    if [ -z "$TARGET_DIR" ]; then
+		locale=`echo $locale | sed -e 's/_.*//g' -e 's/@.*//g'`
+	    	TARGET_DIR=`grep -m1 -F Name[$locale]= $file | sed -e 's|.*=||g'`
+	    fi
+
+	    if [ -z "$TARGET_DIR" ]; then
+	    	TARGET_DIR=`grep -m1 -F Name= $file | sed -e 's|.*=||g'`
+	    fi
+
+	    if [ "$CHARSET" != "UTF-8" ]; then
+		    TARGET_DIR=`echo $TARGET_DIR | iconv -f UTF-8 -t "$CHARSET" 2>/dev/null`
+	    fi
+
+
+	    DIRECTORY_PATH="$HOME/$TARGET_DIR"
+	    [ -d "$DIRECTORY_PATH" ] || mkdir -p "$DIRECTORY_PATH"
+	    echo -e [Desktop Entry]\\nHidden=true\\n`grep Icon= $file` > "$DIRECTORY_PATH/.directory"
+
+	    FILE_PATH=$MDK_FOLDERS/`basename $file .template`
+	    SYMLINK=$MDK_FOLDERS/`basename $file -mdk.desktop.template`
+
+	    ln -f -s "$DIRECTORY_PATH" $SYMLINK
+
+	    if [ "$CHARSET" != "UTF-8" ]; then
+		    DIRECTORY_PATH=`echo $DIRECTORY_PATH | iconv -f "$CHARSET" -t UTF-8 2>/dev/null`
+	    fi
+	    [ -f $FILE_PATH ] || cat $file | sed -e "s|\$HOME.*|$DIRECTORY_PATH|g" > $FILE_PATH
+	    echo "file://$FILE_PATH" >> $HOME/.gtk-bookmarks
+    done
+fi
+
diff --git a/trunk/xinit.d/menu b/trunk/xinit.d/menu
new file mode 100755
index 0000000..41b8c99
--- /dev/null
+++ b/trunk/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