sync with code

1 files changed, 167 insertions, 156 deletions

diff --git a/perl-install/install/share/po/et.po b/perl-install/install/share/po/et.po
index 31d04deea..12e4216a9 100644
--- a/perl-install/install/share/po/et.po
+++ b/perl-install/install/share/po/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-et\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 05:35+0200\n"
+"POT-Creation-Date: 2009-09-10 12:21+0200\n"
 "PO-Revision-Date: 2009-04-09 12:05+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -17,6 +17,31 @@ msgstr ""
 "X-Generator: KBabel 1.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../../advertising/IM_flash.pl:1
+#, c-format
+msgid "Your desktop on a USB key"
+msgstr "Kogu töölaud USB-pulgal"
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr "100%% vaba tarkvaraga Mandriva Linuxi distributsioon"
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr "Linuxi hõlpus tundmaõppimine Mandriva One abil"
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr "Täielik Mandriva Linuxi töölaud koos kasutajatoega"
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr "Mandriva: distributsioone igale maitsele ja kõigiks vajadusteks"
+
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -136,47 +161,18 @@ msgstr ""
 msgid "Looking at packages already installed..."
 msgstr "Juba paigaldatud pakettide tuvastamine..."
 
-#: any.pm:368
+#: any.pm:369
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Uuendatavate pakettide otsimine..."
 
-#: any.pm:387
+#: any.pm:388
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Pakettide eemaldamine enne uuendamist..."
 
-#: any.pm:408
-#, c-format
-msgid ""
-"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
-"choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
-"settings. \n"
-"To upgrade with KDE 3.5 and your personal settings preserved, \n"
-"please reboot your system and upgrade using the Mandriva update applet."
-msgstr ""
-"Otsustasite uuendada oma süsteemi %s peale. Teie süsteemis leiti KDE 3.5.\n"
-"Paigaldusprogramm ei saa uuendamisel KDE 3.5 säilitada. Kui soovite "
-"jätkata,\n"
-"asendatakse KDE 3 KDE 4-ga ja Te kaotate oma isiklikud KDE seadistused.\n"
-"Kui soovite uuendada nii, et KDE 3.5 ja Teie isiklikud seadistused säiliks,\n"
-"käivitage oma süsteem uuesti ja sooritage uuendamine Mandriva uuendusapleti "
-"abil."
-
-#: any.pm:413 steps_interactive.pm:1103
-#, c-format
-msgid "Reboot"
-msgstr "Taaskäivitus"
-
-#: any.pm:413
-#, c-format
-msgid "Proceed"
-msgstr "Jätka"
-
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:602
+#: any.pm:594
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -189,91 +185,86 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldada need paketid?\n"
 
-#: any.pm:821
+#: any.pm:813
 #, c-format
 msgid "Error reading file %s"
 msgstr "Viga faili %s lugemisel"
 
-#: any.pm:1028
+#: any.pm:1020
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Järgmistele ketastele anti uus nimi:"
 
-#: any.pm:1030
+#: any.pm:1022
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (varem oli %s)"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1106 steps_interactive.pm:932
+#: any.pm:1098 steps_interactive.pm:936
 #, c-format
 msgid "Network"
 msgstr "Võrk"
 
-#: any.pm:1110
+#: any.pm:1102
 #, c-format
 msgid "Please choose a media"
 msgstr "Palun valige andmekandja"
 
-#: any.pm:1126
+#: any.pm:1118
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fail on juba olemas. Kas kirjutada see üle?"
 
-#: any.pm:1130
+#: any.pm:1122
 #, c-format
 msgid "Permission denied"
 msgstr "Ligipääs keelatud"
 
-#: any.pm:1178
+#: any.pm:1170
 #, c-format
 msgid "Bad NFS name"
 msgstr "Vigane NFS-i nimi"
 
-#: any.pm:1199
+#: any.pm:1191
 #, c-format
 msgid "Bad media %s"
 msgstr "Vigane andmekandja %s"
 
-#: any.pm:1242
+#: any.pm:1234
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Ekraanipilte ei saa teha enne partitsioneerimist"
 
-#: any.pm:1250
+#: any.pm:1242
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekraanipildid asuvad pärast paigaldamist asukohas %s"
 
-#: gtk.pm:130
+#: gtk.pm:131
 #, c-format
 msgid "Installation"
 msgstr "Paigaldamine"
 
