fixed gettext use (partial)

1 files changed, 1085 insertions, 1045 deletions

diff --git a/po/et.po b/po/et.po
index 9747c1ee..b7e377b5 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-21 17:11+0100\n"
+"POT-Creation-Date: 2007-02-23 15:31+0100\n"
 "PO-Revision-Date: 2007-02-22 16:22+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../edit-urpm-sources.pl:85
+#: ../Rpmdrake/edit_urpm_sources.pm:67
 #, c-format
 msgid "Choose media type"
 msgstr "Andmekandja tüübi valimine"
 
-#: ../edit-urpm-sources.pl:86
+#: ../Rpmdrake/edit_urpm_sources.pm:68
 #, c-format
 msgid ""
 "This step enables you to add sources from a Mandriva Linux web or FTP "
@@ -47,17 +47,17 @@ msgstr ""
 "kui ka allikaid, mis pakuvad Teie distributsioonile ametlikke uuendusi.\n"
 "(Teil on võimalik lisada ka mõlemad, kuid seda tuleb teha eraldi sammudena.)"
 
-#: ../edit-urpm-sources.pl:94
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid "Distribution sources"
 msgstr "Distributsiooniallikad"
 
-#: ../edit-urpm-sources.pl:94
+#: ../Rpmdrake/edit_urpm_sources.pm:76
 #, c-format
 msgid "Official updates"
 msgstr "Ametlikud uuendused"
 
-#: ../edit-urpm-sources.pl:97
+#: ../Rpmdrake/edit_urpm_sources.pm:79
 #, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -76,103 +76,104 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../edit-urpm-sources.pl:111
+#: ../Rpmdrake/edit_urpm_sources.pm:93
 #, c-format
 msgid "Please wait, adding media..."
 msgstr "Palun oodake, lisatakse andmekandja..."
 
-#: ../edit-urpm-sources.pl:144
+#: ../Rpmdrake/edit_urpm_sources.pm:126
 #, c-format
 msgid "Add a medium"
 msgstr "Allika lisamine"
 
-#: ../edit-urpm-sources.pl:146
+#: ../Rpmdrake/edit_urpm_sources.pm:130
 #, c-format
 msgid "Local files"
 msgstr "Kohalikud failid"
 
-#: ../edit-urpm-sources.pl:146
+#: ../Rpmdrake/edit_urpm_sources.pm:130
 #, c-format
 msgid "Path:"
 msgstr "Otsingutee:"
 
-#: ../edit-urpm-sources.pl:147
+#: ../Rpmdrake/edit_urpm_sources.pm:131
 #, c-format
 msgid "FTP server"
 msgstr "FTP-server"
 
-#: ../edit-urpm-sources.pl:147 ../edit-urpm-sources.pl:148
-#: ../edit-urpm-sources.pl:149 ../edit-urpm-sources.pl:414
+#: ../Rpmdrake/edit_urpm_sources.pm:131 ../Rpmdrake/edit_urpm_sources.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:133 ../Rpmdrake/edit_urpm_sources.pm:402
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:148
+#: ../Rpmdrake/edit_urpm_sources.pm:132
 #, c-format
 msgid "RSYNC server"
 msgstr "RSYNC-server"
 
-#: ../edit-urpm-sources.pl:149
+#: ../Rpmdrake/edit_urpm_sources.pm:133
 #, c-format
 msgid "HTTP server"
 msgstr "HTTP-server"
 
-#: ../edit-urpm-sources.pl:150
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Removable device"
 msgstr "Eemaldatav seade"
 
-#: ../edit-urpm-sources.pl:150
+#: ../Rpmdrake/edit_urpm_sources.pm:134
 #, c-format
 msgid "Path or mount point:"
 msgstr "Otsingutee või haakepunkt:"
 
-#: ../edit-urpm-sources.pl:169
+#: ../Rpmdrake/edit_urpm_sources.pm:152
 #, c-format
 msgid "Browse..."
 msgstr "Sirvi..."
 
-#: ../edit-urpm-sources.pl:196
+#: ../Rpmdrake/edit_urpm_sources.pm:179
 #, c-format
 msgid "Login:"
 msgstr "Kasutajatunnus:"
 
-#: ../edit-urpm-sources.pl:196 ../edit-urpm-sources.pl:499 ../rpmdrake.pm:132
+#: ../Rpmdrake/edit_urpm_sources.pm:179 ../Rpmdrake/edit_urpm_sources.pm:488
+#: ../rpmdrake.pm:131
 #, c-format
 msgid "Password:"
 msgstr "Parool:"
 
-#: ../edit-urpm-sources.pl:201 ../edit-urpm-sources.pl:415
+#: ../Rpmdrake/edit_urpm_sources.pm:184 ../Rpmdrake/edit_urpm_sources.pm:403
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Suhteline tee sünteesi/hdlist faili juurde:"
 
-#: ../edit-urpm-sources.pl:203
+#: ../Rpmdrake/edit_urpm_sources.pm:186
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Tühjaksjätmisel püütakse automaatselt kasutada sünteesi/hdlisti"
 
-#: ../edit-urpm-sources.pl:208
+#: ../Rpmdrake/edit_urpm_sources.pm:191
 #, c-format
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../edit-urpm-sources.pl:216
+#: ../Rpmdrake/edit_urpm_sources.pm:199
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr "Andmekandja loomine kogu distributsioonile"
 
-#: ../edit-urpm-sources.pl:227
+#: ../Rpmdrake/edit_urpm_sources.pm:210
 #, c-format
 msgid "Search this media for updates"
 msgstr "Uuenduste otsimine sellelt andmekandjalt"
 
-#: ../edit-urpm-sources.pl:237
+#: ../Rpmdrake/edit_urpm_sources.pm:220
 #, c-format
 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:241
+#: ../Rpmdrake/edit_urpm_sources.pm:224
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -181,131 +182,132 @@ msgstr ""
 "Sellise nimega andmekandja on juba olemas,\n"
 "kas soovite tõesti selle asendada?"
 
-#: ../edit-urpm-sources.pl:252
+#: ../Rpmdrake/edit_urpm_sources.pm:236
 #, c-format
 msgid "Adding a medium:"
 msgstr "Allika lisamine:"
 
-#: ../edit-urpm-sources.pl:254
+#: ../Rpmdrake/edit_urpm_sources.pm:238
 #, c-format
 msgid "Type of medium:"
 msgstr "Andmekandja tüüp:"
 
-#: ../edit-urpm-sources.pl:262 ../edit-urpm-sources.pl:337
-#: ../edit-urpm-sources.pl:424 ../edit-urpm-sources.pl:451
-#: ../edit-urpm-sources.pl:516 ../edit-urpm-sources.pl:598
-#: ../edit-urpm-sources.pl:638 ../edit-urpm-sources.pl:696
-#: ../edit-urpm-sources.pl:841 ../rpmdrake:208 ../rpmdrake:956
-#: ../rpmdrake:1946 ../rpmdrake:1954 ../rpmdrake.pm:288 ../rpmdrake.pm:597
-#: ../rpmdrake.pm:683 ../rpmdrake.pm:756
+#: ../Rpmdrake/edit_urpm_sources.pm:248 ../Rpmdrake/edit_urpm_sources.pm:324
+#: ../Rpmdrake/edit_urpm_sources.pm:412 ../Rpmdrake/edit_urpm_sources.pm:439
+#: ../Rpmdrake/edit_urpm_sources.pm:505 ../Rpmdrake/edit_urpm_sources.pm:589
+#: ../Rpmdrake/edit_urpm_sources.pm:630 ../Rpmdrake/edit_urpm_sources.pm:688
+#: ../Rpmdrake/edit_urpm_sources.pm:836 ../Rpmdrake/gui.pm:478
+#: ../Rpmdrake/init.pm:119 ../Rpmdrake/pkg.pm:511 ../Rpmdrake/pkg.pm:519
+#: ../rpmdrake.pm:289 ../rpmdrake.pm:602 ../rpmdrake.pm:687 ../rpmdrake.pm:760
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: ../edit-urpm-sources.pl:264 ../edit-urpm-sources.pl:339
-#: ../edit-urpm-sources.pl:451 ../edit-urpm-sources.pl:506
-#: ../edit-urpm-sources.pl:595 ../edit-urpm-sources.pl:637
-#: ../edit-urpm-sources.pl:689 ../edit-urpm-sources.pl:761
-#: ../edit-urpm-sources.pl:887 ../edit-urpm-sources.pl:1036 ../rpmdrake:208
-#: ../rpmdrake:956 ../rpmdrake:973 ../rpmdrake:978 ../rpmdrake:1852
-#: ../rpmdrake:1946 ../rpmdrake:2093 ../rpmdrake.pm:123 ../rpmdrake.pm:228
-#: ../rpmdrake.pm:290 ../rpmdrake.pm:597
+#: ../Rpmdrake/edit_urpm_sources.pm:250 ../Rpmdrake/edit_urpm_sources.pm:326
+#: ../Rpmdrake/edit_urpm_sources.pm:439 ../Rpmdrake/edit_urpm_sources.pm:495
+#: ../Rpmdrake/edit_urpm_sources.pm:586 ../Rpmdrake/edit_urpm_sources.pm:629
+#: ../Rpmdrake/edit_urpm_sources.pm:681 ../Rpmdrake/edit_urpm_sources.pm:754
+#: ../Rpmdrake/edit_urpm_sources.pm:882 ../Rpmdrake/edit_urpm_sources.pm:1032
+#: ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:494 ../Rpmdrake/gui.pm:499
+#: ../Rpmdrake/init.pm:119 ../Rpmdrake/pkg.pm:511 ../Rpmdrake/pkg.pm:658
+#: ../Rpmdrake/rpmnew.pm:159 ../rpmdrake.pm:122 ../rpmdrake.pm:229
+#: ../rpmdrake.pm:291 ../rpmdrake.pm:602
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: ../edit-urpm-sources.pl:321
+#: ../Rpmdrake/edit_urpm_sources.pm:307
 #, c-format
 msgid "Global options for package installation"
 msgstr "Paigaldamise globaalsed valikud"
 
-#: ../edit-urpm-sources.pl:323
+#: ../Rpmdrake/edit_urpm_sources.pm:310
 #, c-format
 msgid "always"
 msgstr "alati"
 
-#: ../edit-urpm-sources.pl:324
+#: ../Rpmdrake/edit_urpm_sources.pm:311
 #, c-format
 msgid "never"
 msgstr "mitte kunagi"
 
-#: ../edit-urpm-sources.pl:333
+#: ../Rpmdrake/edit_urpm_sources.pm:320
 #, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Paigaldatavate RPM-pakettide kontroll:"
 
-#: ../edit-urpm-sources.pl:334
+#: ../Rpmdrake/edit_urpm_sources.pm:321
 #, c-format
 msgid "Download program to use:"
 msgstr "Kasutatav allalaadimisprogramm:"
 
-#: ../edit-urpm-sources.pl:364
+#: ../Rpmdrake/edit_urpm_sources.pm:351
 #, c-format
 msgid "Source Removal"
 msgstr "Allika eemaldamine"
 
-#: ../edit-urpm-sources.pl:365
+#: ../Rpmdrake/edit_urpm_sources.pm:352
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Kas tõesti eemaldada allikas \"%s\"?"
 
-#: ../edit-urpm-sources.pl:370
+#: ../Rpmdrake/edit_urpm_sources.pm:357
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "Palun oodake, eemaldan andmekandja..."
 
-#: ../edit-urpm-sources.pl:405
+#: ../Rpmdrake/edit_urpm_sources.pm:392
 #, c-format
 msgid "Edit a medium"
 msgstr "Allika muutmine"
 
-#: ../edit-urpm-sources.pl:411
+#: ../Rpmdrake/edit_urpm_sources.pm:399
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Allika \"%s\" muutmine:"
 
-#: ../edit-urpm-sources.pl:416
+#: ../Rpmdrake/edit_urpm_sources.pm:404
 #, c-format
 msgid "Downloader:"
 msgstr "Allalaadija:"
 
-#: ../edit-urpm-sources.pl:428
+#: ../Rpmdrake/edit_urpm_sources.pm:416
 #, c-format
 msgid "Save changes"
 msgstr "Salvesta muutused"
 
-#: ../edit-urpm-sources.pl:437 ../edit-urpm-sources.pl:1023
+#: ../Rpmdrake/edit_urpm_sources.pm:425 ../Rpmdrake/edit_urpm_sources.pm:1019
 #, c-format
 msgid "Proxy..."
 msgstr "Puhverserver..."
 
-#: ../edit-urpm-sources.pl:449
+#: ../Rpmdrake/edit_urpm_sources.pm:437
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Jätkamiseks tuleb sisestada andmekandja"
 
-#: ../edit-urpm-sources.pl:450
+#: ../Rpmdrake/edit_urpm_sources.pm:438
 #, 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."
 
-#: ../edit-urpm-sources.pl:471
+#: ../Rpmdrake/edit_urpm_sources.pm:459
 #, c-format
 msgid "Configure proxies"
 msgstr "Puhverserveri seadistamine"
 
-#: ../edit-urpm-sources.pl:482
+#: ../Rpmdrake/edit_urpm_sources.pm:471
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Andmekandja \"%s\" puhverserveri seadistused"
 
-#: ../edit-urpm-sources.pl:483
+#: ../Rpmdrake/edit_urpm_sources.pm:472
 #, c-format
 msgid "Global proxy settings"
 msgstr "Globaalsed puhverserveri seadistused"
 
-#: ../edit-urpm-sources.pl:485
+#: ../Rpmdrake/edit_urpm_sources.pm:474
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
@@ -314,172 +316,173 @@ msgstr ""
 "Kui vajate puhverserverit, sisestage masina nimi ja võimalusel port "
 "(süntaks: <puhverserver[:port]>):"
 
-#: ../edit-urpm-sources.pl:488
+#: ../Rpmdrake/edit_urpm_sources.pm:477
 #, c-format
 msgid "Proxy hostname:"
 msgstr "Puhverserveri masinanimi:"
 
