sync with code

1 files changed, 175 insertions, 150 deletions

diff --git a/perl-install/install/share/po/nb.po b/perl-install/install/share/po/nb.po
index 5793b4b5e..3eb538d01 100644
--- a/perl-install/install/share/po/nb.po
+++ b/perl-install/install/share/po/nb.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-09 05:35+0200\n"
+"POT-Creation-Date: 2009-09-10 12:21+0200\n"
 "PO-Revision-Date: 2009-08-27 02:44+0200\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -31,6 +31,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 ""
+
+#: ../../advertising/IM_free09.pl:1
+#, c-format
+msgid "The 100%% open source Mandriva Linux distribution"
+msgstr ""
+
+#: ../../advertising/IM_one09.pl:1
+#, c-format
+msgid "Explore Linux easily with Mandriva One"
+msgstr ""
+
+#: ../../advertising/IM_pwp09.pl:1
+#, c-format
+msgid "A full Mandriva Linux desktop, with support"
+msgstr ""
+
+#: ../../advertising/IM_range09.pl:1
+#, c-format
+msgid "Mandriva: distributions for everybody's needs"
+msgstr ""
+
 #: any.pm:109
 #, c-format
 msgid "Do you have further supplementary media?"
@@ -82,7 +107,8 @@ msgstr "URL må starte med ftp:// eller http://"
 
 #: any.pm:182
 #, 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 … "
@@ -150,54 +176,18 @@ msgstr ""
 msgid "Looking at packages already installed..."
 msgstr "Ser på pakker som allerede er installert … "
 
-#: any.pm:368
+#: any.pm:369
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Finner pakker som skal oppgraderes … "
 
-#: any.pm:387
+#: any.pm:388
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjerner pakker før oppgradering … "
 
-#: any.pm:408
-#, c-format
-msgid ""
-"You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
-"on your system. This installer cannot preserve KDE 3.5 in an upgrade. If you "
-"choose to proceed, \n"
-"KDE 4 will replace KDE 3, and you will lose your personal KDE configuration "
-"settings. \n"
-"To upgrade with KDE 3.5 and your personal settings preserved, \n"
-"please reboot your system and upgrade using the Mandriva update applet."
-msgstr ""
-"Du har bestemt deg for å oppgradere systemet ditt til %s. KDE 3.5 ble "
-"oppdaget\n 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 . "
-"\n"
-"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.Du har bestemt deg for å oppgradere systemet ditt til %s. KDE "
-"3.5 ble oppdaget\n 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 .\n 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:413 steps_interactive.pm:1103
-#, c-format
-msgid "Reboot"
-msgstr "Restart"
-
-#: any.pm:413
-#, c-format
-msgid "Proceed"
-msgstr "Fortsett"
-
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:602
+#: any.pm:594
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -211,91 +201,86 @@ msgstr ""
 " \n"
 "Ønsker du å fjerne disse pakkene?\n"
 
-#: any.pm:821
+#: any.pm:813
 #, c-format
 msgid "Error reading file %s"
 msgstr "Feil ved lesing av fil %s"
 
-#: any.pm:1028
+#: any.pm:1020
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De(n) følgende disken(e) fikk nytt navn:"
 
-#: any.pm:1030
+#: any.pm:1022
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (tidligere kalt %s)"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1087
+#: any.pm:1079
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1106 steps_interactive.pm:932
+#: any.pm:1098 steps_interactive.pm:936
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
 
-#: any.pm:1110
+#: any.pm:1102
 #, c-format
 msgid "Please choose a media"
 msgstr "Velg et medie"
 
-#: any.pm:1126
+#: any.pm:1118
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Filen eksisterer allerede. Overskriv?"
 
-#: any.pm:1130
+#: any.pm:1122
 #, c-format
 msgid "Permission denied"
 msgstr "Adgang nektet"
 
-#: any.pm:1178
+#: any.pm:1170
 #, c-format
 msgid "Bad NFS name"
 msgstr "Ugyldig NFS-navn"
 
-#: any.pm:1199
+#: any.pm:1191
 #, c-format
 msgid "Bad media %s"
 msgstr "Feil på media %s"
 
