sync with code

1 files changed, 281 insertions, 225 deletions

diff --git a/perl-install/install/share/po/nb.po b/perl-install/install/share/po/nb.po
index a33ca0419..f27f71205 100644
--- a/perl-install/install/share/po/nb.po
+++ b/perl-install/install/share/po/nb.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-13 16:29+0100\n"
+"POT-Creation-Date: 2009-03-30 15:42+0200\n"
 "PO-Revision-Date: 2009-03-24 17:33+0100\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
@@ -29,6 +29,31 @@ 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 "Ditt skrivebord på en USB-penn"
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr "Den hundre prosent åpen kildekode-distribusjonen, Mandriva Linux"
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr "Utforsk Linux lett med Mandriva One"
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr "Et komplett Mandriva Linux-skrivebord"
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr "Mandriva: distribusjonen for alles behov"
+
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -80,7 +105,8 @@ msgstr "URL må starte med ftp:// eller http://"
 
 #: any.pm:180
 #, c-format
-msgid "Contacting Mandriva Linux web site to get the list of available mirrors..."
+msgid ""
+"Contacting Mandriva Linux web site to get the list of available mirrors..."
 msgstr ""
 "Kontakter nettstedet til Mandriva Linux for å få listen over tilgjengelige "
 "speil..."
@@ -148,17 +174,17 @@ msgstr ""
 msgid "Looking at packages already installed..."
 msgstr "Ser på pakker som allerede er installert..."
 
-#: any.pm:335
-#, c-format
-msgid "Removing packages prior to upgrade..."
-msgstr "Fjerner pakker før oppgradering..."
-
-#: any.pm:377
+#: any.pm:362
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Finner pakker som skal oppgraderes..."
 
-#: any.pm:389
+#: any.pm:381
+#, c-format
+msgid "Removing packages prior to upgrade..."
+msgstr "Fjerner pakker før oppgradering..."
+
+#: any.pm:402
 #, c-format
 msgid ""
 "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
@@ -168,20 +194,27 @@ msgid ""
 "settings. \n"
 "To upgrade with KDE 3.5 and your personal settings preserved, \n"
 "please reboot your system and upgrade using the Mandriva update applet."
-msgstr "Du har bestemt deg for å oppgradere systemet ditt til %s. KDE 3.5 ble oppdaget <br> på systemet ditt. Dette installasjonsprogrammet kan ikke ta vare på KDE 3.5 i en oppgradering. Hvis du velger å fortsette vil KDE 3 byttes ut med KDE 4 og du vil miste alle dine personlige KDE-innstillinger . <br> Vær vennlig å starte systemet på nytt for å oppgradere med Mandrivas panelverktøy for oppgradering hvis du vil beholde KDE 3.5 og dine personlige innstillinger."
+msgstr ""
+"Du har bestemt deg for å oppgradere systemet ditt til %s. KDE 3.5 ble "
+"oppdaget <br> på systemet ditt. Dette installasjonsprogrammet kan ikke ta "
+"vare på KDE 3.5 i en oppgradering. Hvis du velger å fortsette vil KDE 3 "
+"byttes ut med KDE 4 og du vil miste alle dine personlige KDE-innstillinger . "
+"<br> Vær vennlig å starte systemet på nytt for å oppgradere med Mandrivas "
+"panelverktøy for oppgradering hvis du vil beholde KDE 3.5 og dine personlige "
+"innstillinger."
 
-#: any.pm:394 steps_interactive.pm:1125
+#: any.pm:407 steps_interactive.pm:1106
 #, c-format
 msgid "Reboot"
 msgstr "Restart"
 
-#: any.pm:394
+#: any.pm:407
 #, c-format
 msgid "Proceed"
 msgstr "Fortsett"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:584
+#: any.pm:596
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -195,72 +228,72 @@ msgstr ""
 " \n"
 "Ønsker du å fjerne disse pakkene?\n"
 
-#: any.pm:803
+#: any.pm:815
 #, c-format
 msgid "Error reading file %s"
 msgstr "Feil ved lesing av fil %s"
 
-#: any.pm:1010
+#: any.pm:1022
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De(n) følgende disken(e) fikk nytt navn:"
 
-#: any.pm:1012
+#: any.pm:1024
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (tidligere kalt %s)"
 
-#: any.pm:1069
+#: any.pm:1081
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1069
+#: any.pm:1081
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1069
+#: any.pm:1081
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1088 steps_interactive.pm:954
+#: any.pm:1100 steps_interactive.pm:935
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
 
-#: any.pm:1092
+#: any.pm:1104
 #, c-format
 msgid "Please choose a media"
 msgstr "Velg et medie"
 
-#: any.pm:1108
+#: any.pm:1120
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Filen eksisterer allerede. Overskriv?"
 
-#: any.pm:1112
+#: any.pm:1124
 #, c-format
 msgid "Permission denied"
 msgstr "Adgang nektet"
 
-#: any.pm:1160
+#: any.pm:1172
 #, c-format
 msgid "Bad NFS name"
 msgstr "Ugyldig NFS-navn"
 
