merge

0 files changed, 0 insertions, 0 deletions
diff --git a/po/.cvsignore b/po/.cvsignore
index 5d764cac..bb84ee8c 100644
--- a/po/.cvsignore
+++ b/po/.cvsignore
@@ -1,3 +1,4 @@
 *.mo
 .intltool-merge-cache
-*.pof
-\ No newline at end of file
+*.pof
+*.pog
diff --git a/po/af.po b/po/af.po
index 9ac0f6d7..961243f9 100644
--- a/po/af.po
+++ b/po/af.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: Tue Sep 19 2000 08:40:28+0200\n"
 "Last-Translator: Schalk W. Cronj� <schalkc@ntaba.co.za>\n"
 "Language-Team: Afrikaans <lia@af.org.za>\n"
@@ -21,9 +21,15 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Verwyder media"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
@@ -31,6 +37,11 @@ msgstr ""
 "Wag asb.\n"
 "Media word sorteer"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Canada"
@@ -38,12 +49,7 @@ msgstr "Kanadees (Quebec)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -61,24 +67,19 @@ msgstr ""
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Ontwikkelingsopdaterings"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -110,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Soek"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -131,11 +137,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -149,6 +150,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Installasievoorbereiding"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -166,19 +172,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Installering:"
+msgid "True type"
+msgstr "Tipe"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Graphics"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Installering:"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -194,11 +210,6 @@ msgstr ""
 "Om alle afhanklikhede te bevredig moet hierdie\n"
 "pakkette verwyder word:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Ontwikkelingsopdaterings"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -216,7 +227,7 @@ msgstr "Fout..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -307,21 +318,11 @@ msgid "Password:"
 msgstr "Wagwoord:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Beskrywings"
@@ -342,6 +343,11 @@ msgstr ""
 msgid "All packages, by update availability"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Packaging"
+msgstr "Pakket"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -360,6 +366,11 @@ msgid "Greece"
 msgstr "Grieks"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "CUPS word gelaai"
@@ -412,11 +423,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -479,6 +485,11 @@ msgstr "Poort:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -489,6 +500,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Ander"
 
@@ -497,34 +513,29 @@ msgstr "Ander"
 msgid "Sweden"
 msgstr "Sien"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Boards"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Ontwikkelingsopdaterings"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspect..."
+msgid "Info..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Cards"
+msgid "Inspect..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -533,24 +544,19 @@ msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Opsomming"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Ontwikkelingsopdaterings"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -568,6 +574,11 @@ msgstr "Verwyder media"
 msgid "Importance: "
 msgstr "Belangrikhied: %s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -599,11 +610,6 @@ msgid "Medium"
 msgstr "Belgies"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Grootte"
@@ -628,11 +634,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Dateer media op"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Ontwikkelingsopdaterings"
-
 #
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -671,6 +672,11 @@ msgstr "Daar was probleme tydens installasie"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -681,16 +687,6 @@ msgstr ""
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "%d geselekteerde pakkette: %.1f MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Ander"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -711,11 +707,6 @@ msgstr "Afdwing"
 msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Adventure"
-msgstr ""
-
 #
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -727,14 +718,20 @@ msgstr "Plaaslik"
 msgid "All packages, by group"
 msgstr " Pakkette:"
 
+#
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "algemeen"
+
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -749,6 +746,16 @@ msgstr "Soek"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -762,6 +769,11 @@ msgstr ""
 msgid "Stop"
 msgstr "Sektor"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
@@ -769,6 +781,16 @@ msgstr ""
 "Wag asb.\n"
 "Media word sorteer"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -819,6 +841,11 @@ msgstr ""
 msgid "Finland"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -835,13 +862,13 @@ msgid "Save changes"
 msgstr "Pakkette:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Netwerkinstellings:"
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -850,6 +877,11 @@ msgstr ""
 msgid "More info"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Computer books"
+msgstr ""
+
 #
 #: ../rpmdrake:1
 #, c-format
@@ -872,16 +904,6 @@ msgid "Spain"
 msgstr "Spaans"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Ontwikkelingsopdaterings"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr ""
@@ -894,11 +916,6 @@ msgid "Files:\n"
 msgstr "/_L�er"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Kies u pakkette"
@@ -908,6 +925,11 @@ msgstr "Kies u pakkette"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Chat"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -919,11 +941,6 @@ msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Netwerk"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -977,9 +994,9 @@ msgid "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Ontwikkelingsopdaterings"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -992,11 +1009,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Installasievoorbereiding"
@@ -1016,21 +1028,11 @@ msgstr ""
 "Wag asb.\n"
 "Media word sorteer"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Ander"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Inteken:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Netwerk"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
@@ -1041,16 +1043,6 @@ msgstr "Belgies"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure proxies"
@@ -1058,6 +1050,11 @@ msgstr ""
 "Dateer\n"
 "media op"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Waarskuwing"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1065,11 +1062,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1083,16 +1075,6 @@ msgstr ""
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "Ontwikkelingsopdaterings"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1104,12 +1086,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1124,24 +1101,21 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Media"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
+#, fuzzy, c-format
+msgid "Configuration"
 msgstr ""
+"Dateer\n"
+"media op"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #
@@ -1172,7 +1146,7 @@ msgstr "Daar was probleme tydens installasie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1194,23 +1168,38 @@ msgid "No package found for installation."
 msgstr "Installasievoorbereiding"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Tipe"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Beskrywings"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1218,6 +1207,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1249,11 +1248,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Netwerk"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Naam: %s"
 
@@ -1294,7 +1288,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1309,12 +1303,22 @@ msgstr "Kies geen"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1367,9 +1371,9 @@ msgid "Bugfixes updates"
 msgstr "Vertoon foutkorreksiegraderings"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Netwerk"
+#, c-format
+msgid "Java"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1388,19 +1392,14 @@ msgstr ""
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
+msgid "Enabled?"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1428,16 +1427,6 @@ msgstr "Ge�nstalleer"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Ontwikkelingsopdaterings"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1445,12 +1434,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
+msgid "Too many packages are selected"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
+msgid "Physics"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1463,17 +1452,17 @@ msgstr "CUPS word gelaai"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Netwerk"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Mail"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Help"
 msgstr "/_Help"
@@ -1483,6 +1472,11 @@ msgstr "/_Help"
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Taiwan"
@@ -1510,7 +1504,7 @@ msgstr " Pakkette:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1523,6 +1517,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Ontwikkelingsopdaterings"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1550,11 +1549,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1563,6 +1557,11 @@ msgstr ""
 msgid "Mandrake Update"
 msgstr "Normale opdaterings"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Ander"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1575,12 +1574,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1594,6 +1593,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1625,22 +1629,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Ontwikkelingsopdaterings"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Naam"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1665,7 +1659,7 @@ msgstr "Naam"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #
@@ -1674,6 +1668,11 @@ msgstr ""
 msgid "No update"
 msgstr "Doen opdaterings"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Netwerk"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1684,6 +1683,16 @@ msgstr "OK"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1696,6 +1705,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1704,11 +1718,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Media"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1774,11 +1783,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2065,6 +2069,62 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "Stoor"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Ontwikkelingsopdaterings"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Ontwikkelingsopdaterings"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Ontwikkelingsopdaterings"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Netwerkinstellings:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Ontwikkelingsopdaterings"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Netwerk"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Ontwikkelingsopdaterings"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Ander"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Netwerk"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Ontwikkelingsopdaterings"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Netwerk"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Netwerk"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Ontwikkelingsopdaterings"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "bots met %s-%s-%s"
 
@@ -2175,10 +2235,6 @@ msgstr ""
 #~ msgid "security"
 #~ msgstr "sekuriteit"
 
-#
-#~ msgid "general"
-#~ msgstr "algemeen"
-
 #~ msgid "bugfix"
 #~ msgstr "foutkorreksie"
 
@@ -2196,9 +2252,6 @@ msgstr ""
 #~ "Kan nie die opgraderingspakketlys onttrek nie\n"
 #~ "Probeer 'n ander spie�l"
 
-#~ msgid "Warning"
-#~ msgstr "Waarskuwing"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2269,15 +2322,9 @@ msgstr ""
 #~ msgid "/Help/_About..."
 #~ msgstr "/Help/_Aangaande..."
 
-#~ msgid "Name"
-#~ msgstr "Naam"
-
 #~ msgid "Installed"
 #~ msgstr "Ge�nstalleer"
 
-#~ msgid "Type"
-#~ msgstr "Tipe"
-
 #~ msgid "Source on network: (random mirror)\n"
 #~ msgstr "Bron op netwerk: (lukrake spie�l)\n"
 
@@ -2435,9 +2482,6 @@ msgstr ""
 #~ msgid " Mirrors "
 #~ msgstr " Spie�ls"
 
-#~ msgid "Package "
-#~ msgstr "Pakket"
-
 #~ msgid "%d packages have been added to the list of packages to install"
 #~ msgstr "%d pakkette is by die pakketinstallasielys gevoeg."
 
@@ -2489,9 +2533,6 @@ msgstr ""
 #~ msgid "Apply"
 #~ msgstr "Toepas"
 
-#~ msgid "Save"
-#~ msgstr "Stoor"
-
 #~ msgid ""
 #~ "\n"
 #~ "Importance: %s\n"
diff --git a/po/af.pom b/po/af.pom
index 92e8fffe..81e5fc72 100644
--- a/po/af.pom
+++ b/po/af.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Werkstasie"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafiese omgewing"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Ontwikkeling"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Bediener"
 
diff --git a/po/ar.po b/po/ar.po
index efd363f0..65c50414 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-06-23 22:07-0300\n"
 "Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
 "Language-Team: Arabic\n"
@@ -19,14 +19,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "أرشفة/أخرى"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "الشبكات/الوصول البعيد"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "انتظر من فضلك, جاري تحديث الوسائط..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -34,13 +44,8 @@ msgstr "كندا"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "علوم/علوم الحاسب"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "علوم/فيزياء"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -57,25 +62,20 @@ msgstr "تم تثبيت كل شئ بشكل صحيح"
 msgid "Verifying packages signatures..."
 msgstr "جاري التأكد من توقيعات الحزم..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "النظام/التهيئة/أخرى"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "الشبكات/نقل الملفات"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "النظام/التهيئة/الشبكات"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "تطوير/KDE و Qt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "النظام/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "يجب عليك ملء الحقلين الأولين على الأقل."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "نتائج البحث"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "سطح المكتب الرسومي/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -135,11 +140,6 @@ msgstr "حرر مجموعة متوازية"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "النظام/التهيئة/العتاد"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "كيفية اختيار المرآة يدوياً"
 
@@ -153,6 +153,11 @@ msgstr "النشر"
 msgid "Package installation..."
 msgstr "تثبيت الحزم..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "تطوير/GNOME و GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -169,6 +174,21 @@ msgid "Shells"
 msgstr "برامج سطر الأوامر"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "علوم/كيمياء"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "الرسوم"
@@ -180,11 +200,6 @@ msgstr "ايطاليا"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "النظام/النواة و العتاد"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -199,11 +214,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "أحد هذه الحزم مطلوب:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "تطوير/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,9 +230,9 @@ msgid "Proxy..."
 msgstr "اعدادات البروكسي..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "النظام/التهيئة/بدء التشغيل"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "كتب/أدب"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -326,21 +336,11 @@ msgstr "كلمة المرور:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "النظام/الخادمات"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "تثبيت الحزم البرمجية"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "سطح المكتب الرسومي/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "في الوصف"
 
@@ -359,6 +359,11 @@ msgstr "هذه الحزم الاضافية يجب أن تحذف"
 msgid "All packages, by update availability"
 msgstr "كل الحزم, بتوافر التحديث"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -376,6 +381,11 @@ msgstr "اليونان"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "مراقبة النظام"
 
@@ -427,11 +437,6 @@ msgstr "اختار المرآة..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "سطح المكتب الرسومي/WindowMaker"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -501,6 +506,11 @@ msgstr "المسار:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "جاري تنزيل الحزمة `%s' (%s/%s)..."
 
@@ -511,6 +521,11 @@ msgstr "البروتوكول:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "أخرى"
 
@@ -519,36 +534,31 @@ msgstr "أخرى"
 msgid "Sweden"
 msgstr "السويد"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "ألعاب/ألعاب لوحات"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "النمسا"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "معلومات..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "الشبكات/نقل الملفات"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "تطوير/أخرى"
+msgid "Info..."
+msgstr "معلومات..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "تحقَّق..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "ألعاب/ألعاب ورقية"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -556,23 +566,18 @@ msgstr "اليابان"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "الشبكات/الوصول البعيد"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "نبذة: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "النظام/الخطوط/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "تطوير/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -589,6 +594,11 @@ msgstr "احذف .%s"
 msgid "Importance: "
 msgstr "الأهمية: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -631,11 +641,6 @@ msgstr "الوسيط"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "النظام/التدويل"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "الحجم: "
 
@@ -659,11 +664,6 @@ msgstr "أضف مجموعة موازية"
 msgid "Update media"
 msgstr "حدّث الوسائط"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "تطوير/قواعد البيانات"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -699,6 +699,11 @@ msgstr "مشكلة أثناء التثبيت"
 msgid "Terminals"
 msgstr "محاكيات الطرفيات"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "النظام/النواة و العتاد"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -709,16 +714,6 @@ msgstr "حرّر"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "تم اختيار: %d ميغابايت / المساحة المتوفرة في القرص: %d ميغابايت"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "كتب/أخرى"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "علوم/أخرى"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -741,11 +736,6 @@ msgstr "جاري اختبار الملف البعيد للوسيط `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "ألعاب/مغامرات"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "في الملفات"
 
@@ -756,13 +746,18 @@ msgstr "كل الحزم, بالمجموعة"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "سطح المكتب الرسومي/مبني على FVWM"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "ألعاب/رياضة"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -775,6 +770,16 @@ msgid "Search results (none)"
 msgstr "نتائج البحث (لا شئ)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "ألعاب/مغامرات"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "الأرشفة/نسخ الأقراص"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -794,11 +799,26 @@ msgstr ""
 msgid "Stop"
 msgstr "قف"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "علوم/أحياء"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "انتظر من فضلك, جاري انشاء hdlist..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "علوم/رياضيات"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "النظام/التدويل"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -853,6 +873,11 @@ msgstr ""
 msgid "Finland"
 msgstr "فنلندا"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "النظام/الخطوط/X11 bitmap"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -869,14 +894,14 @@ msgid "Save changes"
 msgstr "احفظ التغييرات"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "الشبكات/الأخبار"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "الشبكات/المراسلة الفورية"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "كتب/أسئلة متكررة"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -885,6 +910,11 @@ msgid "More info"
 msgstr "مزيد من المعلومات"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "كتب/كتب الكمبيوتر"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "ابحث"
@@ -911,16 +941,6 @@ msgstr "أسبانيا"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "علوم/علم الفلك"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "تطوير/نواة النظام"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "وسيط تحديث موجود مسبقاً"
 
@@ -931,11 +951,6 @@ msgstr "الملفات:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "ألعاب/أركيد"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "تعذر الحصول على الحزم المصدرية"
 
@@ -944,6 +959,11 @@ msgstr "تعذر الحصول على الحزم المصدرية"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "يجب عليك تحديد امس مستخدم/كلمة مرور للمصادقة في البروكسي:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "الصين"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -956,11 +976,6 @@ msgstr "هناك حزم اضافية مطلوبة"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "الشبكات/المحادثة"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "جاري التشغيل في وضع المستخدم"
 
@@ -1021,9 +1036,9 @@ msgid "Find:"
 msgstr "ابحث عن:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "تطوير/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "النظام/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1037,11 +1052,6 @@ msgstr "الأجهزة القابلة للإزالة"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "سطح المكتب الرسومي/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "جاري تحضير الحزم للتثبيت..."
 
@@ -1055,21 +1065,11 @@ msgstr "انتظر من فضلك, جاري ازالة الحزم..."
 msgid "Please wait, adding medium..."
 msgstr "انتظر من فضلك, جاري اضافة الوسيط..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "ألعاب/أخرى"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "اسم الدخول:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "الشبكات/أخرى"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1080,21 +1080,16 @@ msgstr "بلجيكا"
 msgid "File tools"
 msgstr "أدوات الملفات"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "الأرشفة/نسخ الأقراص"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "علوم/أحياء"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "تهيئة البروكسي"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1102,11 +1097,6 @@ msgstr "جاري بدء تنزيل `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "النظام/المكتبات"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "ظهر خطأ قاتل: %s"
 
@@ -1120,16 +1110,6 @@ msgstr "خطأ قاتل"
 msgid "Leaves only, sorted by install date"
 msgstr "المتروكات فقط, مرتبة حسب تاريخ التثبيت"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "ألعاب/استراتيجية"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "تطوير/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1144,14 +1124,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "الأرشفة/الضغط"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "كتب/أدب"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "علوم/علوم الأرض"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1163,25 +1138,20 @@ msgstr "فضلاً اختر المرآة المطلوبة."
 msgid "Communications"
 msgstr "اتصالات"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "سطح المكتب الرسومي/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "جاري تحرير المجموعة الموازية \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "سبب التحديث:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "اتصالات"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "علوم/رياضيات"
+msgid "Reason for update: "
+msgstr "سبب التحديث:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1210,8 +1180,8 @@ msgstr "ظهرت مشاكل أثناء الحذف"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "سطح المكتب الرسومي/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1236,29 +1206,54 @@ msgstr "تعذر ايجاد حزم للتثبيت."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "الوسيط: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "ألعاب/استراتيجية"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "وصف:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "أرشفة/أخرى"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "علوم/كيمياء"
+#, fuzzy, c-format
+msgid "System"
+msgstr "النظام/أساسيات"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "النظام/الخادمات"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "ألعاي/ألغاز"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1286,11 +1281,6 @@ msgstr "قواعد البيانات"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "الشبكات/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "الإسم: "
 
@@ -1336,8 +1326,8 @@ msgstr "فيديو"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "تطوير/GNOME و GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1350,14 +1340,24 @@ msgid "Selected"
 msgstr "مختار"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "علوم/علوم الحاسب"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "أقضى المعلومات"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "الأرشفة/النسخ الاحتياطي"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1413,9 +1413,9 @@ msgid "Bugfixes updates"
 msgstr "تحديثات ازالة العيوب"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "الشبكات/الإنترنت"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "اليابان"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1432,6 +1432,11 @@ msgstr "اتنظر من فضلك, جاري ايجاد الحزم المتوفر�
 msgid "Cancel"
 msgstr "الغاء"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "علوم/أخرى"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1439,16 +1444,6 @@ msgstr "متاح؟"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "علوم/علوم الأرض"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "النظام/الخطوط/سطر الأوامر"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "كل الحزم, أبجدياً"
 
@@ -1472,16 +1467,6 @@ msgstr "انتهى التثبيت"
 msgid " done."
 msgstr " تم."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "تطوير/KDE و Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "كتب/مذكرات (كيف أعمل)"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1489,15 +1474,15 @@ msgstr "تحتاج الى ادخال الوسيط للمتابعة"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "ألعاب/ألعاب لوحات"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "تم اختيار حزم كثيرة"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "علوم/فيزياء"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "لا تفعل شيئاً"
@@ -1507,17 +1492,17 @@ msgstr "لا تفعل شيئاً"
 msgid "Danmark"
 msgstr "الدنمارك"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "الشبكات/البريد الألكتروني"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "خطأ أثناء التنزيل"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "البرازيل"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "مساعدة"
@@ -1527,6 +1512,11 @@ msgstr "مساعدة"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "تعذر الحصول على الحزم المصدرية, عفواً %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "ألعاب/رياضة"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1553,9 +1543,9 @@ msgid "All packages, by medium repository"
 msgstr "كل الحزم, بمخزن الوسيط"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "النظام/الخطوط/X11 bitmap"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "الأرشفة/الضغط"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1567,6 +1557,11 @@ msgstr "تنزيل `%s', الوقت المتبقي:%s, السرعة:%s"
 msgid "Add a host"
 msgstr "أضف مستضيف"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "تطوير/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1594,11 +1589,6 @@ msgstr "غير الوسيط"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "سطح المكتب الرسومي/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "أعد الإختيار من جديد"
 
@@ -1607,6 +1597,11 @@ msgstr "أعد الإختيار من جديد"
 msgid "Mandrake Update"
 msgstr "تحديث Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "كتب/أسئلة متكررة"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1623,14 +1618,14 @@ msgstr ""
 "فضلا حاول مرة أخرى في وقت لاحق."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "كتب/كتب الكمبيوتر"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "كتب/مذكرات (كيف أعمل)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "النظام/أساسيات"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1646,6 +1641,11 @@ msgstr ""
 "ربما تحتاج الى تحديث فاعدة بيانات الوسائط ."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "النظام/المكتبات"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1683,24 +1683,14 @@ msgid "Currently installed version: "
 msgstr "الإصدار المثبت حالياً:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "تطوير/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "النظام/التهيئة/الطباعة"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "ألعاي/ألغاز"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "ألعاب/ألعاب ورقية"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "النظام/التهيئة/الحزم"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "علوم/علم الفلك"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1724,14 +1714,19 @@ msgstr "الإسم:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "سطح المكتب الرسومي/أخرى"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "لا تحديث"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "الشبكات/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1742,6 +1737,16 @@ msgstr "موافق"
 msgid "Text tools"
 msgstr "أدوات النصوص"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "ألعاب/ألعاب ورقية"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1753,6 +1758,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "أدخل اسم المستضيف أو عنوان IP الخاص بالمستضيف المطلوب اضافته:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "ألعاب/أركيد"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1762,11 +1772,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "جاري تحرير الوسيط \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "الشبكات/المراسلة الفورية"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1830,11 +1835,6 @@ msgstr ""
 "هذه الأداة ستساعدك في اختيار التحديثات التي تريد تثبيتها على\n"
 "جهازك."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "النظام/الخطوط/True Type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2115,6 +2115,128 @@ msgstr "احذف البرنامج"
 msgid "Software Sources Manager"
 msgstr "مدير مصادر البرمجيات"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "النظام/التدويل"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "أدوات الملفات"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "سطح المكتب الرسومي/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "علوم/علوم الحاسب"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "النظام/الخادمات"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "قواعد البيانات"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "سطح المكتب الرسومي/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "علوم/علوم الحاسب"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "النظام/التهيئة/أخرى"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "النظام/التهيئة/الشبكات"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "النظام/التهيئة/العتاد"
+
+#~ msgid "Development/Python"
+#~ msgstr "تطوير/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "النظام/التهيئة/بدء التشغيل"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "سطح المكتب الرسومي/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "تطوير/أخرى"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "النظام/الخطوط/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "تطوير/قواعد البيانات"
+
+#~ msgid "Books/Other"
+#~ msgstr "كتب/أخرى"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "سطح المكتب الرسومي/مبني على FVWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "الشبكات/الأخبار"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "تطوير/نواة النظام"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "الشبكات/المحادثة"
+
+#~ msgid "Development/Perl"
+#~ msgstr "تطوير/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "سطح المكتب الرسومي/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "ألعاب/أخرى"
+
+#~ msgid "Networking/Other"
+#~ msgstr "الشبكات/أخرى"
+
+#~ msgid "Development/Java"
+#~ msgstr "تطوير/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "سطح المكتب الرسومي/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "الأرشفة/النسخ الاحتياطي"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "الشبكات/الإنترنت"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "النظام/الخطوط/سطر الأوامر"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "الشبكات/البريد الألكتروني"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "سطح المكتب الرسومي/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "تطوير/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "النظام/التهيئة/الطباعة"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "النظام/التهيئة/الحزم"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "سطح المكتب الرسومي/أخرى"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "النظام/الخطوط/True Type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s تتعارض مع %s"
 
