handle /etc/urpmi/proxy.cfg proxies, have a proxy dialog config in

edit-urpm-sources

1 files changed, 153 insertions, 130 deletions

diff --git a/po/et.po b/po/et.po
index a00a4383..51aba145 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
 "PO-Revision-Date: 2002-08-24 10:49+0300\n"
 "Last-Translator: Riho Kurg <rx@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -56,7 +56,7 @@ msgstr "Otsingutee või haakepunkt:"
 msgid "Removable device"
 msgstr "Eemaldatav seade"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
 msgid "Security updates"
 msgstr "Turvaparandused"
 
@@ -72,7 +72,7 @@ msgstr "Valige peegel.."
 msgid "Login:"
 msgstr "Kasutaja:"
 
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
 msgid "Password:"
 msgstr "Salasõna:"
 
@@ -105,14 +105,16 @@ msgid "Type of source:"
 msgstr "Andmekandja tüüp:"
 
 #: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
 msgid "Ok"
 msgstr "OK"
 
 #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
 #: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
 msgid "Cancel"
 msgstr "Katkesta"
 
@@ -162,43 +164,73 @@ msgstr "Uuendus"
 msgid "Please wait, updating media..."
 msgstr "Palun oodake, uuendan meediat.."
 
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Seadista meedia(d)"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Vahendaja kasutajatunnus:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Kasutajatunnus:"
+
+#: ../edit-urpm-sources.pl_.c:250
 msgid "Configure sources"
 msgstr "Seadista meedia(d)"
 
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
 msgid "Enabled?"
 msgstr "Kasutatav?"
 
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
 msgid "Source"
 msgstr "Allikas"
 
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
 msgid "Remove"
 msgstr "Eemalda"
 
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
 msgid "Edit"
 msgstr "Muuda"
 
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
 msgid "Add..."
 msgstr "Lisa.."
 
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
 msgid "Update..."
 msgstr "Uuenda.."
 
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Viga..."
+
+#: ../edit-urpm-sources.pl_.c:289
 msgid "Save and quit"
 msgstr "Salvesta ja välju"
 
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
 msgid "Quit"
 msgstr "Välju"
 
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
 #, c-format
 msgid ""
 "%s\n"
@@ -209,7 +241,7 @@ msgstr ""
 "\n"
 "Kas jätkan?"
 
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
 msgid ""
 "Welcome to the packages source editor!\n"
 "\n"
@@ -340,11 +372,11 @@ msgid "China"
 msgstr "Hiina"
 
 #: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
 msgid ""
 "I need to contact MandrakeSoft website to get the mirrors list.\n"
 "Please check that your network is currently running.\n"
@@ -357,15 +389,15 @@ msgstr ""
 "\n"
 "Kas jätkan?"
 
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr "Palun oodake, peeglite aadresse laetakse.."
 
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
 msgid "Error during download"
 msgstr "Viga allalaadimisel"
 
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
 #, c-format
 msgid ""
 "There was an error downloading the mirrors list:\n"
@@ -380,11 +412,11 @@ msgstr ""
 "Võrk või MandrakeSoft-i veebisait ei ole kättesaadav.\n"
 "Palun proovige hiljem uuesti."
 
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
 msgid "No mirror"
 msgstr "Peeglit ei leita"
 
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -399,7 +431,7 @@ msgstr ""
 "mil Teie arvuti protsessori arhitektuur ei ole Mandrake Linuxi ametlike\n"
 "uuenduste poolt toetatud."
 
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
 msgid "Please choose the desired mirror."
 msgstr "Palun valige peegel."
 
