sync with code

1 files changed, 108 insertions, 104 deletions

diff --git a/perl-install/install/share/po/nb.po b/perl-install/install/share/po/nb.po
index 8940ea7d0..60df95a4f 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: 2012-03-21 02:03+0100\n"
+"POT-Creation-Date: 2012-04-17 22:54+0200\n"
 "PO-Revision-Date: 2010-03-17 05:45+0100\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -194,7 +194,7 @@ msgid "Removing packages prior to upgrade..."
 msgstr "Fjerner pakker før oppgradering … "
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: any.pm:613
+#: any.pm:614
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -208,72 +208,72 @@ msgstr ""
 " \n"
 "Ønsker du å fjerne disse pakkene?\n"
 
-#: any.pm:832
+#: any.pm:833
 #, c-format
 msgid "Error reading file %s"
 msgstr "Feil ved lesing av fil %s"
 
-#: any.pm:1039
+#: any.pm:1041
 #, c-format
 msgid "The following disk(s) were renamed:"
 msgstr "De(n) følgende disken(e) fikk nytt navn:"
 
-#: any.pm:1041
+#: any.pm:1043
 #, c-format
 msgid "%s (previously named as %s)"
 msgstr "%s (tidligere kalt %s)"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "HTTP"
 msgstr "HTTP"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "FTP"
 msgstr "FTP"
 
-#: any.pm:1098
+#: any.pm:1100
 #, c-format
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1117 steps_interactive.pm:946
+#: any.pm:1119 steps_interactive.pm:950
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
 
-#: any.pm:1121
+#: any.pm:1123
 #, c-format
 msgid "Please choose a media"
 msgstr "Velg et medie"
 
-#: any.pm:1137
+#: any.pm:1139
 #, c-format
 msgid "File already exists. Overwrite it?"
 msgstr "Filen eksisterer allerede. Overskriv?"
 
-#: any.pm:1141
+#: any.pm:1143
 #, c-format
 msgid "Permission denied"
 msgstr "Adgang nektet"
 
-#: any.pm:1189
+#: any.pm:1191
 #, c-format
 msgid "Bad NFS name"
 msgstr "Ugyldig NFS-navn"
 
-#: any.pm:1210
+#: any.pm:1212
 #, c-format
 msgid "Bad media %s"
 msgstr "Feil på media %s"
 
-#: any.pm:1253
+#: any.pm:1256
 #, c-format
 msgid "Cannot make screenshots before partitioning"
 msgstr "Jeg kan ikke ta skjembilder før partisjonering."
 
-#: any.pm:1261
+#: any.pm:1264
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Skjermbilder vil være tilgjengelig etter installasjon i %s"
@@ -288,7 +288,7 @@ msgstr "Installasjon"
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: install2.pm:168
+#: install2.pm:167
 #, c-format
 msgid "You must also format %s"
 msgstr "Du må også formatere %s"
@@ -317,47 +317,47 @@ msgstr "Tar ned nettverket"
 msgid "Please wait, retrieving file"
 msgstr "Vennligst vent, henter fil"
 
-#: media.pm:724
+#: media.pm:725
 #, c-format
 msgid "unable to add medium"
 msgstr "kunne ikke legge til medium"
 
-#: media.pm:764
+#: media.pm:765
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiér noen pakker på disken for framtidig bruk"
 
-#: media.pm:817
+#: media.pm:818
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering pågår"
 
-#: pkgs.pm:33
+#: pkgs.pm:59
 #, c-format
 msgid "must have"
 msgstr "må ha"
 
-#: pkgs.pm:34
+#: pkgs.pm:60
 #, c-format
 msgid "important"
 msgstr "viktig"
 
-#: pkgs.pm:35
+#: pkgs.pm:61
 #, c-format
 msgid "very nice"
 msgstr "veldig bra"
 
-#: pkgs.pm:36
+#: pkgs.pm:62
 #, c-format
 msgid "nice"
 msgstr "bra"
 
-#: pkgs.pm:37
+#: pkgs.pm:63
 #, c-format
 msgid "maybe"
 msgstr "kanskje"
 
-#: pkgs.pm:246
+#: pkgs.pm:272
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -366,22 +366,22 @@ msgstr ""
 "Noen pakker krevet av %s kan ikke installeres\n"
 "%s"
 
-#: pkgs.pm:334
+#: pkgs.pm:360
 #, c-format
 msgid "An error occurred:"
 msgstr "En feil oppstod:"
 