-#: any.pm:1181
+#: any.pm:1193
 #, c-format
 msgid "Bad media %s"
 msgstr "Feil på media %s"
 
-#: any.pm:1224
+#: any.pm:1236
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Jeg kan ikke ta skjembilder før partisjonering."
 
-#: any.pm:1232
+#: any.pm:1244
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s"
@@ -271,6 +304,7 @@ msgid "Installation"
 msgstr "Installasjon"
 
 #: gtk.pm:134 share/meta-task/compssUsers.pl:44
+#: share/meta-task/compssUsers.pl.orig:44
 #, c-format
 msgid "Configuration"
 msgstr "Oppsett"
@@ -299,52 +333,52 @@ msgstr "Henter opp nettverket"
 msgid "Bringing down the network"
 msgstr "Tar ned nettverket"
 
-#: media.pm:422
+#: media.pm:402
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Vennligst vent, henter fil"
 
-#: media.pm:705 media.pm:716
+#: media.pm:734
 #, c-format
 msgid "Downloading file %s..."
 msgstr "Laster ned fil %s..."
 
-#: media.pm:808
+#: media.pm:822
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiér noen pakker på disken for framtidig bruk"
 
-#: media.pm:861
+#: media.pm:875
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering pågår"
 
-#: pkgs.pm:29
+#: pkgs.pm:32
 #, c-format
 msgid "must have"
 msgstr "må ha"
 
-#: pkgs.pm:30
+#: pkgs.pm:33
 #, c-format
 msgid "important"
 msgstr "viktig"
 
-#: pkgs.pm:31
+#: pkgs.pm:34
 #, c-format
 msgid "very nice"
 msgstr "veldig bra"
 
-#: pkgs.pm:32
+#: pkgs.pm:35
 #, c-format
 msgid "nice"
 msgstr "bra"
 
-#: pkgs.pm:33
+#: pkgs.pm:36
 #, c-format
 msgid "maybe"
 msgstr "kanskje"
 
-#: pkgs.pm:253
+#: pkgs.pm:225
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -353,17 +387,32 @@ msgstr ""
 "Noen pakker krevet av %s kan ikke installeres\n"
 "%s"
 
-#: share/meta-task/compssUsers.pl:13
+#: pkgs.pm:313
+#, fuzzy, c-format
+msgid "An error occurred:"
+msgstr "En feil oppstod"
+
+#: pkgs.pm:776
+#, c-format
+msgid "%d installation transactions failed"
+msgstr ""
+
+#: pkgs.pm:777
+#, fuzzy, c-format
+msgid "Installation of packages failed:"
+msgstr "Installerer pakke %s"
+
+#: share/meta-task/compssUsers.pl:13 share/meta-task/compssUsers.pl.orig:13
 #, c-format
 msgid "Workstation"
 msgstr "Arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:15
+#: share/meta-task/compssUsers.pl:15 share/meta-task/compssUsers.pl.orig:15
 #, c-format
 msgid "Office Workstation"
 msgstr "Kontorarbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:17
+#: share/meta-task/compssUsers.pl:17 share/meta-task/compssUsers.pl.orig:17
 #, c-format
 msgid ""
 "Office programs: wordprocessors (OpenOffice.org Writer, Kword), spreadsheets "
@@ -372,7 +421,7 @@ msgstr ""
 "Kontorstøtteprogrammer: tekstbehandlere (OpenOffice.org Writer, Kword), "
 "regneark (OpenOffice.org Calc, Kspread), PDF-framvisere, etc"
 
-#: share/meta-task/compssUsers.pl:18
+#: share/meta-task/compssUsers.pl:18 share/meta-task/compssUsers.pl.orig:18
 #, c-format
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
@@ -381,32 +430,32 @@ msgstr ""
 "Kontorstøtteprogrammer: tekstbehandlere (kword, abiword), regneark (kspread, "
 "gnumeric), pdf-framvisere etc"
 
-#: share/meta-task/compssUsers.pl:23
+#: share/meta-task/compssUsers.pl:23 share/meta-task/compssUsers.pl.orig:23
 #, c-format
 msgid "Game station"
 msgstr "Spillstasjon"
 
-#: share/meta-task/compssUsers.pl:24
+#: share/meta-task/compssUsers.pl:24 share/meta-task/compssUsers.pl.orig:24
 #, c-format
 msgid "Amusement programs: arcade, boards, strategy, etc"
 msgstr "Underholdningsprogrammer: arkade, brettspill, strategi, etc"
 
-#: share/meta-task/compssUsers.pl:27
+#: share/meta-task/compssUsers.pl:27 share/meta-task/compssUsers.pl.orig:27
 #, c-format
 msgid "Multimedia station"
 msgstr "Multimediastasjon"
 
-#: share/meta-task/compssUsers.pl:28
+#: share/meta-task/compssUsers.pl:28 share/meta-task/compssUsers.pl.orig:28
 #, c-format
 msgid "Sound and video playing/editing programs"
 msgstr "Lyd- og videoavspilling/redigeringsprogrammer"
 
