Make merge

1 files changed, 392 insertions, 364 deletions

diff --git a/po/nb.po b/po/nb.po
index 9f9b413a..26283f25 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-nb\n"
-"POT-Creation-Date: 2005-01-14 18:50+0100\n"
+"POT-Creation-Date: 2005-01-18 13:29+0100\n"
 "PO-Revision-Date: 2004-10-27 11:48+0100\n"
 "Last-Translator: Eskild Hustvedt <eskild@goldenfiles.com>\n"
 "Language-Team: Norwegian Bokmål <nb@li.org>\n"
@@ -19,7 +19,37 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: ../edit-urpm-sources.pl:65
+#: ../edit-urpm-sources.pl:66
+#, c-format
+msgid "Choose media type"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:67
+#, c-format
+msgid ""
+"This step enables you to add sources from a Mandrakelinux web or FTP "
+"mirror.\n"
+"\n"
+"There are two kinds of official mirrors. You can choose to add sources that\n"
+"contain the complete set of packages of your distribution (usually a "
+"superset\n"
+"of what comes on the standard installation CDs), or sources that provide "
+"the\n"
+"official updates for your distribution. (You can add both, but you'll have\n"
+"to do this in two steps.)"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, c-format
+msgid "Distribution sources"
+msgstr ""
+
+#: ../edit-urpm-sources.pl:75
+#, fuzzy, c-format
+msgid "Official updates"
+msgstr "Normale oppdateringer"
+
+#: ../edit-urpm-sources.pl:78
 #, fuzzy, c-format
 msgid ""
 "This will attempt to install all official sources corresponding to your\n"
@@ -35,103 +65,93 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../edit-urpm-sources.pl:73
+#: ../edit-urpm-sources.pl:87
 #, fuzzy, c-format
 msgid "Please wait, adding media..."
 msgstr "Vennligst vent, oppdaterer media..."
 
-#: ../edit-urpm-sources.pl:93
+#: ../edit-urpm-sources.pl:120
 #, c-format
 msgid "Add a medium"
 msgstr "Legg til et medium"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Local files"
 msgstr "Lokale filer"
 
-#: ../edit-urpm-sources.pl:94
+#: ../edit-urpm-sources.pl:122
 #, c-format
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../edit-urpm-sources.pl:95
+#: ../edit-urpm-sources.pl:123
 #, c-format
 msgid "FTP server"
 msgstr "FTP-tjener"
 
-#: ../edit-urpm-sources.pl:95 ../edit-urpm-sources.pl:96
-#: ../edit-urpm-sources.pl:98 ../edit-urpm-sources.pl:373
+#: ../edit-urpm-sources.pl:123 ../edit-urpm-sources.pl:124
+#: ../edit-urpm-sources.pl:382
 #, c-format
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl:96
+#: ../edit-urpm-sources.pl:124
 #, c-format
 msgid "HTTP server"
 msgstr "HTTP-tjener"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Removable device"
 msgstr "Fjernbar enhet"
 
-#: ../edit-urpm-sources.pl:97
+#: ../edit-urpm-sources.pl:125
 #, c-format
 msgid "Path or mount point:"
 msgstr "Sti eller monteringspunkt:"
 
-#: ../edit-urpm-sources.pl:98 ../rpmdrake:859
-#, c-format
-msgid "Security updates"
-msgstr "Sikkerhetsoppdateringer"
-
-#: ../edit-urpm-sources.pl:114
+#: ../edit-urpm-sources.pl:141
 #, c-format
 msgid "Browse..."
 msgstr "Kikke..."
 
-#: ../edit-urpm-sources.pl:121
-#, c-format
-msgid "Choose a mirror..."
-msgstr "Velg et speil..."
-
-#: ../edit-urpm-sources.pl:159
+#: ../edit-urpm-sources.pl:171
 #, c-format
 msgid "Login:"
 msgstr "Logginn:"
 
-#: ../edit-urpm-sources.pl:159 ../edit-urpm-sources.pl:450
+#: ../edit-urpm-sources.pl:171 ../edit-urpm-sources.pl:459
 #, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../edit-urpm-sources.pl:164 ../edit-urpm-sources.pl:374
+#: ../edit-urpm-sources.pl:176 ../edit-urpm-sources.pl:383
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativ sti til synthesis/hdlist:"
 
-#: ../edit-urpm-sources.pl:166
+#: ../edit-urpm-sources.pl:178
 #, c-format
 msgid "If left blank, synthesis/hdlist will be automatically probed"
 msgstr "Hvis etterlat tom, synthesis/hdlist vil bli automatisk sjekket"
 
-#: ../edit-urpm-sources.pl:171
+#: ../edit-urpm-sources.pl:183
 #, c-format
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../edit-urpm-sources.pl:184
+#: ../edit-urpm-sources.pl:194
 #, c-format
 msgid "Create media for a whole distribution"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:203
+#: ../edit-urpm-sources.pl:212
 #, c-format
 msgid "You need to fill up at least the two first entries."
 msgstr "Du må minst fylle opp de to første oppføringene."
 
-#: ../edit-urpm-sources.pl:207
+#: ../edit-urpm-sources.pl:216
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
@@ -140,126 +160,126 @@ msgstr ""
 "Det er allerede et medium med det navnet, vil du\n"
 "virkelig bytte det ut?"
 
-#: ../edit-urpm-sources.pl:218
+#: ../edit-urpm-sources.pl:227
 #, c-format
 msgid "Adding a medium:"
 msgstr "Legger til et medium:"
 
-#: ../edit-urpm-sources.pl:219
+#: ../edit-urpm-sources.pl:228
 #, c-format
 msgid "Type of medium:"
 msgstr "Mediumstype:"
 