@@ -407,75 +439,75 @@ msgstr "Palun valige peegel."
 msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
 msgid "(Non available)"
 msgstr "(kättesaamatu)"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
 msgid "Search results"
 msgstr "Otsingu tulemused"
 
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
 msgid "Search results (none)"
 msgstr "Otsingu tulemus (ei leitud)"
 
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
 msgid "Please wait, searching..."
 msgstr "Palun oodake, otsin.."
 
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
 msgid "Stop"
 msgstr "Peatu"
 
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
 msgid "Addable"
 msgstr "Lisatavad"
 
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
 msgid "Upgradable"
 msgstr "Uuendatavad"
 
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
 #, fuzzy
 msgid "Not selected"
 msgstr ""
 "Ei vali\n"
 "midagi"
 
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
 #, fuzzy
 msgid "Selected"
 msgstr "Vali kõik"
 
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
 msgid "One of the following packages is needed:"
 msgstr "vajalik on üks järgmistest pakettidest:"
 
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
 msgid "Please choose"
 msgstr "Palun valige"
 
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
 msgid "unknown package "
 msgstr "Tundmatu pakett "
 
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
 msgid "Please wait, listing packages..."
 msgstr "Palun oodake, koostan nimekirja.."
 
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
 msgid "(none)"
 msgstr "(ühtki)"
 
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
 msgid "No update"
 msgstr "Uuendusi ei ole"
 
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
 msgid ""
 "The list of updates is void. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -484,11 +516,11 @@ msgstr ""
 "Uuenduste nimekiri on tühi. See tähendab, et uuendusi hetkel ei ole \n"
 "või olete kõik need juba installinud."
 
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
 msgid "Some additional packages need to be removed"
 msgstr "Et kõik töötaks, on vaja lisaks installida mõned paketid"
 
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -498,11 +530,11 @@ msgstr ""
 "järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
 msgid "Some packages can't be removed"
 msgstr "Mõned paketid ei ole eemaldatavad"
 
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -511,11 +543,11 @@ msgstr ""
 "Sõltuvuste tõttu ei saa järgmiseid pakette valida:\n"
 "\n"
 
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
 msgid "Additional packages needed"
 msgstr "Vajalikud lisapaketid"
 
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -524,11 +556,11 @@ msgstr ""
 "Sõltuvuste rahuldamiseks tuleb installida järgmised paketid:\n"
 "\n"
 
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
 msgid "Some packages can't be installed"
 msgstr "Mõned paketid jäävad installimata"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -536,21 +568,21 @@ msgstr ""
 "Kahjuks ei saa järgmiseid pakette valida:\n"
 "\n"
 
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
 msgid "Some packages need to be removed"
 msgstr "Mõned paketid tuleb eemaldada"
 
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
 
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Valitud pakettide maht: %d MB"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
 #, c-format
 msgid ""
 "%sFiles:\n"
