deal with latest rpm group updates

1 files changed, 48 insertions, 59 deletions

diff --git a/Rpmdrake/icon.pm b/Rpmdrake/icon.pm
index e9e1f732..8ce101b5 100644
--- a/Rpmdrake/icon.pm
+++ b/Rpmdrake/icon.pm
@@ -40,14 +40,13 @@ my %group_icons = (
 	join('|', N("Archiving"), N("Compression")) => 'compression_section',
 	join('|', N("Archiving"), N("Other")) => 'other_archiving',
 	N("Communications") => 'communications_section',
-	join('|', N("Communications"), N("Bluetooth")) => 'communications_section',
-	join('|', N("Communications"), N("Bluetooth")) => 'communications_section',
-	join('|', N("Communications"), N("Dial-Up")) => 'communications_section',
-	join('|', N("Communications"), N("Fax")) => 'communications_section',
-	join('|', N("Communications"), N("Mobile")) => 'communications_section',
-	join('|', N("Communications"), N("Radio")) => 'communications_section',
-	join('|', N("Communications"), N("Serial")) => 'communications_section',
-	join('|', N("Communications"), N("Telephony")) => 'communications_section',
+	join('|', N("Communications"), N("Bluetooth")) => 'communications_bluetooth_section',
+	join('|', N("Communications"), N("Dial-Up")) => 'communications_dialup_section',
+	join('|', N("Communications"), N("Fax")) => 'communications_fax_section',
+	join('|', N("Communications"), N("Mobile")) => 'communications_phone_section',
+	join('|', N("Communications"), N("Radio")) => 'communications_radio_section',
+	join('|', N("Communications"), N("Serial")) => 'communications_serial_section',
+	join('|', N("Communications"), N("Telephony")) => 'communications_phone_section',
 	N("Databases") => 'databases_section',
 	N("Development") => 'development_section',
 	join('|', N("Development"), N("Basic")) => '',
@@ -55,18 +54,19 @@ my %group_icons = (
 	join('|', N("Development"), N("C++")) => '',
 	join('|', N("Development"), N("C#")) => '',
 	join('|', N("Development"), N("Databases")) => 'databases_section',
+	join('|', N("Development"), N("Debug")) => '',
 	join('|', N("Development"), N("Erlang")) => '',
 	join('|', N("Development"), N("GNOME and GTK+")) => 'gnome_section',
 	join('|', N("Development"), N("Java")) => '',
 	join('|', N("Development"), N("KDE and Qt")) => 'kde_section',
 	join('|', N("Development"), N("Kernel")) => 'hardware_configuration_section',
 	join('|', N("Development"), N("OCaml")) => '',
-	join('|', N("Development"), N("Other")) => 'development_tools_section',
+	join('|', N("Development"), N("Other")) => 'development_environment_section',
 	join('|', N("Development"), N("Perl")) => '',
 	join('|', N("Development"), N("PHP")) => '',
 	join('|', N("Development"), N("Python")) => '',
-	join('|', N("Development"), N("Tools")) => '',
-	join('|', N("Development"), N("X11")) => 'office_section',
+	join('|', N("Development"), N("Tools")) => 'development_tools_section',
+	join('|', N("Development"), N("X11")) => '',
 	N("Documentation") => 'documentation_section',
 	N("Editors") => 'emulators_section',
 	N("Education") => 'education_section',
@@ -79,46 +79,40 @@ my %group_icons = (
 	join('|', N("Games"), N("Cards")) => 'cards_section',
 	join('|', N("Games"), N("Other")) => 'other_amusement',
 	join('|', N("Games"), N("Puzzles")) => 'puzzle_section',
-	join('|', N("Games"), N("Shooter")) => 'other_amusement',
+	join('|', N("Games"), N("Shooter")) => 'shooter_section',
+	join('|', N("Games"), N("Simulation")) => 'simulation_section',
 	join('|', N("Games"), N("Sports")) => 'sport_section',
 	join('|', N("Games"), N("Strategy")) => 'strategy_section',
-	N("Geography") => 'geosciences_section',
-	N("Graphical desktop") => 'office_section',
+	N("Geography") => 'geography_section',
+	N("Graphical desktop") => 'graphical_desktop_section',
 	join('|', N("Graphical desktop"),
           #-PO: This is a package/product name. Only translate it if needed:
-          N("Enlightenment")) => '',
-	join('|', N("Graphical desktop"), N("FVWM based")) => '',
+          N("Enlightenment")) => 'enlightment_section',
 	join('|', N("Graphical desktop"),
           #-PO: This is a package/product name. Only translate it if needed:
           N("GNOME")) => 'gnome_section',
 	join('|', N("Graphical desktop"),
           #-PO: This is a package/product name. Only translate it if needed:
-          N("Icewm")) => '',
+          N("Icewm")) => 'icewm_section',
 	join('|', N("Graphical desktop"),
           #-PO: This is a package/product name. Only translate it if needed:
           N("KDE")) => 'kde_section',
 	join('|', N("Graphical desktop"), N("Other")) => 'more_applications_other_section',
 	join('|', N("Graphical desktop"),
           #-PO: This is a package/product name. Only translate it if needed:
-          N("Sawfish")) => '',
+          N("WindowMaker")) => 'windowmaker_section',
 	join('|', N("Graphical desktop"),
           #-PO: This is a package/product name. Only translate it if needed:
-          N("WindowMaker")) => '',
-	join('|', N("Graphical desktop"),
-          #-PO: This is a package/product name. Only translate it if needed:
-          N("Xfce")) => '',
+          N("Xfce")) => 'xfce_section',
 	N("Graphics") => 'graphics_section',
