New menu

92 files changed, 8 insertions, 213 deletions

diff --git a/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in b/menu/desktop-directories/mandriva-accessibility.directory.in
index f43220c..f43220c 100644
--- a/menu/desktop-directories/mandriva-moreapplications-accessibility.directory.in
+++ b/menu/desktop-directories/mandriva-accessibility.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-databases.directory.in b/menu/desktop-directories/mandriva-development-databases.directory.in
index 53be655..53be655 100644
--- a/menu/desktop-directories/mandriva-moreapplications-databases.directory.in
+++ b/menu/desktop-directories/mandriva-development-databases.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in b/menu/desktop-directories/mandriva-development-developmentenvironments.directory.in
index dd6b40e..dd6b40e 100644
--- a/menu/desktop-directories/mandriva-moreapplications-development-developmentenvironments.directory.in
+++ b/menu/desktop-directories/mandriva-development-developmentenvironments.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in b/menu/desktop-directories/mandriva-development-tools.directory.in
index df038a7..df038a7 100644
--- a/menu/desktop-directories/mandriva-moreapplications-development-tools.directory.in
+++ b/menu/desktop-directories/mandriva-development-tools.directory.in
diff --git a/menu/desktop-directories/mandriva-internet-webeditors.directory.in b/menu/desktop-directories/mandriva-development-webdevelopment.directory.in
index 1930c53..477debd 100644
--- a/menu/desktop-directories/mandriva-internet-webeditors.directory.in
+++ b/menu/desktop-directories/mandriva-development-webdevelopment.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Directory
 Encoding=UTF-8
-_Name=Web Editors
+_Name=Web Development
 Icon=web_editors_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development.directory.in b/menu/desktop-directories/mandriva-development.directory.in