-#: share/meta-task/compssUsers.pl:33
+#: share/meta-task/compssUsers.pl:33 share/meta-task/compssUsers.pl.orig:33
 #, c-format
 msgid "Internet station"
 msgstr "Internettstasjon"
 
-#: share/meta-task/compssUsers.pl:34
+#: share/meta-task/compssUsers.pl:34 share/meta-task/compssUsers.pl.orig:34
 #, c-format
 msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
@@ -415,193 +464,211 @@ msgstr ""
 "Sett med verktøy for å lese og sende e-post og njus (mutt, tin..) og til å "
 "surfe på nettet"
 
-#: share/meta-task/compssUsers.pl:39
+#: share/meta-task/compssUsers.pl:39 share/meta-task/compssUsers.pl.orig:39
 #, c-format
 msgid "Network Computer (client)"
 msgstr "Nettverksmaskin (klient)"
 
-#: share/meta-task/compssUsers.pl:40
+#: share/meta-task/compssUsers.pl:40 share/meta-task/compssUsers.pl.orig:40
 #, c-format
 msgid "Clients for different protocols including ssh"
 msgstr "Klienter for forskjellige protokoller inkludert ssh"
 
-#: share/meta-task/compssUsers.pl:45
+#: share/meta-task/compssUsers.pl:45 share/meta-task/compssUsers.pl.orig:45
 #, c-format
 msgid "Tools to ease the configuration of your computer"
 msgstr "Verktøy for å forenkle oppsettet av maskinen din"
 
-#: share/meta-task/compssUsers.pl:49
+#: share/meta-task/compssUsers.pl:49 share/meta-task/compssUsers.pl.orig:49
 #, c-format
 msgid "Console Tools"
 msgstr "Konsollverktøy"
 
-#: share/meta-task/compssUsers.pl:50
+#: share/meta-task/compssUsers.pl:50 share/meta-task/compssUsers.pl.orig:50
 #, c-format
 msgid "Editors, shells, file tools, terminals"
 msgstr "Tekstprogrammer, skall, filverktøy, terminaler"
 
-#: share/meta-task/compssUsers.pl:54 share/meta-task/compssUsers.pl:156
-#: share/meta-task/compssUsers.pl:158
+#: 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
 #, c-format
 msgid "Development"
 msgstr "Utvikling"
 
-#: share/meta-task/compssUsers.pl:55 share/meta-task/compssUsers.pl:159
+#: 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, -programmer og include-filer"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:163
+#: 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 "Dokumentasjon"
 
-#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:164
+#: 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 Howto's om Linux og fri programvare"
 
-#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:167
+#: 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:168
+#: 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 tredjeparts programvare"
 
-#: share/meta-task/compssUsers.pl:73
+#: share/meta-task/compssUsers.pl:73 share/meta-task/compssUsers.pl.orig:73
 #, c-format
 msgid "Web Server"
 msgstr "Webtjener"
 
-#: share/meta-task/compssUsers.pl:74
+#: share/meta-task/compssUsers.pl:74 share/meta-task/compssUsers.pl.orig:74
 #, c-format
 msgid "Apache"
 msgstr "Apache"
 
-#: share/meta-task/compssUsers.pl:77
+#: share/meta-task/compssUsers.pl:77 share/meta-task/compssUsers.pl.orig:77
 #, c-format
 msgid "Groupware"
 msgstr "Gruppevare"
 
-#: share/meta-task/compssUsers.pl:78
+#: share/meta-task/compssUsers.pl:78 share/meta-task/compssUsers.pl.orig:78
 #, c-format
 msgid "Kolab Server"
 msgstr "Kolab-tjener"
 
 #: 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/ruter"
 
 #: 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-gateway"
 
-#: share/meta-task/compssUsers.pl:85
+#: share/meta-task/compssUsers.pl:85 share/meta-task/compssUsers.pl.orig:85
 #, c-format
 msgid "Mail/News"
 msgstr "E-post/Njus"
 
-#: share/meta-task/compssUsers.pl:86
+#: share/meta-task/compssUsers.pl:86 share/meta-task/compssUsers.pl.orig:86
 #, c-format
 msgid "Postfix mail server, Inn news server"
 msgstr "Postfix e-posttjener, Inn njustjener"
 
-#: share/meta-task/compssUsers.pl:89
+#: share/meta-task/compssUsers.pl:89 share/meta-task/compssUsers.pl.orig:89
 #, c-format
 msgid "Directory Server"
 msgstr "Katalogtjener"
 
-#: share/meta-task/compssUsers.pl:93
+#: share/meta-task/compssUsers.pl:93 share/meta-task/compssUsers.pl.orig:93
 #, c-format
 msgid "FTP Server"
 msgstr "FTP-tjener"
 
-#: share/meta-task/compssUsers.pl:94
+#: share/meta-task/compssUsers.pl:94 share/meta-task/compssUsers.pl.orig:94
 #, c-format
 msgid "ProFTPd"
 msgstr "ProFTPd"
 
-#: share/meta-task/compssUsers.pl:97
+#: share/meta-task/compssUsers.pl:97 share/meta-task/compssUsers.pl.orig:97
 #, c-format
 msgid "DNS/NIS"
 msgstr "DNS/NIS"
 