diff --git a/po/ar.pom b/po/ar.pom
index a41f2a72..99a7b433 100644
--- a/po/ar.pom
+++ b/po/ar.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "محطة عمل"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "بيئات رسومية"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "تطوير"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "خادم"
 
diff --git a/po/az.po b/po/az.po
index 64554429..14b16259 100644
--- a/po/az.po
+++ b/po/az.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-02-22 19:26+0200\n"
 "Last-Translator: Mətin Əmirov <metin@karegen.com>\n"
 "Language-Team: Azerbaijani Turkish <linuxaz@azerimal.net>\n"
@@ -19,14 +19,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Çıxardıla Bilən"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Asılılıqlar yoxlanılır..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -34,12 +44,7 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -57,24 +62,19 @@ msgstr "Paket onsuz da quruludur"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Gəlişdirmə Güncəlləmələri"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -106,6 +106,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Axtarış Nəticələri"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -127,11 +132,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -145,6 +145,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Paketlər yükləmə üçün hazırlanır..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -164,21 +169,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Qurulmuşlar"
+msgid "True type"
+msgstr "Növ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Qurulmuşlar"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -190,11 +205,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Gəlişdirmə Güncəlləmələri"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -212,7 +222,7 @@ msgstr "Xəta..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -301,21 +311,11 @@ msgid "Password:"
 msgstr "Parol:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Paketlər yükləmə üçün hazırlanır..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "İzahatlar"
@@ -337,6 +337,11 @@ msgstr ""
 msgid "All packages, by update availability"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -353,6 +358,11 @@ msgid "Greece"
 msgstr "Yunanca"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "amma oxşamır"
@@ -405,11 +415,6 @@ msgstr "Əksi seçin:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -475,6 +480,11 @@ msgstr "cığır:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' Paketi endirilir (%s/%s)..."
 
@@ -485,6 +495,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Digər"
 
@@ -493,34 +508,29 @@ msgstr "Digər"
 msgid "Sweden"
 msgstr "İsveçcə"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Boards"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "serial"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Gəlişdirmə Güncəlləmələri"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspect..."
+msgid "Info..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Cards"
+msgid "Inspect..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -529,24 +539,19 @@ msgid "Japan"
 msgstr "Yaponiya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Qısaca"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Gəlişdirmə Güncəlləmələri"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -563,6 +568,11 @@ msgstr "Çıxardıla Bilən"
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Unable to create medium."
@@ -599,11 +609,6 @@ msgid "Medium"
 msgstr "Belçika dili"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Böyüklük"
@@ -628,11 +633,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Mənbələri Düzəlt"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Gəlişdirmə Güncəlləmələri"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -668,6 +668,11 @@ msgstr "Qurma əsnasında problemlər oldu"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -678,16 +683,6 @@ msgstr "Düzəlt"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Digər"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Australia"
@@ -709,11 +704,6 @@ msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in files"
 msgstr "Yerli"
@@ -724,13 +714,18 @@ msgid "All packages, by group"
 msgstr "o paket, o bayt"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "ümumi"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -745,6 +740,16 @@ msgstr "Axtarış Nəticələri"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -758,11 +763,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Sektor"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Asılılıqlar yoxlanılır..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -811,6 +831,11 @@ msgstr "`%s' paketi qurula bilmir\n"
 msgid "Finland"
 msgstr "Axtar:"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -827,13 +852,13 @@ msgid "Save changes"
 msgstr "Paketlər"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Şəbəkə qurğuları:"
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -843,6 +868,11 @@ msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Search"
 msgstr "Axtarış Nəticələri"
@@ -863,16 +893,6 @@ msgid "Spain"
 msgstr "İspaniya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Gəlişdirmə Güncəlləmələri"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Asılılıqlar yoxlanılır..."
@@ -883,11 +903,6 @@ msgid "Files:\n"
 msgstr "/_Fayl"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
@@ -897,6 +912,11 @@ msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Çin"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -908,11 +928,6 @@ msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Şəbəkə"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -966,9 +981,9 @@ msgid "Find:"
 msgstr "Axtar:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Gəlişdirmə Güncəlləmələri"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -981,11 +996,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Paketlər yükləmə üçün hazırlanır..."
@@ -1000,21 +1010,11 @@ msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
 msgid "Please wait, adding medium..."
 msgstr "Asılılıqlar yoxlanılır..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Digər"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Login:"
 msgstr "giriş:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Şəbəkə"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
@@ -1025,21 +1025,16 @@ msgstr "Belçika dili"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure proxies"
 msgstr "Mənbəni quraq?"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Xəbərdarlıq"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1047,11 +1042,6 @@ msgstr "`%s' paketinin imzası yoxlanır..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1065,16 +1055,6 @@ msgstr "Fayl xətası"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "Gəlişdirmə Güncəlləmələri"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1086,12 +1066,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1106,24 +1081,19 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Mənbələri Düzəlt"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Mənbəni quraq?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1153,7 +1123,7 @@ msgstr "Qurma əsnasında problemlər oldu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1178,23 +1148,38 @@ msgid "No package found for installation."
 msgstr "Paketlər yükləmə üçün hazırlanır..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Növ"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "İzahatlar"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1202,6 +1187,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Local files"
@@ -1228,11 +1223,6 @@ msgid "Databases"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Şəbəkə"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Name: "
 msgstr "Ad: "
@@ -1279,7 +1269,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1294,12 +1284,22 @@ msgstr "Hamısını Seç"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1353,8 +1353,8 @@ msgstr "Təhlükəsizlik güncəlləmələri"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Şəbəkə"
+msgid "Java"
+msgstr "Yaponiya"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1371,19 +1371,14 @@ msgstr "mövcud paketlərin siyahısını yenidən yüklə"
 msgid "Cancel"
 msgstr "Ləğv et"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
+msgid "Enabled?"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1411,32 +1406,22 @@ msgstr "Qurula Bilən"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Gəlişdirmə Güncəlləmələri"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Boards"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Too many packages are selected"
 msgstr "Paketlər onsuz da quruludur"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Physics"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Do nothing"
 msgstr "amma oxşamır"
@@ -1446,17 +1431,17 @@ msgstr "amma oxşamır"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Şəbəkə"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Endirərkən xəta"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Braziliya"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Yardım"
@@ -1466,6 +1451,11 @@ msgstr "Yardım"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Paketləri quraşdırmaq üçün ali istifadəçi olmalısınız, bağışlayın."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Taiwan"
@@ -1493,7 +1483,7 @@ msgstr "o paket, o bayt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1506,6 +1496,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Gəlişdirmə Güncəlləmələri"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1533,11 +1528,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1548,6 +1538,11 @@ msgstr ""
 "Mandrake\n"
 "Güncəlləmə"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Digər"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1560,12 +1555,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1579,6 +1574,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1610,22 +1610,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Gəlişdirmə Güncəlləmələri"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Ad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1650,7 +1640,7 @@ msgstr "Ad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1658,6 +1648,11 @@ msgstr ""
 msgid "No update"
 msgstr "normal güncəlləmələr"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Şəbəkə"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1668,6 +1663,16 @@ msgstr "Oldu"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1680,6 +1685,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1688,11 +1698,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Mənbələri Düzəlt"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1754,11 +1759,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2042,6 +2042,58 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Gəlişdirmə Güncəlləmələri"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Gəlişdirmə Güncəlləmələri"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Gəlişdirmə Güncəlləmələri"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Şəbəkə qurğuları:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Gəlişdirmə Güncəlləmələri"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Şəbəkə"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Gəlişdirmə Güncəlləmələri"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Digər"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Şəbəkə"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Gəlişdirmə Güncəlləmələri"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Şəbəkə"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Şəbəkə"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Gəlişdirmə Güncəlləmələri"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "bununla toqquşur"
 
@@ -2200,9 +2252,6 @@ msgstr ""
 #~ msgid "security"
 #~ msgstr "təhlükəsizlik"
 
-#~ msgid "general"
-#~ msgstr "ümumi"
-
 #~ msgid "bugfix"
 #~ msgstr "bugfix"
 
@@ -2220,9 +2269,6 @@ msgstr ""
 #~ "Güncəllənəcək paketlərin siyahısı alına bilmir\n"
 #~ "Başqa bir əksi (mirroru) sınayın"
 
-#~ msgid "Warning"
-#~ msgstr "Xəbərdarlıq"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2297,15 +2343,9 @@ msgstr ""
 #~ msgid "/Help/_About..."
 #~ msgstr "/Yardım/_Haqqında..."
 
-#~ msgid "Name"
-#~ msgstr "Ad"
-
 #~ msgid "Installed"
 #~ msgstr "Quruldu"
 
-#~ msgid "Type"
-#~ msgstr "Növ"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, buraxılış 7.2\n"
 
diff --git a/po/az.pom b/po/az.pom
index 761678c2..b7753e8a 100644
--- a/po/az.pom
+++ b/po/az.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Masa üstü"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Qrafiki Ara Üz"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Təcrübi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Verici"
 
diff --git a/po/bg.po b/po/bg.po
index f87362a9..6d8fe550 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-04-30 18:07+0300\n"
 "Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
 "Language-Team: Bulgarian\n"
@@ -21,14 +21,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "�������� .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "����, ���������. �������� �� ��������..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -36,12 +46,7 @@ msgstr "������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -59,25 +64,20 @@ msgstr "������ ���� ����������� ��������"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "������ �� ��������� ���� ������� 2 �����."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "����������� �� ����������"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "������ �� ��������� ���� ������� 2 �����."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -108,6 +108,11 @@ msgstr ""
 msgid "Search results"
 msgstr "�������� �� �������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -133,11 +138,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "��� �� �������� ����� ������ ��������� ������"
 
@@ -151,6 +151,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "���������� �� �������� �� ����������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -168,21 +173,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "����������"
+msgid "True type"
+msgstr "���"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "����������"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -194,11 +209,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "���� �� �������� ������ � ���������:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "����������� �� ����������"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -216,7 +226,7 @@ msgstr "������..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -310,21 +320,11 @@ msgid "Password:"
 msgstr "������:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "���������� �� �������� �� ����������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "��������"
@@ -344,6 +344,11 @@ msgstr "����� ������������ ������ ������ �� �� �������"
 msgid "All packages, by update availability"
 msgstr "�� ���������� �� ����������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -360,6 +365,11 @@ msgid "Greece"
 msgstr "������"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "�� ����� ����"
@@ -413,11 +423,6 @@ msgstr "�������� ������:..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -485,6 +490,11 @@ msgstr "����:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "��������� �� ����� `%s' (%s/%s)..."
 
@@ -495,6 +505,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "����"
 
@@ -503,60 +518,50 @@ msgstr "����"
 msgid "Sweden"
 msgstr "������"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "�������"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "����������..."
+msgid "Austria"
+msgstr "�������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "����������� �� ����������"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "����������..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "���������..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "����������� �� ����������"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -573,6 +578,11 @@ msgstr "�������� .%s"
 msgid "Importance: "
 msgstr "�������: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -609,11 +619,6 @@ msgid "Medium"
 msgstr "������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "������"
@@ -638,11 +643,6 @@ msgstr ""
 msgid "Update media"
 msgstr "������ �����������"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "����������� �� ����������"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -680,6 +680,11 @@ msgstr "������� �� �������� �� ����� �� ������������"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -690,16 +695,6 @@ msgstr "���������"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "�������: %d �� / �������� ������� ������������: %d ��"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "����"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -722,11 +717,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "�� �������"
 
@@ -736,13 +726,18 @@ msgid "All packages, by group"
 msgstr "������ ������,"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "��������"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -757,6 +752,16 @@ msgstr "�������� �� ��������� (����)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -776,11 +781,26 @@ msgstr ""
 msgid "Stop"
 msgstr "����"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "����, ���������. �������� �� ��������..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -834,6 +854,11 @@ msgstr ""
 msgid "Finland"
 msgstr "���������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -850,13 +875,13 @@ msgid "Save changes"
 msgstr "������� ���������"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "��������� �� �������:"
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -867,6 +892,11 @@ msgstr "������ ����������"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "�����"
 
@@ -886,16 +916,6 @@ msgid "Spain"
 msgstr "�������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "����������� �� ����������"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "������ ��� �������� �� �������� �� ����������"
@@ -906,11 +926,6 @@ msgid "Files:\n"
 msgstr "/_����"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "�������� �������� ������"
@@ -920,6 +935,11 @@ msgstr "�������� �������� ������"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "��� ������ �� �������� ���/������ �� ������������� ���� ��������:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "�����"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -931,11 +951,6 @@ msgid "Additional packages needed"
 msgstr "������ ������������ ������"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "�����"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -990,9 +1005,9 @@ msgid "Find:"
 msgstr "�����:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "����������� �� ����������"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1005,11 +1020,6 @@ msgid "Removable device"
 msgstr "������������ ����������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "���������� �� �������� �� ����������"
@@ -1028,21 +1038,11 @@ msgstr ""
 "���� ���������\n"
 "������ �� ��������..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "����"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "������������� ���:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "�����"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1053,21 +1053,16 @@ msgstr "������"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "������������� �� ��������"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "��������"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1075,11 +1070,6 @@ msgstr "�������� �� �������� �� `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1093,16 +1083,6 @@ msgstr "������ � ����"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "����������� �� ����������"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1114,12 +1094,7 @@ msgstr "�� ���� �� ������ ��������; ��� �� ���� ���������� ��������."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1134,25 +1109,20 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "����������� �� �������� \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "������� �� ����������: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "������������� �� ��������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "������� �� ����������: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1181,7 +1151,7 @@ msgstr "������� �� �������� �� ����� �� ������������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1206,23 +1176,38 @@ msgid "No package found for installation."
 msgstr "���������� �� �������� �� ����������"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "���"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "��������"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1230,6 +1215,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "������ ������� ������ ���� ����������� ��������."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1257,11 +1252,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "�����"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "���: %s"
 
@@ -1307,7 +1297,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1324,12 +1314,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "�������� ����������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1387,8 +1387,8 @@ msgstr "������������� �������� ��� ����������"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "�����"
+msgid "Java"
+msgstr "������"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1407,20 +1407,15 @@ msgstr ""
 msgid "Cancel"
 msgstr "�����"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "�� �������?"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "�� �������?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1447,16 +1442,6 @@ msgstr "�����������"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "����������� �� ����������"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1464,13 +1449,13 @@ msgstr "��� ������ �� ��������� ��������� �� �� ����������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "������ ����� ������ �� �������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "������ ����� ������ �� �������"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1482,17 +1467,17 @@ msgstr "�� ����� ����"
 msgid "Danmark"
 msgstr "�����"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "�����"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "������ ��� ���������"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "��������"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "�����"
@@ -1502,6 +1487,11 @@ msgstr "�����"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "������ �� ��� root, �� �� ����������� ������, ���������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1529,7 +1519,7 @@ msgstr "�� �������� �� ����������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1542,6 +1532,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "����������� �� ����������"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1569,11 +1564,6 @@ msgstr "����� ��������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "������ ���������"
 
@@ -1582,6 +1572,11 @@ msgstr "������ ���������"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate ���������"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "����"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1594,12 +1589,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1615,6 +1610,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1648,22 +1648,12 @@ msgstr "������ ����������� ������: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "����������� �� ����������"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "���"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1688,7 +1678,7 @@ msgstr "���"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1696,6 +1686,11 @@ msgstr ""
 msgid "No update"
 msgstr "������"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "�����"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1706,6 +1701,16 @@ msgstr "�����"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1718,6 +1723,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1726,11 +1736,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "����������� �� �������� \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1796,11 +1801,6 @@ msgstr ""
 "���� ���������� �� �� ������� �� �������� ���������� �� ������ �������r\n"
 "����� ���������."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2083,6 +2083,62 @@ msgid "Software Sources Manager"
 msgstr "�������� �� ��������� ���������"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP ������"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "����������� �� ����������"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "����������� �� ����������"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "����������� �� ����������"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "��������� �� �������:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "����������� �� ����������"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "����������� �� ����������"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "����������� �� ����������"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "����������� �� ����������"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "����� � �������� �"
 
@@ -2263,9 +2319,6 @@ msgstr "�������� �� ��������� ���������"
 #~ msgid "security"
 #~ msgstr "c��������"
 
-#~ msgid "general"
-#~ msgstr "��������"
-
 #~ msgid "bugfix"
 #~ msgstr "����������"
 
@@ -2283,9 +2336,6 @@ msgstr "�������� �� ��������� ���������"
 #~ "������������ �� ������������ �� ������� � ��������� �� ����������\n"
 #~ "�������� � ���� ��������� ������"
 
-#~ msgid "Warning"
-#~ msgstr "��������"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2360,15 +2410,9 @@ msgstr "�������� �� ��������� ���������"
 #~ msgid "/Help/_About..."
 #~ msgstr "/�����/_�������..."
 
-#~ msgid "Name"
-#~ msgstr "���"
-
 #~ msgid "Installed"
 #~ msgstr "�����������"
 
-#~ msgid "Type"
-#~ msgstr "���"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, ������ 7.2\n"
 
diff --git a/po/bg.pom b/po/bg.pom
index d0feb0bf..ad3d8800 100644
--- a/po/bg.pom
+++ b/po/bg.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "������� �������"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "�������� �����"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "����������"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "������"
 
diff --git a/po/br.po b/po/br.po
index 497cbe38..6d97d2d7 100644
--- a/po/br.po
+++ b/po/br.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2001-07-12 15:39+0200\n"
 "Last-Translator: Ja�-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
 "Language-Team: Brezhoneg <ofisk.bzh@wanadoo.fr>\n"
@@ -19,14 +19,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Rouedad/Diaouled"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Canada"
@@ -34,12 +44,7 @@ msgstr "Kanadian (Kebek)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -57,25 +62,20 @@ msgstr ""
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr ""
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "System/Configuration/Networking"
-msgstr "Arloado�/Rouedad"
+msgid "File transfer"
+msgstr "Rouedad/Mavego�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "System/XFree86"
-msgstr "Reizhiad/Diazez"
+msgid "KDE and Qt"
+msgstr "Diorren/Krao�ell"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to fill up at least the two first entries."
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -106,6 +106,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Servijer DNS"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Grafek"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -127,11 +132,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -145,6 +145,11 @@ msgstr "Embann"
 msgid "Package installation..."
 msgstr "Kudenno� ho staliadur"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Diorren/C++"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -162,6 +167,21 @@ msgstr "Shello�"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Chemistry"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "True type"
+msgstr "Seurt"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Graphics"
 msgstr "Grafek"
 
@@ -172,11 +192,6 @@ msgstr "Stalia�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -188,11 +203,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Ar pakadoÃ¹ a-heul a zo war-nes bezañ staliet/lamet"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Diorren/Reizhiad"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -210,7 +220,7 @@ msgstr "Fazi..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -300,20 +310,10 @@ msgstr "Tremenger"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "System/Servers"
-msgstr "Reizhiad/Mezarc'hio�"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Kudenno� ho staliadur"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Deskrivadurio�"
@@ -333,6 +333,11 @@ msgstr "Ar pakadoÃ¹ a-heul a zo war-nes bezañ staliet/lamet"
 msgid "All packages, by update availability"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Packaging"
+msgstr "Pakad "
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -349,6 +354,11 @@ msgid "Greece"
 msgstr "Gres"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "N'ev ket lodañ"
@@ -401,11 +411,6 @@ msgstr "Dibabit ur skramm"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -466,6 +471,11 @@ msgstr "Porzh�:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -476,6 +486,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "All"
 
@@ -484,36 +499,31 @@ msgstr "All"
 msgid "Sweden"
 msgstr "Suis"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Boards"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "Aostria"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Faqs"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Info..."
 msgstr "TitouroÃ¹"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/File transfer"
-msgstr "Rouedad/Mavego�"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Diorren/Reizhiad"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -521,23 +531,18 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/Remote access"
-msgstr "Rouedad/Diaouled"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Summary: "
 msgstr "Diverra�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "System/Fonts/Type1"
-msgstr "Reizhiad/Nodrezho�/True Type"
+#, c-format
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Diorren/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -554,6 +559,11 @@ msgstr "DibarzhoÃ¹ ar voullerez lpd a-bell"
 msgid "Importance: "
 msgstr "TalvoudegezhÂ : %s\n"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -585,11 +595,6 @@ msgid "Medium"
 msgstr "Beljik"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Ment"
@@ -614,11 +619,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Etre"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Diorren/Stlennvonio�"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -654,24 +654,19 @@ msgstr "Kudenno� ho staliadur"
 msgid "Terminals"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Edit"
-msgstr "Kuitaat"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Books/Other"
-msgstr "All"
+msgid "Edit"
+msgstr "Kuitaat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Other"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -695,11 +690,6 @@ msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in files"
 msgstr "mkraid sac'het"
@@ -711,12 +701,17 @@ msgstr " Pakado��: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Console"
+msgstr "Serri�"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -731,6 +726,16 @@ msgstr "Klask"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -744,11 +749,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Rann"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -797,6 +817,11 @@ msgstr "Ar pakadoÃ¹ a-heul a zo war-nes bezañ distaliet"
 msgid "Finland"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Reizhiad/Nodrezho�/True Type"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -814,12 +839,12 @@ msgstr "Meuziad Lañsañ"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Rouedad"
+msgid "Instant messaging"
+msgstr "Rouedad/Mavego�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -829,6 +854,11 @@ msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Search"
 msgstr "Klask"
@@ -849,16 +879,6 @@ msgid "Spain"
 msgstr "Spagnol"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Diorren/Krao�ell"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Gortozit mar plij, o prientiñ ar staliadur"
@@ -870,11 +890,6 @@ msgstr "/_Restr"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
@@ -883,6 +898,11 @@ msgstr ""
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Ret eo deoc'h kaout ur parzhadur disloañ"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Chat"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Update"
@@ -894,11 +914,6 @@ msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Rouedad"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -949,8 +964,8 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Diorren/Krao�ell"
+msgid "XFree86"
+msgstr "Reizhiad/Diazez"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -963,11 +978,6 @@ msgid "Removable device"
 msgstr "Lemel ar steudad"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Kudenno� ho staliadur"
@@ -982,21 +992,11 @@ msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 msgid "Please wait, adding medium..."
 msgstr "Gortozit mar plij, o prientiñ ar staliadur"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "All"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Rouedad"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1007,21 +1007,16 @@ msgstr "Beljik"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure proxies"
 msgstr "Kefluniañ servijoÃ¹"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Ho evezh"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1029,11 +1024,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Reizhiad/Mezarc'hio�"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1047,16 +1037,6 @@ msgstr "Ne m'eus ket gallet skrivañ\n"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "Diorren/C"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1068,12 +1048,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1086,24 +1061,19 @@ msgstr "Gortozit e-keit ha ma kerc'han roll ar melezourio�, mar plij..."
 msgid "Communications"
 msgstr "Kehenti�"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Etre"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Kehenti�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1133,7 +1103,7 @@ msgstr "O prientiñ ar staliadur"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1155,30 +1125,55 @@ msgid "No package found for installation."
 msgstr "Kudenno� ho staliadur"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Seurt"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Deskrivadurio�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
