Updated POT file

1 files changed, 203 insertions, 230 deletions

diff --git a/perl-install/install/share/po/fi.po b/perl-install/install/share/po/fi.po
index 70125b53c..f4bfc278a 100644
--- a/perl-install/install/share/po/fi.po
+++ b/perl-install/install/share/po/fi.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-fi\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: 2008-10-02 21:39+0300\n"
 "Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -24,31 +24,6 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Työpöytäsi USB-tikulla"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "100%% vapaan lähdekoodin Mandriva Linux -jakelu"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Tutustu Linuxiin helposti Mandriva Onella"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Täysi Mandriva Linux -jakelu käyttäjätuella"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: jakeluja jokaisen tarpeisiin"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -88,24 +63,24 @@ msgstr "Verkko (FTP)"
 msgid "Network (NFS)"
 msgstr "Verkko (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Peilipalvelimen URL?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL pitää alkaa ftp:// tai http://"
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Otetaan yhteys Mandriva Linuxin sivustolle peilipalvelinlistan saamiseksi..."
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -114,69 +89,69 @@ msgstr ""
 "Yhteydenotto Mandriva Linuxin sivustolle peilipalvelinlistan saamiseksi "
 "epäonnistui"
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valitse peilipalvelin josta paketit haetaan"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS Asetus"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Syötä NFS-palvelimesi nimi ja hakemistopolku"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Palvelimen osoite puuttuu"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Hakemistopolun täytyy alkaa \"/\"-merkillä"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "NFS-liitoksen palvelimen nimi?"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Kansio"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Lisämedia"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
 "correct."
 msgstr "En löydä hdlist tiedostoa tässä peilipalvelimessa."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Etsitään jo asennettuja paketteja..."
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Etsitään päivitettäviä paketteja..."
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Poistetaan paketteja ennen päivitystä..."
 
-#: 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"
@@ -195,18 +170,18 @@ msgstr ""
 "asetuksesi, ole hyvä ja käynnistä tietokoneesi uudelleen ja päivitä\n"
 "järjestelmäsi käyttäen MandrivaUpdate."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Käynnistä uudelleen"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr ""
 
 #. -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"