index 410858c..410858c 100644
--- a/menu/desktop-directories/mandriva-moreapplications-development.directory.in
+++ b/menu/desktop-directories/mandriva-development.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in b/menu/desktop-directories/mandriva-documentation.directory.in
index c4e892d..c4e892d 100644
--- a/menu/desktop-directories/mandriva-moreapplications-documentation.directory.in
+++ b/menu/desktop-directories/mandriva-documentation.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in b/menu/desktop-directories/mandriva-education-economy.directory.in
index 582e3c5..582e3c5 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education-economy.directory.in
+++ b/menu/desktop-directories/mandriva-education-economy.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in b/menu/desktop-directories/mandriva-education-geography.directory.in
index 738fd42..738fd42 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education-geography.directory.in
+++ b/menu/desktop-directories/mandriva-education-geography.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in b/menu/desktop-directories/mandriva-education-history.directory.in
index 80b37e1..80b37e1 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education-history.directory.in
+++ b/menu/desktop-directories/mandriva-education-history.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in b/menu/desktop-directories/mandriva-education-languages.directory.in
index c8ad555..c8ad555 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education-languages.directory.in
+++ b/menu/desktop-directories/mandriva-education-languages.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in b/menu/desktop-directories/mandriva-education-literature.directory.in
index 8643eb9..8643eb9 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education-literature.directory.in
+++ b/menu/desktop-directories/mandriva-education-literature.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in b/menu/desktop-directories/mandriva-education-other.directory.in
index 18dc436..18dc436 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education-other.directory.in
+++ b/menu/desktop-directories/mandriva-education-other.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in b/menu/desktop-directories/mandriva-education-sciences.directory.in
index b8c71b7..b8c71b7 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education-sciences.directory.in
+++ b/menu/desktop-directories/mandriva-education-sciences.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in b/menu/desktop-directories/mandriva-education-sports.directory.in
index 877f2bc..877f2bc 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education-sports.directory.in
+++ b/menu/desktop-directories/mandriva-education-sports.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-education.directory.in b/menu/desktop-directories/mandriva-education.directory.in
index edca46a..edca46a 100644
--- a/menu/desktop-directories/mandriva-moreapplications-education.directory.in
+++ b/menu/desktop-directories/mandriva-education.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in b/menu/desktop-directories/mandriva-emulators.directory.in
index 273fdab..273fdab 100644
--- a/menu/desktop-directories/mandriva-moreapplications-emulators.directory.in
+++ b/menu/desktop-directories/mandriva-emulators.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in b/menu/desktop-directories/mandriva-games-adventure.directory.in
index 2aa1562..2aa1562 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-adventure.directory.in
+++ b/menu/desktop-directories/mandriva-games-adventure.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in b/menu/desktop-directories/mandriva-games-arcade.directory.in
index c1b0e90..c1b0e90 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-arcade.directory.in
+++ b/menu/desktop-directories/mandriva-games-arcade.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in b/menu/desktop-directories/mandriva-games-boards.directory.in
index 18954fa..18954fa 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-boards.directory.in
+++ b/menu/desktop-directories/mandriva-games-boards.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in b/menu/desktop-directories/mandriva-games-cards.directory.in
index 2ac788f..2ac788f 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-cards.directory.in
+++ b/menu/desktop-directories/mandriva-games-cards.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in b/menu/desktop-directories/mandriva-games-other.directory.in
index 39f3a69..39f3a69 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-other.directory.in
+++ b/menu/desktop-directories/mandriva-games-other.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in b/menu/desktop-directories/mandriva-games-puzzles.directory.in
index 8ce0de8..8ce0de8 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-puzzles.directory.in
+++ b/menu/desktop-directories/mandriva-games-puzzles.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in b/menu/desktop-directories/mandriva-games-sports.directory.in
index abf35c7..abf35c7 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-sports.directory.in
+++ b/menu/desktop-directories/mandriva-games-sports.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in b/menu/desktop-directories/mandriva-games-strategy.directory.in
index e034101..e034101 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-strategy.directory.in
+++ b/menu/desktop-directories/mandriva-games-strategy.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in b/menu/desktop-directories/mandriva-games-toys.directory.in
index 6565d42..6565d42 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games-toys.directory.in
+++ b/menu/desktop-directories/mandriva-games-toys.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-games.directory.in b/menu/desktop-directories/mandriva-games.directory.in
index 018fb82..018fb82 100644
--- a/menu/desktop-directories/mandriva-moreapplications-games.directory.in
+++ b/menu/desktop-directories/mandriva-games.directory.in
diff --git a/menu/desktop-directories/mandriva-multimedia-graphics.directory.in b/menu/desktop-directories/mandriva-graphics.directory.in
index 5dfcef9..5dfcef9 100644
--- a/menu/desktop-directories/mandriva-multimedia-graphics.directory.in
+++ b/menu/desktop-directories/mandriva-graphics.directory.in
diff --git a/menu/desktop-directories/mandriva-internet-chat.directory.in b/menu/desktop-directories/mandriva-internet-chat.directory.in
deleted file mode 100644
index a38ac09..0000000
--- a/menu/desktop-directories/mandriva-internet-chat.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Chat
-Icon=chat_section
diff --git a/menu/desktop-directories/mandriva-internet-filetransfer.directory.in b/menu/desktop-directories/mandriva-internet-filetransfer.directory.in
deleted file mode 100644
index 241d150..0000000
--- a/menu/desktop-directories/mandriva-internet-filetransfer.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=File Transfer
-Icon=file_transfer_section
diff --git a/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in b/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
deleted file mode 100644
index 543bf14..0000000
--- a/menu/desktop-directories/mandriva-internet-instantmessaging.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Instant Messaging
-Icon=instant_messaging_section
diff --git a/menu/desktop-directories/mandriva-internet-mail.directory.in b/menu/desktop-directories/mandriva-internet-mail.directory.in
deleted file mode 100644
index 2370cf1..0000000
--- a/menu/desktop-directories/mandriva-internet-mail.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Mail
-Icon=mail_section
diff --git a/menu/desktop-directories/mandriva-internet-other.directory.in b/menu/desktop-directories/mandriva-internet-more.directory.in
index f79943a..d8c7289 100644
--- a/menu/desktop-directories/mandriva-internet-other.directory.in
+++ b/menu/desktop-directories/mandriva-internet-more.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Directory
 Encoding=UTF-8
-_Name=Other
+_Name=More
 Icon=other_networking