+msgid "Archiving"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "System"
+msgstr "Reizhiad/Diazez"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Reizhiad/Mezarc'hio�"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1206,11 +1201,6 @@ msgstr "Stlennvonio�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Rouedad"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Anv�: %s"
 
@@ -1250,9 +1240,9 @@ msgid "Video"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Diorren/C++"
+#, c-format
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1267,13 +1257,23 @@ msgstr ""
 "an holl"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Maximum information"
 msgstr "Diskouez titouroÃ¹"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1326,9 +1326,9 @@ msgid "Bugfixes updates"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Rouedad"
+#, c-format
+msgid "Java"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1345,19 +1345,14 @@ msgstr "Gortozit e-keit ha ma kerc'han roll ar pakado� bremanaet, mar plij..."
 msgid "Cancel"
 msgstr "Nulla�"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
+msgid "Enabled?"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1385,32 +1380,22 @@ msgstr "Diuzit renkad ar staliadur"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Diorren/Krao�ell"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Boards"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Too many packages are selected"
 msgstr "Hemañ a zo ur pakad ret, n'hell ket bezañ andiuzet"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Physics"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Do nothing"
 msgstr "N'ev ket lodañ"
@@ -1420,11 +1405,6 @@ msgstr "N'ev ket lodañ"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Rouedad"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
@@ -1432,6 +1412,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Mail"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Help"
 msgstr "Skoazell"
 
@@ -1440,6 +1425,11 @@ msgstr "Skoazell"
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Taiwan"
@@ -1466,9 +1456,9 @@ msgid "All packages, by medium repository"
 msgstr " Pakado��: "
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Reizhiad/Nodrezho�/True Type"
+#, c-format
+msgid "Compression"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1480,6 +1470,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Diorren/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1506,11 +1501,6 @@ msgid "Change medium"
 msgstr "Kemmañ ar spister"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Reset the selection"
 msgstr "Diuz pakadoÃ¹ unan hag unan"
@@ -1520,6 +1510,11 @@ msgstr "Diuz pakadoÃ¹ unan hag unan"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate, doare 7.2\n"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "All"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1532,13 +1527,13 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Reizhiad/Diazez"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1550,6 +1545,11 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Reizhiad/Mezarc'hio�"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1581,23 +1581,13 @@ msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Diorren/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Anv"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1622,7 +1612,7 @@ msgstr "Anv"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1630,6 +1620,11 @@ msgstr ""
 msgid "No update"
 msgstr "Bremanaat Linux-Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Rouedad"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1640,6 +1635,16 @@ msgstr "Mat eo"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1651,6 +1656,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "rpmdrake"
 msgstr "Moullerez"
@@ -1660,11 +1670,6 @@ msgstr "Moullerez"
 msgid "Editing medium \"%s\":"
 msgstr "Etre"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Instant messaging"
-msgstr "Rouedad/Mavego�"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1724,11 +1729,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Reizhiad/Nodrezho�/True Type"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2015,6 +2015,90 @@ msgid "Software Sources Manager"
 msgstr "Anv rannet"
 
 #, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Rouedad/Mavego�"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Serri�"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Grafek"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Reizhiad/Mezarc'hio�"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Stlennvonio�"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Grafek"
+
+#, fuzzy
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Arloado�/Rouedad"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Diorren/Reizhiad"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Diorren/Reizhiad"
+
+#, fuzzy
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Reizhiad/Nodrezho�/True Type"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Diorren/Stlennvonio�"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Rouedad"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Diorren/Krao�ell"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Rouedad"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Diorren/Krao�ell"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "All"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Rouedad"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Diorren/C"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Rouedad"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Rouedad"
+
+#~ msgid "Development/C++"
+#~ msgstr "Diorren/C++"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Reizhiad/Nodrezho�/True Type"
+
+#, fuzzy
 #~ msgid "unknown package "
 #~ msgstr "Ne m'eus ket gallet digeriñ pakad"
 
@@ -2043,9 +2127,6 @@ msgstr "Anv rannet"
 #~ msgid "Error"
 #~ msgstr "Fazi"
 
-#~ msgid "Warning"
-#~ msgstr "Ho evezh"
-
 #~ msgid ""
 #~ "Name: %s\n"
 #~ "Type: %s"
@@ -2071,12 +2152,6 @@ msgstr "Anv rannet"
 #~ msgid "/File/_Quit"
 #~ msgstr "/Restr/_Kuitaat"
 
-#~ msgid "Name"
-#~ msgstr "Anv"
-
-#~ msgid "Type"
-#~ msgstr "Seurt"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, doare 7.2\n"
 
@@ -2150,9 +2225,6 @@ msgstr "Anv rannet"
 #~ "Bremanaat\n"
 #~ "Linux-Mandrake"
 
-#~ msgid "Close"
-#~ msgstr "Serri�"
-
 #~ msgid "Proxies setup"
 #~ msgstr "Keflunia� ar proksio�"
 
@@ -2186,9 +2258,6 @@ msgstr "Anv rannet"
 #~ msgid "%d packages have been added to the list of packages to install"
 #~ msgstr "%d pakad a zo bet ouzhpennet d'ar roll pakado� da stalia�"
 
-#~ msgid "Package "
-#~ msgstr "Pakad "
-
 #~ msgid "Current Mirror:"
 #~ msgstr "Melezour-red�:"
 
diff --git a/po/br.pom b/po/br.pom
index 9d2a496f..ab586d4a 100644
--- a/po/br.pom
+++ b/po/br.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Titouroù"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Diorren"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Servijer"
 
diff --git a/po/bs.po b/po/bs.po
index 0c41e911..3a732f5a 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2002-08-22 17:29+0200\n"
 "Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -18,14 +18,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Ukloni .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Molim sačekajte, unaprjeđujem medije..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -33,12 +43,7 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -56,25 +61,20 @@ msgstr "sve je uspješno instalirano"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Trebate popuniti najmanje prva dva polja."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Razvojni update"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "Trebate popuniti najmanje prva dva polja."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -109,6 +109,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Rezultati pretrage"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -135,11 +140,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kako da ručno izaberete vaš mirror"
 
@@ -153,6 +153,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Pripremam pakete za instalaciju..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -170,21 +175,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Instaliraj"
+msgid "True type"
+msgstr "Tip"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instaliraj"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -196,11 +211,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Potreban je jedan od sljedećih paketa:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Razvojni update"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -218,7 +228,7 @@ msgstr "Greška..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -322,21 +332,11 @@ msgid "Password:"
 msgstr "Šifra:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Opisi"
@@ -356,6 +356,11 @@ msgstr "Potrebno je obrisati neke dodatne pakete"
 msgid "All packages, by update availability"
 msgstr "po dostupnosti update-a"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -372,6 +377,11 @@ msgid "Greece"
 msgstr "Grčka"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Ne radi ništa"
@@ -424,11 +434,6 @@ msgstr "Izaberite neki mirror..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -500,6 +505,11 @@ msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Downloadujem paket `%s' (%s/%s)..."
 
@@ -510,6 +520,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Ostalo"
 
@@ -518,60 +533,50 @@ msgstr "Ostalo"
 msgid "Sweden"
 msgstr "Švedska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austrija"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "Austrija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Razvojni update"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Ispitaj..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Opis"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Razvojni update"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -588,6 +593,11 @@ msgstr "Ukloni .%s"
 msgid "Importance: "
 msgstr "Značaj: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -630,11 +640,6 @@ msgid "Medium"
 msgstr "Belgija"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Veličina"
@@ -659,11 +664,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Osvježi izvore"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Razvojni update"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -699,6 +699,11 @@ msgstr "Došlo je do problema prilikom instalacije"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -709,16 +714,6 @@ msgstr "Izmjeni"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izabrano: %d MB / Slobodan prostor: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Ostalo"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -741,11 +736,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "u datotekama"
 
@@ -755,13 +745,18 @@ msgid "All packages, by group"
 msgstr "Svi paketi,"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "opšta"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -776,6 +771,16 @@ msgstr "Rezultati pretrage (ništa)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -794,11 +799,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Stani"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Molim sačekajte, unaprjeđujem medije..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -854,6 +874,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finska"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -870,13 +895,13 @@ msgid "Save changes"
 msgstr "Snimi izmjene"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Mrežne opcije:"
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -887,6 +912,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Pretraga"
 
@@ -911,16 +941,6 @@ msgid "Spain"
 msgstr "Španija"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Razvojni update"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Greška u dodavanju update medija"
@@ -931,11 +951,6 @@ msgid "Files:\n"
 msgstr "/_Datoteka"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Izaberite pakete"
@@ -945,6 +960,11 @@ msgstr "Izaberite pakete"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Možete navesti korisničko ime / šifru za proxy identifikaciju."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -956,11 +976,6 @@ msgid "Additional packages needed"
 msgstr "Potrebni su dodatni paketi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Mreža"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -1020,9 +1035,9 @@ msgid "Find:"
 msgstr "Pronađi:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Razvojni update"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1035,11 +1050,6 @@ msgid "Removable device"
 msgstr "Izmjenjivi uređaj"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Pripremam pakete za instalaciju..."
@@ -1056,21 +1066,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "Molim sačekajte, dodajem medij..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Ostalo"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Mreža"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1081,21 +1081,16 @@ msgstr "Belgija"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Konfiguriši proxije"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Upozorenje"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1103,11 +1098,6 @@ msgstr "Provjeravam potpis `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1121,16 +1111,6 @@ msgstr "Greška u datoteci"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "Razvojni update"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1142,12 +1122,7 @@ msgstr "Ne mogu da osvježim medij; on će biti automatski isključen."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1162,25 +1137,20 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Izmijena izvora \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Razlog za update: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Podesi izvore"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Razlog za update: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1209,7 +1179,7 @@ msgstr "Došlo je do problema prilikom instalacije"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1234,23 +1204,38 @@ msgid "No package found for installation."
 msgstr "Pripremam pakete za instalaciju..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Tip"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Opisi"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1258,6 +1243,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Svi traženi paketi su uspješno instalirani."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1285,11 +1280,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Mreža"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Ime: %s"
 
@@ -1335,7 +1325,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1352,12 +1342,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Maksimalne informacije"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1415,8 +1415,8 @@ msgstr "Prikaži ispravke grešaka"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Mreža"
+msgid "Java"
+msgstr "Japan"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1435,20 +1435,15 @@ msgstr ""
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Uključeno?"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "Uključeno?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1475,16 +1470,6 @@ msgstr "Instaliran"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Razvojni update"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1492,13 +1477,13 @@ msgstr "Morate ubaciti medij u uređaj za nastavak"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Izabrano je previše paketa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izabrano je previše paketa"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1510,17 +1495,17 @@ msgstr "Ne radi ništa"
 msgid "Danmark"
 msgstr "Danska"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Mreža"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Greška prilikom downloada"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Pomoć"
@@ -1530,6 +1515,11 @@ msgstr "Pomoć"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Morate biti root da bi instalirali pakete, žalim."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1557,7 +1547,7 @@ msgstr "po izvornom spremištu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1570,6 +1560,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Razvojni update"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1597,11 +1592,6 @@ msgstr "Promjeni medij"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Poništi izbor"
 
@@ -1610,6 +1600,11 @@ msgstr "Poništi izbor"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate Opcije"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Ostalo"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1627,12 +1622,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1647,6 +1642,11 @@ msgstr ""
 "Vjerovatno trebate update-ovati vašu bazu izvora."
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1681,22 +1681,12 @@ msgstr "Trenutno instalirana verzija: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Razvojni update"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Ime"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1721,7 +1711,7 @@ msgstr "Ime"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1729,6 +1719,11 @@ msgstr ""
 msgid "No update"
 msgstr "Izvrši update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Mreža"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1739,6 +1734,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1751,6 +1756,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1759,11 +1769,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Izmijena izvora \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1827,11 +1832,6 @@ msgstr ""
 "Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
 "vaš računar."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2116,6 +2116,62 @@ msgid "Software Sources Manager"
 msgstr "Upravitelj izvorima softvera"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP server"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Razvojni update"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Razvojni update"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Razvojni update"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Mrežne opcije:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Razvojni update"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Mreža"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Razvojni update"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Ostalo"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Mreža"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Razvojni update"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Mreža"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Mreža"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Razvojni update"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "je u konfliktu sa"
 
@@ -2370,9 +2426,6 @@ msgstr "Upravitelj izvorima softvera"
 #~ msgid "security"
 #~ msgstr "sigurnost"
 
-#~ msgid "general"
-#~ msgstr "opšta"
-
 #~ msgid "bugfix"
 #~ msgstr "ispravka"
 
@@ -2390,9 +2443,6 @@ msgstr "Upravitelj izvorima softvera"
 #~ "Ne mogu skinuti listu paketa za update\n"
 #~ "Probajte sa drugim mirrorom"
 
-#~ msgid "Warning"
-#~ msgstr "Upozorenje"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2467,15 +2517,9 @@ msgstr "Upravitelj izvorima softvera"
 #~ msgid "/Help/_About..."
 #~ msgstr "/Pomoć/_O programu..."
 
-#~ msgid "Name"
-#~ msgstr "Ime"
-
 #~ msgid "Installed"
 #~ msgstr "Instaliran"
 
-#~ msgid "Type"
-#~ msgstr "Tip"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, verzija 7.2\n"
 
diff --git a/po/bs.pom b/po/bs.pom
index 9fb4af8b..de6b1457 100644
--- a/po/bs.pom
+++ b/po/bs.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Radna stanica"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafičko okruženje"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Programiranje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/ca.po b/po/ca.po
index 1fe27477..5e2185a7 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-03-03 21:35+0200\n"
 "Last-Translator: Softcatal� <traddrake@softcatala.org>\n"
 "Language-Team: Catalan <info@softcatala.org>\n"
@@ -21,14 +21,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Arxivament/Altres"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Xarxa/Acc�s remot"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Si us plau espereu, actualitzant dades..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -36,13 +46,8 @@ msgstr "Canad�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Ci�ncies/Inform�tica"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Ci�ncies/F�sica"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -59,25 +64,20 @@ msgstr "tot s'ha instal�lat correctament"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Es necessita que ompliu les dues primeres entrades."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Sistema/Configuraci�/Altres"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Xarxa/Altres"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Sistema/Configuraci�/Xarxa"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Desenvolupament/KDE i QT"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "Sistema/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Es necessita que ompliu les dues primeres entrades."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Resultats de la cerca"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Escriptori gr�fic/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -138,11 +143,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Sistema/Configuraci�/Maquinari"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Com escollir manualment la r�plica"
 
@@ -156,6 +156,11 @@ msgstr "Publicaci�"
 msgid "Package installation..."
 msgstr "S'estan preparant els paquets per a la instal�laci�..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Desenvolupament/KDE i QT"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -172,6 +177,21 @@ msgid "Shells"
 msgstr "Int�rprets d'ordres"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Ci�ncies/Qu�mica"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Gr�fics"
@@ -183,11 +203,6 @@ msgstr "Instal�laci�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Sistema/Nucli i maquinari"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -199,11 +214,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Es necessita un dels seg�ents paquets:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Desenvolupament/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,9 +230,9 @@ msgid "Proxy..."
 msgstr "Error..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Sistema/Configuraci�/Arrencada i inici"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Llibres/Altres"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -328,21 +338,11 @@ msgid "Password:"
 msgstr "Contrasenya:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr "Sistema/Servidors"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "S'estan preparant els paquets per a la instal�laci�..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Escriptori gr�fic/KDE"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Descripcions"
@@ -362,6 +362,11 @@ msgstr "Cal esborrar paquets addicionals"
 msgid "All packages, by update availability"
 msgstr "per disponibilitat d'actualitzaci�"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -379,6 +384,11 @@ msgstr "Gr�cia"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Monitoritzaci�"
 
@@ -431,11 +441,6 @@ msgid "Choose a mirror..."
 msgstr "Escolliu una r�plica..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Escriptori gr�fic/Creador de finestres"
-
-#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -508,6 +513,11 @@ msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "S'est� descarregant el paquet '%s' (%s/%s)..."
 
@@ -518,6 +528,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Altres"
 
@@ -526,60 +541,50 @@ msgstr "Altres"
 msgid "Sweden"
 msgstr "Su�cia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Jocs/Taula"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "�ustria"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Faqs"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Info..."
 msgstr "Informacions"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/File transfer"
-msgstr "Xarxa/Altres"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Other"
-msgstr "Desenvolupament/Altres"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "s'est� inspeccionant..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Jocs/Cartes"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "Jap�"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr "Xarxa/Acc�s remot"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Resum"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Sistema/Fonts/Tipus1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Desenvolupament/C++"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -596,6 +601,11 @@ msgstr "Elimina .%s"
 msgid "Importance: "
 msgstr "Import�ncia: %s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -640,11 +650,6 @@ msgstr "B�lgica"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "System/Internationalization"
-msgstr "Sistema/Internacionalitzaci�"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Size: "
 msgstr "Mida"
 
@@ -668,11 +673,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Actualitza la(es) font(s)"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Desenvolupament/Depuradors"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -708,6 +708,11 @@ msgstr "Hi ha hagut problemes durant la instal�laci�"
 msgid "Terminals"
 msgstr "Terminals"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Sistema/Nucli i maquinari"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -718,16 +723,6 @@ msgstr "Edita"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionats: %d MB / Espai lliure en disc: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Llibres/Altres"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Ci�ncies/Altres"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -750,11 +745,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Jocs/Aventura"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "en fitxers"
 
@@ -765,13 +755,18 @@ msgstr "Paquets: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Escriptori gr�fic/FUWM"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Jocs/Esports"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -784,6 +779,16 @@ msgid "Search results (none)"
 msgstr "Resultats de la cerca (cap)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Jocs/Aventura"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Arxivament/Cd"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -804,11 +809,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Para"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Ci�ncies/Biologia"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Si us plau espereu, actualitzant dades..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Ci�ncies/Matem�tiques"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Sistema/Internacionalitzaci�"
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -864,6 +884,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finl�ndia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Sistema/Fonts/X11 bitmap"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -880,14 +905,14 @@ msgid "Save changes"
 msgstr "Desa canvis"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Xarxa/Not�cies"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Xarxa/Utilitats"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Llibres/PMF"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -896,6 +921,11 @@ msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Llibres/Inform�tica"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Cerca"
@@ -921,16 +951,6 @@ msgid "Spain"
 msgstr "Espanya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr "Ci�ncies/Astronomia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Desenvolupament/Nucli"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "S'ha produ�t un error afegint el suport d'actualitzaci�"
@@ -941,11 +961,6 @@ msgid "Files:\n"
 msgstr "/_Fitxer"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr "Jocs/Arcade"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Trieu els paquets"
@@ -957,6 +972,11 @@ msgstr ""
 "Podeu especificar un usuari/contraenya en la autentificaci� del servidor "
 "intermediari:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Xina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -969,11 +989,6 @@ msgstr "Es necessiten paquets addicionals"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Xarxa/Xat"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1032,8 +1047,8 @@ msgstr "Cerca:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Desenvolupament/Nucli"
+msgid "XFree86"
+msgstr "Sistema/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1046,11 +1061,6 @@ msgid "Removable device"
 msgstr "Dispositius extra�bles"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Escriptori gr�fic/Icewm"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "S'estan preparant els paquets per a la instal�laci�..."
@@ -1067,21 +1077,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "Si us plau espereu, s'est� afegint el suport..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Jocs/Altres"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Entrada:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Xarxa/Altres"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1092,21 +1092,16 @@ msgstr "B�lgica"
 msgid "File tools"
 msgstr "Eines de text"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Arxivament/Cd"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Ci�ncies/Biologia"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Configureu els servidors intermediaris(proxies)"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1114,11 +1109,6 @@ msgstr "S'est� verificant la signatura de '%s' ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Sistema/Biblioteques"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1132,16 +1122,6 @@ msgstr "Error de fitxer"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Jocs/Estrat�gia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Desenvolupament/Java"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1152,14 +1132,9 @@ msgid ""
 msgstr "No es pot actualitzar el support; es deshabilitar� autom�ticament."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Arxivament/Compressi�"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Books/Litterature"
-msgstr "Llibres/Altres"
+msgid "Geosciences"
+msgstr "Ci�ncies/Inform�tica"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
@@ -1171,25 +1146,20 @@ msgstr "Si us plau, seleccioneu una r�plica d'aquesta llista"
 msgid "Communications"
 msgstr "Comunicacions"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Escriptori gr�fic/Icewm"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editant les fonts \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Rao d'actualitzaci�: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Comunicacions"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Ci�ncies/Matem�tiques"
+msgid "Reason for update: "
+msgstr "Rao d'actualitzaci�: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1218,8 +1188,8 @@ msgstr "Hi ha hagut un problema durant la instal�laci�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Escriptori gr�fic/Il�luminaci�"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1244,29 +1214,54 @@ msgstr "S'estan preparant els paquets per a la instal�laci�..."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
+msgid "Strategy"
+msgstr "Jocs/Estrat�gia"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "Description: "
 msgstr "Descripcions"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
+msgid "Archiving"
+msgstr "Arxivament/Altres"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Ci�ncies/Qu�mica"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Sistema/Base"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Tots els paquets demanats s'han instal�lat correctament."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Sistema/Servidors"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Jocs/Trencaclosques"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1293,11 +1288,6 @@ msgid "Databases"
 msgstr "Bases de dades"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/IRC"
-msgstr "Xarxa/IRC"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Name: "
 msgstr "Nom: %s"
@@ -1343,9 +1333,9 @@ msgid "Video"
 msgstr "V�deo"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Desenvolupament/KDE i QT"
+#, c-format
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1358,14 +1348,24 @@ msgid "Selected"
 msgstr "No en seleccionis cap"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Ci�ncies/Inform�tica"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "M�xima informaci�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Arxivament/C�pia de seguretat"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1421,9 +1421,9 @@ msgid "Bugfixes updates"
 msgstr "Mostra les actualitzacions de reparaci� d'errors"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Xarxa/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Jap�"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1441,20 +1441,15 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancel�la"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Habilitat?"
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Sciences/Geosciences"
-msgstr "Ci�ncies/Inform�tica"
+msgid "Sciences"
+msgstr "Ci�ncies/Altres"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr "Sistema/Fonts/Consola"
+msgid "Enabled?"
+msgstr "Habilitat?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1481,16 +1476,6 @@ msgstr "Instal�lat"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Desenvolupament/KDE i QT"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Llibres/Com es fa"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1498,15 +1483,15 @@ msgstr "Heu d'inserir el support per a continuar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Jocs/Taula"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "S'han seleccionat massa paquets"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Ci�ncies/F�sica"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "No facis res"
@@ -1516,17 +1501,17 @@ msgstr "No facis res"
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Xarxa/Correu"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "S'ha produ�t un error durant la desc�rrega"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
@@ -1536,6 +1521,11 @@ msgstr "Ajuda"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Perdoneu, necessiteu ser root per instal�lar paquets."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Jocs/Esports"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1562,9 +1552,9 @@ msgid "All packages, by medium repository"
 msgstr "per dip�sit de fonts"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Sistema/Fonts/X11 bitmap"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Arxivament/Compressi�"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1576,6 +1566,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Desenvolupament/C++"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1603,11 +1598,6 @@ msgstr "Canvieu el suport"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Escriptori gr�fic/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Esborra la selecci�"
 
@@ -1616,6 +1606,11 @@ msgstr "Esborra la selecci�"
 msgid "Mandrake Update"
 msgstr "Prefer�ncies del MandrakeUpdate"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Llibres/PMF"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1632,14 +1627,14 @@ msgstr ""
 "Per favor, proveu-ho m�s tard."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Llibres/Inform�tica"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Llibres/Com es fa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Sistema/Base"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1653,6 +1648,11 @@ msgstr ""
 "Voldreu actualitzar la vostra base de dades de fonts."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Sistema/Biblioteques"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1684,24 +1684,14 @@ msgid "Currently installed version: "
 msgstr "Versi� actualment instal�lada: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Desenvolupament/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Sistema/Configuraci�/Impressi�"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Jocs/Trencaclosques"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Jocs/Cartes"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Sistema/Configuraci�/Empaquetatge"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Ci�ncies/Astronomia"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1724,15 +1714,20 @@ msgid "Name:"
 msgstr "Nom"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Graphical desktop/Other"
-msgstr "Escriptori gr�fic/Altres"
+#, c-format
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "No update"
 msgstr "Realitza les actualitzacions"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Xarxa/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1743,6 +1738,16 @@ msgstr "D'acord"
 msgid "Text tools"
 msgstr "Eines de text"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Jocs/Cartes"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1754,6 +1759,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Jocs/Arcade"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1763,11 +1773,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Editant les fonts \"%s\":"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Instant messaging"
-msgstr "Xarxa/Utilitats"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1832,11 +1837,6 @@ msgstr ""
 "en el vostre\n"
 "ordinador."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Sistema/Fonts/True type"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2120,6 +2120,134 @@ msgid "Software Sources Manager"
 msgstr "Manejador de Fonts del Programari"
 
 #, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Sistema/Internacionalitzaci�"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Eines de text"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Escriptori gr�fic/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Ci�ncies/Inform�tica"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Sistema/Servidors"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Bases de dades"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Escriptori gr�fic/Il�luminaci�"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Ci�ncies/Inform�tica"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Sistema/Configuraci�/Altres"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Sistema/Configuraci�/Xarxa"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Sistema/Configuraci�/Maquinari"
+
+#~ msgid "Development/Python"
+#~ msgstr "Desenvolupament/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Sistema/Configuraci�/Arrencada i inici"
+
+#, fuzzy
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Escriptori gr�fic/Creador de finestres"
+
+#~ msgid "Development/Other"
+#~ msgstr "Desenvolupament/Altres"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Sistema/Fonts/Tipus1"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Desenvolupament/Depuradors"
+
+#~ msgid "Books/Other"
+#~ msgstr "Llibres/Altres"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Escriptori gr�fic/FUWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "Xarxa/Not�cies"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Desenvolupament/Nucli"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Xarxa/Xat"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Desenvolupament/Nucli"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Escriptori gr�fic/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Jocs/Altres"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Xarxa/Altres"
+
+#~ msgid "Development/Java"
+#~ msgstr "Desenvolupament/Java"
+
+#, fuzzy
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Escriptori gr�fic/Icewm"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Arxivament/C�pia de seguretat"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Xarxa/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Sistema/Fonts/Consola"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Xarxa/Correu"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Escriptori gr�fic/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Desenvolupament/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Sistema/Configuraci�/Impressi�"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Sistema/Configuraci�/Empaquetatge"
+
+#, fuzzy
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Escriptori gr�fic/Altres"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Sistema/Fonts/True type"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "conflictes amb"
 
diff --git a/po/ca.pom b/po/ca.pom
index 2b94b020..0b740fa2 100644
--- a/po/ca.pom
+++ b/po/ca.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Estaci� de treball"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Entorn gr�fic"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Desenvolupament"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Servidor"
 
diff --git a/po/cs.po b/po/cs.po
index 489f8df3..1e2a8911 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-03-03 20:20GMT\n"
 "Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -22,14 +22,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Odebrat .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Prosím počkejte, aktualizuji zdroje..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -37,12 +47,7 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -60,25 +65,20 @@ msgstr "Všechno bylo úspěšně nainstalováno."
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Musíte vyplnit alespoň první dvě políčka."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Networking"
+msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "Musíte vyplnit alespoň první dvě políčka."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -113,6 +113,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Výsledky hledání"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -138,11 +143,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Jak ručně vybrat vaše zrcadlo"
 
@@ -156,6 +156,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Připravuji balíčky k instalaci..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -173,19 +178,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Itálie"
+msgid "True type"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphics"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Itálie"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -199,11 +214,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Je třeba jeden z následujících balíčků:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -221,7 +231,7 @@ msgstr "Chyba..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -325,22 +335,12 @@ msgid "Password:"
 msgstr "Heslo:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Připravuji balíčky k instalaci..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "v popisech"
 
@@ -359,6 +359,11 @@ msgstr "Je třeba odstranit některé další balíčky"
 msgid "All packages, by update availability"
 msgstr "podle dostupnosti aktualizace"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -375,6 +380,11 @@ msgid "Greece"
 msgstr "Řecko"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Nedělat nic"
@@ -428,11 +438,6 @@ msgstr "Vyberte zrcadlo..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -502,6 +507,11 @@ msgstr "Cesta:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Stahuji balíček `%s' (%s/%s)..."
 
