sync with code

1 files changed, 120 insertions, 118 deletions

diff --git a/perl-install/install/share/po/nb.po b/perl-install/install/share/po/nb.po
index e4d332b43..ead473d48 100644
--- a/perl-install/install/share/po/nb.po
+++ b/perl-install/install/share/po/nb.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-20 22:53+0200\n"
+"POT-Creation-Date: 2016-01-02 14:54+0100\n"
 "PO-Revision-Date: 2015-05-26 19:12+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/mageia/"
@@ -100,88 +100,83 @@ msgstr ""
 
 #: any.pm:162
 #, c-format
-msgid "CD-ROM"
-msgstr "CD-ROM"
-
-#: any.pm:163
-#, c-format
 msgid "Network (HTTP)"
 msgstr "Nettverk (HTTP)"
 
-#: any.pm:164
+#: any.pm:163
 #, c-format
 msgid "Network (FTP)"
 msgstr "Nettverk (FTP)"
 
-#: any.pm:165
+#: any.pm:164
 #, c-format
 msgid "Network (NFS)"
 msgstr "Nettverk (NFS)"
 
-#: any.pm:224
+#: any.pm:223
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Nettadresse til speilet?"
 
-#: any.pm:230
+#: any.pm:229
 #, c-format
 msgid "URL must start with ftp:// or http://"
 msgstr "URL må starte med ftp:// eller http://"
 
-#: any.pm:248
+#: any.pm:247
 #, c-format
 msgid "Contacting %s web site to get the list of available mirrors..."
 msgstr ""
 "Kontakter nettstedet til %s for å få listen over tilgjengelige speil … "
 
-#: any.pm:253
+#: any.pm:252
 #, c-format
 msgid "Failed contacting %s web site to get the list of available mirrors"
 msgstr ""
 "Klarte ikke å kontakte nettstedet til %s for å få listen over tilgjengelige "
 "speil"
 
-#: any.pm:263
+#: any.pm:262
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Velg et speil som pakkene kan hentes fra"
 
-#: any.pm:293
+#: any.pm:290
 #, c-format
 msgid "NFS setup"
 msgstr "NFS-oppsett"
 
-#: any.pm:294
+#: any.pm:291
 #, c-format
 msgid "Please enter the hostname and directory of your NFS media"
 msgstr "Tast inn vertsnavnet og mappen til ditt NFS-medie"
 
-#: any.pm:298
+#: any.pm:295
 #, c-format
 msgid "Hostname missing"
 msgstr "Vertsnavn mangler"
 
-#: any.pm:299
+#: any.pm:296
 #, c-format
 msgid "Directory must begin with \"/\""
 msgstr "Mappenavnet må starte med \"/\""
 
-#: any.pm:303
+#: any.pm:300
 #, c-format
 msgid "Hostname of the NFS mount ?"
 msgstr "Vertsnavn til NFS-monteringen ?"
 
-#: any.pm:304
+#: any.pm:301
 #, c-format
 msgid "Directory"
 msgstr "Mappe"
 
-#: any.pm:334
+#: any.pm:331
 #, c-format
 msgid "Supplementary"
 msgstr "Ekstra"
 
-#: any.pm:369
+#: any.pm:366
 #, c-format
 msgid ""
 "Can't find a package list file on this mirror. Make sure the location is "
@@ -190,84 +185,84 @@ msgstr ""
 "Kan ikke finne pakkelistefil på dette speilet. Kontrollér at adressen er "
 "riktig."
 
-#: any.pm:394
+#: any.pm:391
 #, c-format
 msgid "Core Release"
 msgstr ""
 
-#: any.pm:396
+#: any.pm:393
 #, c-format
 msgid "Tainted Release"
 msgstr ""
 
-#: any.pm:398
+#: any.pm:395
 #, c-format
 msgid "Nonfree Release"
 msgstr ""
 
-#: any.pm:436
+#: any.pm:433
 #, c-format
 msgid ""
 "Some hardware on your machine needs some non free firmwares in order for the "
 "free software drivers to work."
 msgstr ""
 
-#: any.pm:437
+#: any.pm:434
 #, c-format
 msgid "You should enable \"%s\""
 msgstr ""
 
-#: any.pm:475
+#: any.pm:472
 #, c-format
 msgid "\"%s\" contains the various pieces of the systems and its applications"
 msgstr ""
 