-#: ../edit-urpm-sources.pl:491
+#: ../Rpmdrake/edit_urpm_sources.pm:480
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr ""
 "Puhverserveri autentimiseks oleks tulus määrata kasutajanimi ja parool:"
 
-#: ../edit-urpm-sources.pl:494
+#: ../Rpmdrake/edit_urpm_sources.pm:483
 #, c-format
 msgid "User:"
 msgstr "Kasutajanimi:"
 
-#: ../edit-urpm-sources.pl:566
+#: ../Rpmdrake/edit_urpm_sources.pm:555
 #, c-format
 msgid "Add a parallel group"
 msgstr "Paralleelgrupi lisamine"
 
-#: ../edit-urpm-sources.pl:566
+#: ../Rpmdrake/edit_urpm_sources.pm:555
 #, c-format
 msgid "Edit a parallel group"
 msgstr "Paralleelgrupi muutmine"
 
-#: ../edit-urpm-sources.pl:577
+#: ../Rpmdrake/edit_urpm_sources.pm:567
 #, c-format
 msgid "Add a medium limit"
 msgstr "Andmekandja limiidi lisamine"
 
-#: ../edit-urpm-sources.pl:589
+#: ../Rpmdrake/edit_urpm_sources.pm:580
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Valige andmekandja andmekandjate limiiti lisamiseks:"
 
-#: ../edit-urpm-sources.pl:626
+#: ../Rpmdrake/edit_urpm_sources.pm:617
 #, c-format
 msgid "Add a host"
 msgstr "Serveri lisamine"
 
-#: ../edit-urpm-sources.pl:632
+#: ../Rpmdrake/edit_urpm_sources.pm:624
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr "Kirjutage lisatava serveri masinanimi või IP-aadress:"
 
-#: ../edit-urpm-sources.pl:663
+#: ../Rpmdrake/edit_urpm_sources.pm:655
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Paralleelgrupi \"%s\" muutmine:"
 
-#: ../edit-urpm-sources.pl:667
+#: ../Rpmdrake/edit_urpm_sources.pm:659
 #, c-format
 msgid "Group name:"
 msgstr "Grupi nimi:"
 
-#: ../edit-urpm-sources.pl:668
+#: ../Rpmdrake/edit_urpm_sources.pm:660
 #, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../edit-urpm-sources.pl:670
+#: ../Rpmdrake/edit_urpm_sources.pm:662
 #, c-format
 msgid "Media limit:"
 msgstr "Andmekandja limiit:"
 
-#: ../edit-urpm-sources.pl:675 ../edit-urpm-sources.pl:682
+#: ../Rpmdrake/edit_urpm_sources.pm:667 ../Rpmdrake/edit_urpm_sources.pm:674
 #, c-format
 msgid "Add"
 msgstr "Lisa"
 
-#: ../edit-urpm-sources.pl:676 ../edit-urpm-sources.pl:683
-#: ../edit-urpm-sources.pl:741 ../edit-urpm-sources.pl:1001
+#: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:675
+#: ../Rpmdrake/edit_urpm_sources.pm:734 ../Rpmdrake/edit_urpm_sources.pm:997
 #, c-format
 msgid "Remove"
 msgstr "Eemalda"
 
-#: ../edit-urpm-sources.pl:677
+#: ../Rpmdrake/edit_urpm_sources.pm:669
 #, c-format
 msgid "Hosts:"
 msgstr "Serverid:"
 
-#: ../edit-urpm-sources.pl:711
+#: ../Rpmdrake/edit_urpm_sources.pm:703
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Paralleel-uprmi seadistamine (urpmi jagatud käivitamine)"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Group"
 msgstr "Grupp"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../edit-urpm-sources.pl:714
+#: ../Rpmdrake/edit_urpm_sources.pm:707
 #, c-format
 msgid "Media limit"
 msgstr "Andmekandjate limiit"
 
-#: ../edit-urpm-sources.pl:715
+#: ../Rpmdrake/edit_urpm_sources.pm:708
 #, c-format
 msgid "Command"
 msgstr "Käsk"
 
-#: ../edit-urpm-sources.pl:725 ../rpmdrake:465 ../rpmdrake:496 ../rpmdrake:635
-#: ../rpmdrake:882 ../rpmdrake:1773
+#: ../Rpmdrake/edit_urpm_sources.pm:718 ../Rpmdrake/gui.pm:680
+#: ../Rpmdrake/pkg.pm:98 ../Rpmdrake/pkg.pm:129 ../Rpmdrake/pkg.pm:168
+#: ../Rpmdrake/rpmnew.pm:80
 #, c-format
 msgid "(none)"
 msgstr "(puudub)"
 
-#: ../edit-urpm-sources.pl:745 ../edit-urpm-sources.pl:1005
+#: ../Rpmdrake/edit_urpm_sources.pm:738 ../Rpmdrake/edit_urpm_sources.pm:1001
 #, c-format
 msgid "Edit..."
 msgstr "Muuda..."
 
-#: ../edit-urpm-sources.pl:753 ../edit-urpm-sources.pl:1011
+#: ../Rpmdrake/edit_urpm_sources.pm:746 ../Rpmdrake/edit_urpm_sources.pm:1007
 #, c-format
 msgid "Add..."
 msgstr "Lisa..."
 
-#: ../edit-urpm-sources.pl:769
+#: ../Rpmdrake/edit_urpm_sources.pm:762
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Pakettide digitaalsignatuuride võtmete haldamine"
 
-#: ../edit-urpm-sources.pl:774 ../edit-urpm-sources.pl:936
+#: ../Rpmdrake/edit_urpm_sources.pm:768 ../Rpmdrake/edit_urpm_sources.pm:932
 #, c-format
 msgid "Medium"
 msgstr "Andmekandja"
 
-#: ../edit-urpm-sources.pl:780
+#: ../Rpmdrake/edit_urpm_sources.pm:774
 #, c-format
 msgid ""
 "_:cryptographic keys\n"
 "Keys"
 msgstr "Võtmed"
 
-#: ../edit-urpm-sources.pl:803
+#: ../Rpmdrake/edit_urpm_sources.pm:797
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "nime ei leitud, võtit ei ole rpm-i võtmerõngas!"
 
-#: ../edit-urpm-sources.pl:816
+#: ../Rpmdrake/edit_urpm_sources.pm:810
 #, c-format
 msgid "Add a key"
 msgstr "Võtme lisamine"
 
-#: ../edit-urpm-sources.pl:828
+#: ../Rpmdrake/edit_urpm_sources.pm:823
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Võtme valimine andmekandjale %s lisamiseks"
 
-#: ../edit-urpm-sources.pl:834
+#: ../Rpmdrake/edit_urpm_sources.pm:829
 #, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: ../edit-urpm-sources.pl:856
+#: ../Rpmdrake/edit_urpm_sources.pm:851
 #, c-format
 msgid "Remove a key"
 msgstr "Võtme eemaldamine"
 
-#: ../edit-urpm-sources.pl:857
+#: ../Rpmdrake/edit_urpm_sources.pm:852
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -488,37 +491,37 @@ msgstr ""
 "Kas tõesti eemaldada võti %s andmekandjalt %s?\n"
 "(võtme nimi: %s)"
 
-#: ../edit-urpm-sources.pl:875
+#: ../Rpmdrake/edit_urpm_sources.pm:870
 #, c-format
 msgid "Add a key..."
 msgstr "Lisa võti..."
 
-#: ../edit-urpm-sources.pl:879
+#: ../Rpmdrake/edit_urpm_sources.pm:874
 #, c-format
 msgid "Remove key"
 msgstr "Eemalda võti"
 
-#: ../edit-urpm-sources.pl:895
+#: ../Rpmdrake/edit_urpm_sources.pm:890
 #, c-format
 msgid "Configure media"
 msgstr "Allikate seadistamine"
 
-#: ../edit-urpm-sources.pl:934
+#: ../Rpmdrake/edit_urpm_sources.pm:930
 #, c-format
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../edit-urpm-sources.pl:935
+#: ../Rpmdrake/edit_urpm_sources.pm:931
 #, c-format
 msgid "Updates"
 msgstr "Uuendused"
 
-#: ../edit-urpm-sources.pl:951
+#: ../Rpmdrake/edit_urpm_sources.pm:947
 #, c-format
 msgid "This medium needs to be updated to be usable. Update it now ?"
 msgstr "Seda andmekandjat tuleb kasutamiseks uuendada. Kas teha seda kohe?"
 
-#: ../edit-urpm-sources.pl:981
+#: ../Rpmdrake/edit_urpm_sources.pm:977
 #, c-format
 msgid ""
 "Unable to update medium, errors reported:\n"
@@ -529,37 +532,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../edit-urpm-sources.pl:1015
+#: ../Rpmdrake/edit_urpm_sources.pm:1011
 #, c-format
 msgid "Add custom..."
 msgstr "Lisa omaloodud..."
 
-#: ../edit-urpm-sources.pl:1019
+#: ../Rpmdrake/edit_urpm_sources.pm:1015
 #, c-format
 msgid "Update..."
 msgstr "Uuenda..."
 
-#: ../edit-urpm-sources.pl:1022
+#: ../Rpmdrake/edit_urpm_sources.pm:1018
 #, c-format
 msgid "Manage keys..."
 msgstr "Võtmete haldamine"
 
-#: ../edit-urpm-sources.pl:1024
+#: ../Rpmdrake/edit_urpm_sources.pm:1020
 #, c-format
 msgid "Parallel..."
 msgstr "Paralleel..."
 
-#: ../edit-urpm-sources.pl:1025
+#: ../Rpmdrake/edit_urpm_sources.pm:1021
 #, c-format
 msgid "Global options..."
 msgstr "Globaalsed valikud..."
 
-#: ../edit-urpm-sources.pl:1035 ../rpmdrake:1425
+#: ../Rpmdrake/edit_urpm_sources.pm:1031 ../rpmdrake:472
 #, c-format
 msgid "Help"
 msgstr "Abi"
 
-#: ../edit-urpm-sources.pl:1051 ../gurpmi.addmedia:98 ../rpmdrake:2169
+#: ../Rpmdrake/edit_urpm_sources.pm:1044 ../Rpmdrake/init.pm:125
+#: ../gurpmi.addmedia:93
 #, c-format
 msgid ""
 "%s\n"
@@ -570,7 +574,7 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../edit-urpm-sources.pl:1054
+#: ../Rpmdrake/edit_urpm_sources.pm:1047
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -585,7 +589,7 @@ msgstr ""
 "kasutada oma süsteemi uuendamisel. Kui olete allikad määranud, saate\n"
 "nende abil paigaldada uusi tarkvarapakette või uuendada vanu."
 
-#: ../edit-urpm-sources.pl:1067
+#: ../Rpmdrake/edit_urpm_sources.pm:1063
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -598,1333 +602,1090 @@ msgstr ""
 "andmekandjatega tegelev rakendus mõnel muul töölaual või\n"
 "paigaldate parajasti mingeid tarkvarapakette?)"
 
-#: ../gurpmi.addmedia:88
+#: ../Rpmdrake/gui.pm:59 ../Rpmdrake/gui.pm:116
 #, c-format
-msgid "Unable to add medium, wrong or missing arguments"
-msgstr "Andmekandja lisamine ebaõnnestus, argumendid olid vigased või puudu"
+msgid "Importance: "
+msgstr "Tähtsus: "
 
-#: ../gurpmi.addmedia:102
+#: ../Rpmdrake/gui.pm:60 ../Rpmdrake/gui.pm:124
 #, c-format
-msgid ""
-"You are about to add new packages media, %s.\n"
-"That means you will be able to add new software packages\n"
-"to your system from these new media."
-msgstr ""
-"Kavatsete lisada uue tarkvaraallika %s.\n"
-"See tähendab, et eduka lisamise korral saate hakata\n"
-"süsteemi uut tarkvara paigaldama."
+msgid "Reason for update: "
+msgstr "Uuendamise põhjus: "
 
-#: ../gurpmi.addmedia:105
+#: ../Rpmdrake/gui.pm:64
 #, c-format
-msgid ""
-"You are about to add a new packages medium, `%s'.\n"
-"That means you will be able to add new software packages\n"
-"to your system from that new medium."
-msgstr ""
-"Kavatsete lisada uue tarkvaraallika '%s'.\n"
-"See tähendab, et eduka lisamise korral saate hakata\n"
-"süsteemi uut tarkvara paigaldama."
+msgid "Security advisory"
+msgstr "Turvanõuanne"
 
-#: ../gurpmi.addmedia:130
+#: ../Rpmdrake/gui.pm:72 ../Rpmdrake/gui.pm:126
 #, c-format
-msgid "Successfully added media %s."
-msgstr "Andmekandja %s edukalt lisatud."
+msgid "No description"
+msgstr "Kirjeldus puudub"
 
-#: ../gurpmi.addmedia:131
+#: ../Rpmdrake/gui.pm:75
 #, c-format
-msgid "Successfully added medium `%s'."
-msgstr "Andmekandja %s edukalt lisatud."
+msgid "Files:"
+msgstr "Failid:"
 
-#: ../rpmdrake:39
+#: ../Rpmdrake/gui.pm:79 ../Rpmdrake/gui.pm:84 ../Rpmdrake/gui.pm:98
+#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/pkg.pm:135
 #, c-format
-msgid "Usage: %s [OPTION]..."
-msgstr "Kasutamine: %s [VÕTI]..."
+msgid "(Not available)"
+msgstr "(kättesaamatu)"
+
+#: ../Rpmdrake/gui.pm:83
+#, c-format
+msgid "Changelog:"
+msgstr "Muutuste logi:"
+
+#: ../Rpmdrake/gui.pm:95
+#, c-format
+msgid "Files:\n"
+msgstr "Failid:\n"
+
+#: ../Rpmdrake/gui.pm:100
+#, c-format
+msgid "Changelog:\n"
+msgstr "Muutuste logi:\n"
+
+#: ../Rpmdrake/gui.pm:105 ../rpmdrake.pm:813
+#, c-format
+msgid "Medium: "
+msgstr "Andmekandja: "
+
+#: ../Rpmdrake/gui.pm:106
+#, c-format
+msgid "Currently installed version: "
+msgstr "Praegu paigaldatud versioon: "
+
+#: ../Rpmdrake/gui.pm:110
+#, c-format
+msgid "Name: "
+msgstr "Nimi: "
+
+#: ../Rpmdrake/gui.pm:111
+#, c-format
+msgid "Version: "
+msgstr "Versioon: "
+
+#: ../Rpmdrake/gui.pm:112
+#, c-format
+msgid "Architecture: "
+msgstr "Arhitektuur: "
 
