merge and translate french

1 files changed, 1072 insertions, 625 deletions

diff --git a/po/et.po b/po/et.po
index ba015ee3..7f61c1e1 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-28 16:30+0200\n"
+"POT-Creation-Date: 2003-05-28 20:14+0200\n"
 "PO-Revision-Date: 2003-05-17 15:54+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -17,54 +17,174 @@ msgstr ""
 "X-Generator: KBabel 1.0\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by size"
-msgstr "Kõik paketid,"
+#, c-format
+msgid "Archiving/Other"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "Palun oodake, uuendan andmekandjat..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Physics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "Uuendatavad"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "kõik paigaldati edukalt"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Verifying packages signatures..."
+msgstr "Signatuuride kontrollimine..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
-msgstr "Kas lubada?"
+msgid "Configure medias"
+msgstr "Allikate seadistamine"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "Otsingutee või haakepunkt:"
+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 ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Configuration/Networking"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/XFree86"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Portugal"
-msgstr "Portugal"
+msgid "France"
+msgstr "Prantsusmaa"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Welcome to the software installation tool!\n"
+"I need to contact the mirror to get latest update packages.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+"Is it ok to continue?"
 msgstr ""
-"Tarkvara paigaldamine\n"
+"Viimaste uuenduste hankimiseks tuleb võtta ühendus peegelsaidiga.\n"
+"Kontrollige palun, et Internetiühendus töötaks.\n"
 "\n"