-#: share/meta-task/compssUsers.pl:98
+#: share/meta-task/compssUsers.pl:98 share/meta-task/compssUsers.pl.orig:98
 #, c-format
 msgid "Domain Name and Network Information Server"
 msgstr "Domenenavn- og nettverksinformasjons-tjener"
 
-#: share/meta-task/compssUsers.pl:101
+#: share/meta-task/compssUsers.pl:101 share/meta-task/compssUsers.pl.orig:101
 #, c-format
 msgid "File and Printer Sharing Server"
 msgstr "Fil- og Skriverdelingstjener"
 
-#: share/meta-task/compssUsers.pl:102
+#: share/meta-task/compssUsers.pl:102 share/meta-task/compssUsers.pl.orig:102
 #, c-format
 msgid "NFS Server, Samba server"
 msgstr "NFS-Tjener, Samba-tjener"
 
 #: 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:106 share/meta-task/compssUsers.pl.orig:106
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
 msgstr "PostgreSQL- og MySQL-databasetjener"
 
-#: share/meta-task/compssUsers.pl:110
+#: share/meta-task/compssUsers.pl:110 share/meta-task/compssUsers.pl.orig:110
 #, c-format
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: share/meta-task/compssUsers.pl:111
+#: share/meta-task/compssUsers.pl:111 share/meta-task/compssUsers.pl.orig:111
 #, c-format
 msgid "Apache, Pro-ftpd"
 msgstr "Apache, Pro-ftpd"
 
-#: share/meta-task/compssUsers.pl:114
+#: share/meta-task/compssUsers.pl:114 share/meta-task/compssUsers.pl.orig:114
 #, c-format
 msgid "Mail"
 msgstr "E-post"
 
-#: share/meta-task/compssUsers.pl:115
+#: share/meta-task/compssUsers.pl:115 share/meta-task/compssUsers.pl.orig:115
 #, c-format
 msgid "Postfix mail server"
 msgstr "Postfix e-posttjener"
 
-#: share/meta-task/compssUsers.pl:119
+#: share/meta-task/compssUsers.pl:119 share/meta-task/compssUsers.pl.orig:119
 #, c-format
 msgid "PostgreSQL or MySQL database server"
 msgstr "PostgreSQL eller MySQL-databasetjener"
 
-#: share/meta-task/compssUsers.pl:126
+#: share/meta-task/compssUsers.pl:126 share/meta-task/compssUsers.pl.orig:126
 #, c-format
 msgid "Network Computer server"
 msgstr "Nettverksmaskintjener"
 
-#: share/meta-task/compssUsers.pl:127
+#: share/meta-task/compssUsers.pl:127 share/meta-task/compssUsers.pl.orig:127
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
 msgstr "NFS-tjener, SMB-tjener, Proxy-tjener, SSH-tjener"
 
-#: share/meta-task/compssUsers.pl:133
+#: share/meta-task/compssUsers.pl:133 share/meta-task/compssUsers.pl.orig:133
 #, c-format
 msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
-#: share/meta-task/compssUsers.pl:135
+#: share/meta-task/compssUsers.pl:135 share/meta-task/compssUsers.pl.orig:135
 #, c-format
 msgid "KDE Workstation"
 msgstr "KDE-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:136
+#: share/meta-task/compssUsers.pl:136 share/meta-task/compssUsers.pl.orig:136
 #, c-format
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
@@ -610,12 +677,12 @@ msgstr ""
 "K Desktop Environment, grunnleggende grafisk miljø med en samling av "
 "passende verktøy"
 
-#: share/meta-task/compssUsers.pl:140
+#: share/meta-task/compssUsers.pl:140 share/meta-task/compssUsers.pl.orig:140
 #, c-format
 msgid "GNOME Workstation"
 msgstr "GNOME-arbeidsstasjon"
 
-#: share/meta-task/compssUsers.pl:141
+#: share/meta-task/compssUsers.pl:141 share/meta-task/compssUsers.pl.orig:141
 #, c-format
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
@@ -624,57 +691,68 @@ msgstr ""
 "Et grafisk miljø med et brukervennlig sett av programmer og "
 "skrivebordsverktøy"
 
-#: share/meta-task/compssUsers.pl:145
+#: share/meta-task/compssUsers.pl:145 share/meta-task/compssUsers.pl.orig:145
 #, c-format
 msgid "LXDE Desktop"
 msgstr "LXDE-skrivebord"
 
-#: share/meta-task/compssUsers.pl:149
+#: share/meta-task/compssUsers.pl:147
+#, fuzzy, c-format
+msgid ""
+"A lightweight & fast graphical environment with user-friendly set of "
+"applications and desktop tools"
+msgstr ""
+"Et grafisk miljø med et brukervennlig sett av programmer og "
+"skrivebordsverktøy"
+
+#: share/meta-task/compssUsers.pl:150 share/meta-task/compssUsers.pl.orig:149
 #, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske skrivebord"
 