-#: ../rpmdrake:40
+#: ../Rpmdrake/gui.pm:113
+#, c-format
+msgid "Size: "
+msgstr "Suurus: "
+
+#: ../Rpmdrake/gui.pm:113
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../Rpmdrake/gui.pm:120
+#, c-format
+msgid "Summary: "
+msgstr "Kokkuvõte: "
+
+#: ../Rpmdrake/gui.pm:126
+#, c-format
+msgid "Description: "
+msgstr "Kirjeldus: "
+
+#: ../Rpmdrake/gui.pm:453 ../Rpmdrake/gui.pm:490 ../Rpmdrake/gui.pm:492
+#, c-format
+msgid "More information on package..."
+msgstr "Rohkem infot paketi kohta..."
+
+#: ../Rpmdrake/gui.pm:455
+#, c-format
+msgid "Please choose"
+msgstr "Palun valige"
+
+#: ../Rpmdrake/gui.pm:456
+#, c-format
+msgid "The following package is needed:"
+msgstr "Vajalik on järgmine pakett:"
+
+#: ../Rpmdrake/gui.pm:456
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "Vajalik on üks järgnevatest pakettidest:"
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:483
+#, c-format
+msgid "More info"
+msgstr "Rohkem infot"
+
+#: ../Rpmdrake/gui.pm:485
+#, c-format
+msgid "Information on packages"
+msgstr "Info pakettide kohta"
+
+#: ../Rpmdrake/gui.pm:508
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
+
+#: ../Rpmdrake/gui.pm:509
 #, c-format
 msgid ""
-"  --changelog-first      display changelog before filelist in the "
-"description window"
-msgstr ""
-"  --changelog-first      muutuste logi näidatakse kirjeldusaknas enne "
-"failide nimekirja"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:"
+msgstr "Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:"
 
-#: ../rpmdrake:41
+#: ../Rpmdrake/gui.pm:515 ../Rpmdrake/gui.pm:524
 #, c-format
-msgid "  --media=medium1,..     limit to given media"
-msgstr "  --media=medium1,..     piirdumine määratud andmekandjaga"
+msgid "Some packages can't be removed"
+msgstr "Mõnda paketti ei saa eemaldada"
 
-#: ../rpmdrake:42
+#: ../Rpmdrake/gui.pm:516
 #, c-format
 msgid ""
-"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+"Removing these packages would break your system, sorry:\n"
+"\n"
 msgstr ""
-"  --merge-all-rpmnew     kõigi leitud .rpmnew/.rpmsave-failide ühendamine"
+"Vabandust, nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
+"\n"
 
-#: ../rpmdrake:43
+#: ../Rpmdrake/gui.pm:525 ../Rpmdrake/gui.pm:592
 #, c-format
-msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgid ""
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
+"\n"
 msgstr ""
-"  --mode=MODE            režiimi määramine (paigaldamine (vaikimisi), "
-"eemaldamine, uuendamine)"
+"Sõltuvuste tõttu ei saa järgmisi pakette valida:\n"
+"\n"
+
+#: ../Rpmdrake/gui.pm:554
+#, c-format
+msgid "Additional packages needed"
+msgstr "Vajalikud lisapaketid"
 
-#: ../rpmdrake:44
+#: ../Rpmdrake/gui.pm:555
 #, c-format
 msgid ""
-"  --no-confirmation      don't ask first confirmation question in update mode"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
+"\n"
 msgstr ""
-"  --no-confirmation      uuendamisrežiimis ei esitata esimest "
-"kinnituseküsimust"
+"Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
+"\n"
 
-#: ../rpmdrake:45
+#: ../Rpmdrake/gui.pm:569
 #, c-format
-msgid "  --no-media-update      don't update media at startup"
-msgstr "  --no-media-update      käivitamisel ei uuendata andmekandjat"
+msgid "%s (belongs to the skip list)"
+msgstr "%s (kuulub vahelejäetavate hulka)"
 
-#: ../rpmdrake:46
+#: ../Rpmdrake/gui.pm:573
 #, c-format
-msgid "  --no-verify-rpm        don't verify packages signatures"
-msgstr "  --no-verify-rpm        pakettide signatuure ei kontrollita"
+msgid "One package cannot be installed"
+msgstr "Üht paketti ei saa paigaldada"
 
-#: ../rpmdrake:47
+#: ../Rpmdrake/gui.pm:573
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "Mõnda paketti ei saa paigaldada"
+
+#: ../Rpmdrake/gui.pm:575
 #, c-format
 msgid ""
-"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
-"\" machine to show needed deps"
+"Sorry, the following package cannot be selected:\n"
+"\n"
+"%s"
 msgstr ""
-"  --parallel=alias,host  töö paralleelrežiimis, kasutades gruppi \"alias\", "
-"kasutades masinat \"host\" vajalike sõltuvuste näitamiseks"
+"Kahjuks ei saa järgmist paketti valida:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:48
+#: ../Rpmdrake/gui.pm:576
 #, c-format
-msgid "  --pkg-nosel=pkg1,..    show only these packages"
-msgstr "  --pkg-nosel=pkg1,..    näidatakse ainult määratud pakette"
+msgid ""
+"Sorry, the following packages can't be selected:\n"
+"\n"
+"%s"
+msgstr ""
+"Kahjuks ei saa järgmisi pakette valida:\n"
+"\n"
+"%s"
 
-#: ../rpmdrake:49
+#: ../Rpmdrake/gui.pm:591 ../Rpmdrake/pkg.pm:486
 #, c-format
-msgid "  --pkg-sel=pkg1,..      preselect these packages"
-msgstr "  --pkg-sel=pkg1,..      määratud pakettide eelvalimine"
+msgid "Some packages need to be removed"
+msgstr "Mõned paketid tuleb eemaldada"
 
-#: ../rpmdrake:50
+#: ../Rpmdrake/gui.pm:622
 #, c-format
-msgid "  --root                 force to run as root"
-msgstr "  --root                 sunnitakse töötama administraatori õigustes"
+msgid "Error: %s appears to be mounted read-only."
+msgstr "Viga: %s paistab olevat haagitud ainult loetavana."
 
-#: ../rpmdrake:51
+#: ../Rpmdrake/gui.pm:626
 #, c-format
-msgid "  --search=pkg           run search for \"pkg\""
-msgstr "  --search=pkg           otsitakse paketti \"pkg\""
+msgid "You need to select some packages first."
+msgstr "Kõigepealt tuleb mõned paketid valida."
 
-#: ../rpmdrake:205
+#: ../Rpmdrake/gui.pm:631
 #, c-format
-msgid "Running in user mode"
-msgstr "Töötamine kasutaja õigustega"
+msgid "Too many packages are selected"
+msgstr "Valitud on liiga palju pakette"
 
-#: ../rpmdrake:206
+#: ../Rpmdrake/gui.pm:632
 #, 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."
+"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 ""
-"Käivitasite selle rakenduse tavalise kasutajana.\n"
-"Te ei saa nii küll süsteemis mingeid muutusi ette võtta,\n"
-"kuid võite siiski sirvida olemasolevat andmebaasi."
+"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?"
+
+#: ../Rpmdrake/gui.pm:664
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "Palun oodake, koostatakse nimekirja..."
+
+#: ../Rpmdrake/gui.pm:682
+#, c-format
+msgid "No update"
+msgstr "Uuendusi ei ole"
+
+#: ../Rpmdrake/gui.pm:683
+#, c-format
+msgid ""
+"The list of updates is empty. 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/gui.pm:706 ../rpmdrake:256
+#, c-format
+msgid "All"
+msgstr "Kõik"
+
+#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#, c-format
+msgid "Upgradable"
+msgstr "Uuendatavad"
+
+#: ../Rpmdrake/gui.pm:715 ../rpmdrake:142
+#, c-format
+msgid "Addable"
+msgstr "Lisatavad"
 
-#: ../rpmdrake:214
+#: ../Rpmdrake/gui.pm:735
+#, c-format
+msgid "Description not available for this package\n"
+msgstr "Sellel paketil pole kirjeldust\n"
+
+#: ../Rpmdrake/gui.pm:741 ../Rpmdrake/pkg.pm:189
+#, c-format
+msgid "A fatal error occurred: %s."
+msgstr "Tekkis saatuslik viga: %s."
+
+#: ../Rpmdrake/icon.pm:35
 #, c-format
 msgid "Accessibility"
 msgstr "Hõlbustus"
 
-#: ../rpmdrake:215 ../rpmdrake:216 ../rpmdrake:217 ../rpmdrake:218
-#: ../rpmdrake:219
+#: ../Rpmdrake/icon.pm:36 ../Rpmdrake/icon.pm:37 ../Rpmdrake/icon.pm:38
+#: ../Rpmdrake/icon.pm:39 ../Rpmdrake/icon.pm:40
 #, c-format
 msgid "Archiving"
 msgstr "Arhiveerimine"
 
-#: ../rpmdrake:216
+#: ../Rpmdrake/icon.pm:37
 #, c-format
 msgid "Backup"
 msgstr "Varundamine"
 
-#: ../rpmdrake:217
+#: ../Rpmdrake/icon.pm:38
 #, c-format
 msgid "Cd burning"
 msgstr "CD-de kirjutamine"
 
-#: ../rpmdrake:218
+#: ../Rpmdrake/icon.pm:39
 #, c-format
 msgid "Compression"
 msgstr "Tihendamine"
 
-#: ../rpmdrake:219 ../rpmdrake:225 ../rpmdrake:239 ../rpmdrake:252
-#: ../rpmdrake:270 ../rpmdrake:291 ../rpmdrake:304 ../rpmdrake:314
-#: ../rpmdrake:426
+#: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:73 ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:112
+#: ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:135 ../Rpmdrake/pkg.pm:75
 #, c-format
 msgid "Other"
 msgstr "Muu"
 
-#: ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222 ../rpmdrake:223
-#: ../rpmdrake:224 ../rpmdrake:225
+#: ../Rpmdrake/icon.pm:41 ../Rpmdrake/icon.pm:42 ../Rpmdrake/icon.pm:43
+#: ../Rpmdrake/icon.pm:44 ../Rpmdrake/icon.pm:45 ../Rpmdrake/icon.pm:46
 #, c-format
 msgid "Books"
 msgstr "Raamatud"
 
-#: ../rpmdrake:221
+#: ../Rpmdrake/icon.pm:42
 #, c-format
 msgid "Computer books"
 msgstr "Arvutiraamatud"
 
-#: ../rpmdrake:222
+#: ../Rpmdrake/icon.pm:43
 #, c-format
 msgid "Faqs"
 msgstr "KKK"
 
-#: ../rpmdrake:223
+#: ../Rpmdrake/icon.pm:44
 #, c-format
 msgid "Howtos"
 msgstr "HOWTO"
 
-#: ../rpmdrake:224
+#: ../Rpmdrake/icon.pm:45
 #, c-format
 msgid "Literature"
 msgstr "Kirjandus"
 
-#: ../rpmdrake:226 ../rpmdrake:227 ../rpmdrake:228
+#: ../Rpmdrake/icon.pm:47 ../Rpmdrake/icon.pm:48 ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Cluster"
 msgstr "Klaster"
 
-#: ../rpmdrake:227
+#: ../Rpmdrake/icon.pm:48
 #, c-format
 msgid "Message Passing"
 msgstr "Teateedastus"
 
-#: ../rpmdrake:228
+#: ../Rpmdrake/icon.pm:49
 #, c-format
 msgid "Queueing Services"
 msgstr "Järjekorrateenused"
 
-#: ../rpmdrake:229
+#: ../Rpmdrake/icon.pm:50
 #, c-format
 msgid "Communications"
 msgstr "Kommunikatsioon"
 
-#: ../rpmdrake:230 ../rpmdrake:234
+#: ../Rpmdrake/icon.pm:51 ../Rpmdrake/icon.pm:55
 #, c-format
 msgid "Databases"
 msgstr "Andmebaasid"
 
-#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
-#: ../rpmdrake:239 ../rpmdrake:240 ../rpmdrake:241 ../rpmdrake:242
-#: ../rpmdrake:353 ../rpmdrake:354 ../rpmdrake:355
+#: ../Rpmdrake/icon.pm:52 ../Rpmdrake/icon.pm:53 ../Rpmdrake/icon.pm:54
+#: ../Rpmdrake/icon.pm:55 ../Rpmdrake/icon.pm:56 ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:58 ../Rpmdrake/icon.pm:59 ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:62 ../Rpmdrake/icon.pm:63
+#: ../Rpmdrake/icon.pm:174 ../Rpmdrake/icon.pm:175 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Development"
 msgstr "Arendus"
 
-#: ../rpmdrake:232
+#: ../Rpmdrake/icon.pm:53
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:233
+#: ../Rpmdrake/icon.pm:54
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:235
+#: ../Rpmdrake/icon.pm:56
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME ja GTK+"
 
-#: ../rpmdrake:236
+#: ../Rpmdrake/icon.pm:57
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:237
+#: ../Rpmdrake/icon.pm:58
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE ja Qt"
 
-#: ../rpmdrake:238
+#: ../Rpmdrake/icon.pm:59
 #, c-format
 msgid "Kernel"
 msgstr "Kernel"
 
-#: ../rpmdrake:240
+#: ../Rpmdrake/icon.pm:61
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:241
+#: ../Rpmdrake/icon.pm:62
 #, c-format
 msgid "PHP"
 msgstr "PHP"
 
-#: ../rpmdrake:242
+#: ../Rpmdrake/icon.pm:63
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:243
+#: ../Rpmdrake/icon.pm:64
 #, c-format
 msgid "Editors"
 msgstr "Redaktorid"
 
