Updated POT file

1 files changed, 201 insertions, 228 deletions

diff --git a/perl-install/install/share/po/nn.po b/perl-install/install/share/po/nn.po
index ec5256d7a..5d00d575c 100644
--- a/perl-install/install/share/po/nn.po
+++ b/perl-install/install/share/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\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-04-05 23:37+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -17,31 +17,6 @@ msgstr ""
 "X-Generator: Lokalize 0.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 "Skrivebordet på ein minnepinne"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Mandriva Linux-distribusjonen med 100 %% open kjeldekode"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Utforsk Linux med Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Eit fullt Mandriva Linux-skrivebord – med brukarstøtte"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: Distribusjonar for alle behov"
-
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -81,23 +56,23 @@ msgstr "Nettverk (FTP)"
 msgid "Network (NFS)"
 msgstr "Nettverk (NFS)"
 
-#: any.pm:163
+#: any.pm:165
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Adresse til spegelen?"
 
-#: any.pm:169
+#: any.pm:171
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "Adresser må starta med «ftp://» eller «http://»."
 
-#: any.pm:180
+#: any.pm:182
 #, c-format
 msgid ""
 "Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr "Kontaktar Mandriva Linux-nettstaden for oversikt over speglar …"
 
-#: any.pm:185
+#: any.pm:187
 #, c-format
 msgid ""
 "Failed contacting Mandriva Linux web site to get the list of available "
@@ -106,47 +81,47 @@ msgstr ""
 "Klarte ikkje få kontakt med Mandriva Linux-nettstaden for å henta oversikt "
 "over tilgjengelege speglar."
 
-#: any.pm:195
+#: any.pm:197
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Vel spegelen du vil installera pakkar frå"
 
-#: any.pm:225
+#: any.pm:227
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-oppsett"
 
-#: any.pm:226
+#: any.pm:228
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Skriv inn vertsnamn og mappe til NFD-media"
 
-#: any.pm:230
+#: any.pm:232
 #, c-format
 msgid "Hostname missing"
 msgstr "Manglar vertsnam"
 
-#: any.pm:231
+#: any.pm:233
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Mappa må begynna med «/»"
 
-#: any.pm:235
+#: any.pm:237
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Vertsnamn til NFS-montering:"
 
-#: any.pm:236
+#: any.pm:238
 #, c-format
 msgid "Directory"
 msgstr "Katalog"
 
-#: any.pm:258
+#: any.pm:260
 #, c-format
 msgid "Supplementary"
 msgstr "Tillegg"
 
-#: any.pm:293
+#: any.pm:295
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -154,22 +129,22 @@ msgid ""
 msgstr ""
 "Finn ikkje pakkelistfila på denne spegelen. Sjå til at adressa er rett."
 
-#: any.pm:328
+#: any.pm:334
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ser på allereie installerte pakkar …"
 
-#: any.pm:362
+#: any.pm:368
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Ser etter pakkar å oppgradera …"
 
-#: any.pm:381
+#: any.pm:387
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjernar pakkar for oppgradering …"
 
-#: 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"
@@ -188,18 +163,18 @@ msgstr ""
 "må du starta maskina på nytt, og så oppgradera med Mandriva-"
 "oppdateringsprogrammet som du finn i systemtrauet."
 
-#: any.pm:407 steps_interactive.pm:1106
+#: any.pm:413 steps_interactive.pm:1103
 #, c-format
 msgid "Reboot"
 msgstr "Start på nytt"
 
-#: any.pm:407
+#: any.pm:413
 #, c-format
 msgid "Proceed"
 msgstr "Hald fram"
 
 #. -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"
@@ -212,72 +187,72 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil fjerna pakkane?\n"
 
-#: any.pm:815
+#: any.pm:821
 #, c-format
 msgid "Error reading file %s"
 msgstr "Klarte ikkje lesa fila «%s»"
 
-#: any.pm:1022
+#: any.pm:1028
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "Desse diskane fekk nye namn:"
 
-#: any.pm:1024
+#: any.pm:1030
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "«%s» (tidlegare namn: «%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 "Nettverk"
 
-#: any.pm:1104
+#: any.pm:1110
 #, c-format
 msgid "Please choose a media"
 msgstr "Vel medium"
 
-#: any.pm:1120
+#: any.pm:1126
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Fila finst allereie. Vil du skriva over ho?"
 
-#: any.pm:1124
+#: any.pm:1130
 #, c-format
 msgid "Permission denied"
 msgstr "Nekta løyve"
 