-#: share/meta-task/compssUsers.pl:150
+#: share/meta-task/compssUsers.pl:151 share/meta-task/compssUsers.pl.orig:150
 #, c-format
 msgid "Window Maker, Enlightenment, Fvwm, etc"
 msgstr "Window Maker, Enlightenment, Fvwm etc"
 
-#: share/meta-task/compssUsers.pl:173
+#: share/meta-task/compssUsers.pl:174 share/meta-task/compssUsers.pl.orig:173
 #, c-format
 msgid "Utilities"
 msgstr "Verktøy"
 
-#: share/meta-task/compssUsers.pl:175 share/meta-task/compssUsers.pl:176
+#: 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-tjener"
 
-#: share/meta-task/compssUsers.pl:180
+#: share/meta-task/compssUsers.pl:181 share/meta-task/compssUsers.pl.orig:180
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:181
+#: share/meta-task/compssUsers.pl:182 share/meta-task/compssUsers.pl.orig:181
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Fjernadministrasjonstjener"
 
-#: share/meta-task/compssUsers.pl:185
+#: share/meta-task/compssUsers.pl:186 share/meta-task/compssUsers.pl.orig:185
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Nettverks-verktøy/overvåkning"
 
-#: share/meta-task/compssUsers.pl:186
+#: share/meta-task/compssUsers.pl:187 share/meta-task/compssUsers.pl.orig:186
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Overvårkningsverktøy, prosessbokføring, tcpdump, nmap, ..."
 
-#: share/meta-task/compssUsers.pl:190
+#: share/meta-task/compssUsers.pl:191 share/meta-task/compssUsers.pl.orig:190
 #, c-format
 msgid "Mandriva Wizards"
 msgstr "Mandriva-veivisere"
 
-#: share/meta-task/compssUsers.pl:191
+#: share/meta-task/compssUsers.pl:192 share/meta-task/compssUsers.pl.orig:191
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Veivisere til å sette opp tjener"
@@ -689,7 +767,7 @@ msgstr ""
 "måte.\n"
 "Fortsett på eget ansvar."
 
-#: steps.pm:442
+#: steps.pm:443
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -721,7 +799,7 @@ msgstr "<Tab>/<Alt-Tab> mellom elementene"
 msgid "Xorg server is slow to start. Please wait..."
 msgstr "Xorg-tjeneren er treg å starte. Vennligst vent..."
 
-#: steps_gtk.pm:203
+#: steps_gtk.pm:205
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -734,112 +812,112 @@ msgstr ""
 "installasjon i tekstmodus\n"
 "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv så `text'."
 
-#: steps_gtk.pm:236
+#: steps_gtk.pm:238
 #, c-format
 msgid "Install Mandriva KDE Desktop"
 msgstr "Installer Mandriva KDE-skrivebord"
 
-#: steps_gtk.pm:237
+#: steps_gtk.pm:239
 #, c-format
 msgid "Install Mandriva GNOME Desktop"
 msgstr "Installer Mandriva GNOME-skrivebord"
 
-#: steps_gtk.pm:238
+#: steps_gtk.pm:240
 #, c-format
 msgid "Custom install"
 msgstr "Skreddersydd installasjon"
 
-#: steps_gtk.pm:259
+#: steps_gtk.pm:261
 #, c-format
 msgid "KDE Desktop"
 msgstr "KDE-skrivebord"
 
-#: steps_gtk.pm:260
+#: steps_gtk.pm:262
 #, c-format
 msgid "GNOME Desktop"
 msgstr "GNOME-skrivebord"
 
-#: steps_gtk.pm:261
+#: steps_gtk.pm:263
 #, c-format
 msgid "Custom Desktop"
 msgstr "Tilpasset skrivebord"
 
-#: steps_gtk.pm:267
+#: steps_gtk.pm:269
 #, c-format
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Her er et  forhåndsbilde av '%s'-skrivebordet."
 
-#: steps_gtk.pm:295
+#: steps_gtk.pm:297
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klikk på bildene for å se et større forhåndsbilde"
 
-#: steps_gtk.pm:313 steps_interactive.pm:625 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: steps_gtk.pm:334 steps_interactive.pm:642
+#: steps_gtk.pm:336 steps_interactive.pm:623
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: steps_gtk.pm:358 steps_interactive.pm:566
+#: steps_gtk.pm:360 steps_interactive.pm:547
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total størrelse: %d / %d MB"
 
-#: steps_gtk.pm:401
+#: steps_gtk.pm:402
 #, c-format
 msgid "Bad package"
 msgstr "Ugyldig pakke"
 
-#: steps_gtk.pm:403
+#: steps_gtk.pm:404
 #, c-format
 msgid "Version: "
 msgstr "Versjon: "
 
-#: steps_gtk.pm:404
+#: steps_gtk.pm:405
 #, c-format
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: steps_gtk.pm:404
+#: steps_gtk.pm:405
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: steps_gtk.pm:405
+#: steps_gtk.pm:406
 #, c-format
 msgid "Importance: "
 msgstr "Viktighet: "
 
-#: steps_gtk.pm:439
+#: steps_gtk.pm:440
 #, c-format
 msgid "You can not select/unselect this package"
 msgstr "Du kan ikke velge (bort) denne pakken"
 