-#: ../rpmdrake:244
+#: ../Rpmdrake/icon.pm:65
 #, c-format
 msgid "Education"
 msgstr "Haridus"
 
-#: ../rpmdrake:245
+#: ../Rpmdrake/icon.pm:66
 #, c-format
 msgid "Emulators"
 msgstr "Emulaatorid"
 
-#: ../rpmdrake:246
+#: ../Rpmdrake/icon.pm:67
 #, c-format
 msgid "File tools"
 msgstr "Failitööriistad"
 
-#: ../rpmdrake:247 ../rpmdrake:248 ../rpmdrake:249 ../rpmdrake:250
-#: ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253 ../rpmdrake:254
-#: ../rpmdrake:255
+#: ../Rpmdrake/icon.pm:68 ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:70
+#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:72 ../Rpmdrake/icon.pm:73
+#: ../Rpmdrake/icon.pm:74 ../Rpmdrake/icon.pm:75 ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Games"
 msgstr "Mängud"
 
-#: ../rpmdrake:248
+#: ../Rpmdrake/icon.pm:69
 #, c-format
 msgid "Adventure"
 msgstr "Seiklusmängud"
 
-#: ../rpmdrake:249
+#: ../Rpmdrake/icon.pm:70
 #, c-format
 msgid "Arcade"
 msgstr "Võitlusmängud"
 
-#: ../rpmdrake:250
+#: ../Rpmdrake/icon.pm:71
 #, c-format
 msgid "Boards"
 msgstr "Lauamängud"
 
-#: ../rpmdrake:251
+#: ../Rpmdrake/icon.pm:72
 #, c-format
 msgid "Cards"
 msgstr "Kaardimängud"
 
-#: ../rpmdrake:253
+#: ../Rpmdrake/icon.pm:74
 #, c-format
 msgid "Puzzles"
 msgstr "Pusled"
 
-#: ../rpmdrake:254
+#: ../Rpmdrake/icon.pm:75
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:255
+#: ../Rpmdrake/icon.pm:76
 #, c-format
 msgid "Strategy"
 msgstr "Strateegia"
 
-#: ../rpmdrake:256 ../rpmdrake:257 ../rpmdrake:260 ../rpmdrake:261
-#: ../rpmdrake:264 ../rpmdrake:267 ../rpmdrake:270 ../rpmdrake:271
-#: ../rpmdrake:274 ../rpmdrake:277
+#: ../Rpmdrake/icon.pm:77 ../Rpmdrake/icon.pm:78 ../Rpmdrake/icon.pm:81
+#: ../Rpmdrake/icon.pm:82 ../Rpmdrake/icon.pm:85 ../Rpmdrake/icon.pm:88
+#: ../Rpmdrake/icon.pm:91 ../Rpmdrake/icon.pm:92 ../Rpmdrake/icon.pm:95
+#: ../Rpmdrake/icon.pm:98
 #, c-format
 msgid "Graphical desktop"
 msgstr "Graafiline töölaud"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:259
+#: ../Rpmdrake/icon.pm:80
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:260
+#: ../Rpmdrake/icon.pm:81
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:263
+#: ../Rpmdrake/icon.pm:84
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:266
+#: ../Rpmdrake/icon.pm:87
 #, c-format
 msgid "Icewm"
 msgstr "IceWM"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:269
+#: ../Rpmdrake/icon.pm:90
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:273
+#: ../Rpmdrake/icon.pm:94
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:276
+#: ../Rpmdrake/icon.pm:97
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:279
+#: ../Rpmdrake/icon.pm:100
 #, c-format
 msgid "Xfce"
 msgstr "Xfce"
 
-#: ../rpmdrake:280
+#: ../Rpmdrake/icon.pm:101
 #, c-format
 msgid "Graphics"
 msgstr "Graafika"
 
-#: ../rpmdrake:281
+#: ../Rpmdrake/icon.pm:102
 #, c-format
 msgid "Monitoring"
 msgstr "Monitooring"
 
-#: ../rpmdrake:282 ../rpmdrake:283
+#: ../Rpmdrake/icon.pm:103 ../Rpmdrake/icon.pm:104
 #, c-format
 msgid "Multimedia"
 msgstr "Multimeedia"
 
-#: ../rpmdrake:283 ../rpmdrake:334
+#: ../Rpmdrake/icon.pm:104 ../Rpmdrake/icon.pm:155
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:284 ../rpmdrake:285 ../rpmdrake:286 ../rpmdrake:287
-#: ../rpmdrake:288 ../rpmdrake:289 ../rpmdrake:290 ../rpmdrake:291
-#: ../rpmdrake:292 ../rpmdrake:293 ../rpmdrake:313
+#: ../Rpmdrake/icon.pm:105 ../Rpmdrake/icon.pm:106 ../Rpmdrake/icon.pm:107
+#: ../Rpmdrake/icon.pm:108 ../Rpmdrake/icon.pm:109 ../Rpmdrake/icon.pm:110
+#: ../Rpmdrake/icon.pm:111 ../Rpmdrake/icon.pm:112 ../Rpmdrake/icon.pm:113
+#: ../Rpmdrake/icon.pm:114 ../Rpmdrake/icon.pm:134
 #, c-format
 msgid "Networking"
 msgstr "Võrk"
 
-#: ../rpmdrake:285
+#: ../Rpmdrake/icon.pm:106
 #, c-format
 msgid "Chat"
 msgstr "Chat"
 
-#: ../rpmdrake:286
+#: ../Rpmdrake/icon.pm:107
 #, c-format
 msgid "File transfer"
 msgstr "Failiedastus"
 
-#: ../rpmdrake:287
+#: ../Rpmdrake/icon.pm:108
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:288
+#: ../Rpmdrake/icon.pm:109
 #, c-format
 msgid "Instant messaging"
 msgstr "Kiirsuhtlus"
 
-#: ../rpmdrake:289 ../rpmdrake:360
+#: ../Rpmdrake/icon.pm:110 ../Rpmdrake/icon.pm:181
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: ../rpmdrake:290
+#: ../Rpmdrake/icon.pm:111
 #, c-format
 msgid "News"
 msgstr "Uudised"
 
-#: ../rpmdrake:292
+#: ../Rpmdrake/icon.pm:113
 #, c-format
 msgid "Remote access"
 msgstr "Kaugligipääs"
 
-#: ../rpmdrake:293
+#: ../Rpmdrake/icon.pm:114
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:294
+#: ../Rpmdrake/icon.pm:115
 #, c-format
 msgid "Office"
 msgstr "Kontoritöö"
 
-#: ../rpmdrake:295
+#: ../Rpmdrake/icon.pm:116
 #, c-format
 msgid "Public Keys"
 msgstr "Avalikud võtmed"
 
-#: ../rpmdrake:296
+#: ../Rpmdrake/icon.pm:117
 #, c-format
 msgid "Publishing"
 msgstr "Publitseerimine"
 
-#: ../rpmdrake:297 ../rpmdrake:298 ../rpmdrake:299 ../rpmdrake:300
-#: ../rpmdrake:301 ../rpmdrake:302 ../rpmdrake:303 ../rpmdrake:304
-#: ../rpmdrake:305
+#: ../Rpmdrake/icon.pm:118 ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:120
+#: ../Rpmdrake/icon.pm:121 ../Rpmdrake/icon.pm:122 ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:124 ../Rpmdrake/icon.pm:125 ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Sciences"
 msgstr "Teadus"
 
-#: ../rpmdrake:298
+#: ../Rpmdrake/icon.pm:119
 #, c-format
 msgid "Astronomy"
 msgstr "Astronoomia"
 
-#: ../rpmdrake:299
+#: ../Rpmdrake/icon.pm:120
 #, c-format
 msgid "Biology"
 msgstr "Bioloogia"
 
-#: ../rpmdrake:300
+#: ../Rpmdrake/icon.pm:121
 #, c-format
 msgid "Chemistry"
 msgstr "Keemia"
 
-#: ../rpmdrake:301
+#: ../Rpmdrake/icon.pm:122
 #, c-format
 msgid "Computer science"
 msgstr "Arvutiteadus"
 
-#: ../rpmdrake:302
+#: ../Rpmdrake/icon.pm:123
 #, c-format
 msgid "Geosciences"
 msgstr "Geograafia"
 
-#: ../rpmdrake:303
+#: ../Rpmdrake/icon.pm:124
 #, c-format
 msgid "Mathematics"
 msgstr "Matemaatika"
 
-#: ../rpmdrake:305
+#: ../Rpmdrake/icon.pm:126
 #, c-format
 msgid "Physics"
 msgstr "Füüsika"
 
-#: ../rpmdrake:306
+#: ../Rpmdrake/icon.pm:127
 #, c-format
 msgid "Shells"
 msgstr "Shellid"
 
-#: ../rpmdrake:307
+#: ../Rpmdrake/icon.pm:128
 #, c-format
 msgid "Sound"
 msgstr "Heli"
 
-#: ../rpmdrake:308 ../rpmdrake:309 ../rpmdrake:310 ../rpmdrake:311
-#: ../rpmdrake:312 ../rpmdrake:313 ../rpmdrake:314 ../rpmdrake:315
-#: ../rpmdrake:316 ../rpmdrake:317 ../rpmdrake:318 ../rpmdrake:319
-#: ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322 ../rpmdrake:323
-#: ../rpmdrake:324 ../rpmdrake:325 ../rpmdrake:326 ../rpmdrake:327
-#: ../rpmdrake:328
+#: ../Rpmdrake/icon.pm:129 ../Rpmdrake/icon.pm:130 ../Rpmdrake/icon.pm:131
+#: ../Rpmdrake/icon.pm:132 ../Rpmdrake/icon.pm:133 ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:137
+#: ../Rpmdrake/icon.pm:138 ../Rpmdrake/icon.pm:139 ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142 ../Rpmdrake/icon.pm:143
+#: ../Rpmdrake/icon.pm:144 ../Rpmdrake/icon.pm:145 ../Rpmdrake/icon.pm:146
+#: ../Rpmdrake/icon.pm:147 ../Rpmdrake/icon.pm:148 ../Rpmdrake/icon.pm:149
 #, c-format
 msgid "System"
 msgstr "Süsteem"
 
-#: ../rpmdrake:309
+#: ../Rpmdrake/icon.pm:130
 #, c-format
 msgid "Base"
 msgstr "Baas"
 
-#: ../rpmdrake:310 ../rpmdrake:311 ../rpmdrake:312 ../rpmdrake:313
-#: ../rpmdrake:314 ../rpmdrake:315 ../rpmdrake:316 ../rpmdrake:338
+#: ../Rpmdrake/icon.pm:131 ../Rpmdrake/icon.pm:132 ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:134 ../Rpmdrake/icon.pm:135 ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:159
 #, c-format
 msgid "Configuration"
 msgstr "Seadistamine"
 
-#: ../rpmdrake:311
+#: ../Rpmdrake/icon.pm:132
 #, c-format
 msgid "Boot and Init"
 msgstr "Algkäivitus"
 
-#: ../rpmdrake:312
+#: ../Rpmdrake/icon.pm:133
 #, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: ../rpmdrake:315
+#: ../Rpmdrake/icon.pm:136
 #, c-format
 msgid "Packaging"
 msgstr "Paketindus"
 
-#: ../rpmdrake:316
+#: ../Rpmdrake/icon.pm:137
 #, c-format
 msgid "Printing"
 msgstr "Trükkimine"
 
-#: ../rpmdrake:317
+#: ../Rpmdrake/icon.pm:138
 #, c-format
 msgid "Deploiement"
 msgstr "Jaosvõrk"
 
-#: ../rpmdrake:318
+#: ../Rpmdrake/icon.pm:139
 #, c-format
 msgid "Deployment"
 msgstr "Jaosvõrk"
 
-#: ../rpmdrake:319 ../rpmdrake:320 ../rpmdrake:321 ../rpmdrake:322
-#: ../rpmdrake:323
+#: ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141 ../Rpmdrake/icon.pm:142
+#: ../Rpmdrake/icon.pm:143 ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "Fonts"
 msgstr "Fondid"
 
-#: ../rpmdrake:320
+#: ../Rpmdrake/icon.pm:141
 #, c-format
 msgid "Console"
 msgstr "Konsool"
 
-#: ../rpmdrake:321
+#: ../Rpmdrake/icon.pm:142
 #, c-format
 msgid "True type"
 msgstr "True Type"
 
-#: ../rpmdrake:322
+#: ../Rpmdrake/icon.pm:143
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:323
+#: ../Rpmdrake/icon.pm:144
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11"
 
-#: ../rpmdrake:324
+#: ../Rpmdrake/icon.pm:145
 #, c-format
 msgid "Internationalization"
 msgstr "Internatsionaliseerimine"
 
-#: ../rpmdrake:325
+#: ../Rpmdrake/icon.pm:146
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kernel ja riistvara"
 
-#: ../rpmdrake:326
+#: ../Rpmdrake/icon.pm:147
 #, c-format
 msgid "Libraries"
 msgstr "Teegid"
 
-#: ../rpmdrake:327
+#: ../Rpmdrake/icon.pm:148
 #, c-format
 msgid "Servers"
 msgstr "Serverid"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../rpmdrake:330
+#: ../Rpmdrake/icon.pm:151
 #, c-format
 msgid "X11"
 msgstr "X11"
 
-#: ../rpmdrake:331
+#: ../Rpmdrake/icon.pm:152
 #, c-format
 msgid "Terminals"
 msgstr "Terminalid"
 
-#: ../rpmdrake:332
+#: ../Rpmdrake/icon.pm:153
 #, c-format
 msgid "Text tools"
 msgstr "Tekstitööriistad"
 
-#: ../rpmdrake:333
+#: ../Rpmdrake/icon.pm:154
 #, c-format
 msgid "Toys"
 msgstr "Mänguasjad"
 