-#: any.pm:476
+#: any.pm:473
 #, c-format
 msgid "\"%s\" contains non free software.\n"
 msgstr ""
 
-#: any.pm:477
+#: any.pm:474
 #, c-format
 msgid ""
 "It also contains firmwares needed for certain devices to operate (eg: some "
 "ATI/AMD graphic cards, some network cards, some RAID cards, ...)"
 msgstr ""
 
-#: any.pm:478
+#: any.pm:475
 #, c-format
 msgid ""
 "\"%s\" contains software that can not be distributed in every country due to "
 "software patents."
 msgstr ""
 
-#: any.pm:479
+#: any.pm:476
 #, c-format
 msgid ""
 "It also contains software from \"%s\" rebuild with additional capabilities."
 msgstr ""
 
-#: any.pm:485
+#: any.pm:482
 #, c-format
 msgid "Here you can enable more media if you want."
 msgstr ""
 
-#: any.pm:502
+#: any.pm:499
 #, c-format
 msgid "This medium provides package updates for medium \"%s\""
 msgstr ""
 
-#: any.pm:600
+#: any.pm:597
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Ser på pakker som allerede er installert … "
 
-#: any.pm:634
+#: any.pm:631
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Finner pakker som skal oppgraderes … "
 
-#: any.pm:653
+#: any.pm:650
 #, c-format
 msgid "Removing packages prior to upgrade..."
 msgstr "Fjerner pakker før oppgradering … "
@@ -317,7 +312,7 @@ msgstr "FTP"
 msgid "NFS"
 msgstr "NFS"
 
-#: any.pm:1382 steps_interactive.pm:948
+#: any.pm:1382 steps_interactive.pm:973
 #, c-format
 msgid "Network"
 msgstr "Nettverk"
@@ -367,7 +362,7 @@ msgstr "Installasjon"
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: install2.pm:210
+#: install2.pm:211
 #, c-format
 msgid "You must also format %s"
 msgstr "Du må også formatere %s"
@@ -391,22 +386,22 @@ msgstr "Henter opp nettverket"
 msgid "Bringing down the network"
 msgstr "Tar ned nettverket"
 
-#: media.pm:404
+#: media.pm:407
 #, c-format
 msgid "Please wait, retrieving file"
 msgstr "Vennligst vent, henter fil"
 
-#: media.pm:712
+#: media.pm:714
 #, c-format
 msgid "unable to add medium"
 msgstr "kunne ikke legge til medium"
 
-#: media.pm:752
+#: media.pm:754
 #, c-format
 msgid "Copying some packages on disks for future use"
 msgstr "Kopiér noen pakker på disken for framtidig bruk"
 
-#: media.pm:805
+#: media.pm:807
 #, c-format
 msgid "Copying in progress"
 msgstr "Kopiering pågår"
@@ -451,7 +446,7 @@ msgstr "Ingen xml-info for mediet «%s», bare delvis resultat for pakke %s"
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: pkgs.pm:286
+#: pkgs.pm:288
 #, c-format
 msgid ""
 "Some packages requested by %s cannot be installed:\n"
@@ -460,27 +455,27 @@ msgstr ""
 "Noen pakker krevet av %s kan ikke installeres\n"
 "%s"
 
-#: pkgs.pm:382 pkgs.pm:409
+#: pkgs.pm:384 pkgs.pm:411
 #, c-format
 msgid "An error occurred:"
 msgstr "En feil oppstod:"
 
-#: pkgs.pm:401
+#: pkgs.pm:403
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "Det oppsto en kritisk feil: %s."
 
-#: pkgs.pm:895 pkgs.pm:937
+#: pkgs.pm:897 pkgs.pm:939
 #, c-format
 msgid "Do not ask again"
 msgstr "Ikke spør igjen"
 
-#: pkgs.pm:911
+#: pkgs.pm:913
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d mislykket installasjonstransaksjon"
 
-#: pkgs.pm:912
+#: pkgs.pm:914
 #, c-format
 msgid "Installation of packages failed:"
 msgstr "Installasjon av pakker feilet:"
@@ -563,33 +558,33 @@ msgstr "Konsollverktøy"
 msgid "Editors, shells, file tools, terminals"
 msgstr "Tekstprogrammer, skall, filverktøy, terminaler"
 
