merge

1 files changed, 406 insertions, 284 deletions

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"