@@ -512,6 +522,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Jiné"
 
@@ -520,36 +535,31 @@ msgstr "Jiné"
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Rakousko"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Informace..."
+msgid "Austria"
+msgstr "Rakousko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr ""
+msgid "Info..."
+msgstr "Informace..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Prozkoumat..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -557,22 +567,17 @@ msgstr "Japonsko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Shrnutí: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
+msgid "Boot and Init"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -590,6 +595,11 @@ msgstr "Odebrat .%s"
 msgid "Importance: "
 msgstr "Důležitost: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -632,11 +642,6 @@ msgstr "Belgie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Velikost: "
 
@@ -660,11 +665,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Aktualizovat zdroj(e)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -700,6 +700,11 @@ msgstr "Při instalaci nastaly problémy"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -710,16 +715,6 @@ msgstr "Upravit"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Vybráno: %d MB / Volné místo na disku: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Jiné"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -742,11 +737,6 @@ msgstr "Zkoumá se soubor zdroje `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "v souborech"
 
@@ -757,12 +747,17 @@ msgstr "Všechny balíčky,"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -777,6 +772,16 @@ msgstr "Výsledky hledání (žádné)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -796,11 +801,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Stop"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Prosím počkejte, aktualizuji zdroje..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -856,6 +876,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finsko"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -873,12 +898,12 @@ msgstr "Uložit změny"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
+msgid "Instant messaging"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -889,6 +914,11 @@ msgstr "Více informací"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Hledat"
 
@@ -913,16 +943,6 @@ msgid "Spain"
 msgstr "Španělsko"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Chyba při přidávání zdroje pro aktualizaci"
@@ -934,11 +954,6 @@ msgstr "Soubory:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Nelze získat balíčky se zdroji."
 
@@ -947,6 +962,11 @@ msgstr "Nelze získat balíčky se zdroji."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Pro ověření přístupu k proxy lze zadat uživatelské jméno a heslo:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Čína"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -959,11 +979,6 @@ msgstr "Jsou potřeba další balíčky"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1021,7 +1036,7 @@ msgstr "Najít:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1035,11 +1050,6 @@ msgid "Removable device"
 msgstr "Vyjímatelné zařízení"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Připravuji balíčky k instalaci..."
@@ -1054,21 +1064,11 @@ msgstr "Prosím počkejte, odebírám balíčky..."
 msgid "Please wait, adding medium..."
 msgstr "Prosím počkejte, přidávám zdroj..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Jiné"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Přihlášení:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1079,21 +1079,16 @@ msgstr "Belgie"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Nastavit proxy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Nastavit proxy"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1101,11 +1096,6 @@ msgstr "Kontroluji signaturu `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1119,16 +1109,6 @@ msgstr "Chyba souboru"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1140,12 +1120,7 @@ msgstr "Nelze aktualizovat zdroj, bude automaticky vypnut."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1158,25 +1133,20 @@ msgstr "Vyberte prosím vhodné zrcadlo."
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Upravuji zdroj \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Důvod pro aktualizaci: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Nastavit zdroje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Důvod pro aktualizaci: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1205,7 +1175,7 @@ msgstr "Problém při odebírání"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1231,22 +1201,37 @@ msgstr "Připravuji balíčky k instalaci..."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "Popis: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s kB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1254,6 +1239,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Všechny požadované balíčky byly uspěšně nainstalovány."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1281,11 +1276,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Název: "
 
@@ -1331,7 +1321,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1346,12 +1336,22 @@ msgstr "Vybraný"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Všechny informace"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1408,9 +1408,9 @@ msgid "Bugfixes updates"
 msgstr "Opravy chyb"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japonsko"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1427,20 +1427,15 @@ msgstr "Prosím počkejte, hledám dostupné balíčky..."
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Povolen?"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "Povolen?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1467,16 +1462,6 @@ msgstr "Instalace dokončena"
 msgid " done."
 msgstr " hotovo."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1484,13 +1469,13 @@ msgstr "Chcete-li pokračovat, musíte vložit médium"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Je vybráno příliš mnoho balíčků"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Je vybráno příliš mnoho balíčků"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1502,17 +1487,17 @@ msgstr "Nedělat nic"
 msgid "Danmark"
 msgstr "Dánsko"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Chyba při stahování"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazílie"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Nápověda"
@@ -1524,6 +1509,11 @@ msgstr ""
 "Promiňte, ale abyste mohl instalovat balíčky, musíte být přihlášen jako "
 "uživatel root."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1551,7 +1541,7 @@ msgstr "podle umístění zdroje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1564,6 +1554,11 @@ msgstr "Stahování `%s', zbývající čas: %s, rychlost: %s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1591,11 +1586,6 @@ msgstr "Změnit zdroj"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Nulovat výběr"
 
@@ -1604,6 +1594,11 @@ msgstr "Nulovat výběr"
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Jiné"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1621,12 +1616,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1642,6 +1637,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1678,23 +1678,13 @@ msgid "Currently installed version: "
 msgstr "Nyní nainstalovaná verze: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Jiné"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1719,7 +1709,7 @@ msgstr "Jméno:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1727,6 +1717,11 @@ msgstr ""
 msgid "No update"
 msgstr "Žádná aktualizace"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Nedělat nic"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1737,6 +1732,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1749,6 +1754,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1757,11 +1767,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Upravuji zdroj \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1825,11 +1830,6 @@ msgstr ""
 "Tento nástroj vám pomůže vybrat aktualizace, které chcete instalovat na\n"
 "vašem počítači."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2112,6 +2112,10 @@ msgid "Software Sources Manager"
 msgstr "Správce zdrojů software"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP server"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "je v konfliktu s"
 
diff --git a/po/cs.pom b/po/cs.pom
index 9c22a733..9c29b415 100644
--- a/po/cs.pom
+++ b/po/cs.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Pracovní stanice"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafické prostředí"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Vývoj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/cy.po b/po/cy.po
index b7c33506..60022cf1 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-02-17 22:21-0000\n"
 "Last-Translator: Rhoslyn Prys <rhoslyn.prys@meddal.org.uk>\n"
 "Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -19,14 +19,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Tynnu .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -34,12 +44,7 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -57,25 +62,20 @@ msgstr "gosodwyd popeth yn llwyddiannus"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Networking"
+msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "Mae angen llanw o leiaf y ddau gofnod cyntaf"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Canlyniadau'r chwilio"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -135,11 +140,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sut i ddewis drych gyda llaw."
 
@@ -153,6 +153,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Paratoi pecynnau i'w gosod"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -170,19 +175,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Yr Eidal"
+msgid "True type"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphics"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Yr Eidal"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -196,11 +211,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Mae angen un o'r pecynnau canlynol:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -218,7 +228,7 @@ msgstr "Gwall..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -321,22 +331,12 @@ msgid "Password:"
 msgstr "Cyfrinair:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "disgrifiadau"
 
@@ -355,6 +355,11 @@ msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
 msgid "All packages, by update availability"
 msgstr "yn ôl diweddariad"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -371,6 +376,11 @@ msgid "Greece"
 msgstr "Groeg"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Gwneud dim"
@@ -424,11 +434,6 @@ msgstr "Dewis drych..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -492,6 +497,11 @@ msgstr "Llwybr:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Llwytho pecyn `%s' (%s/%s) i lawr..."
 
@@ -502,6 +512,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Arall"
 
@@ -510,36 +525,31 @@ msgstr "Arall"
 msgid "Sweden"
 msgstr "Sweden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Awstria"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Gwybodaeth..."
+msgid "Austria"
+msgstr "Awstria"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr ""
+msgid "Info..."
+msgstr "Gwybodaeth..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Archwilio..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -547,22 +557,17 @@ msgstr "Siapan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Crynodeb: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
+msgid "Boot and Init"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -580,6 +585,11 @@ msgstr "Tynnu .%s"
 msgid "Importance: "
 msgstr "Pwysigrwydd: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -622,11 +632,6 @@ msgstr "Gwlad Belg"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Maint: "
 
@@ -650,11 +655,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Diweddaru ffynonellau"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -690,6 +690,11 @@ msgstr "Digwyddodd anhawster wrth osod"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -700,16 +705,6 @@ msgstr "Golygu"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Arall"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -732,11 +727,6 @@ msgstr "Archwilio ffeil y ffynhonell '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "mewn ffeiliau"
 
@@ -747,12 +737,17 @@ msgstr "Pob pecyn,"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -767,6 +762,16 @@ msgstr "Canlyniadau'r chwilio (dim)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -785,11 +790,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Atal"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Arhoswch, diweddaru cyfrwng..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -845,6 +865,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Ffindir"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -862,12 +887,12 @@ msgstr "Cadw newidiadau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
+msgid "Instant messaging"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -878,6 +903,11 @@ msgstr "Mwy o wybodaeth"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Chwilio"
 
@@ -902,16 +932,6 @@ msgid "Spain"
 msgstr "Sbaen"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
@@ -923,11 +943,6 @@ msgstr "Ffeiliau:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Methu estyn pecynnau ffynhonnell."
 
@@ -936,6 +951,11 @@ msgstr "Methu estyn pecynnau ffynhonnell."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Mae modd i chi enwi defnyddiwr /cyfrinair ar gyfer dilysiad dirprwy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Tseina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -948,11 +968,6 @@ msgstr "Pecynnau ychwanegol angenrheidiol"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1010,7 +1025,7 @@ msgstr "Canfod:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1024,11 +1039,6 @@ msgid "Removable device"
 msgstr "Dyfais symudol"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Paratoi pecynnau i'w gosod"
@@ -1043,21 +1053,11 @@ msgstr "Arhoswch tynnu'r pecynnau..."
 msgid "Please wait, adding medium..."
 msgstr "Arhoswch, ychwanegu cyfrwng..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Arall"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Mewngofnod:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1068,21 +1068,16 @@ msgstr "Gwlad Belg"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r dirprwyon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Ffurfweddu'r dirprwyon"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1090,11 +1085,6 @@ msgstr "Gwirio llofnod `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1108,16 +1098,6 @@ msgstr "Gwall ffeil"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1129,12 +1109,7 @@ msgstr "Methu diweddaru'r cyfrwng; bydd yn cael ei anablu'n awtomatig."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1147,25 +1122,20 @@ msgstr "Dewiswch ddrych"
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Rheswm am y diweddariad:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Ffurfweddu'r ffynonellau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Rheswm am y diweddariad:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1194,7 +1164,7 @@ msgstr "Problem wrth dynnu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1220,22 +1190,37 @@ msgstr "Paratoi pecynnau i'w gosod"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "Disgrifiadau: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1243,6 +1228,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1270,11 +1265,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Enw: "
 
@@ -1320,7 +1310,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1335,12 +1325,22 @@ msgstr "Dewiswyd"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Gwybodath lawn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1397,9 +1397,9 @@ msgid "Bugfixes updates"
 msgstr "Diweddariad cywiro gwallau"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Siapan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1416,20 +1416,15 @@ msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
 msgid "Cancel"
 msgstr "Dileu"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Galluogwyd?"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "Galluogwyd?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1456,16 +1451,6 @@ msgstr "Gorffennodd y gosodiad"
 msgid " done."
 msgstr " gorffen.."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1473,13 +1458,13 @@ msgstr "Rhaid gosod y cyfrwng i mewn i barhau"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Mae gormod o becynnau wedi eu dewis"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Mae gormod o becynnau wedi eu dewis"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1491,17 +1476,17 @@ msgstr "Gwneud dim"
 msgid "Danmark"
 msgstr "Denmarc"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Gwall wrth lwytho i lawr"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
@@ -1511,6 +1496,11 @@ msgstr "Cymorth"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Rhaid eich bod yn wraidd i osod pecyn."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1538,7 +1528,7 @@ msgstr "yn ôl ffynhonnell eu tarddiad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1551,6 +1541,11 @@ msgstr "Llwytho '%s' i lawr, amser yn weddill:%s, cyflymdra:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1578,11 +1573,6 @@ msgstr "Newid cyfrwng"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Ailosod y dewis"
 
@@ -1591,6 +1581,11 @@ msgstr "Ailosod y dewis"
 msgid "Mandrake Update"
 msgstr "Diweddaru Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Arall"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1608,12 +1603,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1629,6 +1624,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1665,23 +1665,13 @@ msgid "Currently installed version: "
 msgstr "Fersiwn sydd wedi ei osod ar hyn o bryd:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Arall"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1706,7 +1696,7 @@ msgstr "Enw:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1714,6 +1704,11 @@ msgstr ""
 msgid "No update"
 msgstr "Dim diweddariad"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Gwneud dim"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1724,6 +1719,16 @@ msgstr "Iawn"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1736,6 +1741,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1744,11 +1754,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Golygu ffynhonnell \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1811,11 +1816,6 @@ msgstr ""
 "Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
 "ar eich cyfrifiadur."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2098,6 +2098,10 @@ msgid "Software Sources Manager"
 msgstr "Rheolwr Ffynhonnell Meddalwedd"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "Gwasanaethwr FTP"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " gwrthdaro gyda"
 
diff --git a/po/cy.pom b/po/cy.pom
index 5babd804..03ac15a9 100644
--- a/po/cy.pom
+++ b/po/cy.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Man Gwaith"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Amgylchedd Graffig"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Datblygiad"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Gwasanaethwr"
 
diff --git a/po/da.po b/po/da.po
index 7c0d31d7..64915fff 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-06-20 13:28+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@klid.dk>\n"
@@ -22,14 +22,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Arkivering/andet"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Netv�rk/fjernadgang"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Vent venligst, opdaterer medie..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -37,13 +47,8 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Naturvidenskab/datalogi"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Naturvidenskab/fysik"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -60,25 +65,20 @@ msgstr "alting blev installeret korrekt"
 msgid "Verifying packages signatures..."
 msgstr "Efterpr�ver pakkeunderskrifter..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Du skal udfylde i det mindste de to f�rste indgange."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "System/konfigurering/andet"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Netv�rk/filoverf�rsel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Networking"
-msgstr "System/konfigurering/netv�rk"
+msgid "KDE and Qt"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "System/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Du skal udfylde i det mindste de to f�rste indgange."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -113,6 +113,11 @@ msgstr ""
 msgid "Search results"
 msgstr "S�geresultater"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Grafisk skrivebord/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -138,11 +143,6 @@ msgstr "Redig�r en parallel gruppe"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "System/konfigurering/udstyr"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hvordan du manuelt v�lger dit spejl"
 
@@ -156,6 +156,11 @@ msgstr "Publicering"
 msgid "Package installation..."
 msgstr "Installation af pakker"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -173,6 +178,21 @@ msgstr "Skaller"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Chemistry"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Graphics"
 msgstr "Grafik"
 
@@ -183,11 +203,6 @@ msgstr "Italien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "System/kerne og udstyr"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -202,11 +217,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "En af f�lgende pakker beh�ves:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Udvikling/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -224,8 +234,8 @@ msgstr "Proxy..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "System/konfigurering/opstart og initialisering"
+msgid "Litterature"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -329,21 +339,11 @@ msgstr "Adgangskode:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "System/Servere"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Installation af programpakker"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Grafisk skrivebord/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "i beskrivelser"
 
@@ -362,6 +362,11 @@ msgstr "Nogle yderligere pakker skal fjernes"
 msgid "All packages, by update availability"
 msgstr "Alle pakker, efter opdateringstilg�ngelighed"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -379,6 +384,11 @@ msgstr "Gr�kenland"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Overv�ger"
 
@@ -431,11 +441,6 @@ msgstr "V�lg et spejl..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Grafisk skrivebord/WindowMaker"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -504,6 +509,11 @@ msgstr "Sti:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Henter pakke `%s' (%s/%s)..."
 
@@ -514,6 +524,11 @@ msgstr "Protokol:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Andet"
 
@@ -522,36 +537,31 @@ msgstr "Andet"
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "�strig"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "�strig"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Netv�rk/filoverf�rsel"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Udvikling/andet"
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Unders�g..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Spil/kort"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -559,23 +569,18 @@ msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Netv�rk/fjernadgang"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Resum�: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "System/skrifttyper/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Udvikling/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -592,6 +597,11 @@ msgstr "Fjern .%s"
 msgid "Importance: "
 msgstr "Vigtighed: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -635,11 +645,6 @@ msgstr "Medie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "System/internationalisering"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "St�rrelse: "
 
@@ -663,11 +668,6 @@ msgstr "Tilf�j en parallel gruppe"
 msgid "Update media"
 msgstr "Opdat�r medier"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Udvikling/databaser"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -703,6 +703,11 @@ msgstr "Problem ved installationen"
 msgid "Terminals"
 msgstr "Terminaler"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "System/kerne og udstyr"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -713,16 +718,6 @@ msgstr "Redig�r"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgt: %d MB / Fri diskplads: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "B�ger/andet"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Naturvidenskab/andet"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -745,11 +740,6 @@ msgstr "Unders�ger ekstern fil for medie '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Spil/�ventyr"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "i filer"
 
@@ -760,13 +750,18 @@ msgstr "Alle pakker, efter gruppe"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Grafisk skrivebord/FVWM-baseret"
+msgid "Kernel"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Spil/sport"
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -779,6 +774,16 @@ msgid "Search results (none)"
 msgstr "S�geresultater (ingen)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Spil/�ventyr"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -799,11 +804,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Stop"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Vent venligst, opdaterer hdlist..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "System/internationalisering"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -859,6 +879,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finland"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -876,13 +901,13 @@ msgstr "Gem �ndringer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
-msgstr "Netv�rk/nyheder"
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "B�ger/OSS"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -892,6 +917,11 @@ msgstr "Mere info"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "S�g"
 