-#: ../edit-urpm-sources.pl:224 ../edit-urpm-sources.pl:294
-#: ../edit-urpm-sources.pl:380 ../edit-urpm-sources.pl:405
-#: ../edit-urpm-sources.pl:467 ../edit-urpm-sources.pl:548
-#: ../edit-urpm-sources.pl:588 ../edit-urpm-sources.pl:646
-#: ../edit-urpm-sources.pl:786 ../rpmdrake:159 ../rpmdrake:626
-#: ../rpmdrake:1393 ../rpmdrake:1401 ../rpmdrake.pm:505 ../rpmdrake.pm:595
-#: ../rpmdrake.pm:664
+#: ../edit-urpm-sources.pl:233 ../edit-urpm-sources.pl:303
+#: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
+#: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
+#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:794 ../rpmdrake:159 ../rpmdrake:676
+#: ../rpmdrake:1418 ../rpmdrake:1426 ../rpmdrake.pm:502 ../rpmdrake.pm:592
+#: ../rpmdrake.pm:661
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../edit-urpm-sources.pl:226 ../edit-urpm-sources.pl:296
-#: ../edit-urpm-sources.pl:405 ../edit-urpm-sources.pl:457
-#: ../edit-urpm-sources.pl:545 ../edit-urpm-sources.pl:587
-#: ../edit-urpm-sources.pl:639 ../edit-urpm-sources.pl:711
-#: ../edit-urpm-sources.pl:779 ../edit-urpm-sources.pl:832
-#: ../edit-urpm-sources.pl:982 ../rpmdrake:159 ../rpmdrake:626 ../rpmdrake:646
-#: ../rpmdrake:651 ../rpmdrake:1335 ../rpmdrake:1393 ../rpmdrake:1537
-#: ../rpmdrake.pm:196 ../rpmdrake.pm:253 ../rpmdrake.pm:505
+#: ../edit-urpm-sources.pl:235 ../edit-urpm-sources.pl:305
+#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:466
+#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
+#: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
+#: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:990 ../rpmdrake:159 ../rpmdrake:676 ../rpmdrake:693
+#: ../rpmdrake:698 ../rpmdrake:1360 ../rpmdrake:1418 ../rpmdrake:1561
+#: ../rpmdrake.pm:191 ../rpmdrake.pm:248 ../rpmdrake.pm:502
 #, c-format
 msgid "Ok"
 msgstr "Ok"
 
-#: ../edit-urpm-sources.pl:278
+#: ../edit-urpm-sources.pl:287
 #, fuzzy, c-format
 msgid "Global options for package installation"
 msgstr "Forbereder pakker for installasjon..."
 
-#: ../edit-urpm-sources.pl:280
+#: ../edit-urpm-sources.pl:289
 #, c-format
 msgid "always"
 msgstr ""
 
-#: ../edit-urpm-sources.pl:281
+#: ../edit-urpm-sources.pl:290
 #, fuzzy, c-format
 msgid "never"
 msgstr "Tjenere"
 
-#: ../edit-urpm-sources.pl:290
+#: ../edit-urpm-sources.pl:299
 #, fuzzy, c-format
 msgid "Verify RPMs to be installed:"
 msgstr "Noen pakker kan ikke installeres"
 
-#: ../edit-urpm-sources.pl:291
+#: ../edit-urpm-sources.pl:300
 #, fuzzy, c-format
 msgid "Download program to use:"
 msgstr "Nedlastning av `%s', hastighet:%s"
 
-#: ../edit-urpm-sources.pl:321
+#: ../edit-urpm-sources.pl:330
 #, c-format
 msgid "Source Removal"
 msgstr "Fjerning av kilder"
 
-#: ../edit-urpm-sources.pl:322
+#: ../edit-urpm-sources.pl:331
 #, c-format
 msgid "Are you sure you want to remove source \"%s\"?"
 msgstr "Er du sikker på at du vil fjerne kilden \"%s\"?"
 
-#: ../edit-urpm-sources.pl:327
+#: ../edit-urpm-sources.pl:336
 #, c-format
 msgid "Please wait, removing medium..."
 msgstr "Vennligst vent, fjerner medium..."
 
-#: ../edit-urpm-sources.pl:364
+#: ../edit-urpm-sources.pl:373
 #, c-format
 msgid "Edit a medium"
 msgstr "Rediger et medium"
 
-#: ../edit-urpm-sources.pl:370
+#: ../edit-urpm-sources.pl:379
 #, c-format
 msgid "Editing medium \"%s\":"
 msgstr "Redigerer medium \"%s\":"
 
-#: ../edit-urpm-sources.pl:384
+#: ../edit-urpm-sources.pl:393
 #, c-format
 msgid "Save changes"
 msgstr "Lagre endringer"
 
-#: ../edit-urpm-sources.pl:392 ../edit-urpm-sources.pl:969
+#: ../edit-urpm-sources.pl:401 ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Proxy..."
 msgstr "Proxy..."
 
-#: ../edit-urpm-sources.pl:403
+#: ../edit-urpm-sources.pl:412
 #, c-format
 msgid "You need to insert the medium to continue"
 msgstr "Du må sette inn mediumet for å fortsette"
 
-#: ../edit-urpm-sources.pl:404
+#: ../edit-urpm-sources.pl:413
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "For å kunne lagre endringene må du sette inn et medium i stasjonen."
 
-#: ../edit-urpm-sources.pl:426
+#: ../edit-urpm-sources.pl:435
 #, c-format
 msgid "Configure proxies"
 msgstr "Konfigurer proxier"
 
-#: ../edit-urpm-sources.pl:436
+#: ../edit-urpm-sources.pl:445
 #, c-format
 msgid "Proxy settings for media \"%s\""
 msgstr "Proxyoppsett for media \"%s\""
 
-#: ../edit-urpm-sources.pl:437
+#: ../edit-urpm-sources.pl:446
 #, c-format
 msgid "Global proxy settings"
 msgstr "Globalt proxyoppsett"
 
-#: ../edit-urpm-sources.pl:439
+#: ../edit-urpm-sources.pl:448
 #, c-format
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
@@ -268,165 +288,165 @@ msgstr ""
 "Hvis du trenger en proxy, entre vertsnavnet og en port (syntaks: <proxyvert[:"
 "port]>):"
 
-#: ../edit-urpm-sources.pl:442
+#: ../edit-urpm-sources.pl:451
 #, c-format
 msgid "Proxy hostname:"
 msgstr "Proxy-vertsnavn:"
 
-#: ../edit-urpm-sources.pl:445
+#: ../edit-urpm-sources.pl:454
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "Du kan spesifisere en /bruker/passord for proxy autentifiseringen:"
 
-#: ../edit-urpm-sources.pl:448
+#: ../edit-urpm-sources.pl:457
 #, c-format
 msgid "User:"
 msgstr "Bruker:"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Add a parallel group"
 msgstr "Legg til en parallell-gruppe"
 