-#: any.pm:1172
+#: any.pm:1178
 #, c-format
 msgid "Bad NFS name"
 msgstr "Ugyldig NFS-namn"
 
-#: any.pm:1193
+#: any.pm:1199
 #, c-format
 msgid "Bad media %s"
 msgstr "Ugyldig medium: %s"
 
-#: any.pm:1236
+#: any.pm:1242
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Kan ikkje ta skjermbilete før partisjonering"
 
-#: any.pm:1244
+#: any.pm:1250
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilete vert tilgjengelege i «%s» etter installeringa er ferdig"
@@ -288,11 +263,15 @@ msgid "Installation"
 msgstr "Installering"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
-#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Oppsett"
 
+#: http.pm:53
+#, c-format
+msgid "retrieval of [%s] failed"
+msgstr ""
+
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -317,22 +296,22 @@ msgstr "Koplar til nettverket"
 msgid "Bringing down the network"
 msgstr "Koplar frå nettverket"
 
-#: media.pm:402
+#: media.pm:399
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Hentar fil. Vent litt …"
 
-#: media.pm:734
+#: media.pm:718
 #, c-format
-msgid "Downloading file %s..."
-msgstr "Lastar ned «%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 "Kopierer nokre pakkar til harddisken for seinare bruk"
 
-#: media.pm:875
+#: media.pm:811
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopierer filer"
@@ -376,27 +355,27 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "Det oppstod ein feil:"
 
-#: pkgs.pm:776
+#: pkgs.pm:780
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "feil med %d installasjonstransaksjonar"
 
-#: pkgs.pm:777
+#: pkgs.pm:781
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Feil ved installering av pakkar:"
 
-#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
+#: share/meta-task/compssUsers.pl:13
 #, c-format
 msgid "Workstation"
 msgstr "Arbeidstasjon"
 
-#: 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 "Kontormaskin"
 
-#: 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 "
@@ -405,7 +384,7 @@ msgstr ""
 "Kontorprogramvare: Teksthandsamarar (OpenOffice.org Writer, Kword), rekneark "
 "(OpenOffice.org Calc, Kspread), PDF-viseprogram, med meir"
 
-#: 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, "
@@ -414,32 +393,32 @@ msgstr ""
 "Kontorprogramvare: Teksthandsamarar (KWord, AbiWord), rekneark (KSpread, "
 "gnumeric), PDF-viseprogram, med meir"
 
-#: 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 "Spelmaskin"
 
-#: 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 "Moroprogram: Arkadespel, brettspel, strategispel, med meir"
 
-#: 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 "Multimediemaskin"
 
-#: 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 "Program for vising og redigering av film"
 
-#: 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 "Internett-maskin"
 
-#: 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 "
@@ -448,223 +427,205 @@ msgstr ""
 "Program for lesing og sending av e-post, deltaking i temagrupper og surfing "
 "på Internett"
 
-#: 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 "Nettverksmaskin (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 "Klientprogramvare for fleire protokollar, som ssh"
 
-#: 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 "Verktøy for enkelt oppsett av datamaskina"
 
-#: 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 "Konsollverktøy"
 
-#: 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 "Skriveprogram, skal, filverktøy og terminalprogram."
 
 #: 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 "Utvikling"
 
 #: 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 og C++-utviklingsbibliotek, program og inkluderingsfiler"
 
 #: 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 "Hjelpetekst"
 
 #: 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 "Bøker og hjelpeoppskrifter for Linux og fri programvare"
 
 #: 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 – støtte for tredjepartsprogram"
 
-#: 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 "Vevtenar"
 
-#: 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 "Gruppevare"
 
-#: 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-tenar"
 
 #: 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 "Brannmur/rutar"
 
 #: 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 "Internett-portnar"
 
-#: 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 og temagrupper"
 
-#: 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 e-posttenar og Inn temagruppetenar"
 
-#: 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 "Katalogtenar"
 
-#: 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-tenar"
 
-#: 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 "Domenenamn og nettverksinformasjonstenar."
 
-#: 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 "Fil- og skrivardeling-tenar"
 
-#: 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-tenar, Samba-tenar"
 
 #: 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 "Database"
 
-#: 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- og MySQL-databasetenar"
 
-#: 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 "Vev/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, 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 "Postfix-e-posttenar"
 
-#: 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- eller MySQL-databasetenar"
 
-#: 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 "Nettverkstenar"
 