@@ -219,72 +194,72 @@ msgstr ""
 "\n"
 "Haluatko varmasti poistaa nämä paketit?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Virhe lukiessa tiedostoa %s"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Seuraava(t) levy(t) uudelleennimettiin:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (oli ennen nimetty %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 "Verkko"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Ole hyvä ja valitse media"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Tiedosto jo olemassa. Korvaa?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Ei oikeuksia"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Virheellinen NFS-nimi"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Huono media %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Kuvakaappauksia ei voida tehdä ennen osiointia"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Kuvakaappaukset löytyvät asennuksen jälkeen hakemistosta %s"
@@ -295,11 +270,15 @@ msgid "Installation"
 msgstr "Asennus"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Asetustyökalut"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -324,22 +303,22 @@ msgstr "Käynnistetään verkkoa"
 msgid "Bringing down the network"
 msgstr "Ajetaan alas verkkoa"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Odota hetki, tiedostoa haetaan"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Haetaan tiedosto %s ..."
+msgid "unable to add medium"
+msgstr ""
 
-#: media.pm:822
+#: media.pm:758
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopioin paketteja kovalevylle myöhempään käyttöön"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiointi käynnissä"
@@ -383,27 +362,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Ilmeni virhe"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d asennustapahtumaa epäonnistui"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, fuzzy, c-format
 msgid "Installation of packages failed:"
 msgstr "Asennetaan pakettia: %s"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Työasema"
 
-#: 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 "Toimistotyöasema"
 
-#: 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 "
@@ -412,7 +391,7 @@ msgstr ""
 "Toimisto-ohjelmistot: tekstinkäsittely (OpenOffice.org Writer, Kword), "
 "taulukkolaskenta (OpenOffice.org calc, Kspread), PDF-lukijat 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, "
@@ -421,32 +400,32 @@ msgstr ""
 "Toimisto-ohjelmistot: tekstinkäsittely (kword, abiword), taulukkolaskenta "
 "(kspread, gnumeric), pdf-lukijat 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 "Peliasema"
 
-#: 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 "Viihdeohjelmat: tasohyppely, korttipelit, strategia 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 "Multimediatyöasema"
 
-#: 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 "Äänen sekä videon toisto- ja editointiohjelmat"
 
-#: 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 "Internettyöasema"
 
-#: 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 "
@@ -455,213 +434,195 @@ msgstr ""
 "Valikoima työkaluja sähköpostin ja uutisryhmien lukemiseen (mutt, tin...) "
 "sekä Internetin selailuun"
 
-#: 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 "Verkkopääte (asiakas)"
 
-#: 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 "Asiakasohjelmat eri protokollille (SSH jne)"
 
-#: 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 "Työkalut, jotka helpottavat tietokoneesi asetusten muokkaamista"
 
-#: 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 "Komentorivityökalut"
 
-#: 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 "Editorit, komentotulkit, tiedostotyökalut, päätteet"
 
 #: 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 "Kehitysympäristö"
 
 #: 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++ kehityskirjastot, ohjelmat ja include-tiedostot"
 
 #: 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 "Dokumentaatio"
 
 #: 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 "Kirjoja ja ohjeita Linuxista sekä vapaan lähdekoodin ohjelmista"
 
 #: 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 (Linux Standardi Perusta)\n"
 " - Kolmannen osapuolen ohjelmistojen tuki"
 
-#: 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 "WWW-palvelin"
 
-#: 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 "Groupware"
 
-#: 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 "Kolab palvelin"
 
 #: 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 "Palomuuri / Reititin"
 
 #: 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 "Internetin yhdyskäytävä"
 
-#: 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 "Posti/Uutiset"
 
-#: 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 "Postfix sähköpostipalvelin, Inn uutispalvelin"
 
-#: 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 "Hakemisto-palvelin"
 
-#: 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-palvelin"
 
-#: 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 "Verkkoalueen nimipalvelin (DNS) ja verkon informaatio-palvelin"
 
-#: 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 "Tiedosto- ja Tulostuspalvelin"
 
-#: 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-palvelin, Samba-palvelin"
 
 #: 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 "Tietokanta"
 
-#: 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 tietokantapalvelin"
 
-#: 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 "Web/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 WWW-palvelin ja Pro-ftpd FTP-palvelin"
 
-#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
+#: share/meta-task/compssUsers.pl:114
 #, c-format
 msgid "Mail"
 msgstr "Sähköposti"
 
-#: 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 "Postfix sähköpostipalvelin"
 
-#: 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 tai MySQL tietokantapalvelin"
 
-#: 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 "Verkkotietokone (palvelin)"
 
-#: 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-, välitys- ja SSH-palvelin"
 
-#: 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 "Graafinen ympäristö"
 
-#: 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-työasema"
 
-#: 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 "
@@ -669,12 +630,12 @@ msgid ""
 msgstr ""
 "K-työpöytäympäristö. Graafinen perusympäristö ja sen mukana tulevat työkalut"
 
-#: 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-työasema"
 
-#: 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 "
@@ -682,7 +643,7 @@ msgid ""
 msgstr ""
 "Graafinen ympäristö käyttäjäystävällisellä sovelluksilla ja työkaluilla."
 
-#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
+#: share/meta-task/compssUsers.pl:145
 #, fuzzy, c-format
 msgid "LXDE Desktop"
 msgstr "KDE Työpöytä"
@@ -695,54 +656,52 @@ msgid ""
 msgstr ""
 "Graafinen ympäristö käyttäjäystävällisellä sovelluksilla ja työkaluilla."
 
-#: 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 "Muut graafiset käyttöympäristöt"
 
-#: 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 "Window Maker, Enlightenment, FVWM jne"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Työkalut"
 
 #: 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-palvelin"
 
-#: 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 Etäasetuspalvelin"
 
-#: 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 "Verkkotyökalut/Valvonta"
 
-#: 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 "Valvontatyökalut, prosessihallinta, 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 Velhoja"
 
-#: 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 "Velhoja palvelimen asettamiseksi"
@@ -843,18 +802,18 @@ msgstr "Työpöydän '%s' esikatselu."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Napsauta kuvia nähdäksesi suuremman esikatselun."
 
-#: 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 "Pakettiryhmien valinta"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Yksittäisten pakettien valinta"
 
 # mat
-#: 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 "Koko yhteensä: %d / %d Mt"
@@ -975,12 +934,12 @@ msgstr "Minimaalinen asennus"
 msgid "Software Management"
 msgstr "Ohjelmistohallinta"
 
-#: 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 "Valitse asennettavat paketit"
 
-#: 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 "Asennetaan"
@@ -1008,7 +967,7 @@ msgstr[0] "%d paketti"
 msgstr[1] "%d pakettia"
 
 # Asennuksen sivuvalikko
-#: 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 "Yhteenveto"
@@ -1018,7 +977,7 @@ msgstr "Yhteenveto"
 msgid "Configure"
 msgstr "Aseta"
 
-#: 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 "ei asetettu"
@@ -1028,7 +987,7 @@ msgstr "ei asetettu"
 msgid "Media Selection"
 msgstr "Lähteiden valinta"
 
-#: 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"
@@ -1037,7 +996,7 @@ msgstr ""
 "Seuraavar asennusmediat on löydetty.\n"
 "Jos haluat ohittaa joku niistä, voit poistaa niiden valinta nyt."
 
-#: 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 "
@@ -1050,7 +1009,7 @@ msgstr ""
 "Asennus jatkaa sen jälkeen kovalevyltä ja paketit ovat käytettävissä myös "
 "asennuksen jälkeen."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopioi koko CD"
@@ -1070,61 +1029,49 @@ msgstr "Valitse näppäimistösi asettelu"
 msgid "Here is the full list of available keyboards:"
 msgstr "Tässä on koko lista käytettävissä olevista näppäimistöistä:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Asenna/Päivitä"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Onko tämä asennus vai päivitys?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Asennus"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Päivitä %s"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr ""
-"Päivittäminen 32-bittisestä jakelusta 64-bittiseen jakeluun ei ole tuettu."
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr ""
-"Päivittäminen 64-bittisestä jakelusta 32-bittiseen jakeluun ei ole tuettu."
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Salausavain %s:lle"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Peruuta asennus, käynnistä järjestelmä uudelleen"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Uusi asennus"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Päivitä edellinen asennus (ei suositella)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1144,17 +1091,17 @@ msgstr ""
 "Varoitus: Varmuuskopioi kaikki omat tiedostosi ennen kuin valitset\n"
 "\"Uusi asennus\"."
 
-#: 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 "Asetetaan IDE-levyä"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1164,7 +1111,7 @@ msgstr ""
 "käynnistääksesi järjestelmän sinun pitää luoda käynnistyslohko-osio "
 "DiskDrake:ssa."
 
-#: 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 "
@@ -1175,7 +1122,7 @@ msgstr ""
 "käynnistääksesi järjestelmän sinun pitää luoda käynnistyslohko-osio "
 "DiskDrake:ssa."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1189,19 +1136,19 @@ msgstr ""
 "Jos sinulla ei ole levyä, valitse Peruuta välttääksesi asennukset tältä "
 "levyltä."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Etsitään saatavilla olevia paketteja..."
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
 "dMB > %dMB)"
 msgstr "Järjestelmässäsi ei ole riittävästi vapaata tilaa (%dMt > %dMt)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1210,52 +1157,52 @@ msgstr ""
 "Lataa tai tallenna pakettien valinta.\n"
 "Muoto on sama kuin auto_install-toiminnon luomilla tiedostoilla."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Verkkokuorma"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Tallenna"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Huono tiedosto"
 
-#: 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 "Työpöydän valinta"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Voit valita asennettavan työpöytäprofiilin."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valittu koko on suurempi kuin käytettävissä oleva levytila"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Asennuksen tyyppi"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1264,82 +1211,82 @@ msgstr ""
 "Et ole valinnut yhtäkään pakettiryhmää.\n"
 "Valitse haluamasi minimaalinen asennus"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "X-palvelimella"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Perusdokumentaation kanssa (suositeltu!)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Vähimmäisasennus (erityisesti ei urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Valmistellaan asennusta"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Asennetaan pakettia: %s"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Tapahtui virhe järjestettäessä paketteja:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Jatka kuitenkin?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Ohita tämä paketti"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Ohita kaikki paketit medialta \"%s\""
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Siirry takaisin medioiden ja pakettien valintaan"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Paketin %s asentamisessa tapahtui virhe."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Asennuksen jälkeiset toiminnot"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Varmista että Päivitetyt Moduulit media on asemassa %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Päivitykset"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1359,28 +1306,28 @@ msgstr ""
 "\n"
 "Haluatko hakea ja asentaa päivitykset?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s kohteessa %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 "Laitteisto"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Äänikortti"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Onko sinulla ISA-väylään liitettävä äänikortti?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1389,68 +1336,68 @@ msgstr ""
 "Suorita \"alsaconf\" tai \"sndconfig\" asennuksen jälkeen asettaaksesi "
 "äänikorttisi."
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Yhtäkään äänikorttia ei löydetty. Kokeile \"harddrake\" asennuksen jälkeen"
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafinen käyttöliittymä"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Verkko & Internet"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Välityspalvelimet"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "asetettu"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Turvataso"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Palomuuri"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "aktivoitu"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "ei käytössä"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Et ole asettanut X-palvelinta. Oletko varma että haluat tehdä tämän?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Valmistelen käyttöjärjestelmän lataajaa..."
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr ""
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1463,7 +1410,7 @@ msgstr ""
 "käyttää BootX:ää koneesi käynnistämiseen. Ytimen paremetrit root "
 "tiedostojärjestelmälle 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 "
@@ -1473,17 +1420,17 @@ msgstr ""
 "ylläpitäjälle."
 
 # mat
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Aseta tyhjä levyke levykeasemaan %s"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Valmistellaan automaattiasennuslevykettä..."
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1494,7 +1441,7 @@ msgstr ""
 "\n"
 "Haluatko todella lopettaa?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Onnittelut"
@@ -1641,6 +1588,32 @@ msgid ""
 "Exit"
 msgstr "Poistu"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Työpöytäsi USB-tikulla"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "100%% vapaan lähdekoodin Mandriva Linux -jakelu"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Tutustu Linuxiin helposti Mandriva Onella"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Täysi Mandriva Linux -jakelu käyttäjätuella"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: jakeluja jokaisen tarpeisiin"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Haetaan tiedosto %s ..."
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr ""
+#~ "Päivittäminen 32-bittisestä jakelusta 64-bittiseen jakeluun ei ole tuettu."
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr ""
+#~ "Päivittäminen 64-bittisestä jakelusta 32-bittiseen jakeluun ei ole tuettu."
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"