-#: ../edit-urpm-sources.pl:516
+#: ../edit-urpm-sources.pl:525
 #, c-format
 msgid "Edit a parallel group"
 msgstr "Rediger en parallell-gruppe"
 
-#: ../edit-urpm-sources.pl:527
+#: ../edit-urpm-sources.pl:536
 #, c-format
 msgid "Add a medium limit"
 msgstr "Legg til en mediumgrense"
 
-#: ../edit-urpm-sources.pl:539
+#: ../edit-urpm-sources.pl:548
 #, c-format
 msgid "Choose a medium for adding in the media limit:"
 msgstr "Velg et medium for å legge til i mediagrensa:"
 
-#: ../edit-urpm-sources.pl:576
+#: ../edit-urpm-sources.pl:585
 #, c-format
 msgid "Add a host"
 msgstr "Legg til en vert"
 
-#: ../edit-urpm-sources.pl:582
+#: ../edit-urpm-sources.pl:591
 #, c-format
 msgid "Type in the hostname or IP address of the host to add:"
 msgstr ""
 "Skriv inn vertsnavnet eller IP-adressen til verten som skal legges til:"
 
-#: ../edit-urpm-sources.pl:613
+#: ../edit-urpm-sources.pl:622
 #, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "Rediger parallell-gruppe \"%s\":"
 
-#: ../edit-urpm-sources.pl:617
+#: ../edit-urpm-sources.pl:626
 #, c-format
 msgid "Group name:"
 msgstr "Gruppenavn:"
 
-#: ../edit-urpm-sources.pl:618
+#: ../edit-urpm-sources.pl:627
 #, c-format
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../edit-urpm-sources.pl:620
+#: ../edit-urpm-sources.pl:629
 #, c-format
 msgid "Media limit:"
 msgstr "Mediagrense:"
 
-#: ../edit-urpm-sources.pl:625 ../edit-urpm-sources.pl:632
+#: ../edit-urpm-sources.pl:634 ../edit-urpm-sources.pl:641
 #, c-format
 msgid "Add"
 msgstr "Legg til"
 
-#: ../edit-urpm-sources.pl:626 ../edit-urpm-sources.pl:633
-#: ../edit-urpm-sources.pl:691 ../edit-urpm-sources.pl:947 ../rpmdrake:1131
+#: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1154
 #, c-format
 msgid "Remove"
 msgstr "Fjern"
 
-#: ../edit-urpm-sources.pl:627
+#: ../edit-urpm-sources.pl:636
 #, c-format
 msgid "Hosts:"
 msgstr "Verter:"
 
-#: ../edit-urpm-sources.pl:661
+#: ../edit-urpm-sources.pl:670
 #, c-format
 msgid "Configure parallel urpmi (distributed execution of urpmi)"
 msgstr "Konfigurer parallell-urpmi (distribuert kjøring av urpmi)"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../edit-urpm-sources.pl:664
+#: ../edit-urpm-sources.pl:673
 #, c-format
 msgid "Media limit"
 msgstr "Mediagrense"
 
-#: ../edit-urpm-sources.pl:665
+#: ../edit-urpm-sources.pl:674
 #, c-format
 msgid "Command"
 msgstr "Kommando"
 
-#: ../edit-urpm-sources.pl:675 ../rpmdrake:349 ../rpmdrake:366 ../rpmdrake:488
-#: ../rpmdrake:560
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:353 ../rpmdrake:370 ../rpmdrake:492
+#: ../rpmdrake:608
 #, c-format
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../edit-urpm-sources.pl:695 ../edit-urpm-sources.pl:951
+#: ../edit-urpm-sources.pl:704 ../edit-urpm-sources.pl:959
 #, c-format
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../edit-urpm-sources.pl:703 ../edit-urpm-sources.pl:957
+#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:965
 #, c-format
 msgid "Add..."
 msgstr "Legg til..."
 
-#: ../edit-urpm-sources.pl:719
+#: ../edit-urpm-sources.pl:728
 #, c-format
 msgid "Manage keys for digital signatures of packages"
 msgstr "Håndter nøkler for digitale signaturer av pakker"
 
-#: ../edit-urpm-sources.pl:723 ../edit-urpm-sources.pl:866
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:874
 #, c-format
 msgid "Medium"
 msgstr "Medium"
 
-#: ../edit-urpm-sources.pl:728
+#: ../edit-urpm-sources.pl:737
 #, c-format
 msgid "Keys"
 msgstr "Nøkler"
 
-#: ../edit-urpm-sources.pl:747
+#: ../edit-urpm-sources.pl:756
 #, c-format
 msgid "no name found, key doesn't exist in rpm keyring!"
 msgstr "inget navn funnet, nøkkel eksisterer ikke i rpm-nøkkelring!"
 
-#: ../edit-urpm-sources.pl:761
+#: ../edit-urpm-sources.pl:769
 #, c-format
 msgid "Add a key"
 msgstr "Legg til en nøkkel"
 
-#: ../edit-urpm-sources.pl:773
+#: ../edit-urpm-sources.pl:781
 #, c-format
 msgid "Choose a key for adding to the medium %s"
 msgstr "Velg en nøkkel for å legge til mediumet %s"
 
-#: ../edit-urpm-sources.pl:801
+#: ../edit-urpm-sources.pl:809
 #, c-format
 msgid "Remove a key"
 msgstr "Fjern en nøkkel"
 
-#: ../edit-urpm-sources.pl:802
+#: ../edit-urpm-sources.pl:810
 #, c-format
 msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
@@ -435,77 +455,77 @@ msgstr ""
 "Er du sikker på at du vil fjerne nøkkelen %s fra medium %s?\n"
 "(navn på nøkkelen: %s)"
 
-#: ../edit-urpm-sources.pl:820
+#: ../edit-urpm-sources.pl:828
 #, c-format
 msgid "Add a key..."
 msgstr "Legg til en nøkkel..."
 
-#: ../edit-urpm-sources.pl:824
+#: ../edit-urpm-sources.pl:832
 #, c-format
 msgid "Remove key"
 msgstr "Fjern nøkkel"
 
-#: ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:848
 #, c-format
 msgid "Configure media"
 msgstr "Konfigurer media"
 
-#: ../edit-urpm-sources.pl:865
+#: ../edit-urpm-sources.pl:873
 #, c-format
 msgid "Enabled?"
 msgstr "Aktivert?"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Update medium"
 msgstr "Oppdater medium"
 