-#: ../rpmdrake:337 ../rpmdrake:338 ../rpmdrake:339 ../rpmdrake:340
-#: ../rpmdrake:341 ../rpmdrake:342 ../rpmdrake:343 ../rpmdrake:344
-#: ../rpmdrake:345 ../rpmdrake:346
+#: ../Rpmdrake/icon.pm:158 ../Rpmdrake/icon.pm:159 ../Rpmdrake/icon.pm:160
+#: ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:162 ../Rpmdrake/icon.pm:163
+#: ../Rpmdrake/icon.pm:164 ../Rpmdrake/icon.pm:165 ../Rpmdrake/icon.pm:166
+#: ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "Workstation"
 msgstr "Tööjaam"
 
-#: ../rpmdrake:339
+#: ../Rpmdrake/icon.pm:160
 #, c-format
 msgid "Console Tools"
 msgstr "Konsoolitööriistad"
 
-#: ../rpmdrake:340 ../rpmdrake:355
+#: ../Rpmdrake/icon.pm:161 ../Rpmdrake/icon.pm:176
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
-#: ../rpmdrake:341
+#: ../Rpmdrake/icon.pm:162
 #, c-format
 msgid "Game station"
 msgstr "Mänguarvuti"
 
-#: ../rpmdrake:342
+#: ../Rpmdrake/icon.pm:163
 #, c-format
 msgid "Internet station"
 msgstr "Internetiarvuti"
 
-#: ../rpmdrake:343
+#: ../Rpmdrake/icon.pm:164
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimeediaarvuti"
 
-#: ../rpmdrake:344
+#: ../Rpmdrake/icon.pm:165
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Võrguarvuti (klient)"
 
-#: ../rpmdrake:345
+#: ../Rpmdrake/icon.pm:166
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontoriarvuti"
 
-#: ../rpmdrake:346
+#: ../Rpmdrake/icon.pm:167
 #, c-format
 msgid "Scientific Workstation"
 msgstr "Teadusarvuti"
 
-#: ../rpmdrake:347 ../rpmdrake:349 ../rpmdrake:350 ../rpmdrake:351
-#: ../rpmdrake:352
+#: ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:170 ../Rpmdrake/icon.pm:171
+#: ../Rpmdrake/icon.pm:172 ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Graphical Environment"
 msgstr "Graafiline keskkond"
 
-#: ../rpmdrake:349
+#: ../Rpmdrake/icon.pm:170
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME tööjaam"
 
-#: ../rpmdrake:350
+#: ../Rpmdrake/icon.pm:171
 #, c-format
 msgid "IceWm Desktop"
 msgstr "IceWM töölaud"
 
-#: ../rpmdrake:351
+#: ../Rpmdrake/icon.pm:172
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE tööjaam"
 
-#: ../rpmdrake:352
+#: ../Rpmdrake/icon.pm:173
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Teised graafilised töölauad"
 
-#: ../rpmdrake:356 ../rpmdrake:357 ../rpmdrake:358 ../rpmdrake:359
-#: ../rpmdrake:360 ../rpmdrake:361 ../rpmdrake:362 ../rpmdrake:363
+#: ../Rpmdrake/icon.pm:177 ../Rpmdrake/icon.pm:178 ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:180 ../Rpmdrake/icon.pm:181 ../Rpmdrake/icon.pm:182
+#: ../Rpmdrake/icon.pm:183 ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Server"
 msgstr "Server"
 
-#: ../rpmdrake:357
+#: ../Rpmdrake/icon.pm:178
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: ../rpmdrake:358
+#: ../Rpmdrake/icon.pm:179
 #, c-format
 msgid "Database"
 msgstr "Andmebaas"
 
-#: ../rpmdrake:359
+#: ../Rpmdrake/icon.pm:180
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tulemüür/ruuter"
 
-#: ../rpmdrake:361
+#: ../Rpmdrake/icon.pm:182
 #, c-format
 msgid "Mail/Groupware/News"
 msgstr "E-post/grupitöö/uudised"
 
-#: ../rpmdrake:362
+#: ../Rpmdrake/icon.pm:183
 #, c-format
 msgid "Network Computer server"
 msgstr "Võrguarvuti (server)"
 
-#: ../rpmdrake:363
+#: ../Rpmdrake/icon.pm:184
 #, c-format
 msgid "Web/FTP"
 msgstr "Veeb/FTP"
 
-#: ../rpmdrake:502 ../rpmdrake:703 ../rpmdrake:708 ../rpmdrake:722
-#: ../rpmdrake:724
+#: ../Rpmdrake/init.pm:40
 #, c-format
-msgid "(Not available)"
-msgstr "(kättesaamatu)"
-
-#: ../rpmdrake:534 ../rpmdrake:616
-#, c-format
-msgid "Search results"
-msgstr "Otsingu tulemused"
-
-#: ../rpmdrake:534
-#, c-format
-msgid "Search results (none)"
-msgstr "Otsingu tulemus (ei leitud)"
-
-#: ../rpmdrake:545 ../rpmdrake:573 ../rpmdrake:2150
-#, c-format
-msgid "Please wait, searching..."
-msgstr "Palun oodake, otsitakse..."
-
-#: ../rpmdrake:568 ../rpmdrake:806 ../rpmdrake.pm:180
-#, c-format
-msgid "Software Management"
-msgstr "Tarkvarahaldur"
-
-#: ../rpmdrake:578
-#, c-format
-msgid "Stop"
-msgstr "Peata"
-
-#: ../rpmdrake:617 ../rpmdrake:917
-#, c-format
-msgid "Upgradable"
-msgstr "Uuendatavad"
-
-#: ../rpmdrake:617 ../rpmdrake:917
-#, c-format
-msgid "Addable"
-msgstr "Lisatavad"
-
-#: ../rpmdrake:619
-#, c-format
-msgid "Selected"
-msgstr "Valitud"
-
-#: ../rpmdrake:619
-#, c-format
-msgid "Not selected"
-msgstr "Valimata"
-
-#: ../rpmdrake:683 ../rpmdrake:740
-#, c-format
-msgid "Importance: "
-msgstr "Tähtsus: "
-
-#: ../rpmdrake:684 ../rpmdrake:748
-#, c-format
-msgid "Reason for update: "
-msgstr "Uuendamise põhjus: "
-
-#: ../rpmdrake:688
-#, c-format
-msgid "Security advisory"
-msgstr "Turvanõuanne"
-
-#: ../rpmdrake:696 ../rpmdrake:750
-#, c-format
-msgid "No description"
-msgstr "Kirjeldus puudub"
-
-#: ../rpmdrake:699
-#, c-format
-msgid "Files:"
-msgstr "Failid:"
-
-#: ../rpmdrake:707
-#, c-format
-msgid "Changelog:"
-msgstr "Muutuste logi:"
-
-#: ../rpmdrake:719
-#, c-format
-msgid "Files:\n"
-msgstr "Failid:\n"
-
-#: ../rpmdrake:724
-#, c-format
-msgid "Changelog:\n"
-msgstr "Muutuste logi:\n"
-
-#: ../rpmdrake:729 ../rpmdrake.pm:809
-#, c-format
-msgid "Medium: "
-msgstr "Andmekandja: "
-
-#: ../rpmdrake:730
-#, c-format
-msgid "Currently installed version: "
-msgstr "Praegu paigaldatud versioon: "
-
-#: ../rpmdrake:734
-#, c-format
-msgid "Name: "
-msgstr "Nimi: "
-
-#: ../rpmdrake:735
-#, c-format
-msgid "Version: "
-msgstr "Versioon: "
-
-#: ../rpmdrake:736
-#, c-format
-msgid "Architecture: "
-msgstr "Arhitektuur: "
-
-#: ../rpmdrake:737
-#, c-format
-msgid "Size: "
-msgstr "Suurus: "
-
-#: ../rpmdrake:737
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "Usage: %s [OPTION]..."
+msgstr "Kasutamine: %s [VÕTI]..."
 
-#: ../rpmdrake:744
+#: ../Rpmdrake/init.pm:41
 #, c-format
-msgid "Summary: "
-msgstr "Kokkuvõte: "
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
+msgstr ""
+"  --changelog-first      muutuste logi näidatakse kirjeldusaknas enne "
+"failide nimekirja"
 
-#: ../rpmdrake:750
+#: ../Rpmdrake/init.pm:42
 #, c-format
-msgid "Description: "
-msgstr "Kirjeldus: "
+msgid "  --media=medium1,..     limit to given media"
+msgstr "  --media=medium1,..     piirdumine määratud andmekandjaga"
 
-#: ../rpmdrake:823 ../rpmdrake:969 ../rpmdrake:971
+#: ../Rpmdrake/init.pm:43
 #, c-format
-msgid "More information on package..."
-msgstr "Rohkem infot paketi kohta..."
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+"  --merge-all-rpmnew     kõigi leitud .rpmnew/.rpmsave-failide ühendamine"
 
-#: ../rpmdrake:825
+#: ../Rpmdrake/init.pm:44
 #, c-format
-msgid "Please choose"
-msgstr "Palun valige"
+msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgstr ""
+"  --mode=MODE            režiimi määramine (paigaldamine (vaikimisi), "
+"eemaldamine, uuendamine)"
 
-#: ../rpmdrake:825
+#: ../Rpmdrake/init.pm:45
 #, c-format
-msgid "The following package is needed:"
-msgid_plural "One of the following packages is needed:"
-msgstr[0] "Vajalik on järgmine pakett:"
-msgstr[1] "Vajalik on üks järgmistest pakettidest:"
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+"  --no-confirmation      uuendamisrežiimis ei esitata esimest "
+"kinnituseküsimust"
 
-#: ../rpmdrake:866
+#: ../Rpmdrake/init.pm:46
 #, c-format
-msgid "Please wait, listing packages..."
-msgstr "Palun oodake, koostatakse nimekirja..."
+msgid "  --no-media-update      don't update media at startup"
+msgstr "  --no-media-update      käivitamisel ei uuendata andmekandjat"
 
-#: ../rpmdrake:884
+#: ../Rpmdrake/init.pm:47
 #, c-format
-msgid "No update"
-msgstr "Uuendusi ei ole"
+msgid "  --no-verify-rpm        don't verify packages signatures"
+msgstr "  --no-verify-rpm        pakettide signatuure ei kontrollita"
 
-#: ../rpmdrake:885
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid ""
-"The list of updates is empty. 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."
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
 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:908 ../rpmdrake:1171
-#, c-format
-msgid "All"
-msgstr "Kõik"
-
-#. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:956 ../rpmdrake:961
-#, c-format
-msgid "More info"
-msgstr "Rohkem infot"
+"  --parallel=alias,host  töö paralleelrežiimis, kasutades gruppi \"alias\", "
+"kasutades masinat \"host\" vajalike sõltuvuste näitamiseks"
 
-#: ../rpmdrake:964
+#: ../Rpmdrake/init.pm:49
 #, c-format
-msgid "Information on packages"
-msgstr "Info pakettide kohta"
+msgid "  --pkg-nosel=pkg1,..    show only these packages"
+msgstr "  --pkg-nosel=pkg1,..    näidatakse ainult määratud pakette"
 
-#: ../rpmdrake:987
+#: ../Rpmdrake/init.pm:50
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "Et kõik töötaks, on vaja lisaks eemaldada mõned paketid"
+msgid "  --pkg-sel=pkg1,..      preselect these packages"
+msgstr "  --pkg-sel=pkg1,..      määratud pakettide eelvalimine"
 
-#: ../rpmdrake:988
+#: ../Rpmdrake/init.pm:51
 #, c-format
-msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:"
-msgstr "Kõigi sõltuvuste rahuldamiseks eemaldatakse ka järgmised paketid:"
+msgid "  --root                 force to run as root"
+msgstr "  --root                 sunnitakse töötama administraatori õigustes"
 
-#: ../rpmdrake:994 ../rpmdrake:1003
+#: ../Rpmdrake/init.pm:52
 #, c-format
-msgid "Some packages can't be removed"
-msgstr "Mõnda paketti ei saa eemaldada"
+msgid "  --search=pkg           run search for \"pkg\""
+msgstr "  --search=pkg           otsitakse paketti \"pkg\""
 
-#: ../rpmdrake:995
+#: ../Rpmdrake/init.pm:116
 #, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr ""
-"Vabandust, nende pakettide eemaldamine võib halvata Teie süsteemi:\n"
-"\n"
+msgid "Running in user mode"
+msgstr "Töötamine kasutaja õigustega"
 
-#: ../rpmdrake:1004 ../rpmdrake:1070
+#: ../Rpmdrake/init.pm:117
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
-"\n"
+"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 ""
-"Sõltuvuste tõttu ei saa järgmisi pakette valida:\n"
-"\n"
+"Käivitasite selle rakenduse tavalise kasutajana.\n"
+"Te ei saa nii küll süsteemis mingeid muutusi ette võtta,\n"
+"kuid võite siiski sirvida olemasolevat andmebaasi."
 
-#: ../rpmdrake:1033
+#: ../Rpmdrake/init.pm:124
 #, c-format
-msgid "Additional packages needed"
-msgstr "Vajalikud lisapaketid"
+msgid "Welcome"
+msgstr "Tere tulemast"
 
-#: ../rpmdrake:1034
+#: ../Rpmdrake/init.pm:129
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\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 ""
-"Sõltuvuste rahuldamiseks tuleb paigaldada ka järgmised paketid:\n"
+"Tarkvara eemaldamine\n"
 "\n"
+"Selle tööriista abil saate valida eemaldatava tarkvara."
 
-#: ../rpmdrake:1049
-#, c-format
-msgid "%s (belongs to the skip list)"
-msgstr "%s (kuulub vahelejäetavate hulka)"
-
-#: ../rpmdrake:1053
-#, c-format
-msgid "One package cannot be installed"
-msgid_plural "Some packages can't be installed"
-msgstr[0] "Üht paketti ei saa paigaldada"
-msgstr[1] "Mõnda paketti ei saa paigaldada"
-
-#: ../rpmdrake:1054
+#: ../Rpmdrake/init.pm:134
 #, c-format
 msgid ""
-"Sorry, the following package cannot be selected:\n"
-"\n"
-"%s"
-msgid_plural ""
-"Sorry, the following packages can't be selected:\n"
-"\n"
-"%s"
-msgstr[0] ""
-"Kahjuks ei saa järgmist paketti valida:\n"
+"Welcome to %s!\n"
 "\n"
