Updated POT file

1 files changed, 203 insertions, 228 deletions

diff --git a/perl-install/install/share/po/et.po b/perl-install/install/share/po/et.po
index cb7ceba72..cad3e4476 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-03-30 15:42+0200\n"
+"POT-Creation-Date: 2009-04-09 05:35+0200\n"
 "PO-Revision-Date: 2009-02-16 12:27+0200\n"
 "Last-Translator: Marek Laane <bald@starman.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -17,31 +17,6 @@ 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?"
@@ -81,24 +56,24 @@ msgstr "Võrk (FTP)"
 msgid "Network (NFS)"
 msgstr "Võrk (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Peegli URL?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL-i alguses peab seisma ftp:// või http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Mandriva Linuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -107,47 +82,47 @@ msgstr ""
 "Ühenduse loomine Mandriva Linuxi veebisaidiga saadaolevate peeglite "
 "nimekirja hankimiseks nurjus"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-i seadistamine"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Palun andke NFS-andmekandja masinanimi ja kataloog"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Masinanimi puudub"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Kataloogi alguses peab olema \"/\""
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS-i andmekandja masinanimi?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Kataloog"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Täiendav"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -156,22 +131,22 @@ msgstr ""
 "Tarkvara nimekirja sisaldava faili leidmine sellelt peeglilt nurjus. "
 "Kontrollige palun asukohta."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Juba paigaldatud pakettide tuvastamine..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Uuendatavate pakettide otsimine..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Pakettide eemaldamine enne uuendamist..."
 
-#: any.pm:402
+#: any.pm:408
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -190,18 +165,18 @@ msgstr ""
 "käivitage oma süsteem uuesti ja sooritage uuendamine Mandriva uuendusapleti "
 "abil."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Taaskäivitus"
 
-#: any.pm:407
+#: 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:596
+#: any.pm:602
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -214,72 +189,72 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldada need paketid?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Viga faili %s lugemisel"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Järgmistele ketastele anti uus nimi:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (varem oli %s)"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1081
+#: any.pm:1087
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1100 steps_interactive.pm:935
+#: any.pm:1106 steps_interactive.pm:932
 #, c-format
 msgid "Network"
 msgstr "Võrk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Palun valige andmekandja"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fail on juba olemas. Kas kirjutada see üle?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Ligipääs keelatud"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Vigane NFS-i nimi"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Vigane andmekandja %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Ekraanipilte ei saa teha enne partitsioneerimist"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Ekraanipildid asuvad pärast paigaldamist asukohas %s"
@@ -290,11 +265,15 @@ msgid "Installation"
 msgstr "Paigaldamine"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Seadistamine"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -319,22 +298,22 @@ msgstr "Võrgu aktiveerimine"
 msgid "Bringing down the network"
 msgstr "Võrgu seiskamine"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Palun oodake, tõmmatakse faili"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Faili %s allalaadimine..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Mõningate tarkvarapakettide kopeerimine kettale edasiseks kasutamiseks"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Käib kopeerimine..."
@@ -378,27 +357,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Tekkis viga:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d paigaldamistehingut nurjus"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Pakettide paigaldamine nurjus:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Tööjaam"
 
-#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
+#: share/meta-task/compssUsers.pl:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontori-tööjaam"
 
-#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
+#: share/meta-task/compssUsers.pl:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -407,7 +386,7 @@ msgstr ""
 "Kontoritöö programmid: tekstitöötlus (OpenOffice.org Writer, KWord), "
 "tabelitöötlus (OpenOffice.org Calc, KSpread), PDF-failide näitajad jne"
 
-#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
+#: share/meta-task/compssUsers.pl:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -416,32 +395,32 @@ msgstr ""
 "Kontoritöö programmid: tekstitöötlus (KWord, Abiword), tabelitöötlus "
 "(KSpread, Gnumeric), PDF-failide näitajad jne"
 
-#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
+#: share/meta-task/compssUsers.pl:23
 #, c-format
 msgid "Game station"
 msgstr "Mänguvahend"
 
-#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
+#: share/meta-task/compssUsers.pl:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
 
-#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
+#: share/meta-task/compssUsers.pl:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimeedia-tööjaam"
 
-#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
+#: share/meta-task/compssUsers.pl:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Heli ja video mängimine ja redigeerimine"
 