-#: ../edit-urpm-sources.pl:878
+#: ../edit-urpm-sources.pl:886
 #, c-format
 msgid "Regenerate hdlist"
 msgstr "Regenerer hdliste"
 
-#: ../edit-urpm-sources.pl:890 ../rpmdrake.pm:588
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:585
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Vennligst vent, oppdaterer media..."
 
-#: ../edit-urpm-sources.pl:894
+#: ../edit-urpm-sources.pl:902
 #, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "Vennligst vent, oppdaterer hdliste..."
 
-#: ../edit-urpm-sources.pl:961
+#: ../edit-urpm-sources.pl:969
 #, fuzzy, c-format
 msgid "Add custom..."
 msgstr "Legg til..."
 
-#: ../edit-urpm-sources.pl:965
+#: ../edit-urpm-sources.pl:973
 #, c-format
 msgid "Update..."
 msgstr "Oppdater..."
 
-#: ../edit-urpm-sources.pl:968
+#: ../edit-urpm-sources.pl:976
 #, c-format
 msgid "Manage keys..."
 msgstr "Håndter nøkler..."
 
-#: ../edit-urpm-sources.pl:970
+#: ../edit-urpm-sources.pl:978
 #, c-format
 msgid "Parallel..."
 msgstr "Parallell..."
 
-#: ../edit-urpm-sources.pl:971
+#: ../edit-urpm-sources.pl:979
 #, fuzzy, c-format
 msgid "Global options..."
 msgstr "Globalt proxyoppsett"
 
-#: ../edit-urpm-sources.pl:981
+#: ../edit-urpm-sources.pl:989
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../edit-urpm-sources.pl:993 ../gurpmi.addmedia:75 ../rpmdrake:1648
+#: ../edit-urpm-sources.pl:1001 ../gurpmi.addmedia:75 ../rpmdrake:1672
 #, c-format
 msgid ""
 "%s\n"
@@ -516,7 +536,7 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../edit-urpm-sources.pl:996
+#: ../edit-urpm-sources.pl:1004
 #, c-format
 msgid ""
 "Welcome to the Software Media Manager!\n"
@@ -533,7 +553,7 @@ msgstr ""
 "programvarepakker\n"
 "eller å utføre oppdateringer."
 
-#: ../edit-urpm-sources.pl:1008
+#: ../edit-urpm-sources.pl:1016
 #, c-format
 msgid ""
 "Packages database is locked. Please close other applications\n"
@@ -610,7 +630,7 @@ msgstr "Komprimering"
 
 #: ../rpmdrake:169 ../rpmdrake:174 ../rpmdrake:186 ../rpmdrake:197
 #: ../rpmdrake:206 ../rpmdrake:218 ../rpmdrake:230 ../rpmdrake:238
-#: ../rpmdrake:318
+#: ../rpmdrake:322
 #, c-format
 msgid "Other"
 msgstr "Andre"
@@ -1063,87 +1083,147 @@ msgstr "Leketøy"
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:372 ../rpmdrake:774 ../rpmdrake:775
+#: ../rpmdrake:376 ../rpmdrake:509 ../rpmdrake:511
 #, c-format
 msgid "(Not available)"
 msgstr "(Ikke tilgjengelig)"
 
-#: ../rpmdrake:401 ../rpmdrake:469
+#: ../rpmdrake:405 ../rpmdrake:473
 #, c-format
 msgid "Search results"
 msgstr "Søkeresultater"
 
-#: ../rpmdrake:401
+#: ../rpmdrake:405
 #, c-format
 msgid "Search results (none)"
 msgstr "Søkeresultater (ingen)"
 
-#: ../rpmdrake:412 ../rpmdrake:433
+#: ../rpmdrake:416 ../rpmdrake:437
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Vennligst vent, søker..."
 
-#: ../rpmdrake:431 ../rpmdrake:1171 ../rpmdrake:1433 ../rpmdrake:1647
+#: ../rpmdrake:435 ../rpmdrake:1194 ../rpmdrake:1458 ../rpmdrake:1671
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:436
+#: ../rpmdrake:440
 #, c-format
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Upgradable"
 msgstr "Oppgraderbar"
 
-#: ../rpmdrake:470 ../rpmdrake:589
+#: ../rpmdrake:474 ../rpmdrake:639
 #, c-format
 msgid "Addable"
 msgstr "Kan legges til"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Selected"
 msgstr "Valgte"
 
-#: ../rpmdrake:472
+#: ../rpmdrake:476
 #, c-format
 msgid "Not selected"
 msgstr "Ikke valgt"
 
 #: ../rpmdrake:506
 #, c-format
+msgid "Files:\n"
+msgstr "Filer:\n"
+
+#: ../rpmdrake:511
+#, c-format
+msgid "Changelog:\n"
+msgstr "Changelog:\n"
+
+#: ../rpmdrake:516
+#, c-format
+msgid "Medium: "
+msgstr "Medium: "
+
+#: ../rpmdrake:518
+#, c-format
+msgid "Currently installed version: "
+msgstr "Nåværende installerte versjon: "
+
+#: ../rpmdrake:526
+#, c-format
+msgid "Name: "
+msgstr "Navn: "
+
+#: ../rpmdrake:527
+#, c-format
+msgid "Version: "
+msgstr "Versjon: "
+
+#: ../rpmdrake:528
+#, c-format
+msgid "Size: "
+msgstr "Størrelse: "
+
+#: ../rpmdrake:528
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
+
+#: ../rpmdrake:531
+#, c-format
+msgid "Importance: "
+msgstr "Viktighet: "
+
+#: ../rpmdrake:534
+#, c-format
+msgid "Summary: "
+msgstr "Oppsummering: "
+
+#: ../rpmdrake:537
+#, c-format
+msgid "Reason for update: "
+msgstr "Grunn til oppdatering: "
+
+#: ../rpmdrake:539
+#, c-format
+msgid "Description: "
+msgstr "Beskrivelse: "
+
+#: ../rpmdrake:554
+#, c-format
 msgid "Rpmdrake %s"
 msgstr "Rpmdrake %s"
 
-#: ../rpmdrake:524 ../rpmdrake:639 ../rpmdrake:642 ../rpmdrake:1527
+#: ../rpmdrake:571 ../rpmdrake:689 ../rpmdrake:691 ../rpmdrake:1551
 #, c-format
 msgid "More information on package..."
 msgstr "Mer informasjon om pakke..."
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "Please choose"
 msgstr "Vennligst velg"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:572
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "En av følgende pakker behøves:"
 