-"%s"
-msgstr[1] ""
-"Kahjuks ei saa järgmisi pakette valida:\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"%s\n"
 "\n"
-"%s"
-
-#: ../rpmdrake:1069 ../rpmdrake:1924
-#, c-format
-msgid "Some packages need to be removed"
-msgstr "Mõned paketid tuleb eemaldada"
-
-#: ../rpmdrake:1098
-#, c-format
-msgid "Selected: %s / Free disk space: %s"
-msgstr "Valitud: %s / Vaba kettaruumi %s"
-
-#: ../rpmdrake:1099
-#, c-format
-msgid "Selected size: %d MB"
-msgstr "Valitud pakettide maht: %d MB"
-
-#: ../rpmdrake:1104
-#, c-format
-msgid "Description not available for this package\n"
-msgstr "Sellel paketil pole kirjeldust\n"
-
-#: ../rpmdrake:1110 ../rpmdrake:1506
-#, c-format
-msgid "A fatal error occurred: %s."
-msgstr "Tekkis saatuslik viga: %s."
-
-#: ../rpmdrake:1171
-#, c-format
-msgid "Installed"
-msgstr "Paigaldatud"
-
-#: ../rpmdrake:1171
-#, c-format
-msgid "Non installed"
-msgstr "Paigaldamata"
-
-#: ../rpmdrake:1172
-#, c-format
-msgid "%s choices"
-msgstr "%s valikud"
-
-#: ../rpmdrake:1172
-#, c-format
-msgid "Mandriva Linux choices"
-msgstr "Mandriva Linuxi valikud"
-
-#: ../rpmdrake:1174
-#, c-format
-msgid "All packages, alphabetical"
-msgstr "Kõik paketid tähestikuliselt"
-
-#: ../rpmdrake:1175
-#, c-format
-msgid "All packages, by update availability"
-msgstr "Kõik paketid uuendamisstaatuse järgi"
-
-#: ../rpmdrake:1176
-#, c-format
-msgid "All packages, by size"
-msgstr "Kõik paketid suuruse järgi"
-
-#: ../rpmdrake:1177
-#, c-format
-msgid "All packages, by selection state"
-msgstr "Kõik paketid valikustaatuse järgi"
-
-#: ../rpmdrake:1178
-#, c-format
-msgid "Leaves only, sorted by install date"
-msgstr "Ainult sõltuvusteta paketid paigaldusaja järgi"
-
-#: ../rpmdrake:1179
-#, c-format
-msgid "All packages, by group"
-msgstr "Kõik paketid grupi järgi"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "All updates"
-msgstr "Kõik uuendused"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Security updates"
-msgstr "Turvaparandused"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Bugfixes updates"
-msgstr "Veaparandused"
-
-#: ../rpmdrake:1181
-#, c-format
-msgid "Normal updates"
-msgstr "Tavalised uuendused"
-
-#: ../rpmdrake:1244
-#, c-format
-msgid "in names"
-msgstr "nimedes"
-
-#: ../rpmdrake:1246
-#, c-format
-msgid "in descriptions"
-msgstr "kirjeldustes"
-
-#: ../rpmdrake:1248
-#, c-format
-msgid "in file names"
-msgstr "failinimedes"
-
-#: ../rpmdrake:1275
-#, c-format
-msgid "Error: %s appears to be mounted read-only."
-msgstr "Viga: %s paistab olevat haagitud ainult loetavana."
-
-#: ../rpmdrake:1279
-#, c-format
-msgid "You need to select some packages first."
-msgstr "Kõigepealt tuleb mõned paketid valida."
+"Selle tööriista abil saate oma Mandriva Linuxit uuendada."
 
-#: ../rpmdrake:1284
+#: ../Rpmdrake/init.pm:139
 #, c-format
-msgid "Too many packages are selected"
-msgstr "Valitud on liiga palju pakette"
+msgid "Welcome to the software installation tool!"
+msgstr "Tere tulemast kasutama tarkvara paigaldamise abivahendit!"
 
-#: ../rpmdrake:1285
+#: ../Rpmdrake/init.pm:140
 #, 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"
+"Welcome to the software installation tool!\n"
 "\n"
-"Do you really want to install all the selected packages?"
+"Your Mandriva 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 ""
-"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"
+"Tarkvara paigaldamine\n"
 "\n"
-"Kas soovite tõesti paigaldada kõik valitud paketid?"
-
-#: ../rpmdrake:1317 ../rpmdrake:1320 ../rpmdrake:1331 ../rpmdrake:1344
-#: ../rpmdrake:1353
-#, c-format
-msgid "/_File"
-msgstr "/_Fail"
-
-#: ../rpmdrake:1320
-#, c-format
-msgid "/_Update media"
-msgstr "/_Uuenda allikaid"
-
-#: ../rpmdrake:1331
-#, c-format
-msgid "/_Reset the selection"
-msgstr "/_Lähtesta valik"
-
-#: ../rpmdrake:1344
-#, c-format
-msgid "/Reload the _packages list"
-msgstr "/Laadi _pakettide nimekiri uuesti"
-
-#: ../rpmdrake:1353
-#, c-format
-msgid "/_Quit"
-msgstr "/_Välju"
-
-#: ../rpmdrake:1353
-#, c-format
-msgid "<control>Q"
-msgstr "<control>Q"
-
-#: ../rpmdrake:1356 ../rpmdrake:1357 ../rpmdrake:1360 ../rpmdrake:1390
-#, c-format
-msgid "/_Options"
-msgstr "/_Seadistused"
-
-#: ../rpmdrake:1357
-#, c-format
-msgid "/_Media Manager"
-msgstr "/And_mekandjate haldur"
-
-#: ../rpmdrake:1360 ../rpmdrake:1390
-#, c-format
-msgid "/_Show automatically selected packages"
-msgstr "/A_utomaatselt valitud pakettide näitamine"
-
-#: ../rpmdrake:1364 ../rpmdrake:1365 ../rpmdrake:1366 ../rpmdrake:1367
-#, c-format
-msgid "/_Help"
-msgstr "/_Abi"
-
-#: ../rpmdrake:1365
-#, c-format
-msgid "/_Report Bug"
-msgstr "/Saada vea_raport"
-
-#: ../rpmdrake:1367
-#, c-format
-msgid "/_About..."
-msgstr "/_Info..."
-
-#: ../rpmdrake:1370
-#, c-format
-msgid "Rpmdrake"
-msgstr "Rpmdrake"
-
-#: ../rpmdrake:1372
-#, c-format
-msgid "Copyright (C) %s by Mandriva"
-msgstr "Autoriõigus (C) %s: Mandriva"
-
-#: ../rpmdrake:1374
-#, c-format
-msgid "Rpmdrake is Mandriva Linux package management tool."
-msgstr "Rpmdrake on Mandriva Linuxi tarkvarahaldur."
-
-#: ../rpmdrake:1376
-#, c-format
-msgid "Mandriva Linux"
-msgstr "Mandriva Linux"
-
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../rpmdrake:1381
-#, c-format
-msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "Marek Laane <bald@starman.ee>\n"
-
-#: ../rpmdrake:1405
-#, c-format
-msgid "Find:"
-msgstr "Otsimine:"
-
-#: ../rpmdrake:1414
-#, c-format
-msgid "Search"
-msgstr "Otsi"
-
-#: ../rpmdrake:1416
-#, c-format
-msgid "Clear"
-msgstr "Puhasta"
-
-#: ../rpmdrake:1430 ../rpmdrake.pm:760
-#, c-format
-msgid "Select all"
-msgstr "Vali kõik"
-
-#: ../rpmdrake:1437
-#, c-format
-msgid "Apply"
-msgstr "Rakenda"
-
-#: ../rpmdrake:1441
-#, c-format
-msgid "Quit"
-msgstr "Välju"
-
-#: ../rpmdrake:1457
-#, c-format
-msgid "Quick Introduction"
-msgstr "Kiire sissejuhatus"
-
-#: ../rpmdrake:1458
-#, c-format
-msgid "You can browse the packages through the categories tree on the left."
-msgstr "Tarkvarapakette saab sirvida vasakul kategooriapuus."
-
-#: ../rpmdrake:1459
-#, c-format
-msgid ""
-"You can view information about a package by clicking on it on the right list."
-msgstr "Tarkvarapakettide infot näeb neile klõpsates parempoolses nimekirjas."
-
-#: ../rpmdrake:1460
-#, c-format
-msgid "To install, update or remove a package, just click on its \"checkbox\"."
-msgstr ""
-"Tarkvarapaketi paigaldamiseks, uuendamiseks või eemaldamiseks märkige "
-"lihtsalt kastike."
+"Mandriva Linuxi CD või DVD sisaldab tuhandeid tarkvarapakette.\n"
+"Selle tööriista abil saate valida, millised soovite oma arvutile paigaldada."
 
-#: ../rpmdrake:1505
+#: ../Rpmdrake/pkg.pm:188
 #, c-format
 msgid "Fatal error"
 msgstr "Saatuslik viga"
 
-#: ../rpmdrake:1510 ../rpmdrake:1935 ../rpmdrake.pm:311
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499 ../rpmdrake.pm:316
 #, c-format
 msgid "Please wait"
 msgstr "Palun oodake"
 
-#: ../rpmdrake:1510 ../rpmdrake:1935
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Package installation..."
 msgstr "Paigaldamine..."
 
-#: ../rpmdrake:1510 ../rpmdrake:1935
+#: ../Rpmdrake/pkg.pm:193 ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Initializing..."
 msgstr "Initsialiseerimine..."
 
-#: ../rpmdrake:1533 ../rpmdrake:1924
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:486
 #, c-format
 msgid "Confirmation"
 msgstr "Kinnitus"
 
-#: ../rpmdrake:1534
+#: ../Rpmdrake/pkg.pm:216
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1937,12 +1698,12 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake:1543
+#: ../Rpmdrake/pkg.pm:225
 #, c-format
 msgid "Already existing update media"
 msgstr "Olemasolevad uuenduste allikad"
 
-#: ../rpmdrake:1544
+#: ../Rpmdrake/pkg.pm:226
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1959,12 +1720,12 @@ msgstr ""
 "\n"
 "Seejärel käivitage %s uuesti."
 
-#: ../rpmdrake:1555
+#: ../Rpmdrake/pkg.pm:237
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Kuidas valida peegel käsitsi"
 
-#: ../rpmdrake:1556
+#: ../Rpmdrake/pkg.pm:238
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1979,72 +1740,37 @@ msgstr ""
 "\n"
 "Seejärel taaskäivitage %s."
 
-#: ../rpmdrake:1570
+#: ../Rpmdrake/pkg.pm:252
 #, c-format
 msgid "Reading updates description"
 msgstr "Uuenduste kirjelduste lugemine"
 
-#: ../rpmdrake:1596 ../rpmdrake:1673
+#: ../Rpmdrake/pkg.pm:278 ../Rpmdrake/pkg.pm:358
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Palun oodake, otsitakse kättesaadavaid pakette..."
 
-#: ../rpmdrake:1604
+#: ../Rpmdrake/pkg.pm:286
 #, c-format
 msgid "Please wait, listing base packages..."
 msgstr "Palun oodake, koostatakse baaspakettide nimekirja..."
 
-#: ../rpmdrake:1640
+#: ../Rpmdrake/pkg.pm:323
 #, c-format
 msgid "Please wait, finding installed packages..."
 msgstr "Palun oodake, otsitakse paigaldatud pakette..."
 
-#: ../rpmdrake:1774
-#, c-format
-msgid "Inspecting %s"
-msgstr "%s uurimine"
-
-#: ../rpmdrake:1797
-#, c-format
-msgid "Changes:"
-msgstr "Muutused:"
-
-#: ../rpmdrake:1805
-#, c-format
-msgid "Remove .%s"
-msgstr "Eemalda .%s"
-
-#: ../rpmdrake:1809
-#, c-format
-msgid "Use .%s as main file"
-msgstr "Kasuta .%s põhifailina"
-
-#: ../rpmdrake:1813
-#, c-format
-msgid "Do nothing"
-msgstr "Ära tee midagi"
-
-#: ../rpmdrake:1829
-#, c-format
-msgid "Installation finished"
-msgstr "Paigaldus lõpetatud"
-
-#: ../rpmdrake:1844
-#, c-format
-msgid "Inspect..."
-msgstr "Uuri..."
-
-#: ../rpmdrake:1877 ../rpmdrake:2070
+#: ../Rpmdrake/pkg.pm:440 ../Rpmdrake/pkg.pm:635
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Kõik soovitud paketid said edukalt paigaldatud."
 
-#: ../rpmdrake:1881 ../rpmdrake:2050
+#: ../Rpmdrake/pkg.pm:444 ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "Problem during installation"
 msgstr "Paigaldusel tekkis probleem"
 
-#: ../rpmdrake:1882 ../rpmdrake:2051 ../rpmdrake:2109
+#: ../Rpmdrake/pkg.pm:445 ../Rpmdrake/pkg.pm:616 ../Rpmdrake/pkg.pm:674
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2055,17 +1781,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1901
+#: ../Rpmdrake/pkg.pm:464
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Pakette ei õnnestunud tõmmata."
 
-#: ../rpmdrake:1902
+#: ../Rpmdrake/pkg.pm:465
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Vabandust, pakette ei õnnestunud kätte saada. %s"
 
-#: ../rpmdrake:1903 ../rpmdrake:2001
+#: ../Rpmdrake/pkg.pm:466 ../Rpmdrake/pkg.pm:566
 #, c-format
 msgid ""
 "\n"
@@ -2078,71 +1804,63 @@ msgstr ""
 "Anti teada vigadest:\n"
 "%s"
 
-#. -PO: in singular form, we use %2\$
-#: ../rpmdrake:1921
+#: ../Rpmdrake/pkg.pm:483
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package is going to be installed:\n"
-"%2$s\n"
+"To satisfy dependencies, the following package is going to be installed:"
 msgid_plural ""