-#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
+#: share/meta-task/compssUsers.pl:33
 #, c-format
 msgid "Internet station"
 msgstr "Interneti-tööjaam"
 
-#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
+#: share/meta-task/compssUsers.pl:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -450,230 +429,212 @@ msgstr ""
 "Valik rakendusi e-posti ja uudiste lugemiseks (mutt, tin...) ning veebi "
 "lehitsemiseks"
 
-#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
+#: share/meta-task/compssUsers.pl:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Võrguarvuti (klient)"
 
-#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
+#: share/meta-task/compssUsers.pl:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Mitme protokolli, sealhulgas ssh kliendid"
 
-#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
+#: share/meta-task/compssUsers.pl:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Tööriistad süsteemi lihtsamaks haldamiseks"
 
-#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
+#: share/meta-task/compssUsers.pl:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsoolitööriistad"
 
-#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
+#: share/meta-task/compssUsers.pl:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Redaktorid, shellid, terminalid, failihaldus"
 
 #: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:157
-#: share/meta-task/compssUsers.pl:159 share/meta-task/compssUsers.pl.orig:54
-#: share/meta-task/compssUsers.pl.orig:156
-#: share/meta-task/compssUsers.pl.orig:158
+#: share/meta-task/compssUsers.pl:159
 #, c-format
 msgid "Development"
 msgstr "Arendus"
 
 #: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:160
-#: share/meta-task/compssUsers.pl.orig:55
-#: share/meta-task/compssUsers.pl.orig:159
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
 msgstr "C ja C++ arendusteegid, rakendused ja päisefailid"
 
 #: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:164
-#: share/meta-task/compssUsers.pl.orig:58
-#: share/meta-task/compssUsers.pl.orig:163
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
 #: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:165
-#: share/meta-task/compssUsers.pl.orig:59
-#: share/meta-task/compssUsers.pl.orig:164
 #, c-format
 msgid "Books and Howto's on Linux and Free Software"
 msgstr "Raamatud ja HOWTO-d Linuxi ja vabavara kohta"
 
 #: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:168
-#: share/meta-task/compssUsers.pl.orig:63
-#: share/meta-task/compssUsers.pl.orig:167
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
 #: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:169
-#: share/meta-task/compssUsers.pl.orig:64
-#: share/meta-task/compssUsers.pl.orig:168
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Kolmandate tootjate rakenduste toetus"
 
-#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
+#: share/meta-task/compssUsers.pl:73
 #, c-format
 msgid "Web Server"
 msgstr "Veebiserver"
 
-#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
+#: share/meta-task/compssUsers.pl:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
+#: share/meta-task/compssUsers.pl:77
 #, c-format
 msgid "Groupware"
 msgstr "Grupitöö"
 
-#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
+#: share/meta-task/compssUsers.pl:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolabi server"
 
 #: share/meta-task/compssUsers.pl:81 share/meta-task/compssUsers.pl:122
-#: share/meta-task/compssUsers.pl.orig:81
-#: share/meta-task/compssUsers.pl.orig:122
 #, c-format
 msgid "Firewall/Router"
 msgstr "Tulemüür/marsruuter"
 
 #: share/meta-task/compssUsers.pl:82 share/meta-task/compssUsers.pl:123
-#: share/meta-task/compssUsers.pl.orig:82
-#: share/meta-task/compssUsers.pl.orig:123
 #, c-format
 msgid "Internet gateway"
 msgstr "Internet"
 
-#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
+#: share/meta-task/compssUsers.pl:85
 #, c-format
 msgid "Mail/News"
 msgstr "E-post/Uudistegrupid"
 
-#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
+#: share/meta-task/compssUsers.pl:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfixi e-posti server, Inn uudisteserver"
 
-#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
+#: share/meta-task/compssUsers.pl:89
 #, c-format
 msgid "Directory Server"
 msgstr "Kataloogiserver"
 
-#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
+#: share/meta-task/compssUsers.pl:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-server"
 
-#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
+#: share/meta-task/compssUsers.pl:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
+#: share/meta-task/compssUsers.pl:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
+#: share/meta-task/compssUsers.pl:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Nimeserver ja võrguteabeserver"
 
-#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
+#: share/meta-task/compssUsers.pl:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Faili- ja printserver"
 
-#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
+#: share/meta-task/compssUsers.pl:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-server, Samba-server"
 
 #: share/meta-task/compssUsers.pl:105 share/meta-task/compssUsers.pl:118