-#: ../rpmdrake:545
+#: ../rpmdrake:593
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Vennligst vent, lister pakker..."
 
-#: ../rpmdrake:562
+#: ../rpmdrake:610
 #, c-format
 msgid "No update"
 msgstr "Ingen oppdatering"
 
-#: ../rpmdrake:563
+#: ../rpmdrake:611
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1154,28 +1234,28 @@ msgstr ""
 "noen tilgjengelige oppdateringer for pakkene som er installert på\n"
 "din maskin, eller at du allerede har installert alle sammen."
 
-#: ../rpmdrake:583
+#: ../rpmdrake:632
 #, c-format
 msgid "All"
 msgstr "Alle"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:626 ../rpmdrake:631
+#: ../rpmdrake:676 ../rpmdrake:681
 #, c-format
 msgid "More info"
 msgstr "Mer info"
 
-#: ../rpmdrake:634 ../rpmdrake:1516
+#: ../rpmdrake:684 ../rpmdrake:1540
 #, c-format
 msgid "Information on packages"
 msgstr "Informasjon på pakker"
 
-#: ../rpmdrake:659
+#: ../rpmdrake:706
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Noen ytterligere pakker renger å fjernes"
 
-#: ../rpmdrake:660
+#: ../rpmdrake:707
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1186,12 +1266,12 @@ msgstr ""
 "å bli fjernet:\n"
 "\n"
 
-#: ../rpmdrake:666 ../rpmdrake:675
+#: ../rpmdrake:713 ../rpmdrake:722
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Noen pakker kan ikke fjernes"
 
-#: ../rpmdrake:667
+#: ../rpmdrake:714
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1200,7 +1280,7 @@ msgstr ""
 "Beklager, men fjerning av disse pakkene vil ødelegge systemet ditt:\n"
 "\n"
 
-#: ../rpmdrake:676 ../rpmdrake:737
+#: ../rpmdrake:723 ../rpmdrake:785
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1211,12 +1291,12 @@ msgstr ""
 "vekk nå:\n"
 "\n"
 
-#: ../rpmdrake:705
+#: ../rpmdrake:752
 #, c-format
 msgid "Additional packages needed"
 msgstr "Ytterligere pakker trengs"
 
-#: ../rpmdrake:706
+#: ../rpmdrake:753
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1227,17 +1307,17 @@ msgstr ""
 "installeres:\n"
 "\n"
 
-#: ../rpmdrake:720
+#: ../rpmdrake:768
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (hører til skip-lista)"
 
-#: ../rpmdrake:722
+#: ../rpmdrake:770
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Noen pakker kan ikke installeres"
 
-#: ../rpmdrake:723
+#: ../rpmdrake:771
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1248,177 +1328,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:736 ../rpmdrake:1025
+#: ../rpmdrake:784 ../rpmdrake:1048
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Noen pakker må fjernes"
 
-#: ../rpmdrake:758
+#: ../rpmdrake:807
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgt: %d MB / Ledig diskplass: %d MB"
 
-#: ../rpmdrake:760
+#: ../rpmdrake:809
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Valgt størrelse: %d MB"
 
-#: ../rpmdrake:766
+#: ../rpmdrake:814
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Beskrivelse er ikke tilgjengelig for denne pakken\n"
 
-#: ../rpmdrake:772
-#, c-format
-msgid "Files:\n"
-msgstr "Filer:\n"
-
-#: ../rpmdrake:775
-#, c-format
-msgid "Changelog:\n"
-msgstr "Changelog:\n"
-
-#: ../rpmdrake:777
-#, c-format
-msgid "Medium: "
-msgstr "Medium: "
-
-#: ../rpmdrake:779
-#, c-format
-msgid "Currently installed version: "
-msgstr "Nåværende installerte versjon: "
-
-#: ../rpmdrake:784
-#, c-format
-msgid "Name: "
-msgstr "Navn: "
-
-#: ../rpmdrake:785
-#, c-format
-msgid "Version: "
-msgstr "Versjon: "
-
-#: ../rpmdrake:786
-#, c-format
-msgid "Size: "
-msgstr "Størrelse: "
-
-#: ../rpmdrake:786
-#, c-format
-msgid "%s KB"
-msgstr "%s KB"
-
-#: ../rpmdrake:788
-#, c-format
-msgid "Importance: "
-msgstr "Viktighet: "
-
-#: ../rpmdrake:790
-#, c-format
-msgid "Summary: "
-msgstr "Oppsummering: "
-
-#: ../rpmdrake:792
-#, c-format
-msgid "Reason for update: "
-msgstr "Grunn til oppdatering: "
-
-#: ../rpmdrake:794
+#: ../rpmdrake:881
 #, c-format
-msgid "Description: "
-msgstr "Beskrivelse: "
+msgid "Security updates"
+msgstr "Sikkerhetsoppdateringer"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Feilrettingsoppdateringer"
 
-#: ../rpmdrake:859
+#: ../rpmdrake:881
 #, c-format
 msgid "Normal updates"
 msgstr "Normale oppdateringer"
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "%s choices"
 msgstr "%s valg"
 
-#: ../rpmdrake:878
+#: ../rpmdrake:901
 #, c-format
 msgid "Mandrakelinux choices"
 msgstr "Mandrakelinux-valg"
 
-#: ../rpmdrake:881
+#: ../rpmdrake:904
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:889
+#: ../rpmdrake:912
 #, c-format
 msgid "All packages, by group"
 msgstr "Alle pakker, etter gruppe"
 
-#: ../rpmdrake:890
+#: ../rpmdrake:913
 #, c-format
 msgid "All packages, by size"
 msgstr "Alle pakker, etter størrelse"
 
-#: ../rpmdrake:891
+#: ../rpmdrake:914
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Alle pakker, etter valgstadie"
 
-#: ../rpmdrake:895
+#: ../rpmdrake:918
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Alle pakker, etter mediumlager"
 
-#: ../rpmdrake:896
+#: ../rpmdrake:919
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Alle pakker, ved oppdateringstilgjengelighet"
 
-#: ../rpmdrake:900
+#: ../rpmdrake:923
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Bare blader, sortert etter installasjonsdato"
 