-"To satisfy dependencies, the following %d packages are going to be "
-"installed:\n"
-"%s\n"
-msgstr[0] ""
-"Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:\n"
-"%2$s\n"
-msgstr[1] ""
-"Sõltuvuste lahendamiseks paigaldatakse järgmised %d paketti:\n"
-"%s\n"
+"To satisfy dependencies, the following %d packages are going to be installed:"
+msgstr[0] "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:"
+msgstr[1] "Sõltuvuste lahendamiseks paigaldatakse järgmised %d paketti:"
 
-#: ../rpmdrake:1926
+#: ../Rpmdrake/pkg.pm:488
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "Kas eemaldada pakett?"
 msgstr[1] "Kas eemaldada %d paketti?"
 
-#: ../rpmdrake:1927
+#: ../Rpmdrake/pkg.pm:490
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:"
-msgstr[0] ""
-"Järgmine pakett tuleb eemaldada, et saaks teisi uuendada:"
-msgstr[1] ""
-"Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:"
+msgstr "Järgmine pakett tuleb eemaldada, et saaks teisi uuendada:"
+
+#: ../Rpmdrake/pkg.pm:491
+#, c-format
+msgid "The following packages have to be removed for others to be upgraded:"
+msgstr "Järgmised paketid tuleb eemaldada, et saaks teisi uuendada:"
 
-#: ../rpmdrake:1927
+#: ../Rpmdrake/pkg.pm:491
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "Kas jätkata?"
 
-#: ../rpmdrake:1944
+#: ../Rpmdrake/pkg.pm:509
 #, c-format
 msgid "Change medium"
 msgstr "Muuda andmekandjat"
 
-#: ../rpmdrake:1945
+#: ../Rpmdrake/pkg.pm:510
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun sisestage andmekandja \"%s\" seadmesse [%s]"
 
-#: ../rpmdrake:1952
+#: ../Rpmdrake/pkg.pm:517
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Tõmban võrgust paketti '%s' (%s/%s)..."
 
-#: ../rpmdrake:1972
+#: ../Rpmdrake/pkg.pm:537
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Signatuuride kontrollimine..."
 
-#: ../rpmdrake:1985 ../rpmdrake.pm:739 ../rpmdrake.pm:848
+#: ../Rpmdrake/pkg.pm:550 ../rpmdrake.pm:743 ../rpmdrake.pm:852
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../rpmdrake:1986
+#: ../Rpmdrake/pkg.pm:551
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -2157,12 +1875,12 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake:1998 ../rpmdrake:2108
+#: ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus"
 
-#: ../rpmdrake:1999
+#: ../Rpmdrake/pkg.pm:564
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -2175,27 +1893,27 @@ msgstr ""
 "\n"
 "Võib-olla tasuks uuendada allikate andmebaasi."
 
-#: ../rpmdrake:2013
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Paigaldamiseks valmistumine..."
 
-#: ../rpmdrake:2013
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Preparing..."
 msgstr "Valmistumine..."
 
-#: ../rpmdrake:2016
+#: ../Rpmdrake/pkg.pm:581
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Paketi '%s' paigaldamine (%s/%s)..."
 
-#: ../rpmdrake:2031
+#: ../Rpmdrake/pkg.pm:596
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "ligipääs rpm-failile [%s] ebaõnnestus"
 
-#: ../rpmdrake:2065
+#: ../Rpmdrake/pkg.pm:630
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -2208,47 +1926,48 @@ msgstr ""
 "Mõned seadistusfailid loodi kui '.rpmnew' või '.rpmsave'.\n"
 "Te võiksite neid nüüd uurida, et võtta ette järgmisi samme:"
 
-#: ../rpmdrake:2073
+#: ../Rpmdrake/pkg.pm:638
 #, c-format
 msgid "Upgrade information"
 msgstr "Uuendusinfo"
 
-#: ../rpmdrake:2075
+#: ../Rpmdrake/pkg.pm:640
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Neil pakettidel on uuendusinfo"
 
-#: ../rpmdrake:2083
+#: ../Rpmdrake/pkg.pm:648
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "Paketi uuendusinfo"
 
-#: ../rpmdrake:2086
+#: ../Rpmdrake/pkg.pm:651
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "Paketi %s uuendusinfo"
 
-#: ../rpmdrake:2098 ../rpmdrake.pm:726 ../rpmdrake.pm:807 ../rpmdrake.pm:831
+#: ../Rpmdrake/pkg.pm:663 ../rpmdrake.pm:730 ../rpmdrake.pm:811
+#: ../rpmdrake.pm:835
 #, c-format
 msgid "Error"
 msgstr "Viga"
 
-#: ../rpmdrake:2099
+#: ../Rpmdrake/pkg.pm:664
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Parandamatu viga: kahjuks ei leitud paigaldamiseks ühtegi paketti."
 
-#: ../rpmdrake:2124
+#: ../Rpmdrake/pkg.pm:689
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Palun oodake, eemaldatakse pakette..."
 
-#: ../rpmdrake:2135
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Problem during removal"
 msgstr "Probleem eemaldamisel"
 
-#: ../rpmdrake:2136
+#: ../Rpmdrake/pkg.pm:701
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -2259,70 +1978,364 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:2168
+#: ../Rpmdrake/rpmnew.pm:81
 #, c-format
-msgid "Welcome"
-msgstr "Tere tulemast"
+msgid "Inspecting %s"
+msgstr "%s uurimine"
+
+#: ../Rpmdrake/rpmnew.pm:104
+#, c-format
+msgid "Changes:"
+msgstr "Muutused:"
+
+#: ../Rpmdrake/rpmnew.pm:112
+#, c-format
+msgid "Remove .%s"
+msgstr "Eemalda .%s"
+
+#: ../Rpmdrake/rpmnew.pm:116
+#, c-format
+msgid "Use .%s as main file"
+msgstr "Kasuta .%s põhifailina"
+
+#: ../Rpmdrake/rpmnew.pm:120
+#, c-format
+msgid "Do nothing"
+msgstr "Ära tee midagi"
 
-#: ../rpmdrake:2173
+#: ../Rpmdrake/rpmnew.pm:136
+#, c-format
+msgid "Installation finished"
+msgstr "Paigaldus lõpetatud"
+
+#: ../Rpmdrake/rpmnew.pm:151
+#, c-format
+msgid "Inspect..."
+msgstr "Uuri..."
+
+#: ../Rpmdrake/rpmnew.pm:169 ../rpmdrake:70 ../rpmdrake:98
+#, c-format
+msgid "Please wait, searching..."
+msgstr "Palun oodake, otsitakse..."
+
+#: ../gurpmi.addmedia:83
+#, c-format
+msgid "Unable to add medium, wrong or missing arguments"
+msgstr "Andmekandja lisamine ebaõnnestus, argumendid olid vigased või puudu"
+
+#: ../gurpmi.addmedia:97
 #, c-format
 msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+"You are about to add new packages media, %s.\n"
+"That means you will be able to add new software packages\n"
+"to your system from these new media."
 msgstr ""
-"Tarkvara eemaldamine\n"
-"\n"
-"Selle tööriista abil saate valida eemaldatava tarkvara."
+"Kavatsete lisada uue tarkvaraallika %s.\n"
+"See tähendab, et eduka lisamise korral saate hakata\n"
+"süsteemi uut tarkvara paigaldama."
 
-#: ../rpmdrake:2178
+#: ../gurpmi.addmedia:100
 #, c-format
 msgid ""
-"Welcome to %s!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
+"You are about to add a new packages medium, `%s'.\n"
+"That means you will be able to add new software packages\n"
+"to your system from that new medium."
 msgstr ""
-"%s\n"
-"\n"
-"Selle tööriista abil saate oma Mandriva Linuxit uuendada."
+"Kavatsete lisada uue tarkvaraallika '%s'.\n"
+"See tähendab, et eduka lisamise korral saate hakata\n"
+"süsteemi uut tarkvara paigaldama."
 
-#: ../rpmdrake:2183
+#: ../gurpmi.addmedia:125
 #, c-format
-msgid "Welcome to the software installation tool!"
-msgstr "Tere tulemast kasutama tarkvara paigaldamise abivahendit!"
+msgid "Successfully added media %s."
+msgstr "Andmekandja %s edukalt lisatud."
+
+#: ../gurpmi.addmedia:126
+#, c-format
+msgid "Successfully added medium `%s'."
+msgstr "Andmekandja %s edukalt lisatud."
+
+#: ../rpmdrake:59 ../rpmdrake:141
+#, c-format
+msgid "Search results"
+msgstr "Otsingu tulemused"
+
+#: ../rpmdrake:59
+#, c-format
+msgid "Search results (none)"
+msgstr "Otsingu tulemus (ei leitud)"
+
+#: ../rpmdrake:93 ../rpmdrake:187 ../rpmdrake.pm:180
+#, c-format
+msgid "Software Management"
+msgstr "Tarkvarahaldur"
+
+#: ../rpmdrake:103
+#, c-format
+msgid "Stop"
+msgstr "Peata"
+
+#: ../rpmdrake:144
+#, c-format
+msgid "Selected"
+msgstr "Valitud"
+
+#: ../rpmdrake:144
+#, c-format
+msgid "Not selected"
+msgstr "Valimata"
+
+#: ../rpmdrake:200
+#, c-format
+msgid "Selected: %s / Free disk space: %s"
+msgstr "Valitud: %s / Vaba kettaruumi %s"
+
+#: ../rpmdrake:201
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "Valitud pakettide maht: %d MB"
+
+#: ../rpmdrake:256
+#, c-format
+msgid "Installed"
+msgstr "Paigaldatud"
 
-#: ../rpmdrake:2184
+#: ../rpmdrake:256
+#, c-format
+msgid "Non installed"
+msgstr "Paigaldamata"
+
+#: ../rpmdrake:257
+#, c-format
+msgid "%s choices"
+msgstr "%s valikud"
+
+#: ../rpmdrake:257
+#, c-format
+msgid "Mandriva Linux choices"
+msgstr "Mandriva Linuxi valikud"
+
+#: ../rpmdrake:259
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "Kõik paketid tähestikuliselt"
+
+#: ../rpmdrake:260
+#, c-format
+msgid "All packages, by update availability"
+msgstr "Kõik paketid uuendamisstaatuse järgi"
+
+#: ../rpmdrake:261
+#, c-format
+msgid "All packages, by size"
+msgstr "Kõik paketid suuruse järgi"
+
+#: ../rpmdrake:262
+#, c-format
+msgid "All packages, by selection state"
+msgstr "Kõik paketid valikustaatuse järgi"
+
+#: ../rpmdrake:263
+#, c-format
+msgid "Leaves only, sorted by install date"
+msgstr "Ainult sõltuvusteta paketid paigaldusaja järgi"
+
+#: ../rpmdrake:264
+#, c-format
+msgid "All packages, by group"
+msgstr "Kõik paketid grupi järgi"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "All updates"
+msgstr "Kõik uuendused"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Security updates"
+msgstr "Turvaparandused"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Bugfixes updates"
+msgstr "Veaparandused"
+
+#: ../rpmdrake:266
+#, c-format
+msgid "Normal updates"
+msgstr "Tavalised uuendused"
+
+#: ../rpmdrake:327
+#, c-format
+msgid "in names"
+msgstr "nimedes"
+
+#: ../rpmdrake:329
+#, c-format
+msgid "in descriptions"
+msgstr "kirjeldustes"
+
+#: ../rpmdrake:331
+#, c-format
+msgid "in file names"
+msgstr "failinimedes"
+
+#: ../rpmdrake:362 ../rpmdrake:365 ../rpmdrake:376 ../rpmdrake:389
+#: ../rpmdrake:398
+#, c-format
+msgid "/_File"
+msgstr "/_Fail"
+
+#: ../rpmdrake:365
+#, c-format
+msgid "/_Update media"
+msgstr "/_Uuenda allikaid"
+
+#: ../rpmdrake:376
+#, c-format
+msgid "/_Reset the selection"
+msgstr "/_Lähtesta valik"
+
+#: ../rpmdrake:389
+#, c-format
+msgid "/Reload the _packages list"
+msgstr "/Laadi _pakettide nimekiri uuesti"
+
+#: ../rpmdrake:398
+#, c-format
+msgid "/_Quit"
+msgstr "/_Välju"
+
+#: ../rpmdrake:398
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../rpmdrake:401 ../rpmdrake:402 ../rpmdrake:407 ../rpmdrake:437
+#, c-format
+msgid "/_Options"
+msgstr "/_Seadistused"
+
+#: ../rpmdrake:402
+#, c-format
+msgid "/_Media Manager"
+msgstr "/And_mekandjate haldur"
+
+#: ../rpmdrake:407 ../rpmdrake:437
+#, c-format
+msgid "/_Show automatically selected packages"
+msgstr "/A_utomaatselt valitud pakettide näitamine"
+
+#: ../rpmdrake:411 ../rpmdrake:412 ../rpmdrake:413 ../rpmdrake:414
+#, c-format
+msgid "/_Help"
+msgstr "/_Abi"
+
+#: ../rpmdrake:412
+#, c-format
+msgid "/_Report Bug"
+msgstr "/Saada vea_raport"
+
+#: ../rpmdrake:414
+#, c-format
+msgid "/_About..."
+msgstr "/_Info..."
+
+#: ../rpmdrake:417
+#, c-format
+msgid "Rpmdrake"
+msgstr "Rpmdrake"
+
+#: ../rpmdrake:419
+#, c-format
+msgid "Copyright (C) %s by Mandriva"
+msgstr "Autoriõigus (C) %s: Mandriva"
+
+#: ../rpmdrake:421
+#, c-format
+msgid "Rpmdrake is Mandriva Linux package management tool."
+msgstr "Rpmdrake on Mandriva Linuxi tarkvarahaldur."
+
+#: ../rpmdrake:423
+#, c-format
+msgid "Mandriva Linux"
+msgstr "Mandriva Linux"
+
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../rpmdrake:428
+#, c-format
+msgid "_: Translator(s) name(s) & email(s)\n"
+msgstr "Marek Laane <bald@starman.ee>\n"
+
+#: ../rpmdrake:452
+#, c-format
+msgid "Find:"
+msgstr "Otsimine:"
+
+#: ../rpmdrake:461
+#, c-format
+msgid "Search"
+msgstr "Otsi"
+
+#: ../rpmdrake:463
+#, c-format
+msgid "Clear"
+msgstr "Puhasta"
+
+#: ../rpmdrake:477 ../rpmdrake.pm:764
+#, c-format
+msgid "Select all"
+msgstr "Vali kõik"
+
+#: ../rpmdrake:484
+#, c-format
+msgid "Apply"
+msgstr "Rakenda"
+
+#: ../rpmdrake:488
+#, c-format
+msgid "Quit"
+msgstr "Välju"
+
+#: ../rpmdrake:504
+#, c-format
+msgid "Quick Introduction"
+msgstr "Kiire sissejuhatus"
+
+#: ../rpmdrake:505
+#, c-format
+msgid "You can browse the packages through the categories tree on the left."
+msgstr "Tarkvarapakette saab sirvida vasakul kategooriapuus."
+
+#: ../rpmdrake:506
 #, c-format
 msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandriva 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."