-#: share/meta-task/compssUsers.pl.orig:105
-#: share/meta-task/compssUsers.pl.orig:118
 #, c-format
 msgid "Database"
 msgstr "Andmebaasid"
 
-#: share/meta-task/compssUsers.pl:106 share/meta-task/compssUsers.pl.orig:106
+#: share/meta-task/compssUsers.pl:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL- ja MySQL-andmebaasiserver"
 
-#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
+#: share/meta-task/compssUsers.pl:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Veeb/FTP"
 
-#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
+#: share/meta-task/compssUsers.pl:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache ja Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
+#: share/meta-task/compssUsers.pl:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfixi e-posti server"
 
-#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
+#: share/meta-task/compssUsers.pl:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL- või MySQL-andmebaasiserver"
 
-#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
+#: share/meta-task/compssUsers.pl:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Võrguserver"
 
-#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
+#: share/meta-task/compssUsers.pl:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-, SMB-, SSH-server, puhverserver (proxy)"
 
-#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
+#: share/meta-task/compssUsers.pl:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Graafiline keskkond"
 
-#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
+#: share/meta-task/compssUsers.pl:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE tööjaam"
 
-#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
+#: share/meta-task/compssUsers.pl:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr "K töölaua keskkond: graafiline töökeskkond ja palju rakendusi"
 
-#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
+#: share/meta-task/compssUsers.pl:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME tööjaam"
 
-#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
+#: share/meta-task/compssUsers.pl:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
 msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE töölaud"
@@ -687,54 +648,52 @@ msgstr ""
 "Vähese koormusega ja kiire graafiline töökeskkond koos kasutajasõbralike "
 "rakenduste ja tööriistadega"
 
-#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
+#: share/meta-task/compssUsers.pl:150
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Muud graafilised töölauad"
 
-#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
+#: share/meta-task/compssUsers.pl:151
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "WindowMaker, Enlightenment, Fvwm jt"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Utiliidid"
 
 #: share/meta-task/compssUsers.pl:176 share/meta-task/compssUsers.pl:177
-#: share/meta-task/compssUsers.pl.orig:175
-#: share/meta-task/compssUsers.pl.orig:176
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-server"
 
-#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
+#: share/meta-task/compssUsers.pl:181
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
+#: share/meta-task/compssUsers.pl:182
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin võrguseadistusserver"
 
-#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
+#: share/meta-task/compssUsers.pl:186
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Võrguutiliidid ja võrgu jälgimine"
 
-#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
+#: share/meta-task/compssUsers.pl:187
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Jälgimistööriistad, protsesside jälgimine, tcpdump, nmap..."
 
-#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
+#: share/meta-task/compssUsers.pl:191
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva nõustajad"
 
-#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
+#: share/meta-task/compssUsers.pl:192
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Serverite seadistamise nõustajad"
@@ -832,17 +791,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:606 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:602 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paketigruppide valik"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Valik paketthaaval"
 
-#: steps_gtk.pm:360 steps_interactive.pm:547
+#: steps_gtk.pm:360 steps_interactive.pm:543
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Suurus kokku: %d / %d MB"
@@ -959,12 +918,12 @@ msgstr "Minimaalne paigaldus"
 msgid "Software Management"
 msgstr "Tarkvarahaldur"
 
-#: steps_gtk.pm:517 steps_interactive.pm:432
+#: steps_gtk.pm:517 steps_interactive.pm:428
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Valige paketid, mida soovite paigaldada"
 
-#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Paigaldamine"
@@ -991,7 +950,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakett"
 msgstr[1] "%d paketti"
 
-#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Kokkuvõte"
@@ -1001,7 +960,7 @@ msgstr "Kokkuvõte"
 msgid "Configure"
 msgstr "Seadista"
 
-#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
+#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
 #, c-format
 msgid "not configured"
 msgstr "seadistamata"
@@ -1011,7 +970,7 @@ msgstr "seadistamata"
 msgid "Media Selection"
 msgstr "Andmekandjate valik"
 