-#: gtk.pm:134 share/meta-task/compssUsers.pl:44
+#: gtk.pm:135 share/meta-task/compssUsers.pl:44
 #, c-format
 msgid "Configuration"
 msgstr "Seadistamine"
 
-#: http.pm:53
-#, c-format
-msgid "retrieval of [%s] failed"
-msgstr "[%s] tõmbamine nurjus"
-
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -303,17 +294,17 @@ msgstr "Võrgu seiskamine"
 msgid "Please wait, retrieving file"
 msgstr "Palun oodake, tõmmatakse faili"
 
-#: media.pm:718
+#: media.pm:716
 #, c-format
 msgid "unable to add medium"
 msgstr "andmekandja lisamine nurjus"
 
-#: media.pm:758
+#: media.pm:756
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Mõningate tarkvarapakettide kopeerimine kettale edasiseks kasutamiseks"
 
-#: media.pm:811
+#: media.pm:809
 #, c-format
 msgid "Copying in progress"
 msgstr "Käib kopeerimine..."
@@ -357,12 +348,12 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Tekkis viga:"
 
-#: pkgs.pm:780
+#: pkgs.pm:792
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d paigaldamistehingut nurjus"
 
-#: pkgs.pm:781
+#: pkgs.pm:793
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Pakettide paigaldamine nurjus:"
@@ -791,17 +782,17 @@ msgstr "Siin näeb '%s' töölaua eelvaatlust."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klõpsake piltidel suurema eelvaatluse nägemiseks"
 
-#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paketigruppide valik"
 
-#: steps_gtk.pm:336 steps_interactive.pm:619
+#: steps_gtk.pm:336 steps_interactive.pm:623
 #, c-format
 msgid "Individual package selection"
 msgstr "Valik paketthaaval"
 
-#: steps_gtk.pm:360 steps_interactive.pm:543
+#: steps_gtk.pm:360 steps_interactive.pm:544
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Suurus kokku: %d / %d MB"
@@ -918,59 +909,59 @@ msgstr "Minimaalne paigaldus"
 msgid "Software Management"
 msgstr "Tarkvarahaldur"
 
-#: steps_gtk.pm:517 steps_interactive.pm:428
+#: steps_gtk.pm:517 steps_interactive.pm:429
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Valige paketid, mida soovite paigaldada"
 
-#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Paigaldamine"
 
-#: steps_gtk.pm:563
+#: steps_gtk.pm:564
 #, c-format
 msgid "No details"
 msgstr "Üksikasjadeta"
 
-#: steps_gtk.pm:578
+#: steps_gtk.pm:583
 #, c-format
 msgid "Time remaining:"
 msgstr "Aega jäänud:"
 
-#: steps_gtk.pm:579
+#: steps_gtk.pm:584
 #, c-format
 msgid "(estimating...)"
 msgstr "(oletus...)"
 
-#: steps_gtk.pm:605
+#: steps_gtk.pm:614
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakett"
 msgstr[1] "%d paketti"
 
-#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
+#: steps_gtk.pm:668 steps_interactive.pm:801 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: steps_gtk.pm:670
+#: steps_gtk.pm:687
 #, c-format
 msgid "Configure"
 msgstr "Seadista"
 
-#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
+#: steps_gtk.pm:704 steps_interactive.pm:797 steps_interactive.pm:948
 #, c-format
 msgid "not configured"
 msgstr "seadistamata"
 
-#: steps_gtk.pm:721
+#: steps_gtk.pm:738
 #, c-format
 msgid "Media Selection"
 msgstr "Andmekandjate valik"
 
-#: steps_gtk.pm:730 steps_interactive.pm:329
+#: steps_gtk.pm:747 steps_interactive.pm:330
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -979,7 +970,7 @@ msgstr ""
 "Leiti järgmised paigaldusandmekandjad.\n"
 "Kui Te ei soovi mõnda neist kasutada, eemaldage need valikust."
 
-#: steps_gtk.pm:746 steps_interactive.pm:335
+#: steps_gtk.pm:763 steps_interactive.pm:336
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -991,7 +982,7 @@ msgstr ""
 "Seejärel jätkatakse paigaldamist kõvakettalt ning kogu tarkvara on seal "
 "kättesaadav ka pärast süsteemi paigaldamist."
 