-#: steps_gtk.pm:443
+#: steps_gtk.pm:444
 #, c-format
 msgid "due to missing %s"
 msgstr "pga. manglende %s"
 
-#: steps_gtk.pm:444
+#: steps_gtk.pm:445
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "pga. utilfredsstilt %s"
 
-#: steps_gtk.pm:445
+#: steps_gtk.pm:446
 #, c-format
 msgid "trying to promote %s"
 msgstr "prøver å promotere %s"
 
-#: steps_gtk.pm:446
+#: steps_gtk.pm:447
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å beholde %s"
 
-#: steps_gtk.pm:451
+#: steps_gtk.pm:452
 #, c-format
 msgid ""
 "You can not select this package as there is not enough space left to install "
@@ -848,114 +926,114 @@ msgstr ""
 "Du kan ikke velge denne pakken da det ikke er igjen nok plass til å "
 "installere den"
 
-#: steps_gtk.pm:454
+#: steps_gtk.pm:455
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Følgende pakker vil bli installert"
 
-#: steps_gtk.pm:455
+#: steps_gtk.pm:456
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Følgende pakker vil bli fjernet"
 
-#: steps_gtk.pm:480
+#: steps_gtk.pm:481
 #, c-format
 msgid "This is a mandatory package, it can not be unselected"
 msgstr "Dette er en obligatorisk pakke, den kan ikke fjernes"
 
-#: steps_gtk.pm:482
+#: steps_gtk.pm:483
 #, c-format
 msgid "You can not unselect this package. It is already installed"
 msgstr "Du kan ikke fjerne denne pakken. Den er allerede installert"
 
-#: steps_gtk.pm:484
+#: steps_gtk.pm:485
 #, c-format
 msgid "You can not unselect this package. It must be upgraded"
 msgstr "Du kan ikke fjerne denne pakken. Den må oppgraderes"
 
-#: steps_gtk.pm:488
+#: steps_gtk.pm:489
 #, c-format
 msgid "Show automatically selected packages"
 msgstr "Vis automatisk valgte pakker"
 
-#: steps_gtk.pm:494
+#: steps_gtk.pm:495
 #, c-format
 msgid "Install"
 msgstr "Installer"
 
-#: steps_gtk.pm:497
+#: steps_gtk.pm:498
 #, c-format
 msgid "Load/Save selection"
 msgstr "Last inn/lagre utvalg"
 
-#: steps_gtk.pm:498
+#: steps_gtk.pm:499
 #, c-format
 msgid "Updating package selection"
 msgstr "Oppdaterer pakkevalg"
 
-#: steps_gtk.pm:503
+#: steps_gtk.pm:504
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal installasjon"
 
-#: steps_gtk.pm:516
+#: steps_gtk.pm:517
 #, c-format
 msgid "Software Management"
 msgstr "Programvarehåndtering"
 
-#: steps_gtk.pm:516 steps_interactive.pm:451
+#: steps_gtk.pm:517 steps_interactive.pm:432
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du ønsker å installere"
 
-#: steps_gtk.pm:533 steps_interactive.pm:656 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
 
-#: steps_gtk.pm:562
+#: steps_gtk.pm:563
 #, c-format
 msgid "No details"
 msgstr "Ingen detaljer"
 
-#: steps_gtk.pm:577
+#: steps_gtk.pm:578
 #, c-format
 msgid "Time remaining:"
 msgstr "Tid som gjenstår:"
 
-#: steps_gtk.pm:578
+#: steps_gtk.pm:579
 #, c-format
 msgid "(estimating...)"
 msgstr "(beregner...)"
 
-#: steps_gtk.pm:604
+#: steps_gtk.pm:605
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakker"
 
-#: steps_gtk.pm:650 steps_interactive.pm:819 steps_list.pm:43
+#: steps_gtk.pm:651 steps_interactive.pm:800 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Oppsummering"
 
-#: steps_gtk.pm:669
+#: steps_gtk.pm:670
 #, c-format
 msgid "Configure"
 msgstr "Sett opp"
 
-#: steps_gtk.pm:686 steps_interactive.pm:815 steps_interactive.pm:966
+#: steps_gtk.pm:687 steps_interactive.pm:796 steps_interactive.pm:947
 #, c-format
 msgid "not configured"
 msgstr "ikke satt opp"
 
-#: steps_gtk.pm:720
+#: steps_gtk.pm:721
 #, c-format
 msgid "Media Selection"
 msgstr "Velg media"
 
-#: steps_gtk.pm:729 steps_interactive.pm:334
+#: steps_gtk.pm:730 steps_interactive.pm:334
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -964,7 +1042,7 @@ msgstr ""
 "Følgende installasjonsmedia har blitt funnet.\n"
 "Hvis du vill hoppe over noen av de kan du velge de vekk nå."
 
-#: steps_gtk.pm:745 steps_interactive.pm:340
+#: steps_gtk.pm:746 steps_interactive.pm:340
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -977,7 +1055,7 @@ msgstr ""
 "Den vil da fortsette fra harddisken og pakkene vil forbli tilgjengelige når "
 "systemet er fullstendig installert."
 