-#: steps_gtk.pm:730 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:329
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1020,7 +979,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:340
+#: steps_gtk.pm:746 steps_interactive.pm:335
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1032,7 +991,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:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopeeri kõik CD-d"
@@ -1052,59 +1011,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:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Paigaldamine/Uuendamine"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Kas see on paigaldamine või uuendamine?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Paigaldamine"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s uuendamine"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Uuendamine 32-bitiselt distributsioonilt 64-bitisele ei ole toetatud"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Uuendamine 64-bitiselt distributsioonilt 32-bitisele ei ole toetatud"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s krüptovõti"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Paigaldamisest loobumine, süsteemi taaskäivitamine"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Uus paigaldus"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Varasema paigalduse uuendamine (ei ole soovitatav)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1123,17 +1072,17 @@ msgstr ""
 "Hoiatus: Te peaksite varundama kõik oma isiklikud andmed,\n"
 "enne kui valite võimaluse \"Uus paigaldus\"."
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:255
+#: steps_interactive.pm:250
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1142,7 +1091,7 @@ msgstr ""
 "Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldamine jätkub, kuid "
 "süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
 
-#: steps_interactive.pm:297
+#: steps_interactive.pm:292
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1152,7 +1101,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:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1165,12 +1114,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:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Saadaolevate pakettide otsimine..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1178,7 +1127,7 @@ msgid ""
 msgstr ""
 "Teie süsteemis ei jagu ruumi paigaldamiseks ega uuendamiseks (%dMB > %dMB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1187,52 +1136,52 @@ msgstr ""
 "Valige palun paketivaliku laadimine või salvestamine.\n"
 "Vorming on sama, mis automaatpaigaldusega loodud failide puhul."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Laadi"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Salvesta"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Vigane fail"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:466
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:467
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:474
+#: steps_interactive.pm:470
 #, c-format
 msgid "Desktop Selection"
 msgstr "Töölaua valik"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Siin saab valida oma arvuti töölauaprofiili: "
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valiku suurus ületab saadaolevat kettaruumi"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Paigaldamise tüüp"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1241,82 +1190,82 @@ msgstr ""
 "Te ei valinud ühtegi paketigruppi.\n"
 "Palun valige meelepärane minimaalne paigaldus:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X'iga"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Baasdokumentatsiooniga (soovitatav!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Paigaldamiseks valmistumine"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Paketi %s paigaldamine"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakettide tellimisel tekkis viga:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kas ikkagi jätkata?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Proovi uuesti"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Jäta pakett vahele"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Jäta kõik andmekandja \"%s\" paketid vahele"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Tagasi andmekandja ja paketivaliku juurde"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketi %s paigaldamisel tekkis viga."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Paigaldamisjärgne seadistamine"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, 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:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Uuendused"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1336,28 +1285,28 @@ msgstr ""
 "\n"
 "Kas soovite uuendusi paigaldada?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s asukohas %s"
 
-#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
-#: steps_interactive.pm:912 steps_interactive.pm:927
+#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
+#: steps_interactive.pm:909 steps_interactive.pm:924
 #, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Helikaart"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Kas Teil on ISA helikaart?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1366,69 +1315,69 @@ msgstr ""
 "Helikaardi seadistamiseks käivitage pärast paigaldamist \"alsaconf\" või "
 "\"sndconfig\""
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, 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:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafiline kasutajaliides"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Kohtvõrk ja internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Puhverserverid"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "seadistatud"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Turvatase"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Tulemüür"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktiveeritud"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "keelatud"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, 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:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Alglaaduri ettevalmistamine..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Varuge kannatust, see võib võtta veidi aega..."
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1441,7 +1390,7 @@ msgstr ""
 "tuleb Teil kasutada BootX'i või mingit muud nippi. Kerneli argument "
 "juurfailisüsteemi jaoks on root=%s"
 
-#: steps_interactive.pm:1048
+#: steps_interactive.pm:1045
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1450,17 +1399,17 @@ msgstr ""
 "Sellel turvatasemel pääseb Windowsi partitsioonil asuvatele failidele ligi "
 "ainult administraator."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Pange palun tühi diskett seadmesse %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kiirpaigaldusdisketi loomine..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1471,7 +1420,7 @@ msgstr ""
 "\n"
 "Kas soovite tõesti praegu lõpetada ja väljuda?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Õnnitleme!"
@@ -1615,6 +1564,32 @@ 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 "Downloading file %s..."
+#~ msgstr "Faili %s allalaadimine..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Uuendamine 32-bitiselt distributsioonilt 64-bitisele ei ole toetatud"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Uuendamine 64-bitiselt distributsioonilt 32-bitisele ei ole toetatud"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"