diff --git a/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in b/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
deleted file mode 100644
index ccfc817..0000000
--- a/menu/desktop-directories/mandriva-internet-remoteaccess.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Remote Access
-Icon=remote_access_section
diff --git a/menu/desktop-directories/mandriva-internet-videoconference.directory.in b/menu/desktop-directories/mandriva-internet-videoconference.directory.in
deleted file mode 100644
index 3aa8bed..0000000
--- a/menu/desktop-directories/mandriva-internet-videoconference.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Video Conference
-Icon=video_conferences_section
diff --git a/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in b/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
deleted file mode 100644
index 712821a..0000000
--- a/menu/desktop-directories/mandriva-internet-webbrowsers.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Web Browsers
-Icon=web_browser_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in b/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
deleted file mode 100644
index c03f2b7..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-development-interpreters.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Interpreters
-Icon=interpreters_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in b/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
deleted file mode 100644
index f7a909b..0000000
--- a/menu/desktop-directories/mandriva-moreapplications-development-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=development_section
diff --git a/menu/desktop-directories/mandriva-multimedia-sound.directory.in b/menu/desktop-directories/mandriva-multimedia-sound.directory.in
deleted file mode 100644
index b0206ed..0000000
--- a/menu/desktop-directories/mandriva-multimedia-sound.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Sound
-Icon=sound_section
diff --git a/menu/desktop-directories/mandriva-multimedia-video.directory.in b/menu/desktop-directories/mandriva-multimedia-video.directory.in
deleted file mode 100644
index 5ba7030..0000000
--- a/menu/desktop-directories/mandriva-multimedia-video.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Video
-Icon=video_section
diff --git a/menu/desktop-directories/mandriva-office-accessories.directory.in b/menu/desktop-directories/mandriva-office-accessories.directory.in
deleted file mode 100644
index 4b4b8f8..0000000
--- a/menu/desktop-directories/mandriva-office-accessories.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Accessories
-Icon=office_accessories_section
diff --git a/menu/desktop-directories/mandriva-office-addressbooks.directory.in b/menu/desktop-directories/mandriva-office-addressbooks.directory.in
deleted file mode 100644
index e4efce6..0000000
--- a/menu/desktop-directories/mandriva-office-addressbooks.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Address Books
-Icon=addressbook_section
diff --git a/menu/desktop-directories/mandriva-office-communications-fax.directory.in b/menu/desktop-directories/mandriva-office-communications-fax.directory.in
deleted file mode 100644
index b40260d..0000000
--- a/menu/desktop-directories/mandriva-office-communications-fax.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Fax
-Icon=communications_fax_section
diff --git a/menu/desktop-directories/mandriva-office-communications-other.directory.in b/menu/desktop-directories/mandriva-office-communications-other.directory.in
deleted file mode 100644
index cb4e4af..0000000
--- a/menu/desktop-directories/mandriva-office-communications-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=communications_other_section
diff --git a/menu/desktop-directories/mandriva-office-communications-pda.directory.in b/menu/desktop-directories/mandriva-office-communications-pda.directory.in
deleted file mode 100644
index c513475..0000000
--- a/menu/desktop-directories/mandriva-office-communications-pda.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=PDA
-Icon=pda_section
diff --git a/menu/desktop-directories/mandriva-office-communications-phone.directory.in b/menu/desktop-directories/mandriva-office-communications-phone.directory.in
deleted file mode 100644
index c85e2a6..0000000
--- a/menu/desktop-directories/mandriva-office-communications-phone.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Phone
-Icon=communications_phone_section
diff --git a/menu/desktop-directories/mandriva-office-communications.directory.in b/menu/desktop-directories/mandriva-office-communications.directory.in
deleted file mode 100644
index a52c0ba..0000000
--- a/menu/desktop-directories/mandriva-office-communications.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Communications
-Icon=communications_section
diff --git a/menu/desktop-directories/mandriva-office-drawing.directory.in b/menu/desktop-directories/mandriva-office-drawing.directory.in
deleted file mode 100644
index e5e6736..0000000
--- a/menu/desktop-directories/mandriva-office-drawing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Drawing
-Icon=office_drawing_section
diff --git a/menu/desktop-directories/mandriva-office-graphs.directory.in b/menu/desktop-directories/mandriva-office-graphs.directory.in
deleted file mode 100644
index e0c5d5d..0000000
--- a/menu/desktop-directories/mandriva-office-graphs.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Graphs
-Icon=graphs_section
diff --git a/menu/desktop-directories/mandriva-office-other.directory.in b/menu/desktop-directories/mandriva-office-more.directory.in
index db3f56b..5fb3eec 100644
--- a/menu/desktop-directories/mandriva-office-other.directory.in
+++ b/menu/desktop-directories/mandriva-office-more.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Directory
 Encoding=UTF-8
-_Name=Other
+_Name=More
 Icon=office_section