@@ -917,16 +947,6 @@ msgstr "Spanien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Naturvidenskab/astronomi"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Udvikling/kerne"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Allerede eksisterende opdateringsmedier"
 
@@ -937,11 +957,6 @@ msgstr "Filer:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Kunne ikke hente kildepakker."
 
@@ -951,6 +966,11 @@ msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Du kan angive en bruger og en adgangskode for autentifikation af proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -963,11 +983,6 @@ msgstr "Yderligere pakker beh�ves"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1029,9 +1044,9 @@ msgid "Find:"
 msgstr "Find:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr ""
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "System/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1045,11 +1060,6 @@ msgstr "Udskiftelig enhed"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Forbereder installation af pakker"
 
@@ -1063,21 +1073,11 @@ msgstr "Vent venligst, fjerner pakker..."
 msgid "Please wait, adding medium..."
 msgstr "Vent venligst, tilf�jer medie..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Spil/andet"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1088,21 +1088,16 @@ msgstr "Belgien"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Konfigur�r proxyer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Konfigur�r proxyer"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1110,11 +1105,6 @@ msgstr "Starter hentning af `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "En fatal fejl skete: %s."
 
@@ -1128,16 +1118,6 @@ msgstr "fatal fejl"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1153,12 +1133,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1171,25 +1146,20 @@ msgstr "V�lg �nsket spejl."
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redigerer parallel gruppe '%s':"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "�rsag til opdatering: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "System/konfigurering/andet"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "�rsag til opdatering: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1218,7 +1188,7 @@ msgstr "Problem ved fjernelse"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1244,29 +1214,54 @@ msgstr "Ingen pakke fundet til installation."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "Medie: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "Beskrivelse: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Arkivering/andet"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr ""
+#, fuzzy, c-format
+msgid "System"
+msgstr "System/Servere"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Alle �nskede pakker blev installeret uden problemer."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "System/Servere"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1294,11 +1289,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Navn: "
 
@@ -1344,7 +1334,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1358,13 +1348,23 @@ msgid "Selected"
 msgstr "Valgt"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Naturvidenskab/datalogi"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Mest information"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1421,9 +1421,9 @@ msgid "Bugfixes updates"
 msgstr "Fejlretningsopdateringer"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1440,6 +1440,11 @@ msgstr "Vent venligst, finder tilg�ngelige pakker..."
 msgid "Cancel"
 msgstr "Annull�r"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Naturvidenskab/andet"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1447,16 +1452,6 @@ msgstr "Aktiveret?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakker, alfabetisk"
 
@@ -1480,16 +1475,6 @@ msgstr "Installationen f�rdig"
 msgid " done."
 msgstr " f�rdig."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1497,15 +1482,15 @@ msgstr "Du skal inds�tte mediet for at forts�tte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "For mange pakker er valgt"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Naturvidenskab/fysik"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "G�r ingenting"
@@ -1515,17 +1500,17 @@ msgstr "G�r ingenting"
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Fejl under hentning"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasilien"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Hj�lp"
@@ -1535,6 +1520,11 @@ msgstr "Hj�lp"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Desv�rre, kunne ikke hente kildepakker. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Spil/sport"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1562,7 +1552,7 @@ msgstr "Alle pakker, efter medielagringsplads"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1575,6 +1565,11 @@ msgstr "Hentning af `%s', resterende tid:%s, hastighed:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Udvikling/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1602,11 +1597,6 @@ msgstr "Skift media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Nulstil det valgte"
 
@@ -1615,6 +1605,11 @@ msgstr "Nulstil det valgte"
 msgid "Mandrake Update"
 msgstr "Mandrake Opdat�r"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "B�ger/OSS"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1632,12 +1627,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1655,6 +1650,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1691,24 +1691,14 @@ msgid "Currently installed version: "
 msgstr "Nuv�rende installeret version: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Spil/kort"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr ""
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Naturvidenskab/astronomi"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1732,7 +1722,7 @@ msgstr "Navn:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1740,6 +1730,11 @@ msgstr ""
 msgid "No update"
 msgstr "Ingen opdatering"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Netv�rk/nyheder"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1750,6 +1745,16 @@ msgstr "O.k."
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Spil/kort"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1762,6 +1767,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1770,11 +1780,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Redigerer medie '%s':"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1838,11 +1843,6 @@ msgstr ""
 "Dette v�rkt�j hj�lper dig med at v�lge opdateringerne du vil\n"
 "installere p� maskinen."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2123,6 +2123,66 @@ msgstr "Fjern programmel"
 msgid "Software Sources Manager"
 msgstr "Administration af programmelkilder"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "System/internationalisering"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Grafisk skrivebord/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Naturvidenskab/datalogi"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "System/Servere"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Grafisk skrivebord/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Naturvidenskab/datalogi"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "System/konfigurering/netv�rk"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "System/konfigurering/udstyr"
+
+#~ msgid "Development/Python"
+#~ msgstr "Udvikling/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "System/konfigurering/opstart og initialisering"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Grafisk skrivebord/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Udvikling/andet"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "System/skrifttyper/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Udvikling/databaser"
+
+#~ msgid "Books/Other"
+#~ msgstr "B�ger/andet"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Grafisk skrivebord/FVWM-baseret"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Udvikling/kerne"
+
+#~ msgid "Games/Other"
+#~ msgstr "Spil/andet"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s er i konflikt med %s"
 
diff --git a/po/da.pom b/po/da.pom
index 07e06a93..020f5150 100644
--- a/po/da.pom
+++ b/po/da.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Arbejdsstation"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafisk milj�"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Udvikling"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/de.po b/po/de.po
index 9d49c748..eb26f944 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-de\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-05-14 19:50+0000\n"
 "Last-Translator: Sebastian Deutscher <sebastian_deutscher@web.de>\n"
 "Language-Team: german <cooker-i18n@linux-mandrake.com>\n"
@@ -22,14 +22,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Entferne .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Aktualisiere Quellen, bitte warten ..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -37,12 +47,7 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -60,25 +65,20 @@ msgstr "Alles korrekt installiert"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Sie müssen zumindest die ersten beiden Felder ausfüllen."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Entwicklungsversionen"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "Sie müssen zumindest die ersten beiden Felder ausfüllen."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -113,6 +113,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Suchergebnisse"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -139,11 +144,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Wie Sie Ihren Paketserver(Mirror) selbst auswählen"
 
@@ -157,6 +157,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Paketinstallation vorbereiten ..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -174,19 +179,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "True type"
+msgstr "Typ"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Italien"
+msgid "Base"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Graphics"
 msgstr ""
 
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Italien"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -200,11 +215,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Sie benötigen eines der folgenden Pakete:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Entwicklungsversionen"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -222,7 +232,7 @@ msgstr "Proxy ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -326,21 +336,11 @@ msgstr "Passwort:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Softwarepakete installieren"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "in Beschreibungen"
 
@@ -359,6 +359,11 @@ msgstr "Einige weitere Pakete müssen ebenfalls entfernt werden."
 msgid "All packages, by update availability"
 msgstr "nach Verfügbarkeit"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -375,6 +380,11 @@ msgid "Greece"
 msgstr "Griechenland"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Tue nichts"
@@ -427,11 +437,6 @@ msgstr "Wählen Sie einen Mirror ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -502,6 +507,11 @@ msgstr "Pfad:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Besorge Paket „%s“ (%s/%s) ..."
 
@@ -512,6 +522,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Sonstige"
 
@@ -520,36 +535,31 @@ msgstr "Sonstige"
 msgid "Sweden"
 msgstr "Schweden"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Östereich"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info ..."
+msgid "Austria"
+msgstr "Östereich"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Entwicklungsversionen"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info ..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Untersuche ..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -557,23 +567,18 @@ msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Zusammenfassung: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Entwicklungsversionen"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -590,6 +595,11 @@ msgstr "Entferne .%s"
 msgid "Importance: "
 msgstr "Wichtigkeit: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -632,11 +642,6 @@ msgstr "Belgien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Größe: "
 
@@ -660,11 +665,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Quelle(n) aktualisieren"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Entwicklungsversionen"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -700,6 +700,11 @@ msgstr "Fehler bei der Installation"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -710,16 +715,6 @@ msgstr "Bearbeiten"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Sonstige"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -742,11 +737,6 @@ msgstr "Untersuche Datei auf Quellmedium \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "in Dateien"
 
@@ -756,13 +746,18 @@ msgid "All packages, by group"
 msgstr "Alle Pakete,"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "Allgemein"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -777,6 +772,16 @@ msgstr "Suchergebnisse (keine)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -795,11 +800,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Stopp"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Aktualisiere Quellen, bitte warten ..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -861,6 +881,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finnland"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -877,13 +902,13 @@ msgid "Save changes"
 msgstr "Änderungen speichern"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Netzwerkeinstellungen"
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -894,6 +919,11 @@ msgstr "Mehr..."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Suche"
 
@@ -918,16 +948,6 @@ msgid "Spain"
 msgstr "Spanien"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Entwicklungsversionen"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Fehler beim Erstellen eines Aktualisierungsmediums"
@@ -939,11 +959,6 @@ msgstr "Dateien:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Kann Quellpakete nicht bekommen."
 
@@ -954,6 +969,11 @@ msgstr ""
 "Sie können auch einen Benutzernamen und Passwort für die "
 "Proxyauthentifizierung angeben:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "China"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -965,11 +985,6 @@ msgid "Additional packages needed"
 msgstr "Es werden zusätzliche Pakete benötigt"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Netzwerk"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -1027,9 +1042,9 @@ msgid "Find:"
 msgstr "Finden:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Entwicklungsversionen"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1042,11 +1057,6 @@ msgid "Removable device"
 msgstr "Wechselmedium"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Paketinstallation vorbereiten ..."
@@ -1061,21 +1071,11 @@ msgstr "Entfernen der Pakete, bitte warten ..."
 msgid "Please wait, adding medium..."
 msgstr "Hinzufügen der Quelle, bitte warten ..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Sonstige"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Netzwerk"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1086,21 +1086,16 @@ msgstr "Belgien"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Proxy einrichten"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Warnung"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1108,11 +1103,6 @@ msgstr "Starte den Download von \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Fataler Fehler aufgetreten: %s"
 
@@ -1126,16 +1116,6 @@ msgstr "Fataler Fehler"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "Entwicklungsversionen"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1150,12 +1130,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1168,25 +1143,20 @@ msgstr "Bitte wählen Sie Ihren bevorzugten Mirror."
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Quelle \"%s\" bearbeiten:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Aktualisierungsgründe:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Quellen einrichten"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Aktualisierungsgründe:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1215,7 +1185,7 @@ msgstr "Fehler beim Entfernen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1240,23 +1210,38 @@ msgid "No package found for installation."
 msgstr "Kein Paket zum Installieren gefunden."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Typ"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "Beschreibung: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1264,6 +1249,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Alle gewählten Pakete wurden erfolgreich installiert."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1290,11 +1285,6 @@ msgid "Databases"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Netzwerk"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Name: "
 msgstr "Name: "
@@ -1341,7 +1331,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1356,12 +1346,22 @@ msgstr "Markiert"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Alle Informationen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1419,8 +1419,8 @@ msgstr "Fehlerkorrekturen"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Netzwerk"
+msgid "Java"
+msgstr "Japan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1437,20 +1437,15 @@ msgstr "Suche nach vorhandenen Paketen, bitte warten ..."
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Aktiviert?"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "Aktiviert?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1477,16 +1472,6 @@ msgstr "Installation beendet"
 msgid " done."
 msgstr "Fertig."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Entwicklungsversionen"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1494,13 +1479,13 @@ msgstr "Sie müssen das Medium einlegen, um fortfahren zu können"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Zu viele Pakete ausgewählt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Zu viele Pakete ausgewählt"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1512,17 +1497,17 @@ msgstr "Tue nichts"
 msgid "Danmark"
 msgstr "Dänemark"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Netzwerk"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Fehler beim Herunterladen"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasilien"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Hilfe"
@@ -1532,6 +1517,11 @@ msgstr "Hilfe"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ich kann leider die Quellpakete nicht bekommen.%s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1559,7 +1549,7 @@ msgstr "nach Quellen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1572,6 +1562,11 @@ msgstr "Download von `%s', Dauer:%s, Geschwindigkeit:%s"
 msgid "Add a host"
 msgstr "Hinzufügen einer Quelle"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Entwicklungsversionen"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1599,11 +1594,6 @@ msgstr "Medium wechseln"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Auswahl zurücksetzen"
 
@@ -1612,6 +1602,11 @@ msgstr "Auswahl zurücksetzen"
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Sonstige"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1628,12 +1623,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1649,6 +1644,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1686,22 +1686,12 @@ msgstr "Momentan installierte Version:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Entwicklungsversionen"
+msgid "Games"
+msgstr "Name"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1726,7 +1716,7 @@ msgstr "Name:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1734,6 +1724,11 @@ msgstr ""
 msgid "No update"
 msgstr "Keine Aktualisierungen"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Netzwerk"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1744,6 +1739,16 @@ msgstr "OK"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1756,6 +1761,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "RpmDrake"
 
@@ -1764,11 +1774,6 @@ msgstr "RpmDrake"
 msgid "Editing medium \"%s\":"
 msgstr "Quelle „%s“ bearbeiten:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1832,11 +1837,6 @@ msgstr ""
 "Dieses Werkzeug möchte Ihnen bei der Entscheidung helfen, welche \n"
 "aktualisierten Pakete Sie installieren wollen."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2118,6 +2118,62 @@ msgstr "Software entfernen"
 msgid "Software Sources Manager"
 msgstr "Paketquellen verwalten"
 
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP-Server"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Entwicklungsversionen"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Entwicklungsversionen"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Entwicklungsversionen"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Netzwerkeinstellungen"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Entwicklungsversionen"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Netzwerk"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Entwicklungsversionen"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Sonstige"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Netzwerk"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Entwicklungsversionen"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Netzwerk"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Netzwerk"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Entwicklungsversionen"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s erzeugt Konflikte mit %s."
 
@@ -2492,9 +2548,6 @@ msgstr "Paketquellen verwalten"
 #~ msgid "security"
 #~ msgstr "Sicherheit"
 
-#~ msgid "general"
-#~ msgstr "Allgemein"
-
 #~ msgid "bugfix"
 #~ msgstr "Bugfix"
 
@@ -2512,9 +2565,6 @@ msgstr "Paketquellen verwalten"
 #~ "Ich kann die Liste der zu aktualisierenden Pakete nicht finden.\n"
 #~ "Bitte versuchen Sie einen anderen Server."
 
-#~ msgid "Warning"
-#~ msgstr "Warnung"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2592,15 +2642,9 @@ msgstr "Paketquellen verwalten"
 #~ msgid "/Help/_About..."
 #~ msgstr "/Hilfe/Ü_ber ..."
 
-#~ msgid "Name"
-#~ msgstr "Name"
-
 #~ msgid "Installed"
 #~ msgstr "Installiert"
 
-#~ msgid "Type"
-#~ msgstr "Typ"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "Mandrake Update, Version 7.2\n"
 
diff --git a/po/de.pom b/po/de.pom
index 2c2ceb80..e331168f 100644
--- a/po/de.pom
+++ b/po/de.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Arbeitsplatzrechner"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafische Arbeitsoberfläche"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Entwicklung"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/el.po b/po/el.po
index f3a40d7b..3c459ee9 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2002-08-30 16:19+0300\n"
 "Last-Translator: ����� �������� (Nick Niktaris) <niktaris@yahoo.com>\n"
 "Language-Team: Greek <nls@hellug.gr>\n"
@@ -20,14 +20,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "��������.%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "�������� ����������, ����������� �� ����..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "�������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -58,25 +63,20 @@ msgstr "��� �������������� �����"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "������ �� ������������ ����������� �� ��� ����� �����."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Networking"
+msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "������ �� ������������ ����������� �� ��� ����� �����."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "���������� ����������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -137,11 +142,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "��� �� ��������� ����� ��� ��� ����������� ���"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "������������ ������� ��� �����������..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -172,6 +177,21 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Chemistry"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Graphics"
 msgstr ""
 
@@ -182,11 +202,6 @@ msgstr "�����������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -198,11 +213,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "��� ��� �� �������� ������ �����������:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,7 +230,7 @@ msgstr "������..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -323,22 +333,12 @@ msgid "Password:"
 msgstr "������� ���������:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "������������ ������� ��� �����������..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "���� ����������"
 
@@ -357,6 +357,11 @@ msgstr "�������� �������� ������ ������ �� ����������"
 msgid "All packages, by update availability"
 msgstr "���� �������������� �����������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -373,6 +378,11 @@ msgid "Greece"
 msgstr "������"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "�� �� ����� ������"
@@ -427,11 +437,6 @@ msgstr "�������� ��� �����������..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -496,6 +501,11 @@ msgstr "����:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "������� � ���� ��� ������� `%s' (%s/%s)..."
 
@@ -506,6 +516,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "����"
 
@@ -514,36 +529,31 @@ msgstr "����"
 msgid "Sweden"
 msgstr "�������"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "�������"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "�����������..."
+msgid "Austria"
+msgstr "�������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr ""
+msgid "Info..."
+msgstr "�����������..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "�������..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -551,22 +561,17 @@ msgstr "�������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "������: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
+msgid "Boot and Init"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -584,6 +589,11 @@ msgstr "��������.%s"
 msgid "Importance: "
 msgstr "������������: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -626,11 +636,6 @@ msgstr "������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "�������: "
 
@@ -654,11 +659,6 @@ msgstr ""
 msgid "Update media"
 msgstr "�������� �����(��)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -694,6 +694,11 @@ msgstr "������� ���������� ���� ��� �����������"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -704,16 +709,6 @@ msgstr "�����������"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "����������: %d MB/ ��������� ����� ���� �����: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "����"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -736,11 +731,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "��� ������"
 
@@ -751,12 +741,17 @@ msgstr "��� �� ������,"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -771,6 +766,16 @@ msgstr "���������� ���������� (������)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -789,11 +794,26 @@ msgstr ""
 msgid "Stop"
 msgstr "�����������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "�������� ����������, ����������� �� ����..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -849,6 +869,11 @@ msgstr ""
 msgid "Finland"
 msgstr "���������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -866,12 +891,12 @@ msgstr "���������� �������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
+msgid "Instant messaging"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -882,6 +907,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "���������"
 
@@ -907,16 +937,6 @@ msgid "Spain"
 msgstr "�������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "������ ���� ��� �������� ��� ����� ������������"
@@ -928,11 +948,6 @@ msgstr "������:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "������� � ���� ��� ������� �������."
 
@@ -941,6 +956,11 @@ msgstr "������� � ���� ��� ������� �������."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "����"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -953,11 +973,6 @@ msgstr "����������� �������� ������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1015,7 +1030,7 @@ msgstr "������:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1029,11 +1044,6 @@ msgid "Removable device"
 msgstr "����������� �������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "������������ ������� ��� �����������..."
@@ -1048,21 +1058,11 @@ msgstr "�������� ����������, ����������� �� ������..."
 msgid "Please wait, adding medium..."
 msgstr "�������� ����������, ����������� �� ����..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "����"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "����������:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1073,21 +1073,16 @@ msgstr "������"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure proxies"
 msgstr "������� �����"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1095,11 +1090,6 @@ msgstr "���������� ��������� ��� `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1113,16 +1103,6 @@ msgstr "������ �������"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1134,12 +1114,7 @@ msgstr "�������� ����������� ��� �����, �� ��������������� ��������."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1152,24 +1127,19 @@ msgstr "�������� �������� ��� ��������� �����������."
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "����������� ����� \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "������� �����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1199,7 +1169,7 @@ msgstr "������� ���������� ���� ��� �����������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1225,22 +1195,37 @@ msgstr "������������ ������� ��� �����������..."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "���������"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1248,6 +1233,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "��� �� ��������� ������ �������������� ��������."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1275,11 +1270,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "�����: "
 
@@ -1325,7 +1315,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1340,12 +1330,22 @@ msgstr "����������"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "�������� �����������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1402,9 +1402,9 @@ msgid "Bugfixes updates"
 msgstr "������������ ����������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "�������"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1421,20 +1421,15 @@ msgstr "�������� ����������, ������������ �� ��������� ������..."
 msgid "Cancel"
 msgstr "�������"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "������������;"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "������������;"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1461,33 +1456,23 @@ msgstr "� ����������� ��������"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "������ �� �������� �� ���� ��� �� ����������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Boards"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Too many packages are selected"
 msgstr "�������� ������ ��� ������� �� �������������"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Physics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Do nothing"
 msgstr "�� �� ����� ������"
 
@@ -1496,17 +1481,17 @@ msgstr "�� �� ����� ������"
 msgid "Danmark"
 msgstr "�����"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "������ ���� �� ����"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "��������"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "�������"
@@ -1516,6 +1501,11 @@ msgstr "�������"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "������ �� ����� root ��� �� ������������� ������, �������."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1543,7 +1533,7 @@ msgstr "���� ������������� �����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1556,6 +1546,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1583,11 +1578,6 @@ msgstr "������ �����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1596,6 +1586,11 @@ msgstr ""
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "����"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1613,12 +1608,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1633,6 +1628,11 @@ msgstr ""
 "���� �� ������ �� ������������ ��� ���� ��������� ��� �����."
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1666,23 +1666,13 @@ msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1707,7 +1697,7 @@ msgstr "�����:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1715,6 +1705,11 @@ msgstr ""
 msgid "No update"
 msgstr "����� ������������"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "�� �� ����� ������"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1725,6 +1720,16 @@ msgstr "OK"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1737,6 +1742,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1745,11 +1755,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "����������� ����� \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1813,11 +1818,6 @@ msgstr ""
 "���� �� �������� �� ��� �������� �� ��������� ��� ������������ ��� ������\n"
 "�� ������������� ���� ���������� ���."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2103,6 +2103,10 @@ msgid "Software Sources Manager"
 msgstr "������������ ������� ����������"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "����������� FTP"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " ����������� ��"
 
diff --git a/po/el.pom b/po/el.pom
index 4cd9dc64..0697d23b 100644
--- a/po/el.pom
+++ b/po/el.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "������� ��������"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "������� ����������"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "��������"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "������������"
 
diff --git a/po/eo.po b/po/eo.po
index bc5da138..31ead29d 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-03-11 21:40-0400\n"
 "Last-Translator: Vilhelmo Lutermano <vlutermano@free.fr>\n"
 "Language-Team: esperanto <eo@li.org>\n"
@@ -19,14 +19,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Deprenebla"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Kontrolas dependaĵojn..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -34,12 +44,7 @@ msgstr "Kanado"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -57,24 +62,19 @@ msgstr "Pakaĵo estas jam instalata"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Programadaj Ĝisdatigoj"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -106,6 +106,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Serĉrezulto"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -127,11 +132,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -145,6 +145,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Preparas pakaĵojn por instalado..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -164,21 +169,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Instalu"
+msgid "True type"
+msgstr "Speco"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "Instalu"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -190,11 +205,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Programadaj Ĝisdatigoj"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -212,7 +222,7 @@ msgstr "Eraro..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -301,21 +311,11 @@ msgid "Password:"
 msgstr "Passvorto:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Priskriboj"