-#: 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-tenar, SMB-tenar, mellomtenar, ssh-tenar"
 
-#: 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 "Grafisk miljø"
 
-#: 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-arbeidsstasjon"
 
-#: 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 "Skrivebordsmiljøet KDE, med ei samling tilhøyrande verktøy"
 
-#: 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-arbeidsstasjon"
 
-#: 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 "
@@ -672,7 +633,7 @@ msgid ""
 msgstr ""
 "Eit grafisk skrivebordsmiljø med brukarvenlege program og skrivebordsverktøy"
 
-#: 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-skrivebord"
@@ -686,54 +647,52 @@ msgstr ""
 "Eit kjapt og lite ressurskrevande grafisk skrivebordsmiljø med brukarvenlege "
 "program og skrivebordsverktøy"
 
-#: 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 "Andre grafiske skrivebord"
 
-#: 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, med fleire"
 
-#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
+#: share/meta-task/compssUsers.pl:174
 #, c-format
 msgid "Utilities"
 msgstr "Verktøy"
 
 #: 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-tenar"
 
-#: 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-fjernoppsettenar"
 
-#: 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 "Nettverksverktøy og -overvaking"
 
-#: 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 "Overvakingsverktøy, prosesshandsaming, tcpdump, nmap, med meir"
 
-#: 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-vegvisarar"
 
-#: 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 "Vegvisarar for tenaroppsett"
@@ -831,17 +790,17 @@ msgstr "Slik ser skrivebordsmiljøet %s ut."
 msgid "Click on images in order to see a bigger preview"
 msgstr "Trykk på bileta for å forstørra dei"
 
-#: 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 "Pakkegruppeval"
 
-#: steps_gtk.pm:336 steps_interactive.pm:623
+#: steps_gtk.pm:336 steps_interactive.pm:619
 #, c-format
 msgid "Individual package selection"
 msgstr "Direkte pakkeval"
 
-#: 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 "Totalstorleik: %d / %d MiB"
@@ -960,12 +919,12 @@ msgstr "Minimal installering"
 msgid "Software Management"
 msgstr "Programvarehandsaming"
 
-#: 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 "Vel pakkane du ønskjer å installera"
 
-#: 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 "Installerer"
@@ -992,7 +951,7 @@ msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakkar"
 
-#: 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 "Samandrag"
@@ -1002,7 +961,7 @@ msgstr "Samandrag"
 msgid "Configure"
 msgstr "Set opp"
 
-#: 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 "ikkje sett opp"
@@ -1012,7 +971,7 @@ msgstr "ikkje sett opp"
 msgid "Media Selection"
 msgstr "Medieval"
 
-#: 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"
@@ -1021,7 +980,7 @@ msgstr ""
 "Fann desse installasjonsmedia.\n"
 "Om du ikkje ønskjer å bruka alle, kan du velja vekk dei du ikkje treng no."
 
-#: 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 "
@@ -1034,7 +993,7 @@ msgstr ""
 "Installasjonen vil då helda fram frå harddisken, og pakkane vil vera lett "
 "tilgjengeleg òg etter at systemet er installert og sett opp."
 
-#: steps_gtk.pm:748 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:337
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopier CD-ane"
@@ -1054,59 +1013,49 @@ msgstr "Vel tastaturoppsett"
 msgid "Here is the full list of available keyboards:"
 msgstr "Her er heile lista over tastaturoppsett:"
 
-#: steps_interactive.pm:139
+#: steps_interactive.pm:143
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installer/oppgrader"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:147
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Vil du installera eller oppgradera?"
 
-#: steps_interactive.pm:145
+#: steps_interactive.pm:149
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installer"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:151
 #, c-format
 msgid "Upgrade %s"
 msgstr "Oppgrader «%s»"
 
-#: steps_interactive.pm:151
-#, c-format
-msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
-msgstr "Oppgradering frå 32 bits til 64 bits er ikkje støtta"
-
-#: steps_interactive.pm:155
-#, c-format
-msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
-msgstr "Oppgradering frå 64 bits til 32 bits er ikkje støtta"
-
-#: steps_interactive.pm:174
+#: steps_interactive.pm:169
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøkkel for «%s»"
 
-#: steps_interactive.pm:207
+#: steps_interactive.pm:202
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Avbryt installering og start systemet på nytt"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:203
 #, c-format
 msgid "New Installation"
 msgstr "Nyinstallering"
 