-#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:206
-#: share/meta-task/compssUsers.pl:208
+#: share/meta-task/compssUsers.pl:58 share/meta-task/compssUsers.pl:201
+#: share/meta-task/compssUsers.pl:203
 #, c-format
 msgid "Development"
 msgstr "Utvikling"
 
-#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:209
+#: share/meta-task/compssUsers.pl:59 share/meta-task/compssUsers.pl:204
 #, 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:63 share/meta-task/compssUsers.pl:213
+#: share/meta-task/compssUsers.pl:63 share/meta-task/compssUsers.pl:208
 #, c-format
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:214
+#: share/meta-task/compssUsers.pl:64 share/meta-task/compssUsers.pl:209
 #, 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:68 share/meta-task/compssUsers.pl:217
+#: share/meta-task/compssUsers.pl:68 share/meta-task/compssUsers.pl:212
 #, c-format
 msgid "LSB"
 msgstr "LSB"
 
-#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:218
+#: share/meta-task/compssUsers.pl:69 share/meta-task/compssUsers.pl:213
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
 msgstr "Linux Standard Base. Støtte for tredjeparts programvare"
@@ -720,9 +715,9 @@ msgid "Graphical Environment"
 msgstr "Grafisk miljø"
 
 #: share/meta-task/compssUsers.pl:152
-#, c-format
-msgid "KDE Workstation"
-msgstr "KDE-arbeidsstasjon"
+#, fuzzy, c-format
+msgid "Plasma Workstation"
+msgstr "Arbeidsstasjon"
 
 #: share/meta-task/compssUsers.pl:153
 #, c-format
@@ -806,62 +801,50 @@ msgstr ""
 
 #: share/meta-task/compssUsers.pl:194
 #, c-format
-msgid "Plasma Desktop"
-msgstr ""
-
-#: share/meta-task/compssUsers.pl:195
-#, c-format
-msgid ""
-"The Plasma Desktop, the basic graphical environment with a collection of "
-"accompanying tools"
-msgstr ""
-
-#: share/meta-task/compssUsers.pl:199
-#, c-format
 msgid "Other Graphical Desktops"
 msgstr "Andre grafiske skrivebord"
 
-#: share/meta-task/compssUsers.pl:200
+#: share/meta-task/compssUsers.pl:195
 #, c-format
 msgid "Window Maker, Fvwm, etc"
 msgstr ""
 
-#: share/meta-task/compssUsers.pl:223
+#: share/meta-task/compssUsers.pl:218
 #, c-format
 msgid "Utilities"
 msgstr "Verktøy"
 
-#: share/meta-task/compssUsers.pl:225 share/meta-task/compssUsers.pl:226
+#: share/meta-task/compssUsers.pl:220 share/meta-task/compssUsers.pl:221
 #, c-format
 msgid "SSH Server"
 msgstr "SSH-tjener"
 
-#: share/meta-task/compssUsers.pl:230
+#: share/meta-task/compssUsers.pl:225
 #, c-format
 msgid "Webmin"
 msgstr "Webmin"
 
-#: share/meta-task/compssUsers.pl:231
+#: share/meta-task/compssUsers.pl:226
 #, c-format
 msgid "Webmin Remote Configuration Server"
 msgstr "Webmin Fjernadministrasjonstjener"
 
-#: share/meta-task/compssUsers.pl:235
+#: share/meta-task/compssUsers.pl:230
 #, c-format
 msgid "Network Utilities/Monitoring"
 msgstr "Nettverks-verktøy/overvåkning"
 
-#: share/meta-task/compssUsers.pl:236
+#: share/meta-task/compssUsers.pl:231
 #, c-format
 msgid "Monitoring tools, processes accounting, tcpdump, nmap, ..."
 msgstr "Overvårkningsverktøy, prosessbokføring, tcpdump, nmap,  … "
 
-#: share/meta-task/compssUsers.pl:240
+#: share/meta-task/compssUsers.pl:235
 #, c-format
 msgid "Mageia Wizards"
 msgstr "Mageia-veivisere"
 
-#: share/meta-task/compssUsers.pl:241
+#: share/meta-task/compssUsers.pl:236
 #, c-format
 msgid "Wizards to configure server"
 msgstr "Veivisere til å sette opp tjener"