-"Mandrake Linuxi CDROM või DVD sisaldab tuhandeid tarkvarapakette.\n"
-"Selle tööriista abil saate valida, milliseid soovite oma arvutile paigaldada."
+"Kas jätkata?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Name:"
-msgstr "Nimi:"
+msgid "Search results"
+msgstr "Otsingu tulemused"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Italy"
-msgstr "Itaalia"
+msgid "Yes"
+msgstr "Jah"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"Paigaldus on lõpetatud; %s\n"
+"\n"
+"Mõned seadistusfailid loodi kui '.rpmnew' või '.rpmsave'. Te\n"
+"võiksite mõnda neist nüüd uurida, et võtta ette järgmisi samme:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Configuration/Hardware"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Publishing"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kuidas valida peeglit käsitsi"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Package installation..."
+msgstr "Paigaldan..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "Pakettide eemaldamine"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Shells"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "Itaalia"
+
+#: ../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"
+"but you may still browse the existing database."
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on üks järgmistest pakettidest:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Development/Python"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -72,23 +192,32 @@ msgstr "URL:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "Mõned paketid tuleb eemaldada"
+msgid "Information on packages"
+msgstr "Info pakettide kohta"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by selection state"
-msgstr "valikustaatuse järgi"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "Vahendaja..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "Rohkem infot paketi kohta..."
+msgid "System/Configuration/Boot and Init"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Yes"
-msgstr "Jah"
+msgid "Russia"
+msgstr "Venemaa"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Kui vajate vahendajat, sisestage masina nimi ja võimalusel port (süntaks: "
+"<vahendajamasin[:port]>):"
 
 #: ../rpmdrake:1
 #, c-format
@@ -102,202 +231,278 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "everything was installed correctly"
-msgstr "kõik paigaldati edukalt"
+msgid "Sound"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Changelog:\n"
+msgstr "Muutuste logi:\n"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Medias Manager, and then add a `Security\n"
-"updates' media.\n"
+"I need to contact MandrakeSoft website to get the mirrors list.\n"
+"Please check that your network is currently running.\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"Is it ok to continue?"
 msgstr ""
-"Te võite meelepärase peegli ka käsitsi valida. Selleks\n"
-"käivitage tarkvara allikate haldur ja lisage 'turvauuenduste'\n"
-"allikas.\n"
+"Peeglite nimekirja hankimiseks tuleb ühendust võtta MandrakeSofti\n"
+"veebileheküljega. Kontrollige, et Internetiühendus töötab.\n"
 "\n"
-"Seejärel taaskäivitage Mandrake uuendused."
+"Kas jätkata?"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Please wait, searching..."
+msgstr "Palun oodake, otsin..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
+"%s\n"
 "\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"Is it ok to continue?"
 msgstr ""
-"Tarkvara eemaldamine\n"
+"%s\n"
 "\n"
-"Selle tööriista abil saate valida eemaldatava tarkvara."
+"Kas jätkata?"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Initializing..."
+msgstr "Initsialiseerin.."
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "Muutuste salvestamiseks tuleb andmekandja seadmesse sisestada."
+"The list of updates is void. This means that either there is\n"
+"no available update for the packages installed on your computer,\n"
+"or you already installed all of them."
+msgstr ""
+"Uuenduste nimekiri on tühi. See tähendab, et Teie süsteemi\n"
+"paigaldatud pakettidele ei ole parajasti mingeid uuendusi või\n"
+"Te olete need juba kõik paigaldanud."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Emulators"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save and quit"
-msgstr "Salvesta ja välju"
+msgid "Password:"
+msgstr "Parool:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "System/Servers"
 msgstr ""
-"Pakettide eemaldamisel juhtus järgmine viga:\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Size: "
-msgstr "Suurus: "
+msgid "Software Packages Installation"
+msgstr "Pakettide paigaldamine"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/KDE"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "kirjeldustes"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " failed!"
+msgstr " ebaõnnestus!"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "All packages, by update availability"
 msgstr "uuendamisstaatuse järgi"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Security updates"
-msgstr "Turvaparandused"
+msgid "United States"
+msgstr "USA"
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Already existing update medias"
-msgstr "Olemasolevad uuenduste allikad"
+msgid "Greece"
+msgstr "Kreeka"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Monitoring"
+msgstr "Ära tee midagi"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Maximum information"
-msgstr "Täielik info"
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Proxy..."
-msgstr "Vahendaja..."
+msgid "Some packages can't be installed"
+msgstr "Mõnda paketti ei saa paigaldada"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your medias database."
+"The help window has been started, it should appear shortly on your desktop."
 msgstr ""
-"Paigaldus ebaõnnestus, osa faile on puudu.\n"
-"Võimalik, et peate allikate andmebaasi uuendama."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "Suurbritannia"
+msgid "No mirror"
+msgstr "Peeglit ei leitud"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "in names"
-msgstr "nimedes"
+msgid "Add a media"
+msgstr "Lisa allikas"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"I can't find any suitable mirror.\n"
-"\n"
-"There can be many reasons for this problem; the most frequent is\n"
-"the case when the architecture of your processor is not supported\n"
-"by Mandrake Linux Official Updates."
-msgstr ""
-"Kõlbulikku peeglit ei õnnestunud leida.\n"
-"\n"
-"Sellel võib olla mitu põhjust. Kõige tavalisem on see, et Mandrake\n"
-"Linuxi ametlikud uuendused ei toeta Teie protsessori arhitektuuri."
+msgid "Poland"
+msgstr "Poola"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "Eemalda .%s"
+msgid "Reload the packages list"
+msgstr "Pakettide nimekirja taaslaadimine"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "Otsingutee või haakepunkt:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Finland"
-msgstr "Soome"
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "Palun oodake, laen peeglite aadresse..."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "Valige peegel..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Warning: it seems that you are attempting to add so much\n"
+"packages that your filesystem may run out of free diskspace,\n"
+"during or after package installation ; this is particularly\n"
+"dangerous and should be considered with care.\n"
 "\n"
-"Do you want to continue installation?"
+"Do you really want to install all the selected packages?"
 msgstr ""
-"Järgmistel pakettidel puudub korralik signatuur:\n"
-"\n"
-"%s\n"
+"Hoiatus: paistab, et püüate lisada nii palju pakette, et\n"
+"Teil võib kettaruumist puudu tulla kas nende paigaldamise\n"
+"ajal või pärast seda. See kujutab endast väga suurt ohtu\n"
+"ning kasulik oleks siinkohal natuke mõelda.\n"
 "\n"
-"Kas jätkata?"
+"Kas soovite tõesti paigaldada kõik valitud paketid?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of media `%s'..."
-msgstr "Kaugallikafaili `%s' uurimine..."
+msgid "Selected size: %d MB"
+msgstr "Valitud pakettide maht: %d MB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr "Signatuuride kontrollimine..."
+msgid "Please wait, reading packages database..."
+msgstr "Palun oodake, loen pakettide andmebaasi..."
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "France"
-msgstr "Prantsusmaa"
+msgid ""
+"Welcome to the Software Medias Manager!\n"
+"\n"
+"This tool will help you configure the packages medias you wish to use on\n"
+"your computer. They will then be available to install new software package\n"
+"or to perform updates."
+msgstr ""
+"Tarkvara allikad\n"
+"\n"
+"See abivahend aitab määrata pakettide allikaid, mida soovite kasutada oma\n"
+"süsteemi uuendamisel. Kui olete allikad määranud, saate nende abil\n"
+"paigaldada uusi tarkvarapakette või uuendada vanu pakette."
 
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "More info"
-msgstr "Rohkem infot"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "Muutuste salvestamiseks tuleb andmekandja seadmesse sisestada."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by size"
+msgstr "Kõik paketid,"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"%s\n"
+"There was a problem during the removal of packages:\n"
 "\n"
-"Is it ok to continue?"
+"%s"
 msgstr ""
-"%s\n"
+"Pakettide eemaldamisel juhtus järgmine viga:\n"
 "\n"
-"Kas jätkata?"
+"%s"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "Pakettide nimekirja taaslaadimine"
+msgid "Path:"
+msgstr "Otsingutee:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "Valige peegel..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "Laadin võrgust paketti '%s' (%s/%s)..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be installed"
-msgstr "Mõnda paketti ei saa paigaldada"
+msgid "Other"
+msgstr "Muu"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "Rootsi"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the media(s) you wish to update:"
+msgstr "Valige allikad, mida soovite uuendada:"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austria"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "Info..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "Parandamatu viga: kahjuks ei leitud paigaldamiseks ühtegi paketti."
+msgid "Networking/File transfer"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -306,97 +511,129 @@ msgstr "Andmekandja tüüp:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "failides"
+msgid "Development/Other"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All requested packages were installed successfully."
-msgstr "Kõik soovitud paketid said edukalt paigaldatud."
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Proxy hostname:"
-msgstr "Vahendaja masinanimi:"
+msgid "Inspect..."
+msgstr "Uuri..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "Kohalikud failid"
+msgid "Games/Cards"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "%s uurimine"
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Vähemalt üks uuenduste allikas peab olema seadistatud, kuid\n"
+"praegu on kõik keelatud. Teil tuleks käivitada tarkvara allikate\n"
+"haldur, et vähemalt üks lubada (klõpsake selleks veerul Kas lubada?)\n"
+"\n"
+"Seejärel käivitage Mandrake uuendused uuesti."
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Israel"
-msgstr "Iisrael"
+msgid "Japan"
+msgstr "Jaapan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Help"
-msgstr "Abi"
+msgid "Networking/Remote access"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP server"
+msgid "Summary: "
+msgstr "Kokkuvõte: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation failed"
-msgstr "Paigaldamine ebaõnnestus"
+msgid "%s conflicts with %s"
+msgstr "%s ja %s on konfliktis"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr ".%s kasutamine põhifailina"
+msgid "System/Fonts/Type1"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "Otsingu tulemused"
+msgid "Development/C"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid " failed!"
-msgstr " ebaõnnestus!"
+msgid "FTP server"
+msgstr "FTP server"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "Eemalda .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "Tähtsus: "
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by media repository"
+msgstr "andmekandja asukoha järgi"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "Brasiilia"
+msgid "Unable to create medium."
+msgstr "Andmekandja loomine ebaõnnestus."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
 msgstr ""
-"Sellise nimega andmekandja on juba olemas, kas\n"
-"soovite tõesti selle asendada?"
+"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
+"\n"
+"%s\n"
+"\n"
+"Kas jätkata?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Find:"
-msgstr "Leia:"
+msgid "System/Internationalization"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of media `%s'..."
+msgstr "Allikafaili `%s' uurimine..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "Kõik paketid, tähestikuliselt"
+msgid "Size: "
+msgstr "Suurus: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "Palun oodake, otsin..."
+msgid "Office"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, reading packages database..."
-msgstr "Palun oodake, loen pakettide andmebaasi..."
+msgid "Everything installed successfully"
+msgstr "Kõik paigaldati edukalt"
 
 #: ../rpmdrake:1
 #, c-format
@@ -405,651 +642,840 @@ msgstr "tundmatu pakett "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Palun sisestage andmekandja nimega \"%s\" seadmesse [%s]"
+msgid "Development/Databases"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "Palun oodake, uuendan andmekandjat..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reset the selection"
-msgstr "Valiku lähtestamine"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "Paigaldan paketti '%s' (%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"Kui vajate vahendajat, sisestage masina nimi ja võimalusel port (süntaks: "
-"<vahendajamasin[:port]>):"
+msgid "Not selected"
+msgstr "Valimata"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
-"\n"
-msgstr ""
-"Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
-"\n"
+msgid "in names"
+msgstr "nimedes"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Problem during installation"
+msgstr "Paigaldusel tekkis probleem"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
+msgid "Terminals"
 msgstr ""
-"Paigaldamisel juhtus järgmine viga:\n"
-"\n"
-"%s"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "Palun oodake, eemaldan andmekandja..."
+msgid "Edit"
+msgstr "Muuda"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "Parool:"
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books/Other"
+msgstr "Muu"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Other"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
+msgid "Australia"
+msgstr "Austraalia"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "User:"
-msgstr "Kasutajanimi:"
+msgid "Security updates"
+msgstr "Turvaparandused"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "Palun oodake, uuendan andmekandjat..."
+msgid "Korea"
+msgstr "Korea"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Palun oodake, koostan nimekirja..."
+msgid "Games/Adventure"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by media repository"
-msgstr "andmekandja asukoha järgi"
+#, c-format
+msgid "in files"
+msgstr "failides"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Information on packages"
-msgstr "Info pakettide kohta"
+#, fuzzy, c-format
+msgid "All packages, by group"
+msgstr "Kõik paketid,"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "Katkesta"
+msgid "Graphical desktop/FVWM based"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "Kõik paigaldati edukalt"
+msgid "Media: "
+msgstr "Andmekandja: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Select the media(s) you wish to update:"
-msgstr "Valige allikad, mida soovite uuendada:"
+msgid "Games/Sports"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "Palun oodake, uuendan andmekandjat..."
+msgid "Netherlands"
+msgstr "Holland"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Tekkis saatuslik viga: %s."
+msgid "Search results (none)"
+msgstr "Otsingu tulemus (ei leitud)"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"\n"
-"%s\n"
+"Welcome to the software installation tool!\n"
 "\n"
-"Is it ok to continue?"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
-"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:\n"
-"\n"
-"%s\n"
+"Tarkvara paigaldamine\n"
 "\n"
-"Kas jätkata?"
+"Mandrake Linuxi CDROM või DVD sisaldab tuhandeid tarkvarapakette.\n"
+"Selle tööriista abil saate valida, milliseid soovite oma arvutile paigaldada."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "in descriptions"
-msgstr "kirjeldustes"
+msgid "Stop"
+msgstr "Peata"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "Vahendajate seadistamine"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"Sellise nimega andmekandja on juba olemas, kas\n"
+"soovite tõesti selle asendada?"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
 msgid ""
-"I need to contact MandrakeSoft website to get the mirrors list.\n"
-"Please check that your network is currently running.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
-"Is it ok to continue?"
 msgstr ""
-"Peeglite nimekirja hankimiseks tuleb ühendust võtta MandrakeSofti\n"
-"veebileheküljega. Kontrollige, et Internetiühendus töötab.\n"
+"Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
 "\n"
-"Kas jätkata?"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP server"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "Palun valige"
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "Parandamatu viga: kahjuks ei leitud paigaldamiseks ühtegi paketti."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "Valitud pakettide maht: %d MB"
+msgid "Some packages can't be removed"
+msgstr "Mõnda paketti ei saa eemaldada"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Soome"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "Initsialiseerin.."
+msgid "More information on package..."
+msgstr "Rohkem infot paketi kohta..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Save changes"
 msgstr "Salvesta muutused"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Error during download"
-msgstr "Viga allalaadimisel"
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"Te võite meelepärase peegli ka käsitsi valida. Selleks\n"
+"käivitage tarkvara allikate haldur ja lisage 'turvauuenduste'\n"
+"allikas.\n"
+"\n"
+"Seejärel taaskäivitage Mandrake uuendused."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Package installation..."
-msgstr "Paigaldan..."
+msgid "Networking/News"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "Tähtsus: "
+msgid "Books/Faqs"
+msgstr ""
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
+#, c-format
+msgid "More info"
+msgstr "Rohkem infot"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Search"
+msgstr "Otsi"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"I can't find any suitable mirror.\n"
 "\n"
+"There can be many reasons for this problem; the most frequent is\n"
+"the case when the architecture of your processor is not supported\n"
+"by Mandrake Linux Official Updates."
 msgstr ""
-"Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
+"Kõlbulikku peeglit ei õnnestunud leida.\n"
 "\n"
+"Sellel võib olla mitu põhjust. Kõige tavalisem on see, et Mandrake\n"
+"Linuxi ametlikud uuendused ei toeta Teie protsessori arhitektuuri."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Hispaania"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Astronomy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Development/Kernel"
+msgstr ""
+
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update media(s)"
+msgstr "Allika(te) uuendamine"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "Failid:\n"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Games/Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "Ei saa pakette kätte."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Add..."
-msgstr "Lisa..."
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "Vahendaja autentimiseks oleks tulus määrata kasutajanimi ja parool:"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "Andmekandja loomine ebaõnnestus."
+msgid "Update"
+msgstr "Uuenda"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Additional packages needed"
+msgstr "Vajalikud lisapaketid"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking/Chat"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Running in user mode"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
 msgstr ""
-"Paigaldus on lõpetatud; %s\n"
+"Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:\n"
 "\n"
-"Mõned seadistusfailid loodi kui '.rpmnew' või '.rpmsave'. Te\n"
-"võiksite mõnda neist nüüd uurida, et võtta ette järgmisi samme:"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Browse..."
-msgstr "Sirvi..."
+msgid "Editing media \"%s\":"
+msgstr "Allika \"%s\" muutmine:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Mõnda paketti ei saa eemaldada"
+msgid "Please wait, listing packages..."
+msgstr "Palun oodake, koostan nimekirja..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Info..."
-msgstr "Info..."
+msgid "Find:"
+msgstr "Leia:"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "Jätkamiseks tuleb sisestada andmekandja"
+msgid "Development/Perl"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "Tavainfo"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Copying file for media `%s'..."
 msgstr "Faili kopeerimine allika `%s' jaoks..."
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove"
-msgstr "Eemalda"
+msgid "Removable device"
+msgstr "Eemaldatav seade"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paigaldamiseks valmistumine..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No mirror"
-msgstr "Peeglit ei leitud"
+msgid "Please wait, removing packages..."
+msgstr "Palun oodake, eemaldan pakette..."
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "Palun oodake, lisan andmekandja..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Games/Other"
+msgstr "Muu"
 
 #: ../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."
+msgid "Login:"
+msgstr "Kasutajanimi:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Install"
-msgstr "Paigalda"
+msgid "Networking/Other"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "Jaapan"
+msgid "Belgium"
+msgstr "Belgia"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "Ära tee midagi"
+msgid "File tools"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No update"
-msgstr "Uuendusi ei ole"
+msgid "Archiving/Cd burning"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Description: "
-msgstr "Kirjeldus: "
+msgid "Sciences/Biology"
+msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl: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"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
-"\n"
-"Do you really want to install all the selected packages?"
-msgstr ""
-"Hoiatus: paistab, et püüate lisada nii palju pakette, et\n"
-"Teil võib kettaruumist puudu tulla kas nende paigaldamise\n"
-"ajal või pärast seda. See kujutab endast väga suurt ohtu\n"
-"ning kasulik oleks siinkohal natuke mõelda.\n"
-"\n"
-"Kas soovite tõesti paigaldada kõik valitud paketid?"
+msgid "Configure proxies"
+msgstr "Vahendajate seadistamine"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Starting download of `%s'..."
+msgstr "'%s' allalaadimise alustamine..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Name: "
-msgstr "Nimi: "
+msgid "System/Libraries"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "Uuri..."
+msgid "Leaves only, sorted by install date"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing media \"%s\":"
-msgstr "Allika \"%s\" muutmine:"
+msgid "Fatal error"
+msgstr "Saatuslik viga"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "No package found for installation."
-msgstr "Paigaldamiseks ei leitud ühtegi paketti."
+msgid "A fatal error occurred: %s."
+msgstr "Tekkis saatuslik viga: %s."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Australia"
-msgstr "Austraalia"
+msgid "Games/Strategy"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installation finished"
-msgstr "Paigaldus lõpetatud"
+msgid "Development/Java"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Poland"
-msgstr "Poola"
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr ""
+"Andmekandja uuendamine ebaõnnestus; sellest loobutakse automaatselt.\n"
+"\n"
+"Vead:\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Version: "
-msgstr "Versioon: "
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "Vahendaja autentimiseks oleks tulus määrata kasutajanimi ja parool:"
+msgid "Archiving/Compression"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Upgradable"
-msgstr "Uuendatavad"
+msgid "Books/Litterature"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
-msgstr " tehtud."
+msgid "Please choose the desired mirror."
+msgstr "Palun valige peegel."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Installation"
-msgstr "Pakettide paigaldamine"
+msgid "Communications"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "Vajalikud lisapaketid"
+msgid "Graphical desktop/Sawfish"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Bugfixes updates"
-msgstr "Turvaparandused/uuendused"
+msgid "Reason for update: "
+msgstr "Uuendamise põhjus: "
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
+msgid "Sciences/Mathematics"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Germany"
-msgstr "Saksamaa"
+msgid "Remove"
+msgstr "Eemalda"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Russia"
-msgstr "Venemaa"
+msgid "Portugal"
+msgstr "Portugal"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Norway"
-msgstr "Norra"
+msgid "Czech Republic"
+msgstr "Tšehhi Vabariik"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during installation"
-msgstr "Paigaldusel tekkis probleem"
+msgid "Some packages need to be removed"
+msgstr "Mõned paketid tuleb eemaldada"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "Otsi"
+msgid "Problem during removal"
+msgstr "Probleem eemaldamisel"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Edit a media"
-msgstr "Allika muutmine"
+msgid "Graphical desktop/Enlightenment"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Czech Republic"
-msgstr "Tšehhi Vabariik"
+msgid "Help launched in background"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"You already have at least one update media configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Medias Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"Paigaldus ebaõnnestus, osa faile on puudu.\n"
+"Võimalik, et peate allikate andmebaasi uuendama."
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s"
 msgstr ""
-"Vähemalt üks uuenduste allikas peab olema seadistatud, kuid\n"
-"praegu on kõik keelatud. Teil tuleks käivitada tarkvara allikate\n"
-"haldur, et vähemalt üks lubada (klõpsake selleks veerul Kas lubada?)\n"
+"Paigaldamisel juhtus järgmine viga:\n"
 "\n"
-"Seejärel käivitage Mandrake uuendused uuesti."
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Stop"
-msgstr "Peata"
+msgid "No package found for installation."
+msgstr "Paigaldamiseks ei leitud ühtegi paketti."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update"
-msgstr "Uuenda"
+msgid "Description: "
+msgstr "Kirjeldus: "
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing packages..."
-msgstr "Palun oodake, eemaldan pakette..."
+msgid "%s KB"
+msgstr "%s KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "Tavainfo"
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
+msgstr ""
+"Kahjuks ei saa järgmisi pakette valida:\n"
+"\n"
+"%s\n"
+"\n"
+"Põhjused:\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Media: "
-msgstr "Andmekandja: "
+msgid "Sciences/Chemistry"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "Laadin võrgust paketti '%s' (%s/%s)..."
+msgid "All requested packages were installed successfully."
+msgstr "Kõik soovitud paketid said edukalt paigaldatud."
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "Kohalikud failid"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
+msgid "Addable"
+msgstr "Lisatavad"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "Palun valige"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Databases"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Networking/IRC"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media"
 msgstr "Andmekandja"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "Nimi: "
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "Vahendaja masinanimi:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"Järgmistel pakettidel puudub korralik signatuur:\n"
+"\n"
+"%s\n"
+"\n"
+"Kas jätkata?"
+
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Spain"
-msgstr "Hispaania"
+msgid "Download of `%s', speed:%s"
+msgstr "`%s' allalaadimine, kiirus:%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "%s uurimine"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Video"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Development/GNOME and GTK+"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Normal updates"
 msgstr "Uuendused"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "Palun oodake, laen peeglite aadresse..."
+msgid "Selected"
+msgstr "Valitud"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "Kasutajanimi:"
+msgid "Maximum information"
+msgstr "Täielik info"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Adding a media:"
-msgstr "Allika lisamine:"
+msgid "Examining distant file of media `%s'..."
+msgstr "Kaugallikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Archiving/Backup"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Fatal error"
-msgstr "Saatuslik viga"
+msgid "Quit"
+msgstr "Välju"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update..."
-msgstr "Uuenda..."
+msgid "Version: "
+msgstr "Versioon: "
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Starting download of `%s'..."
-msgstr "'%s' allalaadimise alustamine..."
+msgid "Norway"
+msgstr "Norra"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(none)"
-msgstr "(puudub)"
+msgid "Use .%s as main file"
+msgstr ".%s kasutamine põhifailina"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Iisrael"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "Hiina"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Welcome to the software removal tool!\n"
 "\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
 msgstr ""
-"Vabandan, aga nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
+"Tarkvara eemaldamine\n"
 "\n"
+"Selle tööriista abil saate valida eemaldatava tarkvara."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "Paigaldan paketti '%s' (%s/%s)..."
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Currently installed version: "
-msgstr "Praegu paigaldatud versioon: "
+msgid "(Not available)"
+msgstr "(kättesaamatu)"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "Muu"
+msgid "Bugfixes updates"
+msgstr "Turvaparandused/uuendused"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "Uuendamise põhjus: "
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Please choose the desired mirror."
-msgstr "Palun valige peegel."
+msgid "Networking/WWW"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Edit"
-msgstr "Muuda"
+msgid "Update..."
+msgstr "Uuenda..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Palun oodake, otsin kättesaadavaid pakette..."
 
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "Katkesta"
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "Suhteline tee sünteesi/hdlist-faili juurde:"
+msgid "Enabled?"
+msgstr "Kas lubada?"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "Otsingu tulemus (ei leitud)"
+msgid "Sciences/Geosciences"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Danmark"
-msgstr "Taani"
+msgid "System/Fonts/Console"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "Hiina"
+msgid "All packages, alphabetical"
+msgstr "Kõik paketid, tähestikuliselt"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "United States"
-msgstr "USA"
+msgid "Mandrake choices"
+msgstr "Mandrake valikud"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "changes:"
-msgstr "muutused:"
+msgid "Toys"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
+msgid "Installation finished"
+msgstr "Paigaldus lõpetatud"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid " done."
+msgstr " tehtud."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "Development/KDE and Qt"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "No"
-msgstr "Ei"
+msgid "Books/Howtos"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure medias"
-msgstr "Allikate seadistamine"
+msgid "You need to insert the medium to continue"
+msgstr "Jätkamiseks tuleb sisestada andmekandja"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add a media"
-msgstr "Lisa allikas"
+msgid "Games/Boards"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Summary: "
-msgstr "Kokkuvõte: "
+msgid "Too many packages are selected"
+msgstr "Valitud on liiga palju pakette"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "Kanada"
+msgid "Danmark"
+msgstr "Taani"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Greece"
-msgstr "Kreeka"
+msgid "Do nothing"
+msgstr "Ära tee midagi"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"There was an error downloading the mirrors list:\n"
-"\n"
-"%s\n"
-"The network, or MandrakeSoft website, are maybe unavailable.\n"
-"Please try again later."
+msgid "Networking/Mail"
 msgstr ""
-"Peeglite nimekirja allalaadimisel tekkis viga:\n"
-"\n"
-"%s\n"
-"Võrk või MandrakeSofti veebilehekülg ei pruugi olla kättesaadav.\n"
-"Palun proovige varsti uuesti."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "Viga allalaadimisel"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Help"
+msgstr "Abi"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1058,72 +1484,117 @@ msgstr "Vabandust, pakette ei õnnetunud kätte saada. %s"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Path:"
-msgstr "Otsingutee:"
+msgid "Edit a media"
+msgstr "Allika muutmine"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "Kõik paketid,"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Problem during removal"
-msgstr "Probleem eemaldamisel"
+msgid "(none)"
+msgstr "(puudub)"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "Saksamaa"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected"
-msgstr "Valitud"
+msgid "System/Fonts/X11 bitmap"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "Holland"
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "Ei"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Addable"
-msgstr "Lisatavad"
+msgid "Install"
+msgstr "Paigalda"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "Lisa..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
-msgstr "(kättesaamatu)"
+msgid "Change medium"
+msgstr "Muuda andmekandjat"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Graphical desktop/GNOME"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a media:"
+msgstr "Allika lisamine:"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "Valiku lähtestamine"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake uuendused"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
 "%s\n"
-"\n"
-"Reasons follow:\n"
-"\n"
-"%s"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"Kahjuks ei saa järgmisi pakette valida:\n"
+"Peeglite nimekirja allalaadimisel tekkis viga:\n"
 "\n"
 "%s\n"
-"\n"
-"Põhjused:\n"
-"\n"
-"%s"
+"Võrk või MandrakeSofti veebilehekülg ei pruugi olla kättesaadav.\n"
+"Palun proovige varsti uuesti."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Not selected"
-msgstr "Valimata"
+msgid "Books/Computer books"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "Pakettide eemaldamine"
+msgid "System/Base"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+"Vabandan, aga nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
+"\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Sweden"
-msgstr "Rootsi"
+msgid "Brazil"
+msgstr "Brasiilia"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "Paigaldamine ebaõnnestus"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1140,168 +1611,141 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"The list of updates is void. This means that either there is\n"
-"no available update for the packages installed on your computer,\n"
-"or you already installed all of them."
-msgstr ""
-"Uuenduste nimekiri on tühi. See tähendab, et Teie süsteemi\n"
-"paigaldatud pakettidele ei ole parajasti mingeid uuendusi või\n"
-"Te olete need juba kõik paigaldanud."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Examining file of media `%s'..."
-msgstr "Allikafaili `%s' uurimine..."
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr "`%s' allalaadimine, kiirus:%s"
+msgid "Already existing update medias"
+msgstr "Olemasolevad uuenduste allikad"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "Vajalik on üks järgmistest pakettidest:"
+msgid "Currently installed version: "
+msgstr "Praegu paigaldatud versioon: "
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Quit"
-msgstr "Välju"
+msgid "Development/C++"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"I need to contact the mirror to get latest update packages.\n"
-"Please check that your network is currently running.\n"
-"\n"
-"Is it ok to continue?"
+msgid "System/Configuration/Printing"
 msgstr ""
-"Viimaste uuenduste hankimiseks tuleb võtta ühendus peegelsaidiga.\n"
-"Kontrollige palun, et Internetiühendus töötaks.\n"
-"\n"
-"Kas jätkata?"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Update media(s)"
-msgstr "Allika(te) uuendamine"
+msgid "Games/Puzzles"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Ok"
-msgstr "Olgu"
+msgid "System/Configuration/Packaging"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "Palun oodake, lisan andmekandja..."
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "Palun sisestage andmekandja nimega \"%s\" seadmesse [%s]"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Unable to get source packages."
+#, fuzzy, c-format
+msgid "You need to select some packages first."
 msgstr "Ei saa pakette kätte."
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Too many packages are selected"
-msgstr "Valitud on liiga palju pakette"
+#, fuzzy, c-format
+msgid "All packages, by selection state"
+msgstr "valikustaatuse järgi"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"Welcome to the Software Medias Manager!\n"
-"\n"
-"This tool will help you configure the packages medias you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
-msgstr ""
-"Tarkvara allikad\n"
-"\n"
-"See abivahend aitab määrata pakettide allikaid, mida soovite kasutada oma\n"
-"süsteemi uuendamisel. Kui olete allikad määranud, saate nende abil\n"
-"paigaldada uusi tarkvarapakette või uuendada vanu pakette."
+msgid "Name:"
+msgstr "Nimi:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s ja %s on konfliktis"
+msgid "Graphical desktop/Other"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"Mandrake uuendused\n"
-"\n"
-"Selle tööriista abil saate oma Mandrake Linuxit uuendada."
+msgid "No update"
+msgstr "Uuendusi ei ole"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake valikud"
+msgid "Text tools"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Changelog:\n"
-msgstr "Muutuste logi:\n"
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Korea"
-msgstr "Korea"
+msgid "Networking/Instant messaging"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Removable device"
-msgstr "Eemaldatav seade"
+msgid "Please wait, removing medium..."
+msgstr "Palun oodake, eemaldan andmekandja..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Belgium"
-msgstr "Belgia"
+msgid "Accessibility"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Change medium"
-msgstr "Muuda andmekandjat"
+msgid "changes:"
+msgstr "muutused:"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Editors"
+msgstr "Muuda"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Mandrake Update"
-msgstr "Mandrake uuendused"
+msgid "United Kingdom"
+msgstr "Suurbritannia"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP server"
+msgid "Relative path to synthesis/hdlist:"
+msgstr "Suhteline tee sünteesi/hdlist-faili juurde:"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Files:\n"
-msgstr "Failid:\n"
-
-#: ../rpmdrake.pm:1
-#, c-format
 msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
+"Welcome to MandrakeUpdate!\n"
 "\n"
-"Errors:\n"
-"%s"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
 msgstr ""
-"Andmekandja uuendamine ebaõnnestus; sellest loobutakse automaatselt.\n"
+"Mandrake uuendused\n"
 "\n"
-"Vead:\n"
-"%s"
+"Selle tööriista abil saate oma Mandrake Linuxit uuendada."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Leaves only, sorted by install date"
+msgid "System/Fonts/True type"
 msgstr ""
 
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "Kasutajanimi:"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "Sirvi..."
+
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
 msgstr "Kataloog allatõmmatud failide salvestamiseks peab olema loodud"
@@ -1572,6 +2016,9 @@ msgstr "Tarkvara eemaldamine"
 msgid "Software Sources Manager"
 msgstr "Tarkvaraallikate haldur"
 
+#~ msgid "Save and quit"
+#~ msgstr "Salvesta ja välju"
+
 #~ msgid "by group"
 #~ msgstr "grupi järgi"