-	join('|', N("Graphics"), N("3D")) => '',
-	join('|', N("Graphics"), N("Editors")) => '',
-	join('|', N("Graphics"), N("Other")) => '',
-	join('|', N("Graphics"), N("Photography")) => '',
-	join('|', N("Graphics"), N("Scanning")) => '',
-	join('|', N("Graphics"), N("Viewers")) => '',
+	join('|', N("Graphics"), N("3D")) => 'graphics_3d_section',
+	join('|', N("Graphics"), N("Editors and Converters")) => 'graphics_editors_section',
+	join('|', N("Graphics"), N("Utilities")) => 'graphics_utilities_section',
+	join('|', N("Graphics"), N("Photography")) => 'graphics_photography_section',
+	join('|', N("Graphics"), N("Scanning")) => 'graphics_scanning_section',
+	join('|', N("Graphics"), N("Viewers")) => 'graphics_viewers_section',
 	N("Monitoring") => 'monitoring_section',
-	N("Multimedia") => 'multimedia_section',
-	join('|', N("Multimedia"), N("Video")) => 'video_section',
 	N("Networking") => 'networking_section',
-	join('|', N("Networking"), N("Chat")) => 'chat_section',
 	join('|', N("Networking"), N("File transfer")) => 'file_transfer_section',
 	join('|', N("Networking"), N("IRC")) => 'irc_section',
 	join('|', N("Networking"), N("Instant messaging")) => 'instant_messaging_section',