-#: steps_interactive.pm:209
+#: steps_interactive.pm:204
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Oppgrader førre installasjon (ikkje tilrådd)"
 
-#: steps_interactive.pm:213
+#: steps_interactive.pm:208
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1125,17 +1074,17 @@ msgstr ""
 "Åtvaring: Du bør ta reservekopi av alle personlege data før du vel "
 "«Nyinstallering»."
 
-#: 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 "Set opp IDE"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:287
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1144,7 +1093,7 @@ msgstr ""
 "Ikkje nok ledig plass for oppstartslastar på 1 MiB. Installasjonen held "
 "fram, men du må sjølv laga ein oppstartslastarpartisjon i DiskDrake."
 
-#: 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 "
@@ -1155,7 +1104,7 @@ msgstr ""
 "viss du vil starta systemet, må du først laga bootstrap-partisjonen i "
 "DiskDrake."
 
-#: steps_interactive.pm:372
+#: steps_interactive.pm:368
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1168,12 +1117,12 @@ msgstr ""
 "Set inn plata merkt «%s» og trykk «OK».\n"
 "Trykk eventuelt «Avbryt» om du ikkje har denne plata."
 
-#: steps_interactive.pm:389
+#: steps_interactive.pm:385
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Ser etter tilgjengelege pakkar …"
 
-#: steps_interactive.pm:397
+#: steps_interactive.pm:393
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1182,7 +1131,7 @@ msgstr ""
 "Maskina di har ikkje nok ledig plass for installering eller oppgradering (%d "
 "MB > %d MB)"
 
-#: steps_interactive.pm:444
+#: steps_interactive.pm:440
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1191,52 +1140,52 @@ msgstr ""
 "Vel å lagra eller henta pakkeval.\n"
 "Formatet er likt det laga av «auto_install»."
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Load"
 msgstr "Last"
 
-#: steps_interactive.pm:446
+#: steps_interactive.pm:442
 #, c-format
 msgid "Save"
 msgstr "Lagra"
 
-#: steps_interactive.pm:454
+#: steps_interactive.pm:450
 #, c-format
 msgid "Bad file"
 msgstr "Ugyldig fil"
 
-#: 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 "Skrivebordsval"
 
-#: steps_interactive.pm:475
+#: steps_interactive.pm:471
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr "Du kan velja skrivebordsmiljø."
 
-#: steps_interactive.pm:561
+#: steps_interactive.pm:557
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valt storleik er større enn tilgjengeleg plass"
 
-#: steps_interactive.pm:576
+#: steps_interactive.pm:572
 #, c-format
 msgid "Type of install"
 msgstr "Installasjonstype"
 
-#: steps_interactive.pm:577
+#: steps_interactive.pm:573
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1245,82 +1194,82 @@ msgstr ""
 "Du har ikkje valt noko pakkegruppe.\n"
 "Vel kva type minimal installasjon du vil ha:"
 
-#: steps_interactive.pm:582
+#: steps_interactive.pm:578
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:583
+#: steps_interactive.pm:579
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggjande hjelpetekstar (tilrådd)"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:580
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Heilt minimal (òg utan urpmi)"
 
-#: steps_interactive.pm:638
+#: steps_interactive.pm:634
 #, c-format
 msgid "Preparing installation"
 msgstr "Førebur installasjon"
 
-#: steps_interactive.pm:646
+#: steps_interactive.pm:642
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakken «%s»"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Det oppstod ein feil ved sortering av pakkar:"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:666
 #, c-format
 msgid "Go on anyway?"
 msgstr "Vil du helda fram likevel?"
 
-#: steps_interactive.pm:674
+#: steps_interactive.pm:670
 #, c-format
 msgid "Retry"
 msgstr "Prøv på nytt"
 
-#: steps_interactive.pm:675
+#: steps_interactive.pm:671
 #, c-format
 msgid "Skip this package"
 msgstr "Hopp over denne pakken"
 
-#: steps_interactive.pm:676
+#: steps_interactive.pm:672
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hopp over alle pakkar frå mediet «%s»"
 
-#: steps_interactive.pm:677
+#: steps_interactive.pm:673
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Gå tilbake til medie- og pakkevalskjermen"
 
-#: steps_interactive.pm:680
+#: steps_interactive.pm:676
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Det oppstod ein feil ved installering av pakken «%s»."
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:695
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: steps_interactive.pm:706
+#: steps_interactive.pm:702
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Sjå til at oppdateringsmediet er i stasjon %s"
 