-#: steps_gtk.pm:747 steps_interactive.pm:342
+#: steps_gtk.pm:748 steps_interactive.pm:342
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiér hele CDer"
@@ -1059,7 +1137,11 @@ msgid ""
 "\n"
 "Warning : you should backup all your personal data before choosing \"New\n"
 "Installation\"."
-msgstr "Installasjonsprogrammet har oppdaget at du har et Mandriva Linux-system som ikke kan oppgraderes til %s.<br> <br> En ny installasjon som fjerner den forrige er anbefalt.<br> <br> Advarsel: du bør sikkerhetskopiere alle dine personlige data før du velger \"Ny installasjon\"."
+msgstr ""
+"Installasjonsprogrammet har oppdaget at du har et Mandriva Linux-system som "
+"ikke kan oppgraderes til %s.<br> <br> En ny installasjon som fjerner den "
+"forrige er anbefalt.<br> <br> Advarsel: du bør sikkerhetskopiere alle dine "
+"personlige data før du velger \"Ny installasjon\"."
 
 #: steps_interactive.pm:255
 #, c-format
@@ -1091,7 +1173,7 @@ msgstr ""
 "å kunne starte systemet ditt vil du måtte opprette en bootstrap-partisjon i "
 "DiskDrake"
 
-#: steps_interactive.pm:378
+#: steps_interactive.pm:372
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1104,12 +1186,12 @@ msgstr ""
 "Sett inn CDen merket «%s» i stasjonen og trykk Ok når du er ferdig.\n"
 "Hvis du ikke har den, trykk Avbryt for å unngå installasjon fra denne CDen."
 
-#: steps_interactive.pm:408
+#: steps_interactive.pm:389
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Søker etter tilgjengelige pakker"
 
-#: steps_interactive.pm:416
+#: steps_interactive.pm:397
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1118,7 +1200,7 @@ msgstr ""
 "Systemet har ikke nok gjenværende diskplass for installasjon eller "
 "oppgradering (%dMB > %dMB)"
 
-#: steps_interactive.pm:463
+#: steps_interactive.pm:444
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1127,54 +1209,54 @@ msgstr ""
 "Velg lagre eller hent pakkevalg.\n"
 "Formatet er det samme som for auto_install-genererte filer."
 
-#: steps_interactive.pm:465
+#: steps_interactive.pm:446
 #, c-format
 msgid "Load"
 msgstr "Last inn"
 
-#: steps_interactive.pm:465
+#: steps_interactive.pm:446
 #, c-format
 msgid "Save"
 msgstr "Lagre"
 
-#: steps_interactive.pm:473
+#: steps_interactive.pm:454
 #, c-format
 msgid "Bad file"
 msgstr "Ødelagt fil"
 
-#: steps_interactive.pm:489
+#: steps_interactive.pm:470
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:490
+#: steps_interactive.pm:471
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:493
+#: steps_interactive.pm:474
 #, c-format
 msgid "Desktop Selection"
 msgstr "Skrivebordsvalg"
 
-#: steps_interactive.pm:494
+#: steps_interactive.pm:475
 #, c-format
 msgid "You can choose your workstation desktop profile."
 msgstr ""
 "Her kan du velge skrivebordsprofilen for systemet: KDE, GNOME eller "
 "skreddersydd"
 
-#: steps_interactive.pm:580
+#: steps_interactive.pm:561
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valgt størrelse er større enn tilgjengelig plass"
 
-#: steps_interactive.pm:595
+#: steps_interactive.pm:576
 #, c-format
 msgid "Type of install"
 msgstr "Type installasjon"
 
-#: steps_interactive.pm:596
+#: steps_interactive.pm:577
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1183,82 +1265,82 @@ msgstr ""
 "Du har ikke valgt noen pakkegrupper.\n"
 "Velg den minimale installasjonen du ønsker:"
 
-#: steps_interactive.pm:601
+#: steps_interactive.pm:582
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:602
+#: steps_interactive.pm:583
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggende dokumentasjon (anbefalt!)"
 
-#: steps_interactive.pm:603
+#: steps_interactive.pm:584
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Virkelig minimal installasjon (uten urpmi)"
 
-#: steps_interactive.pm:657
+#: steps_interactive.pm:638
 #, c-format
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: steps_interactive.pm:665
+#: steps_interactive.pm:646
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: steps_interactive.pm:689
+#: steps_interactive.pm:670
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
 
-#: steps_interactive.pm:689
+#: steps_interactive.pm:670
 #, c-format
 msgid "Go on anyway?"
 msgstr "Fortsett uansett?"
 
-#: steps_interactive.pm:693
+#: steps_interactive.pm:674
 #, c-format
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: steps_interactive.pm:694
+#: steps_interactive.pm:675
 #, c-format
 msgid "Skip this package"
 msgstr "Hopp over denne pakken"
 
-#: steps_interactive.pm:695
+#: steps_interactive.pm:676
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hopp over alle pakker fra media \"%s\""
 
