merge

author: Guillaume Cottenceau <gc@mandriva.com> 2003-06-27 12:49:32 +0000
committer: Guillaume Cottenceau <gc@mandriva.com> 2003-06-27 12:49:32 +0000
commit: e0121c96eac93fd2e5b66cdb08654a041fc34bca (patch)
tree: 5301db3940fc011c09c97b36d6092e57dbe5ce83 /po
parent: 58d15a09e3be7b796c977a98e0e9d7acc822705b (diff)
download: rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.tar
rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.tar.gz
rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.tar.bz2
rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.tar.xz
rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.zip
111 files changed, 18105 insertions, 14743 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
@@ -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: 2000-08-24 12:00-0000\n"
 "Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
 "Language-Team: Irish <ga@li.org>\n"
@@ -18,9 +18,14 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "L�onra/Deamhain"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
@@ -28,6 +33,11 @@ msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "Ceanada"
 
 #: ../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"
-msgstr ""
-
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "System/Configuration/Networking"
-msgstr "Feidhmchl�ir/L�onra"
+msgid "File transfer"
+msgstr "L�onra/F�ntais"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "System/XFree86"
-msgstr "C�ras/Bun"
+msgid "KDE and Qt"
+msgstr "Forbairt/Eithne"
+
+#: ../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
 #, c-format
@@ -107,6 +107,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Cuardaigh"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Grafaic"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -128,11 +133,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -146,6 +146,11 @@ msgstr "Foilsitheoireacht"
 msgid "Package installation..."
 msgstr "Bainisteoir Bog-Earra�"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Forbairt/C++"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -163,6 +168,21 @@ msgstr "Blaoscanna"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Chemistry"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "True type"
+msgstr "Cin�al"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Graphics"
 msgstr "Grafaic"
 
@@ -173,11 +193,6 @@ msgstr "Ag Feisti�:"
 
 #: ../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"
@@ -189,11 +204,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Forbairt/C�ras"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -211,7 +221,7 @@ msgstr "Earraidh..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -303,20 +313,10 @@ msgstr "Pasfhocal:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "System/Servers"
-msgstr "C�ras/Leabharlanna"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Bainisteoir Bog-Earra�"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Cuntasa�"
@@ -336,6 +336,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"
@@ -352,6 +357,11 @@ msgid "Greece"
 msgstr "Greic�s"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Ag Tosnaigh CUPS"
@@ -404,11 +414,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"
@@ -475,6 +480,11 @@ msgstr "Poirt:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -485,6 +495,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Eile"
 
@@ -493,34 +508,29 @@ msgstr "Eile"
 msgid "Sweden"
 msgstr "Amharc"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Boards"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "srathach"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/File transfer"
-msgstr "L�onra/F�ntais"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Forbairt/C�ras"
-
-#: ../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
@@ -530,23 +540,18 @@ msgstr "An tSeap�in"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/Remote access"
-msgstr "L�onra/Deamhain"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Summary: "
 msgstr "Coimri�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "System/Fonts/Type1"
-msgstr "C�ras/Cl�fhoirne/True Type"
+#, c-format
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Forbairt/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -563,6 +568,11 @@ msgstr ""
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -594,11 +604,6 @@ msgid "Medium"
 msgstr "Belg�iris"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Meid"
@@ -625,11 +630,6 @@ msgstr ""
 "Fan tamall\n"
 "Ag scrios pac�ist�"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Forbairt/Bunachair Sonra�"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -667,6 +667,11 @@ msgstr ""
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -677,16 +682,6 @@ msgstr "Eagar"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Eile"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Australia"
@@ -708,11 +703,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 "�it"
@@ -724,12 +714,17 @@ msgstr "%d pac�ist�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -744,6 +739,16 @@ msgstr "Cuardaigh"
 
 #: ../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"
@@ -757,6 +762,11 @@ msgstr ""
 msgid "Stop"
 msgstr "Teasc�n"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
@@ -764,6 +774,16 @@ msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
+#: ../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"
@@ -814,6 +834,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Faigh:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "C�ras/Cl�fhoirne/True Type"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -831,12 +856,12 @@ msgstr "Pac�ist�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Lionr�"
+msgid "Instant messaging"
+msgstr "L�onra/F�ntais"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -847,6 +872,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Cuardaigh"
 
@@ -866,16 +896,6 @@ msgid "Spain"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Forbairt/Eithne"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr ""
@@ -889,11 +909,6 @@ msgstr "/_Comhad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
@@ -902,6 +917,11 @@ msgstr ""
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "An tS�n"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Update"
@@ -913,11 +933,6 @@ msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Lionr�"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -972,8 +987,8 @@ msgstr "Faigh:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Forbairt/Eithne"
+msgid "XFree86"
+msgstr "C�ras/Bun"
 
 #: ../rpmdrake:1
 #, c-format
@@ -986,11 +1001,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Bainisteoir Bog-Earra�"
@@ -1009,21 +1019,11 @@ msgstr ""
 "Fan tamall\n"
 "Checking dependencies"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Eile"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Logann:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Lionr�"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
@@ -1034,21 +1034,16 @@ msgstr "Belg�iris"
 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 "Rabhadh"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1056,11 +1051,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "C�ras/Leabharlanna"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1074,16 +1064,6 @@ msgstr "Earraidh scr�obhta\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 "Forbairt/C"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1095,12 +1075,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1113,11 +1088,6 @@ msgstr ""
 msgid "Communications"
 msgstr "Cumars�id�"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
@@ -1126,13 +1096,13 @@ msgstr ""
 "Ag scrios pac�ist�"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Cumars�id�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1162,7 +1132,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1184,28 +1154,53 @@ msgid "No package found for installation."
 msgstr "Bainisteoir Bog-Earra�"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Cin�al"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Cuntasa�"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "System"
+msgstr "C�ras/Bun"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "All requested packages were installed successfully."
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "C�ras/Leabharlanna"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
+msgid "Puzzles"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -1235,11 +1230,6 @@ msgstr "Bunachair Sonra�"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Lionr�"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Ainm: %s"
 
@@ -1279,9 +1269,9 @@ msgid "Video"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Forbairt/C++"
+#, c-format
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1297,12 +1287,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
@@ -1356,8 +1356,8 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Lionr�"
+msgid "Java"
+msgstr "An tSeap�in"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1376,19 +1376,14 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cealaigh"
 
-#: ../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
@@ -1416,16 +1411,6 @@ msgstr "Ag Feisti�"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Forbairt/Eithne"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1433,12 +1418,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
@@ -1451,17 +1436,17 @@ msgstr "Ag Tosnaigh CUPS"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Lionr�"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "An Bhrasail"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "C�namh"
@@ -1471,6 +1456,11 @@ msgstr "C�namh"
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Taiwan"
@@ -1497,9 +1487,9 @@ msgid "All packages, by medium repository"
 msgstr "%d pac�ist�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "C�ras/Cl�fhoirne/True Type"
+#, c-format
+msgid "Compression"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1511,6 +1501,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Forbairt/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1538,11 +1533,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1551,6 +1541,11 @@ msgstr ""
 msgid "Mandrake Update"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Eile"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1563,13 +1558,13 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "C�ras/Bun"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1581,6 +1576,11 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "C�ras/Leabharlanna"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1612,23 +1612,13 @@ msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Forbairt/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Ainm"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1653,7 +1643,7 @@ msgstr "Ainm"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1661,6 +1651,11 @@ msgstr ""
 msgid "No update"
 msgstr "sl�"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Lionr�"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1671,6 +1666,16 @@ msgstr "Ceart go Leor"
 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:"
@@ -1683,6 +1688,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1693,11 +1703,6 @@ msgstr ""
 "Fan tamall\n"
 "Ag scrios pac�ist�"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Instant messaging"
-msgstr "L�onra/F�ntais"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1761,11 +1766,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "C�ras/Cl�fhoirne/True Type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2052,6 +2052,86 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "L�onra/F�ntais"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Grafaic"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "C�ras/Leabharlanna"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Bunachair Sonra�"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Grafaic"
+
+#, fuzzy
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Feidhmchl�ir/L�onra"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Forbairt/C�ras"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Forbairt/C�ras"
+
+#, fuzzy
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "C�ras/Cl�fhoirne/True Type"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Forbairt/Bunachair Sonra�"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Lionr�"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Forbairt/Eithne"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Lionr�"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Forbairt/Eithne"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Eile"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Lionr�"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Forbairt/C"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Lionr�"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Lionr�"
+
+#~ msgid "Development/C++"
+#~ msgstr "Forbairt/C++"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "C�ras/Cl�fhoirne/True Type"
+
+#, fuzzy
 #~ msgid "unknown package "
 #~ msgstr "Teip ag oscailt pac�iste"
 
@@ -2091,9 +2171,6 @@ msgstr ""
 #~ msgid "Incorrect password"
 #~ msgstr "Pasfhocal m�ceart"
 
-#~ msgid "Name"
-#~ msgstr "Ainm"
-
 #~ msgid "Name: %s"
 #~ msgstr "Ainm: %s"
 
@@ -2129,12 +2206,6 @@ msgstr ""
 #~ "Caithfear bheith root le seo a dh�anamh.\n"
 #~ "Ionchur pasfhocal root le d'thoil"
 
-#~ msgid "Type"
-#~ msgstr "Cin�al"
-
-#~ msgid "Warning"
-#~ msgstr "Rabhadh"
-
 #~ msgid "grpmi error: you must be superuser!\n"
 #~ msgstr "Earr�idh grpmi: Is �igin for�s�ideoir duit!\n"
 
diff --git a/po/ga.pom b/po/ga.pom
index 37f5d60b..2e66fe8b 100644
--- a/po/ga.pom
+++ b/po/ga.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "St�isi�n Oibre"
+
+# 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 "Forbairt"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Freastala�"
 
diff --git a/po/gl.po b/po/gl.po
index 291a0510..97a871cf 100644
--- a/po/gl.po
+++ b/po/gl.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: 2000-05-05 20:20+0200\n"
 "Last-Translator: Jes�s Bravo �lvarez <jba@pobox.com>\n"
 "Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\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 "Quitar"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Agarde, por favor"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Canada"
@@ -33,12 +43,7 @@ msgstr "Canadiano (Qu�bec)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -56,24 +61,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 "Actualizaci�n de Linux-Mandrake"
 
-#: ../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
@@ -105,6 +105,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Buscar"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -126,11 +131,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -144,6 +144,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Preparando para a instalaci�n"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -161,6 +166,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 ""
 
@@ -171,11 +191,6 @@ msgstr "Instalar"
 
 #: ../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"
@@ -187,11 +202,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Actualizaci�n de Linux-Mandrake"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -209,7 +219,7 @@ msgstr "Erro..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -298,21 +308,11 @@ msgid "Password:"
 msgstr "Contrasinal:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Preparando para a instalaci�n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Descripci�ns"
@@ -332,6 +332,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"
@@ -348,6 +353,11 @@ msgid "Greece"
 msgstr "Grego"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "M�quina:"
@@ -400,11 +410,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"
@@ -465,6 +470,11 @@ msgstr "Porto:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -475,6 +485,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Outros"
 
@@ -483,34 +498,29 @@ msgstr "Outros"
 msgid "Sweden"
 msgstr "Mirar"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Boards"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "serie"
 
-#: ../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 "Actualizaci�n de Linux-Mandrake"
-
-#: ../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
@@ -519,24 +529,19 @@ msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Resume"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Actualizaci�n de Linux-Mandrake"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -553,6 +558,11 @@ msgstr "Quitar"
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -584,11 +594,6 @@ msgid "Medium"
 msgstr "Belga"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Tama�o"
@@ -613,11 +618,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Medio"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Actualizaci�n de Linux-Mandrake"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -653,24 +653,19 @@ msgstr "Preparando para a instalaci�n"
 msgid "Terminals"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
+msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Edit"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Outros"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Other"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -694,11 +689,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 "Etiqueta"
@@ -710,12 +700,17 @@ msgstr "Desinstalando"
 
 #: ../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
@@ -730,6 +725,16 @@ msgstr "Buscar"
 
 #: ../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"
@@ -743,11 +748,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Sector"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Agarde, por favor"
 
+#: ../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"
@@ -796,6 +816,11 @@ msgstr "O paquete non se pode instalar"
 msgid "Finland"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -813,12 +838,12 @@ msgstr "Paquetes"
 
 #: ../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
@@ -829,6 +854,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Buscar"
 
@@ -848,16 +878,6 @@ msgid "Spain"
 msgstr "Espa�ol"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Actualizaci�n de Linux-Mandrake"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Agarde, por favor"
@@ -869,11 +889,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
@@ -882,6 +897,11 @@ msgstr ""
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Chat"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Update"
@@ -894,11 +914,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -947,9 +962,9 @@ msgid "Find:"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Actualizaci�n de Linux-Mandrake"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -962,11 +977,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Preparando para a instalaci�n"
@@ -981,21 +991,11 @@ msgstr "Agarde, por favor"
 msgid "Please wait, adding medium..."
 msgstr "Agarde, por favor"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Outros"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
@@ -1006,21 +1006,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 "Engadir usuario"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Aviso"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1028,11 +1023,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1046,16 +1036,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 "Actualizaci�n de Linux-Mandrake"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1067,12 +1047,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1085,24 +1060,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 "Medio"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Engadir usuario"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1132,7 +1102,7 @@ msgstr "Preparando para a instalaci�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1155,22 +1125,37 @@ msgstr "Preparando para a instalaci�n"
 
 #: ../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 "Descripci�ns"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1178,6 +1163,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"
@@ -1204,11 +1199,6 @@ msgid "Databases"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Name: "
 msgstr "Nome: %s"
@@ -1250,7 +1240,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1267,12 +1257,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
@@ -1326,7 +1326,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/WWW"
+msgid "Java"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -1344,19 +1344,14 @@ msgstr ""
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../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
@@ -1384,16 +1379,6 @@ msgstr "Instalar"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Actualizaci�n de Linux-Mandrake"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1401,12 +1386,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
@@ -1419,14 +1404,14 @@ msgstr "M�quina:"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Networking/Mail"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Mail"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1439,6 +1424,11 @@ msgstr "Axuda"
 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,7 +1456,7 @@ msgstr "Desinstalando"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1479,6 +1469,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Actualizaci�n de Linux-Mandrake"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1506,11 +1501,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1519,6 +1509,11 @@ msgstr ""
 msgid "Mandrake Update"
 msgstr "Actualizaci�n de Linux-Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Outros"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1531,12 +1526,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
@@ -1550,6 +1545,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1581,22 +1581,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Actualizaci�n de Linux-Mandrake"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Nome"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1621,7 +1611,7 @@ msgstr "Nome"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1629,6 +1619,11 @@ msgstr ""
 msgid "No update"
 msgstr "Actualizaci�n de Linux-Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "M�quina:"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1639,6 +1634,16 @@ msgstr "Aceptar"
 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:"
@@ -1651,6 +1656,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1659,11 +1669,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Medio"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1723,11 +1728,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2014,6 +2014,38 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Actualizaci�n de Linux-Mandrake"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Actualizaci�n de Linux-Mandrake"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Actualizaci�n de Linux-Mandrake"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Actualizaci�n de Linux-Mandrake"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Actualizaci�n de Linux-Mandrake"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Outros"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Actualizaci�n de Linux-Mandrake"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Actualizaci�n de Linux-Mandrake"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " ten conflictos con %s-%s-%s"
 
@@ -2066,15 +2098,9 @@ msgstr ""
 #~ msgid "grpmi error: you must be superuser!\n"
 #~ msgstr "erro do grpmi: �ten que ser superusuario!\n"
 
-#~ msgid "Warning"
-#~ msgstr "Aviso"
-
 #~ msgid "Name: %s"
 #~ msgstr "Nome: %s"
 
-#~ msgid "Name"
-#~ msgstr "Nome"
-
 #~ msgid ""
 #~ "Update\n"
 #~ "List"
diff --git a/po/gl.pom b/po/gl.pom
index 683094a1..308f0ffe 100644
--- a/po/gl.pom
+++ b/po/gl.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Estaci�n de traballo"
+
+# 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 "Desenvolvemento"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Servidor"
 
diff --git a/po/he.po b/po/he.po
index 6667ea19..7c447070 100644
--- a/po/he.po
+++ b/po/he.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-23 15:21-0400\n"
 "Last-Translator: nadav mavor <nadav@mavor.com>\n"
 "Language-Team:  <C@li.org>\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 "עליך למלא לפחות את שתי הכניסות הראשונות."
-
 #: ../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,19 +177,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, 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
+#, c-format
+msgid "Italy"
+msgstr "איטליה"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -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
@@ -324,22 +334,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 "בתיאורים"
 
@@ -358,6 +358,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"
@@ -374,6 +379,11 @@ msgid "Greece"
 msgstr "יוון"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "לא לעשות כלום"
@@ -426,11 +436,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"
@@ -499,6 +504,11 @@ msgstr "נתיב:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "מוריד את החבילה %s' (%s/%s)"
 
@@ -509,6 +519,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "אחר"
 
@@ -517,36 +532,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"
@@ -554,22 +564,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
@@ -587,6 +592,11 @@ msgstr "הסרת .%s"
 msgid "Importance: "
 msgstr "חשיבות : "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -629,11 +639,6 @@ msgstr "בלגיה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "גודל : "
 
@@ -657,11 +662,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..."
@@ -697,6 +697,11 @@ msgstr "התגלו בעיות תוך כדי ההתקנה"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -707,16 +712,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"
@@ -739,11 +734,6 @@ msgstr "בחינת קובץ במאגר `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "בקבצים"
 
@@ -754,12 +744,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
@@ -774,6 +769,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"
@@ -792,11 +797,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"
@@ -857,6 +877,11 @@ msgstr ""
 msgid "Finland"
 msgstr "פינלנד"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -874,12 +899,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
@@ -890,6 +915,11 @@ msgstr "עוד מידע "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "חיפוש"
 
@@ -914,16 +944,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 "כבר קיים מקור לעידקונים"
@@ -935,11 +955,6 @@ msgstr "קבצים:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "ייבוא חבילות מהמאגר אינו אפשרי"
 
@@ -948,6 +963,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"
@@ -960,11 +980,6 @@ msgstr "חבילות נוספות נדרשות"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1025,7 +1040,7 @@ msgstr "חיפוש:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1039,11 +1054,6 @@ msgid "Removable device"
 msgstr "התקן ניתן להסרה"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "מכין חבילות להתקנה..."
@@ -1058,21 +1068,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"
@@ -1083,21 +1083,16 @@ msgstr "בלגיה"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "הגדרת שרתים מתווכים"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "הגדרת שרתים מתווכים"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1105,11 +1100,6 @@ msgstr "בודק חותם זיהוי של '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "שגיאה חמורה קרתה : %s."
 
@@ -1123,16 +1113,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
 #, c-format
 msgid ""
@@ -1148,12 +1128,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1166,25 +1141,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
@@ -1213,7 +1183,7 @@ msgstr "בעיה בזמן ההסרה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1239,22 +1209,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
+#, 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
@@ -1262,6 +1247,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"
@@ -1289,11 +1284,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "שם: "
 
@@ -1339,7 +1329,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1354,12 +1344,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
@@ -1415,9 +1415,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
@@ -1434,20 +1434,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
@@ -1474,16 +1469,6 @@ 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"
@@ -1491,13 +1476,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
@@ -1509,17 +1494,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 "עזרה"
@@ -1529,6 +1514,11 @@ msgstr "עזרה"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "צר לי, רק משתמש על יכול להתקין חבילות."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1556,7 +1546,7 @@ msgstr "לפי מאגר התוכנה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1569,6 +1559,11 @@ msgstr "הורדה של `%s', זמן נותר:%s, במהירות: %s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1596,11 +1591,6 @@ msgstr "החלפת מדיה"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "איפוס הבחירה"
 
@@ -1609,6 +1599,11 @@ msgstr "איפוס הבחירה"
 msgid "Mandrake Update"
 msgstr "עדכון מנדרייק"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "אחר"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1626,12 +1621,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 ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1683,23 +1683,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
@@ -1724,7 +1714,7 @@ msgstr "שם:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1732,6 +1722,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"
@@ -1742,6 +1737,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:"
@@ -1754,6 +1759,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, 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
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1829,11 +1834,6 @@ msgstr ""
 "\n"
 "כלי זה יעזור לך לבחור את העדכונים שהנך רוצה להתקין על המחשב שלך."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2115,6 +2115,10 @@ msgid "Software Sources Manager"
 msgstr "ניהול מקורות תוכנה"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "שרת FTP"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "סתירה עם"
 
diff --git a/po/he.pom b/po/he.pom
index 8fcc87e8..621d6994 100644
--- a/po/he.pom
+++ b/po/he.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/hr.po b/po/hr.po
index 861310a5..c7815c5c 100644
--- a/po/hr.po
+++ b/po/hr.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: Fri Apr 21 2000 17:32:14+0200\n"
 "Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\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 "Prenosivi medij"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Provjeravam ovisnosti..."
 
+#: ../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 je ve� instaliran"
 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 "Razvojne nadogradnje"
 
-#: ../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 "Rezultati pretra�ivanja"
 
+#: ../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 "Pripremam se 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:"
@@ -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 "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"
@@ -190,11 +205,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Razvojne nadogradnje"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "URL:"
@@ -212,7 +222,7 @@ msgstr "Gre�ka..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -301,21 +311,11 @@ msgid "Password:"
 msgstr "Lozinka:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Pripremam se za instalaciju"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Opisi"
@@ -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 "Gr�ka"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "ali ne odgovara"
@@ -405,11 +415,6 @@ msgstr "Izaberite 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"
@@ -474,6 +479,11 @@ msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -484,6 +494,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Ostali"
 
@@ -492,34 +507,29 @@ msgstr "Ostali"
 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 ""
+msgid "Austria"
+msgstr "Austrija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Razvojne nadogradnje"
-
-#: ../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
@@ -528,24 +538,19 @@ msgid "Japan"
 msgstr "Japan"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Sumarno"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Razvojne nadogradnje"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -562,6 +567,11 @@ msgstr "Prenosivi medij"
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Unable to create medium."
@@ -593,11 +603,6 @@ msgid "Medium"
 msgstr "Belgija"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Veli�ina"
@@ -622,11 +627,6 @@ msgstr ""
 msgid "Update media"
 msgstr "A�uriraj izvore"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Razvojne nadogradnje"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -662,6 +662,11 @@ msgstr "Dogodili su se problemi prilikom instalacije"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -672,16 +677,6 @@ msgstr "A�uriraj"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Ostali"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -703,11 +698,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 "Lokalno"
@@ -718,13 +708,18 @@ msgid "All packages, by group"
 msgstr "0 paketa, 0 byte-ova"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "op�enito"
+
+#: ../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
@@ -739,6 +734,16 @@ msgstr "Rezultati pretra�ivanja"
 
 #: ../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"
@@ -752,11 +757,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Zaustavljanje"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Provjeravam ovisnosti..."
 
+#: ../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"
@@ -805,6 +825,11 @@ msgstr "Nisam u stanju instalirati paket"
 msgid "Finland"
 msgstr "Prona�i:"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -821,13 +846,13 @@ msgid "Save changes"
 msgstr "Paketi"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Mre�ne postavke:"
+#, 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
@@ -837,6 +862,11 @@ msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Search"
 msgstr "potraga"
@@ -857,16 +887,6 @@ msgid "Spain"
 msgstr "�panjolska"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Razvojne nadogradnje"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Provjeravam ovisnosti..."
@@ -877,11 +897,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 va�e pakete"
@@ -891,6 +906,11 @@ msgstr "Izaberite va�e pakete"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -902,11 +922,6 @@ msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Mre�a"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -962,9 +977,9 @@ msgid "Find:"
 msgstr "Prona�i:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Razvojne nadogradnje"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -977,11 +992,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Pripremam se za instalaciju"
@@ -998,21 +1008,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "Provjeravam ovisnosti..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Ostali"
-
 #: ../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"
@@ -1023,21 +1023,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
 #, fuzzy, c-format
 msgid "Configure proxies"
 msgstr "Podesiti izvor?"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Upozorenje"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1045,11 +1040,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1063,16 +1053,6 @@ msgstr "Gre�a pri pisanju\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 "Razvojne nadogradnje"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1084,12 +1064,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1104,24 +1079,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 "A�uriraj izvore"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Podesiti izvor?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1151,7 +1121,7 @@ msgstr "Dogodili su se problemi prilikom instalacije"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1173,23 +1143,38 @@ msgid "No package found for installation."
 msgstr "Pripremam se 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
@@ -1197,6 +1182,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"
@@ -1224,11 +1219,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Mre�a"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Ime: %s"
 
@@ -1269,7 +1259,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1286,12 +1276,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
@@ -1345,8 +1345,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
@@ -1365,19 +1365,14 @@ msgstr ""
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../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
@@ -1405,32 +1400,22 @@ msgstr "Instalirano"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Razvojne nadogradnje"
-
-#: ../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 "Paketa ve� instalirano"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Physics"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Do nothing"
 msgstr "ali ne odgovara"
@@ -1440,17 +1425,17 @@ msgstr "ali ne odgovara"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Mre�a"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Pomo�"
@@ -1460,6 +1445,11 @@ msgstr "Pomo�"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Lo�i, ne�itljivi ili nisu prona�eni paketi"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Taiwan"
@@ -1487,7 +1477,7 @@ msgstr "0 paketa, 0 byte-ova"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1500,6 +1490,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Razvojne nadogradnje"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1527,11 +1522,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1540,6 +1530,11 @@ msgstr ""
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate postavke"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Ostali"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1552,12 +1547,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
@@ -1571,6 +1566,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1602,22 +1602,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Razvojne nadogradnje"
-
-#: ../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
@@ -1642,7 +1632,7 @@ msgstr "Ime"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1650,6 +1640,11 @@ msgstr ""
 msgid "No update"
 msgstr "Napravi Nadogradnje"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Mre�a"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1660,6 +1655,16 @@ msgstr "U Redu"
 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:"
@@ -1672,6 +1677,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1680,11 +1690,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "A�uriraj izvore"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1746,11 +1751,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2035,6 +2035,58 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Razvojne nadogradnje"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Razvojne nadogradnje"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Razvojne nadogradnje"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Mre�ne postavke:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Razvojne nadogradnje"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Mre�a"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Razvojne nadogradnje"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Ostali"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Mre�a"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Razvojne nadogradnje"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Mre�a"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Mre�a"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Razvojne nadogradnje"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " je u konfliktu s %s-%s-%s"
 
@@ -2187,9 +2239,6 @@ msgstr ""
 #~ msgid "security"
 #~ msgstr "sigurnost"
 
-#~ msgid "general"
-#~ msgstr "op�enito"
-
 #~ msgid "bugfix"
 #~ msgstr "popravak gre�ke"
 
@@ -2207,9 +2256,6 @@ msgstr ""
 #~ "Ne mogu dohvatiti listu paketa za nadogradnju\n"
 #~ "Poku�ajte sa nekim drugim mirror-om"
 
-#~ msgid "Warning"
-#~ msgstr "Upozorenje"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2284,15 +2330,9 @@ msgstr ""
 #~ msgid "/Help/_About..."
 #~ msgstr "/Pomo�/_O programu..."
 
-#~ msgid "Name"
-#~ msgstr "Ime"
-
 #~ msgid "Installed"
 #~ msgstr "Instalirano"
 
-#~ msgid "Type"
-#~ msgstr "Tip"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, version 7.2\n"
 
diff --git a/po/hr.pom b/po/hr.pom
index fb845ece..ffca527c 100644
--- a/po/hr.pom
+++ b/po/hr.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�je"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Razvoj"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Poslu�itelj"
 
diff --git a/po/hu.po b/po/hu.po
index 7706e699..adf2a2f4 100644
--- a/po/hu.po
+++ b/po/hu.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-02-23 11:02+0100\n"
 "Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
 "Language-Team: Hungarian\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 elt�vol�t�sa"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Az adatforr�sok friss�t�se folyamatban..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -36,12 +46,7 @@ msgstr "Kanada"
 
 #: ../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 "Sikeresen telep�tve lett minden"
 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 "Legal�bb az els� k�t bejegyz�st ki kell t�lteni."
-
 #: ../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 "Legal�bb az els� k�t bejegyz�st ki kell t�lteni."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Keres�si eredm�ny"
 
+#: ../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 "Hogyan lehet t�k�rkiszolg�l�t v�lasztani saj�t kez�leg"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Csomagok el�k�sz�t�se a telep�t�shez..."
 
+#: ../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 "Telep�t�s"
 
 #: ../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 "Sz�ks�g van a k�vetkez� csomagok valamelyik�re:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,7 +230,7 @@ msgstr "Hiba..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -323,22 +333,12 @@ msgid "Password:"
 msgstr "Jelsz�:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Csomagok el�k�sz�t�se a telep�t�shez..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "a le�r�sokban"
 
@@ -359,6 +359,11 @@ msgstr "N�h�ny tov�bbi csomagot is el kell t�vol�tani"
 msgid "All packages, by update availability"
 msgstr "telep�tetts�g alapj�n"
 
+#: ../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 "G�r�gorsz�g"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Ne tegyen semmit"
@@ -427,11 +437,6 @@ msgstr "V�lasszon ki egy t�kr�t..."
 
 #: ../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 "�tvonal:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "\"%s\" csomag let�lt�se (%s/%s)..."
 
@@ -511,6 +521,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Egy�b"
 
@@ -519,36 +534,31 @@ msgstr "Egy�b"
 msgid "Sweden"
 msgstr "Sv�dorsz�g"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Ausztria"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Inform�ci�..."
+msgid "Austria"
+msgstr "Ausztria"
 
 #: ../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 "Inform�ci�..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Vizsg�lat..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -556,22 +566,17 @@ msgstr "Jap�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "�sszefoglal�: "
 
 #: ../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 ".%s elt�vol�t�sa"
 msgid "Importance: "
 msgstr "Fontoss�g: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -632,11 +642,6 @@ msgstr "Belgium"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "M�ret: "
 
@@ -660,11 +665,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Forr�s(ok) friss�t�se"
 
-#: ../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 "Probl�m�k ad�dtak a telep�t�s sor�n"
 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 "M�dos�t�s"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Kijel�lve: %d MB / �res hely a lemezen: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Egy�b"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -742,11 +737,6 @@ msgstr "F�jl vizsg�lata: \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "a f�jlokban"
 
@@ -757,12 +747,17 @@ msgstr "Az �sszes csomag,"
 
 #: ../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 "Keres�si eredm�ny (nincs)"
 
 #: ../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 "Le�ll�t�s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Az adatforr�sok friss�t�se folyamatban..."
 
+#: ../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"
@@ -852,6 +872,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finnorsz�g"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -869,12 +894,12 @@ msgstr "M�dos�t�sok ment�se"
 
 #: ../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
@@ -885,6 +910,11 @@ msgstr "Tov�bbi inform�ci�"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Keres�s"
 
@@ -909,16 +939,6 @@ msgid "Spain"
 msgstr "Spanyolorsz�g"
 
 #: ../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 "Hiba a friss�t�si adatforr�s felv�tele k�zben"
@@ -930,11 +950,6 @@ msgstr "F�jlok:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "A forr�scsomagok let�lt�se sikertelen."
 
@@ -943,6 +958,11 @@ msgstr "A forr�scsomagok let�lt�se sikertelen."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "A proxyhoz sz�ks�ges felhaszn�l�n�v �s jelsz�:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "K�na"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -955,11 +975,6 @@ msgstr "Sz�ks�g van tov�bbi csomagokra"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1016,7 +1031,7 @@ msgstr "Keres�s:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1030,11 +1045,6 @@ msgid "Removable device"
 msgstr "Cser�lhet� eszk�z"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Csomagok el�k�sz�t�se a telep�t�shez..."
@@ -1049,21 +1059,11 @@ msgstr "Csomagok elt�vol�t�sa folyamatban..."
 msgid "Please wait, adding medium..."
 msgstr "Az adatforr�s felv�tele folyamatban..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Egy�b"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Felhaszn�l�n�v:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1074,21 +1074,16 @@ msgstr "Belgium"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Proxyk be�ll�t�sa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Proxyk be�ll�t�sa"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1096,11 +1091,6 @@ msgstr "\"%s\" al��r�s�nak ellen�rz�se..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1114,16 +1104,6 @@ msgstr "F�jlhiba"
 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 ""
@@ -1135,12 +1115,7 @@ msgstr "Az adatforr�s friss�t�se nem siker�lt, ez�rt letilt�sra ker�l."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1153,25 +1128,20 @@ msgstr "V�lassza ki a k�v�nt t�k�rkiszolg�l�t."
 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\" forr�s szerkeszt�se:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "A friss�t�s oka: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Forr�sok be�ll�t�sa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "A friss�t�s oka: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1200,7 +1170,7 @@ msgstr "Probl�ma ad�dott az elt�vol�t�s sor�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1226,22 +1196,37 @@ msgstr "Csomagok el�k�sz�t�se a telep�t�shez..."
 
 #: ../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 "Le�r�s: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KByte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1249,6 +1234,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Az �sszes k�rt csomag telep�tve lett."
 
+#: ../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 "N�v: "
 
@@ -1331,7 +1321,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1346,12 +1336,22 @@ msgstr "Kijel�lve"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Maxim�lis mennyis�g� inform�ci�"
 
 #: ../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 "Hibajav�t� friss�t�sek"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Jap�n"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1427,20 +1427,15 @@ msgstr "A rendelkez�sre �ll� csomagok lek�rdez�se..."
 msgid "Cancel"
 msgstr "M�gsem"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Enged�lyezve?"
-
 #: ../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 "Enged�lyezve?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1467,16 +1462,6 @@ msgstr "A telep�t�s befejez�d�tt"
 msgid " done."
 msgstr " k�sz"
 
-#: ../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 "A folytat�shoz be kell helyeznie az adathordoz�t"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "T�l sok csomag van kijel�lve"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "T�l sok csomag van kijel�lve"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1502,17 +1487,17 @@ msgstr "Ne tegyen semmit"
 msgid "Danmark"
 msgstr "D�nia"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Hiba a let�lt�s k�zben"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Braz�lia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Seg�ts�g"
@@ -1522,6 +1507,11 @@ msgstr "Seg�ts�g"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Csomagtelep�t�shez rendszergazdai jogosults�g sz�ks�ges."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1549,7 +1539,7 @@ msgstr "forr�s alapj�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1562,6 +1552,11 @@ msgstr "\"%s\" let�lt�se; h�tralev� id�: %s; sebess�g: %s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1589,11 +1584,6 @@ msgstr "Adatforr�s v�lt�sa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "A kijel�l�s vissza�ll�t�sa"
 
@@ -1602,6 +1592,11 @@ msgstr "A kijel�l�s vissza�ll�t�sa"
 msgid "Mandrake Update"
 msgstr "Mandrake-friss�t�s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Egy�b"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1619,12 +1614,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
@@ -1640,6 +1635,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1676,23 +1676,13 @@ msgid "Currently installed version: "
 msgstr "A jelenleg telep�tett verzi�: "
 
 #: ../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 "Egy�b"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1719,7 +1709,7 @@ msgstr "N�v:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1727,6 +1717,11 @@ msgstr ""
 msgid "No update"
 msgstr "Friss�t�s nem tal�lhat�"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Ne tegyen semmit"
+
 #: ../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 "\"%s\" forr�s szerkeszt�se:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1826,11 +1831,6 @@ msgstr ""
 "Ezzel a programmal kiv�laszthatja, mely friss�t�seket k�v�nja\n"
 "telep�teni a g�p�re."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2114,6 +2114,10 @@ msgid "Software Sources Manager"
 msgstr "Szoftverforr�s-kezel�"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP-kiszolg�l�"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "�tk�zik ezzel:"
 
diff --git a/po/hu.pom b/po/hu.pom
index e578e4ed..67fdadcc 100644
--- a/po/hu.pom
+++ b/po/hu.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Munka�llom�s"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafikus k�rnyezet"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Fejleszt�s"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Kiszolg�l�"
 
diff --git a/po/id.po b/po/id.po
index ce838d99..b9199ef4 100644
--- a/po/id.po
+++ b/po/id.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-03-18 16:36+0900\n"
 "Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
 "Language-Team: Bahasa Indonesia <id@li.org>\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 "Hapus .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Media sedang di-update..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -36,12 +46,7 @@ msgstr "Kanada"
 
 #: ../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 "semua sudah diinstal dengan benar"
 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 "Setidaknya dua entri pertama harus diisi."
-
 #: ../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 "update development"
 
-#: ../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 "Setidaknya dua entri pertama harus diisi."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Hasil pencarian"
 
+#: ../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 "Cara memilih mirror"
 
@@ -156,6 +156,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Paket sedang disiapkan untuk instalasi..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -173,21 +178,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Install"
+msgid "True type"
+msgstr "Tipe"
 
 #: ../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 "Install"
+
+#: ../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 "Satu di antara paket berikut diperlukan:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "update development"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -221,7 +231,7 @@ msgstr "Error..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -322,21 +332,11 @@ msgid "Password:"
 msgstr "Password:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Keterangan"
@@ -356,6 +356,11 @@ msgstr "Beberapa paket tambahan perlu dihapus"
 msgid "All packages, by update availability"
 msgstr "menurut kesediaan update"
 
+#: ../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 "Yunani"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Menganggur"
@@ -424,11 +434,6 @@ msgstr "Pilih 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 "Download packet `%s' (%s/%s)..."
 
@@ -510,6 +520,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Lainnya"
 
@@ -518,60 +533,50 @@ msgstr "Lainnya"
 msgid "Sweden"
 msgstr "Swedia"
 
-#: ../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
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "update development"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Periksa..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "Jepang"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Ringkasan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "update development"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -588,6 +593,11 @@ msgstr "Hapus .%s"
 msgid "Importance: "
 msgstr "Derajat Kepentingan: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -629,11 +639,6 @@ msgid "Medium"
 msgstr "Belgia"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Ukuran"
@@ -658,11 +663,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Update source"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "update development"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -698,6 +698,11 @@ msgstr "Ada masalah saat instalasi"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -708,16 +713,6 @@ msgstr "Edit"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Terpilih: %d MB / Tersedia: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Lainnya"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -740,11 +735,6 @@ msgstr "Periksa file source `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "dalam file"
 
@@ -754,13 +744,18 @@ msgid "All packages, by group"
 msgstr "Semua paket,"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "Umum"
+
+#: ../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
@@ -775,6 +770,16 @@ msgstr "Hasil pencarian (tak ada)"
 
 #: ../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"
@@ -793,11 +798,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 "Media sedang di-update..."
 
+#: ../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"
@@ -848,6 +868,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finlandia"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -864,13 +889,13 @@ msgid "Save changes"
 msgstr "Simpan perubahan"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Setting Jaringan:"
+#, 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
@@ -881,6 +906,11 @@ msgstr "Info lain"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Cari"
 
@@ -904,16 +934,6 @@ msgid "Spain"
 msgstr "Spanyol"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "update development"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Error saat penambahan media"
@@ -924,11 +944,6 @@ msgid "Files:\n"
 msgstr "/_File"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Pilih paket Anda"
@@ -938,6 +953,11 @@ msgstr "Pilih paket Anda"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Anda dapat menentukan pengguna/katakunci untuk otentikasi proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Cina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -949,11 +969,6 @@ msgid "Additional packages needed"
 msgstr "Dibutuhkan paket tambahan"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Jaringan"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -1010,9 +1025,9 @@ msgid "Find:"
 msgstr "Cari:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "update development"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1025,11 +1040,6 @@ msgid "Removable device"
 msgstr "Perangkat portabel"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Paket sedang disiapkan untuk instalasi..."
@@ -1046,21 +1056,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "Media sedang ditambahkan..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Lainnya"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Jaringan"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1071,21 +1071,16 @@ msgstr "Belgia"
 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 "Konfigurasikan proxy"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Perhatian"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1093,11 +1088,6 @@ msgstr "Verifikasi tandatangan `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1111,16 +1101,6 @@ msgstr "Error file"
 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 "update development"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1132,12 +1112,7 @@ msgstr "Update media gagal; media akan dinon-aktifkan."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1152,25 +1127,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 "Edit source \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Alasan update: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Konfigurasikan source"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Alasan update: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1199,7 +1169,7 @@ msgstr "Masalah saat penghapusan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1224,23 +1194,38 @@ msgid "No package found for installation."
 msgstr "Paket sedang disiapkan untuk instalasi..."
 
 #: ../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 "Keterangan"
 
 #: ../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
@@ -1248,6 +1233,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Semua paket yg diminta telah sukses diinstal."
 
+#: ../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
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Jaringan"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Nama: %s"
 
@@ -1325,7 +1315,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1342,12 +1332,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Info maximum"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1405,8 +1405,8 @@ msgstr "Tampilkan update bugfix"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Jaringan"
+msgid "Java"
+msgstr "Jepang"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1425,20 +1425,15 @@ msgstr ""
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Diaktifkan?"
-
 #: ../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 "Diaktifkan?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1465,16 +1460,6 @@ msgstr "Terinstall"
 msgid " done."
 msgstr " selesai."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "update development"
-
-#: ../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 "Untuk melanjutkan, masukkan media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Terlalu banyak paket dipilih"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Terlalu banyak paket dipilih"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1500,17 +1485,17 @@ msgstr "Menganggur"
 msgid "Danmark"
 msgstr "Denmark"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Jaringan"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Error saat download"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr ""
@@ -1520,6 +1505,11 @@ msgstr ""
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Maaf, untuk menginstal paket, Anda harus jadi root."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1547,7 +1537,7 @@ msgstr "menurut repositori sumber"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1560,6 +1550,11 @@ msgstr "Download `%s', waktu yg dibutuhkan:%s, kecepatan:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "update development"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1587,11 +1582,6 @@ msgstr "Ubah media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Reset pilihan"
 
@@ -1600,6 +1590,11 @@ msgstr "Reset pilihan"
 msgid "Mandrake Update"
 msgstr "Setting MandrakeUpdate"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Lainnya"
+
 #: ../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"
@@ -1675,22 +1675,12 @@ msgstr "Versi terinstal: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "update development"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Nama"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1715,7 +1705,7 @@ msgstr "Nama"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1723,6 +1713,11 @@ msgstr ""
 msgid "No update"
 msgstr "Lakukan update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Jaringan"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1733,6 +1728,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:"
@@ -1745,6 +1750,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1753,11 +1763,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Edit source \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1821,11 +1826,6 @@ msgstr ""
 "Perkakas ini membantu Anda memilih update yang ingin Anda instal di\n"
 "komputer Anda."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2109,6 +2109,62 @@ msgid "Software Sources Manager"
 msgstr "Manajer Source Software"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "Server FTP"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "update development"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "update development"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "update development"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Setting Jaringan:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "update development"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Jaringan"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "update development"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Lainnya"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Jaringan"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "update development"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Jaringan"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Jaringan"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "update development"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "konflik dengan"
 
@@ -2408,9 +2464,6 @@ msgstr "Manajer Source Software"
 #~ msgid "security"
 #~ msgstr "Sekuriti"
 
-#~ msgid "general"
-#~ msgstr "Umum"
-
 #~ msgid "bugfix"
 #~ msgstr "perbaikan"
 
@@ -2428,9 +2481,6 @@ msgstr "Manajer Source Software"
 #~ "Anda tidak dapat mengambil daftar paket untuk diupdate\n"
 #~ "Coba dengan mirror yang lain"
 
-#~ msgid "Warning"
-#~ msgstr "Perhatian"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2490,18 +2540,12 @@ msgstr "Manajer Source Software"
 #~ msgid "0 selected packages: 0.0 MB"
 #~ msgstr "tidak ada paket yang dipilih: 0.0 MB"
 
-#~ msgid "Name"
-#~ msgstr "Nama"
-
 #~ msgid "Installed"
 #~ msgstr "Terinstall"
 
 #~ msgid "Size"
 #~ msgstr "Ukuran"
 
-#~ msgid "Type"
-#~ msgstr "Tipe"
-
 #~ msgid "Summary"
 #~ msgstr "Ringkasan"
 
diff --git a/po/id.pom b/po/id.pom
index f33fc130..8efe293d 100644
--- a/po/id.pom
+++ b/po/id.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Stasiunkerja"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Mode Grafis"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Pengembangan"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/is.po b/po/is.po
index fe735c7f..a360a69d 100644
--- a/po/is.po
+++ b/po/is.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: 1999-04-18 23:01-0400\n"
 "Last-Translator: Thorarinn R. Einarsson <thori@mindspring.com>\n"
 "Language-Team: is <kde-isl@mmedia.is>\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 "Fjarlægja"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Augnablik..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Canada"
@@ -33,12 +43,7 @@ msgstr "Kanadískt (Quebec)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -56,26 +61,21 @@ 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
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Þróunartól/C"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Configuration/Networking"
+msgid "You need to fill up at least the two first entries."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "System/XFree86"
-msgstr "Kerfisforrit/Grunnur"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Type of medium:"
@@ -105,6 +105,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Leita"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Grafík"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -126,11 +131,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -144,6 +144,11 @@ msgstr "Umbrot"
 msgid "Package installation..."
 msgstr "Undirbý innsetningu"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Þróunartól/C++"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -161,6 +166,21 @@ msgstr "Skeljar"
 
 #: ../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 "Grafík"
 
@@ -171,11 +191,6 @@ msgstr "Set inn"
 
 #: ../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"
@@ -187,11 +202,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Þróunartól/Kerfisforrit"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -209,7 +219,7 @@ msgstr "Villa..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -299,20 +309,10 @@ msgstr "Lykilorð:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "System/Servers"
-msgstr "Kerfisforrit/Forritasöfn"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Lýsingar"
@@ -332,6 +332,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"
@@ -348,6 +353,11 @@ msgid "Greece"
 msgstr "Grískt"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Staðbundinn prentari"
@@ -400,11 +410,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"
@@ -465,6 +470,11 @@ msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -475,6 +485,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Annað"
 
@@ -483,34 +498,29 @@ msgstr "Annað"
 msgid "Sweden"
 msgstr "Skoða"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Boards"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "raðtengd"
 
-#: ../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 "Þróunartól/Kerfisforrit"
-
-#: ../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
@@ -519,24 +529,19 @@ msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Yfirlit"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "System/Fonts/Type1"
-msgstr "Kerfisforrit/Grunnur"
+#, c-format
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Þróunartól/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -553,6 +558,11 @@ msgstr "Fjarlægja"
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -584,11 +594,6 @@ msgid "Medium"
 msgstr "Belgískt"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Stærð"
@@ -613,11 +618,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Miðlungs"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Þróunartól/Forritunarmál"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -653,24 +653,19 @@ msgstr "Undirbý innsetningu"
 msgid "Terminals"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit"
+msgid "Kernel and hardware"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
+msgid "Edit"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Annað"
-
-#: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Other"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -694,11 +689,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 "Nafn"
@@ -710,12 +700,17 @@ msgstr "Fjarlægja"
 
 #: ../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
@@ -730,6 +725,16 @@ msgstr "Leita"
 
 #: ../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"
@@ -743,11 +748,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Geiri"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Augnablik..."
 
+#: ../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"
@@ -796,6 +816,11 @@ msgstr "Get ekki sett inn þennan pakka"
 msgid "Finland"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -813,12 +838,12 @@ msgstr "Pakka"
 
 #: ../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
@@ -829,6 +854,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Leita"
 
@@ -848,16 +878,6 @@ msgid "Spain"
 msgstr "Spænskt"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Þróunartól/C"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Augnablik..."
@@ -869,11 +889,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
@@ -882,6 +897,11 @@ msgstr ""
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Chat"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Update"
@@ -894,11 +914,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -948,8 +963,8 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Þróunartól/C"
+msgid "XFree86"
+msgstr "Kerfisforrit/Grunnur"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -962,11 +977,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Undirbý innsetningu"
@@ -981,21 +991,11 @@ msgstr "Augnablik..."
 msgid "Please wait, adding medium..."
 msgstr "Augnablik..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Annað"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
@@ -1006,21 +1006,16 @@ msgstr "Belgískt"
 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 "Bæta við notanda"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Aðvörun"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1028,11 +1023,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Kerfisforrit/Forritasöfn"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1046,16 +1036,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 "Þróunartól/C"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1067,12 +1047,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1085,24 +1060,19 @@ msgstr ""
 msgid "Communications"
 msgstr "Samskipti"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Miðlungs"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Samskipti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1132,7 +1102,7 @@ msgstr "Undirbý innsetningu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1155,29 +1125,54 @@ msgstr "Undirbý innsetningu"
 
 #: ../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 "Lýsingar"
 
 #: ../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 "Kerfisforrit/Grunnur"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Kerfisforrit/Forritasöfn"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Local files"
@@ -1204,11 +1199,6 @@ msgid "Databases"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Name: "
 msgstr "Nafn: %s"
@@ -1249,9 +1239,9 @@ msgid "Video"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Þróunartól/C++"
+#, c-format
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1267,12 +1257,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
@@ -1326,7 +1326,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/WWW"
+msgid "Java"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -1344,19 +1344,14 @@ msgstr ""
 msgid "Cancel"
 msgstr "Hætta við"
 
-#: ../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
@@ -1384,16 +1379,6 @@ msgstr "Set inn"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Þróunartól/C"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1401,12 +1386,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
@@ -1419,14 +1404,14 @@ msgstr "Staðbundinn prentari"
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Networking/Mail"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Mail"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1439,6 +1424,11 @@ msgstr "Hjálp"
 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,7 +1456,7 @@ msgstr "Fjarlægja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1479,6 +1469,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Þróunartól/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1506,11 +1501,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1519,6 +1509,11 @@ msgstr ""
 msgid "Mandrake Update"
 msgstr "Linux-Mandrake uppfærsla"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Annað"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1531,13 +1526,13 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Kerfisforrit/Grunnur"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1549,6 +1544,11 @@ msgid ""
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Kerfisforrit/Forritasöfn"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1580,23 +1580,13 @@ msgid "Currently installed version: "
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Þróunartól/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Nafn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1621,7 +1611,7 @@ msgstr "Nafn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1629,6 +1619,11 @@ msgstr ""
 msgid "No update"
 msgstr "Linux-Mandrake uppfærsla"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Staðbundinn prentari"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1639,6 +1634,16 @@ msgstr "Í lagi"
 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:"
@@ -1651,6 +1656,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1659,11 +1669,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Miðlungs"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1723,11 +1728,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2014,6 +2014,53 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Grafík"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Kerfisforrit/Forritasöfn"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Grafík"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Þróunartól/Kerfisforrit"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Þróunartól/Kerfisforrit"
+
+#, fuzzy
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Kerfisforrit/Grunnur"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Þróunartól/Forritunarmál"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Þróunartól/C"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Þróunartól/C"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Annað"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Þróunartól/C"
+
+#~ msgid "Development/C++"
+#~ msgstr "Þróunartól/C++"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " brýtur í bága við %s-%s-%s"
 
@@ -2055,15 +2102,9 @@ msgstr ""
 #~ msgid "grpmi error: you must be superuser!\n"
 #~ msgstr "grpmi villa: þú verður að vera ofurpaur!\n"
 
-#~ msgid "Warning"
-#~ msgstr "Aðvörun"
-
 #~ msgid "Name: %s"
 #~ msgstr "Nafn: %s"
 
-#~ msgid "Name"
-#~ msgstr "Nafn"
-
 #~ msgid ""
 #~ "Update\n"
 #~ "List"
diff --git a/po/is.pom b/po/is.pom
index 0b5ce510..f7cf1142 100644
--- a/po/is.pom
+++ b/po/is.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Vinnustöð"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Myndrænt umhverfi"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Forritunartól"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Þjónn"
 
diff --git a/po/it.po b/po/it.po
index 4c3f8de3..bf1b345a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -14,7 +14,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-21 18:18+0100\n"
 "Last-Translator: Simone Riccio <s.riccio@aeb.informatica.it>\n"
 "Language-Team: Italian <IT@li.org>\n"
@@ -24,14 +24,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Rimuovi .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Attendere l'aggiornamento del supporto..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -39,12 +49,7 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -62,25 +67,20 @@ msgstr "tutto è stato installato correttamente"
 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 "Dovresti compilare almeno le prime due caselle."
-
 #: ../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 "Aggiornamenti di sviluppo"
 
-#: ../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 "Dovresti compilare almeno le prime due caselle."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -115,6 +115,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Risultati della Ricerca"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -140,11 +145,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Come scegliere manualmente il mirror"
 
@@ -158,6 +158,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Sto preparando i pacchetti per l'installazione..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -175,21 +180,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Installa"
+msgid "True type"
+msgstr "Tipo"
 
 #: ../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 "Installa"
+
+#: ../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 "Uno dei seguenti pacchetti è necessario:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Aggiornamenti di sviluppo"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -223,7 +233,7 @@ msgstr "Errore..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -328,21 +338,11 @@ msgid "Password:"
 msgstr "Password:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Descrizioni"
@@ -362,6 +362,11 @@ msgstr "Ci sono altri pacchetti da rimuovere"
 msgid "All packages, by update availability"
 msgstr "per disponibilità aggiornamenti"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -378,6 +383,11 @@ msgid "Greece"
 msgstr "Grecia"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Non fare niente"
@@ -431,11 +441,6 @@ msgstr "Scegli un 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"
@@ -507,6 +512,11 @@ msgstr "Porta:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Sto scaricando il pacchetto `%s' (%s/%s)..."
 
@@ -517,6 +527,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Altro"
 
@@ -525,60 +540,50 @@ msgstr "Altro"
 msgid "Sweden"
 msgstr "Svezia"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Informazioni..."
+msgid "Austria"
+msgstr "Austria"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Aggiornamenti di sviluppo"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Informazioni..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Ispezionare..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "Giappone"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Sommario"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Aggiornamenti di sviluppo"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -595,6 +600,11 @@ msgstr "Rimuovi .%s"
 msgid "Importance: "
 msgstr "Importanza: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -638,11 +648,6 @@ msgid "Medium"
 msgstr "Belgio"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Dimensioni"
@@ -667,11 +672,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Aggiorna sorgente(i)"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Aggiornamenti di sviluppo"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -707,6 +707,11 @@ msgstr "Si sono verificati dei problemi durante l'installazione"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -717,16 +722,6 @@ msgstr "Modifica"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selezionati: %d MB / Spazio libero su disco: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Altro"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -749,11 +744,6 @@ msgstr "Esamino il file della sorgente '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "nei file"
 
@@ -763,13 +753,18 @@ msgid "All packages, by group"
 msgstr "Tutti i pacchetti,"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "generico"
+
+#: ../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
@@ -784,6 +779,16 @@ msgstr "Risultati della Ricerca (nessuno)"
 
 #: ../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"
@@ -803,11 +808,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 "Attendere l'aggiornamento del supporto..."
 
+#: ../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"
@@ -863,6 +883,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finlandia"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -879,13 +904,13 @@ msgid "Save changes"
 msgstr "Salva le modifiche"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Configurazione di rete:"
+#, 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
@@ -896,6 +921,11 @@ msgstr "Maggiori informazioni"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Cerca"
 
@@ -920,16 +950,6 @@ msgid "Spain"
 msgstr "Spagna"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Aggiornamenti di sviluppo"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Errore durante l'aggiunta del supporto per gli aggiornamenti"
@@ -940,11 +960,6 @@ msgid "Files:\n"
 msgstr "/_File"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Scegli i tuoi pacchetti"
@@ -956,6 +971,11 @@ msgstr ""
 "Devi specificare nome utente/password per l'autenticazione da parte del "
 "proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Cina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -967,11 +987,6 @@ msgid "Additional packages needed"
 msgstr "Sono necessari altri pacchetti"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Rete"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -1031,9 +1046,9 @@ msgid "Find:"
 msgstr "Trova:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Aggiornamenti di sviluppo"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1046,11 +1061,6 @@ msgid "Removable device"
 msgstr "Dispositivo rimovibile"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Sto preparando i pacchetti per l'installazione..."
@@ -1067,21 +1077,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "Attendere l'aggiunta del supporto..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Altro"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Rete"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1092,21 +1092,16 @@ msgstr "Belgio"
 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 "Configurazione dei proxy"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Attenzione"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1114,11 +1109,6 @@ msgstr "Sto verificando la firma di `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1132,16 +1122,6 @@ msgstr "Errore nel file"
 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 "Aggiornamenti di sviluppo"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1154,12 +1134,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1174,25 +1149,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 "Modifica sorgente \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Causa dell'aggiornamento:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Configura sorgenti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Causa dell'aggiornamento:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1221,7 +1191,7 @@ msgstr "Si sono verificati dei problemi durante la rimozione"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1246,23 +1216,38 @@ msgid "No package found for installation."
 msgstr "Sto preparando i pacchetti per l'installazione..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Tipo"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Descrizioni"
 
 #: ../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
@@ -1270,6 +1255,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Tutti i pacchetti richiesti sono stati installati con successo."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1297,11 +1292,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Rete"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Nome: %s"
 
@@ -1347,7 +1337,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1364,12 +1354,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Tutte le informazioni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1427,8 +1427,8 @@ msgstr "Mostra gli aggiornamenti bugfix"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Rete"
+msgid "Java"
+msgstr "Giappone"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1447,20 +1447,15 @@ msgstr ""
 msgid "Cancel"
 msgstr "Annulla"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Abilitato?"
-
 #: ../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 "Abilitato?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1487,16 +1482,6 @@ msgstr "Installato"
 msgid " done."
 msgstr " fatto."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Aggiornamenti di sviluppo"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1504,13 +1489,13 @@ msgstr "Devi inserire il supporto per continuare"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Troppi pacchetti selezionati"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Troppi pacchetti selezionati"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1522,17 +1507,17 @@ msgstr "Non fare niente"
 msgid "Danmark"
 msgstr "Danimarca"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Rete"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Errore durante lo scaricamento"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasile"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Guida"
@@ -1542,6 +1527,11 @@ msgstr "Guida"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Devi essere root per installare dei pacchetti."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1569,7 +1559,7 @@ msgstr "per repositorio di sorgente"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1582,6 +1572,11 @@ msgstr "Scaricamento di '%s', tempo rimasto: %s, velocità: %s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Aggiornamenti di sviluppo"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1609,11 +1604,6 @@ msgstr "Cambia supporto"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Annulla la selezione"
 
@@ -1622,6 +1612,11 @@ msgstr "Annulla la selezione"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate: Preferenze"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Altro"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1639,12 +1634,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
@@ -1660,6 +1655,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1697,22 +1697,12 @@ msgstr "Versione attualmente installata:"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Aggiornamenti di sviluppo"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Nome"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1738,7 +1728,7 @@ msgstr "Nome"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1746,6 +1736,11 @@ msgstr ""
 msgid "No update"
 msgstr "Fai gli aggiornamenti"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Rete"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1756,6 +1751,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:"
@@ -1768,6 +1773,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1776,11 +1786,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Modifica sorgente \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1845,11 +1850,6 @@ msgstr ""
 "installare sul tuo\n"
 "computer."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2133,6 +2133,62 @@ msgid "Software Sources Manager"
 msgstr "Gestore delle sorgenti software"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "Server FTP"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Aggiornamenti di sviluppo"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Aggiornamenti di sviluppo"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Aggiornamenti di sviluppo"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Configurazione di rete:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Aggiornamenti di sviluppo"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Rete"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Aggiornamenti di sviluppo"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Altro"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Rete"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Aggiornamenti di sviluppo"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Rete"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Rete"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Aggiornamenti di sviluppo"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "� in conflitto con"
 
@@ -2431,9 +2487,6 @@ msgstr "Gestore delle sorgenti software"
 #~ msgid "security"
 #~ msgstr "sicurezza"
 
-#~ msgid "general"
-#~ msgstr "generico"
-
 #~ msgid "bugfix"
 #~ msgstr "bugfix"
 
@@ -2451,9 +2504,6 @@ msgstr "Gestore delle sorgenti software"
 #~ "Non posso scaricare la lista dei pacchetti da aggiornare\n"
 #~ "Prova con un altro mirror"
 
-#~ msgid "Warning"
-#~ msgstr "Attenzione"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2533,18 +2583,12 @@ msgstr "Gestore delle sorgenti software"
 #~ msgid "/Help/_About..."
 #~ msgstr "/Guida/_Informazioni su Mandrake Update"
 
-#~ msgid "Name"
-#~ msgstr "Nome"
-
 #~ msgid "Installed"
 #~ msgstr "Installato"
 
 #~ msgid "Size"
 #~ msgstr "Dimensioni"
 
-#~ msgid "Type"
-#~ msgstr "Tipo"
-
 #~ msgid "Summary"
 #~ msgstr "Sommario"
 
diff --git a/po/it.pom b/po/it.pom
index 0200408e..9dc6b87e 100644
--- a/po/it.pom
+++ b/po/it.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Workstation"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Ambiente grafico"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Sviluppo"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/ja.po b/po/ja.po
index 5cdd823d..6822fa65 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-ja\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-31 00:06+0900\n"
 "Last-Translator: UTUMI Hirosi\n"
 "Language-Team: japanese <ja@li.org>\n"
@@ -21,14 +21,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"
@@ -36,13 +46,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
@@ -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 "少なくとも最初の２つの項目は入力してください。"
-
 #: ../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
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "検索結果"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "グラフィカルデスクトップ/KDE"
+
 #: ../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
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "開発/GNOMEとGTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -171,6 +176,21 @@ msgid "Shells"
 msgstr "シェル"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "科学/化学"
+
+#: ../rpmdrake:1
+#, fuzzy, 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"
@@ -201,11 +216,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:"
@@ -222,9 +232,9 @@ msgid "Proxy..."
 msgstr "プロクシ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "システム/設定/起動とInit"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "書籍/文学"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -327,21 +337,11 @@ msgstr "パスワード:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "システム/サーバ"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "RPMのインストール"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "グラフィカルデスクトップ/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "説明"
 
@@ -360,6 +360,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"
@@ -377,6 +382,11 @@ msgstr "ギリシャ"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "モニタリング"
 
@@ -429,11 +439,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"
@@ -502,6 +507,11 @@ msgstr "パス:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "以下のパッケージダウンロード中 `%s' (%s/%s).."
 
@@ -512,6 +522,11 @@ msgstr "プロトコル:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "その他"
 
@@ -520,36 +535,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"
@@ -557,23 +567,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
@@ -590,6 +595,11 @@ msgstr ".%s を削除する"
 msgid "Importance: "
 msgstr "重要性: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -632,11 +642,6 @@ msgstr "メディア"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "システム/国際化"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "サイズ: "
 
@@ -660,11 +665,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..."
@@ -700,6 +700,11 @@ msgstr "インストール中に問題が発生しました"
 msgid "Terminals"
 msgstr "ターミナル"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "システム/カーネルとハードウェア"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -710,16 +715,6 @@ msgstr "編集"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "選択: %d MB / ディスクの空き容量: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "書籍/その他"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "科学/その他"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -742,11 +737,6 @@ msgstr "メディア %s のリモートファイルを調べています.."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "ゲーム/アドベンチャー"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "中のファイル"
 
@@ -756,14 +746,19 @@ msgid "All packages, by group"
 msgstr "全パッケージ, グループ順"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "一般"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "グラフィカルデスクトップ/FVWM系"
+msgid "Console"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "ゲーム/スポーツ"
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -776,6 +771,16 @@ msgid "Search results (none)"
 msgstr "検索結果(なし)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "ゲーム/アドベンチャー"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "書庫/CD作成"
+
+#: ../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"
@@ -859,6 +879,11 @@ msgstr ""
 msgid "Finland"
 msgstr "フィンランド"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "システム/フォント/X11ビットマップ"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -875,14 +900,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 "書籍/FAQ"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -891,6 +916,11 @@ msgid "More info"
 msgstr "詳細情報"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "書籍/コンピュータ書籍"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "検索"
@@ -917,16 +947,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 "その更新メディアは既に存在しています"
 
@@ -937,11 +957,6 @@ msgstr "ファイル: \n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "ゲーム/アーケード"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "パッケージを取得できません。"
 
@@ -950,6 +965,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"
@@ -962,11 +982,6 @@ msgstr "追加パッケージが必要です"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "ネットワーク/チャット"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "ユーザモードで実行"
 
@@ -1027,9 +1042,9 @@ msgid "Find:"
 msgstr "検索対象:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "開発/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "システム/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1043,11 +1058,6 @@ msgstr "リムーバブルデバイス"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "グラフィカルデスクトップ/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "パッケージをインストールする準備.."
 
@@ -1061,21 +1071,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 "Login:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "ネットワーク/その他"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1086,21 +1086,16 @@ msgstr "ベルギー"
 msgid "File tools"
 msgstr "ファイルツール"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "書庫/CD作成"
-
-#: ../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
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1108,11 +1103,6 @@ msgstr "`%s'のダウンロードを開始.."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "システム/ライブラリ"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "回復不能なエラー: %s."
 
@@ -1126,16 +1116,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 ""
@@ -1150,14 +1130,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
@@ -1169,25 +1144,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
@@ -1216,8 +1186,8 @@ msgstr "削除中に問題が発生しました"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "グラフィカルデスクトップ/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1241,30 +1211,55 @@ msgid "No package found for installation."
 msgstr "インストールするパッケージが見つかりません。"
 
 #: ../rpmdrake:1
+#, fuzzy, 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"
@@ -1292,11 +1287,6 @@ msgstr "データベース"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "ネットワーク/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "名前: "
 
@@ -1342,8 +1332,8 @@ msgstr "動画"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "開発/GNOMEとGTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1356,14 +1346,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
@@ -1418,9 +1418,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
@@ -1437,6 +1437,11 @@ msgstr "利用可能なパッケージを探しています。お待ちくださ
 msgid "Cancel"
 msgstr "キャンセル"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "科学/その他"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1444,16 +1449,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 "全パッケージ(ABC順)"
 
@@ -1477,16 +1472,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 "書籍/HowTo"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1494,15 +1479,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 "なにもしない"
@@ -1512,17 +1497,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 "ヘルプ"
@@ -1532,6 +1517,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"
@@ -1558,9 +1548,9 @@ msgid "All packages, by medium repository"
 msgstr "全パッケージ, メディア順"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "システム/フォント/X11ビットマップ"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "書庫/圧縮"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1572,6 +1562,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"
@@ -1599,11 +1594,6 @@ msgstr "メディアを変更"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "グラフィカルデスクトップ/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "選択をリセット"
 
@@ -1612,6 +1602,11 @@ msgstr "選択をリセット"
 msgid "Mandrake Update"
 msgstr "Mandrakeアップデート"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "書籍/FAQ"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1628,14 +1623,14 @@ msgstr ""
 "後でやりなおしてみてください。"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "書籍/コンピュータ書籍"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "書籍/HowTo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "システム/ベース"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1649,6 +1644,11 @@ msgstr ""
 "メディアのデータベースを更新してください。"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "システム/ライブラリ"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1686,24 +1686,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
@@ -1727,14 +1717,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"
@@ -1745,6 +1740,16 @@ msgstr "OK"
 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:"
@@ -1756,6 +1761,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"
@@ -1765,11 +1775,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"
@@ -1832,11 +1837,6 @@ msgstr ""
 "\n"
 "このツールではRPMを選択してアップデートすることができます。"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "システム/フォント/True type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2117,6 +2117,128 @@ msgstr "RPMを削除"
 msgid "Software Sources Manager"
 msgstr "RPMメディアマネージャ"
 
+#, 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 "システム/設定/起動とInit"
+
+#~ 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 と競合します"
 
@@ -2501,9 +2623,6 @@ msgstr "RPMメディアマネージャ"
 #~ msgid "security"
 #~ msgstr "セキュリティ"
 
-#~ msgid "general"
-#~ msgstr "一般"
-
 #~ msgid "bugfix"
 #~ msgstr "バグフィクス"
 
@@ -2521,9 +2640,6 @@ msgstr "RPMメディアマネージャ"
 #~ "更新するパッケージ一覧を取得できません\n"
 #~ "べつのミラーを試してみてください"
 
-#~ msgid "Warning"
-#~ msgstr "警告"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2601,15 +2717,9 @@ msgstr "RPMメディアマネージャ"
 #~ msgid "/Help/_About..."
 #~ msgstr "/ヘルプ(H)/このソフトについて(_A).."
 
-#~ msgid "Name"
-#~ msgstr "名前"
-
 #~ msgid "Installed"
 #~ msgstr "インストール済み"
 
-#~ msgid "Type"
-#~ msgstr "種類"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, version 7.2\n"
 
diff --git a/po/ja.pom b/po/ja.pom
index cfbd5c1d..4e9d3325 100644
--- a/po/ja.pom
+++ b/po/ja.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/ko.po b/po/ko.po
index 7df224b8..7d183cdf 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -14,7 +14,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-25 14:32+0900\n"
 "Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
 "Language-Team: Korean <baedaron@hananet.net>\n"
@@ -24,14 +24,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"
@@ -39,12 +49,7 @@ msgstr "ĳ����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -62,25 +67,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
@@ -115,6 +115,11 @@ msgstr ""
 msgid "Search results"
 msgstr "�˻� ���"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -140,11 +145,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "�������� �̷��� �����ϴ� ���"
 
@@ -158,6 +158,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:"
@@ -175,19 +180,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, 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
+#, c-format
+msgid "Italy"
+msgstr "���¸�"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -201,11 +216,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:"
@@ -223,7 +233,7 @@ msgstr "����..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -327,22 +337,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 "������"
 
@@ -361,6 +361,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"
@@ -377,6 +382,11 @@ msgid "Greece"
 msgstr "�׸���"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "�׳� ��"
@@ -430,11 +440,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"
@@ -505,6 +510,11 @@ msgstr "���:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "��Ű�� �����޴� ��: [%s] (%s/%s)..."
 
@@ -515,6 +525,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "��Ÿ"
 
@@ -523,36 +538,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"
@@ -560,22 +570,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
@@ -593,6 +598,11 @@ msgstr ".%s ����"
 msgid "Importance: "
 msgstr "�߿䵵: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -635,11 +645,6 @@ msgstr "���⿡"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "ũ��: "
 
@@ -663,11 +668,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..."
@@ -703,6 +703,11 @@ msgstr "��ġ�߿� ������ �߻��߽��ϴ�."
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -713,16 +718,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"
@@ -745,11 +740,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "���Ϻ�"
 
@@ -760,12 +750,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
@@ -780,6 +775,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"
@@ -799,11 +804,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"
@@ -859,6 +879,11 @@ msgstr ""
 msgid "Finland"
 msgstr "�ɶ���"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -876,12 +901,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
@@ -892,6 +917,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "�˻�"
 
@@ -916,16 +946,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 "������Ʈ ��ü �߰� �� ����"
@@ -937,11 +957,6 @@ msgstr "%s���ϵ�:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "�ҽ� ��Ű���� ������ �� �����ϴ�."
 
@@ -950,6 +965,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"
@@ -962,11 +982,6 @@ msgstr "�߰� ��Ű���� �ʿ��մϴ�."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1024,7 +1039,7 @@ msgstr "ã��"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1038,11 +1053,6 @@ msgid "Removable device"
 msgstr "Ż���� ��ġ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "��ġ�� ��Ű�� �غ� ��..."
@@ -1057,21 +1067,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"
@@ -1082,21 +1082,16 @@ msgstr "���⿡"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "������ ����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "������ ����"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1104,11 +1099,6 @@ msgstr "[%s]�� ���� ���� �� ..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1122,16 +1112,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 ""
@@ -1143,12 +1123,7 @@ msgstr "��ü�� ������Ʈ�� �� �����ϴ�; �ڵ����� ���Ұ��� ���Դϴ�."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1161,25 +1136,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
@@ -1208,7 +1178,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1234,22 +1204,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
+#, 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
@@ -1257,6 +1242,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"
@@ -1284,11 +1279,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "�̸�: "
 
@@ -1334,7 +1324,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1349,12 +1339,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
@@ -1411,9 +1411,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
@@ -1430,20 +1430,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
@@ -1470,16 +1465,6 @@ 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"
@@ -1487,13 +1472,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
@@ -1505,17 +1490,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 "����"
@@ -1525,6 +1510,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"
@@ -1552,7 +1542,7 @@ msgstr "�ҽ� ��Ϻ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1565,6 +1555,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1592,11 +1587,6 @@ msgstr "��ü ��ȯ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "���� �缳��"
 
@@ -1605,6 +1595,11 @@ msgstr "���� �缳��"
 msgid "Mandrake Update"
 msgstr "�ǵ巹��ũ ������Ʈ"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "��Ÿ"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1622,12 +1617,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
@@ -1643,6 +1638,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1673,23 +1673,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
@@ -1714,7 +1704,7 @@ msgstr "�̸�:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1722,6 +1712,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"
@@ -1732,6 +1727,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:"
@@ -1744,6 +1749,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1752,11 +1762,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"
@@ -1820,11 +1825,6 @@ msgstr ""
 "�� ������ ��ǻ�Ϳ� ��ġ�� ������Ʈ�� ����Ʈ��� ������ �� �ֵ���\n"
 "���� �ݴϴ�."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2108,6 +2108,10 @@ msgid "Software Sources Manager"
 msgstr "����Ʈ���� �ҽ� ������"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP ����"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "(��)�� ������ �浹�մϴ�:"
 
diff --git a/po/ko.pom b/po/ko.pom
index 238565fd..c350b910 100644
--- a/po/ko.pom
+++ b/po/ko.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/lt.po b/po/lt.po
index ecbaa666..3119524f 100644
--- a/po/lt.po
+++ b/po/lt.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-02-20 13:01+0200\n"
 "Last-Translator: Darius Liepuonis <dariusle@takas.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -21,9 +21,14 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "I�imama"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
@@ -31,19 +36,19 @@ msgstr ""
 "Pra�om palaukti\n"
 "I�metama laikmena"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
+msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Sciences/Computer science"
+msgid "Canada"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -61,24 +66,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 "K�rimo atnaujinimai"
 
-#: ../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 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Paie�kos rezultatai"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -131,11 +136,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 +149,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Ruo�iamasi paketo diegimui"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -166,19 +171,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "�diegti"
+msgid "True type"
+msgstr "Tipas"
+
+#: ../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 "�diegti"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -192,11 +207,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "K�rimo atnaujinimai"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -214,7 +224,7 @@ msgstr "Klaida..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -303,21 +313,11 @@ msgid "Password:"
 msgstr "Slapta�odis:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Ruo�iamasi paketo diegimui"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Apra�ymai"
@@ -338,6 +338,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"
@@ -356,6 +361,11 @@ msgid "Greece"
 msgstr "Graik�"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Kompiuteris: "
@@ -408,11 +418,6 @@ msgstr "Pasirinkite veidrod�:"
 
 #: ../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"
@@ -476,6 +481,11 @@ msgstr "kelias:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Siun�iami paketai `%s' (%s/%s)..."
 
@@ -486,6 +496,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Kitas"
 
@@ -494,34 +509,29 @@ msgstr "Kitas"
 msgid "Sweden"
 msgstr "Pasi�i�r�ti"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Boards"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Austria"
 msgstr "nuoseklioji"
 
-#: ../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 "K�rimo atnaujinimai"
-
-#: ../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
@@ -530,24 +540,19 @@ msgid "Japan"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Turinys"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "K�rimo atnaujinimai"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -564,6 +569,11 @@ msgstr "I�imama"
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Unable to create medium."
@@ -600,11 +610,6 @@ msgid "Medium"
 msgstr "Belg�"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Dydis"
@@ -629,11 +634,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Atnaujinti laikmen�"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "K�rimo atnaujinimai"
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -671,6 +671,11 @@ msgstr "�diegimo metu �vyko klaida"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -681,16 +686,6 @@ msgstr "Redaguoti"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "%d pa�ym�ti paketai: %.1f MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Kitas"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Australia"
@@ -712,11 +707,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 "%d bylos"
@@ -727,13 +717,18 @@ msgid "All packages, by group"
 msgstr "0 paket�, 0 bait�"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "bendras"
+
+#: ../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
@@ -748,6 +743,16 @@ msgstr "Paie�kos rezultatai"
 
 #: ../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"
@@ -761,6 +766,11 @@ msgstr ""
 msgid "Stop"
 msgstr "Sektorius"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
@@ -768,6 +778,16 @@ msgstr ""
 "Pra�om palaukti\n"
 "I�metama laikmena"
 
+#: ../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"
@@ -816,6 +836,11 @@ msgstr "Paketas `%s' negali b�ti �diegtas\n"
 msgid "Finland"
 msgstr "Surasti:"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -832,13 +857,13 @@ msgid "Save changes"
 msgstr "Paketai"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Tinklo nustatymai:"
+#, 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
@@ -849,6 +874,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Ie�koti"
 
@@ -868,16 +898,6 @@ msgid "Spain"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "K�rimo atnaujinimai"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr ""
@@ -891,11 +911,6 @@ msgstr "/_Byla"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
@@ -904,6 +919,11 @@ msgstr ""
 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"
@@ -915,11 +935,6 @@ msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Tinklas"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -971,9 +986,9 @@ msgid "Find:"
 msgstr "Surasti:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "K�rimo atnaujinimai"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -986,11 +1001,6 @@ msgid "Removable device"
 msgstr "I�mesti laikmen�"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Ruo�iamasi paketo diegimui"
@@ -1007,21 +1017,11 @@ msgstr ""
 "Pra�om palaukti\n"
 "I�metama laikmena"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Kitas"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Tinklas"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Belgium"
@@ -1032,16 +1032,6 @@ msgstr "Belg�"
 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"
@@ -1049,6 +1039,11 @@ msgstr ""
 "Atnaujinti\n"
 "laikmen�"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "D�mesio"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1056,11 +1051,6 @@ msgstr "Tikrinu '%s' para��..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1074,16 +1064,6 @@ msgstr "Ra�ymo klaida"
 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 "K�rimo atnaujinimai"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1095,12 +1075,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1115,24 +1090,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 "Redaguoti Laikmena"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
+#, fuzzy, c-format
+msgid "Configuration"
 msgstr ""
+"Atnaujinti\n"
+"laikmen�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1162,7 +1134,7 @@ msgstr "�diegimo metu �vyko klaida"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1187,23 +1159,38 @@ msgid "No package found for installation."
 msgstr "Ruo�iamasi paketo diegimui"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Tipas"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Apra�ymai"
 
 #: ../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
@@ -1211,6 +1198,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"
@@ -1237,11 +1234,6 @@ msgid "Databases"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Tinklas"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Name: "
 msgstr "Pavadinimas: "
@@ -1288,7 +1280,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1303,12 +1295,22 @@ msgstr "Pasirinkti visus"
 
 #: ../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
@@ -1361,9 +1363,9 @@ msgid "Bugfixes updates"
 msgstr "Saugumo atnaujinimai"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Tinklas"
+#, c-format
+msgid "Java"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1380,19 +1382,14 @@ msgstr "Pra�om palaukti.Pa�alinami paketai"
 msgid "Cancel"
 msgstr "Nutraukti"
 
-#: ../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
@@ -1420,16 +1417,6 @@ msgstr "�diegiama "
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "K�rimo atnaujinimai"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1437,12 +1424,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
@@ -1455,11 +1442,6 @@ msgstr "Kompiuteris: "
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Tinklas"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
@@ -1467,6 +1449,11 @@ msgstr "Klaida siun�iant"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Mail"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Help"
 msgstr "Pagalba"
 
@@ -1475,6 +1462,11 @@ msgstr "Pagalba"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Atsipra�ome, bet jums reikia perkrauti sistema kad �diegti."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Taiwan"
@@ -1502,7 +1494,7 @@ msgstr "0 paket�, 0 bait�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1515,6 +1507,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "K�rimo atnaujinimai"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1542,11 +1539,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1555,6 +1547,11 @@ msgstr ""
 msgid "Mandrake Update"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Kitas"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1567,12 +1564,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
@@ -1586,6 +1583,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1617,22 +1619,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "K�rimo atnaujinimai"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Pavadinimas"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1657,7 +1649,7 @@ msgstr "Pavadinimas:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1665,6 +1657,11 @@ msgstr ""
 msgid "No update"
 msgstr "Saugumo atnaujinimai"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Tinklas"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1675,6 +1672,16 @@ msgstr "Gerai"
 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:"
@@ -1687,6 +1694,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1695,11 +1707,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Redaguoti Laikmena"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1761,11 +1768,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2049,6 +2051,58 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "K�rimo atnaujinimai"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "K�rimo atnaujinimai"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "K�rimo atnaujinimai"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Tinklo nustatymai:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "K�rimo atnaujinimai"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Tinklas"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "K�rimo atnaujinimai"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Kitas"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Tinklas"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "K�rimo atnaujinimai"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Tinklas"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Tinklas"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "K�rimo atnaujinimai"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " konfliktuoja su "
 
@@ -2186,9 +2240,6 @@ msgstr ""
 #~ msgid "security"
 #~ msgstr "saugumas"
 
-#~ msgid "general"
-#~ msgstr "bendras"
-
 #~ msgid "bugfix"
 #~ msgstr "klaidos atitaisymas"
 
@@ -2206,9 +2257,6 @@ msgstr ""
 #~ "Negaliu atsisi�sti atnaujinam� paket� s�ra�o\n"
 #~ "Pabandykit kit� server�"
 
-#~ msgid "Warning"
-#~ msgstr "D�mesio"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2283,15 +2331,9 @@ msgstr ""
 #~ msgid "/Help/_About..."
 #~ msgstr "/Pagalba/_Apie..."
 
-#~ msgid "Name"
-#~ msgstr "Pavadinimas"
-
 #~ msgid "Installed"
 #~ msgstr "�diegtas"
 
-#~ msgid "Type"
-#~ msgstr "Tipas"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, versija 7.2\n"
 
diff --git a/po/lt.pom b/po/lt.pom
index 6730579f..6a72a815 100644
--- a/po/lt.pom
+++ b/po/lt.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "KDE darbo stotis"
+
+# 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 "K�rimo, Tinklapi�"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "serveris"
 
diff --git a/po/lv.po b/po/lv.po
index c9d7b7e0..9ccc7a6b 100644
--- a/po/lv.po
+++ b/po/lv.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: 2002-08-11 22:16+0200\n"
 "Last-Translator: Vitauts Sto�ka <vit@dau.lv>\n"
 "Language-Team: Latvian <cooker-i18n@linux-mandrake.com>\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 "No�emt .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "L�dzu gaidiet, atjuaninu datu nes�ju"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "Kan�da"
 
 #: ../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 "viss tika uzinstal�ts korekti"
 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 "Jums j�aizpilda vismaz pirmie divi ievadlauki."
-
 #: ../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 "Jums j�aizpilda vismaz pirmie divi ievadlauki."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Mekl��anas rezult�ti"
 
+#: ../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 "K� ar rok�m izv�l�ties spogu�serveri"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Tiek sagatavota instal��ana"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -174,6 +179,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 ""
 
@@ -184,11 +204,6 @@ msgstr "Instal�t"
 
 #: ../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"
@@ -200,11 +215,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Ir nepiecie�ama viena no sekojo��m pakotn�m:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -222,7 +232,7 @@ msgstr "K��da..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -327,22 +337,12 @@ msgid "Password:"
 msgstr "Parole:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Tiek sagatavota instal��ana"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "aprakstos"
 
@@ -361,6 +361,11 @@ msgstr "Nepiecie�ams no�emt da�as papildus pakotnes"
 msgid "All packages, by update availability"
 msgstr "p�c atjaunin�juma pieejam�bas"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -377,6 +382,11 @@ msgid "Greece"
 msgstr "Grie�ija"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Nedar�t neko"
@@ -430,11 +440,6 @@ msgstr "Izv�lieties spogu�serveri..."
 
 #: ../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 "Ce��:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -511,6 +521,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Cits"
 
@@ -519,36 +534,31 @@ msgstr "Cits"
 msgid "Sweden"
 msgstr "Zviedrija"
 
-#: ../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
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr ""
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "P�rbaude..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -556,22 +566,17 @@ msgstr "Jap�na"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Kopsavilkums: "
 
 #: ../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 "No�emt .%s"
 msgid "Importance: "
 msgstr "Svar�gums: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -631,11 +641,6 @@ msgstr "Be��ija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Apjoms: "
 
@@ -659,11 +664,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Atjaunot avotus"
 
-#: ../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 "Instal��anas laik� rad�s probl�mas"
 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 "Redi��t"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izv�l�ts: %d MB / br�v� diska vieta: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Cits"
-
-#: ../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 "failos"
 
@@ -756,12 +746,17 @@ msgstr "Visas pakotnes,"
 
 #: ../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 "Mekl��anas rezult�ti (neviens)"
 
 #: ../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 "Stop"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "L�dzu gaidiet, atjuaninu datu nes�ju"
 
+#: ../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 "Somija"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -871,12 +896,12 @@ msgstr "Saglab�t izmai�as"
 
 #: ../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
@@ -887,6 +912,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Mekl�t"
 
@@ -911,16 +941,6 @@ msgid "Spain"
 msgstr "Sp�nija"
 
 #: ../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 "K��da pievienojot atjauno�anas datu nes�ju"
@@ -931,11 +951,6 @@ msgid "Files:\n"
 msgstr "Faili:\n"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Nebija iesp�jams sa�emt izejas pakotnes."
@@ -945,6 +960,11 @@ msgstr "Nebija iesp�jams sa�emt izejas pakotnes."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Varat nor�d�t lietot�ja v�rdu/paroli priek�i proxy autentifik�cijas:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "��na"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -957,11 +977,6 @@ msgstr "Papildus nepiecie�am�s pakotnes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1019,7 +1034,7 @@ msgstr "Mekl�t:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1033,11 +1048,6 @@ msgid "Removable device"
 msgstr "Atvienojama ier�ce"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Tiek sagatavota instal��ana"
@@ -1052,21 +1062,11 @@ msgstr "L�dzu gaidiet, no�emu pakotnes..."
 msgid "Please wait, adding medium..."
 msgstr "L�dzu gaidiet, pievienoju datu nes�ju..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Cits"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Lietot�js:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1077,29 +1077,19 @@ msgstr "Be��ija"
 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 "Konfigur�t proxy serverus"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "Printing"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "System/Libraries"
+msgid "Starting download of `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1117,16 +1107,6 @@ msgstr "Ierakst��anas k��da\n"
 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 ""
@@ -1138,12 +1118,7 @@ msgstr "Nav iesp�jams atjaunin�t datu nes�ju; tas tiks autom�tiski atsl�gts."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1156,25 +1131,20 @@ msgstr "L�dzu izv�lieties spogu�serveri"
 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 "Laboju avotu \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Atjaunin��anas iemesls: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Konfigur�t izejas kodus"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Atjaunin��anas iemesls: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1203,7 +1173,7 @@ msgstr "Probl�ma instal��anas laik�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1226,22 +1196,37 @@ msgstr "Tiek sagatavota instal��ana"
 
 #: ../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 "Apraksts: "
 
 #: ../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
@@ -1249,6 +1234,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Visas piepras�t�s pakotnes tika veiksm�gi instal�tas."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1276,11 +1271,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "V�rds: "
 
@@ -1326,7 +1316,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1341,12 +1331,22 @@ msgstr "Izv�l�ts"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Maksim�la inform�cija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1403,9 +1403,9 @@ msgid "Bugfixes updates"
 msgstr "K��du labojumu jaunin�jumi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Jap�na"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1422,20 +1422,15 @@ msgstr "L�dzu gaidiet, mekl�ju pieejam�s pakotnes..."
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "At�auts?"
-
 #: ../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 "At�auts?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1462,16 +1457,6 @@ msgstr "Instal��ana pabeigta"
 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"
@@ -1479,13 +1464,13 @@ msgstr "Jums j�ielik datu nes�js, lai turpin�tu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Izv�l�tas pa daudz pakotnes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izv�l�tas pa daudz pakotnes"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1497,17 +1482,17 @@ msgstr "Nedar�t neko"
 msgid "Danmark"
 msgstr "D�nija"
 
-#: ../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 "Braz�lija"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Pal�dz�ba"
@@ -1517,6 +1502,11 @@ msgstr "Pal�dz�ba"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Atvainojiet, nebija iesp�jams pa�emt izejas pakotnes."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1544,7 +1534,7 @@ msgstr "p�c avota repozit�rija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1557,6 +1547,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1584,11 +1579,6 @@ msgstr "Nomainiet datu nes�ju"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Izv�l�ties no jauna"
 
@@ -1597,6 +1587,11 @@ msgstr "Izv�l�ties no jauna"
 msgid "Mandrake Update"
 msgstr "Mandrake atjaunin��ana"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Cits"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1614,12 +1609,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
@@ -1635,6 +1630,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 "Patreiz instal�t� versija: "
 
 #: ../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 "Cits"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1706,7 +1696,7 @@ msgstr "V�rds:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1714,6 +1704,11 @@ msgstr ""
 msgid "No update"
 msgstr "Nav jaunin�juma"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Nedar�t neko"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1724,6 +1719,16 @@ msgstr "Labi"
 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 "Laboju avotu \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1812,11 +1817,6 @@ msgstr ""
 "�is r�ks pal�dz�s Jums izv�l�ties atjaunin�jumus, kurus v�laties\n"
 "instal�t uz datora."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2102,6 +2102,10 @@ msgid "Software Sources Manager"
 msgstr "Programmat�ras avotu p�rvaldnieks"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP serveris"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " konflikt� ar %s-%s-%s"
 
diff --git a/po/lv.pom b/po/lv.pom
index 7925c2ae..f68e7ac8 100644
--- a/po/lv.pom
+++ b/po/lv.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Darbastacija"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafisk� vide"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Izstr�de"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Serveris"
 
diff --git a/po/ms.po b/po/ms.po
index cf9dd28e..ad04e8da 100644
--- a/po/ms.po
+++ b/po/ms.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-20 03:24--730\n"
 "Last-Translator: Yuzz <yuzz@likom.com.my>\n"
 "Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -19,27 +19,32 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Boleh dihapus"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Please wait, updating media..."
 msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
+msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Sciences/Computer science"
+msgid "Canada"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -57,24 +62,19 @@ msgstr "Pakej sudah diinstal sebelumnya"
 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"
+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 "Hasil Pencarian"
 
+#: ../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 "Menyediakan pakej untuk instal..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -162,6 +167,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 ""
 
@@ -172,11 +192,6 @@ msgstr "Terinstal"
 
 #: ../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 ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "URL:"
@@ -210,7 +220,7 @@ msgstr "Ralat..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -299,22 +309,12 @@ msgid "Password:"
 msgstr "katalaluan:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Menyediakan pakej untuk instal..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr ""
 
@@ -333,6 +333,11 @@ msgstr "Pakej-pakej ini perlu diinstal dulu agar semuanya dapat berjalan baik."
 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"
@@ -350,6 +355,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr ""
 
@@ -401,11 +411,6 @@ msgstr "Sila pilih 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"
@@ -471,6 +476,11 @@ msgstr "path: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Muatturun pakej `%s' (%s/%s)..."
 
@@ -481,6 +491,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr ""
 
@@ -489,24 +504,24 @@ msgstr ""
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
+msgid "Boards"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
+msgid "Austria"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
+msgid "Info..."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -514,11 +529,6 @@ msgstr ""
 msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -526,22 +536,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
@@ -559,6 +564,11 @@ msgstr "Boleh dihapus"
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Unable to create medium."
@@ -596,11 +606,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr ""
 
@@ -624,11 +629,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Ubah Sumber"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, updating medium..."
@@ -664,24 +664,19 @@ msgstr "Ada masalah semasa instalasi"
 msgid "Terminals"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr "Ubah"
-
 #: ../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
 #, c-format
-msgid "Books/Other"
-msgstr ""
+msgid "Edit"
+msgstr "Ubah"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Other"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -705,11 +700,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 "Setempat"
@@ -721,12 +711,17 @@ msgstr "0 pakej, 0 bait"
 
 #: ../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
@@ -741,6 +736,16 @@ msgstr "Hasil Pencarian"
 
 #: ../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"
@@ -754,11 +759,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 "Penmeriksaan kebergantungan..."
 
+#: ../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"
@@ -807,6 +827,11 @@ msgstr "Pakej `%s' tidak boleh diinstal\n"
 msgid "Finland"
 msgstr "Cari:"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -824,12 +849,12 @@ msgstr "Pakej"
 
 #: ../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
@@ -839,6 +864,11 @@ msgid "More info"
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Search"
 msgstr "Carian"
@@ -859,16 +889,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 "Penmeriksaan kebergantungan..."
@@ -879,11 +899,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 "Pakej rosak, tidak boleh dibaca/dicari"
@@ -893,6 +908,11 @@ msgstr "Pakej rosak, tidak boleh dibaca/dicari"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Chat"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Update"
@@ -905,11 +925,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -963,7 +978,7 @@ msgstr "Cari:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -977,11 +992,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Menyediakan pakej untuk instal..."
@@ -996,21 +1006,11 @@ msgstr "Tunggu, pakej berikut sedang dihapus:"
 msgid "Please wait, adding medium..."
 msgstr "Penmeriksaan kebergantungan..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Login:"
 msgstr "login:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1021,21 +1021,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 "Konfigurasikan sumber?"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1043,11 +1038,6 @@ msgstr "Mengenalpasti tandatangan `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1061,16 +1051,6 @@ msgstr "Ralat fail"
 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 ""
@@ -1082,12 +1062,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1102,24 +1077,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 "Ubah Sumber"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr ""
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Konfigurasikan sumber?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1149,7 +1119,7 @@ msgstr "Ada masalah semasa instalasi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1175,22 +1145,37 @@ msgstr "Menyediakan pakej untuk instal..."
 
 #: ../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 ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1198,6 +1183,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"
@@ -1224,11 +1219,6 @@ msgid "Databases"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Name: "
 msgstr "Nama"
@@ -1275,7 +1265,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1290,12 +1280,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
@@ -1349,7 +1349,7 @@ msgstr "Kemaskini sekuriti"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/WWW"
+msgid "Java"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -1367,19 +1367,14 @@ msgstr "muat ulang senarai pakej yg tersedia"
 msgid "Cancel"
 msgstr "Batal"
 
-#: ../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
@@ -1407,44 +1402,29 @@ msgstr "dapat diinstal"
 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 "Pakej ini sudah diinstal sebelumnya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
+msgid "Physics"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
+msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Networking/Mail"
+msgid "Danmark"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1454,6 +1434,11 @@ msgstr "Ralat semasa muatturun"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Mail"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Help"
 msgstr "Pertolongan"
 
@@ -1462,6 +1447,11 @@ msgstr "Pertolongan"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Maaf, anda perlu jadi root untuk instal pakej-pakej."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1489,7 +1479,7 @@ msgstr "0 pakej, 0 bait"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1502,6 +1492,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1529,11 +1524,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr ""
 
@@ -1544,6 +1534,11 @@ msgstr ""
 "Mandrake\n"
 "Update"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Books"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1556,12 +1551,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
@@ -1575,6 +1570,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1605,23 +1605,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 "Nama"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1646,7 +1636,7 @@ msgstr "Nama"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1654,6 +1644,11 @@ msgstr ""
 msgid "No update"
 msgstr "kemaskini normal"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking"
+msgstr ""
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1664,6 +1659,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:"
@@ -1676,6 +1681,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1684,11 +1694,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Ubah Sumber"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1750,11 +1755,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
diff --git a/po/mt.po b/po/mt.po
index d6d63dcc..3b37f465 100644
--- a/po/mt.po
+++ b/po/mt.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: 2002-08-19 05:48+0200\n"
 "Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
 "Language-Team: Maltese <mt@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 "Neħħi .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
 
+#: ../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,25 +62,20 @@ msgstr "Kollox ġie nstallat sew"
 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 "Trid timla tal-inqas l-ewwel żewġ elementi."
-
 #: ../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 "Trid timla tal-inqas l-ewwel żewġ elementi."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Riżultat tat-tfittxija"
 
+#: ../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 "Kif tagħżel mera manwalment"
 
@@ -153,6 +153,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -170,6 +175,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 ""
 
@@ -180,11 +200,6 @@ msgstr "Installa"
 
 #: ../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"
@@ -196,11 +211,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -218,7 +228,7 @@ msgstr "Problema..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -322,22 +332,12 @@ msgid "Password:"
 msgstr "Password:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "fid-deskrizzjonijiet"
 
@@ -356,6 +356,11 @@ msgstr "Xi pakketti oħra jridu jitneħħew"
 msgid "All packages, by update availability"
 msgstr "skond id-disponibbiltà ta' aġġornament"
 
+#: ../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 "Greċja"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Tagħmel xejn"
@@ -425,11 +435,6 @@ msgstr "Agħżel mera..."
 
 #: ../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"
@@ -499,6 +504,11 @@ msgstr "Direttorju: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Qed jitniżżel pakkett \"%s\" (%s/%s)..."
 
@@ -509,6 +519,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Oħrajn"
 
@@ -517,36 +532,31 @@ msgstr "Oħrajn"
 msgid "Sweden"
 msgstr "Svezja"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Awstrija"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "Awstrija"
 
 #: ../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 "Spezzjona..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -554,22 +564,17 @@ msgstr "Ġappun"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Sommarju: "
 
 #: ../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
@@ -587,6 +592,11 @@ msgstr "Neħħi .%s"
 msgid "Importance: "
 msgstr "Importanza: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -631,11 +641,6 @@ msgstr "Belġju"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Daqs: "
 
@@ -659,11 +664,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Aġġorna sorsi"
 
-#: ../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 "Inqalgħu problemi waqt l-installazzjoni"
 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 "Editja"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Magħżula: %d MB / Spazju disponibbli: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Oħrajn"
-
-#: ../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 "fil-fajls"
 
@@ -756,12 +746,17 @@ msgstr "Pakketti kollha"
 
 #: ../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 "Riżultat tat-tfittxija (ebda)"
 
 #: ../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 "Ieqaf"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
 
+#: ../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 "Finlandja"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -871,12 +896,12 @@ msgstr "Ikteb bidliet"
 
 #: ../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
@@ -887,6 +912,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Fittex"
 
@@ -911,16 +941,6 @@ msgid "Spain"
 msgstr "Spanja"
 
 #: ../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 "Problema fiż-żieda ta' sors ta' aġġornamenti"
@@ -932,11 +952,6 @@ msgstr "Fajls:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Ma nistax nikseb pakketti sors."
 
@@ -945,6 +960,11 @@ msgstr "Ma nistax nikseb pakketti sors."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Trid tispeċifika user/password għall-awtenitikazzjoni tal-proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Ċina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -957,11 +977,6 @@ msgstr "Pakketti oħra meħtieġa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1018,7 +1033,7 @@ msgstr "Sib:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1032,11 +1047,6 @@ msgid "Removable device"
 msgstr "Apparat jinħareġ"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
@@ -1051,21 +1061,11 @@ msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
 msgid "Please wait, adding medium..."
 msgstr "Stenna ftit, qed jiġi miżjud medju..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Oħrajn"
-
 #: ../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"
@@ -1076,21 +1076,16 @@ msgstr "Belġju"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Ikkonfigura proxies"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Ikkonfigura proxies"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1098,11 +1093,6 @@ msgstr "Qed nivverifika l-firma ta' \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1116,16 +1106,6 @@ msgstr "Problema fil-fajl"
 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 ""
@@ -1137,12 +1117,7 @@ msgstr "Ma nistax naġġorna medju, se jiġi diżabbilit awtomatikament."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1155,25 +1130,20 @@ msgstr "Jekk jogħġbok agħżel mera li tixtieq."
 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 "Editja s-sors \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Raġuni għall-aġġornament: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Ikkonfigura sorsi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Raġuni għall-aġġornament: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1202,7 +1172,7 @@ msgstr "Problema waqt l-installazzjoni"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1228,22 +1198,37 @@ msgstr "Qed jiġu ppreparati l-pakketti għall-installazzjoni..."
 
 #: ../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 "Deskrizzjoni: "
 
 #: ../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
@@ -1251,6 +1236,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Il-pakketti kollha mitluba ġew installati."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1278,11 +1273,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Isem: "
 
@@ -1328,7 +1318,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1343,12 +1333,22 @@ msgstr "Magħżul"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Informazzjoni massima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1405,9 +1405,9 @@ msgid "Bugfixes updates"
 msgstr "Tiswijiet ta' bugs"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Ġappun"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1424,20 +1424,15 @@ msgstr "Stenna ftit, qed insib pakketti disponibbli..."
 msgid "Cancel"
 msgstr "Ikkanċella"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Mixgħul?"
-
 #: ../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 "Mixgħul?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1464,16 +1459,6 @@ msgstr "Installazzjoni lesta"
 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"
@@ -1481,13 +1466,13 @@ msgstr "Trid iddaħħal id-diska biex tkompli"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Hemm wisq pakketti magħżula"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Hemm wisq pakketti magħżula"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1499,17 +1484,17 @@ msgstr "Tagħmel xejn"
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Problema waqt it-tniżżil"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brażil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Għajnuna"
@@ -1519,6 +1504,11 @@ msgstr "Għajnuna"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Trid tkun \"root\" biex tinstalla dawn il-pakketti."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1546,7 +1536,7 @@ msgstr "skond is-sors"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1559,6 +1549,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1586,11 +1581,6 @@ msgstr "Ibdel sors"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Irrisettja l-għażla"
 
@@ -1599,6 +1589,11 @@ msgstr "Irrisettja l-għażla"
 msgid "Mandrake Update"
 msgstr "Aġġornament Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Oħrajn"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1616,12 +1611,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
@@ -1636,6 +1631,11 @@ msgstr ""
 "Jista' jkollok bżonn taġġorna d-database tas-sorsi."
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1669,23 +1669,13 @@ msgid "Currently installed version: "
 msgstr "Verżjoni nstallata bħalissa: "
 
 #: ../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 "Oħrajn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1710,7 +1700,7 @@ msgstr "Isem:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1718,6 +1708,11 @@ msgstr ""
 msgid "No update"
 msgstr "Ebda aġġornament"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Tagħmel xejn"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1728,6 +1723,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:"
@@ -1740,6 +1745,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1748,11 +1758,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Editja s-sors \"%s\":"
 
-#: ../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 ""
 "Din l-għodda tgħinek tagħżel aġġornamenti li trid tinstalla fuq il-\n"
 "kompjuter tiegħek."
 
-#: ../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 "Maniġġjar ta' sorsi tas-softwer"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "Server FTP"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "għandu konflitt ma'"
 
diff --git a/po/mt.pom b/po/mt.pom
index 6863b507..e10aceff 100644
--- a/po/mt.pom
+++ b/po/mt.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Workstation"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Ambjent Grafiku"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Żviluppar"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/nl.po b/po/nl.po
index 514ae807..fd7ee7fc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-nl\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-26 02:17+0100\n"
 "Last-Translator: Peter Bosch <peter@dromas.student.utwente.nl>\n"
 "Language-Team: Nederlands <vertaling@nl.linux.org>\n"
@@ -23,14 +23,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Archiveren/Overige"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Netwerktoepassingen/Externe toegang"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Even geduld, bezig met verversen van media..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -38,13 +48,8 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Wetenschap/Informatica"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Wetenschap/Natuurkunde"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -61,25 +66,20 @@ msgstr "Alles is correct geïnstalleerd"
 msgid "Verifying packages signatures..."
 msgstr "Bezig met controleren van pakket-ondertekeningen..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "U dient tenminste de eerste twee velden in te vullen."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Systeem/Configuratie/Overig"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Netwerktoepassingen/Bestandsoverdracht"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Systeem/Configuratie/Netwerktoepassingen"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Ontwikkeling/KDE en Qt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "Systeem/Xfree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "U dient tenminste de eerste twee velden in te vullen."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -115,6 +115,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Zoekresultaat"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Grafisch bureaublad/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -140,11 +145,6 @@ msgstr "Parallelle groep bewerken"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Systeem/Configuratie/Hardware"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hoe u handmatig uw mirror kunt kiezen"
 
@@ -158,6 +158,11 @@ msgstr "Publiceren"
 msgid "Package installation..."
 msgstr "Pakket installatie..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Ontwikkeling/GNOME en GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -174,6 +179,21 @@ msgid "Shells"
 msgstr "Shells"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Wetenschap/Scheikunde"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Grafisch"
@@ -187,11 +207,6 @@ msgstr "Italië"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Systeem/Kernel en apparatuur"
-
-#: ../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 "Eén van de volgende pakketten is benodigd:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Ontwikkeling/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -227,9 +237,9 @@ msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Systeem/Configuratie/Opstarten en Initialisatie"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Boeken/Literatuur"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -333,21 +343,11 @@ msgstr "Wachtwoord:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Systeem/Diensten"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Software Pakketten Installatie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Grafisch bureaublad/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "in omschrijvingen"
 
@@ -367,6 +367,11 @@ msgstr "Enkele extra pakketten dienen verwijderd te worden"
 msgid "All packages, by update availability"
 msgstr "Alle pakketten, op beschikbaarheid vernieuwingen"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -382,6 +387,11 @@ msgstr "Verenigde Staten"
 msgid "Greece"
 msgstr "Griekenland"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
 # Nieuwe vertaling 'toezicht houden' okee?
 #: ../rpmdrake:1
 #, c-format
@@ -438,11 +448,6 @@ msgstr "Kies uw mirror..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Grafisch bureaublad/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"
@@ -514,6 +519,11 @@ msgstr "Pad:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Ophalen pakket `%s' (%s/%s)..."
 
@@ -524,6 +534,11 @@ msgstr "Protocol:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Overige"
 
@@ -532,36 +547,31 @@ msgstr "Overige"
 msgid "Sweden"
 msgstr "Zweden"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Spelletjes/Bordspellen"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "Oostenrijk"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Info..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Netwerktoepassingen/Bestandsoverdracht"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Ontwikkeling/Overige"
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Inspecteren..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Spelletjes/Kaarten"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -569,23 +579,18 @@ msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Netwerktoepassingen/Externe toegang"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Samenvatting: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Systeem/Lettertypes/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Ontwikkeling/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -603,6 +608,11 @@ msgstr ".%s verwijderen"
 msgid "Importance: "
 msgstr "Belang: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -646,11 +656,6 @@ msgstr "Medium"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Systeem/Internationalisatie"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Grootte: "
 
@@ -674,11 +679,6 @@ msgstr "Parallelle groep toevoegen"
 msgid "Update media"
 msgstr "Media vernieuwen"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Ontwikkeling/Databases"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -714,6 +714,11 @@ msgstr "Probleem tijdens de installatie"
 msgid "Terminals"
 msgstr "Terminals"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Systeem/Kernel en apparatuur"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -724,16 +729,6 @@ msgstr "Bewerken"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Geselecteerd: %d MB / Vrije schijfruimte: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Boeken/Overige"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Wetenschap/Overige"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -754,11 +749,6 @@ msgstr "Korea"
 msgid "Examining remote file of medium `%s'..."
 msgstr "Onderzoeken van bestand op afstand van medium `%s'..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Adventure"
-msgstr "Spelletjes/Avontuur"
-
 #  Local media
 #: ../rpmdrake:1
 #, c-format
@@ -772,13 +762,18 @@ msgstr "Alle pakketten, op groep"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Grafisch Bureaublad/FVWM gebaseerd"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Spelletjes/Sport"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -791,6 +786,16 @@ msgid "Search results (none)"
 msgstr "Zoekresultaat (niets)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Spelletjes/Avontuur"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Archiveren/CD branden"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -810,11 +815,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Stoppen"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Wetenschap/Biologie"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Even geduld, bezig met genereren hdlist..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Wetenschap/Wiskunde"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Systeem/Internationalisatie"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -875,6 +895,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finland"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Systeem/Lettertypes/X11 bitmap"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -891,14 +916,14 @@ msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Netwerktoepassingen/Nieuws"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Netwerktoepassingen/Instant messaging"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Boeken/Faqs"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -907,6 +932,11 @@ msgid "More info"
 msgstr "Meer info"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Boeken/Computer boeken"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Zoeken"
@@ -933,16 +963,6 @@ msgstr "Spanje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Wetenschap/Astronomie"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Ontwikkeling/Kernel"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Reeds bestaand vernieuwingsmedium"
 
@@ -953,11 +973,6 @@ msgstr "Bestanden:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Spelletjes/Arcade"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Niet in staat bronpakketten op te halen"
 
@@ -967,6 +982,11 @@ msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "U kunt een gebruikersnaam/wachtwoord aangeven voor de proxy-aanmelding:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "China"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -979,11 +999,6 @@ msgstr "Extra pakketten benodigd"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Netwerktoepassingen/Chat"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Draaien in gebruikersmode"
 
@@ -1046,9 +1061,9 @@ msgid "Find:"
 msgstr "Zoeken:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Ontwikkeling/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Systeem/Xfree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1062,11 +1077,6 @@ msgstr "Verwisselbaar apparaat"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Grafisch Bureaublad/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Voorbereiden van pakketinstallatie..."
 
@@ -1080,21 +1090,11 @@ msgstr "Even geduld, bezig met het verwijderen van pakketten..."
 msgid "Please wait, adding medium..."
 msgstr "Even geduld, bezig met toevoegen medium..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Spelletjes/Overige"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Aanmeldnaam:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Netwerktoepassingen/Overige"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1105,21 +1105,16 @@ msgstr "België"
 msgid "File tools"
 msgstr "Bestandsgereedschappen"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Archiveren/CD branden"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Wetenschap/Biologie"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Proxy's configureren"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1127,11 +1122,6 @@ msgstr "Bezig met starten van download van `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Systeem/Bibliotheken"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Er is een fatale fout opgetreden: %s."
 
@@ -1145,16 +1135,6 @@ msgstr "Fatale fout"
 msgid "Leaves only, sorted by install date"
 msgstr "Alleen blaadjes, gesorteerd op installatie datum"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Spelletjes/Strategie"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Ontwikkeling/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1169,14 +1149,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Archiveren/Compressie"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Boeken/Literatuur"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Wetenschap/Geologie"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1188,25 +1163,20 @@ msgstr "Kies de gewenste mirror."
 msgid "Communications"
 msgstr "Communicatie"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Grafisch bureaublad/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Bewerken van parallelle groep \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Reden voor vernieuwing: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Communicatie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Wetenschap/Wiskunde"
+msgid "Reason for update: "
+msgstr "Reden voor vernieuwing: "
 
 #  Removable media
 #
@@ -1240,8 +1210,8 @@ msgstr "Probleem bij het verwijderen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Grafisch bureaublad/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1266,29 +1236,54 @@ msgstr "Geen pakketten gevonden voor installatie."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "Medium: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Spelletjes/Strategie"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Beschrijving:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Archiveren/Overige"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Wetenschap/Scheikunde"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Systeem/Basis"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Alle gevraagde pakketten zijn succesvol geïnstalleerd."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Systeem/Diensten"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Spelletjes/Puzzels"
+
 #  Local media
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1317,11 +1312,6 @@ msgstr "Databases"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Netwerktoepassingen/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Naam: "
 
@@ -1367,8 +1357,8 @@ msgstr "Video"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Ontwikkeling/GNOME en GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1381,14 +1371,24 @@ msgid "Selected"
 msgstr "Geselecteerd"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Wetenschap/Informatica"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Maximale informatie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Archiveren/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1446,9 +1446,9 @@ msgid "Bugfixes updates"
 msgstr "Programmafout-reparaties"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Netwerktoepassingen/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1465,6 +1465,11 @@ msgstr "Even geduld, bezig met opzoeken van verkrijgbare pakketten..."
 msgid "Cancel"
 msgstr "Annuleren"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Wetenschap/Overige"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1472,16 +1477,6 @@ msgstr "Ingeschakeld?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Wetenschap/Geologie"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Systeem/Lettertypes/Console"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakketten, alfabetisch"
 
@@ -1505,16 +1500,6 @@ msgstr "Installatie voltooid"
 msgid " done."
 msgstr " klaar."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Ontwikkeling/KDE en Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Boeken/Howtos"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1522,15 +1507,15 @@ msgstr "U dient het medium te plaatsen om door te gaan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Spelletjes/Bordspellen"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Te veel pakketten zijn geselecteerd"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Wetenschap/Natuurkunde"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "Niets doen"
@@ -1540,17 +1525,17 @@ msgstr "Niets doen"
 msgid "Danmark"
 msgstr "Denemarken"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Netwerktoepassingen/Mail"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Fout tijdens ophalen"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazilië"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Hulp"
@@ -1560,6 +1545,11 @@ msgstr "Hulp"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Kon het bron-pakket niet krijgen, sorry. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Spelletjes/Sport"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1586,9 +1576,9 @@ msgid "All packages, by medium repository"
 msgstr "Alle pakketten, op medium-opslagplaats"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Systeem/Lettertypes/X11 bitmap"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Archiveren/Compressie"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1600,6 +1590,11 @@ msgstr "Downloaden van `%s', tijd over:%s, snelheid:%s"
 msgid "Add a host"
 msgstr "Een host toevoegen"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Ontwikkeling/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1627,11 +1622,6 @@ msgstr "Medium veranderen"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Grafisch bureaublad/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Alle selecties opheffen"
 
@@ -1640,6 +1630,11 @@ msgstr "Alle selecties opheffen"
 msgid "Mandrake Update"
 msgstr "Mandrake Vernieuwen"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Boeken/Faqs"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1656,14 +1651,14 @@ msgstr ""
 "Probeert u het later opnieuw."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Boeken/Computer boeken"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Boeken/Howtos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Systeem/Basis"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1677,6 +1672,11 @@ msgstr ""
 "U wilt misschien uw media-database verversen."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Systeem/Bibliotheken"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1715,24 +1715,14 @@ msgid "Currently installed version: "
 msgstr "Momenteel geïnstalleerde versie: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Ontwikkeling/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Systeem/Configuratie/Printen"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Spelletjes/Puzzels"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Spelletjes/Kaarten"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Systeem/Configuratie/Pakketten"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Wetenschap/Astronomie"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1756,14 +1746,19 @@ msgstr "Naam:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Grafisch bureaublad/Overige"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Geen vernieuwing"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Netwerktoepassingen/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1774,6 +1769,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr "Tekstgereedschappen"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Spelletjes/Kaarten"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1785,6 +1790,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Type de hostnaam of IP adres in van de toe te voegen host:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Spelletjes/Arcade"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1794,11 +1804,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Bewerken van medium \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Netwerktoepassingen/Instant messaging"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1863,11 +1868,6 @@ msgstr ""
 "Dit hulpprogramma helpt u bij het kiezen van de vernieuwingen dit u op\n"
 "uw computer wilt installeren."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Systeem/Lettertypes/True type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2148,6 +2148,128 @@ msgstr "Software verwijderen"
 msgid "Software Sources Manager"
 msgstr "Software Bronnenbeheer"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Systeem/Internationalisatie"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Bestandsgereedschappen"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Grafisch bureaublad/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Wetenschap/Informatica"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Systeem/Diensten"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Databases"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Grafisch bureaublad/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Wetenschap/Informatica"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Systeem/Configuratie/Overig"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Systeem/Configuratie/Netwerktoepassingen"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Systeem/Configuratie/Hardware"
+
+#~ msgid "Development/Python"
+#~ msgstr "Ontwikkeling/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Systeem/Configuratie/Opstarten en Initialisatie"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Grafisch bureaublad/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Ontwikkeling/Overige"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Systeem/Lettertypes/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Ontwikkeling/Databases"
+
+#~ msgid "Books/Other"
+#~ msgstr "Boeken/Overige"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Grafisch Bureaublad/FVWM gebaseerd"
+
+#~ msgid "Networking/News"
+#~ msgstr "Netwerktoepassingen/Nieuws"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Ontwikkeling/Kernel"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Netwerktoepassingen/Chat"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Ontwikkeling/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Grafisch Bureaublad/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Spelletjes/Overige"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Netwerktoepassingen/Overige"
+
+#~ msgid "Development/Java"
+#~ msgstr "Ontwikkeling/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Grafisch bureaublad/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Archiveren/Backup"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Netwerktoepassingen/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Systeem/Lettertypes/Console"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Netwerktoepassingen/Mail"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Grafisch bureaublad/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Ontwikkeling/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Systeem/Configuratie/Printen"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Systeem/Configuratie/Pakketten"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Grafisch bureaublad/Overige"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Systeem/Lettertypes/True type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s conflicteert met %s"
 
diff --git a/po/nl.pom b/po/nl.pom
index c8858510..ee629a6f 100644
--- a/po/nl.pom
+++ b/po/nl.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Werkstation"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafische omgeving"
+
+# 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 "Server"
 
diff --git a/po/no.po b/po/no.po
index c44af36e..0c798491 100644
--- a/po/no.po
+++ b/po/no.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-13 17:56+0100\n"
 "Last-Translator: Per �yvind Karlsen <peroyvind@sintrax.net>\n"
 "Language-Team: Norsk Bokm�l <cooker-i18n@linux-mandrake.com>\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 "Fjern .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Vennligst vent, oppdaterer media..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "Canada"
 
 #: ../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 "alt ble installert korrekt"
 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 "Du m� fylle opp minst de to f�rste inngangene."
-
 #: ../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 "Oppdateringer utvikling"
 
-#: ../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 "Du m� fylle opp minst de to f�rste inngangene."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "S�keresultater"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -136,11 +141,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hvordan velge ditt speil manuelt"
 
@@ -154,6 +154,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Forbereder pakker for installasjon..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -171,21 +176,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "Installer"
+msgid "True type"
+msgstr "Type"
 
 #: ../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 "Installer"
+
+#: ../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"
@@ -197,11 +212,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "En av f�lgende pakker beh�ves:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Oppdateringer utvikling"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -219,7 +229,7 @@ msgstr "Feil..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -323,21 +333,11 @@ msgid "Password:"
 msgstr "Passord:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Beskrivelser"
@@ -357,6 +357,11 @@ msgstr "Noen ytterligere pakker renger � fjernes"
 msgid "All packages, by update availability"
 msgstr "ved oppdateringstilgjengelighet"
 
+#: ../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 "Hellas"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Ikke gj�r noe"
@@ -426,11 +436,6 @@ msgstr "Velg et speil..."
 
 #: ../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 "Port:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laster ned pakke `%s' (%s/%s)..."
 
@@ -512,6 +522,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Andre"
 
@@ -520,60 +535,50 @@ msgstr "Andre"
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "�sterrike"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "�sterrike"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Oppdateringer utvikling"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Sjekk..."
 
-#: ../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 "Oppsummering"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Oppdateringer utvikling"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -590,6 +595,11 @@ msgstr "Fjern .%s"
 msgid "Importance: "
 msgstr "Viktighet: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -633,11 +643,6 @@ msgid "Medium"
 msgstr "Belgia"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "St�rrelse"
@@ -662,11 +667,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Oppdaterer kilde(r)"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Oppdateringer utvikling"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -702,6 +702,11 @@ msgstr "Det oppsto problemer under installasjonen"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -712,16 +717,6 @@ msgstr "Rediger"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgte: %d MB / Ledig diskplass: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Andre"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -744,11 +739,6 @@ msgstr "Utforsker fil fra kilde `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "i filer"
 
@@ -758,13 +748,18 @@ msgid "All packages, by group"
 msgstr "Alle pakker,"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "generell"
+
+#: ../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
@@ -779,6 +774,16 @@ msgstr "S�keresultater (ingen)"
 
 #: ../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"
@@ -797,11 +802,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 "Vennligst vent, oppdaterer media..."
 
+#: ../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"
@@ -857,6 +877,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finland"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -873,13 +898,13 @@ msgid "Save changes"
 msgstr "Lagrer endringer"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Innstillinger nettverk:"
+#, 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
@@ -890,6 +915,11 @@ msgstr "Mere info"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "s�k"
 
@@ -914,16 +944,6 @@ msgid "Spain"
 msgstr "Spania"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Oppdateringer utvikling"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "Kunne ikke legge til oppdateringsmedia"
@@ -934,11 +954,6 @@ msgid "Files:\n"
 msgstr "/_Fil"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "Velg pakkene dine"
@@ -948,6 +963,11 @@ msgstr "Velg pakkene dine"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Du kan spesifisere en /bruker/passord for proxy autentifiseringen:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -959,11 +979,6 @@ msgid "Additional packages needed"
 msgstr "Ytterligere pakker trengs"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "Nettverk"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -1023,9 +1038,9 @@ msgid "Find:"
 msgstr "Finn:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Oppdateringer utvikling"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1038,11 +1053,6 @@ msgid "Removable device"
 msgstr "Fjernbar enhet"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Forbereder pakker for installasjon..."
@@ -1059,21 +1069,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "Vennligst vent, legger til media..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Andre"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Logg inn:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Nettverk"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1084,21 +1084,16 @@ msgstr "Belgia"
 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 "Konfigurer proxier"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Advarsel"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1106,11 +1101,6 @@ msgstr "Verifiserer signatur av `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1124,16 +1114,6 @@ msgstr "Fil feil"
 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 "Oppdateringer utvikling"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1145,12 +1125,7 @@ msgstr "Kan ikke oppdatere media, den vil bli automatisk sl�tt av."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1165,25 +1140,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 "Rediger kilde \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Grunn til oppdatering: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Konfigurer kilder"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Grunn til oppdatering: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1212,7 +1182,7 @@ msgstr "Problem under fjerning"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1237,23 +1207,38 @@ msgid "No package found for installation."
 msgstr "Forbereder pakker for installasjon..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Type"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Beskrivelser"
 
 #: ../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
@@ -1261,6 +1246,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Alle pakker ble vellykket installert"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1288,11 +1283,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Nettverk"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Navn: %s"
 
@@ -1338,7 +1328,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1355,12 +1345,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Maksimum informasjon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1418,8 +1418,8 @@ msgstr "Vis bugfiks-oppdateringer"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Nettverk"
+msgid "Java"
+msgstr "Japan"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1438,20 +1438,15 @@ msgstr ""
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Sl�tt p�?"
-
 #: ../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 "Sl�tt p�?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1478,16 +1473,6 @@ msgstr "Installert"
 msgid " done."
 msgstr " ferdig."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Oppdateringer utvikling"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1495,13 +1480,13 @@ msgstr "Du m� sette inn mediumet for � fortsette"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "For mange pakker er valgt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "For mange pakker er valgt"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1513,17 +1498,17 @@ msgstr "Ikke gj�r noe"
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Nettverk"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Feil under nedlasting"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
@@ -1533,6 +1518,11 @@ msgstr "Hjelp"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Du m� v�re root for � installere pakker, beklager"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1560,7 +1550,7 @@ msgstr "ved kildelager"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1573,6 +1563,11 @@ msgstr "Nedlastning av `%s', tid som gjenst�r:%s, hastighet:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Oppdateringer utvikling"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1600,11 +1595,6 @@ msgstr "Endre media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Resett valget"
 
@@ -1613,6 +1603,11 @@ msgstr "Resett valget"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdates valg"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Andre"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1630,12 +1625,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
@@ -1651,6 +1646,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1688,22 +1688,12 @@ msgstr "Installert versjon: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Oppdateringer utvikling"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Navn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1728,7 +1718,7 @@ msgstr "Navn"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1736,6 +1726,11 @@ msgstr ""
 msgid "No update"
 msgstr "Utf�r oppdateringer"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Nettverk"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1746,6 +1741,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:"
@@ -1758,6 +1763,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1766,11 +1776,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Rediger kilde \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1834,11 +1839,6 @@ msgstr ""
 "Dette verkt�yet vil hjelpe deg � velge oppdateringene du skal installere\n"
 "p� maskinen din."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2122,6 +2122,62 @@ msgid "Software Sources Manager"
 msgstr "Programvare kilde h�ndterer"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP tjener"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Innstillinger nettverk:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Nettverk"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "Andre"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Nettverk"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Nettverk"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Nettverk"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Oppdateringer utvikling"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "er i konflikt"
 
@@ -2389,9 +2445,6 @@ msgstr "Programvare kilde h�ndterer"
 #~ msgid "security"
 #~ msgstr "sikkerhet"
 
-#~ msgid "general"
-#~ msgstr "generell"
-
 #~ msgid "bugfix"
 #~ msgstr "bugfiks"
 
@@ -2409,9 +2462,6 @@ msgstr "Programvare kilde h�ndterer"
 #~ "Kan ikke motta liste over pakker for oppdatering\n"
 #~ "Pr�v med et annet speil"
 
-#~ msgid "Warning"
-#~ msgstr "Advarsel"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2486,15 +2536,9 @@ msgstr "Programvare kilde h�ndterer"
 #~ msgid "/Help/_About..."
 #~ msgstr "/Hjelp/_Om..."
 
-#~ msgid "Name"
-#~ msgstr "Navn"
-
 #~ msgid "Installed"
 #~ msgstr "Installert"
 
-#~ msgid "Type"
-#~ msgstr "Type"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, version 7.2\n"
 
diff --git a/po/no.pom b/po/no.pom
index 2adb6a87..201dabeb 100644
--- a/po/no.pom
+++ b/po/no.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Arbeidstasjon"
+
+# 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 "Utvikling"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Tjener"
 
diff --git a/po/pl.po b/po/pl.po
index 5ef4c6f8..d8f0d4aa 100644
--- a/po/pl.po
+++ b/po/pl.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-05-30 14:54+0200\n"
 "Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -18,14 +18,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Archiwizacja/Inne"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Sieć/Zdalny dostęp"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Proszę czekać, aktualizacja nośnika..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -33,13 +43,8 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Nauka/Technika komputerowa"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Nauka/Fizyka"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -56,25 +61,20 @@ msgstr "wszystko zostało pomyślnie zainstalowane"
 msgid "Verifying packages signatures..."
 msgstr "Weryfikowanie podpisów pakietów..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Należy wypełnić co najmniej dwa pierwsze pola."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "System/Konfiguracja/Inne"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Sieć/Przesyłanie plików"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "System/Konfiguracja/Sieć"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Programowanie/KDE i 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 "Należy wypełnić co najmniej dwa pierwsze pola."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Wyniki wyszukiwania"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Pulpit graficzny/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -135,11 +140,6 @@ msgstr "Edycja grupy równoległej"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "System/Konfiguracja/Sprzęt"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Sposób ręcznego wyboru serwera zwierciadlanego"
 
@@ -153,6 +153,11 @@ msgstr "Publikowanie"
 msgid "Package installation..."
 msgstr "Instalacja pakietów..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Programowanie/GNOME i GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -169,6 +174,21 @@ msgid "Shells"
 msgstr "Powłoki"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Nauka/Chemia"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Grafika"
@@ -180,11 +200,6 @@ msgstr "Włochy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "System/Jądro i sprzęt"
-
-#: ../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 "Wymagany jest jeden z poniższych pakietów:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Programowanie/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,9 +230,9 @@ msgid "Proxy..."
 msgstr "Pośrednik..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "System/Konfiguracja/Uruchamianie i inicjowanie"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Książki/Literatura"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -327,21 +337,11 @@ msgstr "Hasło:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "System/Serwery"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalacja pakietów oprogramowania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Pulpit graficzny/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "w opisach"
 
@@ -360,6 +360,11 @@ msgstr "Zostanie usuniętych kilka dodatkowych pakietów"
 msgid "All packages, by update availability"
 msgstr "Wszystkie pakiety, według dostępności aktualizacji"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -377,6 +382,11 @@ msgstr "Grecja"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Monitorowanie"
 
@@ -429,11 +439,6 @@ msgstr "Wybierz serwer zwierciadlany..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Pulpit graficzny/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"
@@ -503,6 +508,11 @@ msgstr "Ścieżka:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Pobieranie pakietu \"%s\" (%s/%s)..."
 
@@ -513,6 +523,11 @@ msgstr "Protokół:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Inne"
 
@@ -521,36 +536,31 @@ msgstr "Inne"
 msgid "Sweden"
 msgstr "Szwecja"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Gry/Planszowe"
+
 #: ../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 "Sieć/Przesyłanie plików"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Programowanie/Inne"
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Sprawdzaj..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Gry/Karciane"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -558,23 +568,18 @@ msgstr "Japonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Sieć/Zdalny dostęp"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Podsumowanie: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "System/Czcionki/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Programowanie/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -591,6 +596,11 @@ msgstr "Usuń %s"
 msgid "Importance: "
 msgstr "Ważność: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -633,11 +643,6 @@ msgstr "Nośnik"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "System/Internacjonalizacja"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Rozmiar: "
 
@@ -661,11 +666,6 @@ msgstr "Dodawanie grupy równoległej"
 msgid "Update media"
 msgstr "Aktualizacja nośnika(-ów)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Programowanie/Bazy danych"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -701,6 +701,11 @@ msgstr "Wystąpił problem podczas instalacji"
 msgid "Terminals"
 msgstr "Terminale"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "System/Jądro i sprzęt"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -711,16 +716,6 @@ msgstr "Modyfikuj"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Książki/Inne"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Nauka/Inne"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -743,11 +738,6 @@ msgstr "Badanie zdalnego pliku nośnika \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Gry/Przygodowe"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "w plikach"
 
@@ -758,13 +748,18 @@ msgstr "Wszystkie pakiety, według grupy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Pulpit graficzny/Oparte na FVWM"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Gry/Sportowe"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -777,6 +772,16 @@ msgid "Search results (none)"
 msgstr "Wyniki wyszukiwania (brak)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Gry/Przygodowe"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Archiwizacja/Wypalanie płyt CD"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -796,11 +801,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Zatrzymaj"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Nauka/Biologia"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Proszę czekać, generacja pliku hdlist..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Nauka/Matematyka"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "System/Internacjonalizacja"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -857,6 +877,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finlandia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "System/Czcionki/Bitmapa X11"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -873,14 +898,14 @@ msgid "Save changes"
 msgstr "Zapisz zmiany"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Sieć/Grupy dyskusyjne"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Sieć/Natychmiastowe przesyłanie wiadomości"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Książki/Dokumenty FAQ"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -889,6 +914,11 @@ msgid "More info"
 msgstr "Więcej info"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Książki/Książki komputerowe"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Wyszukaj"
@@ -915,16 +945,6 @@ msgstr "Hiszpania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Nauka/Astronomia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Programowanie/Jądro"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Już istniejące nośniki aktualizacyjne"
 
@@ -935,11 +955,6 @@ msgstr "Plików:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Gry/Przygodowe"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Nie można pobrać pakietów źródłowych."
 
@@ -948,6 +963,11 @@ msgstr "Nie można pobrać pakietów źródłowych."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Możesz podać użytkownika/hasło dla uwierzytelniania pośrednika:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Chiny"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -960,11 +980,6 @@ msgstr "Wymagane są dodatkowe pakiety"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Sieć/Pogawędka"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Uruchamianie w trybie użytkownika"
 
@@ -1027,9 +1042,9 @@ msgid "Find:"
 msgstr "Znajdź:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Programowanie/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "System/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1043,11 +1058,6 @@ msgstr "Napęd wymienny"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Pulpit graficzny/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Przygotowywanie instalacji pakietów..."
 
@@ -1061,21 +1071,11 @@ msgstr "Proszę czekać, usuwanie pakietów..."
 msgid "Please wait, adding medium..."
 msgstr "Proszę czekać, dodawanie nośnika..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Gry/Inne"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Sieć/Inne"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1086,21 +1086,16 @@ msgstr "Belgia"
 msgid "File tools"
 msgstr "Narzędzia plikowe"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Archiwizacja/Wypalanie płyt CD"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Nauka/Biologia"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Konfiguracja serwera proxy"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1108,11 +1103,6 @@ msgstr "Rozpoczynanie pobierania pakietu \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "System/Biblioteki"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Wystąpił poważny błąd: %s."
 
@@ -1126,16 +1116,6 @@ msgstr "Poważny błąd"
 msgid "Leaves only, sorted by install date"
 msgstr "Tylko liście, uporządkowane według daty instalacji"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Gry/Strategia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Programowanie/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1149,14 +1129,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Archiwizacja/Komprecja"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Książki/Literatura"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Nauka/Nauki o Ziemi"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1168,25 +1143,20 @@ msgstr "Wybierz serwer zwierciadlany."
 msgid "Communications"
 msgstr "Komunikacja"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Pulpit graficzny/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Modyfikowanie grupy równoległej \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Przyczyna uaktualnienia:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Komunikacja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Nauka/Matematyka"
+msgid "Reason for update: "
+msgstr "Przyczyna uaktualnienia:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1215,8 +1185,8 @@ msgstr "Problem podczas usuwania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Pulpit graficzny/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1241,29 +1211,54 @@ msgstr "Nie znaleziono pakietu do instalacji."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "Nośnik: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Gry/Strategia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Opis: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Archiwizacja/Inne"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Nauka/Chemia"
+#, fuzzy, c-format
+msgid "System"
+msgstr "System/Podstawowe"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Wszystkie żądane pakiety zostały pomyślnie zainstalowane."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "System/Serwery"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Gry/Puzzle"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1291,11 +1286,6 @@ msgstr "Bazy Danych"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Sieć/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Nazwa: "
 
@@ -1341,8 +1331,8 @@ msgstr "Wideo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Programowanie/GNOME i GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1355,14 +1345,24 @@ msgid "Selected"
 msgstr "Wybrane"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Nauka/Technika komputerowa"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Maksimum informacji"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Archiwizacja/Tworzenie kopii zapasowych"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1418,9 +1418,9 @@ msgid "Bugfixes updates"
 msgstr "Aktualizacje poprawiające błędy"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Sieć/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japonia"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1437,6 +1437,11 @@ msgstr "Proszę czekać, wyszukiwanie dostępnych pakietów..."
 msgid "Cancel"
 msgstr "Anuluj"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Nauka/Inne"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1444,16 +1449,6 @@ msgstr "Włączone?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Nauka/Nauki o Ziemi"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "System/Czcionki/Konsola"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Wszystkie pakiety, alfabetycznie"
 
@@ -1477,16 +1472,6 @@ msgstr "Instalacja zakończona"
 msgid " done."
 msgstr " gotowe."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Programowanie/KDE i Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Books/Dokumenty HOWTO"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1494,15 +1479,15 @@ msgstr "Włóż nośnik, aby kontynuować"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Gry/Planszowe"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Wybrano zbyt wiele pakietów"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Nauka/Fizyka"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "Nic nie rób"
@@ -1512,17 +1497,17 @@ msgstr "Nic nie rób"
 msgid "Danmark"
 msgstr "Dania"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Sieć/Poczta"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Błąd podczas pobierania"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazylia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Pomoc"
@@ -1532,6 +1517,11 @@ msgstr "Pomoc"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Niestety, nie można pobrać pakietów źródłowych. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Gry/Sportowe"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1558,9 +1548,9 @@ msgid "All packages, by medium repository"
 msgstr "Wszystkie pakiety, według repozytorium nośników"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "System/Czcionki/Bitmapa X11"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Archiwizacja/Komprecja"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1572,6 +1562,11 @@ msgstr "Pobieranie pakietu \"%s\", czas zakończenia:%s, szybkość:%s"
 msgid "Add a host"
 msgstr "Dodaj komputer"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Programowanie/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1599,11 +1594,6 @@ msgstr "Zmień nośnik"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Pultpit graficzny/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Usuń zaznaczenie"
 
@@ -1612,6 +1602,11 @@ msgstr "Usuń zaznaczenie"
 msgid "Mandrake Update"
 msgstr "Aktualizacja Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Książki/Dokumenty FAQ"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1628,14 +1623,14 @@ msgstr ""
 "Spróbuj później ponownie."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Książki/Książki komputerowe"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Books/Dokumenty HOWTO"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "System/Podstawowe"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1651,6 +1646,11 @@ msgstr ""
 "Może zachodzić potrzeba aktualizacji bazy danych nośników."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "System/Biblioteki"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1688,24 +1688,14 @@ msgid "Currently installed version: "
 msgstr "Aktualnie zainstalowana wersja:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Programowanie/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "System/Konfiguracja/Drukowanie"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Gry/Puzzle"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Gry/Karciane"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "System/Konfiguracja/Pakowanie"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Nauka/Astronomia"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1729,14 +1719,19 @@ msgstr "Nazwa:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Pulpit graficzny/Inne"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Brak aktualizacji"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Sieć/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1747,6 +1742,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr "Narzędzia tekstowe"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Gry/Karciane"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1758,6 +1763,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Wpisz nazwę komputera do dodania lub jego adres IP:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Gry/Przygodowe"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1767,11 +1777,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Modyfikowanie nośnika \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Sieć/Natychmiastowe przesyłanie wiadomości"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1835,11 +1840,6 @@ msgstr ""
 "To narzędzie pomoże ci wybrać aktualizacje, które możesz chcieć\n"
 "zainstalować na tym komputerze."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "System/Czcionki/True Type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2119,3 +2119,125 @@ msgstr "Usuwanie oprogramowania"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "Menedżer źródeł oprogramowania"
+
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "System/Internacjonalizacja"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Narzędzia plikowe"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Pulpit graficzny/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Nauka/Technika komputerowa"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "System/Serwery"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Bazy Danych"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Pulpit graficzny/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Nauka/Technika komputerowa"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "System/Konfiguracja/Inne"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "System/Konfiguracja/Sieć"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "System/Konfiguracja/Sprzęt"
+
+#~ msgid "Development/Python"
+#~ msgstr "Programowanie/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "System/Konfiguracja/Uruchamianie i inicjowanie"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Pulpit graficzny/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Programowanie/Inne"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "System/Czcionki/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Programowanie/Bazy danych"
+
+#~ msgid "Books/Other"
+#~ msgstr "Książki/Inne"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Pulpit graficzny/Oparte na FVWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "Sieć/Grupy dyskusyjne"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Programowanie/Jądro"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Sieć/Pogawędka"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Programowanie/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Pulpit graficzny/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Gry/Inne"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Sieć/Inne"
+
+#~ msgid "Development/Java"
+#~ msgstr "Programowanie/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Pulpit graficzny/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Archiwizacja/Tworzenie kopii zapasowych"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Sieć/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "System/Czcionki/Konsola"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Sieć/Poczta"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Pultpit graficzny/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Programowanie/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "System/Konfiguracja/Drukowanie"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "System/Konfiguracja/Pakowanie"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Pulpit graficzny/Inne"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "System/Czcionki/True Type"
diff --git a/po/pl.pom b/po/pl.pom
index 1749a563..c9002f8f 100644
--- a/po/pl.pom
+++ b/po/pl.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Stacja robocza"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Środowisko graficzne"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Programowanie"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Serwer"
 
diff --git a/po/pt.po b/po/pt.po
index 64a0a2da..68c5f13e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-pt\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 22:12+0200\n"
 "Last-Translator: Jose Jorge <jose.jorge@oreka.com>\n"
 "Language-Team: portugu�s <pt@li.org>\n"
@@ -26,14 +26,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Arquivar/Outros"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Rede/Acesso remoto"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Por favor aguarde, a actualizar o m�dia..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -41,13 +51,8 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Ci�ncias/Computadores"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Ci�ncias/F�sica"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -64,25 +69,20 @@ msgstr "foi tudo bem instalado"
 msgid "Verifying packages signatures..."
 msgstr "A verificar a assinaturas dos pacotes..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Necessita preencher pelo menos as duas primeiras entradas."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Sistema/Configura��o/Outros"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Rede/Transfer�ncia de ficheiros"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Sistema/Configura��o/Rede"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Desenvolvimento/KDE e 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 "Necessita preencher pelo menos as duas primeiras entradas."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -117,6 +117,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Resultados da Pesquisa"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Ecr� gr�fico/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -142,11 +147,6 @@ msgstr "Editar um grupo paralelo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Sistema/Configura��o/Material"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Como escolher manualmente o seu espelho"
 
@@ -160,6 +160,11 @@ msgstr "Publicar"
 msgid "Package installation..."
 msgstr "A instalar os pacotes..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Desenvolvimento/GNOME e GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -176,6 +181,21 @@ msgid "Shells"
 msgstr "Consolas"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Ci�ncias/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"
@@ -187,11 +207,6 @@ msgstr "It�lia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Sistema/N�cleo e material"
-
-#: ../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 "Um dos pacotes seguintes � preciso:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Desenvolvimento/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -227,9 +237,9 @@ msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Sistema/Configura��o/Arranque e Inicializa��o"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Livros/Literatura"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -333,21 +343,11 @@ msgstr "Senha:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Sistema/Servidores"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Instala��o de Pacotes de Programas"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Ecr� gr�fico/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "nas descri��es"
 
@@ -366,6 +366,11 @@ msgstr "Alguns pacotes adicionais necessitam ser apagados"
 msgid "All packages, by update availability"
 msgstr "Todos os pacotes, por disponibilidade de actualiza��o"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -383,6 +388,11 @@ msgstr "Gr�cia"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Monitoriza��o"
 
@@ -436,11 +446,6 @@ msgstr "Escolha um espelho..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Ecr� 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"
@@ -510,6 +515,11 @@ msgstr "Caminho:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "A descarregar o pacote '%s' (%s/%s)..."
 
@@ -520,6 +530,11 @@ msgstr "Protocolo :"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Outro"
 
@@ -528,36 +543,31 @@ msgstr "Outro"
 msgid "Sweden"
 msgstr "Su�cia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Jogos/Tabuleiros"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "�ustria"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Informa��o..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Rede/Transfer�ncia de ficheiros"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Desenvolvimento/Outros"
+msgid "Info..."
+msgstr "Informa��o..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Inspeccionar..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Jogos/Cartas"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -565,23 +575,18 @@ msgstr "Jap�o"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Rede/Acesso remoto"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Resumo: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Sistema/Tipos de letra/Tipo1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Desenvolvimento/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -598,6 +603,11 @@ msgstr "Remover %s"
 msgid "Importance: "
 msgstr "Import�ncia: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -641,11 +651,6 @@ msgstr "M�dia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Sistema/Internacionaliza��o"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Tamanho: "
 
@@ -669,11 +674,6 @@ msgstr "Adicionar um grupo paralelo"
 msgid "Update media"
 msgstr "Actualizar m�dia"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Desenvolvimento/Bases de Dados"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -709,6 +709,11 @@ msgstr "Problema durante a instala��o"
 msgid "Terminals"
 msgstr "Terminais"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Sistema/N�cleo e material"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -719,16 +724,6 @@ msgstr "Editar"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selec��o: %d MB / Espa�o dispon�vel no disco: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Livros/Outros"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Ci�ncias/Outros"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -751,11 +746,6 @@ msgstr "A examinar o ficheiro distante do m�dia `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Jogos/Aventura"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "nos ficheiros"
 
@@ -766,13 +756,18 @@ msgstr "Todos os pacotes, por grupo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Ecr� gr�fico/Tipo FVWM"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Jogos/Desporto"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -785,6 +780,16 @@ msgid "Search results (none)"
 msgstr "Resultados da Pesquisa (nenhum)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Jogos/Aventura"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Arquivar/Gravar Cd"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -804,11 +809,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Parar"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Ci�ncias/Biologia"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Por favor aguarde, a criar o hdlist..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Ci�ncias/Matem�ticas"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Sistema/Internacionaliza��o"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -866,6 +886,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finl�ndia"
 
+#: ../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:"
@@ -882,14 +907,14 @@ msgid "Save changes"
 msgstr "Gravar altera��es"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Rede/Forum"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Rede/Mensagens Instant�neas"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Livros/Faqs"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -898,6 +923,11 @@ msgid "More info"
 msgstr "Mais informa��es"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Livros/Livros de computadores"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Procurar"
@@ -924,16 +954,6 @@ msgstr "Espanha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Ci�ncias/Astronomia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Desenvolvimento/N�cleo"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Este m�dia de actualiza��o j� existe"
 
@@ -944,11 +964,6 @@ msgstr "Ficheiros:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Jogos/Arcada"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Imposs�vel descarregar os pacotes da fonte"
 
@@ -957,6 +972,11 @@ msgstr "Imposs�vel descarregar os pacotes da fonte"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Pode indicar um utilizador/senha para a autentica��o no proxy :"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "China"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -969,11 +989,6 @@ msgstr "Pacotes adicionais necess�rios"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Rede/Conversar"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Lan�ado em modo utilizador"
 
@@ -1036,9 +1051,9 @@ msgid "Find:"
 msgstr "Procurar:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Desenvolvimento/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Sistema/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1052,11 +1067,6 @@ msgstr "Dispositivo amov�vel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Ecr� gr�fico/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "A preparar a instala��o dos pacotes..."
 
@@ -1070,21 +1080,11 @@ msgstr "Por favor aguarde, a remover os pacotes..."
 msgid "Please wait, adding medium..."
 msgstr "Por favor aguarde, a adicionar o m�dia..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Jogos/Outros"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Utilizador:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Rede/Outros"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1095,21 +1095,16 @@ msgstr "B�lgica"
 msgid "File tools"
 msgstr "Ferramentas de ficheiros"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Arquivar/Gravar Cd"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Ci�ncias/Biologia"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Configurar os proxies"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1117,11 +1112,6 @@ msgstr "A come�ar o descarregamento de '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Sistema/Livrarias"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Um erro fatal ocorreu : %s."
 
@@ -1135,16 +1125,6 @@ msgstr "Erro fatal"
 msgid "Leaves only, sorted by install date"
 msgstr "S� as folhas, por data de instala��o"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Jogos/Estrat�gia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Desenvolvimento/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1159,14 +1139,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Arquivar/Compress�o"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Livros/Literatura"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Ci�ncias/Geo-ci�ncias"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1178,25 +1153,20 @@ msgstr "Por favor escolha o espelho desejado."
 msgid "Communications"
 msgstr "Comunica��es"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Ecr� gr�fico/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Edi��o do grupo paralelo \"%s\" :"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Motivo de actualiza��o: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Comunica��es"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Ci�ncias/Matem�ticas"
+msgid "Reason for update: "
+msgstr "Motivo de actualiza��o: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1225,8 +1195,8 @@ msgstr "Problema durante a remo��o"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Ecr� gr�fico/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1251,29 +1221,54 @@ msgstr "N�o encontrei nenhum pacote a instalar."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "M�dia : "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Jogos/Estrat�gia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Descri��o: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Arquivar/Outros"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Ci�ncias/Qu�mica"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Sistema/Base"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Todos os pacotes pedidos foram instalados com sucesso."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Sistema/Servidores"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Jogos/Puzzles"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1301,11 +1296,6 @@ msgstr "Bases de Dados"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Rede/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Nome: "
 
@@ -1351,8 +1341,8 @@ msgstr "V�deo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Desenvolvimento/GNOME e GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1365,14 +1355,24 @@ msgid "Selected"
 msgstr "Selecionado"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Ci�ncias/Computadores"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Informa��es completas"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Arquivar/Protec��o dos dados"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1428,9 +1428,9 @@ msgid "Bugfixes updates"
 msgstr "Actualiza��es de Correc��o de Erros"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Rede/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Jap�o"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1447,6 +1447,11 @@ msgstr "Por favor aguarde, a procurar os pacotes dispon�veis..."
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Ci�ncias/Outros"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1454,16 +1459,6 @@ msgstr "Activado?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Ci�ncias/Geo-ci�ncias"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Sistema/Tipos de Letra/Consola"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Todos os pacotes, alfabeticamente"
 
@@ -1487,16 +1482,6 @@ msgstr "A instala��o acabou"
 msgid " done."
 msgstr " feito."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Desenvolvimento/KDE e Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Livros/Como fazer"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1504,15 +1489,15 @@ msgstr "Necessita inserir o m�dia para continuar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Jogos/Tabuleiros"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Demasiados pacotes seleccionados"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Ci�ncias/F�sica"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "N�o fazer nada"
@@ -1522,17 +1507,17 @@ msgstr "N�o fazer nada"
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Rede/Correio Electr�nico"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Erro ao descarregar"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
@@ -1542,6 +1527,11 @@ msgstr "Ajuda"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "N�o consigo descarregar os pacotes, lamento. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Jogos/Desporto"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1568,9 +1558,9 @@ msgid "All packages, by medium repository"
 msgstr "Todos os pacotes, por m�dia de origem"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Sistema/Tipos de letra/Bitmap X11"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Arquivar/Compress�o"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1582,6 +1572,11 @@ msgstr "Descarregamento de `%s', tempo restante: %s, velocidade: %s"
 msgid "Add a host"
 msgstr "Adicionar um anfitri�o"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Desenvolvimento/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1609,11 +1604,6 @@ msgstr "Mudar o m�dia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Ecr� gr�fico/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Inicializar a selec��o"
 
@@ -1622,6 +1612,11 @@ msgstr "Inicializar a selec��o"
 msgid "Mandrake Update"
 msgstr "Actualiza��es Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Livros/Faqs"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1638,14 +1633,14 @@ msgstr ""
 "Por favor tente outra vez mais tarde."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Livros/Livros de computadores"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Livros/Como fazer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Sistema/Base"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1661,6 +1656,11 @@ msgstr ""
 "Talvez queira actualizar a base de dados dos seus m�dias."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Sistema/Livrarias"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1698,24 +1698,14 @@ msgid "Currently installed version: "
 msgstr "Vers�o actualmente instalada: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Desenvolvimento/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Sistema/Configura��o/Impress�o"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Jogos/Puzzles"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Jogos/Cartas"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Sistema/Configura��o/Pacotes"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Ci�ncias/Astronomia"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1739,14 +1729,19 @@ msgstr "Nome:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Ecr� gr�fico/Outros"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Nenhuma actualiza��o"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Rede/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1757,6 +1752,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr "Ferramentas de texto"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Jogos/Cartas"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1768,6 +1773,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Escreva o nome ou o endere�o IP do anfitri�o a adicionar :"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Jogos/Arcada"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1777,11 +1787,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "A editar o m�dia \"%s\" :"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Rede/Mensagens Instant�neas"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1845,11 +1850,6 @@ msgstr ""
 "Esta ferramenta vai ajud�-lo a escolher quais as actualiza��es que deseja\n"
 "instalar no seu computador."
 
-#: ../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:"
@@ -2130,6 +2130,128 @@ msgstr "Remover Programas"
 msgid "Software Sources Manager"
 msgstr "Gestor de Fontes de Programas"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Sistema/Internacionaliza��o"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Ferramentas de ficheiros"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Ecr� gr�fico/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Ci�ncias/Computadores"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Sistema/Servidores"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Bases de Dados"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Ecr� gr�fico/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Ci�ncias/Computadores"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Sistema/Configura��o/Outros"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Sistema/Configura��o/Rede"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Sistema/Configura��o/Material"
+
+#~ msgid "Development/Python"
+#~ msgstr "Desenvolvimento/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Sistema/Configura��o/Arranque e Inicializa��o"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Ecr� gr�fico/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Desenvolvimento/Outros"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Sistema/Tipos de letra/Tipo1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Desenvolvimento/Bases de Dados"
+
+#~ msgid "Books/Other"
+#~ msgstr "Livros/Outros"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Ecr� gr�fico/Tipo FVWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "Rede/Forum"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Desenvolvimento/N�cleo"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Rede/Conversar"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Desenvolvimento/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Ecr� gr�fico/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Jogos/Outros"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Rede/Outros"
+
+#~ msgid "Development/Java"
+#~ msgstr "Desenvolvimento/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Ecr� gr�fico/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Arquivar/Protec��o dos dados"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Rede/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Sistema/Tipos de Letra/Consola"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Rede/Correio Electr�nico"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Ecr� gr�fico/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Desenvolvimento/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Sistema/Configura��o/Impress�o"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Sistema/Configura��o/Pacotes"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Ecr� gr�fico/Outros"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Sistema/Tipos de Letra/True type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s em conflito com %s"
 
diff --git a/po/pt.pom b/po/pt.pom
index 22376a67..388a0f6d 100644
--- a/po/pt.pom
+++ b/po/pt.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Esta��o de Trabalho"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Ambiente Gr�fico"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Desenvolvimento"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Servidor"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4f9f9263..0e6a6bcf 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-pt_BR\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 16:30-0300\n"
 "Last-Translator: Tiago da Cruz Bezerra <tiago@grupoking.com.br>\n"
 "Language-Team: Porugu�s do Brasil <linux_pt_BR@yahoogrupos.com.br>\n"
@@ -23,14 +23,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Arquivar/Outros"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Rede/Acesso Remoto"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Aguarde, atualizando fonte"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -38,13 +48,8 @@ msgstr "Canad�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Ci�ncias/Computa��o Cient�fica"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Ci�ncias/F�sicas"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -61,25 +66,20 @@ msgstr "Tudo foi instalado corretamente"
 msgid "Verifying packages signatures..."
 msgstr "Verificando assinatura dos pacotes..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Voc� precisa preencher pelo menos os dois primeiros campos"
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Sistema/Configura��o/Outros"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Rede/Transfer�ncia de Arquivos"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Sistema/Configura��o/Rede"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Desenvolvimento/KDE e 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 "Voc� precisa preencher pelo menos os dois primeiros campos"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -114,6 +114,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Resultados da busca"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Ambiente Gr�fico/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -139,11 +144,6 @@ msgstr "Editar o grupo paralelo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Sistema/Configura��o/Hardware"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Como selecionar manualmente o seu servidor espelho"
 
@@ -157,6 +157,11 @@ msgstr "Publicando"
 msgid "Package installation..."
 msgstr "Instala��o do pacote..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Desenvolvimento/Gnome e GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -173,6 +178,21 @@ msgid "Shells"
 msgstr "Shells"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Ci�ncias/Chemistry"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Gr�ficos"
@@ -184,11 +204,6 @@ msgstr "It�lia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Sistema/Kernel e 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"
@@ -203,11 +218,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Um dos seguintes pacotes � necess�rio"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Desenvolvimento/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -224,9 +234,9 @@ msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Sistema/Configura��o/Boot e Inicializa��o"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Livros/Literatura"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -331,21 +341,11 @@ msgstr "Senha:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Sistema/Servidores"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Instala��o de Pacotes de Software"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Ambiente Gr�fico/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "nas descri��es"
 
@@ -364,6 +364,11 @@ msgstr "Alguns pacotes adicionais precisam ser removidos"
 msgid "All packages, by update availability"
 msgstr "Todos pacotes, por disponibilidade de atualiza��o"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -381,6 +386,11 @@ msgstr "Gr�cia"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Monitorando"
 
@@ -433,11 +443,6 @@ msgstr "Escolha um servidor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Ambiente 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"
@@ -508,6 +513,11 @@ msgstr "Caminho:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Fazendo download do pacote `%s' (%s/%s)..."
 
@@ -518,6 +528,11 @@ msgstr "Protocolo:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Outro"
 
@@ -526,36 +541,31 @@ msgstr "Outro"
 msgid "Sweden"
 msgstr "Su��a"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Jogos/Tabuleiros"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "�ustria"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Informa��o..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Rede/Transfer�ncia de Arquivos"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Desenvolvimento/Outros"
+msgid "Info..."
+msgstr "Informa��o..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Verificando..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Jogos/Cartas"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -563,23 +573,18 @@ msgstr "Jap�o"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Rede/Acesso Remoto"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Resumo: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Sistema/Fontes/Tipo1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Desenvolvimento/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -596,6 +601,11 @@ msgstr "Remover .%s"
 msgid "Importance: "
 msgstr "Import�ncia: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -640,11 +650,6 @@ msgstr "M�dio"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Sistema/Internacionaliza��o"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Tamanho: "
 
@@ -668,11 +673,6 @@ msgstr "Adicionar um grupo paralelo"
 msgid "Update media"
 msgstr "Atualizar fonte(s)"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Desenvolvimento/Base de Dados"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -708,6 +708,11 @@ msgstr "Problemas ocorreram durante a instala��o"
 msgid "Terminals"
 msgstr "Terminais"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Sistema/Kernel e Hardware"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -718,16 +723,6 @@ msgstr "Editar"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selecionado: %d MB / Espa�o dispon�vel: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Livros/Outros"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Ci�ncias/Outros"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -750,11 +745,6 @@ msgstr "Examinando arquivo da fonte '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Jogos/Aventura"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "nos arquivos"
 
@@ -765,13 +755,18 @@ msgstr "Todos os pacotes, por grupo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Ambiente Gr�fico/Baseado no FVWM"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Jogos/Esporte"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -784,6 +779,16 @@ msgid "Search results (none)"
 msgstr "Resultados da busca (nenhum)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Jogos/Aventura"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Arquivar/Queimar CD"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -803,11 +808,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Parar"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Ci�ncias/Biologia"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Aguarde, gerando hdlist..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Ci�ncias/Matem�ticas"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Sistema/Internacionaliza��o"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -868,6 +888,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finl�ndia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Sistema/Fontes/X11 bitmap"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -884,14 +909,14 @@ msgid "Save changes"
 msgstr "Salvar altera��es"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Rede/Not�cias"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Rede/Mensagens Instant�neas"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Livros/FAQ's"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -900,6 +925,11 @@ msgid "More info"
 msgstr "Mais informa��es"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Livros/Livros de Inform�tica"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Procurar"
@@ -926,16 +956,6 @@ msgstr "Espanha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Ci�ncias/Astronomia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Desenvolvimento/Kernel"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Fonte de atualiza��o j� existente"
 
@@ -946,11 +966,6 @@ msgstr "Arquivos:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Jogos/Arcade"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "N�o foi poss�vel obter fontes de pacotes."
 
@@ -959,6 +974,11 @@ msgstr "N�o foi poss�vel obter fontes de pacotes."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Voc� pode especificar um usu�rio e senha para autentica��o no proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "China"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -971,11 +991,6 @@ msgstr "Pacotes adicionais s�o necess�rios"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Rede/Chat"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Executando em modo usu�rio"
 
@@ -1039,9 +1054,9 @@ msgid "Find:"
 msgstr "Localizar:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Desenvolvimento/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Sistema/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1055,11 +1070,6 @@ msgstr "Dispositivo remov�vel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Ambiente Gr�fico/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Preparando pacotes para instala��o..."
 
@@ -1073,21 +1083,11 @@ msgstr "Aguarde, removendo pacotes..."
 msgid "Please wait, adding medium..."
 msgstr "Aguarde, adicionando fonte..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Jogos/Outros"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Rede/Outros"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1098,21 +1098,16 @@ msgstr "B�lgica"
 msgid "File tools"
 msgstr "Ferramentas de arquivos"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Arquivar/Queimar CD"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Ci�ncias/Biologia"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Configurar proxy"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1120,11 +1115,6 @@ msgstr "Iniciando download de `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Sistema/Bibliotecas"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Ocorreu um erro fatal: %s"
 
@@ -1138,16 +1128,6 @@ msgstr "Erro fatal"
 msgid "Leaves only, sorted by install date"
 msgstr "Somente os existentes, classificado pela data de instala��o"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Jogos/Estrat�gia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Desenvolvimento/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1162,14 +1142,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Arquivar/Compress�o"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Livros/Literatura"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Ci�ncias/Geoci�ncias"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1181,25 +1156,20 @@ msgstr "Escolha o servidor desejado."
 msgid "Communications"
 msgstr "Comunica��es"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Ambiente Gr�fico/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Editando o grupo paralelo \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Raz�o para atualiza��o:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Comunica��es"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Ci�ncias/Matem�ticas"
+msgid "Reason for update: "
+msgstr "Raz�o para atualiza��o:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1228,8 +1198,8 @@ msgstr "Problema durante a remo��o"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Ambiente Gr�fico/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1255,29 +1225,54 @@ msgstr "Nenhum pacote encontrado para instala��o."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "M�dia:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Jogos/Estrat�gia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Descri��o: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Arquivar/Outros"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Ci�ncias/Chemistry"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Sistema/Base"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Todos os pacotes requisitados foram instalados com sucesso."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Sistema/Servidores"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Jogos/Puzzles"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1305,11 +1300,6 @@ msgstr "Base de Dados"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Rede/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Nome: "
 
@@ -1355,8 +1345,8 @@ msgstr "V�deo:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Desenvolvimento/Gnome e GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1369,14 +1359,24 @@ msgid "Selected"
 msgstr "Selecionado"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Ci�ncias/Computa��o Cient�fica"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Informa��o m�xima"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Arquivar/C�pia de Seguran�a"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1432,9 +1432,9 @@ msgid "Bugfixes updates"
 msgstr "Atualiza��es para corre��o de erros"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Rede/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Jap�o"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1451,6 +1451,11 @@ msgstr "Aguarde, procurando pacotes dispon�veis..."
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Ci�ncias/Outros"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1458,16 +1463,6 @@ msgstr "Habilitar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Ci�ncias/Geoci�ncias"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Sistema/Fontes/Console"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Todos os pacotes, alfabeticamente"
 
@@ -1491,16 +1486,6 @@ msgstr "Instala��o conclu�da"
 msgid " done."
 msgstr "pronto."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Desenvolvimento/KDE e Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Livros/Como fazer"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1508,15 +1493,15 @@ msgstr "Voc� precisa inserir a m�dia para continuar"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Jogos/Tabuleiros"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Muitos pacotes foram selecionados"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Ci�ncias/F�sicas"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "Ficar parado"
@@ -1526,17 +1511,17 @@ msgstr "Ficar parado"
 msgid "Danmark"
 msgstr "Dinamarca"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Rede/E-mail"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Erro durante o download"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
@@ -1546,6 +1531,11 @@ msgstr "Ajuda"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Imposs�vel pegar os fontes dos pacotes, desculpe. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Jogos/Esporte"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1572,9 +1562,9 @@ msgid "All packages, by medium repository"
 msgstr "Todos os pacotes, por reposit�rio de fontes"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Sistema/Fontes/X11 bitmap"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Arquivar/Compress�o"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1586,6 +1576,11 @@ msgstr "Download de '%s', tempo para terminar: '%s', velocidade: '%s'"
 msgid "Add a host"
 msgstr "Adicionar um host"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Desenvolvimento/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1613,11 +1608,6 @@ msgstr "Alterando fonte"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Ambiente Gr�fico/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Reiniciando a sele��o"
 
@@ -1626,6 +1616,11 @@ msgstr "Reiniciando a sele��o"
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Livros/FAQ's"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1643,14 +1638,14 @@ msgstr ""
 "Por favor tente mais tarde."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Livros/Livros de Inform�tica"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Livros/Como fazer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Sistema/Base"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1664,6 +1659,11 @@ msgstr ""
 "Voc� pode atualizar a sua lista de fontes."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Sistema/Bibliotecas"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1701,24 +1701,14 @@ msgid "Currently installed version: "
 msgstr "Vers�o instalada atualmente: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Desenvolvimento/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Sistema/Configura��o/Impressora"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Jogos/Puzzles"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Jogos/Cartas"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Sistema/Configura��o/Empacotando"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Ci�ncias/Astronomia"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1742,14 +1732,19 @@ msgstr "Nome:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Ambiente Gr�fico/Outros"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Sem atualiza��o"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Rede/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1760,6 +1755,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr "Ferramentas em modo texto"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Jogos/Cartas"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1771,6 +1776,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Digite o nome do host ou endere�o IP que deseja adicionar:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Jogos/Arcade"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1780,11 +1790,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Editando fonte \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Rede/Mensagens Instant�neas"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1848,11 +1853,6 @@ msgstr ""
 "\n"
 "Esta ferramenta ir� ajudar na atualiza��o do seu sistema."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Sistema/Fontes/True type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2137,6 +2137,128 @@ msgstr "Remover software"
 msgid "Software Sources Manager"
 msgstr "Gerenciador de fontes de Software"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Sistema/Internacionaliza��o"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Ferramentas de arquivos"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Ambiente Gr�fico/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Ci�ncias/Computa��o Cient�fica"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Sistema/Servidores"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Base de Dados"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Ambiente Gr�fico/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Ci�ncias/Computa��o Cient�fica"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Sistema/Configura��o/Outros"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Sistema/Configura��o/Rede"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Sistema/Configura��o/Hardware"
+
+#~ msgid "Development/Python"
+#~ msgstr "Desenvolvimento/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Sistema/Configura��o/Boot e Inicializa��o"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Ambiente Gr�fico/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Desenvolvimento/Outros"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Sistema/Fontes/Tipo1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Desenvolvimento/Base de Dados"
+
+#~ msgid "Books/Other"
+#~ msgstr "Livros/Outros"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Ambiente Gr�fico/Baseado no FVWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "Rede/Not�cias"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Desenvolvimento/Kernel"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Rede/Chat"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Desenvolvimento/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Ambiente Gr�fico/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Jogos/Outros"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Rede/Outros"
+
+#~ msgid "Development/Java"
+#~ msgstr "Desenvolvimento/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Ambiente Gr�fico/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Arquivar/C�pia de Seguran�a"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Rede/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Sistema/Fontes/Console"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Rede/E-mail"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Ambiente Gr�fico/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Desenvolvimento/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Sistema/Configura��o/Impressora"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Sistema/Configura��o/Empacotando"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Ambiente Gr�fico/Outros"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Sistema/Fontes/True type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s conflita com %s"
 
diff --git a/po/pt_BR.pom b/po/pt_BR.pom
index a861c56d..7050ee28 100644
--- a/po/pt_BR.pom
+++ b/po/pt_BR.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Esta��o de Trabalho"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Ambiente Gr�fico"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Desenvolvimento"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "servidor"
 
diff --git a/po/ro.po b/po/ro.po
index 030b1372..abaaf0da 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -12,7 +12,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-16 01:08+0200\n"
 "Last-Translator: Ovidiu Constantin <ovidiu.constantin@gmx.net>\n"
 "Language-Team: Romanian Translators for Free Software <rtfs-project@lists."
@@ -23,14 +23,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "�terg .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "V� rog s� a�tepta�i, actualizez mediul..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -38,12 +48,7 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -61,25 +66,20 @@ msgstr "Totul a fost instalat cu succes"
 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 "Trebuie s� completa�i cel pu�in primele dou� intr�ri."
-
 #: ../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 "Trebuie s� completa�i cel pu�in primele dou� intr�ri."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -115,6 +115,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Rezultatele c�ut�rii"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -140,11 +145,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Cum s� selecta�i manual serverul oglind�"
 
@@ -158,6 +158,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Preg�tesc pachetele pentru instalare..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -175,19 +180,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Italia"
+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 "Italia"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -201,11 +216,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Unul din urm�toarele pachete e necesar:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -223,7 +233,7 @@ msgstr "Eroare..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -328,22 +338,12 @@ msgid "Password:"
 msgstr "Parola:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Preg�tesc pachetele pentru instalare..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "�n descrieri"
 
@@ -362,6 +362,11 @@ msgstr "Trebuie �terse unele pachete adi�ionale"
 msgid "All packages, by update availability"
 msgstr "dup� disponibilitatea actualiz�rii"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -378,6 +383,11 @@ msgid "Greece"
 msgstr "Grecia"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Nu f� nimic"
@@ -432,11 +442,6 @@ msgstr "Selectare server oglind�..."
 
 #: ../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"
@@ -506,6 +511,11 @@ msgstr "Cale:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Descarc pachetul `%s' (%s/%s)..."
 
@@ -516,6 +526,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Diverse"
 
@@ -524,36 +539,31 @@ msgstr "Diverse"
 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 "Informa�ii... "
+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 "Informa�ii... "
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Inspectez..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -561,22 +571,17 @@ msgstr "Japonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Sumar: "
 
 #: ../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
@@ -594,6 +599,11 @@ msgstr "�terg .%s"
 msgid "Importance: "
 msgstr "Importan��: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -637,11 +647,6 @@ msgstr "Belgia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "M�rime: "
 
@@ -665,11 +670,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Actualizare surse"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -705,6 +705,11 @@ msgstr "Probleme ap�rute �n timpul instal�rii"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -715,16 +720,6 @@ msgstr "Editeaz�"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Selectat: %d MB / Spa�iu liber pe disc: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Diverse"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -747,11 +742,6 @@ msgstr "Examinez fi�ierul pentru sursa `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "�n fi�iere "
 
@@ -762,12 +752,17 @@ msgstr "Toate pachetele,"
 
 #: ../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
@@ -782,6 +777,16 @@ msgstr "Rezultatele c�ut�rii (nimic)"
 
 #: ../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"
@@ -801,11 +806,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Opre�te"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "V� rog s� a�tepta�i, actualizez mediul..."
 
+#: ../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 "Finlanda"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -878,12 +903,12 @@ msgstr "Salveaz� schimb�rile"
 
 #: ../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
@@ -894,6 +919,11 @@ msgstr "Mai multe informa�ii"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "C�utare"
 
@@ -918,16 +948,6 @@ msgid "Spain"
 msgstr "Spania"
 
 #: ../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 "Eroare la ad�ugarea mediului de actualizare"
@@ -939,11 +959,6 @@ msgstr "Fi�iere:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Nu pot prelua pachetele surs�."
 
@@ -952,6 +967,11 @@ msgstr "Nu pot prelua pachetele surs�."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Pute�i specifica un utilizator/parol� pentru autentificarea la proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "China"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -964,11 +984,6 @@ msgstr "Pachete adi�ionale necesare"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1026,7 +1041,7 @@ msgstr "Caut�:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1040,11 +1055,6 @@ msgid "Removable device"
 msgstr "Dispozitiv deta�abil"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Preg�tesc pachetele pentru instalare..."
@@ -1059,21 +1069,11 @@ msgstr "V� rog s� a�tepta�i, �terg pachetele..."
 msgid "Please wait, adding medium..."
 msgstr "V� rog s� a�tepta�i, adaug mediul..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Diverse"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Logare:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1084,21 +1084,16 @@ msgstr "Belgia"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Configurare proxy-uri"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Configurare proxy-uri"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1106,11 +1101,6 @@ msgstr "Verific semn�tura digital� pt: `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1124,16 +1114,6 @@ msgstr "Eroare fi�ier"
 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 ""
@@ -1145,12 +1125,7 @@ msgstr "Nu pot actualiza mediul, el va fi dezactivat automat."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1163,25 +1138,20 @@ msgstr "V� rog s� selecta�i serverul oglind� dorit."
 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 "Editez sursa \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Motivul actualiz�rii:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Configurare surse"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Motivul actualiz�rii:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1210,7 +1180,7 @@ msgstr "Problem� �n timpul �tergerii"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1236,22 +1206,37 @@ msgstr "Preg�tesc pachetele pentru instalare..."
 
 #: ../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 "Descriere:"
 
 #: ../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
@@ -1259,6 +1244,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Toate pachetele cerute au fost instalate cu succes."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, 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 ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Nume: "
 
@@ -1336,7 +1326,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1351,12 +1341,22 @@ msgstr "Selectate"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Informa�ii maximale"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1413,9 +1413,9 @@ msgid "Bugfixes updates"
 msgstr "Actualiz�ri pentru corectarea erorilor"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japonia"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1432,20 +1432,15 @@ msgstr "V� rog s� a�tepta�i, caut pachetele disponibile..."
 msgid "Cancel"
 msgstr "Renun��"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Activat?"
-
 #: ../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 "Activat?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1472,16 +1467,6 @@ msgstr "Instalare terminat�"
 msgid " done."
 msgstr " terminat."
 
-#: ../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"
@@ -1489,13 +1474,13 @@ msgstr "Trebuie s� introduce�i mediul pentru a continua"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Sunt selectate prea multe pachete"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Sunt selectate prea multe pachete"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1507,17 +1492,17 @@ msgstr "Nu f� nimic"
 msgid "Danmark"
 msgstr "Danemarca"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Eroare �n timpul desc�rc�rii."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazilia"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Ajutor"
@@ -1527,6 +1512,11 @@ msgstr "Ajutor"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Regret, trebuie s� fi�i root pentru a instala pachete."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1554,7 +1544,7 @@ msgstr "dup� surs�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1567,6 +1557,11 @@ msgstr "Descarc `%s', timp r�mas: %s, vitez�: %s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1594,11 +1589,6 @@ msgstr "Schimb� mediul"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Reseteaz� selec�ia"
 
@@ -1607,6 +1597,11 @@ msgstr "Reseteaz� selec�ia"
 msgid "Mandrake Update"
 msgstr "Actualizare Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Diverse"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1624,12 +1619,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
@@ -1645,6 +1640,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1681,23 +1681,13 @@ msgid "Currently installed version: "
 msgstr "Versiunea instalat� curent:"
 
 #: ../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 "Diverse"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1722,7 +1712,7 @@ msgstr "Nume:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1730,6 +1720,11 @@ msgstr ""
 msgid "No update"
 msgstr "Nu sunt actualiz�ri"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Nu f� nimic"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1740,6 +1735,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:"
@@ -1752,6 +1757,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1760,11 +1770,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Editez sursa \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1829,11 +1834,6 @@ msgstr ""
 "care dori�i \n"
 "s� le actualiza�i ."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2116,6 +2116,10 @@ msgid "Software Sources Manager"
 msgstr "Administrator surse de programe"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "Server FTP"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "e �n conflict cu"
 
diff --git a/po/ro.pom b/po/ro.pom
index 77d951af..8d4b13ff 100644
--- a/po/ro.pom
+++ b/po/ro.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Sta�ie de lucru"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Mediu Grafic"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Dezvoltare"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/rpmdrake.pot b/po/rpmdrake.pot
index d05968ad..4c340f91 100644
--- a/po/rpmdrake.pot
+++ b/po/rpmdrake.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,7 +16,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remote access"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
@@ -24,19 +29,19 @@ msgstr ""
 msgid "Please wait, updating media..."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Canada"
+msgid "FVWM based"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Sciences/Computer science"
+msgid "Canada"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -54,24 +59,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"
+msgid "KDE and Qt"
 msgstr ""
 
-#: ../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
@@ -103,6 +103,11 @@ msgstr ""
 msgid "Search results"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -124,22 +129,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
+msgid "How to choose manually your mirror"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
+msgid "Publishing"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Publishing"
+msgid "Package installation..."
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Package installation..."
+msgid "GNOME and GTK+"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -159,17 +164,27 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
+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 ""
 
 #: ../rpmdrake:1
@@ -185,11 +200,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:"
@@ -207,7 +217,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -297,21 +307,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 ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr ""
 
@@ -330,6 +330,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"
@@ -347,6 +352,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr ""
 
@@ -398,11 +408,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"
@@ -463,6 +468,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -473,6 +483,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr ""
 
@@ -481,24 +496,24 @@ msgstr ""
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
+msgid "Boards"
 msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
+msgid "Austria"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
+msgid "Info..."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -506,11 +521,6 @@ msgstr ""
 msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -518,22 +528,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
@@ -551,6 +556,11 @@ msgstr ""
 msgid "Importance: "
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -583,11 +593,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr ""
 
@@ -611,11 +616,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..."
@@ -651,24 +651,19 @@ msgstr ""
 msgid "Terminals"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Edit"
-msgstr ""
-
 #: ../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
 #, c-format
-msgid "Books/Other"
+msgid "Edit"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Other"
+msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -693,27 +688,27 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
+msgid "in files"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
+msgid "All packages, by group"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, by group"
+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
@@ -728,6 +723,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"
@@ -741,11 +746,26 @@ msgstr ""
 msgid "Stop"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, 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
 #, c-format
 msgid "Edit a medium"
@@ -794,6 +814,11 @@ msgstr ""
 msgid "Finland"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -811,12 +836,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
@@ -827,6 +852,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr ""
 
@@ -847,16 +877,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 ""
 
@@ -867,11 +887,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr ""
 
@@ -880,19 +895,19 @@ msgstr ""
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
+msgid "Chat"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Additional packages needed"
+msgid "Update"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
+msgid "Additional packages needed"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -946,7 +961,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -961,11 +976,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr ""
 
@@ -979,21 +989,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"
@@ -1004,19 +1004,14 @@ msgstr ""
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
+msgid "Configure proxies"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
+msgid "Printing"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1026,11 +1021,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1044,16 +1034,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
 #, c-format
 msgid ""
@@ -1065,12 +1045,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1083,11 +1058,6 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
@@ -1095,12 +1065,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
+msgid "Configuration"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
+msgid "Reason for update: "
 msgstr ""
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
@@ -1130,7 +1100,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1153,22 +1123,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
+#, c-format
 msgid "Description: "
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1176,6 +1161,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"
@@ -1203,11 +1198,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr ""
 
@@ -1248,7 +1238,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1263,12 +1253,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
@@ -1322,7 +1322,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/WWW"
+msgid "Java"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -1340,19 +1340,14 @@ 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"
+msgid "Enabled?"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1380,16 +1375,6 @@ 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"
@@ -1397,12 +1382,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
@@ -1415,14 +1400,14 @@ msgstr ""
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Networking/Mail"
+msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
+msgid "Mail"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1435,6 +1420,11 @@ msgstr ""
 msgid "Unable to get source packages, sorry. %s"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1462,7 +1452,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1475,6 +1465,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1502,17 +1497,17 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
+msgid "Reset the selection"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
+msgid "Mandrake Update"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake Update"
+msgid "Books"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1527,12 +1522,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
@@ -1546,6 +1541,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1577,22 +1577,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C++"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
+msgid "Games"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Puzzles"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1617,7 +1607,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1625,6 +1615,11 @@ msgstr ""
 msgid "No update"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking"
+msgstr ""
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1635,6 +1630,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
 #, c-format
 msgid "Group name:"
@@ -1647,17 +1652,17 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
+msgid "Arcade"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing medium \"%s\":"
+msgid "rpmdrake"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Networking/Instant messaging"
+msgid "Editing medium \"%s\":"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1
@@ -1719,11 +1724,6 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
diff --git a/po/ru.po b/po/ru.po
index 76961ad8..96b54051 100644
--- a/po/ru.po
+++ b/po/ru.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-05-27 23:56+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <cooker-i18n@linux-mandrake.com >\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
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "���������� ������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -136,11 +141,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "��� ������� ������� ���� �������"
 
@@ -154,6 +154,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:"
@@ -171,19 +176,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, 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
+#, c-format
+msgid "Italy"
+msgstr "������"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -197,11 +212,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:"
@@ -219,7 +229,7 @@ msgstr "������..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -324,21 +334,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 ""
-
-#: ../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"
@@ -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.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"
@@ -556,22 +566,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
@@ -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."
@@ -632,11 +642,6 @@ msgstr "��������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "������: "
 
@@ -660,11 +665,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..."
@@ -700,6 +700,11 @@ msgstr "�� ����� ��������� �������� ��������"
 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 "�������������"
 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"
@@ -742,11 +737,6 @@ msgstr "��������� ���� ��������� `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "� ������"
 
@@ -757,12 +747,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
@@ -777,6 +772,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"
@@ -794,11 +799,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"
@@ -859,6 +879,11 @@ msgstr ""
 msgid "Finland"
 msgstr "���������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Media limit:"
@@ -876,12 +901,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
@@ -892,6 +917,11 @@ msgstr "�������������"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "�����"
 
@@ -916,16 +946,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 "��� ������������ ��������� ����������"
@@ -937,11 +957,6 @@ msgstr "�����:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "���������� �������� �������� ������."
 
@@ -950,6 +965,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"
@@ -962,11 +982,6 @@ msgstr "��������� �������������� ������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1030,7 +1045,7 @@ msgstr "�����:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1045,11 +1060,6 @@ msgstr "������� ����������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "���������� � ��������� �������..."
 
@@ -1063,21 +1073,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"
@@ -1088,21 +1088,16 @@ msgstr "�������"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "��������� ������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "��������� ������"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1110,11 +1105,6 @@ msgstr "���������� �������� `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "��������� ����������� ������: %s."
 
@@ -1128,16 +1118,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
 #, 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 "����������, �������� �������������� �������."
 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
@@ -1218,7 +1188,7 @@ msgstr "�������� �� ����� ��������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1243,23 +1213,38 @@ msgid "No package found for installation."
 msgstr "�� ������ ����� ��� ���������."
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Medium: "
 msgstr "��������:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Description: "
 msgstr "��������:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s ��"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1267,6 +1252,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"
@@ -1294,11 +1289,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "��������: "
 
@@ -1344,7 +1334,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1359,12 +1349,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
@@ -1421,9 +1421,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
@@ -1440,20 +1440,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
@@ -1480,16 +1475,6 @@ 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"
@@ -1497,13 +1482,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
@@ -1515,17 +1500,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 "�������"
@@ -1535,6 +1520,11 @@ msgstr "�������"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "� ��������� ���������� �������� ������ � �����������. %s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1562,7 +1552,7 @@ msgstr "�� ��������� ���������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1575,6 +1565,11 @@ msgstr "�������� `%s', �������� �������:%s, ��������:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1602,11 +1597,6 @@ msgstr "�������� ��������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "�������� �����"
 
@@ -1615,6 +1605,11 @@ msgstr "�������� �����"
 msgid "Mandrake Update"
 msgstr "���������� Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "������"
+
 #: ../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
@@ -1653,6 +1648,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1689,23 +1689,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
@@ -1730,7 +1720,7 @@ msgstr "���:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1738,6 +1728,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"
@@ -1748,6 +1743,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:"
@@ -1760,6 +1765,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1768,11 +1778,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"
@@ -1836,11 +1841,6 @@ msgstr ""
 "���� ���������� ������� ��� ������� ���������� ��� ��������� �� ���\n"
 "���������."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2122,6 +2122,10 @@ msgstr "�������� ��������"
 msgid "Software Sources Manager"
 msgstr "�������� ���������� ��������"
 
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP ������"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s ����������� � %s"
 
diff --git a/po/ru.pom b/po/ru.pom
index 03b2a8f8..3e0e895a 100644
--- a/po/ru.pom
+++ b/po/ru.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/sk.po b/po/sk.po
index 773dd97f..ef1299b4 100644
--- a/po/sk.po
+++ b/po/sk.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-03-11 19:46--100\n"
 "Last-Translator: Tibor Pittich <Tibor.Pittich@phuture.sk>\n"
 "Language-Team: Slovak <i18n@mandrake.sk>\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 "Odstrániť .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Prosím čakajte, aktualizujem média..."
 
+#: ../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,25 +62,20 @@ msgstr "všetko bolo úspešne nainštalované"
 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 "Je potrebné vyplniť najmenej prvé dve položky."
-
 #: ../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 "Je potrebné vyplniť najmenej prvé dve položky."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Výsledky vyhľadávania"
 
+#: ../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 "Ako si zvoliť miror manuálne"
 
@@ -153,6 +153,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Príprava balíčkov na inštaláciu..."
 
+#: ../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 "Taliansko"
+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 "Taliansko"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -196,11 +211,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Jeden z nasledujúcich balíčkov je potrebný:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -218,7 +228,7 @@ msgstr "Chyba..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -321,22 +331,12 @@ msgid "Password:"
 msgstr "Heslo:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Príprava balíčkov na inštaláciu..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "v popisoch"
 
@@ -355,6 +355,11 @@ msgstr "Je potrebné odstrániť niektoré balíčky"
 msgid "All packages, by update availability"
 msgstr "podľa dostupnosti zdroja"
 
+#: ../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 "Grécko"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Neurobiť nič"
@@ -423,11 +433,6 @@ msgstr "Zvoľte si miror..."
 
 #: ../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"
@@ -497,6 +502,11 @@ msgstr "Cesta:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Sťahovanie balíčka `%s' (%s/%s)..."
 
@@ -507,6 +517,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Iné"
 
@@ -515,36 +530,31 @@ msgstr "Iné"
 msgid "Sweden"
 msgstr "Švédsko"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Rakúsko"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "Rakúsko"
 
 #: ../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 "Preveriť.."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -552,22 +562,17 @@ msgstr "Japonsko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Stručný obsah: "
 
 #: ../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
@@ -585,6 +590,11 @@ msgstr "Odstrániť .%s"
 msgid "Importance: "
 msgstr "Dôležitosť: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -627,11 +637,6 @@ msgstr "Belgicko"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Veľkosť: "
 
@@ -655,11 +660,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Aktualizácia zdrojov"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -695,6 +695,11 @@ msgstr "Vyskytol sa problém počas inštalácie"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -705,16 +710,6 @@ msgstr "Zmeň"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Vybrané: %d MB / Dostupné: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Iné"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -737,11 +732,6 @@ msgstr "Preverujem súbory zo zdroja '%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "v súboroch"
 
@@ -752,12 +742,17 @@ msgstr "Všetky 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
@@ -772,6 +767,16 @@ msgstr "Výsledky vyhľadávania (žiadne)"
 
 #: ../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"
@@ -791,11 +796,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 čakajte, aktualizujem média..."
 
+#: ../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"
@@ -850,6 +870,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Fínsko"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -867,12 +892,12 @@ msgstr "Uložiť zmeny"
 
 #: ../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
@@ -883,6 +908,11 @@ msgstr "Viac informácií"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Hľadať"
 
@@ -907,16 +937,6 @@ msgid "Spain"
 msgstr "Španielsko"
 
 #: ../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 pri pridávaní média"
@@ -928,11 +948,6 @@ msgstr "Súbory:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Nie je možné prebrať zdrojové balíčky."
 
@@ -941,6 +956,11 @@ msgstr "Nie je možné prebrať zdrojové balíčky."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Môžete zadať užívateľské meno/heslo pre proxy autentifikáciu:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Čína"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -953,11 +973,6 @@ msgstr "Sú potrebné ďalšie balíčky"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1014,7 +1029,7 @@ msgstr "Hľadaj:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1028,11 +1043,6 @@ msgid "Removable device"
 msgstr "Vymeniteľné zariadenie"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Príprava balíčkov na inštaláciu..."
@@ -1047,21 +1057,11 @@ msgstr "Prosím čakajte, odstraňujú balíčky..."
 msgid "Please wait, adding medium..."
 msgstr "Prosím čakajte, pridávam médium..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Iné"
-
 #: ../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"
@@ -1072,21 +1072,16 @@ msgstr "Belgicko"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Nastaviť proxy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Nastaviť proxy"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1094,11 +1089,6 @@ msgstr "Overovanie signatúry `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1112,16 +1102,6 @@ msgstr "Chyba súboru"
 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 ""
@@ -1133,12 +1113,7 @@ msgstr "Nemôžem aktualizovať médium; bude automaticky zakázané."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1151,25 +1126,20 @@ msgstr "Prosím zvoľte si jeden z mirorov."
 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 "Zmena zdroja \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Dôvod pre aktualizáciu:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Nastaviť zdroje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Dôvod pre aktualizáciu:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1198,7 +1168,7 @@ msgstr "Problém počas odstraňovania"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1224,22 +1194,37 @@ msgstr "Príprava balíčkov na inštaláciu..."
 
 #: ../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
@@ -1247,6 +1232,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Všetky požadované balíčky boli úspešne nainštalované."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1274,11 +1269,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Názov: "
 
@@ -1324,7 +1314,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1339,12 +1329,22 @@ msgstr "Vybrané"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Maximálne informácie"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1401,9 +1401,9 @@ msgid "Bugfixes updates"
 msgstr "Aktualizácie opravujúce chyby"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japonsko"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1420,20 +1420,15 @@ msgstr "Prosím čakajte, hľadám dostupné balíčky..."
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: ../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
@@ -1460,16 +1455,6 @@ msgstr "Inštalácia ukončená"
 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"
@@ -1477,13 +1462,13 @@ msgstr "Vložte médium ak chcete pokračovať"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Vybrali ste príliš veľa balíčkov"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Vybrali ste príliš veľa balíčkov"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1495,17 +1480,17 @@ msgstr "Neurobiť nič"
 msgid "Danmark"
 msgstr "Dánsko"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Chyba počas sťahovania"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazília"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Pomoc"
@@ -1515,6 +1500,11 @@ msgstr "Pomoc"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Na inštaláciu balíčkov musíte byť root, prepáčte."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1542,7 +1532,7 @@ msgstr "podľa zdroja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1555,6 +1545,11 @@ msgstr "Získavanie '%s', čas do konca: %s, rýchlosť: %s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1582,11 +1577,6 @@ msgstr "Vymeniť médium"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Zrušiť výber"
 
@@ -1595,6 +1585,11 @@ msgstr "Zrušiť výber"
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Iné"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1612,12 +1607,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
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1669,23 +1669,13 @@ msgid "Currently installed version: "
 msgstr "Aktuálne nainštalovaná verzia:"
 
 #: ../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 "Iné"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1710,7 +1700,7 @@ msgstr "Meno:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1718,6 +1708,11 @@ msgstr ""
 msgid "No update"
 msgstr "Žiadna aktualizácia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Neurobiť nič"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1728,6 +1723,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:"
@@ -1740,6 +1745,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1748,11 +1758,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Zmena zdroja \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1817,11 +1822,6 @@ msgstr ""
 "Vášho\n"
 "počítača."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2104,6 +2104,10 @@ msgid "Software Sources Manager"
 msgstr "Manažér zdrojov softvéru"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP server"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "konfliktuje s"
 
diff --git a/po/sk.pom b/po/sk.pom
index 1cfceee9..9bc1eb85 100644
--- a/po/sk.pom
+++ b/po/sk.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Pracovná stanica"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafické prostredie"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Vývojárska"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/sl.po b/po/sl.po
index 9509375a..24ba062c 100644
--- a/po/sl.po
+++ b/po/sl.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-01 12:27+0100\n"
 "Last-Translator: Gregor Pirnaver <gregor.pirnaver@email.si>\n"
 "Language-Team: Sloven��ina <lugos-slo@lugos.si>\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 "Odstrani .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Prosim po�akajte, medij se obnavlja..."
 
+#: ../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,25 +62,20 @@ msgstr "vse je bilo pravilno name��eno"
 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 "Izpolniti morate najmanj prvi dve polji."
-
 #: ../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 "Izpolniti morate najmanj prvi dve polji."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Rezultati iskanja"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -136,11 +141,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kako ro�no izbrati zrcalni stre�nik"
 
@@ -154,6 +154,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Pripravljam pakete za namestitev..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -171,6 +176,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 ""
 
@@ -181,11 +201,6 @@ msgstr "Namesti"
 
 #: ../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"
@@ -197,11 +212,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Potrebujete enega od naslednjih paketov:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -219,7 +229,7 @@ msgstr "Napaka..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -324,22 +334,12 @@ msgid "Password:"
 msgstr "Geslo:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Pripravljam pakete za namestitev..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "v opisih"
 
@@ -358,6 +358,11 @@ msgstr "Nekaj dodatnih paketov je potrebno odstraniti"
 msgid "All packages, by update availability"
 msgstr "po dostopnih nadgradnjah"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -374,6 +379,11 @@ msgid "Greece"
 msgstr "Gr�ija"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Ne naredi ni�"
@@ -428,11 +438,6 @@ msgstr "Izberite zrcalni stre�nik:"
 
 #: ../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 "Pot:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Prena�am paket `%s' (%s/%s)..."
 
@@ -511,6 +521,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Drugo"
 
@@ -519,36 +534,31 @@ msgstr "Drugo"
 msgid "Sweden"
 msgstr "�vedska"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Avstrija"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Austria"
+msgstr "Avstrija"
 
 #: ../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 "Preverjam..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -556,22 +566,17 @@ msgstr "Japonska"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Povzetek:"
 
 #: ../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 "Odstrani .%s"
 msgid "Importance: "
 msgstr "Pomembnost:"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -631,11 +641,6 @@ msgstr "Belgija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Velikost: "
 
@@ -659,11 +664,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Obnovi vir(e)"
 
-#: ../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 "Problem se je pojavil med namestitvijo"
 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 "Uredi"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izbrano: %d MB / Prosti disk: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Drugo"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -741,11 +736,6 @@ msgstr "Pregled datoteke vira `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "v datotekah"
 
@@ -756,12 +746,17 @@ msgstr "Vsi paketi,"
 
 #: ../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 "Rezultati iskanja (brez)"
 
 #: ../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 "Ustavi"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Prosim po�akajte, medij se obnavlja..."
 
+#: ../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:"
@@ -871,12 +896,12 @@ msgstr "Shrani spremembe"
 
 #: ../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
@@ -887,6 +912,11 @@ msgstr "Ve� informacij"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Iskanje"
 
@@ -911,16 +941,6 @@ msgid "Spain"
 msgstr "�panija"
 
 #: ../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 "Napaka pri dodajanju medija za nadgradnje (update)"
@@ -932,11 +952,6 @@ msgstr "Datoteke:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Dostop do paketov vira ni mogo�."
 
@@ -945,6 +960,11 @@ msgstr "Dostop do paketov vira ni mogo�."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Lahko dolo�ite uporabnika/geslo za proksi overitev (authentication):"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kitajska"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -957,11 +977,6 @@ msgstr "Potrebni so dodatni paketi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1019,7 +1034,7 @@ msgstr "Najdi:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1033,11 +1048,6 @@ msgid "Removable device"
 msgstr "Naprava oz. pogon"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Pripravljam pakete za namestitev..."
@@ -1052,21 +1062,11 @@ msgstr "Prosim po�akajte, paketi se odstranjujejo..."
 msgid "Please wait, adding medium..."
 msgstr "Pro"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Drugo"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Uporabni�ko ime:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1077,21 +1077,16 @@ msgstr "Belgija"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Nastavite proksije"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Nastavite proksije"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1099,11 +1094,6 @@ msgstr "Preverjanje podpisa `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1117,16 +1107,6 @@ msgstr "Datote�na napaka"
 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 ""
@@ -1138,12 +1118,7 @@ msgstr "Ni mo�no obnoviti medija, zato bo samodejno onemogo�en"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1156,25 +1131,20 @@ msgstr "Prosim izberite �eljen zrcalni stre�nik"
 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 "Uredi vir \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Razlog za nadgradnjo: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Nastavite vire"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Razlog za nadgradnjo: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1203,7 +1173,7 @@ msgstr "Te�ave med odstranjevanjem"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1229,22 +1199,37 @@ msgstr "Pripravljam pakete za namestitev..."
 
 #: ../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 "Opis:"
 
 #: ../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
@@ -1252,6 +1237,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Vsi zahtevani paketi so bil uspe�no name��eni."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1279,11 +1274,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Ime: "
 
@@ -1329,7 +1319,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1344,12 +1334,22 @@ msgstr "Izbran"
 
 #: ../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
@@ -1406,9 +1406,9 @@ msgid "Bugfixes updates"
 msgstr "Popravki napak"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japonska"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1425,20 +1425,15 @@ msgstr "Prosim po�akajte, i��em dostopne pakete..."
 msgid "Cancel"
 msgstr "Prekli�i"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Omogo�en?"
-
 #: ../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 "Omogo�en?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1465,16 +1460,6 @@ msgstr "Namestitev je kon�ana"
 msgid " done."
 msgstr " opravljeno."
 
-#: ../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 "Za nadaljevanje morate vstaviti medij"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Preve� paketov je izbranih"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Preve� paketov je izbranih"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1500,17 +1485,17 @@ msgstr "Ne naredi ni�"
 msgid "Danmark"
 msgstr "Danska"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Napaka pri prenosu"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazilija"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Pomo�"
@@ -1520,6 +1505,11 @@ msgstr "Pomo�"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Za name��ane paketov morate biti root."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1547,7 +1537,7 @@ msgstr "po skladi��ih virov"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1560,6 +1550,11 @@ msgstr "Prenos `%s', preostanek �asa:%s, hitrost:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1587,11 +1582,6 @@ msgstr "Zamenjajte medij"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Ponastavi izbiro"
 
@@ -1600,6 +1590,11 @@ msgstr "Ponastavi izbiro"
 msgid "Mandrake Update"
 msgstr "Mandrake nadgradnja"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Drugo"
+
 #: ../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"
@@ -1674,23 +1674,13 @@ msgid "Currently installed version: "
 msgstr "Trenutno name��ena razli�ica: "
 
 #: ../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 "Drugo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1715,7 +1705,7 @@ msgstr "Ime:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1723,6 +1713,11 @@ msgstr ""
 msgid "No update"
 msgstr "Brez nadgradnje"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Ne naredi ni�"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1733,6 +1728,16 @@ msgstr "V redu"
 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:"
@@ -1745,6 +1750,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1753,11 +1763,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Uredi vir \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1821,11 +1826,6 @@ msgstr ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2109,6 +2109,10 @@ msgid "Software Sources Manager"
 msgstr "Upravnik virov programske opreme"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP stre�nik"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "je v sporu z"
 
diff --git a/po/sl.pom b/po/sl.pom
index 26d50c57..8654dabc 100644
--- a/po/sl.pom
+++ b/po/sl.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Nastavitev zaslona"
+
+# 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 "stre�nik"
 
diff --git a/po/sq.po b/po/sq.po
index 57d534f6..7f1b0dcd 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\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-11-27 21:45:+0100\n"
 "Last-Translator: Naim Daka <naim70@freesurf>\n"
 "Language-Team: Albanian <LL@li.org>\n"
@@ -19,14 +19,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Arkivimi/Tjet�r"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Punim rrjeti/Hyrje e larg�t"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Nj� moment ju lutemi, azhurnimi i burimeve..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -34,13 +44,8 @@ msgstr "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Shkencat/Shkenc� kompjuterike"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Shkencat/Fizike"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -57,25 +62,20 @@ msgstr "gjdo gj� �sht� instaluar si duhet"
 msgid "Verifying packages signatures..."
 msgstr "Verifikimi i n�nshkrimeve t� pakove..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Ju duhet ti mbushni m� s� paku dy hyrje t� para."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Sistemi/Konfigurimi/Tjet�r"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Punim rrjeti/Transferimi i skedares"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Sistemi/Konfigurimi/Rrjeti"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Nd�rtimi/KDE dhe Qt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "Sistemi/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Ju duhet ti mbushni m� s� paku dy hyrje t� para."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "K�rkues i rezultateve"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Tryez� Grafike/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -135,11 +140,6 @@ msgstr "Botoje grupin paralel"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Sistemi/Konfigurimi/Hardveri"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Si ta zgjedhni pasqyr�n tuaj vet�"
 
@@ -153,6 +153,11 @@ msgstr "Publikimi"
 msgid "Package installation..."
 msgstr "Instalimi i pakos..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Nd�rtimi/GNOME dhe GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -169,6 +174,21 @@ msgid "Shells"
 msgstr "Shellet"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Shkencat/Kimike"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Grafike"
@@ -180,11 +200,6 @@ msgstr "Italia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Sistemi/B�rthama dhe hardveri"
-
-#: ../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 "Nj� nga pakot vijuese �sht� e nevojshme:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Nd�rtimi/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,9 +230,9 @@ msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Sistemi/Konfigurimi/Boot dhe Hyrja"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Librat/Literatura"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -327,21 +337,11 @@ msgstr "Parulla:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Sistemi/Sever�t"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalimi i Pakove Software"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Tryez� Grafike/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "mes p�rshkrimeve"
 
@@ -360,6 +360,11 @@ msgstr "Disa nga pakot e mbledhura duhet t� zhduken"
 msgid "All packages, by update availability"
 msgstr "Gjitha pakot, simbas azhurnimit jan� t� lira"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -377,6 +382,11 @@ msgstr "Greqia"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "V�shtrimi"
 
@@ -431,11 +441,6 @@ msgstr "Zgjedheni nj� pasqyre..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Treyz� grafike/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"
@@ -507,6 +512,11 @@ msgstr "Shtegu:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Shkarkimi i pakos `%s' (%s/%s)..."
 
@@ -517,6 +527,11 @@ msgstr "Protokoli:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Tjetri"
 
@@ -525,36 +540,31 @@ msgstr "Tjetri"
 msgid "Sweden"
 msgstr "Suedia"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Loj�ra/Boards"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Infomacion..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Punim rrjeti/Transferimi i skedares"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Nd�rtimi/Tjet�r"
+msgid "Info..."
+msgstr "Infomacion..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Inspektim..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Loj�ra/Letrat"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -562,23 +572,18 @@ msgstr "Japonia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Punim rrjeti/Hyrje e larg�t"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Titulli: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Sistemi/Polisa/Tipi1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Nd�rtimi/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -595,6 +600,11 @@ msgstr "Zhduke .%s"
 msgid "Importance: "
 msgstr "R�nd�sia: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -639,11 +649,6 @@ msgstr "Burimi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Sistemi/Internacionalizimi"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Madh�sia: "
 
@@ -667,11 +672,6 @@ msgstr "Shtoje nj� grup paralel"
 msgid "Update media"
 msgstr "Azhurnim i burimit"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Nd�rtimi/I Baz�s s� t� dh�nave"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -707,6 +707,11 @@ msgstr "Nj� problem �sht� paraqitur gjat� instalimit"
 msgid "Terminals"
 msgstr "Terminalet"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Sistemi/B�rthama dhe hardveri"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -717,16 +722,6 @@ msgstr "Botues"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Zgjedhur: %d MB / Hap�sir� e lir� n� disk: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Librat/Tjet�r"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Shk�ncat/Tjet�r"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -749,11 +744,6 @@ msgstr "Verifikimi i skedar�s s� larg�t t� burimit `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Loj�ra/Aventr�"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "mes skedareve"
 
@@ -764,13 +754,18 @@ msgstr "Gjitha pakot, simbas grupit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Tryez� grafike/E bazuar me FVWM"
+msgid "Kernel"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Console"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Loj�ra/Sportet"
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -783,6 +778,16 @@ msgid "Search results (none)"
 msgstr "Rezultatet e hetimeve (asnj�)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Loj�ra/Aventr�"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Arkivimi/Cd gdhend�si"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -803,11 +808,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Ndale"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Shkencat/Biologjia"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Nj� moment ju lutemi, prodhimi i list�s hd..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Shkencat/Metamatike"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Sistemi/Internacionalizimi"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -868,6 +888,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finlanda"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Sistemi/Polisat/X11 bitmap"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -884,14 +909,14 @@ msgid "Save changes"
 msgstr "Shp�toi ndryshimet"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Punim rrjeti/Lajmet"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Punim rrjeti/Lajm�rim i �astit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Librat/Faqs"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -900,6 +925,11 @@ msgid "More info"
 msgstr "M� shum� informacione"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Librat/Libra kompjuterike"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Hulumtim"
@@ -926,16 +956,6 @@ msgstr "Spanja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Shkencat/Astronomia"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Nd�rtimi/B�rthama"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Burimet azhurnuese veqse ekzistojn�"
 
@@ -946,11 +966,6 @@ msgstr "Skedaret:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Loj�ra/Arkade"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "E pa mundur marrja e burimeve mbi pakot."
 
@@ -961,6 +976,11 @@ msgstr ""
 "Ju keni mund�si t� p�rdorni nj� em�r t� p�rdoruesit/parull�n p�r tu\n"
 "lidhur n� serverin proxy"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -973,11 +993,6 @@ msgstr "Keni nevoj� p�r pakot shtuese"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Punim rrjeti/Chat"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Nisje n� mod t� p�rdoruesit"
 
@@ -1039,9 +1054,9 @@ msgid "Find:"
 msgstr "Gjeta:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Nd�rtimi/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Sistemi/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1055,11 +1070,6 @@ msgstr "Mjet i l�vizsh�m"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Tryez� grafike/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Pregatitje p�r instalimin e pakove..."
 
@@ -1073,21 +1083,11 @@ msgstr "Nj� moment ju lutemi, zhdukja pakove..."
 msgid "Please wait, adding medium..."
 msgstr "Nj� moment ju lutemi, shtimi i nj� burimi..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Loj�rat/Tjet�r"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Login:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Punim rrjeti/Tjet�r"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1098,21 +1098,16 @@ msgstr "Belgjika"
 msgid "File tools"
 msgstr "Vegla skedaresh"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Arkivimi/Cd gdhend�si"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Shkencat/Biologjia"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Konfigurimi i proxies"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1120,11 +1115,6 @@ msgstr "Nisja e shkarkimit t� `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Sistemi/Bibliotekat"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Nj� gabim fatal �sht� paraqitur: %s."
 
@@ -1138,16 +1128,6 @@ msgstr "Gabim fatal"
 msgid "Leaves only, sorted by install date"
 msgstr "Vet�m lejimet, t� renditura simbas dat�s s� instalimit"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Loj�ra/Strategjike"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Nd�rtimi/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1162,14 +1142,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Arkivimi/Compresim"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Librat/Literatura"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Shkencat/Gjeoshkencore"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1181,25 +1156,20 @@ msgstr "Zgjedheni pasqyr�n tuaj."
 msgid "Communications"
 msgstr "Komunikimet"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Tryez� grafike/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Botimi i grupit paralel \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Ar�syja p�r azhurnim: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Komunikimet"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Shkencat/Metamatike"
+msgid "Reason for update: "
+msgstr "Ar�syja p�r azhurnim: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1228,8 +1198,8 @@ msgstr "Nj� problem �sht� paraqitur gjat� zhdukjes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Tryez� grafike/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1254,29 +1224,54 @@ msgstr "Asnj� pako s'�sht� gjetur p�r Instalim"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "Burimi: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Loj�ra/Strategjike"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "P�rshkrimi: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Arkivimi/Tjet�r"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Shkencat/Kimike"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Sistemi/Baz�"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "T� gjitha pakot e zgjedhura jan� instaluar si duhet."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Sistemi/Sever�t"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Loj�ra/Enigmat"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1304,11 +1299,6 @@ msgstr "Baz� e t� dh�nave"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Punim rrjeti/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Emri: "
 
@@ -1354,8 +1344,8 @@ msgstr "Video"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Nd�rtimi/GNOME dhe GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1368,14 +1358,24 @@ msgid "Selected"
 msgstr "Zgjedhur"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Shkencat/Shkenc� kompjuterike"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Infomacione maksimale"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Arkivimi/Regjistrim"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1431,9 +1431,9 @@ msgid "Bugfixes updates"
 msgstr "Korigjimi i bug(it) azhurnues"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "punim rrjeti/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japonia"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1450,6 +1450,11 @@ msgstr "Nj� moment ju lutemi, gjetja e pakove t� lira..."
 msgid "Cancel"
 msgstr "Anulo"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Shk�ncat/Tjet�r"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1457,16 +1462,6 @@ msgstr "Aktivizuar?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Shkencat/Gjeoshkencore"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Sistemi/Polisat/Konsola"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Gjitha pakot, t� radhitura simbas alfabetit"
 
@@ -1490,16 +1485,6 @@ msgstr "Instalimi p�rfundoi"
 msgid " done."
 msgstr " b�r�."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Nd�rtimi/KDE dhe Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Librat/Howtos"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1507,15 +1492,15 @@ msgstr "Ju duhet t� futni burimin p�r t� vazhduar m� tutje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Loj�ra/Boards"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Num�r shum� i madh� i pakove t� zgjedhura"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Shkencat/Fizike"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "Asnj� veprim"
@@ -1525,17 +1510,17 @@ msgstr "Asnj� veprim"
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Punim rrjeti/Mail"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Gabim gjat� shkarkimit"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazili"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Ndihm�"
@@ -1545,6 +1530,11 @@ msgstr "Ndihm�"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "E pa mundur marrja e burimeve mbi pakot, kemi ndjes�. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Loj�ra/Sportet"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1571,9 +1561,9 @@ msgid "All packages, by medium repository"
 msgstr "Gjitha pakot, simbas burimit t� depozuar"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Sistemi/Polisat/X11 bitmap"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Arkivimi/Compresim"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1585,6 +1575,11 @@ msgstr "Shkarkimi i `%s', koha e kaluar:%s, shpejt�sia:%s"
 msgid "Add a host"
 msgstr "Shtimi i nj� ftuesi"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Nd�rtimi/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1612,11 +1607,6 @@ msgstr "Ndrryshim i burimit"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Tryez� grafike/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "V�rja e zgjedhjeve n� fillim"
 
@@ -1625,6 +1615,11 @@ msgstr "V�rja e zgjedhjeve n� fillim"
 msgid "Mandrake Update"
 msgstr "Azhurnimi Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Librat/Faqs"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1641,14 +1636,14 @@ msgstr ""
 "Ju lutemi provoni m� von�."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Librat/Libra kompjuterike"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Librat/Howtos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Sistemi/Baz�"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1664,6 +1659,11 @@ msgstr ""
 "A d�shironi ti azhurnoni burimet e baz�s s� t� dh�nave."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Sistemi/Bibliotekat"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1701,24 +1701,14 @@ msgid "Currently installed version: "
 msgstr "Versioni i tanish�m i instaluar: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Nd�rtimi/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Sistemi/Konfigurimi/Stampimi"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Loj�ra/Enigmat"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Loj�ra/Letrat"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Sistemi/Konfigurimi/Paketimi"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Shkencat/Astronomia"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1742,14 +1732,19 @@ msgstr "Emri:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Tryez� grafike/Tjet�r"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Asnj� azhurnim"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Punim rrjeti/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1760,6 +1755,16 @@ msgstr "Ok"
 msgid "Text tools"
 msgstr "Vegla teksti"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Loj�ra/Letrat"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1771,6 +1776,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Tip n� emrin e ftuesit apo n� adres�n IP t� ftuesit t� shtuar:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Loj�ra/Arkade"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1780,11 +1790,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Botimi i burimit \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Punim rrjeti/Lajm�rim i �astit"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1848,11 +1853,6 @@ msgstr ""
 "Kjo veg�l do t� ju ndihmoj� p�r intalimin e azhurnimeve t� zgjedhura n�\n"
 "kompjuterit tuaj."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Sistemi/Polisat/Tip i v�rtet"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2133,6 +2133,128 @@ msgstr "Zhduke Softverin"
 msgid "Software Sources Manager"
 msgstr "Administrues i Burimeve Softver"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Sistemi/Internacionalizimi"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Vegla skedaresh"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Tryez� Grafike/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Shkencat/Shkenc� kompjuterike"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Sistemi/Sever�t"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Baz� e t� dh�nave"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Tryez� grafike/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Shkencat/Shkenc� kompjuterike"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Sistemi/Konfigurimi/Tjet�r"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Sistemi/Konfigurimi/Rrjeti"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Sistemi/Konfigurimi/Hardveri"
+
+#~ msgid "Development/Python"
+#~ msgstr "Nd�rtimi/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Sistemi/Konfigurimi/Boot dhe Hyrja"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Treyz� grafike/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Nd�rtimi/Tjet�r"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Sistemi/Polisa/Tipi1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Nd�rtimi/I Baz�s s� t� dh�nave"
+
+#~ msgid "Books/Other"
+#~ msgstr "Librat/Tjet�r"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Tryez� grafike/E bazuar me FVWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "Punim rrjeti/Lajmet"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Nd�rtimi/B�rthama"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Punim rrjeti/Chat"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Nd�rtimi/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Tryez� grafike/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Loj�rat/Tjet�r"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Punim rrjeti/Tjet�r"
+
+#~ msgid "Development/Java"
+#~ msgstr "Nd�rtimi/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Tryez� grafike/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Arkivimi/Regjistrim"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "punim rrjeti/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Sistemi/Polisat/Konsola"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Punim rrjeti/Mail"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Tryez� grafike/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Nd�rtimi/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Sistemi/Konfigurimi/Stampimi"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Sistemi/Konfigurimi/Paketimi"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Tryez� grafike/Tjet�r"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Sistemi/Polisat/Tip i v�rtet"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s �sht� n� konflikt me %s"
 
diff --git a/po/sq.pom b/po/sq.pom
index 1449b573..2f45aa79 100644
--- a/po/sq.pom
+++ b/po/sq.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Stacion punues"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Mjedis Grafik�"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Zhvillimi"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/sr.po b/po/sr.po
index 957134a7..22d42fd3 100644
--- a/po/sr.po
+++ b/po/sr.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-02-17 20:53+0100\n"
 "Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\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 "������: %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"
@@ -34,12 +44,7 @@ msgstr "������"
 
 #: ../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"
+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
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "��������� �������e"
 
+#: ../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 "���� ����� �������� ���� ����� ����"
 
@@ -153,6 +153,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:"
@@ -170,19 +175,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, 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
+#, c-format
+msgid "Italy"
+msgstr "�������"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -196,11 +211,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:"
@@ -218,7 +228,7 @@ msgstr "������..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -324,21 +334,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 ""
-
-#: ../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 "��������� ���j ����� ��j�..."
 
 #: ../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 "���a��:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "��w�����-���� ������ `%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.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"
@@ -556,22 +566,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
@@ -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."
@@ -632,11 +642,6 @@ msgstr "�������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "��������: "
 
@@ -660,11 +665,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..."
@@ -700,6 +700,11 @@ msgstr "������� �� ����� �����������"
 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 "������"
 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"
@@ -742,11 +737,6 @@ msgstr "��������� ���� �� ����� `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "� ���������"
 
@@ -757,12 +747,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
@@ -777,6 +772,16 @@ msgstr "�������� �������e (����)"
 
 #: ../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 "����"
 
+#: ../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"
@@ -856,6 +876,11 @@ msgstr ""
 msgid "Finland"
 msgstr "������"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -873,12 +898,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
@@ -889,6 +914,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "�����"
 
@@ -913,16 +943,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 "����� ��� ���������, �������� �������..."
@@ -934,11 +954,6 @@ msgstr "�������:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "�� ���� �� ������� ������� ������."
 
@@ -947,6 +962,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"
@@ -959,11 +979,6 @@ msgstr "�������� �� ������� ������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1021,7 +1036,7 @@ msgstr "����a��: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1035,11 +1050,6 @@ msgid "Removable device"
 msgstr "�������� ������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "����������� ������"
@@ -1054,21 +1064,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"
@@ -1079,21 +1079,16 @@ msgstr "�������"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "���������� ��������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "���������� ��������"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1101,11 +1096,6 @@ msgstr "�������� download �� `%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 "������ ��� ������\n"
 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 ""
@@ -1140,12 +1120,7 @@ msgstr ""
 
 #: ../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 "��������� ���� �� ����."
 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
@@ -1205,7 +1175,7 @@ msgstr "������� �������� ��������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1231,22 +1201,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
+#, 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
@@ -1254,6 +1239,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"
@@ -1281,11 +1276,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "���: "
 
@@ -1331,7 +1321,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1346,12 +1336,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
@@ -1408,9 +1408,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
@@ -1427,20 +1427,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
@@ -1467,16 +1462,6 @@ 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"
@@ -1484,13 +1469,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
@@ -1502,17 +1487,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 "�����"
@@ -1522,6 +1507,11 @@ msgstr "�����"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "�� ���� �� ������� ������� ������, ��� �� ��. %s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1549,7 +1539,7 @@ msgstr "�� ����� �������� ����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1562,6 +1552,11 @@ msgstr "Download �� `%s', ����� �� �����:%s, ������:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1589,11 +1584,6 @@ msgstr "������� �������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "������ �������"
 
@@ -1602,6 +1592,11 @@ msgstr "������ �������"
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "������"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1619,12 +1614,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
@@ -1640,6 +1635,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1676,23 +1676,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
@@ -1717,7 +1707,7 @@ msgstr "��e:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1725,6 +1715,11 @@ msgstr ""
 msgid "No update"
 msgstr "��� ������a��"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "�� ���� �����"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1735,6 +1730,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:"
@@ -1747,6 +1752,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1755,11 +1765,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"
@@ -1824,11 +1829,6 @@ msgstr ""
 "����������� ��\n"
 "��� �������."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2111,6 +2111,10 @@ msgstr "������ �������"
 msgid "Software Sources Manager"
 msgstr "������� ����������� ����"
 
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP ������"
+
 #~ msgid "unknown package "
 #~ msgstr "��������� ����� "
 
diff --git a/po/sr.pom b/po/sr.pom
index b162e0d7..907ffe86 100644
--- a/po/sr.pom
+++ b/po/sr.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "����� ������a"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "�������� �����e�e"
+
+# 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/sr@Latn.po b/po/sr@Latn.po
index add2d1af..7cc7019e 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\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-28 22:12+0100\n"
 "Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
 "Language-Team: Serbian <i18n@mandrake.co.yu>\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 "Ukloni: %s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Molim Vas sa�ekajte, a�uriram medijum..."
 
+#: ../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 "svi paketi su dobro instalirani"
 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 "Morate da popunite najmanje prva dva polja."
-
 #: ../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 "Morate da popunite najmanje prva dva polja."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Rezultati pretrage"
 
+#: ../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 "Kako ru�no izabrati svoj miror sajt"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Instalacija paketa"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -172,19 +177,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "Italija"
+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 "Italija"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -198,11 +213,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Jedan od slede�ih paketa je potreban:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,7 +230,7 @@ msgstr "Proksi..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -326,21 +336,11 @@ msgstr "Lozinka:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Instalacija paketa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "u opisima"
 
@@ -359,6 +359,11 @@ msgstr "Jo� neki paketi moraju biti uklonjeni"
 msgid "All packages, by update availability"
 msgstr "po dostupnosti"
 
+#: ../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 "Gr�ka"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Ne radi ni�ta"
@@ -429,11 +439,6 @@ msgstr "Izaberite svoj miror sajt..."
 
 #: ../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"
@@ -503,6 +508,11 @@ msgstr "Putanja:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Download-ujem pakete `%s' (%s/%s)..."
 
@@ -513,6 +523,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Ostalo"
 
@@ -521,36 +536,31 @@ 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 "Informacije..."
+msgid "Austria"
+msgstr "Austrija"
 
 #: ../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 "Informacije..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Proveri..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -558,22 +568,17 @@ msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Sa�etak: "
 
 #: ../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
@@ -591,6 +596,11 @@ msgstr "Ukloni: %s"
 msgid "Importance: "
 msgstr "Va�nost: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -635,11 +645,6 @@ msgstr "Belgija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Veli�ina: "
 
@@ -663,11 +668,6 @@ msgstr ""
 msgid "Update media"
 msgstr "A�uriranje izvora"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -703,6 +703,11 @@ msgstr "Problem za vreme instaliranja"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -713,16 +718,6 @@ msgstr "Izmeni"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Izabrano: %d MB / Slobodan prostor na disku: %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"
@@ -745,11 +740,6 @@ msgstr "Ispitujem fajl za izvor `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "u fajlovima"
 
@@ -760,12 +750,17 @@ msgstr "Svi paketi,"
 
 #: ../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
@@ -780,6 +775,16 @@ msgstr "Rezultat pretrage (nema)"
 
 #: ../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"
@@ -798,11 +803,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 "Molim Vas sa�ekajte, a�uriram medijum..."
 
+#: ../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"
@@ -858,6 +878,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finska"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -875,12 +900,12 @@ msgstr "Sa�uvaj izmene"
 
 #: ../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
@@ -891,6 +916,11 @@ msgstr "Vi�e informacija"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Tra�i"
 
@@ -915,16 +945,6 @@ msgid "Spain"
 msgstr "�panija"
 
 #: ../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 "Gre�ka prilikom dodavanja medijuma sa nadogradnjom"
@@ -936,11 +956,6 @@ msgstr "Fajlovi:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Ne mogu da dobavim izvorne pakete."
 
@@ -949,6 +964,11 @@ msgstr "Ne mogu da dobavim izvorne pakete."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Mo�ete da podesite korisnika/lozinku za identifikaciju proksija:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -961,11 +981,6 @@ msgstr "Potrebni su dodatni paketi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1023,7 +1038,7 @@ msgstr "Prona�i: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1037,11 +1052,6 @@ msgid "Removable device"
 msgstr "Prenosni ure�aj"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Instalacija paketa"
@@ -1056,21 +1066,11 @@ msgstr "Molim Vas sa�ekajte, uklanjam pakete..."
 msgid "Please wait, adding medium..."
 msgstr "Molimo Vas da sa�ekate, dodajem medijum..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Ostalo"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Prijava:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1081,21 +1081,16 @@ msgstr "Belgija"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Pode�avanje proksija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Pode�avanje proksija"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1103,11 +1098,6 @@ msgstr "Pokre�em download sa `%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 pri �itanju\n"
 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 ""
@@ -1142,12 +1122,7 @@ msgstr "Ne mogu da a�uriram medijum; 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
@@ -1160,25 +1135,20 @@ msgstr "Izaberite sajt po �elji."
 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 "Menjam izvor \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Razlog a�uriranja:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Pode�avanje izvora"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Razlog a�uriranja:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1207,7 +1177,7 @@ msgstr "Problem prilikom uklanjanja"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1233,22 +1203,37 @@ msgstr "Nije prona�en paket za instalaciju."
 
 #: ../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 "Opis:"
 
 #: ../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
@@ -1256,6 +1241,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Svi paketi, koji ste zahtevali, su uspe�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"
@@ -1283,11 +1278,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Ime: "
 
@@ -1333,7 +1323,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1348,12 +1338,22 @@ msgstr "Izabrani"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Potpuna informacija"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1410,9 +1410,9 @@ msgid "Bugfixes updates"
 msgstr "Nadogradnje sa ispravkama"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1429,20 +1429,15 @@ msgstr "Molim Vas sa�ekajte, pronalazim dostupne pakete..."
 msgid "Cancel"
 msgstr "Odustani"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Uklju�i?"
-
 #: ../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�i?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1469,16 +1464,6 @@ msgstr "Instalacija gotova"
 msgid " done."
 msgstr " ura�eno."
 
-#: ../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"
@@ -1486,13 +1471,13 @@ msgstr "Morate da ubacite medijum kako bi ste nastavili"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Izabrali ste previ�e paketa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Izabrali ste previ�e paketa"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1504,17 +1489,17 @@ msgstr "Ne radi ni�ta"
 msgid "Danmark"
 msgstr "Danska"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Gre�ka tokom preuzimanja sa interneta"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Pomo�"
@@ -1524,6 +1509,11 @@ msgstr "Pomo�"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ne mogu da dobavim izvorne pakete, �ao mi je. %s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1551,7 +1541,7 @@ msgstr "po stanju izvornog koda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1564,6 +1554,11 @@ msgstr "Download sa `%s', vreme do kraja:%s, brzina:%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 "Promeni medijum"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Ponovo izaberi"
 
@@ -1604,6 +1594,11 @@ msgstr "Ponovo izaberi"
 msgid "Mandrake Update"
 msgstr "Mandrake Update"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Ostalo"
+
 #: ../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 "Trenutno instalirana verzija: "
 
 #: ../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 "Ostalo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1719,7 +1709,7 @@ msgstr "Ime:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1727,6 +1717,11 @@ msgstr ""
 msgid "No update"
 msgstr "Bez a�uriranja"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Ne radi ni�ta"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1737,6 +1732,16 @@ msgstr "U redu"
 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 "Menjam izvor \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1826,11 +1831,6 @@ msgstr ""
 "instalirate na\n"
 "va� ra�unar."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2113,6 +2113,10 @@ msgstr "Ukloni softver"
 msgid "Software Sources Manager"
 msgstr "Menad�er Softverskog Koda"
 
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP server"
+
 #~ msgid "unknown package "
 #~ msgstr "nepoznati paket "
 
diff --git a/po/sr@Latn.pom b/po/sr@Latn.pom
index 62a5e40e..75a09708 100644
--- a/po/sr@Latn.pom
+++ b/po/sr@Latn.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 "Razvojna"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/sv.po b/po/sv.po
index be3d9e2d..d4e0e341 100644
--- a/po/sv.po
+++ b/po/sv.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-02-17 15:38+0200\n"
 "Last-Translator: Magnus Bj�rkl�f <bjorklof@nic.fi>\n"
 "Language-Team: Svenska <sv@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 "Ta bort .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "V�nta, uppdaterar media..."
 
+#: ../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 "allt installerades utan problem"
 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 "Du m�ste fylla i �tminstone de tv� f�rsta posterna."
-
 #: ../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 "Du m�ste fylla i �tminstone de tv� f�rsta posterna."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -113,6 +113,11 @@ msgstr ""
 msgid "Search results"
 msgstr "S�kresultat"
 
+#: ../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 "Hur du manuellt v�ljer en spegel"
 
@@ -156,6 +156,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "F�rbereder paket f�r installation..."
 
+#: ../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 "Italien"
+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 "Italien"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -199,11 +214,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Ett av f�ljande paket kr�vs:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -221,7 +231,7 @@ msgstr "Fel..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -325,22 +335,12 @@ msgid "Password:"
 msgstr "L�senord:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "F�rbereder paket f�r installation..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "i beskrivningar"
 
@@ -359,6 +359,11 @@ msgstr "N�gra ytterligare paket m�ste tas bort"
 msgid "All packages, by update availability"
 msgstr "efter uppdateringstillg�nglighet"
 
+#: ../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 "Grekland"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "G�r ingenting"
@@ -427,11 +437,6 @@ msgstr "V�lj en spegel..."
 
 #: ../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 "S�kv�g:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laddar ner paket \"%s\" (%s/%s)..."
 
@@ -511,6 +521,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Annan"
 
@@ -519,36 +534,31 @@ msgstr "Annan"
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "�sterrike"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Information..."
+msgid "Austria"
+msgstr "�sterrike"
 
 #: ../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 "Information..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Unders�k..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -556,22 +566,17 @@ msgstr "Japan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Sammanfattning: "
 
 #: ../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 "Ta bort .%s"
 msgid "Importance: "
 msgstr "Viktighet: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -631,11 +641,6 @@ msgstr "Belgien"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Storlek: "
 
@@ -659,11 +664,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Uppdatera k�llor"
 
-#: ../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 "Problem uppstod under installationen"
 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 "Redigera"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Annan"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -741,11 +736,6 @@ msgstr "Unders�ker fil f�r k�lla \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "i filer"
 
@@ -756,12 +746,17 @@ msgstr "Alla paket,"
 
 #: ../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 "S�kresultat (inget)"
 
 #: ../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 "Stoppa"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "V�nta, uppdaterar media..."
 
+#: ../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"
@@ -853,6 +873,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finland"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -870,12 +895,12 @@ msgstr "Spara �ndringar"
 
 #: ../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
@@ -886,6 +911,11 @@ msgstr "Mer information"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "S�k"
 
@@ -910,16 +940,6 @@ msgid "Spain"
 msgstr "Spanien"
 
 #: ../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 "Fel vid till�gg av uppdateringsmedia"
@@ -931,11 +951,6 @@ msgstr "Filer:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Kunde inte h�mta k�llpaket."
 
@@ -944,6 +959,11 @@ msgstr "Kunde inte h�mta k�llpaket."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Du kan specificera ett anv�ndarnamn/l�senord f�r proxyautentiseringen:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Kina"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -956,11 +976,6 @@ msgstr "Ytterligare paket kr�vs"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1017,7 +1032,7 @@ msgstr "Hitta:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1031,11 +1046,6 @@ msgid "Removable device"
 msgstr "Flyttbar enhet"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "F�rbereder paket f�r installation..."
@@ -1050,21 +1060,11 @@ msgstr "V�nta, tar bort paket..."
 msgid "Please wait, adding medium..."
 msgstr "V�nta, l�gger till media..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Annan"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Anv�ndarnamn:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1075,21 +1075,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 "Anpassa proxy"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Anpassa proxy"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1097,11 +1092,6 @@ msgstr "Verifierar signatur f�r \"%s\"..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1115,16 +1105,6 @@ msgstr "Filfel"
 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 ""
@@ -1136,12 +1116,7 @@ msgstr "Kan inte uppdatera media; det kommer att inaktiveras automatiskt."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1154,25 +1129,20 @@ msgstr "V�lj �nskad spegel."
 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 "Redigerar k�lla \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Orsak f�r uppdatering: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Anpassa k�llor"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Orsak f�r uppdatering: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1201,7 +1171,7 @@ msgstr "Problem vid borttag"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1227,22 +1197,37 @@ msgstr "F�rbereder paket f�r installation..."
 
 #: ../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 "Beskrivning: "
 
 #: ../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
@@ -1250,6 +1235,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "Alla beg�rda paket installerades utan problem."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1277,11 +1272,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Namn: "
 
@@ -1326,7 +1316,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1341,12 +1331,22 @@ msgstr "Vald"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Maximal information"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1403,9 +1403,9 @@ msgid "Bugfixes updates"
 msgstr "Felr�ttningsuppdateringar"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japan"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1422,20 +1422,15 @@ msgstr "V�nta, hittar tillg�ngliga paket..."
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Aktiverad?"
-
 #: ../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 "Aktiverad?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1462,16 +1457,6 @@ msgstr "Installation slutf�rd"
 msgid " done."
 msgstr " klar."
 
-#: ../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"
@@ -1479,13 +1464,13 @@ msgstr "Du m�ste l�gga i mediet f�r att forts�tta"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "F�r m�nga paket �r valda"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "F�r m�nga paket �r valda"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1497,17 +1482,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 "Fel vid nerladdning"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brasilien"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Hj�lp"
@@ -1517,6 +1502,11 @@ msgstr "Hj�lp"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Du m�ste vara root f�r att kunna installera paket."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1544,7 +1534,7 @@ msgstr "efter k�llagringsplats"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1557,6 +1547,11 @@ msgstr "Nedladdnig av \"%s\", �terst�ende tid:%s, hastighet:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1584,11 +1579,6 @@ msgstr "Byt media"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "�terst�ll valet"
 
@@ -1597,6 +1587,11 @@ msgstr "�terst�ll valet"
 msgid "Mandrake Update"
 msgstr "Uppdatera Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Annan"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1614,12 +1609,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
@@ -1635,6 +1630,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1671,23 +1671,13 @@ msgid "Currently installed version: "
 msgstr "Installerad 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 "Annan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1712,7 +1702,7 @@ msgstr "Namn:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1720,6 +1710,11 @@ msgstr ""
 msgid "No update"
 msgstr "Ingen uppdatering"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "G�r ingenting"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1730,6 +1725,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:"
@@ -1742,6 +1747,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1750,11 +1760,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Redigerar k�lla \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1818,11 +1823,6 @@ msgstr ""
 "Det h�r verktyget hj�lper dig att v�lja uppdateringarna du vill\n"
 "installera p� datorn."
 
-#: ../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 "Programhanterare f�r k�llor"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP-server"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "i konflikt med"
 
diff --git a/po/sv.pom b/po/sv.pom
index 3c1c62b6..55acfba0 100644
--- a/po/sv.pom
+++ b/po/sv.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Arbetsstation"
+
+# 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 "Utveckling"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Server"
 
diff --git a/po/ta.po b/po/ta.po
index 67a29c55..cac431e8 100644
--- a/po/ta.po
+++ b/po/ta.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: 2002-08-31 16:35+0800\n"
 "Last-Translator: prabu anand <prabu_anand2000@yahoo.com>\n"
 "Language-Team: tamil <tamilinix@yahoogroups.com>\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 "நீக்கு  .%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"
@@ -34,12 +44,7 @@ msgstr "கனடா"
 
 #: ../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"
+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
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "தேடலின் முடிவுகள்"
 
+#: ../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 "உங்கள் இணைபதிப்ைப ைகமுைறயாக எப்படித் தேர்வுச் செய்வது"
 
@@ -153,6 +153,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:"
@@ -170,19 +175,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, 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
+#, c-format
+msgid "Italy"
+msgstr "இத்தாலி"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -196,11 +211,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:"
@@ -218,7 +228,7 @@ msgstr " பிழை நேர்ந்துள்ளது..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -322,22 +332,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 "விளக்கங்களில் "
 
@@ -356,6 +356,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"
@@ -372,6 +377,11 @@ msgid "Greece"
 msgstr "கிரேக்கம்"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "ஒன்றும் செய்யாதே"
@@ -424,11 +434,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 "`%s'... என்ற நிரலின் மூலம் ஆராய�
 
 #: ../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"
@@ -788,11 +793,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"
@@ -848,6 +868,11 @@ msgstr ""
 msgid "Finland"
 msgstr "பின்லாந்து"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -865,12 +890,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
@@ -881,6 +906,11 @@ msgstr "ேமலதிக விவரம்"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "தேடு"
 
@@ -905,16 +935,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 "புதுப்பித்தல்ல் ஊடகத்தில் பிழை நேர்ந்துள்ளது"
@@ -926,11 +946,6 @@ msgstr "கோப்புகள்:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "மூலப் பொதிகள் கிடைக்கவில்ைல"
 
@@ -939,6 +954,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"
@@ -951,11 +971,6 @@ msgstr "மேலும் சில பொதிகள் தேவை"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1008,7 +1023,7 @@ msgstr "கண்டுபிடி:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1022,11 +1037,6 @@ msgid "Removable device"
 msgstr "கழற்று சாதனங்கள்"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "நிறுவுவதற்காக பொதிகள் தயாராகின்றன..."
@@ -1041,21 +1051,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"
@@ -1066,21 +1066,16 @@ msgstr "பெல்ஜியம்"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "பினாமிகளை வடிவமை"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "பினாமிகளை வடிவமை"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1088,11 +1083,6 @@ msgstr "பொதி கையெழுத்து சோதனையில்
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1106,16 +1096,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 ""
@@ -1127,12 +1107,7 @@ msgstr "ஊடகத்ைத புதுப்பிக்க முடிய�
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1145,25 +1120,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
@@ -1192,7 +1162,7 @@ msgstr "நீக்குதலில் பிழை நேர்ந்து�
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1218,22 +1188,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
+#, 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
@@ -1241,6 +1226,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"
@@ -1268,11 +1263,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "பெயர்: "
 
@@ -1318,7 +1308,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1333,12 +1323,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
@@ -1395,9 +1395,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
@@ -1414,20 +1414,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
@@ -1454,16 +1449,6 @@ 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"
@@ -1471,13 +1456,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
@@ -1489,17 +1474,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 "உதவி"
@@ -1509,6 +1494,11 @@ msgstr "உதவி"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "பொதிகளை நிறுவுவதற்கு நீங்கள் நிர்வாகியாக இருக்க வேண்டும்"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1536,7 +1526,7 @@ msgstr "மூலங்களின் இருப்புப்படி"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1549,6 +1539,11 @@ msgstr "`%s' இறக்கத்திற்கு, ேதவைப்பட�
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1576,11 +1571,6 @@ msgstr "ஊடகத்ைத மாற்றவும்"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "தேர்வுகளை மறந்து விடு"
 
@@ -1589,6 +1579,11 @@ msgstr "தேர்வுகளை மறந்து விடு"
 msgid "Mandrake Update"
 msgstr "மாண்ட்ேரக் புதுப்பித்தல்"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "மற்ற"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1606,12 +1601,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
@@ -1627,6 +1622,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1663,23 +1663,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
@@ -1704,7 +1694,7 @@ msgstr "பெயர்:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1712,6 +1702,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"
@@ -1722,6 +1717,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:"
@@ -1734,6 +1739,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "டிேரக்ெமன்ெபாருள்"
 
@@ -1742,11 +1752,6 @@ msgstr "டிேரக்ெமன்ெபாருள்"
 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"
@@ -1810,11 +1815,6 @@ msgstr ""
 "இக்கருவி மூலம் உங்கள் கணினியில் உள்ள  ெமன்ெபாருளை நீங்கள் புதுப்பிக்க\n"
 " முடியும்"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2097,6 +2097,10 @@ msgid "Software Sources Manager"
 msgstr " ெமன்ெபாருள் மூலங்கள் மேலாளர்"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP பாிமாறி"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "பிரச்சினைகள் எழுகிறது"
 
diff --git a/po/ta.pom b/po/ta.pom
index 3eccae69..f51655ce 100644
--- a/po/ta.pom
+++ b/po/ta.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/tg.po b/po/tg.po
index 723d6cc3..b1a224f9 100644
--- a/po/tg.po
+++ b/po/tg.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 16:54+0500\n"
 "Last-Translator: Dilshod Marupov <dma165@hotmail.com>\n"
 "Language-Team: Tajik\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
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Натиҷаҳои ҷустуҷӯ"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -136,11 +141,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Чӣ тавр оинаатонро дастӣ интихоб мекунед"
 
@@ -154,6 +154,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:"
@@ -171,6 +176,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 ""
 
@@ -181,11 +201,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"
@@ -197,11 +212,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:"
@@ -219,7 +229,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
+#, fuzzy, 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 "Ҳеҷ кор накунед"
@@ -426,11 +436,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"
@@ -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.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"
@@ -556,22 +566,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
@@ -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."
@@ -633,11 +643,6 @@ msgstr "Белжик"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Ҳаҷм: "
 
@@ -661,11 +666,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..."
@@ -701,6 +701,11 @@ msgstr "Муаммоҳо ҳангоми коргузориш рӯй доданд
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -711,16 +716,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"
@@ -743,11 +738,6 @@ msgstr "Санҷидани файли сарчашмаи `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "дар файлҳо"
 
@@ -758,12 +748,17 @@ msgstr "Ҳаммаи қуттиҳо,"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Kernel"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Console"
+msgstr "Cooker"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -778,6 +773,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"
@@ -796,11 +801,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"
@@ -856,6 +876,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Финлонд"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -873,13 +898,13 @@ msgstr "Нигоҳдории тағиротҳо"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
+msgid "Instant messaging"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Faqs"
-msgstr ""
+#, fuzzy, c-format
+msgid "News"
+msgstr "Нав"
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -889,6 +914,11 @@ msgstr "Маълумоти изофа"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Ҷустуҷӯ"
 
@@ -913,16 +943,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 "Сарчашмаи %s дар таҳлил аст"
@@ -934,11 +954,6 @@ msgstr "Файлҳо:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Қуттиҳои сарчашмавӣ гирифта нашуд."
 
@@ -947,6 +962,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"
@@ -959,11 +979,6 @@ msgstr "Қуттиҳои иловагӣ лозиманд"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1021,7 +1036,7 @@ msgstr "Ёфтан:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1035,11 +1050,6 @@ msgid "Removable device"
 msgstr "Дастгоҳи хориҷ шаванда"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Тайёркунии қуттиҳо барои коргузорӣ..."
@@ -1054,21 +1064,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 "Номи дохилӣ (login):"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1079,32 +1079,22 @@ msgstr "Белжик"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Танзимдарории ноибҳо"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Танзимдарории ноибҳо"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
 msgstr "Тасдиқкунии имзои `%s'..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
@@ -1121,16 +1111,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 ""
@@ -1142,12 +1122,7 @@ msgstr "Навкунии миёна номумкин, ин автоматикӣ
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1160,25 +1135,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
@@ -1207,7 +1177,7 @@ msgstr "Муаммо ҳангоми хориҷкунӣ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1233,22 +1203,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
+#, c-format
 msgid "Description: "
 msgstr "Тавсиф: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "%s KB"
 msgstr "%s KБ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1256,6 +1241,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"
@@ -1283,11 +1278,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Ном: "
 
@@ -1333,7 +1323,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1348,12 +1338,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
@@ -1410,9 +1410,9 @@ msgid "Bugfixes updates"
 msgstr "Навигариҳои Ғалатислоҳ (Bugfixes)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Ҷопон"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1429,20 +1429,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
@@ -1469,16 +1464,6 @@ 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"
@@ -1486,13 +1471,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
@@ -1504,17 +1489,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 "Ёрӣ"
@@ -1524,6 +1509,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"
@@ -1551,7 +1541,7 @@ msgstr "аз рӯи анбори сарчашма"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1564,6 +1554,11 @@ msgstr "Фаровири `%s', вақт:%s, суръат:%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 "Ивази миёна"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Бознишондодани интихоб"
 
@@ -1604,6 +1594,11 @@ msgstr "Бознишондодани интихоб"
 msgid "Mandrake Update"
 msgstr "Навигарии Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Дигар"
+
 #: ../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 "Нусхаи коргузошта шуда: "
 
 #: ../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
@@ -1719,7 +1709,7 @@ msgstr "Ном:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1727,6 +1717,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"
@@ -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 "Таҳрири сарчашмаи \"%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 ""
 "Ин асбоб ба шумо барои интихоби навигарӣ барои коргузоштан ба компютери\n"
 "Шумо ёрӣ медиҳад."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2113,6 +2113,14 @@ msgid "Software Sources Manager"
 msgstr "Менеҷери Сарчашмаҳои Нармафзор"
 
 #, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Cooker"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Хидматрасони FTP"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "зиддиятҳо бо"
 
@@ -2387,9 +2395,6 @@ msgstr "Менеҷери Сарчашмаҳои Нармафзор"
 #~ msgid "Uninstalled only"
 #~ msgstr "Танҳо хориҷшудаҳо"
 
-#~ msgid "New"
-#~ msgstr "Нав"
-
 #~ msgid "Delete"
 #~ msgstr "Нобуд кардан"
 
@@ -2427,9 +2432,6 @@ msgstr "Менеҷери Сарчашмаҳои Нармафзор"
 #~ msgid "Update the list of mirrors"
 #~ msgstr "Нав кардани рӯйхати оинаҳо"
 
-#~ msgid "Cooker"
-#~ msgstr "Cooker"
-
 #~ msgid "Do you really want to delete the %s source?\n"
 #~ msgstr "Шумо ҳақиқатан мехоҳед сарчашмаи %s-ро нобуд кунед?\n"
 
@@ -2632,9 +2634,6 @@ msgstr "Менеҷери Сарчашмаҳои Нармафзор"
 #~ msgid "License: "
 #~ msgstr "лисензия: "
 
-#~ msgid "Packager: "
-#~ msgstr "Борбанд: "
-
 #~ msgid "Empty changelog"
 #~ msgstr "Холӣ changelog"
 
diff --git a/po/tg.pom b/po/tg.pom
index 961d92e2..978a6128 100644
--- a/po/tg.pom
+++ b/po/tg.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/th.po b/po/th.po
index 3fbcf82b..a967ab2b 100644
--- a/po/th.po
+++ b/po/th.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: 2002-11-27 21:43+0700\n"
 "Last-Translator: Varokas Panusuwan <varokasp@hotmail.com>\n"
 "Language-Team: Thai <th@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 "ลบ %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"
@@ -34,12 +44,7 @@ msgstr "แคนาดา"
 
 #: ../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 "ทุกอย่างถูก install เรียบร้อย"
 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
@@ -110,6 +110,11 @@ msgstr ""
 msgid "Search results"
 msgstr "ผลการค้นหา"
 
+#: ../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 "วิธีเลือก mirror ของคุณเอง"
 
@@ -153,6 +153,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "การ install package"
 
+#: ../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 "อิตาลี"
+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 "อิตาลี"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -196,11 +211,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:"
@@ -218,7 +228,7 @@ msgstr "Proxy..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -319,21 +329,11 @@ msgstr "พาสเวิร์ด:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "การ install package"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "ตามคำอธิบาย"
 
@@ -352,6 +352,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"
@@ -368,6 +373,11 @@ msgid "Greece"
 msgstr "กรืซ"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "ไม่ต้องทำอะไร"
@@ -420,11 +430,6 @@ msgstr "เลือก 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"
@@ -493,6 +498,11 @@ msgstr "พาธ:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr ""
 
@@ -503,6 +513,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "อื่นๆ"
 
@@ -511,36 +526,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"
@@ -548,22 +558,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
@@ -581,6 +586,11 @@ msgstr "ลบ %s"
 msgid "Importance: "
 msgstr "ความสำคัญ:"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -622,11 +632,6 @@ msgstr "เบลเยียม"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "ขนาด:"
 
@@ -650,11 +655,6 @@ msgstr ""
 msgid "Update media"
 msgstr "อัพเดท source(s)"
 
-#: ../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 "เกิดปัญหาขณะ install"
 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 "แก้ไข"
 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"
@@ -732,11 +727,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "ในไฟล์"
 
@@ -747,12 +737,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
@@ -767,6 +762,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"
@@ -785,11 +790,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"
@@ -844,6 +864,11 @@ msgstr ""
 msgid "Finland"
 msgstr "ฟินแลนด์"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -861,12 +886,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
@@ -877,6 +902,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "ค้นหา"
 
@@ -900,16 +930,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 "เกิดข้อผิดพลาดขณะกำลังเพื่มแผ่นข้อมูลอัพเดท"
@@ -921,11 +941,6 @@ msgstr "แฟ้ม:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
@@ -934,6 +949,11 @@ msgstr "ไม่สามารถหา source เพกเกจได้"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "คุณต้องใส่ล็อกอินและพาสเวิร์ดเพื่อใช้ proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "จีน"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -946,11 +966,6 @@ msgstr "ต้องการเพจเกจเพิ่มเติม"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1007,7 +1022,7 @@ msgstr "ค้นหา:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1021,11 +1036,6 @@ msgid "Removable device"
 msgstr "ไดร์ฟเคลื่อนย้ายได้"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "การ install package"
@@ -1040,21 +1050,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"
@@ -1065,29 +1065,19 @@ 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 "ปรับแต่ง proxies"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Starting download of `%s'..."
+msgid "Printing"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "System/Libraries"
+msgid "Starting download of `%s'..."
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1105,16 +1095,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 ""
@@ -1126,12 +1106,7 @@ msgstr "ไม่สามารถอัพเดทแผ่นข้อมู
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1144,25 +1119,20 @@ msgstr "กรุณาเลือก 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 "กำลังแก้ไข source \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "เหตุผลในการอัพเดท:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "ปรับแต่ง source"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "เหตุผลในการอัพเดท:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1191,7 +1161,7 @@ msgstr "เกิดปัญหาขณะ install"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1217,22 +1187,37 @@ msgstr "การ install package"
 
 #: ../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 "คำอธิบาย:"
 
 #: ../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
@@ -1240,6 +1225,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "เพกเกจทุกตัวที่เลือกไว้ถูก install เรียบร้อย"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1267,11 +1262,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "ชื่อ:"
 
@@ -1317,7 +1307,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1332,12 +1322,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
@@ -1393,9 +1393,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
@@ -1412,20 +1412,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
@@ -1452,16 +1447,6 @@ msgstr "install เสร็จเรียบร้อย"
 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"
@@ -1469,13 +1454,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
@@ -1487,17 +1472,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 "ความช่วยเหลือ"
@@ -1507,6 +1492,11 @@ msgstr "ความช่วยเหลือ"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "ไม่สามารถหา source เพกเกจได้"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1534,7 +1524,7 @@ msgstr "ตาม source repository"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1547,6 +1537,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1574,11 +1569,6 @@ msgstr "เปลื่ยนสื่อข้อมูล"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "reset รายชื่อที่ถูกเลือก"
 
@@ -1587,6 +1577,11 @@ msgstr "reset รายชื่อที่ถูกเลือก"
 msgid "Mandrake Update"
 msgstr "อัพเดทของ Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "อื่นๆ"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1603,12 +1598,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
@@ -1624,6 +1619,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1654,23 +1654,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
@@ -1695,7 +1685,7 @@ msgstr "ชื่อ:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1703,6 +1693,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"
@@ -1713,6 +1708,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:"
@@ -1725,6 +1730,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1733,11 +1743,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "กำลังแก้ไข source \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1800,11 +1805,6 @@ msgstr ""
 "\n"
 "โปรแกรมนี้จะช่วยคุณในการเลือกตัวอัพเดทที่คุณต้องการ install ลงในเครื่อง"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2086,6 +2086,10 @@ msgstr "ลบโปรแกรท"
 msgid "Software Sources Manager"
 msgstr "ตัวจัดการ Software Sources"
 
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "เซอร์เวอร์ FTP"
+
 #~ msgid "unknown package "
 #~ msgstr "ไม่รู้จักเพกเกจนี้"
 
diff --git a/po/th.pom b/po/th.pom
index bf9a6557..0ea0262f 100644
--- a/po/th.pom
+++ b/po/th.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Workstation ที่ทำงาน"
+
+# 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 "พัฒนาซอฟท์แวร์ (Development)"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "เซิร์ฟเวอร์"
 
diff --git a/po/tr.po b/po/tr.po
index 273d23c9..499446e4 100644
--- a/po/tr.po
+++ b/po/tr.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-02-13 18:29+0200\n"
 "Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\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 "Kaldır .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Lütfen bekleyin, ortam güncelleniyor..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -36,12 +46,7 @@ msgstr "Kanada"
 
 #: ../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 "Herşey kusursuz kuruldu"
 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 "En azından İlk iki girişi doldurmak zorundasınız."
-
 #: ../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 "En azından İlk iki girişi doldurmak zorundasınız."
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -112,6 +112,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Arama sonuçları"
 
+#: ../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 "Yansınızı elle nasıl seçersiniz?"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Kurulum için paketler hazırlanılıyor..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -172,19 +177,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Italy"
-msgstr "İtalya"
+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 "İtalya"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -198,11 +213,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "Şu paketler birinin yüklenmesi gerekiyor:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,7 +230,7 @@ msgstr "Hata..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -323,22 +333,12 @@ msgid "Password:"
 msgstr "Parola:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "Kurulum için paketler hazırlanılıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "tanımlarda"
 
@@ -357,6 +357,11 @@ msgstr "Bazı ek paketlerin kaldırılması gerekiyor"
 msgid "All packages, by update availability"
 msgstr "güncellenebilirliğine göre"
 
+#: ../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 "Yunanistan"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Birşey yapma"
@@ -426,11 +436,6 @@ msgstr "Yansı adresini 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"
@@ -499,6 +504,11 @@ msgstr "Yol:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' paketi indiriliyor (%s/%s)..."
 
@@ -509,6 +519,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Diğer"
 
@@ -517,36 +532,31 @@ msgstr "Diğer"
 msgid "Sweden"
 msgstr "İsveç"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Avusturya"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Hakkında..."
+msgid "Austria"
+msgstr "Avusturya"
 
 #: ../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 "Hakkında..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "İncele..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -554,22 +564,17 @@ msgstr "Japonya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Özet: "
 
 #: ../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
@@ -587,6 +592,11 @@ msgstr "Kaldır .%s"
 msgid "Importance: "
 msgstr "Önem: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -630,11 +640,6 @@ msgstr "Belçika"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Boyut: "
 
@@ -658,11 +663,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Kaynakları güncelle"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -698,6 +698,11 @@ msgstr "Kurulum sırasında sorunlar oluştu"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -708,16 +713,6 @@ msgstr "Düzenle"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Seçili: %d MB / Diskteki boş alan: %d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Diğer"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -740,11 +735,6 @@ msgstr "'%s' dosyasının kaynağı sınanıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "dosyalarda"
 
@@ -755,12 +745,17 @@ msgstr "Tüm paketler,"
 
 #: ../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
@@ -775,6 +770,16 @@ msgstr "Arama sonuçları (hiçbiri)"
 
 #: ../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 "Dur"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Lütfen bekleyin, ortam güncelleniyor..."
 
+#: ../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 "Finlandiya"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -871,12 +896,12 @@ msgstr "Değişiklikleri kaydet"
 
 #: ../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
@@ -887,6 +912,11 @@ msgstr "Daha Bilgi"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Ara"
 
@@ -911,16 +941,6 @@ msgid "Spain"
 msgstr "İspanya"
 
 #: ../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 "Güncelleme ortamı eklenirken hata"
@@ -932,11 +952,6 @@ msgstr "Dosyalar:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Kaynak paketleri alınamıyor."
 
@@ -946,6 +961,11 @@ msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Vekil sunucu kimlik denetimi için kullanıcıadı/parola belirtebilirsiniz:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Çin"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -958,11 +978,6 @@ msgstr "Ek paketlere ihtiyaç var"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1019,7 +1034,7 @@ msgstr "Bul:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1033,11 +1048,6 @@ msgid "Removable device"
 msgstr "Kaldırılabilinir aygıt"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "Kurulum için paketler hazırlanılıyor..."
@@ -1052,21 +1062,11 @@ msgstr "Lütfen bekleyin, paketler kaldırılıyor..."
 msgid "Please wait, adding medium..."
 msgstr "Lütfen bekleyin, ortam ekleniyor..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Diğer"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Kullanıcı adı:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1077,21 +1077,16 @@ msgstr "Belçika"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "Vekil sunucuları yapılandır"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "Vekil sunucuları yapılandır"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1099,11 +1094,6 @@ msgstr "'%s' paketinin imzası doğrulanıyor..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1117,16 +1107,6 @@ msgstr "Dosya hatası"
 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 ""
@@ -1138,12 +1118,7 @@ msgstr "Ortam güncellenemiyor; otomatik olarak görünmeyecek."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1156,25 +1131,20 @@ msgstr "Lütfen istediğiniz yansıyı seçin."
 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\" kaynağı düzenleniyor:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Güncelleme nedeni: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Kaynakları yapılandır"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Güncelleme nedeni: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1203,7 +1173,7 @@ msgstr "Kaldırım esnasında problem"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1229,22 +1199,37 @@ msgstr "Kurulum için paketler hazırlanılıyor..."
 
 #: ../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 "Tanım: "
 
 #: ../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
@@ -1252,6 +1237,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "İstenen paketler başarılı bir şekilde yüklendi."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1279,11 +1274,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Adı: "
 
@@ -1329,7 +1319,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1344,12 +1334,22 @@ msgstr "Seçili"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "En fazla bilgi"
 
 #: ../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 "Hata düzeltme güncellemeleri"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr ""
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Japonya"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1425,20 +1425,15 @@ msgstr "Lütfen bekleyin, erişilebilir paketler aranıyor..."
 msgid "Cancel"
 msgstr "İptal"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "Etkin?"
-
 #: ../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 "Etkin?"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1465,16 +1460,6 @@ msgstr "Kurulum tamamlandı"
 msgid " done."
 msgstr " tamamlandı."
 
-#: ../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 "Devam etmek için ortamı takmanız gerekli"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "Aşırı fazla paket seçildi"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Aşırı fazla paket seçildi"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1500,17 +1485,17 @@ msgstr "Birşey yapma"
 msgid "Danmark"
 msgstr "Danimarka"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "İndirme sırasında hata"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brezilya"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Yardım"
@@ -1520,6 +1505,11 @@ msgstr "Yardım"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Paketleri yüklemek için root olmanız gerekli, üzgünüm."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1547,7 +1537,7 @@ msgstr "kaynak deposuna göre"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1560,6 +1550,11 @@ msgstr "'%s' indirmesi , kalan zaman:%s , hız:%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1587,11 +1582,6 @@ msgstr "Ortam değiştir"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Seçimi sıfırla"
 
@@ -1600,6 +1590,11 @@ msgstr "Seçimi sıfırla"
 msgid "Mandrake Update"
 msgstr "Mandrake Güncelleme"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Diğer"
+
 #: ../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"
@@ -1674,23 +1674,13 @@ msgid "Currently installed version: "
 msgstr "Kurulu olan sürüm: "
 
 #: ../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 "Diğer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1715,7 +1705,7 @@ msgstr "Adı:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1723,6 +1713,11 @@ msgstr ""
 msgid "No update"
 msgstr "Güncelleme yok"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Birşey yapma"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1733,6 +1728,16 @@ msgstr "Tamam"
 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:"
@@ -1745,6 +1750,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1753,11 +1763,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "\"%s\" kaynağı düzenleniyor:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1821,11 +1826,6 @@ msgstr ""
 "Bu araç, bilgisayarınıza yüklemek istediğiniz güncellemeleri seçmede size\n"
 "yardımcı olacak."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2108,6 +2108,10 @@ msgid "Software Sources Manager"
 msgstr "Yazılım Kaynakları Yöneticisi"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP sunucu"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "şununla çakışıyor:"
 
diff --git a/po/tr.pom b/po/tr.pom
index 138697af..500acf74 100644
--- a/po/tr.pom
+++ b/po/tr.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "İş istasyonu"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Grafik Ortamı"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Geliştirme"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Sunucu"
 
diff --git a/po/uk.po b/po/uk.po
index 3884b7ca..f902d09f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-uk\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-19 22:43+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
@@ -24,14 +24,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"
@@ -39,13 +49,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
@@ -62,25 +67,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
@@ -116,6 +116,11 @@ msgstr ""
 msgid "Search results"
 msgstr "���������� ������"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "���Ʀ��� �Ԧ������/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -141,11 +146,6 @@ msgstr "����������� ���������� �����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "�������/������������/��̦��"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "�� ������� �������� ������"
 
@@ -159,6 +159,11 @@ msgstr "�����������"
 msgid "Package installation..."
 msgstr "�������������� �������..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "��������/����� � GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -175,6 +180,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 "���Ʀ��"
@@ -186,11 +206,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"
@@ -205,11 +220,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:"
@@ -226,9 +236,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
@@ -333,21 +343,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 "� ������"
 
@@ -366,6 +366,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"
@@ -383,6 +388,11 @@ msgstr "���æ�"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "��������"
 
@@ -436,11 +446,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"
@@ -510,6 +515,11 @@ msgstr "����:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "��������� ������� '%s' (%s/%s)..."
 
@@ -520,6 +530,11 @@ msgstr "��������:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "����"
 
@@ -528,36 +543,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"
@@ -565,23 +575,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 "��������/�"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -598,6 +603,11 @@ msgstr "�������� .%s"
 msgid "Importance: "
 msgstr "�����צ���: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -641,11 +651,6 @@ msgstr "�������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "�������/�������æ���̦��æ�"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "���ͦ�: "
 
@@ -669,11 +674,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..."
@@ -709,6 +709,11 @@ msgstr "������� Ц� ��� ������������"
 msgid "Terminals"
 msgstr "���ͦ����"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "�������/���� � ��̦��"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -719,16 +724,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"
@@ -751,11 +746,6 @@ msgstr "����צ��� ����� ������� `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "�������/�������"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "� ������"
 
@@ -766,13 +756,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
@@ -785,6 +780,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"
@@ -804,11 +809,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"
@@ -865,6 +885,11 @@ msgstr ""
 msgid "Finland"
 msgstr "�����Ħ�"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "�������/������/�����æ X11"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -881,14 +906,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
@@ -897,6 +922,11 @@ msgid "More info"
 msgstr "����� �������æ�"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "������/������ ��� ����'�����"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "�����"
@@ -923,16 +953,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 "��� �����ަ ������� ����������"
 
@@ -943,11 +963,6 @@ msgstr "�����:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "����/������"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "��������� �������� ������� � ���������."
 
@@ -956,6 +971,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"
@@ -968,11 +988,6 @@ msgstr "���Ҧ�Φ �������צ �������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "������/�������"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "��������� � ����ͦ �����������"
 
@@ -1035,9 +1050,9 @@ msgid "Find:"
 msgstr "������:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "��������/����"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "�������/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1051,11 +1066,6 @@ msgstr "�ͦ���� �����Ҧ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "���Ʀ��� �Ԧ������/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "�������������� ������� �� ������������..."
 
@@ -1069,21 +1079,11 @@ msgstr "���������, ���� �����, ���� rpm ������� æ �������..."
 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"
@@ -1094,21 +1094,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'..."
@@ -1116,11 +1111,6 @@ msgstr "����������� ������������ `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "�������/��̦�����"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "������� ���������� �������: %s"
 
@@ -1134,16 +1124,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
 #, c-format
 msgid ""
@@ -1158,14 +1138,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
@@ -1177,25 +1152,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
@@ -1224,8 +1194,8 @@ msgstr "�������� Ц� ��� ���������"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "���Ʀ��� �Ԧ������/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1250,29 +1220,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 ��"
 
 #: ../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"
@@ -1300,11 +1295,6 @@ msgstr "���� �����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "������/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "�����:"
 
@@ -1350,8 +1340,8 @@ msgstr "�����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "��������/����� � GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1364,14 +1354,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
@@ -1428,9 +1428,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
@@ -1447,6 +1447,11 @@ msgstr "���� �����, ���������, ����� ������Φ �������..."
 msgid "Cancel"
 msgstr "���������"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "�����/����"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1454,16 +1459,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 "�Ӧ ������� �� �������"
 
@@ -1487,16 +1482,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"
@@ -1504,15 +1489,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 "����� �� ������"
@@ -1522,17 +1507,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 "��צ���"
@@ -1542,6 +1527,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"
@@ -1568,9 +1558,9 @@ msgid "All packages, by medium repository"
 msgstr "�Ӧ �������, �� ��������"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "�������/������/�����æ X11"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "��Ȧ�������/���������"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1582,6 +1572,11 @@ msgstr "����������� `%s', ���������� ����:%s, ����˦���:%s"
 msgid "Add a host"
 msgstr "������ ������"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "��������/�"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1609,11 +1604,6 @@ msgstr "�ͦΦ�� ��Ӧ�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "���Ʀ��� �Ԧ������/�����"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "��������� ��¦�"
 
@@ -1622,6 +1612,11 @@ msgstr "��������� ��¦�"
 msgid "Mandrake Update"
 msgstr "���������� ��������"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "������/���Ԧ �������"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1638,14 +1633,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
@@ -1661,6 +1656,11 @@ msgstr ""
 "�������, ��� ���Ҧ��� �������� ���� ����� ������."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "�������/��̦�����"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1698,24 +1698,14 @@ 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"
-msgstr "�������/���Ʀ����æ�/������ � ���������"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "�����/�������ͦ�"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1739,14 +1729,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"
@@ -1757,6 +1752,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:"
@@ -1768,6 +1773,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"
@@ -1777,11 +1787,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"
@@ -1845,11 +1850,6 @@ msgstr ""
 "�� �������� �������� ��� ������� ����������, �˦ �� ������ ���������� �� \n"
 "��� ����'����."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "�������/������/True type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2131,6 +2131,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 "��������/����"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "���Ʀ��� �Ԧ������/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "�������/����"
+
+#~ msgid "Networking/Other"
+#~ msgstr "������/����"
+
+#~ msgid "Development/Java"
+#~ msgstr "��������/���"
+
+#~ 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 "���Ʀ��� �Ԧ������/�����"
+
+#~ msgid "Development/C++"
+#~ msgstr "��������/�++"
+
+#~ 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/uk.pom b/po/uk.pom
index 2e09b99d..e1366409 100644
--- a/po/uk.pom
+++ b/po/uk.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/uz.po b/po/uz.po
index 70e1a3d0..628525df 100644
--- a/po/uz.po
+++ b/po/uz.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-03-04 13:14+0000\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <uz-li@yahoogroups.com>\n"
@@ -20,7 +20,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remote access"
 msgstr ""
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
@@ -28,6 +33,11 @@ msgstr ""
 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 "Kanada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -58,24 +63,19 @@ msgstr "hamma narsa to'g'ri o'rnatildi"
 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 "Rivojlanish Apdeytlari"
 
-#: ../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
@@ -107,6 +107,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Qidirish natijalari"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -128,11 +133,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr ""
 
@@ -146,6 +146,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -163,19 +168,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "O'rnat"
+msgid "True type"
+msgstr "Turi"
+
+#: ../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 "O'rnat"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -189,11 +204,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "Rivojlanish Apdeytlari"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -211,7 +221,7 @@ msgstr "Xato..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -303,21 +313,11 @@ msgid "Password:"
 msgstr "Parol:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "Tavsiflar"
@@ -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 "Gretsiya"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "Hech narsa qilmash"
@@ -405,11 +415,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"
@@ -475,6 +480,11 @@ msgstr "Port:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "`%s' (%s/%s) paketi olinmoqda..."
 
@@ -485,6 +495,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Boshqa"
 
@@ -493,60 +508,50 @@ msgstr "Boshqa"
 msgid "Sweden"
 msgstr "Shvetsiya"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Avstriya"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "Ma'lumot"
+msgid "Austria"
+msgstr "Avstriya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "Rivojlanish Apdeytlari"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Ma'lumot"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Tekshirish..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "Yaponiya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "Xulosa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "Rivojlanish Apdeytlari"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -563,6 +568,11 @@ msgstr ""
 msgid "Importance: "
 msgstr "Muhimligi: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -599,11 +609,6 @@ msgid "Medium"
 msgstr "Belgiya"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "Hajm"
@@ -628,11 +633,6 @@ msgstr ""
 msgid "Update media"
 msgstr "Manba(lar)ni yangilash"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "Rivojlanish Apdeytlari"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -668,6 +668,11 @@ msgstr "O'rnatish paytida xatolar yuzaga keldi"
 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 "Tuzatish"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Tanlangan: %d Mb / Diskdagi bo'sh joy: %d Mb"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "Boshqa"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -710,11 +705,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "fayllarda"
 
@@ -724,13 +714,18 @@ msgid "All packages, by group"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "umumiy"
+
+#: ../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 "Qidirish natijalari (hech qanaqa)"
 
 #: ../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 "To'xtatish"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Qidirayapman, iltimos kutib turing..."
 
+#: ../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 "Paketni o'rnatish mumkin emas"
 msgid "Finland"
 msgstr "Finlyandiya"
 
+#: ../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 "O'zgarishlarni saqlash"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "Tarmoq sharoiti:"
+#, 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
@@ -844,6 +869,11 @@ msgstr "Qo'shimcha ma'lumot"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "Qidirish"
 
@@ -864,16 +894,6 @@ msgstr "Ispaniya"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "Rivojlanish Apdeytlari"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr ""
 
@@ -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 "Paketlaringizni tanlang"
@@ -897,6 +912,11 @@ msgstr "Paketlaringizni tanlang"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Xitoy"
+
 #: ../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 "Tarmoq"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -964,9 +979,9 @@ msgid "Find:"
 msgstr "Qidirish:"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "Rivojlanish Apdeytlari"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -979,11 +994,6 @@ msgid "Removable device"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
@@ -1000,21 +1010,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "Boshqa"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Foydalanuvchi:"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "Tarmoq"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1025,21 +1025,16 @@ msgstr "Belgiya"
 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 "Ogohlantirish"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1047,11 +1042,6 @@ msgstr "`%s' imzosi tekshirilmoqda..."
 
 #: ../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 xatosi"
 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 "Rivojlanish Apdeytlari"
-
 #: ../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,25 +1081,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 "Manbani (\"%s\") tuzatayapman:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Yangilash uchun sabab: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Manbalarni moslash"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "Yangilash uchun sabab: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1153,7 +1123,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1178,23 +1148,38 @@ msgid "No package found for installation."
 msgstr "O'rnatishga paketlar tayyorlanmoqda..."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "Turi"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "Tavsiflar"
 
 #: ../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
@@ -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
 #, c-format
 msgid "Local files"
@@ -1229,11 +1224,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "Tarmoq"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "Nom: %s"
 
@@ -1279,7 +1269,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1296,12 +1286,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "Eng ko'p ma'lumot"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1355,8 +1355,8 @@ msgstr "Xato tuzatish apdeytlarini ko'rsat"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "Tarmoq"
+msgid "Java"
+msgstr "Yaponiya"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1375,19 +1375,14 @@ msgstr ""
 msgid "Cancel"
 msgstr "Bekor"
 
-#: ../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
@@ -1415,16 +1410,6 @@ msgstr "O'rnatilgan"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "Rivojlanish Apdeytlari"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1432,12 +1417,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
@@ -1450,17 +1435,17 @@ msgstr "Hech narsa qilmash"
 msgid "Danmark"
 msgstr "Daniya"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "Tarmoq"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Download paytida xato"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Braziliya"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Yordam"
@@ -1470,6 +1455,11 @@ msgstr "Yordam"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Paketlarni o'rnatish uchun root bo'lish shart, uzr"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1497,7 +1487,7 @@ msgstr "manba bo'yicha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1510,6 +1500,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Rivojlanish Apdeytlari"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1537,11 +1532,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Tanlashni tiklash"
 
@@ -1550,6 +1540,11 @@ msgstr "Tanlashni tiklash"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate Tanlovlari"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Boshqa"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1562,12 +1557,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
@@ -1581,6 +1576,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1612,22 +1612,12 @@ msgstr "O'rnatilgan versiyasi: "
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "Rivojlanish Apdeytlari"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "Boshqa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1652,7 +1642,7 @@ msgstr "Nom"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1660,6 +1650,11 @@ msgstr ""
 msgid "No update"
 msgstr "Yangila"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Tarmoq"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1670,6 +1665,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:"
@@ -1682,6 +1687,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1690,11 +1700,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Manbani (\"%s\") tuzatayapman:"
 
-#: ../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:"
@@ -2058,6 +2058,58 @@ msgid "Software Sources Manager"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP server"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "Tarmoq sharoiti:"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "Tarmoq"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "Tarmoq"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "Tarmoq"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "Tarmoq"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "Rivojlanish Apdeytlari"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr "bu bilan ziddiyat"
 
@@ -2311,9 +2363,6 @@ msgstr ""
 #~ msgid "security"
 #~ msgstr "xavfsizlik"
 
-#~ msgid "general"
-#~ msgstr "umumiy"
-
 #~ msgid "bugfix"
 #~ msgstr "xatoni to'g'rilash"
 
@@ -2331,9 +2380,6 @@ msgstr ""
 #~ "Yangilanadigan paketlar ro'yxatini ola olmadim\n"
 #~ "Boshqa ko'zgu bilan urinib ko'ring"
 
-#~ msgid "Warning"
-#~ msgstr "Ogohlantirish"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2402,9 +2448,6 @@ msgstr ""
 #~ msgid "/Help/_About..."
 #~ msgstr "/Yordam/_Haqida..."
 
-#~ msgid "Type"
-#~ msgstr "Turi"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, 7.2 versiyasi\n"
 
diff --git a/po/uz.pom b/po/uz.pom
index 44642d43..4b2111da 100644
--- a/po/uz.pom
+++ b/po/uz.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 "Grafik muhit"
+
+# 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 "Server"
 
diff --git a/po/vi.po b/po/vi.po
index c35ec6a6..f9be2053 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-vi\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-31 23:35+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -18,14 +18,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "Lưu trữ / Loại khác"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Chạy mạng/Truy cập từ xa"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Hãy đợi, đang cập nhật phương tiện..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -33,13 +43,8 @@ msgstr "Canada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr "Khoa học/Khoa học máy tính"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Khoa học/Vật lý"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -56,25 +61,20 @@ msgstr "mọi thứ đã được cài đặt đúng"
 msgid "Verifying packages signatures..."
 msgstr "Đang thẩm tra chữ ký của các gói tin..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Bạn cần điền ít nhất là hai mục nhập đầu tiên."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Hệ thống/Cấu hình/Thức khác"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Chạy mạng/Truyền tập tin"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Hệ thống/Cấu hình/Chạy Mạng"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Phát triển/KDE và Qt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "Hệ thống/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Bạn cần điền ít nhất là hai mục nhập đầu tiên."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -109,6 +109,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Kết quả tìm kiếm"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Màn hình nền đồ họa/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -134,11 +139,6 @@ msgstr "Biên tập nhóm song song"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Hệ thống/Cấu hình/Phần cứng"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Cách chọn thủ công mirror của bạn"
 
@@ -152,6 +152,11 @@ msgstr "Xuất bản"
 msgid "Package installation..."
 msgstr "Cài đặt gói tin..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Phát triển/GNOME và GTK+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -168,6 +173,21 @@ msgid "Shells"
 msgstr "Shells"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Khoa học/Hóa học"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "True type"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Đồ họa"
@@ -179,11 +199,6 @@ msgstr "Ý"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Hệ thống/Kernel và phần cứng"
-
-#: ../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 "Cần đến một trong các gói tin sau:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Phát triển/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -219,9 +229,9 @@ msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Hệ thống/Cấu hình/Khởi động và Khởi tạo"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Sách/Văn học"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -325,21 +335,11 @@ msgstr "Mật khẩu:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Hệ thống/Máy chủ"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Cài đặt các gói phần mềm"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Màn hình nền đồ họa/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "trong các mô tả"
 
@@ -358,6 +358,11 @@ msgstr "Cần gỡ bỏ một số gói bổ sung"
 msgid "All packages, by update availability"
 msgstr "Mọi gói tin, theo mức sẵn có để cập nhật"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -375,6 +380,11 @@ msgstr "Hy lạp"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Theo dõi"
 
@@ -427,11 +437,6 @@ msgstr "Chọn một mirror..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Graphical desktop/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 "Đường dẫn: "
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Đang tải xuống gói tin `%s' (%s/%s)..."
 
@@ -511,6 +521,11 @@ msgstr "Giao thức:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "Khác"
 
@@ -519,36 +534,31 @@ msgstr "Khác"
 msgid "Sweden"
 msgstr "Thụy Điển"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Trò chơi/Bảng"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "Áo"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Thông tin..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Chạy mạng/Truyền tập tin"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Phát triển/Thứ khác"
+msgid "Info..."
+msgstr "Thông tin..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Thẩm tra..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Trò chơi/Bài lá"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -556,23 +566,18 @@ msgstr "Nhật"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Chạy mạng/Truy cập từ xa"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Tóm tắt: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Hệ thống/Phông chữ/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Phát triển/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -589,6 +594,11 @@ msgstr "Gỡ Bỏ .%s"
 msgid "Importance: "
 msgstr "Mức độ quan trọng: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -631,11 +641,6 @@ msgstr "Phương tiện"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Hệ thống/Quốc tế hóa"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Kích thước: "
 
@@ -659,11 +664,6 @@ msgstr "Thêm nhóm song song"
 msgid "Update media"
 msgstr "Phương tiện cập nhật"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Phát triển/Cơ sở dữ liệu"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -699,6 +699,11 @@ msgstr "Trục trặc trong khi cài đặt"
 msgid "Terminals"
 msgstr "Terminals"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Hệ thống/Kernel và phần cứng"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -709,16 +714,6 @@ msgstr "Hiệu chỉnh"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Đã chọn: %d MB / Không gian đĩa trống: %d MB"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Sách/Thứ Khác"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Khoa học/Thứ khác"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -741,11 +736,6 @@ msgstr "Đang kiểm tra tập tin ở xa của phương tiện `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Trò chơi/Thám hiểm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "trong các tập tin"
 
@@ -756,13 +746,18 @@ msgstr "Mọi gói tin, theo nhóm"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Màn hình nền đồ họa/Dựa trên FVWM"
+msgid "Kernel"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Trò chơi/Thể thao"
+msgid "Console"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -775,6 +770,16 @@ msgid "Search results (none)"
 msgstr "Kết quả tìm kiếm (không)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Trò chơi/Thám hiểm"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "Lưu trữ/Ghi CD"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -794,11 +799,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Dừng"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Khoa học/Sinh học"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Hãy đợi, đang tạo hdlist..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Khoa học/Toán học"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Hệ thống/Quốc tế hóa"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -859,6 +879,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Phần Lan"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Hệ thống/Phông chữ/X11 bitmap"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -875,14 +900,14 @@ msgid "Save changes"
 msgstr "Lưu lại các thay đổi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/News"
-msgstr "Chạy mạng/Tin tức"
+#, fuzzy, c-format
+msgid "Instant messaging"
+msgstr "Chạy mạng/Thông điệp tức thời"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "Sách/Câu hỏi thường gặp"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -891,6 +916,11 @@ msgid "More info"
 msgstr "Thêm thông tin"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Sách/Sách vi tính"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Tìm kiếm"
@@ -917,16 +947,6 @@ msgstr "Tây ban nha"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Khoa học/Thiên văn học"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Phát triển/Kernel"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Các phương tiện cập nhật hiện đang có"
 
@@ -937,11 +957,6 @@ msgstr "Tập tin:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Trò chơi/Arcade"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Không thể lấy các gói nguồn."
 
@@ -950,6 +965,11 @@ msgstr "Không thể lấy các gói nguồn."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Bạn có thể chỉ định người dùng/mật khẩu cho xác thực của proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Trung Quốc"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -962,11 +982,6 @@ msgstr "Cần thêm các gói bổ sung"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr "Chạy mạng/Tán chuyện"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Chạy trong chế độ người dùng"
 
@@ -1029,9 +1044,9 @@ msgid "Find:"
 msgstr "Tìm:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Phát triển/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Hệ thống/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1045,11 +1060,6 @@ msgstr "Thiết bị có thể gỡ bỏ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Màn hình nền đồ họa/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Đang chuẩn bị cài đặt các gói tin..."
 
@@ -1063,21 +1073,11 @@ msgstr "Hãy đợi, đang gỡ bỏ các gói..."
 msgid "Please wait, adding medium..."
 msgstr "Hãy đợi, đang thêm phương tiện..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Trò Chơi/Thứ Khác"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "Đăng nhập:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Chạy mạng/Thứ khác"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1088,21 +1088,16 @@ msgstr "Bỉ"
 msgid "File tools"
 msgstr "Công cụ tập tin"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "Lưu trữ/Ghi CD"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Khoa học/Sinh học"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Cấu hình các proxy"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Printing"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1110,11 +1105,6 @@ msgstr "Đang bắt đầu tải về `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Hệ thống/Thư viện"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Xả ra lỗi trầm trọng: %s."
 
@@ -1128,16 +1118,6 @@ msgstr "Lỗi trầm trọng"
 msgid "Leaves only, sorted by install date"
 msgstr "Chỉ bỏ đó, xếp loại theo ngày cài đặt"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Trò chơi/Chiến thuật"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Phát triển/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1152,14 +1132,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "Lưu trữ/Nén"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Sách/Văn học"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Khoa học/Geosciences"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1171,25 +1146,20 @@ msgstr "Hãy chọn mirror mong muốn."
 msgid "Communications"
 msgstr "Viễn thông"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Màn hình nền đồ họa/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Biên tập nhóm song song \"%s\":"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "Lý do cập nhật:"
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Viễn thông"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Khoa học/Toán học"
+msgid "Reason for update: "
+msgstr "Lý do cập nhật:"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1218,8 +1188,8 @@ msgstr "Có trục trặc khi gỡ bỏ"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Màn hình nền đồ họa/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1244,29 +1214,54 @@ msgstr "Không tìm thấy gói tin để cài đặt."
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Medium: "
 msgstr "Phương tiện: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Trò chơi/Chiến thuật"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Mô tả: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "Lưu trữ / Loại khác"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Khoa học/Hóa học"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Hệ thống/Cơ sở"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Mọi gói tin yêu cầu đã được cài đặt thành công."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Hệ thống/Máy chủ"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Puzzles"
+msgstr "Trò chơi/Đố ô chữ"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1294,11 +1289,6 @@ msgstr "Cơ sở dữ liệu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Chạy mạng/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "Tên: "
 
@@ -1344,8 +1334,8 @@ msgstr "Video"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Phát triển/GNOME và GTK+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1358,14 +1348,24 @@ msgid "Selected"
 msgstr "Được chọn"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Khoa học/Khoa học máy tính"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Thông tin tối đa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "Lưu trữ/Sao lưu"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1421,9 +1421,9 @@ msgid "Bugfixes updates"
 msgstr "Cập nhật sửa lỗi"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Chạy mạng/WWW"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Nhật"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1440,6 +1440,11 @@ msgstr "Hãy đợi, đang tìm các gói sẵn có..."
 msgid "Cancel"
 msgstr "Bỏ qua"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Khoa học/Thứ khác"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1447,16 +1452,6 @@ msgstr "Bật chạy?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Khoa học/Geosciences"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Hệ thống/Phông chữ/Console"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Mọi gói tin, theo bảng chữ cái"
 
@@ -1480,16 +1475,6 @@ msgstr "Kết thúc cài đặt"
 msgid " done."
 msgstr " hoàn thành."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Phát triển/KDE và Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Sách/Howto"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1497,15 +1482,15 @@ msgstr "Cần nạp phương tiện để tiếp tục"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Trò chơi/Bảng"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "Có quá nhiều gói tin được chọn"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Khoa học/Vật lý"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "Không làm gì"
@@ -1515,17 +1500,17 @@ msgstr "Không làm gì"
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Chạy mạng/Thư"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "Lỗi khi đang tải xuống"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Brazil"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Trợ giúp"
@@ -1535,6 +1520,11 @@ msgstr "Trợ giúp"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Xin lỗi, không thể lấy các gói nguồn. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Trò chơi/Thể thao"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1561,9 +1551,9 @@ msgid "All packages, by medium repository"
 msgstr "Mọi gói tin, theo vị trí đặt phương tiện"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Hệ thống/Phông chữ/X11 bitmap"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "Lưu trữ/Nén"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1575,6 +1565,11 @@ msgstr "Tải xuống của `%s', thời gian tải:%s, tốc độ:%s"
 msgid "Add a host"
 msgstr "Thêm host"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Phát triển/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1602,11 +1597,6 @@ msgstr "Thay phương tiện"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Màn hình nền đồ họa/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Lập lại việc chọn"
 
@@ -1615,6 +1605,11 @@ msgstr "Lập lại việc chọn"
 msgid "Mandrake Update"
 msgstr "Cập Nhật Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "Sách/Câu hỏi thường gặp"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1631,14 +1626,14 @@ msgstr ""
 "Xin hãy thử lại sau."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Sách/Sách vi tính"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Sách/Howto"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Hệ thống/Cơ sở"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -1652,6 +1647,11 @@ msgstr ""
 "Có thể bạn muốn cập nhật cơ sở dữ liệu các phương tiện."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Hệ thống/Thư viện"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1689,24 +1689,14 @@ msgid "Currently installed version: "
 msgstr "Phiên bản đã cài đặt hiện thời:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Phát triển/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Hệ thống/Cấu hình/In ấn"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr "Trò chơi/Đố ô chữ"
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Trò chơi/Bài lá"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Hệ thống/Cấu hình/Đóng gói"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Khoa học/Thiên văn học"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1730,14 +1720,19 @@ msgstr "Tên:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Màn hình nền đồ họa/Khác"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Không có cập nhật"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Chạy mạng/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1748,6 +1743,16 @@ msgstr "OK"
 msgid "Text tools"
 msgstr "Công cụ văn bản"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Trò chơi/Bài lá"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1759,6 +1764,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Hãy nhập hostname hay địa chỉ IP để thêm:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Trò chơi/Arcade"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1768,11 +1778,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Biên tập phương tiện \"%s\":"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr "Chạy mạng/Thông điệp tức thời"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1836,11 +1841,6 @@ msgstr ""
 "Công cụ này giúp bạn chọn các cập nhật mà bạn muốn cài đặt lên\n"
 "máy tính."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Hệ thống/Phông chữ/True type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2121,6 +2121,128 @@ msgstr "Gỡ Bỏ Phần Mềm"
 msgid "Software Sources Manager"
 msgstr "Chương Trình Quản Lý Nguồn Phần Mềm"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Hệ thống/Quốc tế hóa"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Công cụ tập tin"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Màn hình nền đồ họa/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Khoa học/Khoa học máy tính"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Hệ thống/Máy chủ"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "Cơ sở dữ liệu"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Màn hình nền đồ họa/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Khoa học/Khoa học máy tính"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Hệ thống/Cấu hình/Thức khác"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Hệ thống/Cấu hình/Chạy Mạng"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Hệ thống/Cấu hình/Phần cứng"
+
+#~ msgid "Development/Python"
+#~ msgstr "Phát triển/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Hệ thống/Cấu hình/Khởi động và Khởi tạo"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Graphical desktop/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Phát triển/Thứ khác"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Hệ thống/Phông chữ/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Phát triển/Cơ sở dữ liệu"
+
+#~ msgid "Books/Other"
+#~ msgstr "Sách/Thứ Khác"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Màn hình nền đồ họa/Dựa trên FVWM"
+
+#~ msgid "Networking/News"
+#~ msgstr "Chạy mạng/Tin tức"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Phát triển/Kernel"
+
+#~ msgid "Networking/Chat"
+#~ msgstr "Chạy mạng/Tán chuyện"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Phát triển/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Màn hình nền đồ họa/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Trò Chơi/Thứ Khác"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Chạy mạng/Thứ khác"
+
+#~ msgid "Development/Java"
+#~ msgstr "Phát triển/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Màn hình nền đồ họa/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "Lưu trữ/Sao lưu"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Chạy mạng/WWW"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Hệ thống/Phông chữ/Console"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Chạy mạng/Thư"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Màn hình nền đồ họa/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Phát triển/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Hệ thống/Cấu hình/In ấn"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Hệ thống/Cấu hình/Đóng gói"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Màn hình nền đồ họa/Khác"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Hệ thống/Phông chữ/True type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s xung đột với %s"
 
diff --git a/po/vi.pom b/po/vi.pom
index 28021847..397d3ca4 100644
--- a/po/vi.pom
+++ b/po/vi.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Trạm làm việc"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Môi trường đồ hoạ"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Phát triển"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Máy chủ"
 
diff --git a/po/wa.po b/po/wa.po
index e478221c..12fd6068 100644
--- a/po/wa.po
+++ b/po/wa.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-05-13 13:32+0200\n"
 "Last-Translator: Pablo Saratxaga <pablo@mandrakesoft.com>\n"
 "Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -22,14 +22,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
-msgstr "�rtchivaedje/�tes"
+msgid "Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "Rantoele/Acc�s d� lon"
 
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "T�rdj�z on p� s'�i vs plait, metaedje a djo� do sopoirt..."
 
+#: ../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 "Siyinces/Informatike"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
-msgstr "Siyinces/Fizike"
+msgid "Python"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -60,25 +65,20 @@ msgstr "totafwait a st� astal� comuf�t"
 msgid "Verifying packages signatures..."
 msgstr "Verifiaedje des sinateures des pacaedjes..."
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "Vos dvoz rimpli pol moens les deus prumir�s intr�yes."
-
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Other"
-msgstr "Sistinme/Apontiaedje/�tes"
+#, fuzzy, c-format
+msgid "File transfer"
+msgstr "Rantoele/TRansfer di fitch�s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr "Sistinme/Apontiaedje/Rantoele"
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "Programaedje/KDE et Qt"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr "Sistinme/XFree86"
+msgid "You need to fill up at least the two first entries."
+msgstr "Vos dvoz rimpli pol moens les deus prumir�s intr�yes."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -114,6 +114,11 @@ msgstr ""
 msgid "Search results"
 msgstr "Rizultats do cweraedje"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Graphical desktop"
+msgstr "Sicribanne/KDE"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -140,11 +145,6 @@ msgstr "Candj� on groupe paralele"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr "Sistinme/Apontiaedje/�ndjolreye"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kimint tchoezi manuwelmint vosse muroe"
 
@@ -158,6 +158,11 @@ msgstr "Aplaidaedje"
 msgid "Package installation..."
 msgstr "Astalaedje do pacaedje..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "GNOME and GTK+"
+msgstr "Programaedje/GNOME et Gtk+"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Select the media you wish to update:"
@@ -174,6 +179,21 @@ msgid "Shells"
 msgstr "Shells"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chemistry"
+msgstr "Siyinces/Chimeye"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "True type"
+msgstr "S�re"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Base"
+msgstr ""
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Graphics"
 msgstr "Dessinaedjes"
@@ -185,11 +205,6 @@ msgstr "It�leye"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
-msgstr "Sistinme/Nawea ey�t �ndjolreye"
-
-#: ../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"
@@ -204,11 +219,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "I gn a mez�jhe d'�onk des pacaedjes ki shuv�t:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Python"
-msgstr "Programaedje/Python"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -225,9 +235,9 @@ msgid "Proxy..."
 msgstr "Proxy..."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Boot and Init"
-msgstr "Sistinme/Apontiaedje/Enondaedje del �ndjole"
+#, fuzzy, c-format
+msgid "Litterature"
+msgstr "Lives/Bel�s letes"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -332,21 +342,11 @@ msgstr "Sicret:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Servers"
-msgstr "Sistinme/Sierveus"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Software Packages Installation"
 msgstr "Astalaedje des pacaedjes di programes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/KDE"
-msgstr "Sicribanne/KDE"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "ez�s discrijhaedjes"
 
@@ -365,6 +365,11 @@ msgstr "K�k�s �tes pacaedjes div�t esse oist�s"
 msgid "All packages, by update availability"
 msgstr "To les pacaedjes, pa disponibilit� di metaedjes a djo�"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure media"
@@ -382,6 +387,11 @@ msgstr "Grece"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Monitoring"
 msgstr "Corwaitaedje"
 
@@ -436,11 +446,6 @@ msgstr "Tchoezixhoz on muroe..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-msgstr "Sicribanne/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"
@@ -510,6 +515,11 @@ msgstr "Tchimin:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Aberwetant l'�pacaedje �%s� (%s/%s)..."
 
@@ -520,6 +530,11 @@ msgstr "Protocole:"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "�te"
 
@@ -528,36 +543,31 @@ msgstr "�te"
 msgid "Sweden"
 msgstr "Suwede"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Boards"
+msgstr "Djeus/Djeus d'�platea"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
 msgstr "�triche"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Info..."
-msgstr "Inform�cions..."
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
-msgstr "Rantoele/TRansfer di fitch�s"
+msgid "Faqs"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Development/Other"
-msgstr "Programaedje/�tes"
+msgid "Info..."
+msgstr "Inform�cions..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "Analijhant..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr "Djeus/Cw�rdjeus"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
@@ -565,23 +575,18 @@ msgstr "Djapon"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Remote access"
-msgstr "Rantoele/Acc�s d� lon"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Summary: "
 msgstr "Rascourti: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
-msgstr "Sistinme/Fontes/Type1"
+msgid "Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/C"
-msgstr "Programaedje/C"
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -598,6 +603,11 @@ msgstr "Oister les *.%s"
 msgid "Importance: "
 msgstr "Imp�rtance: "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -643,11 +653,6 @@ msgstr "Sopoirt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr "Sistinme/Eternacion�lijhaedje"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "Grandeu: "
 
@@ -671,11 +676,6 @@ msgstr "Radjouter on groupe paralele"
 msgid "Update media"
 msgstr "Mete a djo� les sopoirts"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Databases"
-msgstr "Programaedje/B�zes di donneyes"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -711,6 +711,11 @@ msgstr "�k n'�a n�n st� tins d'�l'�astalaedje"
 msgid "Terminals"
 msgstr "Termin�s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel and hardware"
+msgstr "Sistinme/Nawea ey�t �ndjolreye"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -721,16 +726,6 @@ msgstr "Candj�"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Tchoezi: %d Mo / Plaece libe sol deure plake: %d Mo"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Other"
-msgstr "Lives/�tes"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr "Siyinces/�t�s syinces"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -753,11 +748,6 @@ msgstr "Dji corwaite li fitch� d� lon pol sopoirt �%s�..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr "Djeus/Advinteure"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "ez�s fitch�s"
 
@@ -767,14 +757,19 @@ msgid "All packages, by group"
 msgstr "Tos les pacaedjes, pa groupe"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "djener�"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
-msgstr "Sicribanne/B�z� so fvwm"
+msgid "Console"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
-msgstr "Djeus/Sp�rts"
+msgid "C++"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -787,6 +782,16 @@ msgid "Search results (none)"
 msgstr "Rizultats do cweraedje (nouk)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Adventure"
+msgstr "Djeus/Advinteure"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cd burning"
+msgstr "�rtchivaedje/Bro�laedje di CDs"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -806,11 +811,26 @@ msgstr ""
 msgid "Stop"
 msgstr "Arester"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Biology"
+msgstr "Siyinces/Biolodjeye"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "T�rdj�z on p� s'�i vs plait, dji fwai l'�fitch� �hdlist�..."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mathematics"
+msgstr "Siyinces/Matematike"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Internationalization"
+msgstr "Sistinme/Eternacion�lijhaedje"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit a medium"
@@ -871,6 +891,11 @@ msgstr ""
 msgid "Finland"
 msgstr "Finlande"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "X11 bitmap"
+msgstr "Sistinme/Fontes/Bitmap X11"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -888,13 +913,13 @@ msgstr "Schaper les candjmints"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/News"
-msgstr "Rantoele/Copinreyes (news)"
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
-msgstr "L�ves/FAQs"
+msgid "News"
+msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
@@ -903,6 +928,11 @@ msgid "More info"
 msgstr "Pus d'�info"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer books"
+msgstr "Lives/Lives d' informatike"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Search"
 msgstr "Cweri"
@@ -929,16 +959,6 @@ msgstr "Espagne"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Astronomy"
-msgstr "Siyinces/Astronomeye"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Kernel"
-msgstr "Programaedje/Nawea"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Already existing update media"
 msgstr "Sopoirts di metaedjes a djo� k'�egzist�t ddja"
 
@@ -949,11 +969,6 @@ msgstr "Fitch�s:\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr "Djeus/�rc�de"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "Dji n'�a n�n savou prinde les pacaedjes sourdants."
 
@@ -962,6 +977,11 @@ msgstr "Dji n'�a n�n savou prinde les pacaedjes sourdants."
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Vos ploz dner �n uzeu et si scret po l'�otintifiaedje sol proxy:"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "Chine"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -974,11 +994,6 @@ msgstr "�tes pacaedjes k'�end a mez�jhe"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr "Enond� e m�de uzeu"
 
@@ -1041,9 +1056,9 @@ msgid "Find:"
 msgstr "Trover:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/Perl"
-msgstr "Programaedje/Perl"
+#, fuzzy, c-format
+msgid "XFree86"
+msgstr "Sistinme/XFree86"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1057,11 +1072,6 @@ msgstr "Bodj�ve sopoirt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr "Sicribanne/Icewm"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "Dj'�aprest�ye les pacaedjes po l'�astalaedje..."
 
@@ -1075,21 +1085,11 @@ msgstr "T�rdj�z on p� s'�i vs plait, rpm oist�ye les pacaedjes..."
 msgid "Please wait, adding medium..."
 msgstr "T�rdj�z on p� s'�i vs plait, dji radjoute on sopoirt..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Other"
-msgstr "Djeus/�tes"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "No d'�elodjaedje:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Other"
-msgstr "Rantoele/�tes"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1100,21 +1100,16 @@ msgstr "Beljike"
 msgid "File tools"
 msgstr "Usteyes po fitch�s"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr "�rtchivaedje/Bro�laedje di CDs"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr "Siyinces/Biolodjeye"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "Aponty� les proxies"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "Adviertixhmint"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1122,11 +1117,6 @@ msgstr "Dj'�atake l'�aberwetaedje di �%s�..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr "Sistinme/L�vreyes"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "I gn a-st avou �n aroke moirt: %s."
 
@@ -1140,16 +1130,6 @@ msgstr "Aroke moirt"
 msgid "Leaves only, sorted by install date"
 msgstr "R�n k'�les foyes, rel�jhowes pal date d'�astalaedje"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr "Djeus/Stratedjeye"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/Java"
-msgstr "Programaedje/Java"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1164,14 +1144,9 @@ msgstr ""
 "%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Compression"
-msgstr "�rtchivaedje/Rastrindaedje"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
-msgstr "Lives/Bel�s letes"
+#, fuzzy, c-format
+msgid "Geosciences"
+msgstr "Siyinces/Siyinces del Daegn"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1183,25 +1158,20 @@ msgstr "Tchoezixhoz li muroe ki vos vloz, s'�i vs plait."
 msgid "Communications"
 msgstr "Comunic�cions"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr "Sicribanne/Sawfish"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Dji candje li groupe paralele �%s�:"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "R�jhon do metaedje a djo�: "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "Comunic�cions"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr "Siyinces/Matematike"
+msgid "Reason for update: "
+msgstr "R�jhon do metaedje a djo�: "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1230,8 +1200,8 @@ msgstr "�k n'�a n�n st� tins do oistaedje"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
-msgstr "Sicribanne/Enlightenment"
+msgid "WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1255,30 +1225,55 @@ msgid "No package found for installation."
 msgstr "Nou pacaedje n'�a st� trov� po l'�astalaedje."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "S�re"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr "Sopoirt: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Strategy"
+msgstr "Djeus/Stratedjeye"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Description: "
 msgstr "Discrijhaedje: "
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Archiving"
+msgstr "�rtchivaedje/�tes"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Chemistry"
-msgstr "Siyinces/Chimeye"
+#, fuzzy, c-format
+msgid "System"
+msgstr "Sistinme/B�ze"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Totes les pacaedjes dimand�s ont st� astal�s comuf�t."
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Servers"
+msgstr "Sistinme/Sierveus"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1306,11 +1301,6 @@ msgstr "B�zes di doneyes"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr "Rantoele/IRC"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "No do pacaedje: "
 
@@ -1356,8 +1346,8 @@ msgstr "Videyo"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
-msgstr "Programaedje/GNOME et Gtk+"
+msgid "Perl"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1370,14 +1360,24 @@ msgid "Selected"
 msgstr "Tchoezi"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Computer science"
+msgstr "Siyinces/Informatike"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
 msgstr "Li pus d'�inform�cions"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
-msgstr "�rtchivaedjes/Copeyes di s�vrit�"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1433,9 +1433,9 @@ msgid "Bugfixes updates"
 msgstr "Metaedjes a djo� di coridjaedje"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/WWW"
-msgstr "Rantoele/Waibe"
+#, fuzzy, c-format
+msgid "Java"
+msgstr "Djapon"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -1452,6 +1452,11 @@ msgstr "T�rdj�z on p� s'�i vs plait, dji cwir apr�s les pacaedjes k'�i gn a..."
 msgid "Cancel"
 msgstr "Rinonc�"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sciences"
+msgstr "Siyinces/�t�s syinces"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
@@ -1459,16 +1464,6 @@ msgstr "En alaedje?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
-msgstr "Siyinces/Siyinces del Daegn"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/Console"
-msgstr "Sistinme/Fontes/Conz�le"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "All packages, alphabetical"
 msgstr "Tos les pacaedjes, rel�s alfabeticmint"
 
@@ -1492,16 +1487,6 @@ msgstr "L'�astalaedje a fini"
 msgid " done."
 msgstr " fwait."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Development/KDE and Qt"
-msgstr "Programaedje/KDE et Qt"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr "Lives/Howtos"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1509,15 +1494,15 @@ msgstr "Vos dvoz mete li sopoirt dins l'�l�jheu po continuwer"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr "Djeus/Djeus d'�platea"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Too many packages are selected"
 msgstr "P�r trop di pacaedjes ont st� tchoezis"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Physics"
+msgstr "Siyinces/Fizike"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
 msgstr "�n r�n f�"
@@ -1527,17 +1512,17 @@ msgstr "�n r�n f�"
 msgid "Danmark"
 msgstr "Daenm�tche"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Mail"
-msgstr "Rantoele/Emilaedje"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "�k n'�a n�n st� tot-z aberwetant"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "Braezi"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "Aidance"
@@ -1547,6 +1532,11 @@ msgstr "Aidance"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Dji m'�escuze, mins dji n'�sai prinde les pacaedjes sourdants. %s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Sports"
+msgstr "Djeus/Sp�rts"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1573,9 +1563,9 @@ msgid "All packages, by medium repository"
 msgstr "Tos les pacaedjes, pa sopoirt d'�astalaedje"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/X11 bitmap"
-msgstr "Sistinme/Fontes/Bitmap X11"
+#, fuzzy, c-format
+msgid "Compression"
+msgstr "�rtchivaedje/Rastrindaedje"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1587,6 +1577,11 @@ msgstr "Aberwetaedje di �%s�, tins ki dmeure:%s, roedeu:%s"
 msgid "Add a host"
 msgstr "Radjouter on lodjoe"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "Programaedje/C"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1614,11 +1609,6 @@ msgstr "Candj� di sopoirt"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr "Sicribanne/GNOME"
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "Rif� l'�tchuze"
 
@@ -1627,6 +1617,11 @@ msgstr "Rif� l'�tchuze"
 msgid "Mandrake Update"
 msgstr "Metaedjes a djo� di Mandrake"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "L�ves/FAQs"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1644,14 +1639,14 @@ msgstr ""
 "Risay�z ene miete pus t�rd."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Books/Computer books"
-msgstr "Lives/Lives d' informatike"
+#, fuzzy, c-format
+msgid "Howtos"
+msgstr "Lives/Howtos"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
-msgstr "Sistinme/B�ze"
+msgid "Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1667,6 +1662,11 @@ msgstr ""
 "Vos dvoz motoit mete a djo� vosse b�ze di dn�yes des sopoirts."
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Libraries"
+msgstr "Sistinme/L�vreyes"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1704,24 +1704,14 @@ msgid "Currently installed version: "
 msgstr "Mod�ye d'�astal�ye: "
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Development/C++"
-msgstr "Programaedje/C++"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr "Sistinme/Apontiaedje/Eprimaedje"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+#, fuzzy, c-format
+msgid "Games"
+msgstr "Djeus/Cw�rdjeus"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Packaging"
-msgstr "Sistinme/Apontiaedje/Manaedjmint des pacaedjes"
+#, fuzzy, c-format
+msgid "Astronomy"
+msgstr "Siyinces/Astronomeye"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1745,14 +1735,19 @@ msgstr "No:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
-msgstr "Sicribanne/�tes"
+msgid "KDE"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
 msgstr "Nou metaedjes a djo�"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "Rantoele/IRC"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1763,6 +1758,16 @@ msgstr "'l est bon"
 msgid "Text tools"
 msgstr "Usteyes tecsse"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Cards"
+msgstr "Djeus/Cw�rdjeus"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Group name:"
@@ -1774,6 +1779,11 @@ msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Tapez li no ou l'�adresse do lodjoe ki vos vloz radjouter:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Arcade"
+msgstr "Djeus/�rc�de"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
@@ -1783,11 +1793,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "Dji candje li sopoirt �%s�:"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add a medium limit"
@@ -1851,11 +1856,6 @@ msgstr ""
 "Ciste usteye chal vos aidr� a tchoezi les metaedjes a djo� ki vos vloz\n"
 "astaler sol copiutrece da vosse."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr "Sistinme/Fontes/True Type"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
@@ -2136,6 +2136,125 @@ msgstr "Oister des programes"
 msgid "Software Sources Manager"
 msgstr "Manaedjeu des sourdants d'�astalaedje"
 
+#, fuzzy
+#~ msgid "Internet station"
+#~ msgstr "Sistinme/Eternacion�lijhaedje"
+
+#, fuzzy
+#~ msgid "Console Tools"
+#~ msgstr "Usteyes po fitch�s"
+
+#, fuzzy
+#~ msgid "Other Graphical Desktops"
+#~ msgstr "Sicribanne/KDE"
+
+#, fuzzy
+#~ msgid "Network Computer (client)"
+#~ msgstr "Siyinces/Informatike"
+
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "Sistinme/Sierveus"
+
+#, fuzzy
+#~ msgid "Database"
+#~ msgstr "B�zes di doneyes"
+
+#, fuzzy
+#~ msgid "Graphical Environment"
+#~ msgstr "Sicribanne/Enlightenment"
+
+#, fuzzy
+#~ msgid "Network Computer server"
+#~ msgstr "Siyinces/Informatike"
+
+#~ msgid "System/Configuration/Other"
+#~ msgstr "Sistinme/Apontiaedje/�tes"
+
+#~ msgid "System/Configuration/Networking"
+#~ msgstr "Sistinme/Apontiaedje/Rantoele"
+
+#~ msgid "System/Configuration/Hardware"
+#~ msgstr "Sistinme/Apontiaedje/�ndjolreye"
+
+#~ msgid "Development/Python"
+#~ msgstr "Programaedje/Python"
+
+#~ msgid "System/Configuration/Boot and Init"
+#~ msgstr "Sistinme/Apontiaedje/Enondaedje del �ndjole"
+
+#~ msgid "Graphical desktop/WindowMaker"
+#~ msgstr "Sicribanne/WindowMaker"
+
+#~ msgid "Development/Other"
+#~ msgstr "Programaedje/�tes"
+
+#~ msgid "System/Fonts/Type1"
+#~ msgstr "Sistinme/Fontes/Type1"
+
+#~ msgid "Development/Databases"
+#~ msgstr "Programaedje/B�zes di donneyes"
+
+#~ msgid "Books/Other"
+#~ msgstr "Lives/�tes"
+
+#~ msgid "Graphical desktop/FVWM based"
+#~ msgstr "Sicribanne/B�z� so fvwm"
+
+#~ msgid "Networking/News"
+#~ msgstr "Rantoele/Copinreyes (news)"
+
+#~ msgid "Development/Kernel"
+#~ msgstr "Programaedje/Nawea"
+
+#~ msgid "Development/Perl"
+#~ msgstr "Programaedje/Perl"
+
+#~ msgid "Graphical desktop/Icewm"
+#~ msgstr "Sicribanne/Icewm"
+
+#~ msgid "Games/Other"
+#~ msgstr "Djeus/�tes"
+
+#~ msgid "Networking/Other"
+#~ msgstr "Rantoele/�tes"
+
+#~ msgid "Development/Java"
+#~ msgstr "Programaedje/Java"
+
+#~ msgid "Graphical desktop/Sawfish"
+#~ msgstr "Sicribanne/Sawfish"
+
+#~ msgid "Archiving/Backup"
+#~ msgstr "�rtchivaedjes/Copeyes di s�vrit�"
+
+#~ msgid "Networking/WWW"
+#~ msgstr "Rantoele/Waibe"
+
+#~ msgid "System/Fonts/Console"
+#~ msgstr "Sistinme/Fontes/Conz�le"
+
+#~ msgid "Networking/Mail"
+#~ msgstr "Rantoele/Emilaedje"
+
+#~ msgid "Graphical desktop/GNOME"
+#~ msgstr "Sicribanne/GNOME"
+
+#~ msgid "Development/C++"
+#~ msgstr "Programaedje/C++"
+
+#~ msgid "System/Configuration/Printing"
+#~ msgstr "Sistinme/Apontiaedje/Eprimaedje"
+
+#~ msgid "System/Configuration/Packaging"
+#~ msgstr "Sistinme/Apontiaedje/Manaedjmint des pacaedjes"
+
+#~ msgid "Graphical desktop/Other"
+#~ msgstr "Sicribanne/�tes"
+
+#~ msgid "System/Fonts/True type"
+#~ msgstr "Sistinme/Fontes/True Type"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s fwait des conflits avou %s"
 
@@ -2517,9 +2636,6 @@ msgstr "Manaedjeu des sourdants d'�astalaedje"
 #~ msgid "security"
 #~ msgstr "s�vrit�"
 
-#~ msgid "general"
-#~ msgstr "djener�"
-
 #~ msgid "bugfix"
 #~ msgstr "coridjaedje"
 
@@ -2537,9 +2653,6 @@ msgstr "Manaedjeu des sourdants d'�astalaedje"
 #~ "Dji n'�a savu prinde li djiv�ye des pacaedjes a mete a djo�\n"
 #~ "Say�z di novea avou �n �te muroe"
 
-#~ msgid "Warning"
-#~ msgstr "Adviertixhmint"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2608,9 +2721,6 @@ msgstr "Manaedjeu des sourdants d'�astalaedje"
 #~ msgid "/Help/_About..."
 #~ msgstr "/_Aidance/� _dfait..."
 
-#~ msgid "Type"
-#~ msgstr "S�re"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate, mod�ye 7.2\n"
 
diff --git a/po/wa.pom b/po/wa.pom
index baa4025d..da8b96d9 100644
--- a/po/wa.pom
+++ b/po/wa.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "Posse �ndjolrece"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Graphical Environment"
+msgstr "Evironmint grafike"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Development"
 msgstr "Programaedje"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "Sierveu"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 09121f1d..d52f2888 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\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-24 11:13+0800\n"
 "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
 "Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\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 "您至少要填写头两项。"
-
 #: ../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,19 +177,29 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, 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
+#, c-format
+msgid "Italy"
+msgstr "意大利"
+
 #: ../rpmdrake:1
 #, c-format
 msgid ""
@@ -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
@@ -322,21 +332,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 ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in descriptions"
 msgstr "在描述中"
 
@@ -355,6 +355,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"
@@ -371,6 +376,11 @@ msgid "Greece"
 msgstr "希腊"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "不做任何事"
@@ -423,11 +433,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"
@@ -495,6 +500,11 @@ msgstr "路径："
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下载软件包“%s”（%s/%s）..."
 
@@ -505,6 +515,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "其他"
 
@@ -513,36 +528,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"
@@ -550,22 +560,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
@@ -583,6 +588,11 @@ msgstr "删除 .%s"
 msgid "Importance: "
 msgstr "重要性："
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -624,11 +634,6 @@ msgstr "来源"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Size: "
 msgstr "大小："
 
@@ -652,11 +657,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..."
@@ -692,6 +692,11 @@ msgstr "在安装过程中发生问题"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -702,16 +707,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"
@@ -734,11 +729,6 @@ msgstr "正在检查源“%s”的文件..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "在文件中"
 
@@ -749,12 +739,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
@@ -769,6 +764,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"
@@ -786,11 +791,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"
@@ -848,6 +868,11 @@ msgstr ""
 msgid "Finland"
 msgstr "芬兰"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Media limit:"
@@ -865,12 +890,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
@@ -881,6 +906,11 @@ msgstr "更多信息"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "搜索"
 
@@ -903,16 +933,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 "升级来源已经存在"
@@ -924,11 +944,6 @@ msgstr "文件：\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
@@ -937,6 +952,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"
@@ -949,11 +969,6 @@ msgstr "需要另外的软件包"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/Chat"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Running in user mode"
 msgstr ""
 
@@ -1014,7 +1029,7 @@ msgstr "查找："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/Perl"
+msgid "XFree86"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1029,11 +1044,6 @@ msgstr "可移动设备"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包"
 
@@ -1047,21 +1057,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"
@@ -1072,21 +1072,16 @@ msgstr "比利时"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
+msgid "Configure proxies"
+msgstr "配置代理服务器"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Biology"
+msgid "Printing"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Configure proxies"
-msgstr "配置代理服务器"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
@@ -1094,11 +1089,6 @@ msgstr "开始下载“%s”..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr "发生了一个致命错误：%s。"
 
@@ -1112,16 +1102,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
 #, c-format
 msgid ""
@@ -1137,12 +1117,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1155,25 +1130,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
@@ -1202,7 +1172,7 @@ msgstr "在删除过程中发生问题"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1227,23 +1197,38 @@ msgid "No package found for installation."
 msgstr "没有可供安装的软件包。"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Type1"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Medium: "
 msgstr "来源："
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, 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
@@ -1251,6 +1236,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"
@@ -1278,11 +1273,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/IRC"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Name: "
 msgstr "名称："
 
@@ -1328,7 +1318,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1343,12 +1333,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
@@ -1404,9 +1404,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
@@ -1423,20 +1423,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
@@ -1463,16 +1458,6 @@ 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"
@@ -1480,13 +1465,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
@@ -1498,17 +1483,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 "帮助"
@@ -1518,6 +1503,11 @@ msgstr "帮助"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1545,7 +1535,7 @@ msgstr "按照来源库排列"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1558,6 +1548,11 @@ msgstr "下载“%s”，剩余时间：%s，速度：%s"
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Development"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1585,11 +1580,6 @@ msgstr "更换来源"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "重置选中"
 
@@ -1598,6 +1588,11 @@ msgstr "重置选中"
 msgid "Mandrake Update"
 msgstr "Mandrake 自动升级"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "其他"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1615,12 +1610,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
@@ -1636,6 +1631,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
@@ -1672,23 +1672,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
@@ -1713,7 +1703,7 @@ msgstr "名称："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1721,6 +1711,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"
@@ -1731,6 +1726,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:"
@@ -1743,6 +1748,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "Drake RPM 管理器"
 
@@ -1751,11 +1761,6 @@ msgstr "Drake RPM 管理器"
 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"
@@ -1818,11 +1823,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 @@ msgstr "删除软件"
 msgid "Software Sources Manager"
 msgstr "软件源管理器"
 
+#, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP 服务器"
+
 #~ msgid "%s conflicts with %s"
 #~ msgstr "%s 与 %s 相冲突"
 
diff --git a/po/zh_CN.pom b/po/zh_CN.pom
index 2279d18d..dd520e57 100644
--- a/po/zh_CN.pom
+++ b/po/zh_CN.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/zh_TW.po b/po/zh_TW.po
index 697c2b6d..b7c0a3de 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.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: 2002-08-25 06:10+0800\n"
 "Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\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 "�еy��A��s�C����..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "�[���j"
 
 #: ../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 "�Ҧ����ؤw�g���w�˦��\�F�C"
 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 "�z�ܤֻݭn��J�e����Ӷ��ءC"
-
 #: ../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 "�}�o��s"
 
-#: ../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 "�z�ܤֻݭn��J�e����Ӷ��ءC"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "�j�M���G"
 
+#: ../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 "�p���ʿ�ܱz�ݭn���M�g���x"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "���b�ǳƦw��"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -172,21 +177,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "�w��"
+msgid "True type"
+msgstr "���O"
 
 #: ../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 "�w��"
+
+#: ../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 "�N�ݭn�U�C���䤤���@�M��G"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "�}�o��s"
-
 #: ../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
@@ -322,21 +332,11 @@ msgid "Password:"
 msgstr "�K�X�G"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "���b�ǳƦw��"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "�y�z"
@@ -356,6 +356,11 @@ msgstr "���F�i�H�����B�@���`�o���B�~���M�󥲶��@�P�w��"
 msgid "All packages, by update availability"
 msgstr "�̥i�ѧ�s����"
 
+#: ../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 "��þ"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "�S���i�����ʧ@"
@@ -424,11 +434,6 @@ msgstr "��ܬM�g�a�}..."
 
 #: ../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"
@@ -498,6 +503,11 @@ msgstr "�𸹡G"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "���b�U���u%s�v(%s/%s)..."
 
@@ -508,6 +518,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "��L"
 
@@ -516,60 +531,50 @@ msgstr "��L"
 msgid "Sweden"
 msgstr "���"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "���a�Q"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "��T..."
+msgid "Austria"
+msgstr "���a�Q"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "�}�o��s"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "��T..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "�ˬd..."
 
-#: ../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 "�K�n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "�}�o��s"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -586,6 +591,11 @@ msgstr "���� .%s"
 msgid "Importance: "
 msgstr "���n�ʡG "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -626,11 +636,6 @@ msgid "Medium"
 msgstr "��Q��"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "�j�p"
@@ -655,11 +660,6 @@ msgstr ""
 msgid "Update media"
 msgstr "��s�ӷ�"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "�}�o��s"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -695,6 +695,11 @@ msgstr "�w�ˮɵo�Ͱ��D"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -705,16 +710,6 @@ msgstr "�s��"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "�w��ܡG%d MB / �i�κϺЪŶ��G%d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "��L"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -737,11 +732,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "���ɮ�"
 
@@ -751,13 +741,18 @@ msgid "All packages, by group"
 msgstr "�Ҧ��M��A"
 
 #: ../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
@@ -772,6 +767,16 @@ msgstr "�j�M���G (�L����ŦX������)"
 
 #: ../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"
@@ -788,11 +793,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 "�еy��A��s�C����..."
 
+#: ../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"
@@ -847,6 +867,11 @@ msgstr ""
 msgid "Finland"
 msgstr "����"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -863,13 +888,13 @@ msgid "Save changes"
 msgstr "�x�s�ܧ�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "�����]�w�G"
+#, 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
@@ -880,6 +905,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "�M��"
 
@@ -903,16 +933,6 @@ msgid "Spain"
 msgstr "��Z��"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "�}�o��s"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "�s�W��s�C���ɵo�Ϳ��~"
@@ -923,11 +943,6 @@ msgid "Files:\n"
 msgstr "/�ɮ� (_F)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "��ܮM��"
@@ -937,6 +952,11 @@ msgstr "��ܮM��"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "�z�ݭn���w�ϥΪ̱b��/�K�X�A�H�K�����ϥΥN�z���A���{�ҡG"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "����j��"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -948,11 +968,6 @@ msgid "Additional packages needed"
 msgstr "�ݭn�B�~���M�󶵥�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "����"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -1010,9 +1025,9 @@ msgid "Find:"
 msgstr "�M��G"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "�}�o��s"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1025,11 +1040,6 @@ msgid "Removable device"
 msgstr "�i�����˸m"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "���b�ǳƦw��"
@@ -1046,21 +1056,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "�еy��A���b�[�J�C���ӷ�..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "��L"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "�n�J�G"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "����"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1071,21 +1071,16 @@ msgstr "��Q��"
 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 "�]�w�N�z���A��"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "ĵ�i"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1093,11 +1088,6 @@ msgstr "�T�{ '%s' �M��ñ�W��T"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1111,16 +1101,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 "�}�o��s"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1132,12 +1112,7 @@ msgstr "�L�k��s�C���A�Ӷ��رN�|�Ȯɦ۰������C"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1152,25 +1127,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��ӷ� \"%s\"�G"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "��s����]�G "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "�]�w�M��ӷ���m�H"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "��s����]�G "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1199,7 +1169,7 @@ msgstr "�w�ˮɵo�Ͱ��D"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1224,23 +1194,38 @@ msgid "No package found for installation."
 msgstr "���b�ǳƦw��"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "���O"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "�y�z"
 
 #: ../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
@@ -1248,6 +1233,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "�w�g���\�a�w�˱z�ݭn���M��C"
 
+#: ../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
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "����"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "�W�١G %s"
 
@@ -1325,7 +1315,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1342,12 +1332,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "�����T"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1404,8 +1404,8 @@ msgstr "��ܭץ����~����s�M��"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "����"
+msgid "Java"
+msgstr "�饻"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1424,20 +1424,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
@@ -1464,16 +1459,6 @@ msgstr "�w�w��"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "�}�o��s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1481,13 +1466,13 @@ msgstr "�д��J�C���˸m���~��"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "����Ӧh�F�M�󶵥�"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "����Ӧh�F�M�󶵥�"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1499,17 +1484,17 @@ msgstr "�S���i�����ʧ@"
 msgid "Danmark"
 msgstr "����"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "����"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "�U���o�Ϳ��~"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "�ڦ�"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "����"
@@ -1519,6 +1504,11 @@ msgstr "����"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "��p�A�z�ݭn��� root �v�������~�i�H�i��M��w�ˡC"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1546,7 +1536,7 @@ msgstr "�̨ӷ����x����"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1559,6 +1549,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "�}�o��s"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1586,11 +1581,6 @@ msgstr "�ܧ�C��"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "���m�������"
 
@@ -1599,6 +1589,11 @@ msgstr "���m�������"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate �s�n�]�w"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "��L"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1616,12 +1611,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
@@ -1636,6 +1631,11 @@ msgstr ""
 "�]�\�O�t�θ�Ʈw���¤F�A�Х���s��Ʈw��A�~��C"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1668,22 +1668,12 @@ msgstr "�ثe�w�w�˪������G"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "�}�o��s"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "�W��"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1708,7 +1698,7 @@ msgstr "�W��"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1716,6 +1706,11 @@ msgstr ""
 msgid "No update"
 msgstr "��s"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "����"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1726,6 +1721,16 @@ msgstr "�T�w"
 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:"
@@ -1738,6 +1743,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1746,11 +1756,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "�s��ӷ� \"%s\"�G"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1812,11 +1817,6 @@ msgstr ""
 "�w��Ө�M���s�{��!\n"
 "���U�ӵ{���N�|�޾ɧA�����M���s�P�w�ˡC"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2101,6 +2101,62 @@ msgid "Software Sources Manager"
 msgstr "�M��ӷ��޲z��"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP �D��"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "�}�o��s"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "�}�o��s"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "�}�o��s"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "�����]�w�G"
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "�}�o��s"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "�}�o��s"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "��L"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "�}�o��s"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "����"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "�}�o��s"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " �P %s-%s-%s �R��"
 
@@ -2389,9 +2445,6 @@ msgstr "�M��ӷ��޲z��"
 #~ msgid "security"
 #~ msgstr "�w��"
 
-#~ msgid "general"
-#~ msgstr "�@��"
-
 #~ msgid "bugfix"
 #~ msgstr "���~�ץ�"
 
@@ -2409,9 +2462,6 @@ msgstr "�M��ӷ��޲z��"
 #~ "�L�k���o���n��s���M��M��\n"
 #~ "���ը䥦�M�g�a�}"
 
-#~ msgid "Warning"
-#~ msgstr "ĵ�i"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2486,15 +2536,9 @@ msgstr "�M��ӷ��޲z��"
 #~ msgid "/Help/_About..."
 #~ msgstr "/����/���� (_A)..."
 
-#~ msgid "Name"
-#~ msgstr "�W��"
-
 #~ msgid "Installed"
 #~ msgstr "�w�w��"
 
-#~ msgid "Type"
-#~ msgstr "���O"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate�A���� 7.2\n"
 
diff --git a/po/zh_TW.pom b/po/zh_TW.pom
index 6f7d04e2..57103f98 100644
--- a/po/zh_TW.pom
+++ b/po/zh_TW.pom
@@ -1,8 +1,20 @@
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Workstation"
+msgstr "�u�@�����x"
+
+# 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 "�{���}�o���x"
 
 # DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
 msgid "Server"
 msgstr "���A�����x"
author	Guillaume Cottenceau <gc@mandriva.com>	2003-06-27 12:49:32 +0000
committer	Guillaume Cottenceau <gc@mandriva.com>	2003-06-27 12:49:32 +0000
commit	e0121c96eac93fd2e5b66cdb08654a041fc34bca (patch)
tree	5301db3940fc011c09c97b36d6092e57dbe5ce83 /po
parent	58d15a09e3be7b796c977a98e0e9d7acc822705b (diff)
download	rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.tar rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.tar.gz rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.tar.bz2 rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.tar.xz rpmdrake-e0121c96eac93fd2e5b66cdb08654a041fc34bca.zip