diff --git a/menu/desktop-directories/mandriva-office-presentations.directory.in b/menu/desktop-directories/mandriva-office-presentations.directory.in
deleted file mode 100644
index c3102ef..0000000
--- a/menu/desktop-directories/mandriva-office-presentations.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Presentations
-Icon=presentation_section
diff --git a/menu/desktop-directories/mandriva-office-publishing.directory.in b/menu/desktop-directories/mandriva-office-publishing.directory.in
deleted file mode 100644
index ecab9f6..0000000
--- a/menu/desktop-directories/mandriva-office-publishing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Publishing
-Icon=publishing_section
diff --git a/menu/desktop-directories/mandriva-office-spreadsheets.directory.in b/menu/desktop-directories/mandriva-office-spreadsheets.directory.in
deleted file mode 100644
index b64f8e6..0000000
--- a/menu/desktop-directories/mandriva-office-spreadsheets.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Spreadsheets
-Icon=spreadsheet_section
diff --git a/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in b/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
deleted file mode 100644
index 3cc120f..0000000
--- a/menu/desktop-directories/mandriva-office-tasksmanagement.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Tasks Management
-Icon=taskmanagement_section
diff --git a/menu/desktop-directories/mandriva-office-timemanagement.directory.in b/menu/desktop-directories/mandriva-office-timemanagement.directory.in
deleted file mode 100644
index ad8c6e9..0000000
--- a/menu/desktop-directories/mandriva-office-timemanagement.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Time Management
-Icon=timemanagement_section
diff --git a/menu/desktop-directories/mandriva-office-wordprocessors.directory.in b/menu/desktop-directories/mandriva-office-wordprocessors.directory.in
deleted file mode 100644
index c2e96e2..0000000
--- a/menu/desktop-directories/mandriva-office-wordprocessors.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Wordprocessors
-Icon=wordprocessor_section
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in b/menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in
index 7cb1564..7cb1564 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-artificialintelligence.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-artificialintelligence.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in b/menu/desktop-directories/mandriva-sciences-astronomy.directory.in
index a90b846..a90b846 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-astronomy.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-astronomy.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in b/menu/desktop-directories/mandriva-sciences-biology.directory.in
index 080fe41..080fe41 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-biology.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-biology.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in b/menu/desktop-directories/mandriva-sciences-chemistry.directory.in
index 6d26b77..6d26b77 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-chemistry.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-chemistry.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in b/menu/desktop-directories/mandriva-sciences-computerscience.directory.in
index 3af7cb0..3af7cb0 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-computerscience.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-computerscience.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in b/menu/desktop-directories/mandriva-sciences-datavisualization.directory.in
index 34474cc..34474cc 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-datavisualization.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-datavisualization.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in b/menu/desktop-directories/mandriva-sciences-electricity.directory.in
index dfbfd6f..dfbfd6f 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-electricity.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-electricity.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in b/menu/desktop-directories/mandriva-sciences-geosciences.directory.in
index 1163474..1163474 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-geosciences.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-geosciences.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in b/menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in
index 27c465a..27c465a 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-imageprocessing.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-imageprocessing.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in b/menu/desktop-directories/mandriva-sciences-mathematics.directory.in
index e63c918..e63c918 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-mathematics.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-mathematics.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in b/menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in
index 8fb6220..8fb6220 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-numericanalysis.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-numericanalysis.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in b/menu/desktop-directories/mandriva-sciences-other.directory.in
index 1662a74..1662a74 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-other.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-other.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in b/menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in
index 37e9ff5..37e9ff5 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-parallelcomputing.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-parallelcomputing.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in b/menu/desktop-directories/mandriva-sciences-physics.directory.in
index c1b1df4..c1b1df4 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-physics.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-physics.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in b/menu/desktop-directories/mandriva-sciences-robotics.directory.in
index 225c8d5..225c8d5 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences-robotics.directory.in
+++ b/menu/desktop-directories/mandriva-sciences-robotics.directory.in
diff --git a/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in b/menu/desktop-directories/mandriva-sciences.directory.in
index c662b55..c662b55 100644
--- a/menu/desktop-directories/mandriva-moreapplications-sciences.directory.in
+++ b/menu/desktop-directories/mandriva-sciences.directory.in
diff --git a/menu/desktop-directories/mandriva-multimedia-other.directory.in b/menu/desktop-directories/mandriva-soundvideo-other.directory.in
index 010bf91..010bf91 100644
--- a/menu/desktop-directories/mandriva-multimedia-other.directory.in
+++ b/menu/desktop-directories/mandriva-soundvideo-other.directory.in
diff --git a/menu/desktop-directories/mandriva-multimedia.directory.in b/menu/desktop-directories/mandriva-soundvideo.directory.in
index ccaaa00..055b5cc 100644
--- a/menu/desktop-directories/mandriva-multimedia.directory.in
+++ b/menu/desktop-directories/mandriva-soundvideo.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Directory
 Encoding=UTF-8
-_Name=Multimedia
+_Name=Sound & Video
 Icon=multimedia_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-backup.directory.in b/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
