merge

1 files changed, 252 insertions, 248 deletions

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 "