-#: any.pm:1242
+#: any.pm:1234
 #, c-format
 msgid "Can not make screenshots before partitioning"
 msgstr "Jeg kan ikke ta skjembilder før partisjonering."
 
-#: any.pm:1250
+#: any.pm:1242
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s"
 
-#: gtk.pm:130
+#: gtk.pm:131
 #, c-format
 msgid "Installation"
 msgstr "Installasjon"
 
-#: gtk.pm:134 share/meta-task/compssUsers.pl:44
+#: gtk.pm:135 share/meta-task/compssUsers.pl:44
 #, c-format
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: http.pm:53
-#, c-format
-msgid "retrieval of [%s] failed"
-msgstr "henting av [%s] feilet"
-
 #: install2.pm:168
 #, c-format
 msgid "You must also format %s"
@@ -325,17 +310,17 @@ msgstr "Tar ned nettverket"
 msgid "Please wait, retrieving file"
 msgstr "Vennligst vent, henter fil"
 
-#: media.pm:718
+#: media.pm:716
 #, c-format
 msgid "unable to add medium"
 msgstr "kunne ikke legge til medium"
 
-#: media.pm:758
+#: media.pm:756
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiér noen pakker på disken for framtidig bruk"
 
-#: media.pm:811
+#: media.pm:809
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering pågår"
@@ -379,12 +364,12 @@ msgstr ""
 msgid "An error occurred:"
 msgstr "En feil oppstod:"
 
-#: pkgs.pm:780
+#: pkgs.pm:792
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d mislykket installasjonstransaksjon"
 
-#: pkgs.pm:781
+#: pkgs.pm:793
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installasjon av pakker feilet:"
@@ -819,17 +804,17 @@ msgstr "Her er et  forhåndsbilde av '%s'-skrivebordet."
 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:315 steps_interactive.pm:602 steps_list.pm:30
+#: steps_gtk.pm:315 steps_interactive.pm:606 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: steps_gtk.pm:336 steps_interactive.pm:619
+#: steps_gtk.pm:336 steps_interactive.pm:623
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: steps_gtk.pm:360 steps_interactive.pm:543
+#: steps_gtk.pm:360 steps_interactive.pm:544
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total størrelse: %d / %d MB"
@@ -948,59 +933,59 @@ msgstr "Minimal installasjon"
 msgid "Software Management"
 msgstr "Programvarehåndtering"
 
-#: steps_gtk.pm:517 steps_interactive.pm:428
+#: steps_gtk.pm:517 steps_interactive.pm:429
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du ønsker å installere"
 
-#: steps_gtk.pm:534 steps_interactive.pm:633 steps_list.pm:32
+#: steps_gtk.pm:534 steps_interactive.pm:637 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
 
-#: steps_gtk.pm:563
+#: steps_gtk.pm:564
 #, c-format
 msgid "No details"
 msgstr "Ingen detaljer"
 
-#: steps_gtk.pm:578
+#: steps_gtk.pm:583
 #, c-format
 msgid "Time remaining:"
 msgstr "Tid som gjenstår:"
 
-#: steps_gtk.pm:579
+#: steps_gtk.pm:584
 #, c-format
 msgid "(estimating...)"
 msgstr "(beregner … )"
 
-#: steps_gtk.pm:605
+#: steps_gtk.pm:614
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakker"
 
-#: steps_gtk.pm:651 steps_interactive.pm:797 steps_list.pm:43
+#: steps_gtk.pm:668 steps_interactive.pm:801 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Oppsummering"
 
-#: steps_gtk.pm:670
+#: steps_gtk.pm:687
 #, c-format
 msgid "Configure"
 msgstr "Sett opp"
 
-#: steps_gtk.pm:687 steps_interactive.pm:793 steps_interactive.pm:944
+#: steps_gtk.pm:704 steps_interactive.pm:797 steps_interactive.pm:948
 #, c-format
 msgid "not configured"
 msgstr "ikke satt opp"
 
-#: steps_gtk.pm:721
+#: steps_gtk.pm:738
 #, c-format
 msgid "Media Selection"
 msgstr "Velg media"
 