-#: steps_interactive.pm:696
+#: steps_interactive.pm:677
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Gå tilbake til valg av media og pakker"
 
-#: steps_interactive.pm:699
+#: steps_interactive.pm:680
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Feil under installering av pakke %s"
 
-#: steps_interactive.pm:718
+#: steps_interactive.pm:699
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: steps_interactive.pm:725
+#: steps_interactive.pm:706
 #, c-format
 msgid "Please ensure the Update Modules media is in drive %s"
 msgstr "Vennligst forsikre deg om at medie med oppdaterte moduler er i %s"
 
-#: steps_interactive.pm:753 steps_list.pm:47
+#: steps_interactive.pm:734 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: steps_interactive.pm:754
+#: steps_interactive.pm:735
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1279,28 +1361,28 @@ msgstr ""
 "\n"
 "Ønsker du å installere oppdateringene?"
 
-#: steps_interactive.pm:861
+#: steps_interactive.pm:842
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:894 steps_interactive.pm:901 steps_interactive.pm:914
-#: steps_interactive.pm:931 steps_interactive.pm:946
+#: steps_interactive.pm:875 steps_interactive.pm:882 steps_interactive.pm:895
+#: steps_interactive.pm:912 steps_interactive.pm:927
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: steps_interactive.pm:915 steps_interactive.pm:932
+#: steps_interactive.pm:896 steps_interactive.pm:913
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:935
+#: steps_interactive.pm:916
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA-lydkort?"
 
-#: steps_interactive.pm:937
+#: steps_interactive.pm:918
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1309,69 +1391,69 @@ msgstr ""
 "Kjør «alsaconf» eller «sndconfig» etter installasjonen for å sette opp "
 "lydkortet ditt"
 
-#: steps_interactive.pm:939
+#: steps_interactive.pm:920
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
 
-#: steps_interactive.pm:947
+#: steps_interactive.pm:928
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:953 steps_interactive.pm:964
+#: steps_interactive.pm:934 steps_interactive.pm:945
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk & internett"
 
-#: steps_interactive.pm:965
+#: steps_interactive.pm:946
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtjenere"
 
-#: steps_interactive.pm:966
+#: steps_interactive.pm:947
 #, c-format
 msgid "configured"
 msgstr "satt opp"
 
-#: steps_interactive.pm:976
+#: steps_interactive.pm:957
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhetsnivå"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:976
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:999
+#: steps_interactive.pm:980
 #, c-format
 msgid "activated"
 msgstr "aktivert"
 
-#: steps_interactive.pm:999
+#: steps_interactive.pm:980
 #, c-format
 msgid "disabled"
 msgstr "deaktiver"
 
-#: steps_interactive.pm:1013
+#: steps_interactive.pm:994
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
 "Du har ikke satt opp det grafiske grensesnittet Xorg. Er du sikker på at du "
 "ikke vil gjøre dette?"
 
-#: steps_interactive.pm:1041
+#: steps_interactive.pm:1022
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Klargjør oppstartslaster..."
 
-#: steps_interactive.pm:1042
+#: steps_interactive.pm:1023
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Vennligst vær tålmodig, dette kan ta en stund..."
 
-#: steps_interactive.pm:1053
+#: steps_interactive.pm:1034
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1384,7 +1466,7 @@ msgstr ""
 "du må bruke BootX eller andre måter for å starte din maskin. "
 "Kjerneargumentet for root-filsystemet er: root=%s"
 
-#: steps_interactive.pm:1067
+#: steps_interactive.pm:1048
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1393,17 +1475,17 @@ msgstr ""
 "I dette sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt "
 "administratoren."
 
-#: steps_interactive.pm:1099
+#: steps_interactive.pm:1080
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: steps_interactive.pm:1101
+#: steps_interactive.pm:1082
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Oppretter diskett for autoinstallasjon..."
 
-#: steps_interactive.pm:1112
+#: steps_interactive.pm:1093
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1414,7 +1496,7 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å avslutte nå?"
 
-#: steps_interactive.pm:1122
+#: steps_interactive.pm:1103
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
@@ -1557,29 +1639,3 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Avslutt"
-
-#: ../../advertising/IM_flash.pl:1
-#, c-format
-msgid "Your desktop on a USB key"
-msgstr "Ditt skrivebord på en USB-penn"
-
-#: ../../advertising/IM_free09.pl:1
-#, c-format
-msgid "The 100%% open source Mandriva Linux distribution"
-msgstr "Den hundre prosent åpen kildekode-distribusjonen, Mandriva Linux"
-
-#: ../../advertising/IM_one09.pl:1
-#, c-format
-msgid "Explore Linux easily with Mandriva One"
-msgstr "Utforsk Linux lett med Mandriva One"
-
-#: ../../advertising/IM_pwp09.pl:1
-#, c-format
-msgid "A full Mandriva Linux desktop, with support"
-msgstr "Et komplett Mandriva Linux-skrivebord"
-
-#: ../../advertising/IM_range09.pl:1
-#, c-format
-msgid "Mandriva: distributions for everybody's needs"
-msgstr "Mandriva: distribusjonen for alles behov"
-