-#: steps_gtk.pm:748 steps_interactive.pm:337
+#: steps_gtk.pm:765 steps_interactive.pm:338
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopeeri kõik CD-d"
@@ -1011,49 +1002,49 @@ msgstr "Palun valige klaviatuuriasetus"
 msgid "Here is the full list of available keyboards:"
 msgstr "See on saadaolevate klaviatuuriasetuste täielik nimekiri:"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:144
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Paigaldamine/Uuendamine"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:148
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Kas see on paigaldamine või uuendamine?"
 
-#: steps_interactive.pm:149
+#: steps_interactive.pm:150
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Paigaldamine"
 
-#: steps_interactive.pm:151
+#: steps_interactive.pm:152
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s uuendamine"
 
-#: steps_interactive.pm:169
+#: steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s krüptovõti"
 
-#: steps_interactive.pm:202
+#: steps_interactive.pm:203
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Paigaldamisest loobumine, süsteemi taaskäivitamine"
 
-#: steps_interactive.pm:203
+#: steps_interactive.pm:204
 #, c-format
 msgid "New Installation"
 msgstr "Uus paigaldus"
 
-#: steps_interactive.pm:204
+#: steps_interactive.pm:205
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Varasema paigalduse uuendamine (ei ole soovitatav)"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:209
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1072,17 +1063,17 @@ msgstr ""
 "Hoiatus: Te peaksite varundama kõik oma isiklikud andmed,\n"
 "enne kui valite võimaluse \"Uus paigaldus\"."
 
-#: steps_interactive.pm:250
+#: steps_interactive.pm:251
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:250
+#: steps_interactive.pm:251
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: steps_interactive.pm:287
+#: steps_interactive.pm:288
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1091,7 +1082,7 @@ msgstr ""
 "Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldamine jätkub, kuid "
 "süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:293
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1101,7 +1092,7 @@ msgstr ""
 "Teil tuleb luua PPC PReP Boot alglaadimisala! Paigaldamine jätkub, kuid "
 "süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
 
-#: steps_interactive.pm:368
+#: steps_interactive.pm:369
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1114,12 +1105,12 @@ msgstr ""
 "Palun sisestage CD nimega \"%s\" CD-seadmesse ja klõpsake nupule \"Olgu\".\n"
 "Kui Teil sellist ei ole, klõpsake nupule \"Loobu\"."
 
-#: steps_interactive.pm:385
+#: steps_interactive.pm:386
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Saadaolevate pakettide otsimine..."
 
-#: steps_interactive.pm:393
+#: steps_interactive.pm:394
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1127,7 +1118,7 @@ msgid ""
 msgstr ""
 "Teie süsteemis ei jagu ruumi paigaldamiseks ega uuendamiseks (%dMB > %dMB)"
 
-#: steps_interactive.pm:440
+#: steps_interactive.pm:441
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1136,52 +1127,52 @@ msgstr ""
 "Valige palun paketivaliku laadimine või salvestamine.\n"
 "Vorming on sama, mis automaatpaigaldusega loodud failide puhul."
 
-#: steps_interactive.pm:442
+#: steps_interactive.pm:443
 #, c-format
 msgid "Load"
 msgstr "Laadi"
 
-#: steps_interactive.pm:442
+#: steps_interactive.pm:443
 #, c-format
 msgid "Save"
 msgstr "Salvesta"
 
-#: steps_interactive.pm:450
+#: steps_interactive.pm:451
 #, c-format
 msgid "Bad file"
 msgstr "Vigane fail"
 
-#: steps_interactive.pm:466
+#: steps_interactive.pm:467
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:467
+#: steps_interactive.pm:468
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:471
 #, c-format
 msgid "Desktop Selection"
 msgstr "Töölaua valik"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:472
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Siin saab valida oma arvuti töölauaprofiili: "
 
-#: steps_interactive.pm:557
+#: steps_interactive.pm:558
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valiku suurus ületab saadaolevat kettaruumi"
 
-#: steps_interactive.pm:572
+#: steps_interactive.pm:574
 #, c-format
 msgid "Type of install"
 msgstr "Paigaldamise tüüp"
 
-#: steps_interactive.pm:573
+#: steps_interactive.pm:575
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1190,82 +1181,87 @@ msgstr ""
 "Te ei valinud ühtegi paketigruppi.\n"
 "Palun valige meelepärane minimaalne paigaldus:"
 