@@ -335,6 +335,11 @@ msgstr "Vi devas instali ĉi tiujn pakaĵojn por ĉiuj bone funkcias:"
 msgid "All packages, by update availability"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -351,6 +356,11 @@ msgid "Greece"
 msgstr "Greka"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "sed ne konformanta(j)"
@@ -403,11 +413,6 @@ msgstr "Elektu vian spegulon:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -475,6 +480,11 @@ msgstr "Pordo:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Deŝutante pakaĵon '%s' (%s/%s)..."
 
@@ -485,6 +495,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Alia"
 
@@ -493,34 +508,29 @@ msgstr "Alia"
 msgid "Sweden"
 msgstr "Sveda"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Boards"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "seria"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Programadaj Ĝisdatigoj"
-
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspect..."
+msgid "Info..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Cards"
+msgid "Inspect..."
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -529,24 +539,19 @@ msgid "Japan"
 msgstr "Japanio"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Resumo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Programadaj Ĝisdatigoj"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -563,6 +568,11 @@ msgstr "Deprenebla"
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Unable to create medium."
@@ -599,11 +609,6 @@ msgid "Medium"
 msgstr "Belga"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Grandeco"
@@ -628,11 +633,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Redaktu Fontojn"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Programadaj Ĝisdatigoj"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -668,6 +668,11 @@ msgstr "Problemo okazis dum instalado"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -678,16 +683,6 @@ msgstr "Redaktu"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Alia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Australia"
@@ -709,11 +704,6 @@ msgid "Examining remote file of medium `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in files"
 msgstr "Loka"
@@ -724,13 +714,18 @@ msgid "All packages, by group"
 msgstr "0 pakaĵoj, 0 bitokoj"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "ĝenerala"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -745,6 +740,16 @@ msgstr "Serĉrezulto"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -758,11 +763,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Sektoro"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Kontrolas dependaĵojn..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -811,6 +831,11 @@ msgstr "Pakaĵo  `%s'ne povas esti instalata\n"
 msgid "Finland"
 msgstr "Trovu:"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -827,13 +852,13 @@ msgid "Save changes"
 msgstr "Pakaĵoj"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Retaj Opcioj:"
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -843,6 +868,11 @@ msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Search"
 msgstr "serĉu"
@@ -863,16 +893,6 @@ msgid "Spain"
 msgstr "Hispanujo"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Programadaj Ĝisdatigoj"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Kontrolas dependaĵojn..."
@@ -883,11 +903,6 @@ msgid "Files:\n"
 msgstr "/_Dosiero"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Elektu viajn pakaĵojn"
@@ -897,6 +912,11 @@ msgstr "Elektu viajn pakaĵojn"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Ĉinio"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -908,11 +928,6 @@ msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Reto"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -968,9 +983,9 @@ msgid "Find:"
 msgstr "Trovu:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Programadaj Ĝisdatigoj"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -983,11 +998,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Preparas pakaĵojn por instalado..."
@@ -1004,21 +1014,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "Kontrolas dependaĵojn..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Alia"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Login:"
 msgstr "salutnomo:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Reto"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
@@ -1029,21 +1029,16 @@ msgstr "Belga"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure proxies"
 msgstr "Ĉu konfiguri fonton?"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Averto"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1051,11 +1046,6 @@ msgstr "Kontrolante la subskribon de '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1069,16 +1059,6 @@ msgstr "dosiera eraro"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "Programadaj Ĝisdatigoj"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1090,12 +1070,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1110,24 +1085,19 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Redaktu Fontojn"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Ĉu konfiguri fonton?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1157,7 +1127,7 @@ msgstr "Problemo okazis dum instalado"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1182,23 +1152,38 @@ msgid "No package found for installation."
 msgstr "Preparas pakaĵojn por instalado..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Speco"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Priskriboj"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1206,6 +1191,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Local files"
@@ -1233,11 +1228,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Reto"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Nomo: %s"
 
@@ -1283,7 +1273,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1300,12 +1290,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1359,8 +1359,8 @@ msgstr "Montru cimo-riparajn ĝisdatigojn"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Reto"
+msgid "Java"
+msgstr "Japanio"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1379,19 +1379,14 @@ msgstr ""
 msgid "Cancel"
 msgstr "Forigu"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr ""
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
+msgid "Enabled?"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1419,32 +1414,22 @@ msgstr "Instalitaj"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Programadaj Ĝisdatigoj"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Boards"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Too many packages are selected"
 msgstr "Pakaĵoj jam estas instalataj"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Physics"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Do nothing"
 msgstr "sed ne konformanta(j)"
@@ -1454,17 +1439,17 @@ msgstr "sed ne konformanta(j)"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Reto"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Eraro dum deŝutado"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazilo"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Helpo"
@@ -1474,6 +1459,11 @@ msgstr "Helpo"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Vi devas esti root por instali pakaĵojn, bedaŭrinde."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Taiwan"
@@ -1501,7 +1491,7 @@ msgstr "0 pakaĵoj, 0 bitokoj"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1514,6 +1504,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Programadaj Ĝisdatigoj"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1541,11 +1536,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1554,6 +1544,11 @@ msgstr ""
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate Preferoj"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Alia"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1566,12 +1561,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1585,6 +1580,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1616,22 +1616,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Programadaj Ĝisdatigoj"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Nomo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1656,7 +1646,7 @@ msgstr "Nomo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1664,6 +1654,11 @@ msgstr ""
 msgid "No update"
 msgstr "Faru Ĝisdatigojn"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Reto"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1674,6 +1669,16 @@ msgstr "Jes"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1686,6 +1691,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1694,11 +1704,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Redaktu Fontojn"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1760,11 +1765,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2048,6 +2048,58 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Programadaj Ĝisdatigoj"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Programadaj Ĝisdatigoj"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Programadaj Ĝisdatigoj"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Retaj Opcioj:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Programadaj Ĝisdatigoj"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Reto"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Programadaj Ĝisdatigoj"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Alia"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Reto"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Programadaj Ĝisdatigoj"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Reto"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Reto"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Programadaj Ĝisdatigoj"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "konfliktas kun"
 
@@ -2200,9 +2252,6 @@ msgstr ""
 #~ msgid "security"
 #~ msgstr "sekureco"
 
-#~ msgid "general"
-#~ msgstr "ĝenerala"
-
 #~ msgid "bugfix"
 #~ msgstr "cimo-riparo"
 
@@ -2220,9 +2269,6 @@ msgstr ""
 #~ "Ne povas preni la liston de pakaĵoj por ĝisdatigi\n"
 #~ "Provu kun alia spegulo"
 
-#~ msgid "Warning"
-#~ msgstr "Averto"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2297,15 +2343,9 @@ msgstr ""
 #~ msgid "/Help/_About..."
 #~ msgstr "/Helpo/_Pri..."
 
-#~ msgid "Name"
-#~ msgstr "Nomo"
-
 #~ msgid "Installed"
 #~ msgstr "Instalitaj"
 
-#~ msgid "Type"
-#~ msgstr "Speco"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, versio 7.2\n"
 
diff --git a/po/eo.pom b/po/eo.pom
index 4fc342b7..43c32a2e 100644
--- a/po/eo.pom
+++ b/po/eo.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Laborstacio"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr ""
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Programisto"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Servilo"
 
diff --git a/po/es.po b/po/es.po
index cb14c009..ab1cd259 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-06-18 19:21-0300\n"
 "Last-Translator: Fabian Mandelbaum <fmandelbaum@hotmail.com>\n"
 "Language-Team: Español <es@li.org>\n"
@@ -24,14 +24,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Archivado/Otros"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Redes/Acceso remoto"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Por favor espere, actualizando soportes..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -39,13 +49,8 @@ msgstr "Canadá"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Ciencias/Ciencias de la computación"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Ciencias/Física"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -62,25 +67,20 @@ msgstr "se instaló todo correctamente"
 msgid "Verifying packages signatures..."
 msgstr "Verificando las firmas de los paquetes..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Debe completar al menos las dos primeras entradas."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Sistema/Configuración/Otros"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Redes/Transferencia de archivos"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Sistema/Configuración/Redes"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Desarollo/KDE y QT"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "Sistema/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Debe completar al menos las dos primeras entradas."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -116,6 +116,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Resultados de la búsqueda"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Entorno gráfico/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -141,11 +146,6 @@ msgstr "Editar un grupo paralelo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Sistema/Configuración/Hardware"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Cómo elegir manualmente su sitio de réplica"
 
@@ -159,6 +159,11 @@ msgstr "Edición"
 msgid "Package installation..."
 msgstr "Instalación de paquete..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Desarollo/GNOME y GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -175,6 +180,21 @@ msgid "Shells"
 msgstr "Shells"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Ciencias/Química"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Gráficos"
@@ -186,11 +206,6 @@ msgstr "Italia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Sistema/Núcleo y hardware"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -205,11 +220,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Se necesita uno de los paquetes siguientes:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Desarollo/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -226,9 +236,9 @@ msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Sistema/Configuración/Arranque e inicio"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Libros/Literatura"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -332,21 +342,11 @@ msgstr "Contraseña:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Sistema/Servidores"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalación de paquetes de software"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Entorno gráfico/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "en descripciones"
 
@@ -365,6 +365,11 @@ msgstr "Se necesitan quitar algunos paquetes adicionales"
 msgid "All packages, by update availability"
 msgstr "Todos los paquetes, por disponibilidad de actualización"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -382,6 +387,11 @@ msgstr "Grecia"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Monitoreo"
 
@@ -437,11 +447,6 @@ msgstr "Elija un sitio de réplica..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Entorno gráfico/WindowMaker"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -513,6 +518,11 @@ msgstr "Ruta:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Descargando el paquete «%s» (%s/%s)..."
 
@@ -523,6 +533,11 @@ msgstr "Protocolo:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Otro"
 
@@ -531,36 +546,31 @@ msgstr "Otro"
 msgid "Sweden"
 msgstr "Suecia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Juegos/Tableros"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Info..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Redes/Transferencia de archivos"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Desarollo/Otros"
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Inspeccionar..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Juegos/Naipes"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -568,23 +578,18 @@ msgstr "Japón"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Redes/Acceso remoto"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Resumen: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Sistema/Tipos de letra/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Desarollo/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -601,6 +606,11 @@ msgstr "Quitar .%s"
 msgid "Importance: "
 msgstr "Importancia: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -643,11 +653,6 @@ msgstr "Soporte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Sistema/Internacionalización"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Tamaño: "
 
@@ -671,11 +676,6 @@ msgstr "Añadir un grupo paralelo"
 msgid "Update media"
 msgstr "Actualizar soportes"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Desarollo/Bases de datos"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -711,6 +711,11 @@ msgstr "Problema durante la instalación"
 msgid "Terminals"
 msgstr "Terminales"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Sistema/Núcleo y hardware"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -721,16 +726,6 @@ msgstr "Editar"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Libros/Otros"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Ciencias/Otros"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -753,11 +748,6 @@ msgstr "Examinando archivo remoto de soporte `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Juegos/Aventura"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "en archivos"
 
@@ -768,13 +758,18 @@ msgstr "Todos los paquetes, por grupo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Entorno gráfico/Basados en FVWM"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Juegos/Deportes"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -787,6 +782,16 @@ msgid "Search results (none)"
 msgstr "Resultados de la búsqueda (ninguno)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Juegos/Aventura"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Archivado/Grabación de CD"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -806,11 +811,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Detener"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Ciencias/Biología"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Por favor espere, generando hdlist..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Ciencias/Matemáticas"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Sistema/Internacionalización"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -867,6 +887,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finlandia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Sistema/Tipos de letra/Bitmap X11"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -883,14 +908,14 @@ msgid "Save changes"
 msgstr "Guardar cambios"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Redes/Noticias"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Redes/Mensajería instantánea"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Libros/FAQs"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -899,6 +924,11 @@ msgid "More info"
 msgstr "Más información"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Libros/Libros de computación"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Buscar"
@@ -925,16 +955,6 @@ msgstr "España"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Ciencias/Astronomía"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Desarollo/Núcleo"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Soporte de actualizaciones existente"
 
@@ -945,11 +965,6 @@ msgstr "Archivos:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Juegos/Arcade"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "No se pueden obtener los paquetes de la fuente."
 
@@ -959,6 +974,11 @@ msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Puede especificar un usuario/contraseña para la autenticación del proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "China"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -971,11 +991,6 @@ msgstr "Se necesitan paquetes adicionales"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Red/Chat"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Ejecutando en modo usuario"
 
@@ -1038,9 +1053,9 @@ msgid "Find:"
 msgstr "Encontrar:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Desarollo/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Sistema/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1054,11 +1069,6 @@ msgstr "Dispositivo removible"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Entorno gráfico/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Preparando instalación de paquetes..."
 
@@ -1072,21 +1082,11 @@ msgstr "Por favor espere, quitando paquetes..."
 msgid "Please wait, adding medium..."
 msgstr "Por favor espere, agregando soporte..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Juegos/Otros"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Cuenta:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Redes/Otros"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1097,21 +1097,16 @@ msgstr "Bélgica"
 msgid "File tools"
 msgstr "Herramientas de archivo"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Archivado/Grabación de CD"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Ciencias/Biología"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Configurar proxies"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1119,11 +1114,6 @@ msgstr "Comenzando descarga de «%s»..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Sistema/Bibliotecas"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Ocurrió un error fatal: %s."
 
@@ -1137,16 +1127,6 @@ msgstr "Error fatal"
 msgid "Leaves only, sorted by install date"
 msgstr "Sólo hojas, clasificadas por fecha de instalación"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Juegos/Estrategia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Desarollo/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1161,14 +1141,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Archivado/Compresión"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Libros/Literatura"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Ciencias/Geociencias"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1180,25 +1155,20 @@ msgstr "Por favor, elija el sitio de réplica deseado."
 msgid "Communications"
 msgstr "Comunicaciones"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Entorno gráfico/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editando grupo paralelo \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Razón para actualizar: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Comunicaciones"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Ciencias/Matemáticas"
+msgid "Reason for update: "
+msgstr "Razón para actualizar: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1227,8 +1197,8 @@ msgstr "Problema durante la eliminación"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Entorno gráfico/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1253,29 +1223,54 @@ msgstr "No se encontró paquete para instalar."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "Soporte: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Juegos/Estrategia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Descripción: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Archivado/Otros"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Ciencias/Química"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Sistema/Base"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Sistema/Servidores"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Juegos/Rompecabezas"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1303,11 +1298,6 @@ msgstr "Bases de datos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Red/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Nombre: "
 
@@ -1353,8 +1343,8 @@ msgstr "Vídeo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Desarollo/GNOME y GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1367,14 +1357,24 @@ msgid "Selected"
 msgstr "Seleccionado"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Ciencias/Ciencias de la computación"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Información máxima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Archivado/Copia de respaldo"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1430,9 +1430,9 @@ msgid "Bugfixes updates"
 msgstr "Actualizaciones que corrigen bugs"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Red/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japón"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1449,6 +1449,11 @@ msgstr "Por favor espere, encontrando los paquetes disponibles..."
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Ciencias/Otros"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1456,16 +1461,6 @@ msgstr "¿Habilitada?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Ciencias/Geociencias"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Sistema/Tipos de letra/Consola"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Todos los paquetes, alfabético"
 
@@ -1489,16 +1484,6 @@ msgstr "Finalizó la instalación"
 msgid " done."
 msgstr "hecho."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Desarollo/KDE y QT"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Libros/COMOs"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1506,15 +1491,15 @@ msgstr "Necesita insertar el soporte para continuar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Juegos/Tableros"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Se han seleccionado demasiados paquetes."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Ciencias/Física"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "Hacer nada"
@@ -1524,17 +1509,17 @@ msgstr "Hacer nada"
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Red/Correo"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Error durante la descarga"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Ayuda"
@@ -1544,6 +1529,11 @@ msgstr "Ayuda"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "No se pueden obtener paquetes fuente, lo siento. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Juegos/Deportes"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1570,9 +1560,9 @@ msgid "All packages, by medium repository"
 msgstr "Todos los paquetes, por repositorio de soporte"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Sistema/Tipos de letra/Bitmap X11"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Archivado/Compresión"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1584,6 +1574,11 @@ msgstr "Descarga de `%s', faltan:%s, velocidad:%s"
 msgid "Add a host"
 msgstr "Agregar un host"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Desarollo/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1611,11 +1606,6 @@ msgstr "Cambiar el soporte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Entorno gráfico/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Reiniciar la selección"
 
@@ -1624,6 +1614,11 @@ msgstr "Reiniciar la selección"
 msgid "Mandrake Update"
 msgstr "Actualización de Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Libros/FAQs"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1640,14 +1635,14 @@ msgstr ""
 "Por favor, intente nuevamente más tarde."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Libros/Libros de computación"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Libros/COMOs"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Sistema/Base"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1663,6 +1658,11 @@ msgstr ""
 "Puede que desee actualizar la base de datos de sus soportes."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Sistema/Bibliotecas"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1700,24 +1700,14 @@ msgid "Currently installed version: "
 msgstr "Versión actualmente instalada: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Desarollo/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Sistema/Configuración/Impresoras"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Juegos/Rompecabezas"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Juegos/Naipes"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Sistema/Configuración/Paquetes"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Ciencias/Astronomía"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1741,14 +1731,19 @@ msgstr "Nombre:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Entorno gráfico/Otros"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Sin actualizaciones"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Red/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1759,6 +1754,16 @@ msgstr "Aceptar"
 msgid "Text tools"
 msgstr "Herramientas de texto"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Juegos/Naipes"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1770,6 +1775,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Ingrese el nombre del host o la dirección IP del host a añadir:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Juegos/Arcade"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1779,11 +1789,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Editando soporte \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Redes/Mensajería instantánea"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1847,11 +1852,6 @@ msgstr ""
 "Esta herramienta lo ayudará a elegir las actualizaciones que desea instalar "
 "en su computadora."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Sistema/Tipos de letra/True Type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2132,6 +2132,128 @@ msgstr "Quitar software"
 msgid "Software Sources Manager"
 msgstr "Administrador de las fuentes de software"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Sistema/Internacionalización"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Herramientas de archivo"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Entorno gráfico/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Ciencias/Ciencias de la computación"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Sistema/Servidores"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Bases de datos"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Entorno gráfico/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Ciencias/Ciencias de la computación"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Sistema/Configuración/Otros"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Sistema/Configuración/Redes"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Sistema/Configuración/Hardware"
+
+#~ msgid "Development/Python"
+#~ msgstr "Desarollo/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Sistema/Configuración/Arranque e inicio"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Entorno gráfico/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Desarollo/Otros"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Sistema/Tipos de letra/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Desarollo/Bases de datos"
+
+#~ msgid "Books/Other"
+#~ msgstr "Libros/Otros"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Entorno gráfico/Basados en FVWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "Redes/Noticias"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Desarollo/Núcleo"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Red/Chat"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Desarollo/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Entorno gráfico/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Juegos/Otros"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Redes/Otros"
+
+#~ msgid "Development/Java"
+#~ msgstr "Desarollo/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Entorno gráfico/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Archivado/Copia de respaldo"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Red/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Sistema/Tipos de letra/Consola"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Red/Correo"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Entorno gráfico/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Desarollo/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Sistema/Configuración/Impresoras"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Sistema/Configuración/Paquetes"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Entorno gráfico/Otros"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Sistema/Tipos de letra/True Type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s está en conflicto con %s"
 
diff --git a/po/es.pom b/po/es.pom
index 7393d44b..2af2f5c2 100644
--- a/po/es.pom
+++ b/po/es.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Estación de trabajo"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Entorno gráfico"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Desarrollo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Servidor"
 
diff --git a/po/et.po b/po/et.po
index bceac1d5..ba2fb83c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-06-21 17:54+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -21,14 +21,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Arhiveerimine/Muu"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Võrk/Kaugligipääs"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Palun oodake, uuendan andmekandjat..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -36,13 +46,8 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Teadus/Arvutiteadus"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Teadus/Füüsika"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -59,25 +64,20 @@ msgstr "kõik paigaldati edukalt"
 msgid "Verifying packages signatures..."
 msgstr "Signatuuride kontrollimine..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Täitke vähemalt 2 esimest välja."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Süsteem/Seadistamine/Muu"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Võrk/Failiedastus"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Süsteem/Seadistamine/Võrk"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Arendus/KDE ja Qt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "Süsteem/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Täitke vähemalt 2 esimest välja."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Otsingu tulemused"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Graafiline töölaud/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -137,11 +142,6 @@ msgstr "Paralleelgrupi muutmine"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Süsteem/Seadistamine/Riistvara"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kuidas valida peegel käsitsi"
 
@@ -155,6 +155,11 @@ msgstr "Publitseerimine"
 msgid "Package installation..."
 msgstr "Paigaldamine..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Arendus/GNOME ja GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -171,6 +176,21 @@ msgid "Shells"
 msgstr "Shellid"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Teadus/Keemia"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Graafika"
@@ -182,11 +202,6 @@ msgstr "Itaalia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Süsteem/Kernel ja riistvara"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -201,11 +216,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Vajalik on üks järgmistest pakettidest:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Arendus/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -222,9 +232,9 @@ msgid "Proxy..."
 msgstr "Vahendaja..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Süsteem/Seadistamine/Algkäivitus"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Raamatud/Kirjandus"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -327,21 +337,11 @@ msgstr "Parool:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Süsteem/Serverid"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Pakettide paigaldamine"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Graafiline töölaud/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "kirjeldustes"
 
@@ -360,6 +360,11 @@ msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
 msgid "All packages, by update availability"
 msgstr "Kõik paketid uuendamisstaatuse järgi"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -377,6 +382,11 @@ msgstr "Kreeka"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Monitooring"
 
@@ -428,11 +438,6 @@ msgstr "Valige peegel..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Graafiline töölaud/WindowMaker"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -502,6 +507,11 @@ msgstr "Otsingutee:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Tõmban võrgust paketti '%s' (%s/%s)..."
 
@@ -512,6 +522,11 @@ msgstr "Protokoll:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Muu"
 
@@ -520,36 +535,31 @@ msgstr "Muu"
 msgid "Sweden"
 msgstr "Rootsi"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Mängud/Lauamängud"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Info..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Võrk/Failiedastus"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Arendus/Muu"
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Uuri..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Mängud/Kaardimängud"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -557,23 +567,18 @@ msgstr "Jaapan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Võrk/Kaugligipääs"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Kokkuvõte: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Süsteem/Fondid/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Arendus/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -590,6 +595,11 @@ msgstr "Eemalda .%s"
 msgid "Importance: "
 msgstr "Tähtsus: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -632,11 +642,6 @@ msgstr "Andmekandja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Süsteem/Internatsionaliseerimine"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Suurus: "
 