+"You can view information about a package by clicking on it on the right list."
+msgstr "Tarkvarapakettide infot näeb neile klõpsates parempoolses nimekirjas."
+
+#: ../rpmdrake:507
+#, c-format
+msgid "To install, update or remove a package, just click on its \"checkbox\"."
 msgstr ""
-"Tarkvara paigaldamine\n"
-"\n"
-"Mandriva Linuxi CD või DVD sisaldab tuhandeid tarkvarapakette.\n"
-"Selle tööriista abil saate valida, millised soovite oma arvutile paigaldada."
+"Tarkvarapaketi paigaldamiseks, uuendamiseks või eemaldamiseks märkige "
+"lihtsalt kastike."
 
-#: ../rpmdrake.pm:104
+#: ../rpmdrake.pm:103
 #, c-format
 msgid "Software Update"
 msgstr "Tarkvara uuendamine"
 
-#: ../rpmdrake.pm:104
+#: ../rpmdrake.pm:103
 #, c-format
 msgid "Mandriva Linux Update"
 msgstr "Mandriva Linuxi uuendused"
 
-#: ../rpmdrake.pm:131
+#: ../rpmdrake.pm:130
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "Palun sisestage oma andmed puhverserveri kasutamiseks\n"
 
-#: ../rpmdrake.pm:132
+#: ../rpmdrake.pm:131
 #, c-format
 msgid "User name:"
 msgstr "Kasutajanimi:"
@@ -2332,7 +2345,7 @@ msgstr "Kasutajanimi:"
 msgid "Software Packages Removal"
 msgstr "Tarkvara eemaldamine"
 
-#: ../rpmdrake.pm:176
+#: ../rpmdrake.pm:176 ../rpmdrake.pm:180
 #, c-format
 msgid "Software Packages Update"
 msgstr "Tarkvara uuendamine"
@@ -2342,177 +2355,177 @@ msgstr "Tarkvara uuendamine"
 msgid "Software Packages Installation"
 msgstr "Tarkvara paigaldamine"
 
-#: ../rpmdrake.pm:219
+#: ../rpmdrake.pm:220
 #, c-format
 msgid "No"
 msgstr "Ei"
 
-#: ../rpmdrake.pm:223
+#: ../rpmdrake.pm:224
 #, c-format
 msgid "Yes"
 msgstr "Jah"
 
-#: ../rpmdrake.pm:273
+#: ../rpmdrake.pm:274
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:390
+#: ../rpmdrake.pm:395
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: ../rpmdrake.pm:391
+#: ../rpmdrake.pm:396
 #, c-format
 msgid "Australia"
 msgstr "Austraalia"
 
-#: ../rpmdrake.pm:392
+#: ../rpmdrake.pm:397
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:393
+#: ../rpmdrake.pm:398
 #, c-format
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: ../rpmdrake.pm:394
+#: ../rpmdrake.pm:399
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: ../rpmdrake.pm:395
+#: ../rpmdrake.pm:400
 #, c-format
 msgid "Switzerland"
 msgstr "Šveits"
 
-#: ../rpmdrake.pm:396
+#: ../rpmdrake.pm:401
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:397
+#: ../rpmdrake.pm:402
 #, c-format
 msgid "Czech Republic"
 msgstr "Tšehhi Vabariik"
 
-#: ../rpmdrake.pm:398
+#: ../rpmdrake.pm:403
 #, c-format
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: ../rpmdrake.pm:399
+#: ../rpmdrake.pm:404
 #, c-format
 msgid "Danmark"
 msgstr "Taani"
 
-#: ../rpmdrake.pm:400 ../rpmdrake.pm:404
+#: ../rpmdrake.pm:405 ../rpmdrake.pm:409
 #, c-format
 msgid "Greece"
 msgstr "Kreeka"
 
-#: ../rpmdrake.pm:401
+#: ../rpmdrake.pm:406
 #, c-format
 msgid "Spain"
 msgstr "Hispaania"
 
-#: ../rpmdrake.pm:402
+#: ../rpmdrake.pm:407
 #, c-format
 msgid "Finland"
 msgstr "Soome"
 
-#: ../rpmdrake.pm:403
+#: ../rpmdrake.pm:408
 #, c-format
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: ../rpmdrake.pm:405
+#: ../rpmdrake.pm:410
 #, c-format
 msgid "Hungary"
 msgstr "Ungari"
 
-#: ../rpmdrake.pm:406
+#: ../rpmdrake.pm:411
 #, c-format
 msgid "Israel"
 msgstr "Iisrael"
 
-#: ../rpmdrake.pm:407
+#: ../rpmdrake.pm:412
 #, c-format
 msgid "Italy"
 msgstr "Itaalia"
 
-#: ../rpmdrake.pm:408
+#: ../rpmdrake.pm:413
 #, c-format
 msgid "Japan"
 msgstr "Jaapan"
 
-#: ../rpmdrake.pm:409
+#: ../rpmdrake.pm:414
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:410
+#: ../rpmdrake.pm:415
 #, c-format
 msgid "Netherlands"
 msgstr "Holland"
 
-#: ../rpmdrake.pm:411
+#: ../rpmdrake.pm:416
 #, c-format
 msgid "Norway"
 msgstr "Norra"
 
-#: ../rpmdrake.pm:412
+#: ../rpmdrake.pm:417
 #, c-format
 msgid "Poland"
 msgstr "Poola"
 
-#: ../rpmdrake.pm:413
+#: ../rpmdrake.pm:418
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:414
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "Russia"
 msgstr "Venemaa"
 
-#: ../rpmdrake.pm:415
+#: ../rpmdrake.pm:420
 #, c-format
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: ../rpmdrake.pm:416
+#: ../rpmdrake.pm:421
 #, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: ../rpmdrake.pm:417
+#: ../rpmdrake.pm:422
 #, c-format
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: ../rpmdrake.pm:418
+#: ../rpmdrake.pm:423
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:419
+#: ../rpmdrake.pm:424
 #, c-format
 msgid "United Kingdom"
 msgstr "Suurbritannia"
 
-#: ../rpmdrake.pm:420
+#: ../rpmdrake.pm:425
 #, c-format
 msgid "China"
 msgstr "Hiina"
 
-#: ../rpmdrake.pm:421 ../rpmdrake.pm:422 ../rpmdrake.pm:423 ../rpmdrake.pm:424
+#: ../rpmdrake.pm:426 ../rpmdrake.pm:427 ../rpmdrake.pm:428 ../rpmdrake.pm:429
 #, c-format
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm:521
+#: ../rpmdrake.pm:526
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2525,7 +2538,7 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake.pm:525
+#: ../rpmdrake.pm:530
 #, c-format
 msgid ""
 "I need to contact the Mandriva website to get the mirror list.\n"
@@ -2538,27 +2551,27 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake.pm:531 ../rpmdrake.pm:569
+#: ../rpmdrake.pm:536 ../rpmdrake.pm:574
 #, c-format
 msgid "Mirror choice"
 msgstr "Peegli valik"
 
-#: ../rpmdrake.pm:534
+#: ../rpmdrake.pm:539
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Palun oodake, laetakse peeglite aadresse."
 
-#: ../rpmdrake.pm:535
+#: ../rpmdrake.pm:540
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mandriva website."
 msgstr "Palun oodake, laetakse peeglite aadresse Mandriva veebisaidilt."
 
-#: ../rpmdrake.pm:542
+#: ../rpmdrake.pm:547
 #, c-format
 msgid "Error during download"
 msgstr "Viga allalaadimisel"
 
-#: ../rpmdrake.pm:544
+#: ../rpmdrake.pm:549
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2573,7 +2586,7 @@ msgstr ""
 "Võrk või veebilehekülg ei pruugi olla kättesaadav.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake.pm:549
+#: ../rpmdrake.pm:554
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2588,17 +2601,17 @@ msgstr ""
 "Võrk või Mandriva veebilehekülg ei pruugi olla kättesaadav.\n"
 "Palun proovige varsti uuesti."
 
-#: ../rpmdrake.pm:559
+#: ../rpmdrake.pm:564
 #, c-format
 msgid "No mirror"
 msgstr "Peeglit ei leitud"
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:566
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Ühtki kõlblikku peeglit ei leitud."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:567
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2612,68 +2625,68 @@ msgstr ""
 "Sellel võib olla mitu põhjust. Kõige tavalisem on see, et Mandriva Linuxi\n"
 "ametlikud uuendused ei toeta Teie protsessori arhitektuuri."
 
-#: ../rpmdrake.pm:581
+#: ../rpmdrake.pm:586
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Palun valige peegel."
 
-#: ../rpmdrake.pm:634
+#: ../rpmdrake.pm:639
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Faili kopeerimine allika `%s' jaoks..."
 
-#: ../rpmdrake.pm:637
+#: ../rpmdrake.pm:642
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Allikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:640
+#: ../rpmdrake.pm:645
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Allikafaili `%s' uurimine..."
 
-#: ../rpmdrake.pm:644
+#: ../rpmdrake.pm:649
 #, c-format
 msgid " done."
 msgstr " tehtud."
 
-#: ../rpmdrake.pm:648
+#: ../rpmdrake.pm:653
 #, c-format
 msgid " failed!"
 msgstr " ebaõnnestus!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:652
+#: ../rpmdrake.pm:657
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s andmekandjalt %s"
 
-#: ../rpmdrake.pm:656
+#: ../rpmdrake.pm:661
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "'%s' allalaadimise alustamine..."
 
-#: ../rpmdrake.pm:660
+#: ../rpmdrake.pm:665
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "`%s' allalaadimine, aega jäänud:%s, kiirus:%s"
 
-#: ../rpmdrake.pm:663
+#: ../rpmdrake.pm:668
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "`%s' allalaadimine, kiirus:%s"
 
-#: ../rpmdrake.pm:674
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Palun oodake, uuendatakse andmekandjat..."
 
-#: ../rpmdrake.pm:702
+#: ../rpmdrake.pm:706
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Viga pakettide hankimisel"
 
-#: ../rpmdrake.pm:703
+#: ../rpmdrake.pm:707
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2690,29 +2703,29 @@ msgstr ""
 "lihtsalt ajutiselt kättesaamatu, millisel juhul võiks hiljem\n"
 "uuesti proovida nimekirja hankida."
 
-#: ../rpmdrake.pm:734
+#: ../rpmdrake.pm:738
 #, c-format
 msgid "Update media"
 msgstr "Allikate uuendamine"
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:743
 #, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
 msgstr ""
 "Aktiivset andmekandjat ei leitud. Uuendamiseks tuleb andmekandja aktiveerida."
 
-#: ../rpmdrake.pm:746
+#: ../rpmdrake.pm:750
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Valige allikad, mida soovite uuendada:"
 
-#: ../rpmdrake.pm:764
+#: ../rpmdrake.pm:768
 #, c-format
 msgid "Update"
 msgstr "Uuenda"
 
-#: ../rpmdrake.pm:785
+#: ../rpmdrake.pm:789
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2725,7 +2738,7 @@ msgstr ""
 "Vead:\n"
 "%s"
 
-#: ../rpmdrake.pm:808 ../rpmdrake.pm:819
+#: ../rpmdrake.pm:812 ../rpmdrake.pm:823
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2736,17 +2749,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:831
+#: ../rpmdrake.pm:835
 #, c-format
 msgid "Unable to create medium."
 msgstr "Andmekandja loomine ebaõnnestus."
 
-#: ../rpmdrake.pm:836
+#: ../rpmdrake.pm:840
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Viga andmekandja lisamisel"
 
-#: ../rpmdrake.pm:837
+#: ../rpmdrake.pm:841
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2757,7 +2770,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:850
+#: ../rpmdrake.pm:854
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2768,7 +2781,7 @@ msgstr ""
 "versiooniga (%s).\n"
 "Seepärast seda ei kasutata."
 
-#: ../rpmdrake.pm:853
+#: ../rpmdrake.pm:857
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of Mandriva "
@@ -2779,12 +2792,12 @@ msgstr ""
 "Mandriva Linuxi versiooniga (%s).\n"
 "Seepärast seda ei kasutata."
 
-#: ../rpmdrake.pm:870
+#: ../rpmdrake.pm:874
 #, c-format
 msgid "Help launched in background"
 msgstr "Abi käivitati taustal"
 
-#: ../rpmdrake.pm:871
+#: ../rpmdrake.pm:875
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -3060,3 +3073,30 @@ msgstr "Tarkvara eemaldamine"
 msgid "Software Media Manager"
 msgstr "Tarkvaraallikate haldur"
 
+#~ msgid ""
+#~ "To satisfy dependencies, the following package is going to be installed:\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:\n"
+#~ "%s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d package is going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgid_plural ""
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
+#~ "%s\n"
+#~ msgstr[0] ""
+#~ "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:\n"
+#~ "%s\n"
+#~ msgstr[1] ""
+#~ "Sõltuvuste lahendamiseks paigaldatakse järgmine pakett:\n"
+#~ "%s\n"
+
+#~ msgid "Remove %d package?"
+#~ msgid_plural "Remove %d packages?"
+#~ msgstr[0] "Kas eemaldada pakett?"
+#~ msgstr[1] "Kas eemaldada %d paketti?"