-#: ../rpmdrake:974
+#: ../rpmdrake:997
 #, c-format
 msgid "in names"
 msgstr "i navn"
 
-#: ../rpmdrake:976
+#: ../rpmdrake:999
 #, c-format
 msgid "in descriptions"
 msgstr "i beskrivelser"
 
-#: ../rpmdrake:978
+#: ../rpmdrake:1001
 #, c-format
 msgid "in file names"
 msgstr "i filnavn"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Normal information"
 msgstr "Normal informasjon"
 
-#: ../rpmdrake:987
+#: ../rpmdrake:1010
 #, c-format
 msgid "Maximum information"
 msgstr "Maksimum informasjon"
 
-#: ../rpmdrake:1007
+#: ../rpmdrake:1030
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Du trenger å velge noen pakker først."
 
-#: ../rpmdrake:1012
+#: ../rpmdrake:1035
 #, c-format
 msgid "Too many packages are selected"
 msgstr "For mange pakker er valgt"
 
-#: ../rpmdrake:1013
+#: ../rpmdrake:1036
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1435,7 +1460,7 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å installere alle valgte pakker?"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1049
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1450,93 +1475,93 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake:1059
+#: ../rpmdrake:1082
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Fjerning av programvarepakker"
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1083
 #, c-format
 msgid "Software Packages Update"
 msgstr "Programvarepakkeroppdatering"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1084
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Programvarepakker-installasjon..."
 
-#: ../rpmdrake:1067 ../rpmdrake:1070 ../rpmdrake:1079 ../rpmdrake:1090
-#: ../rpmdrake:1095
+#: ../rpmdrake:1090 ../rpmdrake:1093 ../rpmdrake:1102 ../rpmdrake:1113
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../rpmdrake:1070
+#: ../rpmdrake:1093
 #, fuzzy, c-format
 msgid "/_Update media"
 msgstr "Oppdaterer media"
 
-#: ../rpmdrake:1079
+#: ../rpmdrake:1102
 #, fuzzy, c-format
 msgid "/_Reset the selection"
 msgstr "Resett valget"
 
-#: ../rpmdrake:1090
+#: ../rpmdrake:1113
 #, fuzzy, c-format
 msgid "/Reload the _packages list"
 msgstr "Last pakkelisten på nytt"
 
-#: ../rpmdrake:1095
+#: ../rpmdrake:1118
 #, c-format
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: ../rpmdrake:1096
+#: ../rpmdrake:1119
 #, fuzzy, c-format
 msgid "/_View"
 msgstr "Vis"
 
-#: ../rpmdrake:1098 ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1121 ../rpmdrake:1122 ../rpmdrake:1129
 #, c-format
 msgid "/_Options"
 msgstr "/_Valg"
 
-#: ../rpmdrake:1099 ../rpmdrake:1106
+#: ../rpmdrake:1122 ../rpmdrake:1129
 #, fuzzy, c-format
 msgid "/_Show automatically selected packages"
 msgstr "Vis automatisk valgte pakker"
 
-#: ../rpmdrake:1103 ../rpmdrake:1104
+#: ../rpmdrake:1126 ../rpmdrake:1127
 #, c-format
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../rpmdrake:1120
+#: ../rpmdrake:1143
 #, c-format
 msgid "Find:"
 msgstr "Finn:"
 
-#: ../rpmdrake:1125
+#: ../rpmdrake:1148
 #, c-format
 msgid "Search"
 msgstr "Søk"
 
-#: ../rpmdrake:1131
+#: ../rpmdrake:1154
 #, c-format
 msgid "Install"
 msgstr "Installer"
 
-#: ../rpmdrake:1163
+#: ../rpmdrake:1186
 #, c-format
 msgid "Fatal error"
 msgstr "Kritisk feil"
 
-#: ../rpmdrake:1164
+#: ../rpmdrake:1187
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "En kritisk feil oppsto: %s."
 
-#: ../rpmdrake:1172
+#: ../rpmdrake:1195
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1549,12 +1574,12 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake:1181
+#: ../rpmdrake:1204
 #, c-format
 msgid "Already existing update media"
 msgstr "Allerede eksisterende oppdateringsmedia"
 
-#: ../rpmdrake:1182
+#: ../rpmdrake:1205
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1571,12 +1596,12 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1192
+#: ../rpmdrake:1215
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hvordan velge ditt speil manuelt"
 
-#: ../rpmdrake:1193
+#: ../rpmdrake:1216
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1591,62 +1616,62 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1224
+#: ../rpmdrake:1249
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vennligst vent, finner tilgjengelige pakker..."
 
-#: ../rpmdrake:1272
+#: ../rpmdrake:1297
 #, c-format
 msgid "Inspecting %s"
 msgstr "Sjekker %s"
 
-#: ../rpmdrake:1291
+#: ../rpmdrake:1316
 #, c-format
 msgid "changes:"
 msgstr "endringer:"
 
-#: ../rpmdrake:1295
+#: ../rpmdrake:1320
 #, c-format
 msgid "Remove .%s"
 msgstr "Fjern .%s"
 
-#: ../rpmdrake:1297
+#: ../rpmdrake:1322
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Bruk .%s som hovedfil"
 
-#: ../rpmdrake:1299
+#: ../rpmdrake:1324
 #, c-format
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../rpmdrake:1312
+#: ../rpmdrake:1337
 #, c-format
 msgid "Installation finished"
 msgstr "Installasjon ferdig"
 
-#: ../rpmdrake:1327
+#: ../rpmdrake:1352
 #, c-format
 msgid "Inspect..."
 msgstr "Sjekk..."
 
-#: ../rpmdrake:1356 ../rpmdrake:1512
+#: ../rpmdrake:1381 ../rpmdrake:1536
 #, c-format
 msgid "Everything installed successfully"
 msgstr "Alt ble vellykket installert"
 
-#: ../rpmdrake:1357 ../rpmdrake:1513
+#: ../rpmdrake:1382 ../rpmdrake:1537
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Alle forespurte pakker ble vellykket installert."
 
-#: ../rpmdrake:1359 ../rpmdrake:1497
+#: ../rpmdrake:1384 ../rpmdrake:1521
 #, c-format
 msgid "Problem during installation"
 msgstr "Problemer under installasjon"
 
