Update

8 files changed, 437 insertions, 320 deletions

diff --git a/perl-install/share/compssUsers-discovery.pl b/perl-install/share/compssUsers-discovery.pl
new file mode 100644
index 000000000..c234f93a9
--- /dev/null
+++ b/perl-install/share/compssUsers-discovery.pl
@@ -0,0 +1,51 @@
+package tmp::compssUsers;
+
+use common;
+use ugtk2 qw(:helpers :wrappers :create);
+
+my $h = {
+
+("Discovery") => 
+[
+  { label => ("Discovery"),
+    descr => (""),
+    flags => [ qw(OFFICE SPELLCHECK PUBLISHING PIM ARCHIVING PRINTER AUDIO VIDEO GRAPHICS NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS CONFIG TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS KDE X BOOKS) ], 
+    default_selected => 1,
+  },
+],
+};
+
+foreach my $path (keys %$h) {
+    foreach (@{$h->{$path}}) {
+	$_->{path} = $path;
+	$_->{uid} = join('|', $path, $_->{label});
+    }
+}
+
+my $compssUsers = [ map { @$_ } values %$h ];
+
+my $gtk_display_compssUsers = sub {
+    my ($entry) = @_;
+
+    my $entries_in_path = sub {
+	my ($path) = @_;
+	translate($path), map { $entry->($_) } @{$h->{$path}};
+    };
+
+    gtkpack_(Gtk2::VBox->new(0, 0),
+	     1, gtkpack_(Gtk2::HBox->new(0, 0),
+			 1, gtkpack(Gtk2::VBox->new(0, 0), 
+				    $entries_in_path->('Workstation'),
+				    '',
+				    $entries_in_path->('Development'),
+				   ),
+			 0, gtkpack(Gtk2::VBox->new(0, 0), 
+				    $entries_in_path->('Server'),
+				    '',
+				    $entries_in_path->('Graphical Environment'),
+				   ),
+			),
+	    );
+};
+
+$compssUsers, $gtk_display_compssUsers;
diff --git a/perl-install/share/compssUsers-powerpack.pl b/perl-install/share/compssUsers-powerpack.pl
new file mode 100644
index 000000000..c5afe3cb8
--- /dev/null
+++ b/perl-install/share/compssUsers-powerpack.pl
@@ -0,0 +1,133 @@
+package tmp::compssUsers;
+
+use common;
+use ugtk2 qw(:helpers :wrappers :create);
+
+my $h = {
+
+N_("Workstation") => 
+[
+  { label => N_("Office Workstation"),
+    descr => N_("Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc"),
+    flags => [ qw(OFFICE SPELLCHECK PUBLISHING PIM ARCHIVING PRINTER) ],
+    default_selected => 1,
+  },
+  { label => N_("Game station"),
+    descr => N_("Amusement programs: arcade, boards, strategy, etc"),
+    flags => [ qw(GAMES) ], 
+  },
+  { label => N_("Multimedia station"),
+    descr => N_("Sound and video playing/editing programs"),
+    flags => [ qw(AUDIO VIDEO GRAPHICS) ],
+    default_selected => 1,
+  },
+  { label => N_("Internet station"),
+    descr => N_("Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"),
+    flags => [ qw(NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS) ],
+    default_selected => 1,
+  },
+  { label => N_("Network Computer (client)"),
+    descr => N_("Clients for different protocols including ssh"),
+    flags => [ qw(NETWORKING_REMOTE_ACCESS NETWORKING_FILE) ], 
+    default_selected => 1,
+  },
+  { label => N_("Configuration"),
+    descr => N_("Tools to ease the configuration of your computer"),
+    flags => [ qw(CONFIG) ],
+    default_selected => 1,
+  },
+  { label => N_("Console Tools"),
+    descr => N_("Editors, shells, file tools, terminals"),
+    flags => [ qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS) ],
+    default_selected => 1,
+  },
+  { label => N_("Development"),
+    descr => N_("C and C++ development libraries, programs and include files"),
+    flags => [ qw(DEVELOPMENT EDITORS) ],
+    default_selected => 1,
+  },
+  { label => N_("Documentation"),
+    descr => N_("Books and Howto's on Linux and Free Software"),
+    flags => [ qw(BOOKS) ],
+    default_selected => 1,
+  },
+  { label => N_("LSB"),
+    descr => N_("Linux Standard Base. Third party applications support"),
+    flags => [ qw(LSB) ],
+  },
+],
+
+N_("Server") =>
+[
+  { label => N_("Web/FTP"),
+    descr => N_("Apache, Pro-ftpd"),
+    flags => [ qw(NETWORKING_WWW_SERVER NETWORKING_FILE_TRANSFER_SERVER) ],
+  },
+  { label => N_("Mail"),
+    descr => N_("Postfix mail server"),
+    flags => [ qw(NETWORKING_MAIL_SERVER) ],
+  },
+  { label => N_("Database"),
+    descr => N_("PostgreSQL or MySQL database server"),
+    flags => [ qw(DATABASES DATABASES_SERVER) ],
+  },
+  { label => N_("Firewall/Router"),
+    descr => N_("Internet gateway"),
+    flags => [ qw(NETWORKING_FIREWALLING_SERVER) ],
+  },
+  { label => N_("Network Computer server"),
+    descr => N_("NFS server, SMB server, Proxy server, ssh server"),
+    flags => [ qw(NETWORKING_FILE_SERVER NETWORKING_REMOTE_ACCESS_SERVER) ],
+  },
+],
+
+N_("Graphical Environment") => 
+[
+  { label => N_("KDE Workstation"),
+    descr => N_("The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"),
+    flags => [ qw(KDE X ACCESSIBILITY) ],
+    default_selected => 1,
+  },
+  { label => N_("GNOME Workstation"),
+    descr => N_("A graphical environment with user-friendly set of applications and desktop tools"),
+    flags => [ qw(GNOME X ACCESSIBILITY) ], 
+  },
+  { label => N_("Other Graphical Desktops"),
+    descr => N_("Icewm, Window Maker, Enlightenment, Fvwm, etc"),
+    flags => [ qw(GRAPHICAL_DESKTOP X ACCESSIBILITY) ], 
+  },
+],
+};
+
+foreach my $path (keys %$h) {
+    foreach (@{$h->{$path}}) {
+	$_->{path} = $path;
+	$_->{uid} = join('|', $path, $_->{label});
+    }
+}
+
+my $compssUsers = [ map { @$_ } values %$h ];
+
+my $gtk_display_compssUsers = sub {
+    my ($entry) = @_;
+
+    my $entries_in_path = sub {
+	my ($path) = @_;
+	translate($path), map { $entry->($_) } @{$h->{$path}};
+    };
+
+    gtkpack_(Gtk2::VBox->new(0, 0),
+	     1, gtkpack_(Gtk2::HBox->new(0, 0),
+			 1, gtkpack(Gtk2::VBox->new(0, 0), 
+				    $entries_in_path->('Workstation'),
+				   ),
+			 0, gtkpack(Gtk2::VBox->new(0, 0), 
+				    $entries_in_path->('Server'),
+				    '',
+				    $entries_in_path->('Graphical Environment'),
+				   ),
+			),
+	    );
+};
+
+$compssUsers, $gtk_display_compssUsers;
diff --git a/perl-install/share/compssUsers-powerpackplus.pl b/perl-install/share/compssUsers-powerpackplus.pl
new file mode 100644
index 000000000..b168cca26
--- /dev/null
+++ b/perl-install/share/compssUsers-powerpackplus.pl
@@ -0,0 +1,153 @@
+package tmp::compssUsers;
+
+use common;
+use ugtk2 qw(:helpers :wrappers :create);
+
+my $h = {
+
+N_("Workstation") => 
+[
+  { label => N_("Office Workstation"),
+    descr => N_("Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets (OpenOffice.org Calc, Kspread), PDF viewers, etc"),
+    flags => [ qw(OFFICE SPELLCHECK PUBLISHING PIM ARCHIVING PRINTER) ],
+    default_selected => 1,
+  },
+  { label => N_("Internet station"),
+    descr => N_("Set of tools to read and send mail and news (mutt, tin..) and to browse the Web"),
+    flags => [ qw(NETWORKING_WWW NETWORKING_MAIL NETWORKING_NEWS COMMUNICATIONS NETWORKING_CHAT NETWORKING_FILE_TRANSFER NETWORKING_IRC NETWORKING_INSTANT_MESSAGING NETWORKING_DNS) ],
+    default_selected => 1,
+  },
+],
+
+N_("Server") =>
+[
+  { label => N_("Web Server"),
+    descr => N_("Apache"),
+    flags => [ qw(NETWORKING_WWW_SERVER) ],
+  },
+  { label => N_("Groupware"),
+    descr => N_("Kolab Server"),
+    flags => [ qw(NETWORKING_GROUPWARE_SERVER) ],
+  },
+  { label => N_("Firewall/Router"),
+    descr => N_("Internet gateway"),
+    flags => [ qw(NETWORKING_FIREWALLING_SERVER) ],
+  },
+  { label => N_("Mail/News"),
+    descr => N_("Postfix mail server, Inn news server"),
+    flags => [ qw(NETWORKING_MAIL_SERVER NETWORKING_NEWS_SERVER) ],
+  },
+  { label => N_("Directory Server"),
+    descr => N_("LDAP Server"),
+    flags => [ qw(NETWORKING_LDAP_SERVER) ],
+  },
+  { label => N_("FTP Server"),
+    descr => N_("ProFTPd"),
+    flags => [ qw(NETWORKING_FILE_TRANSFER_SERVER) ],
+  },
+  { label => N_("DNS/NIS"),
+    descr => N_("Domain Name and Network Information Server"),
+    flags => [ qw(NIS_SERVER NETWORKING_DNS_SERVER) ],
+  },
+  { label => N_("File and Printer Sharing Server"),
+    descr => N_("NFS Server, Samba server"),
+    flags => [ qw(NETWORKING_FILE_SERVER PRINTER) ],
+  },
+  { label => N_("Database"),
+    descr => N_("PostgreSQL and MySQL Database Server"),
+    flags => [ qw(DATABASES DATABASES_SERVER) ],
+  },
+],
+
+N_("Graphical Environment") =>
+[
+  { label => N_("KDE Workstation"),
+    descr => N_("The K Desktop Environment, the basic graphical environment with a collection of accompanying tools"),
+    flags => [ qw(KDE X ACCESSIBILITY) ],
+    default_selected => 1,
+  },
+  { label => N_("GNOME Workstation"),
+    descr => N_("A graphical environment with user-friendly set of applications and desktop tools"),
+    flags => [ qw(GNOME X ACCESSIBILITY) ],
+  },
+  { label => N_("Other Graphical Desktops"),
+    descr => N_("Icewm, Window Maker, Enlightenment, Fvwm, etc"),
+    flags => [ qw(GRAPHICAL_DESKTOP X ACCESSIBILITY) ],
+  },
+],
+  
+N_("Development") =>
+[ 
+  { label => N_("Development"),
+    descr => N_("C and C++ development libraries, programs and include files"),
+    flags => [ qw(DEVELOPMENT EDITORS) ],
+    default_selected => 1,
+  },
+  { label => N_("Documentation"),
+    descr => N_("Books and Howto's on Linux and Free Software"),
+    flags => [ qw(BOOKS) ],
+  },
+  { label => N_("LSB"),
+    descr => N_("Linux Standard Base. Third party applications support"),
+    flags => [ qw(LSB) ],
+  },
+],
+
+N_("Utilities") =>
+[
+  { label => N_("SSH Server"),
+    descr => N_("SSH Server"),
+    flags => [ qw(NETWORKING_REMOTE_ACCESS_SERVER) ],
+    default_selected => 1,
+  },
+  { label => N_("Webmin"),
+    descr => N_("Webmin Remote Configuration Server"),
+    flags => [ qw(WEBMIN) ],
+    default_selected => 1,
+  },
+  { label => N_("Network Utilities/Monitoring"),
+    descr => N_("Monitoring tools, processes accounting, tcpdump, nmap, ..."),
+    flags => [ qw(MONITORING NETWORKING_FILE) ],
+    default_selected => 1,
+  },
+  { label => N_("MandrakeSoft Wizards"),
+    descr => N_("Wizards to configure server"),
+    flags => [ qw(WIZARDS) ],
+    default_selected => 1,
+  },
+],
+};
+
+foreach my $path (keys %$h) {
+    foreach (@{$h->{$path}}) {
+	$_->{path} = $path;
+	$_->{uid} = join('|', $path, $_->{label});
+    }
+}
+
+my $compssUsers = [ map { @$_ } values %$h ];
+
+my $gtk_display_compssUsers = sub {
+    my ($entry) = @_;
+
+    my $entries_in_path = sub {
+	my ($path) = @_;
+	translate($path), map { $entry->($_) } @{$h->{$path}};
+    };
+
+    gtkpack_(Gtk2::VBox->new(0, 0),
+	     1, gtkpack_(Gtk2::HBox->new(0, 0),
+			 1, gtkpack(Gtk2::VBox->new(0, 0), 
+				    $entries_in_path->('Workstation'),
+				    $entries_in_path->('Server'),
+				   ),
+			 0, gtkpack(Gtk2::VBox->new(0, 0), 
+				    $entries_in_path->('Graphical Environment'),
+				    $entries_in_path->('Development'),
+				    $entries_in_path->('Utilities'),
+				   ),
+			),
+	    );
+};
+
+$compssUsers, $gtk_display_compssUsers;
diff --git a/perl-install/share/compssUsers.desktop b/perl-install/share/compssUsers.desktop
deleted file mode 100644
index b47df70d5..000000000
--- a/perl-install/share/compssUsers.desktop
+++ /dev/null
@@ -1,40 +0,0 @@
-     # --- Workstation
-
-
-KDE Workstation [icon=kde] [path=Workstation] [selected=desktop] [descr=The K Desktop Environment, the basic graphical environment with a collection of accompanying tools]
-	KDE
-	X
-	TERMINALS
-	NETWORKING_OTHER
-
-Office Workstation [icon=office] [path=Workstation] [selected=desktop] [descr=Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc]
-	OFFICE
-	SPELLCHECK
-	PUBLISHING
-	ARCHIVING
-	PRINTER
-
-Multimedia station [icon=multimedia] [path=Workstation] [selected=desktop] [descr=Sound and video playing/editing programs]
-        AUDIO
-	VIDEO
-	GRAPHICS
-
-Internet station [icon=networking] [path=Workstation] [selected=desktop] [descr=Set of tools to read and send mail and news and to browse the Web]
-        NETWORKING_WWW
-	NETWORKING_MAIL
-	NETWORKING_NEWS
-	COMMUNICATIONS
-	NETWORKING_FILE_TRANSFER
-	NETWORKING_IRC
-	NETWORKING_INSTANT_MESSAGING
-	NETWORKING_DNS
-
-Network Computer (client) [icon=terminals] [path=Workstation] [selected=desktop] [descr=Clients for different protocols including ssh]
-        NETWORKING_REMOTE_ACCESS
-
-Game station [icon=arcade] [path=Workstation] [selected=desktop] [descr=Amusement programs: arcade, boards, strategy, etc]
-        GAMES
-
-Documentation [icon=documentation] [path=Workstation] [selected=desktop] [descr=Books and Howto's on Linux and Free Software]
-        BOOKS
-
diff --git a/perl-install/share/compssUsers.pl b/perl-install/share/compssUsers.pl
index f94aa6ae3..f8dce9680 100644
--- a/perl-install/share/compssUsers.pl
+++ b/perl-install/share/compssUsers.pl
@@ -5,47 +5,6 @@ use ugtk2 qw(:helpers :wrappers :create);
 
 my $h = {
 
-N_("Server") => 
-[
-  { label => N_("Web/FTP"),
-    descr => N_("Apache, Pro-ftpd"),
-    flags => [ qw(NETWORKING_WWW_SERVER NETWORKING_FILE_TRANSFER_SERVER) ], 
-  },
-  { label => N_("Mail"),
-    descr => N_("Postfix mail server"),
-    flags => [ qw(NETWORKING_MAIL_SERVER) ], 
-  },
-  { label => N_("Database"),
-    descr => N_("PostgreSQL or MySQL database server"),
-    flags => [ qw(DATABASES DATABASES_SERVER) ], 
-  },
-  { label => N_("Firewall/Router"),
-    descr => N_("Internet gateway"),
-    flags => [ qw(NETWORKING_FIREWALLING_SERVER) ], 
-  },
-  { label => N_("Network Computer server"),
-    descr => N_("NFS server, SMB server, Proxy server, ssh server"),
-    flags => [ qw(NETWORKING_FILE_SERVER NETWORKING_REMOTE_ACCESS_SERVER) ], 
-  },
-],
-
-N_("Development") => 
-[
-  { label => N_("Development"),
-    descr => N_("C and C++ development libraries, programs and include files"),
-    flags => [ qw(DEVELOPMENT EDITORS) ], 
-    default_selected => 1,
-  },
-  { label => N_("Documentation"),
-    descr => N_("Books and Howto's on Linux and Free Software"),
-    flags => [ qw(BOOKS) ], 
-  },
-  { label => N_("LSB"),
-    descr => N_("Linux Standard Base. Third party applications support"),
-    flags => [ qw(LSB) ], 
-  },
-],
-
 N_("Workstation") => 
 [
   { label => N_("Office Workstation"),
@@ -81,6 +40,42 @@ N_("Workstation") =>
     flags => [ qw(EDITORS TERMINALS TEXT_TOOLS SHELLS FILE_TOOLS) ],
     default_selected => 1,
   },
+  { label => N_("Development"),
+    descr => N_("C and C++ development libraries, programs and include files"),
+    flags => [ qw(DEVELOPMENT EDITORS) ],
+  },
+  { label => N_("Documentation"),
+    descr => N_("Books and Howto's on Linux and Free Software"),
+    flags => [ qw(BOOKS) ],
+  },
+  { label => N_("LSB"),
+    descr => N_("Linux Standard Base. Third party applications support"),
+    flags => [ qw(LSB) ],
+  },
+],
+
+N_("Server") =>
+[
+  { label => N_("Web/FTP"),
+    descr => N_("Apache, Pro-ftpd"),
+    flags => [ qw(NETWORKING_WWW_SERVER NETWORKING_FILE_TRANSFER_SERVER) ],
+  },
+  { label => N_("Mail"),
+    descr => N_("Postfix mail server"),
+    flags => [ qw(NETWORKING_MAIL_SERVER) ],
+  },
+  { label => N_("Database"),
+    descr => N_("PostgreSQL or MySQL database server"),
+    flags => [ qw(DATABASES DATABASES_SERVER) ],
+  },
+  { label => N_("Firewall/Router"),
+    descr => N_("Internet gateway"),
+    flags => [ qw(NETWORKING_FIREWALLING_SERVER) ],
+  },
+  { label => N_("Network Computer server"),
+    descr => N_("NFS server, SMB server, Proxy server, ssh server"),
+    flags => [ qw(NETWORKING_FILE_SERVER NETWORKING_REMOTE_ACCESS_SERVER) ],
+  },
 ],
 
 N_("Graphical Environment") => 
@@ -122,8 +117,6 @@ my $gtk_display_compssUsers = sub {
 	     1, gtkpack_(Gtk2::HBox->new(0, 0),
 			 1, gtkpack(Gtk2::VBox->new(0, 0), 
 				    $entries_in_path->('Workstation'),
-				    '',
-				    $entries_in_path->('Development'),
 				   ),
 			 0, gtkpack(Gtk2::VBox->new(0, 0), 
 				    $entries_in_path->('Server'),
diff --git a/perl-install/share/compssUsers.powerpack b/perl-install/share/compssUsers.powerpack
deleted file mode 100644
index 40d69209c..000000000
--- a/perl-install/share/compssUsers.powerpack
+++ /dev/null
@@ -1,89 +0,0 @@
-     # --- Workstation
-
-Office Workstation [icon=office] [path=Workstation] [selected=all] [descr=Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc]
-	OFFICE
-	SPELLCHECK
-	PUBLISHING
-	PIM
-	ARCHIVING
-	PRINTER
-
-Game station [icon=arcade] [path=Workstation] [descr=Amusement programs: arcade, boards, strategy, etc]
-	GAMES
-
-Multimedia station [icon=multimedia] [path=Workstation] [selected=all] [descr=Sound and video playing/editing programs]
-	AUDIO
-	VIDEO
-	GRAPHICS
-
-Internet station [icon=networking] [path=Workstation] [selected=all] [descr=Set of tools to read and send mail and news (mutt, tin..) and to browse the Web]
-	NETWORKING_WWW
-	NETWORKING_MAIL
-	NETWORKING_NEWS
-	COMMUNICATIONS
-	NETWORKING_CHAT
-	NETWORKING_FILE_TRANSFER
-	NETWORKING_IRC
-	NETWORKING_INSTANT_MESSAGING
-	NETWORKING_DNS
-
-Network Computer (client) [icon=terminals] [path=Workstation] [selected=all] [descr=Clients for different protocols including ssh]
-	NETWORKING_REMOTE_ACCESS
-	NETWORKING_FILE
-
-Configuration [icon=configuration] [path=Workstation] [selected=all] [descr=Tools to ease the configuration of your computer]
-	CONFIG
-
-Console Tools [icon=terminals] [path=Workstation] [selected=all] [descr=Editors, shells, file tools, terminals]
-	EDITORS
-	TERMINALS
-	TEXT_TOOLS
-	SHELLS
-	FILE_TOOLS
-
-     # --- Graphical Environment
-
-KDE Workstation [icon=kde] [path=Graphical Environment] [selected=all] [descr=The K Desktop Environment, the basic graphical environment with a collection of accompanying tools]
-	KDE
-	X
-
-GNOME Workstation [icon=gnome] [path=Graphical Environment] [descr=A graphical environment with user-friendly set of applications and desktop tools]
-	GNOME
-	X
-
-Other Graphical Desktops [icon=windowmanager] [path=Graphical Environment] [descr=Icewm, Window Maker, Enlightenment, Fvwm, etc]
-	GRAPHICAL_DESKTOP
-	X
-
-
-     # --- Development
-
-Development [icon=editors] [path=Development] [selected=all] [descr=C and C++ development libraries, programs and include files]
-	DEVELOPMENT
-	EDITORS
-
-Documentation [icon=documentation] [path=Development] [selected=all] [descr=Books and Howto's on Linux and Free Software]
-	BOOKS
-
-LSB [icon=documentation] [path=Development] [descr=Linux Standard Base. Third party applications support]
-	LSB
-
-     # --- Server
-
-Web/FTP  [icon=file_transfer] [path=Server] [descr=Apache, Pro-ftpd]
-	NETWORKING_WWW_SERVER
-	NETWORKING_FILE_TRANSFER_SERVER
-
-Mail [icon=mail] [path=Server] [descr=Postfix mail server]
-	NETWORKING_MAIL_SERVER
-
-Database [icon=archiving] [path=Server] [descr=PostgreSQL or MySQL database server]
-	DATABASES
-	DATABASES_SERVER
-
-Firewall/Router [icon=networking] [path=Server] [descr=Internet gateway]
-	NETWORKING_FIREWALLING_SERVER
-
-Network Computer server [icon=networking] [path=Server] [descr=NFS server, SMB server, Proxy server, ssh server]
-	NETWORKING_FILE_SERVER
-	NETWORKING_REMOTE_ACCESS_SERVER
diff --git a/perl-install/share/compssUsers.server b/perl-install/share/compssUsers.server
deleted file mode 100644
index 4dfce0153..000000000
--- a/perl-install/share/compssUsers.server
+++ /dev/null
@@ -1,93 +0,0 @@
-     # --- Workstation
-
-Office Workstation [icon=office] [path=Workstation] [selected=server] [descr=Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, gnumeric), pdf viewers, etc]
-    OFFICE
-    SPELLCHECK
-    PUBLISHING
-    PIM
-    ARCHIVING
-    PRINTER
-
-Internet station [icon=networking] [path=Workstation] [selected=server] [descr=Set of tools to read and send mail and news (mutt, tin..) and to browse the Web]
-    NETWORKING_WWW
-    NETWORKING_MAIL
-    NETWORKING_NEWS
-    COMMUNICATIONS
-    NETWORKING_CHAT
-    NETWORKING_FILE_TRANSFER
-    NETWORKING_IRC
-    NETWORKING_INSTANT_MESSAGING
-    NETWORKING_DNS
-
-     # --- Graphical Environment
-
-KDE Workstation [icon=kde] [path=Graphical Environment] [selected=server] [descr=The K Desktop Environment, the basic graphical environment with a collection of accompanying tools]
-	KDE
-	X
-
-GNOME Workstation [icon=gnome] [path=Graphical Environment] [descr=A graphical environment with user-friendly set of applications and desktop tools]
-	GNOME
-	X
-
-Other Graphical Desktops [icon=windowmanager] [path=Graphical Environment] [descr=XFce, Window Maker, IceWm]
-	GRAPHICAL_DESKTOP
-	X
-
-     # --- Development
-
-Development [icon=editors] [path=Development] [selected=server] [descr=C and C++ development libraries, programs and include files]
-	DEVELOPMENT
-
-Documentation [icon=documentation] [path=Development] [descr=Books and Howto's on Linux and Free Software]
-	BOOKS
-
-LSB [icon=documentation] [path=Development] [descr=Linux Standard Base. Third party applications support]
-	LSB
-
-     # --- Server
-
-Web Server  [icon=file_transfer] [path=Server] [descr=Apache]
-	NETWORKING_WWW_SERVER
-
-Groupware [icon=mail] [selected=server] [path=Server] [descr=Kolab server]
-	NETWORKING_GROUPWARE_SERVER
-
-Firewall/Router [icon=networking] [path=Server] [descr=Internet gateway]
-	NETWORKING_FIREWALLING_SERVER
-
-Mail/News [icon=mail] [path=Server] [descr=Postfix mail server, Inn news server]
-	NETWORKING_MAIL_SERVER
-	NETWORKING_NEWS_SERVER
-
-Directory Server [icon=mail] [path=Server] [descr=LDAP server]
-	NETWORKING_LDAP_SERVER
-
-FTP Server [icon=file_transfer] [path=Server] [descr=Wu-FTPd]
-	NETWORKING_FILE_TRANSFER_SERVER
-
-DNS/NIS [icon=hardware] [path=Server] [descr=Domain Name and Network Information Server] 
-	NIS_SERVER
-	NETWORKING_DNS_SERVER
-
-File & Printer Sharing Server [icon=archiving] [path=Server] [descr=NFS server, Samba server] 
-	NETWORKING_FILE_SERVER
-	PRINTER
-
-Database [icon=archiving] [path=Server] [descr=PostgreSQL or MySQL database server]
-	DATABASES
-	DATABASES_SERVER
-
-     # --- Utilities
-
-SSH server [icon=networking] [path=Utilities] [selected=server] [descr=ssh server]
-	NETWORKING_REMOTE_ACCESS_SERVER
-
-Webmin [icon=archiving] [path=Utilities] [selected=server] [descr=webmin remote configuration server]
-	WEBMIN
-
-Network Utilities/Monitoring [icon=archiving] [path=Utilities] [selected=server] [descr=Monitoring tools, processes accounting, tcpdump, nmap, ...]
-	MONITORING
-	NETWORKING_FILE
-
-Mandrakesoft Wizards [icon=archiving] [path=Utilities] [selected=server] [descr=Wizards to configure servers]
-	WIZARDS
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index 235e165e1..057d5203d 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -20,14 +20,23 @@ KDE
   5 galaxy-kde galaxy-kde-kwin kdeartwork kdeartwork-kde-classic kdebase-nsplugins kdebase-progs krozat mandrakegalaxy
   1 mdkkdm
   5 kdebase-kdm
-  5 kde-i18n-af kde-i18n-ar
+  5 kde-i18n-af kde-i18n-ar kde-i18n-az kde-i18n-be kde-i18n-bg kde-i18n-bn kde-i18n-br kde-i18n-bs kde-i18n-ca kde-i18n-cs kde-i18n-cy kde-i18n-da kde-i18n-de kde-i18n-el kde-i18n-en_GB kde-i18n-eo kde-i18n-es kde-i18n-et kde-i18n-eu kde-i18n-fa kde-i18n-fi kde-i18n-fo kde-i18n-fr kde-i18n-ga kde-i18n-gl kde-i18n-he kde-i18n-hi kde-i18n-hr kde-i18n-hu kde-i18n-id kde-i18n-is kde-i18n-it kde-i18n-ja kde-i18n-ko kde-i18n-lo kde-i18n-lt kde-i18n-lv kde-i18n-mi kde-i18n-mk kde-i18n-mn kde-i18n-ms kde-i18n-mt kde-i18n-nb kde-i18n-nds kde-i18n-nl kde-i18n-nn kde-i18n-oc kde-i18n-pl kde-i18n-pt kde-i18n-pt_BR kde-i18n-ro kde-i18n-ru kde-i18n-se kde-i18n-sk kde-i18n-sl kde-i18n-sr kde-i18n-sv kde-i18n-ta kde-i18n-tg kde-i18n-th kde-i18n-tr kde-i18n-uk kde-i18n-uz kde-i18n-vi kde-i18n-wa kde-i18n-xh kde-i18n-zh_CN.GB2312 kde-i18n-zh_TW.Big5 kde-i18n-zu
   5 kdebase-servicemenu zip
-  5 kdeutils-ark kdeutils-kcalc kdeutils-kcharselect kdeutils-kdf kdeutils-kedit kdeutils-kfloppy kdeutils-khexedit kdeutils-kjots kdeutils-kdepasswd kdeutils-ktimer
+  5 kdeutils-ark
+  5 kdeutils-kcalc
+  5 kdeutils-kcharselect
+  5 kdeutils-kdf
+  5 kdeutils-kfloppy
+  5 kdeutils-kdepasswd
   5 kdepim-kontact
   5 kdeaddons-searchbar
   5 kdeutils-kwalletmanager
   5 kdegraphics-kuickshow
-  
+  3 kdeutils-kedit
+  3 kdeutils-khexedit 
+  3 kdeutils-kjots
+  3 kdeutils-ktimer
+
 VIDEO
   5 !KDE totem
   5 KDE kaffeine
@@ -46,8 +55,8 @@ TV
 
 OFFICE
   5 OpenOffice.org
-  5 OpenOffice.org-help-cs OpenOffice.org-help-de
-  5 OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca
+  5 OpenOffice.org-help-cs OpenOffice.org-help-de OpenOffice.org-help-en OpenOffice.org-help-es OpenOffice.org-help-eu OpenOffice.org-help-fi OpenOffice.org-help-fr OpenOffice.org-help-it OpenOffice.org-help-ja OpenOffice.org-help-ko OpenOffice.org-help-nl OpenOffice.org-help-ru OpenOffice.org-help-sk OpenOffice.org-help-sl OpenOffice.org-help-sv OpenOffice.org-help-zh_CN OpenOffice.org-help-zh_TW
+  5 OpenOffice.org-l10n-af OpenOffice.org-l10n-ar OpenOffice.org-l10n-ca OpenOffice.org-l10n-cs OpenOffice.org-l10n-cy OpenOffice.org-l10n-da OpenOffice.org-l10n-de OpenOffice.org-l10n-el OpenOffice.org-l10n-en OpenOffice.org-l10n-es OpenOffice.org-l10n-et OpenOffice.org-l10n-eu OpenOffice.org-l10n-fi OpenOffice.org-l10n-fr OpenOffice.org-l10n-he OpenOffice.org-l10n-it OpenOffice.org-l10n-ja OpenOffice.org-l10n-ko OpenOffice.org-l10n-nb OpenOffice.org-l10n-nl OpenOffice.org-l10n-nn OpenOffice.org-l10n-ns OpenOffice.org-l10n-pl OpenOffice.org-l10n-pt OpenOffice.org-l10n-pt_BR OpenOffice.org-l10n-ru OpenOffice.org-l10n-sk OpenOffice.org-l10n-sl OpenOffice.org-l10n-sv OpenOffice.org-l10n-tr OpenOffice.org-l10n-zh_CN OpenOffice.org-l10n-zh_TW OpenOffice.org-l10n-zu
   5 KDE koffice-kivio
   5 !KDE dia
   5 gnucash gnucash-hbci gnucash-ofx
@@ -65,7 +74,7 @@ OFFICE
     5 kdepim-knotes
     5 kdegraphics-kghostview
     5 kdepim-kpilot
-    3 koffice koffice-i18n-az koffice-i18n-bg
+    3 koffice koffice-i18n-af koffice-i18n-az koffice-i18n-bg koffice-i18n-ca koffice-i18n-cs koffice-i18n-da koffice-i18n-de koffice-i18n-el koffice-i18n-en_GB koffice-i18n-eo koffice-i18n-es koffice-i18n-et koffice-i18n-fa koffice-i18n-fi koffice-i18n-fr koffice-i18n-he koffice-i18n-hu koffice-i18n-it koffice-i18n-ja koffice-i18n-lo koffice-i18n-lt koffice-i18n-mt koffice-i18n-nb koffice-i18n-nl koffice-i18n-nn koffice-i18n-pl koffice-i18n-pt koffice-i18n-pt_BR koffice-i18n-ro koffice-i18n-ru koffice-i18n-se koffice-i18n-sk koffice-i18n-sl koffice-i18n-sr koffice-i18n-sv koffice-i18n-ta koffice-i18n-tr koffice-i18n-uk koffice-i18n-zh_CN koffice-i18n-zh_TW koffice-i18n-zu
     3 kdegraphics-kdvi
   GNOME
     4 gnome-pim
@@ -73,10 +82,10 @@ OFFICE
     2 ggv 
 
 SPELLCHECK
-  5 aspell-br aspell-ca
+  5 aspell-af aspell-be aspell-bg aspell-br aspell-ca aspell-cs aspell-cy aspell-da aspell-de aspell-el aspell-en aspell-eo aspell-es aspell-fi aspell-fo aspell-fr aspell-ga aspell-gd aspell-gl aspell-gv aspell-hr aspell-hu aspell-id aspell-is aspell-it aspell-mi aspell-mk aspell-ms aspell-mt aspell-nl aspell-nn aspell-no aspell-pl aspell-pt aspell-ro aspell-ru aspell-sc aspell-sk aspell-sl aspell-sv aspell-sw aspell-tr aspell-uk aspell-wa aspell-zu
   5 ispell-af ispell-en
-  5 myspell-bg_BG myspell-ca_ES
-  5 myspell-hyph-cs myspell-hyph-da
+  5 myspell-af_ZA myspell-bg_BG myspell-ca_ES myspell-cs_CZ myspell-cy_GB myspell-da_DK myspell-de_AT myspell-de_CH myspell-de_DE myspell-el_GR myspell-en_AU myspell-en_CA myspell-en_GB myspell-en_NZ myspell-en_US myspell-es_ES myspell-es_MX myspell-et_EE myspell-fo_FO myspell-fr_BE myspell-fr_FR myspell-ga_IE myspell-gl_ES myspell-hr_HR myspell-hu_HU myspell-id_ID myspell-it_IT myspell-lt_LT myspell-mi_NZ myspell-ms_MY myspell-nb_NO myspell-nl_NL myspell-nn_NO myspell-pl_PL myspell-pt_BR myspell-pt_PT myspell-ro_RO myspell-ru_RU myspell-sk_SK myspell-sl_SI myspell-sv_SE myspell-sw_KE myspell-tn_ZA myspell-uk_UA myspell-zu_ZA
+  5 myspell-hyph-bg myspell-hyph-cs myspell-hyph-da myspell-hyph-de myspell-hyph-el myspell-hyph-en myspell-hyph-es myspell-hyph-et myspell-hyph-fi myspell-hyph-fr myspell-hyph-ga myspell-hyph-hu myspell-hyph-id myspell-hyph-is myspell-hyph-it myspell-hyph-lt myspell-hyph-nl myspell-hyph-pl myspell-hyph-pt myspell-hyph-ru myspell-hyph-sk myspell-hyph-sl myspell-hyph-sv myspell-hyph-uk
 
 SOUND
   5 KDE kdemultimedia-kmix
@@ -90,8 +99,8 @@ AUDIO
   5 audacity
   5 KDE kdemultimedia-kaudiocreator kdemultimedia-common
   5 gnome-media
-  4 GNOME gnome-audio
-  4 KDE rosegarden4
+  5 GNOME gnome-audio
+  5 KDE rosegarden4
   3 cdp
   3 cdparanoia
   3 cdrecord-cdda2wav
@@ -104,13 +113,13 @@ AUDIO
   3 timidity-instruments
   3 xmms
   3 DRIVER"^snd-" xmms-alsa gnome-alsamixer alsa-utils
-# the two following entries are for ISA sound cards and thus are not managed for now:
+
   3 DRIVER"^snd-sb" cspctl
   3 DRIVER"^sbawe" awesfx
   3 DRIVER"snd-emu10k1" as10k1
   3 DRIVER"snd-hdsp" hdsploader hdspmixer rmedigicontrol
   3 DRIVER"snd-ice1712|snd-ice1724" envy24control
-# unmanaged ISA too:
+
   3 DRIVER"snd-sscape" sscape_ctl
   3 DRIVER"snd-mixart" mixartloader
   3 DRIVER"snd-usb-audio" us428control usx2yloader
@@ -249,9 +258,9 @@ NETWORKING_GROUPWARE_SERVER
   3 phpgroupware
 
 NETWORKING_MAIL
-  5 mailx metamail
   5 KDE kdepim-kmail
   5 GNOME evolution
+  3 mailx metamail
   3 faces mozilla-mail
   3 fetchmail urlview mutt spamassassin
   3 !GNOME !KDE xmailbox
@@ -354,7 +363,7 @@ NETWORKING_WWW_SERVER
   4 BOOKS apache2-manual
   3 php-gd php-imap php-ldap php-mysql
     php-pgsql php-readline php_cgi mod_sxnet HTML-Embperl
-  3 BOOKS php-manual-en php-manual-fr
+  3 BOOKS php-manual-de php-manual-en php-manual-es php-manual-fr php-manual-it
 
 GRAPHICS
   5 qiv
@@ -420,7 +429,7 @@ DATABASES
   DEVELOPMENT 
     4 perl-Mysql
     3 postgresql-devel
-    1 MySQL-bench libmysql-devel
+    1 MySQL-bench libmysql12-devel libmysql-devel
 
 GAMES
   5 frozen-bubble
@@ -454,7 +463,7 @@ DEVELOPMENT
   2 gperf indent
   1 glibc-profile xxgdb
 
-  4 gcc-c++ libstdc++-devel
+  4 gcc-c++ libstdc++6-devel libstdc++-devel
   2 libsigc++-examples
 
   4 bison flex
@@ -471,7 +480,7 @@ DEVELOPMENT
   3 swig
 
   4 python tkinter
-  3 python-devel python-imaging pygtk-glarea pygtk pygtk-libglade rpm-python
+  3 libpython2.3-devel python-devel python-imaging pygtk-glarea pygtk pygtk-libglade rpm-python
 
   4 perl perl-Term-Readline-Gnu perl-libwww-perl perl-devel
   3 perl-DBI perl-IO-stringy perl-PDL perl-Parse-RecDescent 
@@ -500,17 +509,17 @@ DEVELOPMENT
     5 kdesdk
     5 libkdenetwork2-kopete-devel libkdebase4-kate-devel libkdepim2-common-devel
       libkdebase4-nsplugins-devel libkdepim2-kaddressbook-devel
-      libkdepim2-kmail-devel kdecore-devel libkdepim2-knode-devel
-      kdeedu-devel libkdepim2-kontact-devel libkdegames1-devel
+      libkdepim2-kmail-devel libkdecore4-devel kdecore-devel libkdepim2-knode-devel
+      libkdeedu1-devel kdeedu-devel libkdepim2-kontact-devel libkdegames1-devel
       libkdepim2-korganizer-devel libkdegraphics0-common-devel
       libkdepim2-kpilot-devel libkdegraphics0-kooka-devel
       libkdesdk1-cervisia-devel libkdegraphics0-kpovmodeler-devel
-      kdesdk-devel libkdegraphics0-ksvg-devel libkdesdk1-kbabel-devel
-      libkdegraphics0-kview-devel kdetoys-devel
+      libkdesdk1-devel kdesdk-devel libkdegraphics0-ksvg-devel libkdesdk1-kbabel-devel
+      libkdegraphics0-kview-devel libkdetoys1-devel kdetoys-devel
       libkdemultimedia1-common-devel libkdeutils1-common-devel
       libkdemultimedia1-kscd-devel libkdeutils1-ksim-devel
-      libkdemultimedia1-noatun-devel kdevelop-devel arts-devel
-      qt-devel quanta-devel libquanta0-kfilereplace-devel
+      libkdemultimedia1-noatun-devel libkdevelop3-devel kdevelop-devel libarts1-devel arts-devel
+      libqt3-devel qt-devel libquanta0-devel quanta-devel libquanta0-kfilereplace-devel
       libquanta0-kommander-devel koffice-devel
 
   GNOME
@@ -521,20 +530,20 @@ DEVELOPMENT
     1 libgnucash0-devel 
 
   DEVELOPMENT_OTHER
-    2 libMagick-devel libMesaGLU1-devel Xaw3d-devel
-      gd-devel p2c-devel gmp-devel guile-devel libgr-devel libjpeg-devel libpng-devel
-      libtermcap-devel libtiff-devel libungif-devel libxml-devel
-      slang-devel sox-devel zlib-devel libxorg-x11-devel dev86-devel
-      gdk-pixbuf-devel gimp-devel gpm-devel libghttp-devel libgtop-devel
-      libmikmod-devel librep-devel libunicode-devel popt-devel pwdb-devel t1lib-devel
-      libsnmp-devel mpeg_lib-devel WindowMaker-devel libaa-devel adns-devel
-      libalsa-devel audiofile-devel cups-devel e2fsprogs-devel
-      g-wrap-devel gkrellm-devel libPropList-devel licq-devel openldap-devel
-      parted-devel pciutils-devel pilot-link-devel svgalib-devel
-      recode-devel aspell-devel cracklib-devel faces-devel fnlib-devel
-      freetype-devel gtk+mdk-devel gtkglarea-devel libxorg-x11-static-devel imap-devel
-      php-devel pth-devel sane-devel swig-devel xdelta-devel isapnptools-devel
-      pango-devel readline-devel
+    2 libMagick6.4.0-devel libMagick-devel libMesaGLU1-devel libXaw3d7-devel Xaw3d-devel
+      libgd2-devel gd-devel p2c-devel libgmp3-devel gmp-devel libguile12-devel guile-devel libgr-devel libjpeg62-devel libjpeg-devel libpng3-devel libpng-devel
+      libtermcap2-devel libtermcap-devel libtiff3-devel libtiff-devel libungif4-devel libungif-devel libxml2-devel libxml-devel
+      libslang1-devel slang-devel sox-devel zlib1-devel zlib-devel libxorg-x11-devel dev86-devel
+      libgdk-pixbuf2-devel gdk-pixbuf-devel libgimp2.0-devel gimp-devel libgpm1-devel gpm-devel libghttp1-devel libghttp-devel libgtop2.0_2-devel libgtop-devel
+      libmikmod2-devel libmikmod-devel librep-devel libunicode-devel popt-devel libpwdb0-devel pwdb-devel t1lib1-devel t1lib-devel
+      libsnmp-devel mpeg_lib-devel libWindowMaker0-devel WindowMaker-devel libaa1-devel libaa-devel libadns1-devel adns-devel
+      libalsa2-devel libalsa-devel libaudiofile0-devel audiofile-devel libcups2-devel cups-devel e2fsprogs-devel
+      libg-wrap1-devel g-wrap-devel gkrellm-devel libPropList-devel licq-devel openldap-devel
+      libparted1.6-devel parted-devel pciutils-devel pilot-link-devel svgalib-devel
+      librecode0-devel recode-devel libaspell15-devel aspell-devel cracklib-devel faces-devel libfnlib0-devel fnlib-devel
+      libfreetype6-devel freetype-devel gtk+mdk-devel libgtkglarea5-devel gtkglarea-devel libxorg-x11-static-devel imap-devel
+      php432-devel php-devel libpth20-devel pth-devel libsane1-devel sane-devel swig-devel xdelta-devel isapnptools-devel
+      libpango1.0_0-devel pango-devel libreadline4-devel readline-devel
 
 MONITORING
   5 procinfo psacct
@@ -570,7 +579,7 @@ CONFIG
   1 ipxutils
 
 BOOKS
-  4 mandrake-doc-de mandrake-doc-es
+  4 mandrake-doc-de mandrake-doc-es mandrake-doc-fr mandrake-doc-it mandrake-doc-zh_cn
   4 !LOCALES"fr" !LOCALES"it" !LOCALES"es" mandrake-doc-en
 
 X
@@ -582,7 +591,7 @@ X
   5 LOCALES"ko" scim-hangul
   5 LOCALES"vi" x-unikey
   5 LOCALES"zh" scim-chinese
-  
+
   4 vim-enhanced
   4 gurpmi rpmdrake drakconf userdrake fonts-ttf-decoratives fonts-ttf-west_european
     mandrake-mime menudrake mandrake_desk
@@ -598,7 +607,7 @@ X
 
   1 ami fcitx imhangul im-ja miniChinput nabi skim xcin xvnkb
 
-  2 app-defaults-be app-defaults-cs
+  2 app-defaults-be app-defaults-cs app-defaults-ga app-defaults-ru app-defaults-th app-defaults-uk
 
   5 LOCALES"ru" || LOCALES"uk" xorg-x11-cyrillic-fonts
     LOCALES"am" fonts-ttf-ethiopic
@@ -624,10 +633,10 @@ SYSTEM
 
   5 lshw dmidecode
 
-  5 HIGH_SECURITY libsafe kernel-secure lads
-  5 BIGMEM kernel
-  5 SMP kernel-smp
-  5 BIGMEM SMP kernel-enterprise
+  5 HIGH_SECURITY libsafe kernel-secure-2.6.8.1.11mdk kernel-secure lads
+  5 BIGMEM kernel-2.6.8.1.11mdk kernel
+  5 SMP kernel-smp-2.6.8.1.11mdk kernel-smp
+  5 BIGMEM SMP kernel-enterprise-2.6.8.1.11mdk kernel-enterprise
   5 PCMCIA pcmcia-cs
   5 USB hotplug
 
@@ -644,7 +653,7 @@ SYSTEM
 
   5 GNOME || KDE magicdev
 
-  5 DRIVER"slamr|slusb" slmodem-kernel
+  5 DRIVER"slamr|slusb" slmodem-kernel--------------------------- slmodem-kernel-------------------------- slmodem-kernel-------------------------- slmodem-kernel------------------------- slmodem-kernel------------------------- slmodem-kernel------------------------ slmodem-kernel------------------------ slmodem-kernel----------------------- slmodem-kernel----------------------- slmodem-kernel---------------------- slmodem-kernel---------------------- slmodem-kernel--------------------- slmodem-kernel--------------------- slmodem-kernel-------------------- slmodem-kernel-------------------- slmodem-kernel------------------- slmodem-kernel------------------- slmodem-kernel------------------ slmodem-kernel------------------ slmodem-kernel----------------- slmodem-kernel----------------- slmodem-kernel---------------- slmodem-kernel---------------- slmodem-kernel--------------- slmodem-kernel--------------- slmodem-kernel-------------- slmodem-kernel-------------- slmodem-kernel------------- slmodem-kernel------------- slmodem-kernel------------ slmodem-kernel------------ slmodem-kernel----------- slmodem-kernel----------- slmodem-kernel---------- slmodem-kernel---------- slmodem-kernel--------- slmodem-kernel--------- slmodem-kernel-------- slmodem-kernel-------- slmodem-kernel------- slmodem-kernel------- slmodem-kernel------ slmodem-kernel------ slmodem-kernel----- slmodem-kernel----- slmodem-kernel---- slmodem-kernel---- slmodem-kernel--- slmodem-kernel--- slmodem-kernel-- slmodem-kernel-- slmodem-kernel- slmodem-kernel- slmodem-kernel
   5 DRIVER"^ISDN:" ibod isdn4net isdn4k-utils
   5 DRIVER"adiusbadsl" eagle-usb
   5 KDE  DRIVER"bcm203x|bfusb|hci_usb" kdebluetooth 
@@ -654,16 +663,16 @@ SYSTEM
   5 DRIVER"ath_pci" madwifi_kernel madwifi
   5 DRIVER"speedtch" speedtouch speedtouch_mgmt
   5 DRIVER"^ISDN:|^Hcf:|^Hsf:|^LT:|speedtch"
-      kernel-2.4
-      SMP kernel-smp-2.4
-      BIGMEM kernel-enterprise-2.4
+      kernel-2.4.27.0.pre2.1mdk kernel-2.4
+      SMP kernel-smp-2.4.27.0.pre2.1mdk kernel-smp-2.4
+      BIGMEM kernel-enterprise-2.4.27.0.pre2.1mdk kernel-enterprise-2.4
 
   5 atmel-firmware prism54-firmware
   5 bluez-utils
-  
+
   5 KDE TYPE"laptop" kdeutils-klaptop
   5 TYPE"laptop" cpufreq apmd
-  
+
   4 ftp-client-krb5 hexedit strace sudo grub procmail hdparm coreutils-doc
   4 TYPE"laptop" netprofile
 
@@ -672,9 +681,9 @@ SYSTEM
   1 fdutils genromfs mailcap pinfo
 
   BOOKS 
-    5 man-pages-cs man-pages-da
+    5 man-pages-cs man-pages-da man-pages-de man-pages-es man-pages-fr man-pages-hu man-pages-id man-pages-it man-pages-ja man-pages-ko man-pages-pl man-pages-pt_BR man-pages-ru man-pages-zh
     4 grub-doc lilo-doc
-      howto-html-de howto-html-el
+      howto-html-de howto-html-el howto-html-en howto-html-es howto-html-fi howto-html-fr howto-html-hu howto-html-id howto-html-it howto-html-ja howto-html-ko howto-html-nl howto-html-pl howto-html-ro howto-html-sl howto-html-sv howto-html-zh
 
   4 NIS yp-tools
   3 TYPE"laptop" irda-utils
@@ -695,7 +704,7 @@ PRINTER
 
 INSTALL
   NOCOPY
-    5 kernel kernel-smp kernel-i686-up-4GB
+    5 kernel-2.6.8.1.11mdk kernel kernel-smp-2.6.8.1.11mdk kernel-smp kernel-i686-up-4GB-2.4.27.0.pre2.1mdk kernel-i686-up-4GB
       mdadm lvm2 reiserfsprogs jfsprogs xfsprogs 
       alsa-utils xorg-x11 xorg-x11-server 
     4 brltty
@@ -709,7 +718,7 @@ INSTALL
     hotplug ypbind
     autofs pam_ldap pam_krb5 libsasl2-plug-gssapi nss_ldap openldap-clients samba-winbind
     tmdns zcip acpi acpid
-    ibod isdn4net isdn-light isdn4k-utils kernel-2.4
+    ibod isdn4net isdn-light isdn4k-utils kernel-2.4.27.0.pre2.1mdk kernel-2.4
     eagle-usb
     speedtouch speedtouch_mgmt
     kdenetwork-kppp-provider