-#: steps_interactive.pm:734 steps_list.pm:47
+#: steps_interactive.pm:730 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringar"
 
-#: steps_interactive.pm:735
+#: steps_interactive.pm:731
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1343,28 +1292,28 @@ msgstr ""
 "\n"
 "Ønskjer du å installera oppdateringane?"
 
-#: steps_interactive.pm:842
+#: steps_interactive.pm:839
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %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 "Maskinvare"
 
-#: steps_interactive.pm:896 steps_interactive.pm:913
+#: steps_interactive.pm:893 steps_interactive.pm:910
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:916
+#: steps_interactive.pm:913
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du eit ISA-lydkort?"
 
-#: steps_interactive.pm:918
+#: steps_interactive.pm:915
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1372,69 +1321,69 @@ msgid ""
 msgstr ""
 "Køyr «sndconfig» etter installasjonen er ferdig for å setja opp lydkortet."
 
-#: steps_interactive.pm:920
+#: steps_interactive.pm:917
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Fann ingen lydkort. Køyr «harddrake» etter installasjonen er ferdig."
 
-#: steps_interactive.pm:928
+#: steps_interactive.pm:925
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:934 steps_interactive.pm:945
+#: steps_interactive.pm:931 steps_interactive.pm:942
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk og Internett"
 
-#: steps_interactive.pm:946
+#: steps_interactive.pm:943
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtenarar"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:944
 #, c-format
 msgid "configured"
 msgstr "oppsett"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:954
 #, c-format
 msgid "Security Level"
 msgstr "Tryggleiksnivå"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:973
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "activated"
 msgstr "påslått"
 
-#: steps_interactive.pm:980
+#: steps_interactive.pm:977
 #, c-format
 msgid "disabled"
 msgstr "avslått"
 
-#: steps_interactive.pm:994
+#: steps_interactive.pm:991
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Du har ikkje sett opp det grafiske grensesnittet. Er du sikker på at du "
 "ikkje vil ha det?"
 
-#: steps_interactive.pm:1022
+#: steps_interactive.pm:1019
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Førebur oppstartslastar …"
 
-#: steps_interactive.pm:1023
+#: steps_interactive.pm:1020
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Ver tålmodig. Dette kan ta ei stund …"
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1031
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1447,7 +1396,7 @@ msgstr ""
 "annan måte å starta maskina di på. Kjerneargumentet for rotfilsystemet er: "
 "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 "
@@ -1456,17 +1405,17 @@ msgstr ""
 "Med dette tryggleiksnivået er det berre administratoren som får tilgang til "
 "filer på Windows-partisjonen."
 
-#: steps_interactive.pm:1080
+#: steps_interactive.pm:1077
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Set inn ein tom diskett i stasjon «%s»"
 
-#: steps_interactive.pm:1082
+#: steps_interactive.pm:1079
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Lagar diskett for automatisk installasjon …"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1090
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1477,7 +1426,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil avslutta?"
 
-#: steps_interactive.pm:1103
+#: steps_interactive.pm:1100
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
@@ -1621,6 +1570,30 @@ msgid ""
 "Exit"
 msgstr "Avslutt"
 
+#~ msgid "Your desktop on a USB key"
+#~ msgstr "Skrivebordet på ein minnepinne"
+
+#~ msgid "The 100%% open source Mandriva Linux distribution"
+#~ msgstr "Mandriva Linux-distribusjonen med 100 %% open kjeldekode"
+
+#~ msgid "Explore Linux easily with Mandriva One"
+#~ msgstr "Utforsk Linux med Mandriva One"
+
+#~ msgid "A full Mandriva Linux desktop, with support"
+#~ msgstr "Eit fullt Mandriva Linux-skrivebord – med brukarstøtte"
+
+#~ msgid "Mandriva: distributions for everybody's needs"
+#~ msgstr "Mandriva: Distribusjonar for alle behov"
+
+#~ msgid "Downloading file %s..."
+#~ msgstr "Lastar ned «%s» …"
+
+#~ msgid "Upgrade from a 32bit to a 64bit distribution is not supported"
+#~ msgstr "Oppgradering frå 32 bits til 64 bits er ikkje støtta"
+
+#~ msgid "Upgrade from a 64bit to a 32bit distribution is not supported"
+#~ msgstr "Oppgradering frå 64 bits til 32 bits er ikkje støtta"
+
 #~ msgid ""
 #~ "You have selected the following server(s): %s\n"
 #~ "\n"