@@ -128,17 +122,15 @@ my %group_icons = (
 	join('|', N("Networking"), N("Remote access")) => 'remote_access_section',
 	join('|', N("Networking"), N("WWW")) => 'networking_www_section',
 	N("Office") => 'office_section',
-	join('|', N("Office"), N("Dictionary")) => '',
-	join('|', N("Office"), N("Finance")) => '',
-	join('|', N("Office"), N("Management")) => '',
-	join('|', N("Office"), N("Organizer")) => '',
-	join('|', N("Office"), N("Other")) => '',
-	join('|', N("Office"), N("Spreadsheet")) => '',
-	join('|', N("Office"), N("Suite")) => '',
-	join('|', N("Office"), N("Word processor")) => '',
-	N("Public Keys") => 'packaging_section',
+	join('|', N("Office"), N("Dictionary")) => 'office_accessories_section',
+	join('|', N("Office"), N("Finance")) => 'finances_section',
+	join('|', N("Office"), N("Management")) => 'timemanagement_section',
+	join('|', N("Office"), N("Organizer")) => 'timemanagement_section',
+	join('|', N("Office"), N("Utilities")) => 'office_accessories_section',
+	join('|', N("Office"), N("Spreadsheet")) => 'spreadsheet_section',
+	join('|', N("Office"), N("Suite")) => 'office_suite',
+	join('|', N("Office"), N("Word processor")) => 'wordprocessor_section',
 	N("Publishing") => 'publishing_section',
-	N("Security") => 'packaging_section',
 	N("Sciences") => 'sciences_section',
 	join('|', N("Sciences"), N("Astronomy")) => 'astronomy_section',
 	join('|', N("Sciences"), N("Biology")) => 'biology_section',
@@ -148,34 +140,30 @@ my %group_icons = (
 	join('|', N("Sciences"), N("Mathematics")) => 'mathematics_section',
 	join('|', N("Sciences"), N("Other")) => 'other_sciences',
 	join('|', N("Sciences"), N("Physics")) => 'physics_section',
+	N("Security") => 'packaging_section',
 	N("Shells") => 'shells_section',
 	N("Sound") => 'sound_section',
-	join('|', N("Sound"), N("Editors and Converters")) => '',
-	join('|', N("Sound"), N("Midi")) => '',
-	join('|', N("Sound"), N("Mixers")) => '',
-	join('|', N("Sound"), N("Players")) => '',
-	join('|', N("Sound"), N("Utilities")) => '',
-	join('|', N("Sound"), N("Visualization")) => '',
+	join('|', N("Sound"), N("Editors and Converters")) => 'sound_editors_section',
+	join('|', N("Sound"), N("Midi")) => 'sound_midi_section',
+	join('|', N("Sound"), N("Mixers")) => 'sound_mixers_section',
+	join('|', N("Sound"), N("Players")) => 'sound_section',
+	join('|', N("Sound"), N("Utilities")) => 'sound_utilities_section',
 	N("System") => 'system_section',
 	join('|', N("System"), N("Base")) => 'system_section',
+	join('|', N("System"), N("Boot and Init")) => 'boot_init_section',
 	join('|', N("System"), N("Cluster")) => 'parallel_computing_section',
 	join('|', N("System"), N("Configuration")) => 'configuration_section',
-	join('|', N("System"), N("Configuration"), N("Boot and Init")) => 'boot_init_section',
-	join('|', N("System"), N("Configuration"), N("Hardware")) => 'hardware_configuration_section',
-	join('|', N("System"), N("Configuration"), N("Networking")) => 'networking_configuration_section',
-	join('|', N("System"), N("Configuration"), N("Other")) => 'system_other_section',
-	join('|', N("System"), N("Configuration"), N("Packaging")) => 'packaging_section',
-	join('|', N("System"), N("Configuration"), N("Printing")) => 'printing_section',
 	join('|', N("System"), N("Fonts")) => 'chinese_section',
-	join('|', N("System"), N("Fonts"), N("Console")) => 'interpreters_section',
 	join('|', N("System"), N("Fonts"), N("True type")) => '',
 	join('|', N("System"), N("Fonts"), N("Type1")) => '',
 	join('|', N("System"), N("Fonts"), N("X11 bitmap")) => '',
 	join('|', N("System"), N("Internationalization")) => 'chinese_section',
 	join('|', N("System"), N("Kernel and hardware")) => 'hardware_configuration_section',
-	join('|', N("System"), N("Libraries")) => '',
+	join('|', N("System"), N("Libraries")) => 'system_section',
+	join('|', N("System"), N("Networking")) => 'networking_configuration_section',
+	join('|', N("System"), N("Packaging")) => 'packaging_section',
 	join('|', N("System"), N("Printing")) => 'printing_section',
-	join('|', N("System"), N("Servers")) => '',
+	join('|', N("System"), N("Servers")) => 'servers_section',
 	join('|', N("System"),
           #-PO: This is a package/product name. Only translate it if needed:
           N("X11")) => 'office_section',
@@ -183,9 +171,10 @@ my %group_icons = (
 	N("Text tools") => 'text_tools_section',
 	N("Toys") => 'toys_section',
 	N("Video") => 'video_section',
-	join('|', N("Video"), N("Editors and Converters")) => '',
-	join('|', N("Video"), N("Players")) => '',
-	join('|', N("Video"), N("Utilities")) => '',
+	join('|', N("Video"), N("Editors and Converters")) => 'video_editors_section',
+	join('|', N("Video"), N("Players")) => 'video_players_section',
+	join('|', N("Video"), N("Television")) => 'video_television_section',
+	join('|', N("Video"), N("Utilities")) => 'video_utilities_section',
 
      # for Mageia Choice:
 	N("Workstation") => 'office_section',