-#: steps_interactive.pm:578
+#: steps_interactive.pm:580
 #, c-format
 msgid "With X"
 msgstr "X'iga"
 
-#: steps_interactive.pm:579
+#: steps_interactive.pm:581
+#, fuzzy, c-format
+msgid "Install suggested packages"
+msgstr "Paketi %s paigaldamine"
+
+#: steps_interactive.pm:582
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Baasdokumentatsiooniga (soovitatav!)"
 
-#: steps_interactive.pm:580
+#: steps_interactive.pm:583
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
 
-#: steps_interactive.pm:634
+#: steps_interactive.pm:638
 #, c-format
 msgid "Preparing installation"
 msgstr "Paigaldamiseks valmistumine"
 
-#: steps_interactive.pm:642
+#: steps_interactive.pm:646
 #, c-format
 msgid "Installing package %s"
 msgstr "Paketi %s paigaldamine"
 
-#: steps_interactive.pm:666
+#: steps_interactive.pm:670
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakettide tellimisel tekkis viga:"
 
-#: steps_interactive.pm:666
+#: steps_interactive.pm:670
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kas ikkagi jätkata?"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:674
 #, c-format
 msgid "Retry"
 msgstr "Proovi uuesti"
 
-#: steps_interactive.pm:671
+#: steps_interactive.pm:675
 #, c-format
 msgid "Skip this package"
 msgstr "Jäta pakett vahele"
 
-#: steps_interactive.pm:672
+#: steps_interactive.pm:676
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Jäta kõik andmekandja \"%s\" paketid vahele"
 
-#: steps_interactive.pm:673
+#: steps_interactive.pm:677
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Tagasi andmekandja ja paketivaliku juurde"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:680
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketi %s paigaldamisel tekkis viga."
 
-#: steps_interactive.pm:695
+#: steps_interactive.pm:699
 #, c-format
 msgid "Post-install configuration"
 msgstr "Paigaldamisjärgne seadistamine"
 
-#: steps_interactive.pm:702
+#: steps_interactive.pm:706
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Palun kontrollige, et uuenduste andmekandja on seadmes %s"
 
-#: steps_interactive.pm:730 steps_list.pm:47
+#: steps_interactive.pm:734 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Uuendused"
 
-#: steps_interactive.pm:731
+#: steps_interactive.pm:735
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1285,28 +1281,28 @@ msgstr ""
 "\n"
 "Kas soovite uuendusi paigaldada?"
 
-#: steps_interactive.pm:839
+#: steps_interactive.pm:843
 #, c-format
 msgid "%s on %s"
 msgstr "%s asukohas %s"
 
-#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
-#: steps_interactive.pm:909 steps_interactive.pm:924
+#: steps_interactive.pm:876 steps_interactive.pm:883 steps_interactive.pm:896
+#: steps_interactive.pm:913 steps_interactive.pm:928
 #, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: steps_interactive.pm:893 steps_interactive.pm:910
+#: steps_interactive.pm:897 steps_interactive.pm:914
 #, c-format
 msgid "Sound card"
 msgstr "Helikaart"
 
-#: steps_interactive.pm:913
+#: steps_interactive.pm:917
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Kas Teil on ISA helikaart?"
 
-#: steps_interactive.pm:915
+#: steps_interactive.pm:919
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1315,69 +1311,69 @@ msgstr ""
 "Helikaardi seadistamiseks käivitage pärast paigaldamist \"alsaconf\" või "
 "\"sndconfig\""
 
-#: steps_interactive.pm:917
+#: steps_interactive.pm:921
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Helikaarti ei leitud. Proovige see leida pärast paigaldamist \"harddrake\" "
 "abil"
 
-#: steps_interactive.pm:925
+#: steps_interactive.pm:929
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafiline kasutajaliides"
 
-#: steps_interactive.pm:931 steps_interactive.pm:942
+#: steps_interactive.pm:935 steps_interactive.pm:946
 #, c-format
 msgid "Network & Internet"
 msgstr "Kohtvõrk ja internet"
 
-#: steps_interactive.pm:943
+#: steps_interactive.pm:947
 #, c-format
 msgid "Proxies"
 msgstr "Puhverserverid"
 
-#: steps_interactive.pm:944
+#: steps_interactive.pm:948
 #, c-format
 msgid "configured"
 msgstr "seadistatud"
 