@@ -660,11 +665,6 @@ msgstr "Paralleelgrupi lisamine"
 msgid "Update media"
 msgstr "Uuenda allikaid"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Arendus/Andmebaasid"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -700,6 +700,11 @@ msgstr "Paigaldusel tekkis probleem"
 msgid "Terminals"
 msgstr "Terminalid"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Süsteem/Kernel ja riistvara"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -710,16 +715,6 @@ msgstr "Muuda"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valitud: %d MB / Vaba kettaruumi %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Raamatud/Muu"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Teadus/Muu"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -742,11 +737,6 @@ msgstr "Allikafaili `%s' uurimine..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Mängud/Seiklusmängud"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "failides"
 
@@ -757,13 +747,18 @@ msgstr "Kõik paketid grupi järgi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Graafiline töölaud/FVWM"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Mängud/Sport"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -776,6 +771,16 @@ msgid "Search results (none)"
 msgstr "Otsingu tulemus (ei leitud)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Mängud/Seiklusmängud"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Arhiveerimine/CD-de kirjutamine"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -794,11 +799,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Peata"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Teadus/Bioloogia"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Palun oodake, tekitan hdlisti..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Teadus/Matemaatika"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Süsteem/Internatsionaliseerimine"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -854,6 +874,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Soome"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Süsteem/Fondid/X11"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -870,14 +895,14 @@ msgid "Save changes"
 msgstr "Salvesta muutused"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Võrk/Uudised"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Võrk/Kiirsuhtlus"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Raamatud/KKK"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -886,6 +911,11 @@ msgid "More info"
 msgstr "Rohkem infot"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Raamatud/Arvutiraamatud"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Otsi"
@@ -911,16 +941,6 @@ msgstr "Hispaania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Teadus/Astronoomia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Arendus/Kernel"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Olemasolevad uuenduste allikad"
 
@@ -931,11 +951,6 @@ msgstr "Failid:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Mängud/Võitlusmängud"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Ei saa pakette kätte."
 
@@ -944,6 +959,11 @@ msgstr "Ei saa pakette kätte."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Vahendaja autentimiseks oleks tulus määrata kasutajanimi ja parool:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Hiina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -956,11 +976,6 @@ msgstr "Vajalikud lisapaketid"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Võrk/Chat"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Töötamine kasutaja õigustega"
 
@@ -1021,9 +1036,9 @@ msgid "Find:"
 msgstr "Leia:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Arendus/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Süsteem/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1037,11 +1052,6 @@ msgstr "Eemaldatav seade"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Graafiline töölaud/IceWm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Paigaldamiseks valmistumine..."
 
@@ -1055,21 +1065,11 @@ msgstr "Palun oodake, eemaldan pakette..."
 msgid "Please wait, adding medium..."
 msgstr "Palun oodake, lisan andmekandja..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Mängud/Muu"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Kasutajanimi:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Võrk/Muu"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1080,21 +1080,16 @@ msgstr "Belgia"
 msgid "File tools"
 msgstr "Failivahendid"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Arhiveerimine/CD-de kirjutamine"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Teadus/Bioloogia"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Vahendajate seadistamine"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1102,11 +1097,6 @@ msgstr "'%s' allalaadimise alustamine..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Süsteem/Teegid"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Tekkis saatuslik viga: %s."
 
@@ -1120,16 +1110,6 @@ msgstr "Saatuslik viga"
 msgid "Leaves only, sorted by install date"
 msgstr "Ainult mittenõutavad paigaldusaja järgi"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Mängud/Strateegia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Arendus/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1144,14 +1124,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Arhiveerimine/Tihendus"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Raamatud/Kirjandus"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Teadus/Geograafia"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1163,25 +1138,20 @@ msgstr "Palun valige peegel."
 msgid "Communications"
 msgstr "Kommunikatsioon"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Graafiline töölaud/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Paralleelgrupi \"%s\" muutmine:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Uuendamise põhjus: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Kommunikatsioon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Teadus/Matemaatika"
+msgid "Reason for update: "
+msgstr "Uuendamise põhjus: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1210,8 +1180,8 @@ msgstr "Probleem eemaldamisel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Graafiline töölaud/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1236,29 +1206,54 @@ msgstr "Paigaldamiseks ei leitud ühtegi paketti."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "Andmekandja: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Mängud/Strateegia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Kirjeldus: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Arhiveerimine/Muu"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Teadus/Keemia"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Süsteem/Baas"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Kõik soovitud paketid said edukalt paigaldatud."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Süsteem/Serverid"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Mängud/Pusled"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1286,11 +1281,6 @@ msgstr "Andmebaasid"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Võrk/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Nimi: "
 
@@ -1336,8 +1326,8 @@ msgstr "Video"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Arendus/GNOME ja GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1350,14 +1340,24 @@ msgid "Selected"
 msgstr "Valitud"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Teadus/Arvutiteadus"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Täielik info"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Arhiveerimine/Varundamine"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1412,9 +1412,9 @@ msgid "Bugfixes updates"
 msgstr "Turvaparandused/uuendused"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Võrk/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Jaapan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1431,6 +1431,11 @@ msgstr "Palun oodake, otsin kättesaadavaid pakette..."
 msgid "Cancel"
 msgstr "Katkesta"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Teadus/Muu"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1438,16 +1443,6 @@ msgstr "Kas lubada?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Teadus/Geograafia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Süsteem/Fondid/Konsool"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Kõik paketid tähestikuliselt"
 
@@ -1471,16 +1466,6 @@ msgstr "Paigaldus lõpetatud"
 msgid " done."
 msgstr " tehtud."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Arendus/KDE ja Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Raamatud/HOWTO"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1488,15 +1473,15 @@ msgstr "Jätkamiseks tuleb sisestada andmekandja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Mängud/Lauamängud"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Valitud on liiga palju pakette"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Teadus/Füüsika"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "Ära tee midagi"
@@ -1506,17 +1491,17 @@ msgstr "Ära tee midagi"
 msgid "Danmark"
 msgstr "Taani"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Võrk/E-post"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Viga allalaadimisel"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasiilia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Abi"
@@ -1526,6 +1511,11 @@ msgstr "Abi"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Vabandust, pakette ei õnnetunud kätte saada. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Mängud/Sport"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1552,9 +1542,9 @@ msgid "All packages, by medium repository"
 msgstr "Kõik paketid andmekandja asukoha järgi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Süsteem/Fondid/X11"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Arhiveerimine/Tihendus"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1566,6 +1556,11 @@ msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
 msgid "Add a host"
 msgstr "Serveri lisamine"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Arendus/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1593,11 +1588,6 @@ msgstr "Muuda andmekandjat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Graafiline töölaud/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Lähtesta valik"
 
@@ -1606,6 +1596,11 @@ msgstr "Lähtesta valik"
 msgid "Mandrake Update"
 msgstr "Mandrake uuendused"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Raamatud/KKK"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1622,14 +1617,14 @@ msgstr ""
 "Palun proovige varsti uuesti."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Raamatud/Arvutiraamatud"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Raamatud/HOWTO"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Süsteem/Baas"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1645,6 +1640,11 @@ msgstr ""
 "Võimalik, et peate allikate andmebaasi uuendama."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Süsteem/Teegid"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1682,24 +1682,14 @@ msgid "Currently installed version: "
 msgstr "Praegu paigaldatud versioon: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Arendus/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Süsteem/Seadistamine/Trükkimine"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Mängud/Pusled"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Mängud/Kaardimängud"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Süsteem/Seadistamine/Paketindus"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Teadus/Astronoomia"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1723,14 +1713,19 @@ msgstr "Nimi:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Graafiline töölaud/Muu"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Uuendusi ei ole"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Võrk/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1741,6 +1736,16 @@ msgstr "Olgu"
 msgid "Text tools"
 msgstr "Tekstivahendid"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Mängud/Kaardimängud"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1752,6 +1757,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Kirjutage lisatava serveri masinanimi või IP aadress:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Mängud/Võitlusmängud"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1761,11 +1771,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Allika \"%s\" muutmine:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Võrk/Kiirsuhtlus"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1828,11 +1833,6 @@ msgstr ""
 "\n"
 "Selle tööriista abil saate oma Mandrake Linuxit uuendada."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Süsteem/Fondid/TrueType"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2112,3 +2112,125 @@ msgstr "Tarkvara eemaldamine"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Tarkvaraallikate haldur"
+
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Süsteem/Internatsionaliseerimine"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Failivahendid"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Graafiline töölaud/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Teadus/Arvutiteadus"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Süsteem/Serverid"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Andmebaasid"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Graafiline töölaud/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Teadus/Arvutiteadus"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Süsteem/Seadistamine/Muu"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Süsteem/Seadistamine/Võrk"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Süsteem/Seadistamine/Riistvara"
+
+#~ msgid "Development/Python"
+#~ msgstr "Arendus/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Süsteem/Seadistamine/Algkäivitus"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Graafiline töölaud/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Arendus/Muu"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Süsteem/Fondid/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Arendus/Andmebaasid"
+
+#~ msgid "Books/Other"
+#~ msgstr "Raamatud/Muu"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Graafiline töölaud/FVWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "Võrk/Uudised"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Arendus/Kernel"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Võrk/Chat"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Arendus/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Graafiline töölaud/IceWm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Mängud/Muu"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Võrk/Muu"
+
+#~ msgid "Development/Java"
+#~ msgstr "Arendus/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Graafiline töölaud/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Arhiveerimine/Varundamine"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Võrk/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Süsteem/Fondid/Konsool"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Võrk/E-post"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Graafiline töölaud/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Arendus/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Süsteem/Seadistamine/Trükkimine"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Süsteem/Seadistamine/Paketindus"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Graafiline töölaud/Muu"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Süsteem/Fondid/TrueType"
diff --git a/po/et.pom b/po/et.pom
index 5606823f..c3e3e251 100644
--- a/po/et.pom
+++ b/po/et.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Tööjaam"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Graafiline keskkond"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Arendus"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
@@ -219,3 +231,4 @@ msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
 msgid "Set of tools to read and send mail and news and to browse the Web"
 msgstr ""
 "Valik rakendusi e-posti lugemiseks ja saatmiseks ning veebi lehitsemiseks"
+
diff --git a/po/eu.po b/po/eu.po
index d93eb82a..168b4033 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2002-08-27 19:47+0200\n"
 "Last-Translator: I�igo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -20,14 +20,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Ezabatu .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Itxoin mesedez, euskarria eguneratzen..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -58,25 +63,20 @@ msgstr "guztia ondo instalatu da"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Gutxienez lehenengo bi sarrerak bete behar dituzu."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Networking"
+msgid "KDE and Qt"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "Gutxienez lehenengo bi sarrerak bete behar dituzu."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Bilaketaren emaitzak"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -137,11 +142,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Nola hautatu eskuz zure ispilua"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Paketeak instalaziorako prestatzen..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -172,6 +177,21 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Chemistry"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Graphics"
 msgstr ""
 
@@ -182,11 +202,6 @@ msgstr "Instalatu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -198,11 +213,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Ondorengo paketeetako bat behar da:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,7 +230,7 @@ msgstr "Errorea..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -325,22 +335,12 @@ msgid "Password:"
 msgstr "Pasahitza:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Paketeak instalaziorako prestatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "deskribapenetan"
 
@@ -359,6 +359,11 @@ msgstr "Pakete osagarri batzu kendu behar dira"
 msgid "All packages, by update availability"
 msgstr "eguneratze eskuragarritasun arabera"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -375,6 +380,11 @@ msgid "Greece"
 msgstr "Grezia"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Ez egin ezer"
@@ -427,11 +437,6 @@ msgstr "Aukeratu ispilua..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -501,6 +506,11 @@ msgstr "bidea:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) paketea jaisten ..."
 
@@ -511,6 +521,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Beste bat"
 
@@ -519,36 +534,31 @@ msgstr "Beste bat"
 msgid "Sweden"
 msgstr "Suedia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "Austria"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr ""
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Ikertu..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -556,22 +566,17 @@ msgstr "Japonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Laburpena: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
+msgid "Boot and Init"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -589,6 +594,11 @@ msgstr "Ezabatu .%s"
 msgid "Importance: "
 msgstr "Garrantzia: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -631,11 +641,6 @@ msgstr "Belgika"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Neurria: "
 
@@ -659,11 +664,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Eguneratu sorburua(k)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -699,6 +699,11 @@ msgstr "Arazoak izan dira instalazioan zehar"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -709,16 +714,6 @@ msgstr "Editatu"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Aukeratutakoak: %d MB / Diskoan leku askea: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Beste bat"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -741,11 +736,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "fitxategitan"
 
@@ -756,12 +746,17 @@ msgstr "Pakete guztiak,"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -776,6 +771,16 @@ msgstr "Bilaketaren emaitzak (batere ez)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -795,11 +800,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Gelditu"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Itxoin mesedez, euskarria eguneratzen..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -855,6 +875,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finlandia"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -872,12 +897,12 @@ msgstr "Aldaketak gorde"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
+msgid "Instant messaging"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -888,6 +913,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Bilatu"
 
@@ -912,16 +942,6 @@ msgid "Spain"
 msgstr "Espainia"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Okerra eguneratze euskarria gehitzerakoan"
@@ -933,11 +953,6 @@ msgstr "Fitxategiak:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Ezin dira sorburuko paketeak jaso."
 
@@ -946,6 +961,11 @@ msgstr "Ezin dira sorburuko paketeak jaso."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "erabiltzaile/pasahitza zehaztu dezakezu proxy autentifikaziorako:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Txina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -958,11 +978,6 @@ msgstr "Pakete osagarriak behar dira"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1020,7 +1035,7 @@ msgstr "Aurkitu:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1034,11 +1049,6 @@ msgid "Removable device"
 msgstr "Gailu aldagarriak"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Paketeak instalaziorako prestatzen..."
@@ -1053,21 +1063,11 @@ msgstr "Itxaoin mesedez, paketeak ezabatzen..."
 msgid "Please wait, adding medium..."
 msgstr "Itxoin mesedez, euskarria gehitzen..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Beste bat"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Sarrera:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1078,21 +1078,16 @@ msgstr "Belgika"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Proxyak konfiguratu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Proxyak konfiguratu"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1100,11 +1095,6 @@ msgstr "'%s'-ren sinadura egiaztatzen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1118,16 +1108,6 @@ msgstr "Fitxategi okerra"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1139,12 +1119,7 @@ msgstr "Ezin da euskarria eguneratu, automatikoki ezgaituko da."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1157,25 +1132,20 @@ msgstr "Mesedez hautatu nahi duzun ispilua."
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "\"%s\" sorburua editatzen:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Eguneratzeko arrazoia: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Sorburuak konfiguratu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Eguneratzeko arrazoia: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1204,7 +1174,7 @@ msgstr "Arazoa instalatzerakoan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1230,22 +1200,37 @@ msgstr "Paketeak instalaziorako prestatzen..."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "Deskribapena: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1253,6 +1238,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Eskatutako pakete guztiak ondo instalatu dira."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1280,11 +1275,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Izena: "
 
@@ -1329,7 +1319,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1344,12 +1334,22 @@ msgstr "Hautatuta"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Informazio zabalenak"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1406,9 +1406,9 @@ msgid "Bugfixes updates"
 msgstr "Akatsak konpontzeko eguneratzeak"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japonia"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1425,20 +1425,15 @@ msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
 msgid "Cancel"
 msgstr "Utzi"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Gaitu?"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "Gaitu?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1465,16 +1460,6 @@ msgstr "Instalazioa amaitu da"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1482,13 +1467,13 @@ msgstr "Jarraitzeko euskarria sartu behar duzu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Pakete gehiegi dago hautatuta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Pakete gehiegi dago hautatuta"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1500,17 +1485,17 @@ msgstr "Ez egin ezer"
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Okerra jaisterakoan"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Laguntza"
@@ -1520,6 +1505,11 @@ msgstr "Laguntza"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Barkatu, root izan behar duzu paketeak instalatzeko."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1547,7 +1537,7 @@ msgstr "sorburu gordailuaren arabera"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1560,6 +1550,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1587,11 +1582,6 @@ msgstr "Aldatu euskarria"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Hautua berrezarri"
 
@@ -1600,6 +1590,11 @@ msgstr "Hautua berrezarri"
 msgid "Mandrake Update"
 msgstr "Mandrake Eguneratu"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Beste bat"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1617,12 +1612,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1638,6 +1633,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1668,23 +1668,13 @@ msgid "Currently installed version: "
 msgstr "Orain instalatutako bertsioa: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Beste bat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1709,7 +1699,7 @@ msgstr "Izena:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1717,6 +1707,11 @@ msgstr ""
 msgid "No update"
 msgstr "Eguneratzerik ez"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Ez egin ezer"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1727,6 +1722,16 @@ msgstr "Ados"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1739,6 +1744,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1747,11 +1757,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" sorburua editatzen:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1816,11 +1821,6 @@ msgstr ""
 "aukeratzen\n"
 "lagunduko dizu."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2105,6 +2105,10 @@ msgid "Software Sources Manager"
 msgstr "Software Sorburu Kudeatzailea"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP zerbitzaria"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "honekin gatazka dauka"
 
diff --git a/po/eu.pom b/po/eu.pom
index 436057a9..b6b156c8 100644
--- a/po/eu.pom
+++ b/po/eu.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Lan-estazioa"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Ingurune grafikoa"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Garapena"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Zerbitzaria"
 
diff --git a/po/fi.po b/po/fi.po
index 453373cb..8d36107c 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -16,7 +16,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-fi - MDK Release 9.2\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2003-05-30 21:09+0300\n"
 "Last-Translator: Thomas Backlund <tmb@iki.fi>\n"
 "Language-Team: Finnish <cooker-i18n@linux-mandrake.com>\n"
@@ -27,14 +27,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Arkistointi/Muut"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Verkko/Etäkäyttö"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Odota, päivitetään media(t)..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -42,13 +52,8 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Tiede/Tietokone tiede"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Tiede/Fysiikka"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -65,25 +70,20 @@ msgstr "Kaikki asennettiin oikein"
 msgid "Verifying packages signatures..."
 msgstr "Tarkistetaan pakettien allekirjoitukset..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Sinun pitää täyttää ainakin kaksi ensimmäistä kohtaa."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Järjestelmä/Asetukset/Muut"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Verkko/Tiedostonsiirto"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Järjestelmä/Asetukset/Verkko"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Kehitys/KDE ja Qt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "Järjestelmä/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Sinun pitää täyttää ainakin kaksi ensimmäistä kohtaa."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -118,6 +118,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Haun tulokset"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Graafinen työpöytä/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -143,11 +148,6 @@ msgstr "Muokkaa rinnakkaisryhmän"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Järjestelmä/Asetukset/Laitteisto"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Miten manuaalisesti valitset peilipalvelimen"
 
@@ -161,6 +161,11 @@ msgstr "Julkaiseminen"
 msgid "Package installation..."
 msgstr "Pakettien asennus..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Kehitys/GNOME ja GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -177,6 +182,21 @@ msgid "Shells"
 msgstr "Komentotulkit"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Tiede/Kemia"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Grafiikka"
@@ -188,11 +208,6 @@ msgstr "Italia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Järjestelmä/ Ydin ja laitteisto"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -207,11 +222,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Yksi seuraavista paketista tarvitaan:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Kehitys/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -228,9 +238,9 @@ msgid "Proxy..."
 msgstr "Välityspalvelin..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Järjestelmä/Asetukset/Käynnistys ja alustus"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Kirjat/Kirjallisuus"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -333,21 +343,11 @@ msgstr "Salasana:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Järjestelmä/Palvelimet"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Ohjelmistopakettien asentaminen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Graafinen työpöytä/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "kuvauksissa"
 
@@ -366,6 +366,11 @@ msgstr "Joitakin paketteja pitää poistaa tämän lisäksi"
 msgid "All packages, by update availability"
 msgstr "Kaikki paketit, päivityksien saatavuuden mukaan"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -383,6 +388,11 @@ msgstr "Kreikka"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Seuranta"
 
@@ -434,11 +444,6 @@ msgstr "Valitse peilipalvelin..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Graafinen työpöytä/WindowMaker"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -508,6 +513,11 @@ msgstr "Polku: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Haetaan pakettia `%s' (%s/%s)..."
 
@@ -518,6 +528,11 @@ msgstr "Protokolla:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Muu"
 
@@ -526,36 +541,31 @@ msgstr "Muu"
 msgid "Sweden"
 msgstr "Ruotsi"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Pelit/Lautapelit"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "Itävalta"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Tietoja..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Verkko/Tiedostonsiirto"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Kehitys/Muut"
+msgid "Info..."
+msgstr "Tietoja..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Tarkista..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Pelit/Kortti"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -563,23 +573,18 @@ msgstr "Japani"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Verkko/Etäkäyttö"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Yhteenveto: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Järjestelmä/Kirjasimet/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Kehitys/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -596,6 +601,11 @@ msgstr "Poista .%s"
 msgid "Importance: "
 msgstr "Tärkeys: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -638,11 +648,6 @@ msgstr "Lähde"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Järjestelmä/Kansainvälistäminen"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Koko: "
 
@@ -666,11 +671,6 @@ msgstr "Lisää rinnakkaisryhmä"
 msgid "Update media"
 msgstr "Päivitä lähteet"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Kehitys/Tietokannat"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -706,6 +706,11 @@ msgstr "Ongelma asennuksen aikana"
 msgid "Terminals"
 msgstr "Päätteet"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Järjestelmä/ Ydin ja laitteisto"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -716,16 +721,6 @@ msgstr "Muokkaa"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valitut: %d Mt / Vapaata levytilaa: %d Mt"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Kirjat/Muut"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Tiede/Muut"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -748,11 +743,6 @@ msgstr "Tarkistan etätiedostoa lähteestä `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Pelit/Seikkailu"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "tiedostoissa"
 
@@ -763,13 +753,18 @@ msgstr "Kaikki paketit, ryhmän mukaan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Graafinen työpöytä/FVWM-pohjainen"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Pelit/Urheilu"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -782,6 +777,16 @@ msgid "Search results (none)"
 msgstr "Haun tulokset (ei mitään)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Pelit/Seikkailu"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Arkistointi/CD polttaminen"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -801,11 +806,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Pysäytä"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Tiede/Biologiaa"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Odota, luodaan hdlist..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Tiede/Matematiikka"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Järjestelmä/Kansainvälistäminen"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -866,6 +886,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Suomi"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Järjestelmä/Kirjasimet/X11 bittikartta"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -882,14 +907,14 @@ msgid "Save changes"
 msgstr "Tallenna muutokset"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Verkko/Uutiset"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Verkko/Pikaviestintä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Kirjat/FAQ"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -898,6 +923,11 @@ msgid "More info"
 msgstr "Lisää tietoa"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Kirjat/Tietokone-kirjat"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Etsi"
@@ -924,16 +954,6 @@ msgstr "Espanja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Tiede/Astronomiaa"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Kehitys/Ydin"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Olemassaolevat päivityslähteet"
 
@@ -944,11 +964,6 @@ msgstr "Tiedostot:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Pelit/Arkadi"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Lähdepakettien hakeminen epäonnistui."
 
@@ -958,6 +973,11 @@ msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Voit halutessasi antaa tunnuksen/salasanan välityspalvelimen tunnistukseen:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kiina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -970,11 +990,6 @@ msgstr "Lisäpaketteja vaaditaan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Verkko/Keskustelu"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Suoritetaan käyttäjätilassa"
 
@@ -1036,9 +1051,9 @@ msgid "Find:"
 msgstr "Hae:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Kehitys/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Järjestelmä/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1052,11 +1067,6 @@ msgstr "Siirrettävä laite"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Graafinen työpöytä/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Valmistellaan ohjelmistopakettien asentamista..."
 