-#: ../rpmdrake:1360 ../rpmdrake:1498 ../rpmdrake:1553
+#: ../rpmdrake:1385 ../rpmdrake:1522 ../rpmdrake:1577
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1657,17 +1682,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1373
+#: ../rpmdrake:1398
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Ikke i stand til å få tak i kildepakker."
 
-#: ../rpmdrake:1374
+#: ../rpmdrake:1399
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ikke i stand til å hente kildepakker, beklager. %s"
 
-#: ../rpmdrake:1375 ../rpmdrake:1444
+#: ../rpmdrake:1400 ../rpmdrake:1469
 #, c-format
 msgid ""
 "\n"
@@ -1680,37 +1705,37 @@ msgstr ""
 "Feil rapportert:\n"
 "%s"
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Package installation..."
 msgstr "Pakkeinstallasjon..."
 
-#: ../rpmdrake:1382
+#: ../rpmdrake:1407
 #, c-format
 msgid "Initializing..."
 msgstr "Initialiserer..."
 
-#: ../rpmdrake:1391
+#: ../rpmdrake:1416
 #, c-format
 msgid "Change medium"
 msgstr "Endre medium"
 
-#: ../rpmdrake:1392
+#: ../rpmdrake:1417
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vennligst sett inn medium kalt \"%s\" på enhet [%s]"
 
-#: ../rpmdrake:1399
+#: ../rpmdrake:1424
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laster ned pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1422
+#: ../rpmdrake:1447
 #, c-format
 msgid "Verifying packages signatures..."
 msgstr "Sjekker pakkers signatur..."
 
-#: ../rpmdrake:1434
+#: ../rpmdrake:1459
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1725,12 +1750,12 @@ msgstr ""
 "\n"
 "Vil du fortsette installasjon?"
 
-#: ../rpmdrake:1441 ../rpmdrake:1552
+#: ../rpmdrake:1466 ../rpmdrake:1576
 #, c-format
 msgid "Installation failed"
 msgstr "Installasjon feilet"
 
-#: ../rpmdrake:1442
+#: ../rpmdrake:1467
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1743,22 +1768,22 @@ msgstr ""
 "\n"
 "Du vil kanskje oppdatere din mediadatabase."
 
-#: ../rpmdrake:1456
+#: ../rpmdrake:1480
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: ../rpmdrake:1459
+#: ../rpmdrake:1483
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1475
+#: ../rpmdrake:1499
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "klarte ikke å åpne rpm-fil [%s]"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1771,47 +1796,47 @@ msgstr ""
 "Noen konfigureringsfiler ble opprettet som `.rpmnew' ellr `.rpmsave',\n"
 "du kan no sjekke noen for å utføre noen handlinger:"
 
-#: ../rpmdrake:1510
+#: ../rpmdrake:1534
 #, c-format
 msgid "everything was installed correctly"
 msgstr "alt ble korrekt installert"
 
-#: ../rpmdrake:1518
+#: ../rpmdrake:1542
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Disse pakkene kommer med oppgraderingsinformasjon"
 
-#: ../rpmdrake:1530
+#: ../rpmdrake:1554
 #, fuzzy, c-format
 msgid "More information on package... [%s]"
 msgstr "Mer informasjon om pakke..."
 
-#: ../rpmdrake:1543
+#: ../rpmdrake:1567
 #, c-format
 msgid "No package found for installation."
 msgstr "Ingen pakker ble funnet for installasjon."
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1568
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Uopprettelig feil: ingen pakke ble funnet for installasjon, beklager."
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1590
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "Vennligst vent, leser pakkedatabase..."
 
-#: ../rpmdrake:1613
+#: ../rpmdrake:1637
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Vennligst ven, fjerner pakker..."
 
-#: ../rpmdrake:1618
+#: ../rpmdrake:1642
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem under fjerning"
 
-#: ../rpmdrake:1619
+#: ../rpmdrake:1643
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1822,7 +1847,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1652
+#: ../rpmdrake:1676
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1835,7 +1860,7 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge hvilken programvare du skal fjerne\n"
 "fra maskinen din."
 
-#: ../rpmdrake:1657
+#: ../rpmdrake:1681
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1848,12 +1873,12 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
 "på maskinen din."
 
-#: ../rpmdrake:1662
+#: ../rpmdrake:1686
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Velkommen til installasjonsprogrammet for programvarepakker!"
 
-#: ../rpmdrake:1663
+#: ../rpmdrake:1687
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1868,183 +1893,183 @@ msgstr ""
 "på CDROM eller DVD. Dette verktøyet hjelper deg å velge hvilken\n"
 "programvare du ønsker å installere på maskinen din."
 
-#: ../rpmdrake.pm:95
+#: ../rpmdrake.pm:93
 #, c-format
 msgid "Software Update"
 msgstr "Programvareoppdatering"
 
-#: ../rpmdrake.pm:95
+#: ../rpmdrake.pm:93
 #, c-format
 msgid "Mandrakelinux Update"
 msgstr "Mandrakelinux Update"
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:182
 #, c-format
 msgid "No"
 msgstr "Nei"
 
-#: ../rpmdrake.pm:191
+#: ../rpmdrake.pm:186
 #, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:239
+#: ../rpmdrake.pm:234
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:310
 #, c-format
 msgid "Austria"
 msgstr "Østerrike"
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:311
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:312
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:313
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:314
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:315
 #, c-format
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: ../rpmdrake.pm:321
+#: ../rpmdrake.pm:316
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:317
 #, c-format
 msgid "Czech Republic"
 msgstr "Tjekkiske Republikk"
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:318
 #, c-format
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:319
 #, c-format
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:325 ../rpmdrake.pm:329
+#: ../rpmdrake.pm:320 ../rpmdrake.pm:324
 #, c-format
 msgid "Greece"
 msgstr "Hellas"
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:321
 #, c-format
 msgid "Spain"
 msgstr "Spania"
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:322
 #, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:323
 #, c-format
 msgid "France"
 msgstr "Frankrike"
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:325
 #, c-format
 msgid "Hungary"
 msgstr "Hungarn"
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:326
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:327
 #, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:328
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:329
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:330
 #, c-format
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:331
 #, c-format
 msgid "Norway"
 msgstr "Norge"
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:332
 #, c-format
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:333
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:334
 #, c-format
 msgid "Russia"
 msgstr "Russland"
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:335
 #, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:341
+#: ../rpmdrake.pm:336
 #, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:342