-#: steps_interactive.pm:954
+#: steps_interactive.pm:958
 #, c-format
 msgid "Security Level"
 msgstr "Turvatase"
 
-#: steps_interactive.pm:973
+#: steps_interactive.pm:977
 #, c-format
 msgid "Firewall"
 msgstr "Tulemüür"
 
-#: steps_interactive.pm:977
+#: steps_interactive.pm:981
 #, c-format
 msgid "activated"
 msgstr "aktiveeritud"
 
-#: steps_interactive.pm:977
+#: steps_interactive.pm:981
 #, c-format
 msgid "disabled"
 msgstr "keelatud"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:995
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Te ei ole seadistanud X'i. Kas Te tõesti ei taha seda teha?"
 
-#: steps_interactive.pm:1019
+#: steps_interactive.pm:1023
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Alglaaduri ettevalmistamine..."
 
-#: steps_interactive.pm:1020
+#: steps_interactive.pm:1024
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Varuge kannatust, see võib võtta veidi aega..."
 
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1035
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1390,7 +1386,7 @@ msgstr ""
 "tuleb Teil kasutada BootX'i või mingit muud nippi. Kerneli argument "
 "juurfailisüsteemi jaoks on root=%s"
 
-#: steps_interactive.pm:1045
+#: steps_interactive.pm:1049
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1399,17 +1395,17 @@ msgstr ""
 "Sellel turvatasemel pääseb Windowsi partitsioonil asuvatele failidele ligi "
 "ainult administraator."
 
-#: steps_interactive.pm:1077
+#: steps_interactive.pm:1081
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Pange palun tühi diskett seadmesse %s"
 
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1083
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kiirpaigaldusdisketi loomine..."
 
-#: steps_interactive.pm:1090
+#: steps_interactive.pm:1094
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1420,11 +1416,16 @@ msgstr ""
 "\n"
 "Kas soovite tõesti praegu lõpetada ja väljuda?"
 
-#: steps_interactive.pm:1100
+#: steps_interactive.pm:1104
 #, c-format
 msgid "Congratulations"
 msgstr "Õnnitleme!"
 
+#: steps_interactive.pm:1107
+#, c-format
+msgid "Reboot"
+msgstr "Taaskäivitus"
+
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
@@ -1564,20 +1565,30 @@ msgid ""
 "Exit"
 msgstr "Välju"
 
-#~ msgid "Your desktop on a USB key"
-#~ msgstr "Kogu töölaud USB-pulgal"
-
-#~ msgid "The 100%% open source Mandriva Linux distribution"
-#~ msgstr "100%% vaba tarkvaraga Mandriva Linuxi distributsioon"
-
-#~ msgid "Explore Linux easily with Mandriva One"
-#~ msgstr "Linuxi hõlpus tundmaõppimine Mandriva One abil"
-
-#~ msgid "A full Mandriva Linux desktop, with support"
-#~ msgstr "Täielik Mandriva Linuxi töölaud koos kasutajatoega"
-
-#~ msgid "Mandriva: distributions for everybody's needs"
-#~ msgstr "Mandriva: distributsioone igale maitsele ja kõigiks vajadusteks"
+#~ msgid ""
+#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
+#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
+#~ "you choose to proceed, \n"
+#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
+#~ "configuration settings. \n"
+#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
+#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ msgstr ""
+#~ "Otsustasite uuendada oma süsteemi %s peale. Teie süsteemis leiti KDE "
+#~ "3.5.\n"
+#~ "Paigaldusprogramm ei saa uuendamisel KDE 3.5 säilitada. Kui soovite "
+#~ "jätkata,\n"
+#~ "asendatakse KDE 3 KDE 4-ga ja Te kaotate oma isiklikud KDE seadistused.\n"
+#~ "Kui soovite uuendada nii, et KDE 3.5 ja Teie isiklikud seadistused "
+#~ "säiliks,\n"
+#~ "käivitage oma süsteem uuesti ja sooritage uuendamine Mandriva "
+#~ "uuendusapleti abil."
+
+#~ msgid "Proceed"
+#~ msgstr "Jätka"
+
+#~ msgid "retrieval of [%s] failed"
+#~ msgstr "[%s] tõmbamine nurjus"
 
 #~ msgid "Downloading file %s..."
 #~ msgstr "Faili %s allalaadimine..."