-#: steps_gtk.pm:730 steps_interactive.pm:329
+#: steps_gtk.pm:747 steps_interactive.pm:330
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1009,7 +994,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:746 steps_interactive.pm:335
+#: steps_gtk.pm:763 steps_interactive.pm:336
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard drive "
@@ -1022,7 +1007,7 @@ msgstr ""
 "Den vil da fortsette fra harddisken og pakkene vil forbli tilgjengelige når "
 "systemet er fullstendig installert."
 
-#: steps_gtk.pm:748 steps_interactive.pm:337
+#: steps_gtk.pm:765 steps_interactive.pm:338
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiér hele CDer"
@@ -1042,49 +1027,49 @@ msgstr "Velg ditt tastaturoppsett"
 msgid "Here is the full list of available keyboards:"
 msgstr "Her er den komplette listen over tilgjengelige tastatur"
 
-#: steps_interactive.pm:143
+#: steps_interactive.pm:144
 #, c-format
 msgid "Install/Upgrade"
 msgstr "Installer/Oppgrader"
 
-#: steps_interactive.pm:147
+#: steps_interactive.pm:148
 #, c-format
 msgid "Is this an install or an upgrade?"
 msgstr "Er dette en installasjon eller en oppgradering?"
 
-#: steps_interactive.pm:149
+#: steps_interactive.pm:150
 #, c-format
 msgid ""
 "_: This is a noun:\n"
 "Install"
 msgstr "Installér"
 
-#: steps_interactive.pm:151
+#: steps_interactive.pm:152
 #, c-format
 msgid "Upgrade %s"
 msgstr "Oppgrader %s"
 
-#: steps_interactive.pm:169
+#: steps_interactive.pm:170
 #, c-format
 msgid "Encryption key for %s"
 msgstr "Krypteringsnøkkel for %s"
 
-#: steps_interactive.pm:202
+#: steps_interactive.pm:203
 #, c-format
 msgid "Cancel installation, reboot system"
 msgstr "Avbryt installasjonen, start systemet på nytt"
 
-#: steps_interactive.pm:203
+#: steps_interactive.pm:204
 #, c-format
 msgid "New Installation"
 msgstr "Ny installasjon"
 
-#: steps_interactive.pm:204
+#: steps_interactive.pm:205
 #, c-format
 msgid "Upgrade previous installation (not recommended)"
 msgstr "Oppgrader forrige versjon (ikke anbefalt)"
 
-#: steps_interactive.pm:208
+#: steps_interactive.pm:209
 #, c-format
 msgid ""
 "Installer has detected that your installed Mandriva Linux system could not\n"
@@ -1104,17 +1089,17 @@ msgstr ""
 "<br> Advarsel: du bør sikkerhetskopiere alle dine personlige data før du "
 "velger \"Ny installasjon\"."
 
-#: steps_interactive.pm:250
+#: steps_interactive.pm:251
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: steps_interactive.pm:250
+#: steps_interactive.pm:251
 #, c-format
 msgid "Configuring IDE"
 msgstr "Setter opp IDE"
 
-#: steps_interactive.pm:287
+#: steps_interactive.pm:288
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
@@ -1123,7 +1108,7 @@ msgstr ""
 "Det er ikke plass for 1 MB bootstrap! Installasjonen vil fortsette, men for "
 "å boote systemet ditt, må du lage en bootstrap-partisjon i DiskDrake"
 
-#: steps_interactive.pm:292
+#: steps_interactive.pm:293
 #, c-format
 msgid ""
 "You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
@@ -1134,7 +1119,7 @@ msgstr ""
 "å kunne starte systemet ditt vil du måtte opprette en bootstrap-partisjon i "
 "DiskDrake"
 
-#: steps_interactive.pm:368
+#: steps_interactive.pm:369
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -1147,12 +1132,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:385
+#: steps_interactive.pm:386
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Søker etter tilgjengelige pakker"
 