@@ -876,7 +859,7 @@ msgstr ""
 "måte.\n"
 "Fortsett på eget ansvar."
 
-#: steps.pm:458
+#: steps.pm:460
 #, c-format
 msgid ""
 "Some important packages did not get installed properly.\n"
@@ -920,7 +903,7 @@ msgstr ""
 "tekstmodus\n"
 "i stedet. Trykk `F1' ved oppstart av CD-ROM, skriv så `text'."
 
-#: steps_gtk.pm:242 steps_gtk.pm:757
+#: steps_gtk.pm:242 steps_gtk.pm:754
 #, c-format
 msgid "Media Selection"
 msgstr "Medievalg"
@@ -1119,29 +1102,29 @@ msgstr "Tid som gjenstår:"
 msgid "(estimating...)"
 msgstr "(beregner … )"
 
-#: steps_gtk.pm:631
+#: steps_gtk.pm:627
 #, c-format
 msgid "%d package"
 msgid_plural "%d packages"
 msgstr[0] "%d pakke"
 msgstr[1] "%d pakker"
 
-#: steps_gtk.pm:687 steps_interactive.pm:809 steps_list.pm:43
+#: steps_gtk.pm:684 steps_interactive.pm:834 steps_list.pm:43
 #, c-format
 msgid "Summary"
 msgstr "Oppsummering"
 
-#: steps_gtk.pm:706
+#: steps_gtk.pm:703
 #, c-format
 msgid "Configure"
 msgstr "Sett opp"
 
-#: steps_gtk.pm:723 steps_interactive.pm:805 steps_interactive.pm:961
+#: steps_gtk.pm:720 steps_interactive.pm:830 steps_interactive.pm:986
 #, c-format
 msgid "not configured"
 msgstr "ikke satt opp"
 
-#: steps_gtk.pm:766 steps_interactive.pm:315
+#: steps_gtk.pm:763 steps_interactive.pm:315
 #, c-format
 msgid ""
 "The following installation media have been found.\n"
@@ -1150,7 +1133,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:782 steps_interactive.pm:321
+#: steps_gtk.pm:779 steps_interactive.pm:321
 #, c-format
 msgid ""
 "You have the option to copy the contents of the CDs onto the hard disk drive "
@@ -1163,7 +1146,7 @@ msgstr ""
 "Den vil da fortsette fra harddisken og pakkene vil forbli tilgjengelige når "
 "systemet er fullstendig installert."
 
-#: steps_gtk.pm:784 steps_interactive.pm:323
+#: steps_gtk.pm:781 steps_interactive.pm:323
 #, c-format
 msgid "Copy whole CDs"
 msgstr "Kopiér hele CDer"
@@ -1239,12 +1222,12 @@ msgstr ""
 
 #: steps_interactive.pm:264
 #, c-format
-msgid "IDE"
-msgstr "IDE"
+msgid "CD/DVD"
+msgstr ""
 
 #: steps_interactive.pm:264
-#, c-format
-msgid "Configuring IDE"
+#, fuzzy, c-format
+msgid "Configuring CD/DVD"
 msgstr "Setter opp IDE"
 
 #: steps_interactive.pm:354
@@ -1419,7 +1402,7 @@ msgstr "Oppsett etter installering"
 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:739 steps_list.pm:47
+#: steps_interactive.pm:739 steps_interactive.pm:769 steps_list.pm:47
 #, c-format
 msgid "Updates"
 msgstr "Oppdateringer"
@@ -1443,7 +1426,17 @@ msgid ""
 "Do you want to setup the update media?"
 msgstr ""
 
-#: steps_interactive.pm:764
+#: steps_interactive.pm:762
+#, fuzzy, c-format
+msgid "Failure when adding medium"
+msgstr "kunne ikke legge til medium"
+
+#: steps_interactive.pm:762
+#, fuzzy, c-format
+msgid "Retry?"
+msgstr "Prøv igjen"
+
+#: steps_interactive.pm:770
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -1463,28 +1456,28 @@ msgstr ""
 "Ønsker du å installere oppdateringene?"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: steps_interactive.pm:853