-#: pkgs.pm:807
+#: pkgs.pm:833
 #, c-format
 msgid "Do not ask again"
 msgstr "Ikke spør igjen"
 
-#: pkgs.pm:823
+#: pkgs.pm:849
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d mislykket installasjonstransaksjon"
 
-#: pkgs.pm:824
+#: pkgs.pm:850
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installasjon av pakker feilet:"
@@ -722,7 +722,7 @@ msgstr ""
 "måte.\n"
 "Fortsett på eget ansvar."
 
-#: steps.pm:451
+#: steps.pm:457
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -801,31 +801,26 @@ msgstr "Tilpasset skrivebord"
 msgid "Here's a preview of the '%s' desktop."
 msgstr "Her er en forhåndsvisning av skrivebordet «%s»."
 
-#: steps_gtk.pm:305
+#: steps_gtk.pm:304
 #, c-format
 msgid "Click on images in order to see a bigger preview"
 msgstr "Klikk på bildene for å se en større forhåndsvisning"
 
-#: steps_gtk.pm:323 steps_interactive.pm:617 steps_list.pm:30
+#: steps_gtk.pm:322 steps_interactive.pm:619 steps_list.pm:30
 #, c-format
 msgid "Package Group Selection"
 msgstr "Valg pakkegruppe"
 
-#: steps_gtk.pm:344 steps_interactive.pm:634
+#: steps_gtk.pm:343 steps_interactive.pm:636
 #, c-format
 msgid "Individual package selection"
 msgstr "Individuelt pakkevalg"
 
-#: steps_gtk.pm:368 steps_interactive.pm:554
+#: steps_gtk.pm:367 steps_interactive.pm:555
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Total størrelse: %d / %d MB"
 
-#: steps_gtk.pm:410
-#, c-format
-msgid "Bad package"
-msgstr "Ugyldig pakke"
-
 #: steps_gtk.pm:412
 #, c-format
 msgid "Version: "
@@ -846,6 +841,11 @@ msgstr "%d KB\n"
 msgid "Importance: "
 msgstr "Viktighet: "
 
+#: steps_gtk.pm:415
+#, c-format
+msgid "No description"
+msgstr ""
+
 #: steps_gtk.pm:448
 #, c-format
 msgid "You cannot select/unselect this package"
@@ -910,84 +910,84 @@ msgstr "Du kan ikke fjerne denne pakken. Den må oppgraderes"
 msgid "Show automatically selected packages"
 msgstr "Vis automatisk valgte pakker"
 
-#: steps_gtk.pm:503
+#: steps_gtk.pm:504
 #, c-format
 msgid "Install"
 msgstr "Installer"
 
-#: steps_gtk.pm:506
+#: steps_gtk.pm:507
 #, c-format
 msgid "Load/Save selection"
 msgstr "Last inn/lagre utvalg"
 
-#: steps_gtk.pm:507
+#: steps_gtk.pm:508
 #, c-format
 msgid "Updating package selection"
 msgstr "Oppdaterer pakkevalg"
 
-#: steps_gtk.pm:512
+#: steps_gtk.pm:513
 #, c-format
 msgid "Minimal install"
 msgstr "Minimal installasjon"
 
-#: steps_gtk.pm:525
+#: steps_gtk.pm:526
 #, c-format
 msgid "Software Management"
 msgstr "Programvarehåndtering"
 
-#: steps_gtk.pm:525 steps_interactive.pm:439
+#: steps_gtk.pm:526 steps_interactive.pm:439
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Velg pakkene du ønsker å installere"
 
-#: steps_gtk.pm:542 steps_interactive.pm:648 steps_list.pm:32
+#: steps_gtk.pm:543 steps_interactive.pm:650 steps_list.pm:32
 #, c-format
 msgid "Installing"
 msgstr "Installerer"
 
-#: steps_gtk.pm:572
+#: steps_gtk.pm:573
 #, c-format
 msgid "No details"
 msgstr "Ingen detaljer"
 
-#: steps_gtk.pm:591
+#: steps_gtk.pm:592
 #, c-format
 msgid "Time remaining:"
 msgstr "Tid som gjenstår:"
 
-#: steps_gtk.pm:592
+#: steps_gtk.pm:593
 #, c-format
 msgid "(estimating...)"
 msgstr "(beregner … )"
 
-#: steps_gtk.pm:622
+#: steps_gtk.pm:623
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakker"
 