deleted file mode 100644
index 4fd55f1..0000000
--- a/menu/desktop-directories/mandriva-system-archiving-backup.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Backup
-Icon=backup_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in b/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
deleted file mode 100644
index 5cae6d0..0000000
--- a/menu/desktop-directories/mandriva-system-archiving-cdburning.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=CD Burning
-Icon=cd_burning_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-compression.directory.in b/menu/desktop-directories/mandriva-system-archiving-compression.directory.in
deleted file mode 100644
index ef08446..0000000
--- a/menu/desktop-directories/mandriva-system-archiving-compression.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Compression
-Icon=compression_section
diff --git a/menu/desktop-directories/mandriva-system-archiving-other.directory.in b/menu/desktop-directories/mandriva-system-archiving-other.directory.in
deleted file mode 100644
index 1a0f328..0000000
--- a/menu/desktop-directories/mandriva-system-archiving-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_archiving
diff --git a/menu/desktop-directories/mandriva-system-archiving.directory.in b/menu/desktop-directories/mandriva-system-archiving.directory.in
deleted file mode 100644
index 20e5d95..0000000
--- a/menu/desktop-directories/mandriva-system-archiving.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Archiving
-Icon=archiving_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in b/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
deleted file mode 100644
index d818d52..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-bootandinit.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Boot and Init
-Icon=boot_init_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in b/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
deleted file mode 100644
index 86cb531..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-hardware.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Hardware
-Icon=hardware_configuration_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-networking.directory.in b/menu/desktop-directories/mandriva-system-configuration-networking.directory.in
deleted file mode 100644
index 72ec939..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-networking.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Networking
-Icon=networking_configuration_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-other.directory.in b/menu/desktop-directories/mandriva-system-configuration-other.directory.in
deleted file mode 100644
index 51b50ad..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-other.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Other
-Icon=other_configuration
diff --git a/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in b/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
deleted file mode 100644
index 37c3ceb..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-packaging.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Packaging
-Icon=packaging_section
diff --git a/menu/desktop-directories/mandriva-system-configuration-printing.directory.in b/menu/desktop-directories/mandriva-system-configuration-printing.directory.in
deleted file mode 100644
index d9988df..0000000
--- a/menu/desktop-directories/mandriva-system-configuration-printing.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Printing
-Icon=printing_section
diff --git a/menu/desktop-directories/mandriva-system-filetools.directory.in b/menu/desktop-directories/mandriva-system-filetools.directory.in
deleted file mode 100644
index 4306fb7..0000000
--- a/menu/desktop-directories/mandriva-system-filetools.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=File Tools
-Icon=file_tools_section
diff --git a/menu/desktop-directories/mandriva-system-monitoring.directory.in b/menu/desktop-directories/mandriva-system-monitoring.directory.in
deleted file mode 100644
index df68be5..0000000
--- a/menu/desktop-directories/mandriva-system-monitoring.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Monitoring
-Icon=monitoring_section
diff --git a/menu/desktop-directories/mandriva-system-terminals.directory.in b/menu/desktop-directories/mandriva-system-terminals.directory.in
deleted file mode 100644
index ed56f96..0000000
--- a/menu/desktop-directories/mandriva-system-terminals.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Terminals
-Icon=terminals_section
diff --git a/menu/desktop-directories/mandriva-system-texttools.directory.in b/menu/desktop-directories/mandriva-system-texttools.directory.in
deleted file mode 100644
index da94ea2..0000000
--- a/menu/desktop-directories/mandriva-system-texttools.directory.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-Type=Directory
-Encoding=UTF-8
-_Name=Text Tools
-Icon=text_tools_section
diff --git a/menu/desktop-directories/mandriva-system-configuration.directory.in b/menu/desktop-directories/mandriva-systemtools.directory.in
index a3b404b..8894e31 100644
--- a/menu/desktop-directories/mandriva-system-configuration.directory.in
+++ b/menu/desktop-directories/mandriva-systemtools.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Directory
 Encoding=UTF-8
-_Name=Configuration
+_Name=System Tools
 Icon=configuration_section
diff --git a/menu/desktop-directories/mandriva-system.directory.in b/menu/desktop-directories/mandriva-tools-other.directory.in
index b84cb66..bf6f545 100644
--- a/menu/desktop-directories/mandriva-system.directory.in
+++ b/menu/desktop-directories/mandriva-tools-other.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Directory
 Encoding=UTF-8
-_Name=System
+_Name=Other
 Icon=system_section
diff --git a/menu/desktop-directories/mandriva-internet-news.directory.in b/menu/desktop-directories/mandriva-tools.directory.in
index 9c3be3d..99112c6 100644
--- a/menu/desktop-directories/mandriva-internet-news.directory.in
+++ b/menu/desktop-directories/mandriva-tools.directory.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
 Type=Directory
 Encoding=UTF-8
-_Name=News
-Icon=news_section
+_Name=Tools
+Icon=system_section