+#: steps_interactive.pm:878
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: steps_interactive.pm:888 steps_interactive.pm:895 steps_interactive.pm:908
-#: steps_interactive.pm:925 steps_interactive.pm:940
+#: steps_interactive.pm:913 steps_interactive.pm:920 steps_interactive.pm:933
+#: steps_interactive.pm:950 steps_interactive.pm:965
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: steps_interactive.pm:909 steps_interactive.pm:926
+#: steps_interactive.pm:934 steps_interactive.pm:951
 #, c-format
 msgid "Sound card"
 msgstr "Lydkort"
 
-#: steps_interactive.pm:929
+#: steps_interactive.pm:954
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Har du et ISA-lydkort?"
 
-#: steps_interactive.pm:931
+#: steps_interactive.pm:956
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
@@ -1493,52 +1486,52 @@ msgstr ""
 "Kjør «alsaconf» eller «sndconfig» etter installasjonen for å sette opp "
 "lydkortet ditt"
 
-#: steps_interactive.pm:933
+#: steps_interactive.pm:958
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr "Lydkort ikke oppdaget. Prøv \"harddrake\" etter installasjonen"
 
-#: steps_interactive.pm:941
+#: steps_interactive.pm:966
 #, c-format
 msgid "Graphical interface"
 msgstr "Grafisk grensesnitt"
 
-#: steps_interactive.pm:947 steps_interactive.pm:959
+#: steps_interactive.pm:972 steps_interactive.pm:984
 #, c-format
 msgid "Network & Internet"
 msgstr "Nettverk & internett"
 
-#: steps_interactive.pm:960
+#: steps_interactive.pm:985
 #, c-format
 msgid "Proxies"
 msgstr "Mellomtjenere"
 
-#: steps_interactive.pm:961
+#: steps_interactive.pm:986
 #, c-format
 msgid "configured"
 msgstr "satt opp"
 
-#: steps_interactive.pm:971
+#: steps_interactive.pm:996
 #, c-format
 msgid "Security Level"
 msgstr "Sikkerhetsnivå"
 
-#: steps_interactive.pm:991
+#: steps_interactive.pm:1016
 #, c-format
 msgid "Firewall"
 msgstr "Brannmur"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:1020
 #, c-format
 msgid "activated"
 msgstr "aktivert"
 
-#: steps_interactive.pm:995
+#: steps_interactive.pm:1020
 #, c-format
 msgid "disabled"
 msgstr "deaktiver"
 
-#: steps_interactive.pm:1009
+#: steps_interactive.pm:1034
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr ""
@@ -1546,17 +1539,17 @@ msgstr ""
 "ikke vil gjøre dette?"
 
 #. -PO: This is NOT the boot loader (just the kernel initrds)!!!!
-#: steps_interactive.pm:1059
+#: steps_interactive.pm:1065
 #, c-format
 msgid "Preparing initial startup program..."
 msgstr ""
 
-#: steps_interactive.pm:1041
+#: steps_interactive.pm:1066
 #, c-format
 msgid "Be patient, this may take a while..."
 msgstr "Vennligst vær tålmodig, dette kan ta en stund … "
 
-#: steps_interactive.pm:1057
+#: steps_interactive.pm:1082
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -1565,17 +1558,17 @@ msgstr ""
 "I dette sikkerhetsnivået er tilgang til Windows-partisjonen forbeholdt "
 "administratoren."
 
-#: steps_interactive.pm:1089
+#: steps_interactive.pm:1114
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Sett inn en tom diskett i stasjon %s"
 
-#: steps_interactive.pm:1091
+#: steps_interactive.pm:1116
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Oppretter diskett for autoinstallasjon … "
 
-#: steps_interactive.pm:1102
+#: steps_interactive.pm:1127
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -1586,12 +1579,12 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å avslutte nå?"
 
-#: steps_interactive.pm:1112
+#: steps_interactive.pm:1137
 #, c-format
 msgid "Congratulations"
 msgstr "Gratulerer"
 
-#: steps_interactive.pm:1115
+#: steps_interactive.pm:1140
 #, c-format
 msgid "Reboot"
 msgstr "Restart"
@@ -1727,3 +1720,12 @@ msgid ""
 "_: Keep these entry short\n"
 "Exit"
 msgstr "Avslutt"
+
+#~ msgid "CD-ROM"
+#~ msgstr "CD-ROM"
+
+#~ msgid "KDE Workstation"
+#~ msgstr "KDE-arbeidsstasjon"
+
+#~ msgid "IDE"
+#~ msgstr "IDE"