-#: steps_gtk.pm:677 steps_interactive.pm:812 steps_list.pm:43
+#: steps_gtk.pm:678 steps_interactive.pm:814 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Oppsummering"
 
-#: steps_gtk.pm:696
+#: steps_gtk.pm:697
 #, c-format
 msgid "Configure"
 msgstr "Sett opp"
 
-#: steps_gtk.pm:713 steps_interactive.pm:808 steps_interactive.pm:958
+#: steps_gtk.pm:714 steps_interactive.pm:810 steps_interactive.pm:962
 #, c-format
 msgid "not configured"
 msgstr "ikke satt opp"
 
-#: steps_gtk.pm:747
+#: steps_gtk.pm:748
 #, c-format
 msgid "Media Selection"
 msgstr "Medievalg"
 
-#: steps_gtk.pm:756 steps_interactive.pm:340
+#: steps_gtk.pm:757 steps_interactive.pm:340
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -996,7 +996,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:772 steps_interactive.pm:346
+#: steps_gtk.pm:773 steps_interactive.pm:346
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1009,7 +1009,7 @@ msgstr ""
 "Den vil da fortsette fra harddisken og pakkene vil forbli tilgjengelige når "
 "systemet er fullstendig installert."
 
-#: steps_gtk.pm:774 steps_interactive.pm:348
+#: steps_gtk.pm:775 steps_interactive.pm:348
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiér hele CDer"
@@ -1193,17 +1193,17 @@ msgstr ""
 "Her kan du velge skrivebordprofilen for systemet; «KDE», «GNOME» eller "
 "«Skreddersydd»."
 
-#: steps_interactive.pm:568
+#: steps_interactive.pm:569
 #, c-format
 msgid "Selected size is larger than available space"
 msgstr "Valgt størrelse er større enn tilgjengelig plass"
 
-#: steps_interactive.pm:584
+#: steps_interactive.pm:585
 #, c-format
 msgid "Type of install"
 msgstr "Type installasjon"
 
-#: steps_interactive.pm:585
+#: steps_interactive.pm:586
 #, c-format
 msgid ""
 "You have not selected any group of packages.\n"
@@ -1212,87 +1212,87 @@ msgstr ""
 "Du har ikke valgt noen pakkegrupper.\n"
 "Velg den minimale installasjonen du ønsker:"
 
-#: steps_interactive.pm:590
+#: steps_interactive.pm:591
 #, c-format
 msgid "With X"
 msgstr "Med X"
 
-#: steps_interactive.pm:591
+#: steps_interactive.pm:592
 #, c-format
 msgid "Install suggested packages"
 msgstr "Installerer foreslåtte pakker"
 
-#: steps_interactive.pm:592
+#: steps_interactive.pm:593
 #, c-format
 msgid "With basic documentation (recommended!)"
 msgstr "Med grunnleggende dokumentasjon (anbefalt!)"
 
-#: steps_interactive.pm:593
+#: steps_interactive.pm:594
 #, c-format
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Virkelig minimal installasjon (uten urpmi)"
 
-#: steps_interactive.pm:649
+#: steps_interactive.pm:651
 #, c-format
 msgid "Preparing installation"
 msgstr "Forbereder installasjon"
 
-#: steps_interactive.pm:657
+#: steps_interactive.pm:659
 #, c-format
 msgid "Installing package %s"
 msgstr "Installerer pakke %s"
 
-#: steps_interactive.pm:681
+#: steps_interactive.pm:683
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Det var en feil ved endring av pakkenes rekkefølge:"
 
-#: steps_interactive.pm:681
+#: steps_interactive.pm:683
 #, c-format
 msgid "Go on anyway?"
 msgstr "Fortsett uansett?"
 
-#: steps_interactive.pm:685
+#: steps_interactive.pm:687
 #, c-format
 msgid "Retry"
 msgstr "Prøv igjen"
 
-#: steps_interactive.pm:686
+#: steps_interactive.pm:688
 #, c-format
 msgid "Skip this package"
 msgstr "Hopp over denne pakken"
 
-#: steps_interactive.pm:687
+#: steps_interactive.pm:689
 #, c-format
 msgid "Skip all packages from medium \"%s\""
 msgstr "Hopp over alle pakker fra media \"%s\""
 
-#: steps_interactive.pm:688
+#: steps_interactive.pm:690
 #, c-format
 msgid "Go back to media and packages selection"
 msgstr "Gå tilbake til valg av media og pakker"
 