-#: steps_interactive.pm:393
+#: steps_interactive.pm:394
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%"
@@ -1161,7 +1146,7 @@ msgstr ""
 "Systemet har ikke nok gjenværende diskplass for installasjon eller "
 "oppgradering (%dMB > %dMB)"
 
-#: steps_interactive.pm:440
+#: steps_interactive.pm:441
 #, c-format
 msgid ""
 "Please choose load or save package selection.\n"
@@ -1170,54 +1155,54 @@ msgstr ""
 "Velg lagre eller hent pakkevalg.\n"
 "Formatet er det samme som for auto_install-genererte filer."
 
-#: steps_interactive.pm:442
+#: steps_interactive.pm:443
 #, c-format
 msgid "Load"
 msgstr "Last inn"
 
-#: steps_interactive.pm:442
+#: steps_interactive.pm:443
 #, c-format
 msgid "Save"
 msgstr "Lagre"
 
-#: steps_interactive.pm:450
+#: steps_interactive.pm:451
 #, c-format
 msgid "Bad file"
 msgstr "Ødelagt fil"
 
-#: steps_interactive.pm:466
+#: steps_interactive.pm:467
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: steps_interactive.pm:467
+#: steps_interactive.pm:468
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: steps_interactive.pm:470
+#: steps_interactive.pm:471
 #, c-format
 msgid "Desktop Selection"
 msgstr "Skrivebordsvalg"
 
-#: steps_interactive.pm:471
+#: steps_interactive.pm:472
 #, 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:557
+#: steps_interactive.pm:558
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valgt størrelse er større enn tilgjengelig plass"
 
-#: steps_interactive.pm:572
+#: steps_interactive.pm:574
 #, c-format
 msgid "Type of install"
 msgstr "Type installasjon"
 
-#: steps_interactive.pm:573
+#: steps_interactive.pm:575
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1226,82 +1211,87 @@ msgstr ""
 "Du har ikke valgt noen pakkegrupper.\n"
 "Velg den minimale installasjonen du ønsker:"
 
-#: steps_interactive.pm:578
+#: steps_interactive.pm:580
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:579
+#: steps_interactive.pm:581
+#, fuzzy, c-format
+msgid "Install suggested packages"
+msgstr "Installerer pakke %s"
+
+#: steps_interactive.pm:582
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggende dokumentasjon (anbefalt!)"
 
-#: steps_interactive.pm:580
+#: steps_interactive.pm:583
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Virkelig minimal installasjon (uten urpmi)"
 
-#: steps_interactive.pm:634
+#: steps_interactive.pm:638
 #, c-format
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: steps_interactive.pm:642
+#: steps_interactive.pm:646
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: steps_interactive.pm:666
+#: 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:666
+#: steps_interactive.pm:670
 #, c-format
 msgid "Go on anyway?"
 msgstr "Fortsett uansett?"
 
-#: steps_interactive.pm:670
+#: steps_interactive.pm:674
 #, c-format
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: steps_interactive.pm:671
+#: steps_interactive.pm:675
 #, c-format
 msgid "Skip this package"
 msgstr "Hopp over denne pakken"
 
-#: steps_interactive.pm:672
+#: steps_interactive.pm:676
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hopp over alle pakker fra media \"%s\""
 
-#: steps_interactive.pm:673
+#: 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:676
+#: steps_interactive.pm:680
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Feil under installering av pakke %s"
 
-#: steps_interactive.pm:695
+#: steps_interactive.pm:699
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: steps_interactive.pm:702
+#: 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:730 steps_list.pm:47
+#: steps_interactive.pm:734 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: steps_interactive.pm:731
+#: steps_interactive.pm:735
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1320,28 +1310,28 @@ msgstr ""
 "\n"
 "Ønsker du å installere oppdateringene?"
 
-#: steps_interactive.pm:839
+#: steps_interactive.pm:843
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:872 steps_interactive.pm:879 steps_interactive.pm:892
-#: steps_interactive.pm:909 steps_interactive.pm:924
+#: steps_interactive.pm:876 steps_interactive.pm:883 steps_interactive.pm:896
+#: steps_interactive.pm:913 steps_interactive.pm:928
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: steps_interactive.pm:893 steps_interactive.pm:910
+#: steps_interactive.pm:897 steps_interactive.pm:914
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:913
+#: steps_interactive.pm:917
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA-lydkort?"
 