@@ -560,12 +592,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
 #, fuzzy, c-format
 msgid "Source: %s\n"
 msgstr "Allikas"
 
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -586,7 +618,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -605,68 +637,68 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
 msgid "Bugfixes updates"
 msgstr "Turvaparandused/uuendused"
 
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
 msgid "Normal updates"
 msgstr "Uuendused"
 
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
 msgid "Mandrake choices"
 msgstr "Mandrake valikud"
 
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
 msgid "All packages, alphabetical"
 msgstr "Kõik paketid, tähestikuliselt"
 
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
 msgid "All packages,"
 msgstr "Kõik paketid,"
 
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
 msgid "by group"
 msgstr "grupi järgi"
 
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
 msgid "by size"
 msgstr "suuruse järgi"
 
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
 msgid "by selection state"
 msgstr "oleku järg"
 
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
 msgid "by source repository"
 msgstr "installimeedia järgi"
 
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
 msgid "by update availability"
 msgstr "uuenduse järgi"
 
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
 msgid "in descriptions"
 msgstr "kirjeldustest"
 
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
 msgid "in names"
 msgstr "nimedest"
 
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
 msgid "in files"
 msgstr "failidest"
 
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
 msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
 #, fuzzy
 msgid "Normal information"
 msgstr "Uuendused"
 
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -680,35 +712,35 @@ msgstr ""
 "\n"
 "Kas jätkan?"
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
 msgid "Find:"
 msgstr "Leia:"
 
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
 msgid "Search"
 msgstr "Otsi"
 
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
 msgid "Install"
 msgstr "Paigalda"
 
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
 msgid "Mandrake Update"
 msgstr "Mandrake Uuendused"
 
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
 msgid "Software Packages Removal"
 msgstr "Pakettide eemaldamine"
 
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
 msgid "Software Packages Installation"
 msgstr "Pakettide installimine"
 
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -720,23 +752,23 @@ msgstr ""
 "\n"
 "Kas jätkata?"
 
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "Palun oodake, uuendan pakettide infot."
 
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
 msgid "Error updating medium"
 msgstr "Viga installimeedia uuendamisel"
 
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "Paketiinfo uuendamisel tekkis viga, ei saa jätkata."
 
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
 msgid "How to choose manually your mirror"
 msgstr "Kuidas valida peeglit käsitsi"
 
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -750,15 +782,15 @@ msgstr ""
 "\n"
 "Seejärel restartige MandrakeUpdate."
 
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "Palun oodake võtan ühendust uuenduste saidiga."
 
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
 msgid "Error adding update medium"
 msgstr "Viga uuenduste meedia lisamisel."
 
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -777,48 +809,52 @@ msgstr ""
 "\n"
 "Kas soovite proovide mõnd muud peegelsaiti?"
 
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
 msgid "Please wait, finding available packages..."
 msgstr "Palun oodake, otsin kättesaadavaid pakette.."
 
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
 msgid "All requested packages were installed successfully."
 msgstr "Kõik soovitud paketid said edukalt installitud"
 
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
 msgid "Everything installed successfully"
 msgstr "Kõik on edukalt installitud"
 
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
 #, fuzzy
 msgid "Installation finished"
 msgstr "Install ebaõnnestus "
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
 #, fuzzy, c-format
 msgid "Remove .%s"
 msgstr "Eemalda"
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
 #, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
 #, fuzzy
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -827,44 +863,40 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
 #, fuzzy
 msgid ""
 "some packages failed to install\n"
 "correctly"
 msgstr "Mõned paketid jäävad installimata"
 
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
 #, fuzzy
 msgid "everything was installed correctly"
 msgstr "Kõik on edukalt installitud"
 
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
 msgid "Unable to get source packages."
 msgstr "Ei saa pakette kätte."
 
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
 msgid "Unable to get source packages, sorry."
 msgstr "Ei ole võimalik pakette kätte saada, vabandan."
 
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
 msgid "Change medium"
 msgstr "Muudke installimeedia"
 
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Palun sisestage meedia nimega \"%s\" seadmesse [%s]"
 
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
 msgid "Installation failed"
 msgstr "Install ebaõnnestus "
 
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -872,36 +904,36 @@ msgstr ""
 "Install ebaõnnestus, osa faile on puudu.\n"
 "Võimalik, et peate meediat uuendama."
 
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "Palun oodake, eemaldan pakette, et uuendus oleks võimalik.."
 
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
 msgid "Program missing"
 msgstr "Programm puudub"
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr ""
 "Vajalik programm (grpmi) puudub Teie süsteemist. Palun vaadake, milles viga."
 
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
 msgid "Everything already installed."
 msgstr "Kõik on juba installitud."
 
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "Kõik on juba installitud (kas see pidigi nii juhtuma?)."
 
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
 msgid "Please wait, reading packages database..."
 msgstr "Palun oodake, loed pakettide andmebaasi.."
 
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
 msgid "Please wait, removing packages..."
 msgstr "Palun oodake, eemaldan pakette.."
 
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -912,7 +944,7 @@ msgstr ""
 "\n"
 "Selle tööriista abil saate valida eemaldatava tarkvara."
 
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -923,7 +955,7 @@ msgstr ""
 "\n"
 "Selle tööriista abil saate oma Mandrake Linuxit uuendada."
 
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1173,9 +1205,6 @@ msgstr "Pakettide paigaldus"
 #~ msgid "Force"
 #~ msgstr "Ikka tahan!"
 
-#~ msgid "Error..."
-#~ msgstr "Viga..."
-
 #~ msgid "Problems occured during installation"
 #~ msgstr "Paigaldusel tekkinud probleemid"
 
@@ -1475,9 +1504,6 @@ msgstr "Pakettide paigaldus"
 #~ msgid "Ftp Proxy:"
 #~ msgstr "FTP vahendaja:"
 
-#~ msgid "Proxy username:"
-#~ msgstr "Vahendaja kasutajatunnus:"
-
 #~ msgid "Proxy password:"
 #~ msgstr "Vahendaja salasõna:"
 
@@ -1517,9 +1543,6 @@ msgstr "Pakettide paigaldus"
 #~ msgid "Choose Packages"
 #~ msgstr "Valige paketid"
 
-#~ msgid "Username:"
-#~ msgstr "Kasutajatunnus:"
-
 #~ msgid "Security"
 #~ msgstr "Turvalisus"