@@ -1070,21 +1080,11 @@ msgstr "Odota, paketteja poistetaan..."
 msgid "Please wait, adding medium..."
 msgstr "Odota, mediaa lisätään..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Pelit/Muu"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Käyttäjätunnus:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Verkko/Muu"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1095,21 +1095,16 @@ msgstr "Belgia"
 msgid "File tools"
 msgstr "Tiedosto-työkalut"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Arkistointi/CD polttaminen"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Tiede/Biologiaa"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Määrittele välityspalvelin"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1117,11 +1112,6 @@ msgstr "Aloitan `%s' lataamisen..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Järjestelmä/Kirjastot"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Tapahtui ohittamaton virhe: %s."
 
@@ -1135,16 +1125,6 @@ msgstr "Ohittamaton virhe"
 msgid "Leaves only, sorted by install date"
 msgstr "Jäämistöt, ,eriteltynä asennuspäivämäärän mukaan"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Pelit/Strategia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Kehitys/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1159,14 +1139,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Arkistointi/Pakkaus"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Kirjat/Kirjallisuus"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Tiede/Geologia"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1178,25 +1153,20 @@ msgstr "Ole hyvä ja valitse haluttu peilipalvelin."
 msgid "Communications"
 msgstr "Viestintä"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Graafinen työpöytä/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Muokataan rinnakkaisryhmä \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Syy päivitykseen: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Viestintä"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Tiede/Matematiikka"
+msgid "Reason for update: "
+msgstr "Syy päivitykseen: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1225,8 +1195,8 @@ msgstr "Ongelma poistamisen aikana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Graafinen työpöytä/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1251,29 +1221,54 @@ msgstr "Pakettia ei löytynyt asennettavaksi."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "Lähde: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Pelit/Strategia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Kuvaus: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Arkistointi/Muut"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s kt"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Tiede/Kemia"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Järjestelmä/Perusta"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Kaikki haluamasi paketit asennettiin onnistuneesti."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Järjestelmä/Palvelimet"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Pelit/Palapelit"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1301,11 +1296,6 @@ msgstr "Tietokannat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Verkko/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Nimi: "
 
@@ -1351,8 +1341,8 @@ msgstr "Video"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Kehitys/GNOME ja GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1365,14 +1355,24 @@ msgid "Selected"
 msgstr "Valittu"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Tiede/Tietokone tiede"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Mahdollisimman paljon tietoa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Arkistointi/Varmistus"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1428,9 +1428,9 @@ msgid "Bugfixes updates"
 msgstr "Virhekorjaukset"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Verkko/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japani"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1447,6 +1447,11 @@ msgstr "Odota, etsitään saatavilla olevia paketteja"
 msgid "Cancel"
 msgstr "Peruuta"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Tiede/Muut"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1454,16 +1459,6 @@ msgstr "Käytössä?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Tiede/Geologia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Järjestelmä/Kirjasimet/Konsooli"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Kaikki paketit, aakkosjärjestyksessä"
 
@@ -1487,16 +1482,6 @@ msgstr "Asennus on valmis"
 msgid " done."
 msgstr " valmis."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Kehitys/KDE ja Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Kirjat/HOWTO"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1504,15 +1489,15 @@ msgstr "Sinun pitää asettaa media jatkaaksesi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Pelit/Lautapelit"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Liian paljon paketteja valittu"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Tiede/Fysiikka"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "Jätä tekemättä"
@@ -1522,17 +1507,17 @@ msgstr "Jätä tekemättä"
 msgid "Danmark"
 msgstr "Tanska"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Verkko/Sähköposti"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Virhe latauksen aikana"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasilia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Apua"
@@ -1542,6 +1527,11 @@ msgstr "Apua"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Lähdepakettien hakeminen epäonnistui, valitan. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Pelit/Urheilu"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1568,9 +1558,9 @@ msgid "All packages, by medium repository"
 msgstr "Kaikki paketit, lähteiden mukaan"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Järjestelmä/Kirjasimet/X11 bittikartta"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Arkistointi/Pakkaus"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1582,6 +1572,11 @@ msgstr "Lataan `%s', aikaa jäljellä:%s, nopeus:%s"
 msgid "Add a host"
 msgstr "Lisää palvelinta"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Kehitys/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1609,11 +1604,6 @@ msgstr "Vaihda mediaa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Graafinen työpöytä/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Palauta valinnat"
 
@@ -1622,6 +1612,11 @@ msgstr "Palauta valinnat"
 msgid "Mandrake Update"
 msgstr "Mandrake päivitys"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Kirjat/FAQ"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1638,14 +1633,14 @@ msgstr ""
 "Yritä myöhemmin uudelleen."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Kirjat/Tietokone-kirjat"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Kirjat/HOWTO"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Järjestelmä/Perusta"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1659,6 +1654,11 @@ msgstr ""
 "Sinun kannattaisi päivittää lähdetietokantasi."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Järjestelmä/Kirjastot"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1696,24 +1696,14 @@ msgid "Currently installed version: "
 msgstr "Asennettu versio: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Kehitys/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Järjestelmä/Asetukset/Tulostaminen"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Pelit/Palapelit"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Pelit/Kortti"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Järjestelmä/Asetukset/Pakkausta"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Tiede/Astronomiaa"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1737,14 +1727,19 @@ msgstr "Nimi:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Graafinen työpöytä/Muu"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Ei päivitystä"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Verkko/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1755,6 +1750,16 @@ msgstr "OK"
 msgid "Text tools"
 msgstr "Teksti-työkalut"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Pelit/Kortti"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1766,6 +1771,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Kirjoita koneen nimi tai IP osoite jota haluat lisätä:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Pelit/Arkadi"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1775,11 +1785,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Muokataan lähdettä \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Verkko/Pikaviestintä"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1843,11 +1848,6 @@ msgstr ""
 "Tämä ohjelma auttaa sinua valitsemaan päivityksiä joita haluat\n"
 "asentaa tietokoneeseesi."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Järjestelmä/Kirjasimet/True type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2128,6 +2128,128 @@ msgstr "Poista ohjelmia"
 msgid "Software Sources Manager"
 msgstr "Ohjelmistolähteiden hallinta"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Järjestelmä/Kansainvälistäminen"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Tiedosto-työkalut"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Graafinen työpöytä/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Tiede/Tietokone tiede"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Järjestelmä/Palvelimet"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Tietokannat"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Graafinen työpöytä/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Tiede/Tietokone tiede"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Järjestelmä/Asetukset/Muut"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Järjestelmä/Asetukset/Verkko"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Järjestelmä/Asetukset/Laitteisto"
+
+#~ msgid "Development/Python"
+#~ msgstr "Kehitys/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Järjestelmä/Asetukset/Käynnistys ja alustus"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Graafinen työpöytä/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Kehitys/Muut"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Järjestelmä/Kirjasimet/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Kehitys/Tietokannat"
+
+#~ msgid "Books/Other"
+#~ msgstr "Kirjat/Muut"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Graafinen työpöytä/FVWM-pohjainen"
+
+#~ msgid "Networking/News"
+#~ msgstr "Verkko/Uutiset"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Kehitys/Ydin"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Verkko/Keskustelu"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Kehitys/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Graafinen työpöytä/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Pelit/Muu"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Verkko/Muu"
+
+#~ msgid "Development/Java"
+#~ msgstr "Kehitys/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Graafinen työpöytä/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Arkistointi/Varmistus"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Verkko/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Järjestelmä/Kirjasimet/Konsooli"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Verkko/Sähköposti"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Graafinen työpöytä/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Kehitys/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Järjestelmä/Asetukset/Tulostaminen"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Järjestelmä/Asetukset/Pakkausta"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Graafinen työpöytä/Muu"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Järjestelmä/Kirjasimet/True type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s on ristiriidassa paketin %s kanssa"
 
diff --git a/po/fi.pom b/po/fi.pom
index 44f006e1..ab092399 100644
--- a/po/fi.pom
+++ b/po/fi.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Työasema"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Graafinen ympäristö"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Kehitysympäristö"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Palvelin"
 
diff --git a/po/fr.po b/po/fr.po
index 019a190d..e541893e 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
-"PO-Revision-Date: 2003-06-18 19:07+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
+"PO-Revision-Date: 2003-06-27 14:03+0200\n"
 "Last-Translator: Christophe Combelles <ccomb@free.fr>\n"
 "Language-Team: french <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
@@ -24,14 +24,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Archivage/Autres"
+msgid "Enlightenment"
+msgstr "Enlightenment"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remote access"
+msgstr "Acc�s distant"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Veuillez patienter, mise � jour des m�dia..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr "FVWM et d�riv�s"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -39,13 +49,8 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Sciences/Informatique"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Sciences/Physique"
+msgid "Python"
+msgstr "Python"
 
 #: ../rpmdrake:1
 #, c-format
@@ -62,25 +67,20 @@ msgstr "tout a �t� install� correctement"
 msgid "Verifying packages signatures..."
 msgstr "V�rification de la signature des paquetages..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Vous devez remplir au moins les deux premiers champs."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
-msgstr "Syst�me/Configuration/Autres"
+msgid "File transfer"
+msgstr "Transfert de fichiers"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Networking"
-msgstr "Syst�me/Configuration/R�seau"
+msgid "KDE and Qt"
+msgstr "KDE et Qt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "System/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Vous devez remplir au moins les deux premiers champs."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -116,6 +116,11 @@ msgstr ""
 msgid "Search results"
 msgstr "R�sultats de la recherche"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr "Environnement graphique"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -142,11 +147,6 @@ msgstr "�diter un groupe parall�le"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Syst�me/Configuration/Mat�riel"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Comment choisir manuellement votre mirroir"
 
@@ -160,6 +160,11 @@ msgstr "Publication"
 msgid "Package installation..."
 msgstr "Installation des paquetages..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr "GNOME et GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -177,6 +182,21 @@ msgstr "Interpr�teurs de commandes"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Chemistry"
+msgstr "Chimie"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr "True type"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr "Base"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Graphics"
 msgstr "Graphisme"
 
@@ -187,11 +207,6 @@ msgstr "Italie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Syst�me/Noyau et mat�riel"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -206,11 +221,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "L'un des paquetages suivants est n�cessaire :"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "D�veloppement/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -228,8 +238,8 @@ msgstr "Mandataire..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Syst�me/Configuration/D�marrage"
+msgid "Litterature"
+msgstr "Litt�rature"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -335,21 +345,11 @@ msgstr "Mot de passe�:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Syst�me/Serveurs"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Installation de paquetages logiciels"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Environnement graphique/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "parmi les descriptions"
 
@@ -368,6 +368,11 @@ msgstr "Des paquetages suppl�mentaires doivent �tre supprim�s"
 msgid "All packages, by update availability"
 msgstr "Tous les paquetages, nouveaux ou mis � jour"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr "Empaquetage"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -385,6 +390,11 @@ msgstr "Gr�ce"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr "GNOME"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Surveillance"
 
@@ -440,11 +450,6 @@ msgstr "Choisissez votre miroir..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Environnement graphique/WindowMaker"
-
-#: ../rpmdrake:1
-#, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -517,6 +522,11 @@ msgstr "Chemin�: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr "IRC"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "T�l�chargement du paquetage `%s' (%s/%s)..."
 
@@ -527,6 +537,11 @@ msgstr "Protocole :"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr "C"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Autre"
 
@@ -535,36 +550,31 @@ msgstr "Autre"
 msgid "Sweden"
 msgstr "Su�de"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Autriche"
+msgid "Boards"
+msgstr "Plateau"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "Autriche"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "R�seau/Transfert de fichiers"
+msgid "Faqs"
+msgstr "Faqs"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "D�veloppement/Autres"
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Examiner..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Jeux/Cartes"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -572,23 +582,18 @@ msgstr "Japon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "R�seau/Acc�s distant"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Intitul� : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Syst�me/Fontes/Type1"
+msgid "Backup"
+msgstr "Sauvegarde"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "D�veloppement/C"
+msgid "Boot and Init"
+msgstr "D�marrage"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -605,6 +610,11 @@ msgstr "Supprimer le .%s"
 msgid "Importance: "
 msgstr "Importance : "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr "WWW"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -649,11 +659,6 @@ msgstr "M�dium"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Syst�me/Internationalisation"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Taille : "
 
@@ -677,11 +682,6 @@ msgstr "Ajouter un groupe parall�le"
 msgid "Update media"
 msgstr "Mise � jour de m�dia"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "D�veloppement/Bases de donn�es"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -717,6 +717,11 @@ msgstr "Des probl�mes sont survenus durant l'installation"
 msgid "Terminals"
 msgstr "Terminaux"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr "Noyau et mat�riel"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -727,16 +732,6 @@ msgstr "�diter"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "S�lectionn�s : %d Mo / Place libre sur disque : %d Mo"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Livres/Autres"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Sciences/Autres"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -759,11 +754,6 @@ msgstr "Examen du fichier distant du m�dium `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Jeux/Aventure"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "parmi les fichiers"
 
@@ -774,13 +764,18 @@ msgstr "Tous les paquetages, par groupe"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Environnement graphique/FVWM et d�riv�s"
+msgid "Kernel"
+msgstr "Noyau"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
+msgstr "Console"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Jeux/Sports"
+msgid "C++"
+msgstr "C++"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -794,6 +789,16 @@ msgstr "R�sultats de la recherche (aucun)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr "Aventure"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr "Gravure de CD"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -813,11 +818,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Arr�ter"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr "Biologie"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Veuillez patienter, g�n�ration de l'hdlist..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr "Math�matiques"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr "Internationalisation"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -875,6 +895,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finlande"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr "X11 bitmap"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -892,13 +917,13 @@ msgstr "Sauvegarder"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
-msgstr "R�seau/News"
+msgid "Instant messaging"
+msgstr "Messagerie instantan�e"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Livres/Faqs"
+msgid "News"
+msgstr "News"
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -908,6 +933,11 @@ msgstr "Plus d'infos"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr "Livres informatiques"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Chercher"
 
@@ -933,16 +963,6 @@ msgstr "Espagne"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Sciences/Astronomie"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "D�veloppement/Noyau"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Des m�dia de mise-�-jour existent d�j�"
 
@@ -953,11 +973,6 @@ msgstr "Fichiers :\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Jeux/Arcade"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Impossible d'obtenir les paquetages sources."
 
@@ -969,6 +984,11 @@ msgstr ""
 "connexion\n"
 "au serveur mandataire :"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Chat"
+msgstr "Discussion"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -981,11 +1001,6 @@ msgstr "Des paquetages suppl�mentaires sont n�cessaires"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "R�seau/Discussion"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Fonctionnement en utilisateur normal"
 
@@ -1050,8 +1065,8 @@ msgstr "Rechercher�:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
-msgstr "D�veloppement/Perl"
+msgid "XFree86"
+msgstr "XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1065,11 +1080,6 @@ msgstr "P�riph�rique amovible"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Environnement graphique/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Pr�paration de l'installation des paquetages..."
 
@@ -1083,21 +1093,11 @@ msgstr "Veuillez patienter, suppression des paquetages..."
 msgid "Please wait, adding medium..."
 msgstr "Veuillez patienter, ajout du m�dium..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Jeux/Autres"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login�:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "R�seau/Autres"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1108,21 +1108,16 @@ msgstr "Belgique"
 msgid "File tools"
 msgstr "Outils fichiers"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Archivage/Gravure de CD"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Sciences/Biologie"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Configurer les serveurs mandataires (proxy)"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr "Impression"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1130,11 +1125,6 @@ msgstr "D�marrage du t�l�chargement de `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Syst�me/Biblioth�ques"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Une erreur fatale est survenue : %s."
 
@@ -1148,16 +1138,6 @@ msgstr "Erreur fatale"
 msgid "Leaves only, sorted by install date"
 msgstr "Les feuilles seulement, par date d'installation"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Jeux/Strat�gie"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "D�veloppement/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1173,13 +1153,8 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr "Archivage/Compression"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Livres/Litt�rature"
+msgid "Geosciences"
+msgstr "G�osciences"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1191,11 +1166,6 @@ msgstr "Veuillez choisir le miroir."
 msgid "Communications"
 msgstr "Communication"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Environnement graphique/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
@@ -1203,13 +1173,13 @@ msgstr "�dition du groupe parall�le \"%s\" :"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Raison de la mise � jour : "
+msgid "Configuration"
+msgstr "Configuration"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Sciences/Math�matiques"
+msgid "Reason for update: "
+msgstr "Raison de la mise � jour : "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1238,8 +1208,8 @@ msgstr "Un probl�me est survenu pendant la d�sinstallation"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Environnement graphique/Enlightenment"
+msgid "WindowMaker"
+msgstr "WindowMaker"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1264,29 +1234,54 @@ msgstr "Aucun paquetage trouv� pour l'installation."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr "Type1"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "M�dium�: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr "Strat�gie"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "Description : "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr "Archivage"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
-msgstr "Sciences/Chimie"
+msgid "System"
+msgstr "Syst�me"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Tous les paquetages demand�s ont �t� install�s correctement."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr "Serveurs"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr "�nigmes"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1314,11 +1309,6 @@ msgstr "Bases de donn�es"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "R�seau/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Nom : "
 
@@ -1364,8 +1354,8 @@ msgstr "Vid�o"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "D�veloppement/GNOME et GTK+"
+msgid "Perl"
+msgstr "Perl"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1379,13 +1369,23 @@ msgstr "S�lectionn�s"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr "Informatique"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Informations maximales"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Archivage/Sauvegarde"
+msgid "Fonts"
+msgstr "Fontes"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr "Mat�riel"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1442,8 +1442,8 @@ msgstr "Corrections de bogues"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/WWW"
-msgstr "R�seau/WWW"
+msgid "Java"
+msgstr "Java"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1460,20 +1460,15 @@ msgstr "Veuillez patienter, recherche des paquetages disponibles..."
 msgid "Cancel"
 msgstr "Annuler"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Activ� ?"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Sciences/G�osciences"
+msgid "Sciences"
+msgstr "Sciences"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr "Syst�me/Fontes/Console"
+msgid "Enabled?"
+msgstr "Activ� ?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1500,16 +1495,6 @@ msgstr "L'installation est termin�e"
 msgid " done."
 msgstr " fini."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "D�veloppement/KDE et Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Livres/Howtos"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1517,13 +1502,13 @@ msgstr "Vous devez ins�rer le m�dium pour continuer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Jeux/Plateau"
+msgid "Too many packages are selected"
+msgstr "Trop de paquetages sont s�lectionn�s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Trop de paquetages sont s�lectionn�s"
+msgid "Physics"
+msgstr "Physique"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1535,11 +1520,6 @@ msgstr "Ne rien faire"
 msgid "Danmark"
 msgstr "Danemark"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "R�seau/Courrier �lectronique"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
@@ -1547,6 +1527,11 @@ msgstr "Erreur pendant le t�l�chargement"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Mail"
+msgstr "Courrier �lectronique"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Help"
 msgstr "Aide"
 
@@ -1555,6 +1540,11 @@ msgstr "Aide"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Impossible d'obtenir les paquetages sources, d�sol�. %s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr "Sports"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1582,8 +1572,8 @@ msgstr "Tous les paquetages, par m�dium"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Syst�me/Fontes/X11 bitmap"
+msgid "Compression"
+msgstr "Compression"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1595,6 +1585,11 @@ msgstr "T�l�chargement de `%s', temps : %s, vitesse : %s"
 msgid "Add a host"
 msgstr "Ajouter un h�te"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr "D�veloppement"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1622,11 +1617,6 @@ msgstr "Changement de m�dium"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Environnement graphique/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Remettre � z�ro la s�lection"
 
@@ -1635,6 +1625,11 @@ msgstr "Remettre � z�ro la s�lection"
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Books"
+msgstr "Livres"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1653,13 +1648,13 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
-msgstr "Livres/Livres informatiques"
+msgid "Howtos"
+msgstr "Howtos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Syst�me/Base"
+msgid "Icewm"
+msgstr "Icewm"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1676,6 +1671,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr "Biblioth�ques"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1713,23 +1713,13 @@ msgstr "Version actuellement install�e : "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C++"
-msgstr "D�veloppement/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Syst�me/Configuration/Impression"
+msgid "Games"
+msgstr "Jeux"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Puzzles"
-msgstr "Jeux/�nigmes"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Syst�me/Configuration/Empaquetage"
+msgid "Astronomy"
+msgstr "Astronomie"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1753,14 +1743,19 @@ msgstr "Nom :"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Environnement graphique/Autres"
+msgid "KDE"
+msgstr "KDE"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Pas de mise � jour"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking"
+msgstr "R�seau"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1771,6 +1766,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr "Outils texte"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr "Cartes"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr "Sawfish"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1783,6 +1788,11 @@ msgstr "Veuillez tapper le nom d'h�te ou l'adresse IP de l'h�te � ajouter :"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr "Arcade"
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1791,11 +1801,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "�dition du m�dium \"%s\" :"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "R�seau/Messagerie instantan�e"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1859,11 +1864,6 @@ msgstr ""
 "Cet outil va vous aider � choisir les mises � jour que vous\n"
 "souhaiter installer sur votre ordinateur."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Syst�me/Fontes/True type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2144,6 +2144,128 @@ msgstr "Supprimer des Logiciels"
 msgid "Software Sources Manager"
 msgstr "Gestionnaire de Sources Logicielles"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Internationalisation"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Console"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Environnement graphique"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Informatique"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Serveurs"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Bases de donn�es"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Environnement graphique/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Informatique"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Syst�me/Configuration/Autres"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Syst�me/Configuration/R�seau"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Syst�me/Configuration/Mat�riel"
+
+#~ msgid "Development/Python"
+#~ msgstr "D�veloppement/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Syst�me/Configuration/D�marrage"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Environnement graphique/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "D�veloppement/Autres"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Syst�me/Fontes/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "D�veloppement/Bases de donn�es"
+
+#~ msgid "Books/Other"
+#~ msgstr "Livres/Autres"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Environnement graphique/FVWM et d�riv�s"
+
+#~ msgid "Networking/News"
+#~ msgstr "R�seau/News"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "D�veloppement/Noyau"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "R�seau/Discussion"
+
+#~ msgid "Development/Perl"
+#~ msgstr "D�veloppement/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Environnement graphique/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Jeux/Autres"
+
+#~ msgid "Networking/Other"
+#~ msgstr "R�seau/Autres"
+
+#~ msgid "Development/Java"
+#~ msgstr "D�veloppement/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Environnement graphique/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Archivage/Sauvegarde"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "R�seau/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Syst�me/Fontes/Console"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "R�seau/Courrier �lectronique"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Environnement graphique/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "D�veloppement/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Syst�me/Configuration/Impression"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Syst�me/Configuration/Empaquetage"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Environnement graphique/Autres"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Syst�me/Fontes/True type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s est en conflit avec %s"
 
diff --git a/po/fr.pom b/po/fr.pom
index a7e6cee2..cbccf89f 100644
--- a/po/fr.pom
+++ b/po/fr.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Station de travail"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Environnement graphique"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "D�veloppement"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Serveur"
 
diff --git a/po/ga.po b/po/ga.po
index 0ad6db6a..cfd6f6e1 100644
--- a/po/ga.po
+++ b/po/ga.po