-#: steps_interactive.pm:915
+#: steps_interactive.pm:919
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1350,69 +1340,69 @@ msgstr ""
 "Kjør «alsaconf» eller «sndconfig» etter installasjonen for å sette opp "
 "lydkortet ditt"
 
-#: steps_interactive.pm:917
+#: steps_interactive.pm:921
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
 
-#: steps_interactive.pm:925
+#: steps_interactive.pm:929
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:931 steps_interactive.pm:942
+#: steps_interactive.pm:935 steps_interactive.pm:946
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk & internett"
 
-#: steps_interactive.pm:943
+#: steps_interactive.pm:947
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtjenere"
 
-#: steps_interactive.pm:944
+#: steps_interactive.pm:948
 #, c-format
 msgid "configured"
 msgstr "satt opp"
 
-#: steps_interactive.pm:954
+#: steps_interactive.pm:958
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhetsnivå"
 
-#: steps_interactive.pm:973
+#: steps_interactive.pm:977
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:977
+#: steps_interactive.pm:981
 #, c-format
 msgid "activated"
 msgstr "aktivert"
 
-#: steps_interactive.pm:977
+#: steps_interactive.pm:981
 #, c-format
 msgid "disabled"
 msgstr "deaktiver"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:995
 #, 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:1019
+#: steps_interactive.pm:1023
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Klargjør oppstartslaster … "
 
-#: steps_interactive.pm:1020
+#: steps_interactive.pm:1024
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Vennligst vær tålmodig, dette kan ta en stund … "
 
-#: steps_interactive.pm:1031
+#: steps_interactive.pm:1035
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1425,7 +1415,7 @@ msgstr ""
 "du må bruke BootX eller andre måter for å starte din maskin. "
 "Kjerneargumentet for root-filsystemet er: root=%s"
 
-#: steps_interactive.pm:1045
+#: steps_interactive.pm:1049
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1434,17 +1424,17 @@ msgstr ""
 "I dette sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt "
 "administratoren."
 
-#: steps_interactive.pm:1077
+#: steps_interactive.pm:1081
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: steps_interactive.pm:1079
+#: steps_interactive.pm:1083
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Oppretter diskett for autoinstallasjon … "
 
-#: steps_interactive.pm:1090
+#: steps_interactive.pm:1094
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1455,11 +1445,16 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å avslutte nå?"
 
-#: steps_interactive.pm:1100
+#: steps_interactive.pm:1104
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
 
+#: steps_interactive.pm:1107
+#, c-format
+msgid "Reboot"
+msgstr "Restart"
+
 #. -PO: please keep the following messages very short: they must fit in the left list of the installer!!!
 #: steps_list.pm:16
 #, c-format
@@ -1599,3 +1594,33 @@ msgid ""
 "Exit"
 msgstr "Avslutt"
 
+#~ msgid ""
+#~ "You have decided to upgrade your system to %s. KDE 3.5 has been detected\n"
+#~ "on your system. This installer cannot preserve KDE 3.5 in an upgrade. If "
+#~ "you choose to proceed, \n"
+#~ "KDE 4 will replace KDE 3, and you will lose your personal KDE "
+#~ "configuration settings. \n"
+#~ "To upgrade with KDE 3.5 and your personal settings preserved, \n"
+#~ "please reboot your system and upgrade using the Mandriva update applet."
+#~ msgstr ""
+#~ "Du har bestemt deg for å oppgradere systemet ditt til %s. KDE 3.5 ble "
+#~ "oppdaget\n"
+#~ " 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 . \n"
+#~ "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.Du har bestemt deg for å oppgradere systemet "
+#~ "ditt til %s. KDE 3.5 ble oppdaget\n"
+#~ " 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 .\n"
+#~ " 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."
+
+#~ msgid "Proceed"
+#~ msgstr "Fortsett"
+
+#~ msgid "retrieval of [%s] failed"
+#~ msgstr "henting av [%s] feilet"