-#: steps_interactive.pm:691
+#: steps_interactive.pm:693
 #, c-format
 msgid "There was an error installing package %s."
 msgstr "Feil under installering av pakke %s"
 
-#: steps_interactive.pm:710
+#: steps_interactive.pm:712
 #, c-format
 msgid "Post-install configuration"
 msgstr "Oppsett etter installering"
 
-#: steps_interactive.pm:717
+#: steps_interactive.pm:719
 #, 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:745 steps_list.pm:47
+#: steps_interactive.pm:747 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: steps_interactive.pm:746
+#: steps_interactive.pm:748
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1311,28 +1311,29 @@ msgstr ""
 "\n"
 "Ønsker du å installere oppdateringene?"
 
-#: steps_interactive.pm:854
+#. -PO: example: lilo-graphic on /dev/hda1
+#: steps_interactive.pm:858
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:886 steps_interactive.pm:893 steps_interactive.pm:906
-#: steps_interactive.pm:923 steps_interactive.pm:938
+#: steps_interactive.pm:890 steps_interactive.pm:897 steps_interactive.pm:910
+#: steps_interactive.pm:927 steps_interactive.pm:942
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: steps_interactive.pm:907 steps_interactive.pm:924
+#: steps_interactive.pm:911 steps_interactive.pm:928
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:927
+#: steps_interactive.pm:931
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA-lydkort?"
 
-#: steps_interactive.pm:929
+#: steps_interactive.pm:933
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1341,74 +1342,74 @@ msgstr ""
 "Kjør «alsaconf» eller «sndconfig» etter installasjonen for å sette opp "
 "lydkortet ditt"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:935
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
 
-#: steps_interactive.pm:939
+#: steps_interactive.pm:943
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:945 steps_interactive.pm:956
+#: steps_interactive.pm:949 steps_interactive.pm:960
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk & internett"
 
-#: steps_interactive.pm:957
+#: steps_interactive.pm:961
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtjenere"
 
-#: steps_interactive.pm:958
+#: steps_interactive.pm:962
 #, c-format
 msgid "configured"
 msgstr "satt opp"
 
-#: steps_interactive.pm:968
+#: steps_interactive.pm:972
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhetsnivå"
 
-#: steps_interactive.pm:987
+#: steps_interactive.pm:992
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:996
 #, c-format
 msgid "activated"
 msgstr "aktivert"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:996
 #, c-format
 msgid "disabled"
 msgstr "deaktiver"
 
-#: steps_interactive.pm:1005
+#: steps_interactive.pm:1010
 #, 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:1034
+#: steps_interactive.pm:1039
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Klargjør oppstartslaster … "
 
-#: steps_interactive.pm:1034
+#: steps_interactive.pm:1039
 #, fuzzy, c-format
 msgid "Preparing initial startup program..."
 msgstr "Forbereder installasjon"
 
-#: steps_interactive.pm:1035
+#: steps_interactive.pm:1040
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Vennligst vær tålmodig, dette kan ta en stund … "
 
-#: steps_interactive.pm:1046
+#: steps_interactive.pm:1051
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
@@ -1421,7 +1422,7 @@ msgstr ""
 "du må bruke BootX eller andre måter for å starte din maskin. "
 "Kjerneargumentet for root-filsystemet er: root=%s"
 
-#: steps_interactive.pm:1059
+#: steps_interactive.pm:1064
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1430,17 +1431,17 @@ msgstr ""
 "I dette sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt "
 "administratoren."
 
-#: steps_interactive.pm:1091
+#: steps_interactive.pm:1096
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: steps_interactive.pm:1093
+#: steps_interactive.pm:1098
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Oppretter diskett for autoinstallasjon … "
 
-#: steps_interactive.pm:1104
+#: steps_interactive.pm:1109
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1451,12 +1452,12 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å avslutte nå?"
 
-#: steps_interactive.pm:1114
+#: steps_interactive.pm:1119
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
 
-#: steps_interactive.pm:1117
+#: steps_interactive.pm:1122
 #, c-format
 msgid "Reboot"
 msgstr "Restart"
@@ -1593,6 +1594,9 @@ msgid ""
 "Exit"
 msgstr "Avslutt"
 
+#~ msgid "Bad package"
+#~ msgstr "Ugyldig pakke"
+
 #, fuzzy
 #~ msgid "Preparing boot images..."
 #~ msgstr "Klargjør oppstartslaster … "