+#: ../rpmdrake.pm:337
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:343
+#: ../rpmdrake.pm:338
 #, c-format
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: ../rpmdrake.pm:344
+#: ../rpmdrake.pm:339
 #, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:345 ../rpmdrake.pm:346 ../rpmdrake.pm:347 ../rpmdrake.pm:348
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:340 ../rpmdrake.pm:341 ../rpmdrake.pm:342 ../rpmdrake.pm:343
+#: ../rpmdrake.pm:419
 #, c-format
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:431
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2058,7 +2083,7 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:435
 #, c-format
 msgid ""
 "I need to contact the Mandrakesoft website to get the mirror list.\n"
@@ -2071,24 +2096,24 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:441
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Vennligst vent, laster ned tjeneradresser..."
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:442
 #, c-format
 msgid ""
 "Please wait, downloading mirror addresses from the Mandrakesoft website."
 msgstr ""
 "Vennligst vent, laster ned adresser over speil fra Mandrakesoft website."
 
-#: ../rpmdrake.pm:451
+#: ../rpmdrake.pm:448
 #, c-format
 msgid "Error during download"
 msgstr "Feil under nedlasting"
 
-#: ../rpmdrake.pm:453
+#: ../rpmdrake.pm:450
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2103,7 +2128,7 @@ msgstr ""
 "Nettverket, eller nettsiden, er kanskje ikke tilgjengelig.\n"
 "Vennligst prøv igjen senere."
 
-#: ../rpmdrake.pm:458
+#: ../rpmdrake.pm:455
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2118,17 +2143,17 @@ msgstr ""
 "Nettverket, eller Mandrakesoft websiden, er kanskje ikke tilgjengelig.\n"
 "Vennligst prøv igjen senere."
 
-#: ../rpmdrake.pm:467
+#: ../rpmdrake.pm:464
 #, c-format
 msgid "No mirror"
 msgstr "Inget speil"
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:466
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Jeg kan ikke finne en tjener."
 
-#: ../rpmdrake.pm:470
+#: ../rpmdrake.pm:467
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
@@ -2143,63 +2168,63 @@ msgstr ""
 "når arkitekturen til prosessoren din ikke er støttet\n"
 "av Mandrakelinux offisielle oppdateringer."
 
-#: ../rpmdrake.pm:489
+#: ../rpmdrake.pm:486
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Vennligst velg ønsket speil."
 
-#: ../rpmdrake.pm:548
+#: ../rpmdrake.pm:545
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierer fil for medium `%s'..."
 
-#: ../rpmdrake.pm:551
+#: ../rpmdrake.pm:548
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Utforsker fil fra medium `%s'..."
 
-#: ../rpmdrake.pm:554
+#: ../rpmdrake.pm:551
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Utforsker ekstern fil fra medium `%s'..."
 
-#: ../rpmdrake.pm:558
+#: ../rpmdrake.pm:555
 #, c-format
 msgid " done."
 msgstr " ferdig."
 
-#: ../rpmdrake.pm:562
+#: ../rpmdrake.pm:559
 #, c-format
 msgid " failed!"
 msgstr " feilet!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:566
+#: ../rpmdrake.pm:563
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s fra medium %s"
 
-#: ../rpmdrake.pm:570
+#: ../rpmdrake.pm:567
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Starteer nedlastning av `%s'..."
 
-#: ../rpmdrake.pm:574
+#: ../rpmdrake.pm:571
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
 msgstr "Nedlastning av `%s', tid som gjenstår:%s, hastighet:%s"
 
-#: ../rpmdrake.pm:577
+#: ../rpmdrake.pm:574
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Nedlastning av `%s', hastighet:%s"
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:611
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Feil ved henting av pakker"
 
-#: ../rpmdrake.pm:615
+#: ../rpmdrake.pm:612
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
@@ -2217,27 +2242,27 @@ msgstr ""
 "det\n"
 "og du bør da prøve på nytt senere."
 
-#: ../rpmdrake.pm:646
+#: ../rpmdrake.pm:643
 #, c-format
 msgid "Update media"
 msgstr "Oppdaterer media"
 
-#: ../rpmdrake.pm:654
+#: ../rpmdrake.pm:651
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Velg mediumet du ønsker å oppdatere:"
 
-#: ../rpmdrake.pm:668
+#: ../rpmdrake.pm:665
 #, fuzzy, c-format
 msgid "Select all"
 msgstr "Valgte"
 
-#: ../rpmdrake.pm:672
+#: ../rpmdrake.pm:669
 #, c-format
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../rpmdrake.pm:694
+#: ../rpmdrake.pm:691
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2250,7 +2275,7 @@ msgstr ""
 "Feil:\n"
 "%s"
 
-#: ../rpmdrake.pm:718 ../rpmdrake.pm:727
+#: ../rpmdrake.pm:715 ../rpmdrake.pm:724
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2261,17 +2286,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:739
+#: ../rpmdrake.pm:736
 #, c-format
 msgid "Unable to create medium."
 msgstr "Kan ikke opprette medium."
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:741
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Feil under forsøk på å legge til medium"
 
-#: ../rpmdrake.pm:745
+#: ../rpmdrake.pm:742
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2282,7 +2307,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:758
+#: ../rpmdrake.pm:755
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of %s you're "
@@ -2293,7 +2318,7 @@ msgstr ""
 "versjonen av %s du kjører (%s).\n"
 "Det vil bli deaktivert"
 
-#: ../rpmdrake.pm:761
+#: ../rpmdrake.pm:758
 #, c-format
 msgid ""
 "Your medium `%s', used for updates, does not match the version of "
@@ -2304,12 +2329,12 @@ msgstr ""
 "versjonen av Mandrakelinux du kjører (%s).\n"
 "Det vil bli deaktivert"
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:774
 #, c-format
 msgid "Help launched in background"
 msgstr "Hjelp startet opp i bakgrunn"
 
-#: ../rpmdrake.pm:778
+#: ../rpmdrake.pm:775
 #, c-format
 msgid ""
 "The help window has been started, it should appear shortly on your desktop."
@@ -2586,6 +2611,9 @@ msgstr "Fjern programvare"
 msgid "Software Media Manager"
 msgstr "Programvare-Mediahåndterer"
 
+#~ msgid "Choose a mirror..."
+#~ msgstr "Velg et speil..."
+
 #~ msgid "Reset the selection"
 #~ msgstr "Resett valget"