s/Mandrake/Mandriva/

1 files changed, 503 insertions, 534 deletions

diff --git a/po/nb.po b/po/nb.po
index a5a8d742..60d225ad 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,10 +1,10 @@
 # translation of nb.po to Norsk Bokmål
 # translation of rpmdrake-nb.po to Norwegian Bokmål
 #
-# Latest versions of po files are at http://www.mandrakelinux.com/l10n/no.php3
+# Latest versions of po files are at http://www.mandrivalinux.com/l10n/no.php3
 #
 # Copyright (C) 1999, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Copyright (C) 1999 Mandrakesoft
+# Copyright (C) 1999 Mandriva
 # Terje Bjerkelia <terje@bjerkelia.com>, 1999-2000.
 # Per Øyvind Karlsen <peroyvind@sintrax.net>, 2003, 2004.
 # Eskild Hustvedt <zerodogg@skolelinux.no>, 2005.
@@ -13,10 +13,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: 2005-03-02 10:52+0100\n"
+"POT-Creation-Date: 2005-05-05 22:04+0200\n"
 "PO-Revision-Date: 2005-04-02 14:02+0200\n"
 "Last-Translator: Per Øyvind Karlsen <peroyvind@linux-mandrake.com>\n"
-"Language-Team: Norsk Bokmål <cooker-i18n@linux-mandrake.com>\n"
+"Language-Team: Norsk Bokmål <cooker-i18n@mandrakelinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -30,20 +30,26 @@ msgstr "Velg medietype"
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandrakelinux web or FTP mirror.\n"
+"This step enables you to add sources from a Mandriva Linux 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"
+"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 ""
-"Dette valget lar deg legge til kilder fra Mandrakelinux HTTP- eller FTP-speil.\n"
+"Dette valget lar deg legge til kilder fra Mandriva Linux HTTP- eller FTP-"
+"speil.\n"
 "\n"
-"Det er to typer offisielle speil. Du kan velge å legge til kildner som inneholder\n"
+"Det er to typer offisielle speil. Du kan velge å legge til kildner som "
+"inneholder\n"
 "et komplett sett med pakker for din distribusjon (normalt sett et supersett\n"
 "av hva som kommer med standard installasjons-CDene) eller kilder som gir\n"
-"de offisielle oppdateringene for din distribusjon. (Du kan legge til begge deler\n"
+"de offisielle oppdateringene for din distribusjon. (Du kan legge til begge "
+"deler\n"
 "men må gjøre dette i to steg.)"
 
 #: ../edit-urpm-sources.pl:75
@@ -62,7 +68,7 @@ msgid ""
 "This will attempt to install all official sources corresponding to your\n"
 "distribution (%s).\n"
 "\n"
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
@@ -70,7 +76,7 @@ msgstr ""
 "Dette vil prøve å installere alle offisielle kilder for din \n"
 "distribusjon (%s).\n"
 "\n"
-"Jeg må kontakte Mandrakesoft nettsiden for å få speillisten.\n"
+"Jeg må kontakte Mandriva nettsiden for å få speillisten.\n"
 "Pass på at nettverket ditt er oppe.\n"
 "\n"
 "Er det greit å fortsette?"
@@ -100,8 +106,7 @@ msgstr "Sti:"
 msgid "FTP server"
 msgstr "FTP-tjener"
 
-#: ../edit-urpm-sources.pl:122
-#: ../edit-urpm-sources.pl:123
+#: ../edit-urpm-sources.pl:122 ../edit-urpm-sources.pl:123
 #: ../edit-urpm-sources.pl:382
 #, c-format
 msgid "URL:"
@@ -132,14 +137,12 @@ msgstr "Bla igjennom..."
 msgid "Login:"
 msgstr "Brukernavn:"
 
-#: ../edit-urpm-sources.pl:170
-#: ../edit-urpm-sources.pl:459
+#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459 ../rpmdrake.pm:123
 #, c-format
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../edit-urpm-sources.pl:175
-#: ../edit-urpm-sources.pl:383
+#: ../edit-urpm-sources.pl:175 ../edit-urpm-sources.pl:383
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "Relativ sti til syntese/hdlist:"
@@ -183,47 +186,25 @@ msgstr "Legger til et medium:"
 msgid "Type of medium:"
 msgstr "Mediumstype:"
 
-#: ../edit-urpm-sources.pl:232
-#: ../edit-urpm-sources.pl:302
-#: ../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:164
-#: ../rpmdrake:699
-#: ../rpmdrake:1502
-#: ../rpmdrake:1510
-#: ../rpmdrake.pm:504
-#: ../rpmdrake.pm:594
-#: ../rpmdrake.pm:663
+#: ../edit-urpm-sources.pl:232 ../edit-urpm-sources.pl:302
+#: ../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:165 ../rpmdrake:701
+#: ../rpmdrake:1505 ../rpmdrake:1513 ../rpmdrake.pm:539 ../rpmdrake.pm:628
+#: ../rpmdrake.pm:697
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../edit-urpm-sources.pl:234
-#: ../edit-urpm-sources.pl:304
-#: ../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:164
-#: ../rpmdrake:699
-#: ../rpmdrake:716
-#: ../rpmdrake:721
-#: ../rpmdrake:1444
-#: ../rpmdrake:1502
-#: ../rpmdrake:1647
-#: ../rpmdrake.pm:192
-#: ../rpmdrake.pm:249
-#: ../rpmdrake.pm:504
+#: ../edit-urpm-sources.pl:234 ../edit-urpm-sources.pl:304
+#: ../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:165 ../rpmdrake:701 ../rpmdrake:718
+#: ../rpmdrake:723 ../rpmdrake:1446 ../rpmdrake:1505 ../rpmdrake:1648
+#: ../rpmdrake.pm:114 ../rpmdrake.pm:224 ../rpmdrake.pm:281 ../rpmdrake.pm:539
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -283,8 +264,7 @@ msgstr "Redigerer medium \"%s\":"
 msgid "Save changes"
 msgstr "Lagre endringer"
 
-#: ../edit-urpm-sources.pl:401
-#: ../edit-urpm-sources.pl:977
+#: ../edit-urpm-sources.pl:401 ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Proxy..."
 msgstr "Mellomtjener..."
@@ -296,7 +276,8 @@ msgstr "Du må sette inn mediumet for å fortsette"
 
 #: ../edit-urpm-sources.pl:413
 #, c-format
-msgid "In order to save the changes, you need to insert the medium in the drive."
+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:435
@@ -316,8 +297,12 @@ msgstr "Globalt mellomtjeneroppsett"
 
 #: ../edit-urpm-sources.pl:448
 #, c-format
-msgid "If you need a proxy, enter the hostname and an optional port (syntax: <proxyhost[:port]>):"
-msgstr "Hvis du trenger en mellomtjener, skriv inn vertsnavnet og en port (syntaks: <mellomtjener-vert[:port]>):"
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Hvis du trenger en mellomtjener, skriv inn vertsnavnet og en port (syntaks: "
+"<mellomtjener-vert[:port]>):"
 
 #: ../edit-urpm-sources.pl:451
 #, c-format
@@ -327,7 +312,9 @@ msgstr "Mellomtjener-vertsnavn:"
 #: ../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 mellomtjener identitetsbekreftelsen:"
+msgstr ""
+"Du kan spesifisere en /bruker/passord for mellomtjener "
+"identitetsbekreftelsen:"
 
 #: ../edit-urpm-sources.pl:457
 #, c-format
@@ -362,7 +349,8 @@ msgstr "Legg til en vert"
 #: ../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:"
+msgstr ""
+"Skriv inn vertsnavnet eller IP-adressen til verten som skal legges til:"
 
 #: ../edit-urpm-sources.pl:622
 #, c-format
@@ -384,17 +372,13 @@ msgstr "Protokoll:"
 msgid "Media limit:"
 msgstr "Mediagrense:"
 
-#: ../edit-urpm-sources.pl:634
-#: ../edit-urpm-sources.pl:641
+#: ../edit-urpm-sources.pl:634 ../edit-urpm-sources.pl:641
 #, c-format
 msgid "Add"
 msgstr "Legg til"
 
-#: ../edit-urpm-sources.pl:635
-#: ../edit-urpm-sources.pl:642
-#: ../edit-urpm-sources.pl:700
-#: ../edit-urpm-sources.pl:955
-#: ../rpmdrake:1179
+#: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
+#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr "Fjern"
@@ -429,23 +413,18 @@ msgstr "Mediagrense"
 msgid "Command"
 msgstr "Kommando"
 
-#: ../edit-urpm-sources.pl:684
-#: ../rpmdrake:363
-#: ../rpmdrake:380
-#: ../rpmdrake:511
-#: ../rpmdrake:627
+#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:382 ../rpmdrake:516
+#: ../rpmdrake:629
 #, c-format
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../edit-urpm-sources.pl:704
-#: ../edit-urpm-sources.pl:959
+#: ../edit-urpm-sources.pl:704 ../edit-urpm-sources.pl:959
 #, c-format
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../edit-urpm-sources.pl:712
-#: ../edit-urpm-sources.pl:965
+#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:965
 #, c-format
 msgid "Add..."
 msgstr "Legg til..."
@@ -455,16 +434,17 @@ msgstr "Legg til..."
 msgid "Manage keys for digital signatures of packages"
 msgstr "Håndter nøkler for digitale signaturer av pakker"
 
-#: ../edit-urpm-sources.pl:732
-#: ../edit-urpm-sources.pl:874
+#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:874
 #, c-format
 msgid "Medium"
 msgstr "Medium"
 
 #: ../edit-urpm-sources.pl:737
 #, c-format
-msgid "Keys"
-msgstr "Nøkler"
+msgid ""
+"_:cryptographic keys\n"
+"Keys"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:756
 #, c-format
@@ -525,8 +505,7 @@ msgstr "Oppdater medium"
 msgid "Regenerate hdlist"
 msgstr "Regenerer hdliste"
 
-#: ../edit-urpm-sources.pl:898
-#: ../rpmdrake.pm:587
+#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:621
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "Vennligst vent, oppdaterer media..."
@@ -566,9 +545,7 @@ msgstr "Globale innstillinger..."
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../edit-urpm-sources.pl:1002
-#: ../gurpmi.addmedia:75
-#: ../rpmdrake:1758
+#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1759
 #, c-format
 msgid ""
 "%s\n"
@@ -590,7 +567,8 @@ msgid ""
 msgstr ""
 "Velkommen til håndtereren for progamvaremedier!\n"
 "\n"
-"Dette verktøyet vil hjelpe deg å sette opp medier for pakker du ønsker å bruke\n"
+"Dette verktøyet vil hjelpe deg å sette opp medier for pakker du ønsker å "
+"bruke\n"
 "på maskinen din. Du vil da få tilgang til nye programvarepakker\n"
 "eller å utføre oppdateringer."
 
@@ -607,12 +585,12 @@ msgstr ""
 "på et annet skrivebord, eller driver du å installerer pakker\n"
 "samtidig?)."
 
-#: ../gurpmi.addmedia:70
+#: ../gurpmi.addmedia:69
 #, c-format
 msgid "Unable to add medium, wrong or missing arguments"
 msgstr "Klarte ikke å legge til medium, feil eller manglende argumenter"
 
-#: ../gurpmi.addmedia:78
+#: ../gurpmi.addmedia:77
 #, c-format
 msgid ""
 "You are about to add a new packages medium, `%s'.\n"
@@ -623,22 +601,90 @@ msgstr ""
 "Det betyr at du vil være i stand til å legge til programvarepakker\n"
 "til ditt system fra det nye mediet."
 
-#: ../gurpmi.addmedia:87
+#: ../gurpmi.addmedia:86
 #, c-format
 msgid "Successfully added medium `%s'."
 msgstr "Medium «%s» vellykket lagt til."
 
-#: ../rpmdrake:28
+#: ../rpmdrake:31
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "Bruk: %s [OPSJONER]..."
 
-#: ../rpmdrake:161
+#: ../rpmdrake:32
+#, c-format
+msgid ""
+"  --changelog-first      display changelog before filelist in the "
+"description window"
+msgstr ""
+
+#: ../rpmdrake:33
+#, c-format
+msgid "  --media=medium1,..     limit to given media"
+msgstr ""
+
+#: ../rpmdrake:34
+#, c-format
+msgid ""
+"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr ""
+
+#: ../rpmdrake:35
+#, c-format
+msgid "  --mode=MODE            set mode (install (default), remove, update)"
+msgstr ""
+
+#: ../rpmdrake:36
+#, c-format
+msgid ""
+"  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr ""
+
+#: ../rpmdrake:37
+#, fuzzy, c-format
+msgid "  --no-media-update      don't update media at startup"
+msgstr "  --update       - oppdater bare oppdateringsmedia.\n"
+
+#: ../rpmdrake:38
+#, fuzzy, c-format
+msgid "  --no-verify-rpm        don't verify packages signatures"
+msgstr "  --name         - vis bare pakkenavn.\n"
+
+#: ../rpmdrake:39
+#, c-format
+msgid ""
+"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
+"\" machine to show needed deps"
+msgstr ""
+
+#: ../rpmdrake:40
+#, c-format
+msgid "  --pkg-nosel=pkg1,..    show only these packages"
+msgstr ""
+
+#: ../rpmdrake:41
+#, c-format
+msgid "  --pkg-sel=pkg1,..      preselect these packages"
+msgstr ""
+
+#: ../rpmdrake:42
+#, fuzzy, c-format
+msgid "  --root                 force to run as root"
+msgstr ""
+"\n"
+"                      DrakBackup-tjenesteRapport\n"
+
+#: ../rpmdrake:43
+#, c-format
+msgid "  --search=pkg           run search for \"pkg\""
+msgstr ""
+
+#: ../rpmdrake:162
 #, c-format
 msgid "Running in user mode"
 msgstr "Kjører i brukermodus"
 
-#: ../rpmdrake:162
+#: ../rpmdrake:163
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -649,710 +695,628 @@ msgstr ""
 "Du vil ikke kunne gjøre noen endringer på systemet,\n"
 "men du kan fortsatt se igjennom den eksisterende databasen."
 
-#: ../rpmdrake:171
+#: ../rpmdrake:172
 #, c-format
 msgid "Accessibility"
 msgstr "Tilgjengelighet"
 
-#: ../rpmdrake:172
-#: ../rpmdrake:173
-#: ../rpmdrake:174
-#: ../rpmdrake:175
+#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
 #, c-format
 msgid "Archiving"
 msgstr "Arkivering"
 
-#: ../rpmdrake:172
+#: ../rpmdrake:173
 #, c-format
 msgid "Backup"
 msgstr "Sikkerhetskopi"
 
-#: ../rpmdrake:173
+#: ../rpmdrake:174
 #, c-format
 msgid "Cd burning"
 msgstr "CD-brenning"
 
-#: ../rpmdrake:174
+#: ../rpmdrake:175
 #, c-format
 msgid "Compression"
 msgstr "Komprimering"
 
-#: ../rpmdrake:175
-#: ../rpmdrake:180
-#: ../rpmdrake:192
-#: ../rpmdrake:203
-#: ../rpmdrake:212
-#: ../rpmdrake:224
-#: ../rpmdrake:236
-#: ../rpmdrake:244
-#: ../rpmdrake:332
+#: ../rpmdrake:176 ../rpmdrake:181 ../rpmdrake:193 ../rpmdrake:204
+#: ../rpmdrake:213 ../rpmdrake:225 ../rpmdrake:237 ../rpmdrake:245
+#: ../rpmdrake:333
 #, c-format
 msgid "Other"
 msgstr "Andre"
 
-#: ../rpmdrake:176
-#: ../rpmdrake:177
-#: ../rpmdrake:178
-#: ../rpmdrake:179
-#: ../rpmdrake:180
+#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
+#: ../rpmdrake:181
 #, c-format
 msgid "Books"
 msgstr "Bøker"
 
-#: ../rpmdrake:176
+#: ../rpmdrake:177
 #, c-format
 msgid "Computer books"
 msgstr "Databøker"
 
-#: ../rpmdrake:177
+#: ../rpmdrake:178
 #, c-format
 msgid "Faqs"
 msgstr "Ofte stilte spørsmål (Faqs)"
 
-#: ../rpmdrake:178
+#: ../rpmdrake:179
 #, c-format
 msgid "Howtos"
 msgstr "Bruksanvisninger (howto)"
 
-#: ../rpmdrake:179
+#: ../rpmdrake:180
 #, c-format
 msgid "Literature"
 msgstr "Litteratur"
 
-#: ../rpmdrake:181
-#: ../rpmdrake:182
+#: ../rpmdrake:182 ../rpmdrake:183
 #, c-format
 msgid "Cluster"
 msgstr "Klynge (Cluster)"
 
-#: ../rpmdrake:181
+#: ../rpmdrake:182
 #, c-format
 msgid "Message Passing"
 msgstr "Meldingsvideresending"
 
-#: ../rpmdrake:182
+#: ../rpmdrake:183
 #, c-format
 msgid "Queueing Services"
 msgstr "Kø-tjenester"
 
-#: ../rpmdrake:183
+#: ../rpmdrake:184
 #, c-format
 msgid "Communications"
 msgstr "Kommunikasjon"
 
-#: ../rpmdrake:184
-#: ../rpmdrake:187
+#: ../rpmdrake:185 ../rpmdrake:188
 #, c-format
 msgid "Databases"
 msgstr "Databaser"
 
-#: ../rpmdrake:185
-#: ../rpmdrake:186
-#: ../rpmdrake:187
-#: ../rpmdrake:188
-#: ../rpmdrake:189
-#: ../rpmdrake:190
-#: ../rpmdrake:191
-#: ../rpmdrake:192
-#: ../rpmdrake:193
-#: ../rpmdrake:194
+#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
+#: ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192 ../rpmdrake:193
+#: ../rpmdrake:194 ../rpmdrake:195
 #, c-format
 msgid "Development"
 msgstr "Utvikling"
 
-#: ../rpmdrake:185
+#: ../rpmdrake:186
 #, c-format
 msgid "C"
 msgstr "C"
 
-#: ../rpmdrake:186
+#: ../rpmdrake:187
 #, c-format
 msgid "C++"
 msgstr "C++"
 
-#: ../rpmdrake:188
+#: ../rpmdrake:189
 #, c-format
 msgid "GNOME and GTK+"
 msgstr "GNOME og GTK+"
 
-#: ../rpmdrake:189
+#: ../rpmdrake:190
 #, c-format
 msgid "Java"
 msgstr "Java"
 
-#: ../rpmdrake:190
+#: ../rpmdrake:191
 #, c-format
 msgid "KDE and Qt"
 msgstr "KDE og Qt"
 
-#: ../rpmdrake:191
+#: ../rpmdrake:192
 #, c-format
 msgid "Kernel"
 msgstr "Kjerne"
 
-#: ../rpmdrake:193
+#: ../rpmdrake:194
 #, c-format
 msgid "Perl"
 msgstr "Perl"
 
-#: ../rpmdrake:194
+#: ../rpmdrake:195
 #, c-format
 msgid "Python"
 msgstr "Python"
 
-#: ../rpmdrake:195
+#: ../rpmdrake:196
 #, c-format
 msgid "Editors"
 msgstr "Tekstprogrammer"
 
-#: ../rpmdrake:196
+#: ../rpmdrake:197
 #, c-format
 msgid "Education"
 msgstr "Undervisning"
 
-#: ../rpmdrake:197
+#: ../rpmdrake:198
 #, c-format
 msgid "Emulators"
 msgstr "Emulatorer"
 
-#: ../rpmdrake:198
+#: ../rpmdrake:199
 #, c-format
 msgid "File tools"
 msgstr "Filverktøy"
 
-#: ../rpmdrake:199
-#: ../rpmdrake:200
-#: ../rpmdrake:201
-#: ../rpmdrake:202
-#: ../rpmdrake:203
-#: ../rpmdrake:204
-#: ../rpmdrake:205
-#: ../rpmdrake:206
+#: ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202 ../rpmdrake:203
+#: ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206 ../rpmdrake:207
 #, c-format
 msgid "Games"
 msgstr "Spill"
 
-#: ../rpmdrake:199
+#: ../rpmdrake:200
 #, c-format
 msgid "Adventure"
 msgstr "Eventyr"
 
-#: ../rpmdrake:200
+#: ../rpmdrake:201
 #, c-format
 msgid "Arcade"
 msgstr "Arkade"
 
-#: ../rpmdrake:201
+#: ../rpmdrake:202
 #, c-format
 msgid "Boards"
 msgstr "Brett"
 
-#: ../rpmdrake:202
+#: ../rpmdrake:203
 #, c-format
 msgid "Cards"
 msgstr "Kort"
 
-#: ../rpmdrake:204
+#: ../rpmdrake:205
 #, c-format
 msgid "Puzzles"
 msgstr "Puslespill"
 
-#: ../rpmdrake:205
+#: ../rpmdrake:206
 #, c-format
 msgid "Sports"
 msgstr "Sport"
 
-#: ../rpmdrake:206
+#: ../rpmdrake:207
 #, c-format
 msgid "Strategy"
 msgstr "Strategi"
 
-#: ../rpmdrake:207
-#: ../rpmdrake:208
-#: ../rpmdrake:209
-#: ../rpmdrake:210
-#: ../rpmdrake:211
-#: ../rpmdrake:212
-#: ../rpmdrake:213
-#: ../rpmdrake:214
+#: ../rpmdrake:208 ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
+#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
 #, c-format
 msgid "Graphical desktop"
 msgstr "Grafisk skrivebord"
 
-#: ../rpmdrake:207
+#: ../rpmdrake:208
 #, c-format
 msgid "Enlightenment"
 msgstr "Enlightenment"
 
-#: ../rpmdrake:208
+#: ../rpmdrake:209
 #, c-format
 msgid "FVWM based"
 msgstr "FVWM-basert"
 
-#: ../rpmdrake:209
+#: ../rpmdrake:210
 #, c-format
 msgid "GNOME"
 msgstr "GNOME"
 
-#: ../rpmdrake:210
+#: ../rpmdrake:211
 #, c-format
 msgid "Icewm"
 msgstr "Icewm"
 
-#: ../rpmdrake:211
+#: ../rpmdrake:212
 #, c-format
 msgid "KDE"
 msgstr "KDE"
 
-#: ../rpmdrake:213
+#: ../rpmdrake:214
 #, c-format
 msgid "Sawfish"
 msgstr "Sawfish"
 
-#: ../rpmdrake:214
+#: ../rpmdrake:215
 #, c-format
 msgid "WindowMaker"
 msgstr "WindowMaker"
 
-#: ../rpmdrake:215
+#: ../rpmdrake:216
 #, c-format
 msgid "Graphics"
 msgstr "Grafikk"
 
-#: ../rpmdrake:216
+#: ../rpmdrake:217
 #, c-format
 msgid "Monitoring"
 msgstr "Overvåking"
 
-#: ../rpmdrake:217
+#: ../rpmdrake:218
 #, c-format
 msgid "Multimedia"
 msgstr "Multimedia"
 
-#: ../rpmdrake:218
-#: ../rpmdrake:219
-#: ../rpmdrake:220
-#: ../rpmdrake:221
-#: ../rpmdrake:222
-#: ../rpmdrake:223
-#: ../rpmdrake:224
-#: ../rpmdrake:225
-#: ../rpmdrake:226
-#: ../rpmdrake:243
+#: ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
+#: ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226
+#: ../rpmdrake:227 ../rpmdrake:244
 #, c-format
 msgid "Networking"
 msgstr "Nettverk"
 
-#: ../rpmdrake:218
+#: ../rpmdrake:219
 #, c-format
 msgid "Chat"
 msgstr "Prat"
 
-#: ../rpmdrake:219
+#: ../rpmdrake:220
 #, c-format
 msgid "File transfer"
 msgstr "Filoverføring"
 
-#: ../rpmdrake:220
+#: ../rpmdrake:221
 #, c-format
 msgid "IRC"
 msgstr "IRC"
 
-#: ../rpmdrake:221
+#: ../rpmdrake:222
 #, c-format
 msgid "Instant messaging"
 msgstr "Lynmelding"
 
-#: ../rpmdrake:222
+#: ../rpmdrake:223
 #, c-format
 msgid "Mail"
 msgstr "Epost"
 
-#: ../rpmdrake:223
+#: ../rpmdrake:224
 #, c-format
 msgid "News"
 msgstr "Nyheter"
 
-#: ../rpmdrake:225
+#: ../rpmdrake:226
 #, c-format
 msgid "Remote access"
 msgstr "Fjerntilgang"
 
-#: ../rpmdrake:226
+#: ../rpmdrake:227
 #, c-format
 msgid "WWW"
 msgstr "WWW"
 
-#: ../rpmdrake:227
+#: ../rpmdrake:228
 #, c-format
 msgid "Office"
 msgstr "Kontor"
 
-#: ../rpmdrake:228
+#: ../rpmdrake:229
 #, c-format
 msgid "Public Keys"
 msgstr "Offentlige nøkler"
 
-#: ../rpmdrake:229
+#: ../rpmdrake:230
 #, c-format
 msgid "Publishing"
 msgstr "Publisering"
 
-#: ../rpmdrake:230
-#: ../rpmdrake:231
-#: ../rpmdrake:232
-#: ../rpmdrake:233
-#: ../rpmdrake:234
-#: ../rpmdrake:235
-#: ../rpmdrake:236
-#: ../rpmdrake:237
+#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
+#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
 #, c-format
 msgid "Sciences"
 msgstr "Vitenskap"
 
-#: ../rpmdrake:230
+#: ../rpmdrake:231
 #, c-format
 msgid "Astronomy"
 msgstr "Astronomi"
 
-#: ../rpmdrake:231
+#: ../rpmdrake:232
 #, c-format
 msgid "Biology"
 msgstr "Biologi"
 
-#: ../rpmdrake:232
+#: ../rpmdrake:233
 #, c-format
 msgid "Chemistry"
 msgstr "Kjemi"
 
-#: ../rpmdrake:233
+#: ../rpmdrake:234
 #, c-format
 msgid "Computer science"
 msgstr "Datavitenskap"
 
-#: ../rpmdrake:234
+#: ../rpmdrake:235
 #, c-format
 msgid "Geosciences"
 msgstr "Geovitenskap"
 
-#: ../rpmdrake:235
+#: ../rpmdrake:236
 #, c-format
 msgid "Mathematics"
 msgstr "Matematikk"
 
-#: ../rpmdrake:237
+#: ../rpmdrake:238
 #, c-format
 msgid "Physics"
 msgstr "Fysikk"
 
-#: ../rpmdrake:238
+#: ../rpmdrake:239
 #, c-format
 msgid "Shells"
 msgstr "Skall"
 
-#: ../rpmdrake:239
+#: ../rpmdrake:240
 #, c-format
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../rpmdrake:240
-#: ../rpmdrake:241
-#: ../rpmdrake:242
-#: ../rpmdrake:243
-#: ../rpmdrake:244
-#: ../rpmdrake:245
-#: ../rpmdrake:246
-#: ../rpmdrake:247
-#: ../rpmdrake:248
-#: ../rpmdrake:249
-#: ../rpmdrake:250
-#: ../rpmdrake:251
-#: ../rpmdrake:252
-#: ../rpmdrake:253
-#: ../rpmdrake:254
-#: ../rpmdrake:255
-#: ../rpmdrake:256
-#: ../rpmdrake:257
+#: ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244
+#: ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248
+#: ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252
+#: ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255 ../rpmdrake:256
+#: ../rpmdrake:257 ../rpmdrake:258
 #, c-format
 msgid "System"
 msgstr "System"
 
-#: ../rpmdrake:240
+#: ../rpmdrake:241
 #, c-format
 msgid "Base"
 msgstr "Basis"
 
-#: ../rpmdrake:241
-#: ../rpmdrake:242
-#: ../rpmdrake:243
-#: ../rpmdrake:244
-#: ../rpmdrake:245
-#: ../rpmdrake:246
+#: ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245
+#: ../rpmdrake:246 ../rpmdrake:247
 #, c-format
 msgid "Configuration"
 msgstr "Oppsett"
 
-#: ../rpmdrake:241
+#: ../rpmdrake:242
 #, c-format
 msgid "Boot and Init"
 msgstr "Oppstart og init"
 
-#: ../rpmdrake:242
+#: ../rpmdrake:243
 #, c-format
 msgid "Hardware"
 msgstr "Maskinvare"
 
-#: ../rpmdrake:245
+#: ../rpmdrake:246
 #, c-format
 msgid "Packaging"
 msgstr "Pakking"
 
-#: ../rpmdrake:246
+#: ../rpmdrake:247
 #, c-format
 msgid "Printing"
 msgstr "Utskrift"
 
-#: ../rpmdrake:247
+#: ../rpmdrake:248
 #, c-format
 msgid "Deploiement"
 msgstr "Utrulling"
 
-#: ../rpmdrake:248
+#: ../rpmdrake:249
 #, c-format
 msgid "Deployment"
 msgstr "Utrulling"
 
-#: ../rpmdrake:249
-#: ../rpmdrake:250
-#: ../rpmdrake:251
-#: ../rpmdrake:252
+#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
 #, c-format
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: ../rpmdrake:249
+#: ../rpmdrake:250
 #, c-format
 msgid "Console"
 msgstr "Konsoll"
 
-#: ../rpmdrake:250
+#: ../rpmdrake:251
 #, c-format
 msgid "True type"
 msgstr "Sanntype"
 
-#: ../rpmdrake:251
+#: ../rpmdrake:252
 #, c-format
 msgid "Type1"
 msgstr "Type1"
 
-#: ../rpmdrake:252
+#: ../rpmdrake:253
 #, c-format
 msgid "X11 bitmap"
 msgstr "X11-bitmap"
 
-#: ../rpmdrake:253
+#: ../rpmdrake:254
 #, c-format
 msgid "Internationalization"
 msgstr "Internasjonalisering"
 
-#: ../rpmdrake:254
+#: ../rpmdrake:255
 #, c-format
 msgid "Kernel and hardware"
 msgstr "Kjerne og maskinvare"
 
-#: ../rpmdrake:255
+#: ../rpmdrake:256
 #, c-format
 msgid "Libraries"
 msgstr "Biblioteker"
 
-#: ../rpmdrake:256
+#: ../rpmdrake:257
 #, c-format
 msgid "Servers"
 msgstr "Tjenere"
 
-#: ../rpmdrake:257
+#: ../rpmdrake:258
 #, c-format
 msgid "XFree86"
 msgstr "XFree86"
 
-#: ../rpmdrake:258
+#: ../rpmdrake:259
 #, c-format
 msgid "Terminals"
 msgstr "Terminaler"
 
-#: ../rpmdrake:259
+#: ../rpmdrake:260
 #, c-format
 msgid "Text tools"
 msgstr "Tekstverktøy"
 
-#: ../rpmdrake:260
+#: ../rpmdrake:261
 #, c-format
 msgid "Toys"
 msgstr "Leketøy"
 
-#: ../rpmdrake:261
+#: ../rpmdrake:262
 #, c-format
 msgid "Video"
 msgstr "Video"
 
-#: ../rpmdrake:386
-#: ../rpmdrake:528
-#: ../rpmdrake:530
+#: ../rpmdrake:388 ../rpmdrake:533 ../rpmdrake:535
 #, c-format
 msgid "(Not available)"
 msgstr "(Ikke tilgjengelig)"
 
-#: ../rpmdrake:415
-#: ../rpmdrake:492
+#: ../rpmdrake:417 ../rpmdrake:497
 #, c-format
 msgid "Search results"
 msgstr "Søkeresultater"
 
-#: ../rpmdrake:415
+#: ../rpmdrake:417
 #, c-format
 msgid "Search results (none)"
 msgstr "Søkeresultater (ingen)"
 
-#: ../rpmdrake:426
-#: ../rpmdrake:450
+#: ../rpmdrake:428 ../rpmdrake:455
 #, c-format
 msgid "Please wait, searching..."
 msgstr "Vennligst vent, søker..."
 
-#: ../rpmdrake:445
-#: ../rpmdrake:1233
-#: ../rpmdrake:1543
-#: ../rpmdrake:1757
+#: ../rpmdrake:450 ../rpmdrake:576 ../rpmdrake:1235 ../rpmdrake:1546
+#: ../rpmdrake:1758
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../rpmdrake:455
+#: ../rpmdrake:460
 #, c-format
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../rpmdrake:493
-#: ../rpmdrake:662
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Upgradable"
 msgstr "Oppgraderbar"
 
-#: ../rpmdrake:493
-#: ../rpmdrake:662
+#: ../rpmdrake:498 ../rpmdrake:664
 #, c-format
 msgid "Addable"
 msgstr "Kan legges til"
 
-#: ../rpmdrake:495
+#: ../rpmdrake:500
 #, c-format
 msgid "Selected"
 msgstr "Valgte"
 
-#: ../rpmdrake:495
+#: ../rpmdrake:500
 #, c-format
 msgid "Not selected"
 msgstr "Ikke valgt"
 
-#: ../rpmdrake:525
+#: ../rpmdrake:530
 #, c-format
 msgid "Files:\n"
 msgstr "Filer:\n"
 
-#: ../rpmdrake:530
+#: ../rpmdrake:535
 #, c-format
 msgid "Changelog:\n"
 msgstr "Endringslogg:\n"
 
-#: ../rpmdrake:535
+#: ../rpmdrake:540
 #, c-format
 msgid "Medium: "
 msgstr "Medium: "
 
-#: ../rpmdrake:537
+#: ../rpmdrake:542
 #, c-format
 msgid "Currently installed version: "
 msgstr "Nåværende installerte versjon: "
 
-#: ../rpmdrake:545
+#: ../rpmdrake:550
 #, c-format
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../rpmdrake:546
+#: ../rpmdrake:551
 #, c-format
 msgid "Version: "
 msgstr "Versjon: "
 
-#: ../rpmdrake:547
+#: ../rpmdrake:552
 #, c-format
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: ../rpmdrake:547
+#: ../rpmdrake:552
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake:550
+#: ../rpmdrake:555
 #, c-format
 msgid "Importance: "
 msgstr "Viktighet: "
 
-#: ../rpmdrake:553
+#: ../rpmdrake:558
 #, c-format
 msgid "Summary: "
 msgstr "Oppsummering: "
 
-#: ../rpmdrake:556
+#: ../rpmdrake:561
 #, c-format
 msgid "Reason for update: "
 msgstr "Grunn til oppdatering: "
 
-#: ../rpmdrake:558
+#: ../rpmdrake:563
 #, c-format
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: ../rpmdrake:558
+#: ../rpmdrake:563
 #, c-format
 msgid "No description"
 msgstr "Ingen beskrivelse"
 
-#: ../rpmdrake:573
-#, c-format
-msgid "Rpmdrake %s"
-msgstr "Rpmdrake %s"
-
-#: ../rpmdrake:590
-#: ../rpmdrake:712
-#: ../rpmdrake:714
-#: ../rpmdrake:1637
+#: ../rpmdrake:592 ../rpmdrake:714 ../rpmdrake:716 ../rpmdrake:1638
 #, c-format
 msgid "More information on package..."
 msgstr "Mer informasjon om pakke..."
 
-#: ../rpmdrake:591
+#: ../rpmdrake:593
 #, c-format
 msgid "Please choose"
 msgstr "Vennligst velg"
 
-#: ../rpmdrake:591
+#: ../rpmdrake:593
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "En av de følgende pakkene behøves:"
 
-#: ../rpmdrake:612
+#: ../rpmdrake:614
 #, c-format
 msgid "Please wait, listing packages..."
 msgstr "Vennligst vent, lister opp pakker..."
 
-#: ../rpmdrake:629
+#: ../rpmdrake:631
 #, c-format
 msgid "No update"
 msgstr "Ingen oppdatering"
 
-#: ../rpmdrake:630
+#: ../rpmdrake:632
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -1363,30 +1327,28 @@ msgstr ""
 "noen tilgjengelige oppdateringer for pakkene som er installert på\n"
 "din maskin, eller at du allerede har installert alle sammen."
 
-#: ../rpmdrake:653
+#: ../rpmdrake:655
 #, c-format
 msgid "All"
 msgstr "Alle"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:699
-#: ../rpmdrake:704
+#: ../rpmdrake:701 ../rpmdrake:706
 #, c-format
 msgid "More info"
 msgstr "Mer info"
 
-#: ../rpmdrake:707
-#: ../rpmdrake:1626
+#: ../rpmdrake:709 ../rpmdrake:1627
 #, c-format
 msgid "Information on packages"
 msgstr "Informasjon om pakker"
 
-#: ../rpmdrake:729
+#: ../rpmdrake:731
 #, c-format
 msgid "Some additional packages need to be removed"
 msgstr "Noen ytterligere pakker renger å fjernes"
 
-#: ../rpmdrake:730
+#: ../rpmdrake:732
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -1397,13 +1359,12 @@ msgstr ""
 "å bli fjernet:\n"
 "\n"
 
-#: ../rpmdrake:736
-#: ../rpmdrake:745
+#: ../rpmdrake:738 ../rpmdrake:747
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "Noen pakker kan ikke fjernes"
 
-#: ../rpmdrake:737
+#: ../rpmdrake:739
 #, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1412,8 +1373,7 @@ msgstr ""
 "Beklager, men fjerning av disse pakkene vil ødelegge systemet ditt:\n"
 "\n"
 
-#: ../rpmdrake:746
-#: ../rpmdrake:808
+#: ../rpmdrake:748 ../rpmdrake:810
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1424,12 +1384,12 @@ msgstr ""
 "vekk nå:\n"
 "\n"
 
-#: ../rpmdrake:775
+#: ../rpmdrake:777
 #, c-format
 msgid "Additional packages needed"
 msgstr "Ytterligere pakker trengs"
 
-#: ../rpmdrake:776
+#: ../rpmdrake:778
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
@@ -1440,17 +1400,17 @@ msgstr ""
 "installeres:\n"
 "\n"
 
-#: ../rpmdrake:791
+#: ../rpmdrake:793
 #, c-format
 msgid "%s (belongs to the skip list)"
 msgstr "%s (hører til skip-lista)"
 
-#: ../rpmdrake:793
+#: ../rpmdrake:795
 #, c-format
 msgid "Some packages can't be installed"
 msgstr "Noen pakker kan ikke installeres"
 
-#: ../rpmdrake:794
+#: ../rpmdrake:796
 #, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
@@ -1461,123 +1421,122 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:807
-#: ../rpmdrake:1073
+#: ../rpmdrake:809 ../rpmdrake:1075
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "Noen pakker må fjernes"
 
-#: ../rpmdrake:832
+#: ../rpmdrake:834
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "Valgt: %d MB / Ledig diskplass: %d MB"
 
-#: ../rpmdrake:833
+#: ../rpmdrake:835
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "Valgt størrelse: %d MB"
 
-#: ../rpmdrake:839
+#: ../rpmdrake:841
 #, c-format
 msgid "Description not available for this package\n"
 msgstr "Beskrivelse er ikke tilgjengelig for denne pakken\n"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Security updates"
 msgstr "Sikkerhetsoppdateringer"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Bugfixes updates"
 msgstr "Feilrettingsoppdateringer"
 
-#: ../rpmdrake:906
+#: ../rpmdrake:908
 #, c-format
 msgid "Normal updates"
 msgstr "Normale oppdateringer"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:928
 #, c-format
 msgid "%s choices"
 msgstr "%s valg"
 
-#: ../rpmdrake:926
+#: ../rpmdrake:928
 #, c-format
-msgid "Mandrakelinux choices"
-msgstr "Mandrakelinux-valg"
+msgid "Mandriva Linux choices"
+msgstr "Mandriva Linux-valg"
 
-#: ../rpmdrake:929
+#: ../rpmdrake:931
 #, c-format
 msgid "All packages, alphabetical"
 msgstr "Alle pakker, alfabetisk"
 
-#: ../rpmdrake:937
+#: ../rpmdrake:939
 #, c-format
 msgid "All packages, by group"
 msgstr "Alle pakker, etter gruppe"
 
-#: ../rpmdrake:938
+#: ../rpmdrake:940
 #, c-format
 msgid "All packages, by size"
 msgstr "Alle pakker, etter størrelse"
 
-#: ../rpmdrake:939
+#: ../rpmdrake:941
 #, c-format
 msgid "All packages, by selection state"
 msgstr "Alle pakker, etter valgstadie"
 
-#: ../rpmdrake:943
+#: ../rpmdrake:945
 #, c-format
 msgid "All packages, by medium repository"
 msgstr "Alle pakker, etter mediumlager"
 
-#: ../rpmdrake:944
+#: ../rpmdrake:946
 #, c-format
 msgid "All packages, by update availability"
 msgstr "Alle pakker, ved oppdateringstilgjengelighet"
 
-#: ../rpmdrake:948
+#: ../rpmdrake:950
 #, c-format
 msgid "Leaves only, sorted by install date"
 msgstr "Bare blader, sortert etter installasjonsdato"
 
-#: ../rpmdrake:1022
+#: ../rpmdrake:1024
 #, c-format
 msgid "in names"
 msgstr "i navn"
 
-#: ../rpmdrake:1024
+#: ../rpmdrake:1026
 #, c-format
 msgid "in descriptions"
 msgstr "i beskrivelser"
 
-#: ../rpmdrake:1026
+#: ../rpmdrake:1028
 #, c-format
 msgid "in file names"
 msgstr "i filnavn"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1037
 #, c-format
 msgid "Normal information"
 msgstr "Normal informasjon"
 
-#: ../rpmdrake:1035
+#: ../rpmdrake:1037
 #, c-format
 msgid "Maximum information"
 msgstr "Full informasjon"
 
-#: ../rpmdrake:1055
+#: ../rpmdrake:1057
 #, c-format
 msgid "You need to select some packages first."
 msgstr "Du må velge noen pakker først."
 
-#: ../rpmdrake:1060
+#: ../rpmdrake:1062
 #, c-format
 msgid "Too many packages are selected"
 msgstr "For mange pakker er valgt"
 
-#: ../rpmdrake:1061
+#: ../rpmdrake:1063
 #, c-format
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
@@ -1594,7 +1553,7 @@ msgstr ""
 "\n"
 "Ønsker du virkelig å installere alle valgte pakker?"
 
-#: ../rpmdrake:1074
+#: ../rpmdrake:1076
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1609,100 +1568,98 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake:1107
+#: ../rpmdrake:1109
 #, c-format
 msgid "Software Packages Removal"
 msgstr "Fjerning av Programvarepakker"
 
-#: ../rpmdrake:1108
+#: ../rpmdrake:1110
 #, c-format
 msgid "Software Packages Update"
 msgstr "Oppdatering av Programvarepakker"
 
-#: ../rpmdrake:1109
+#: ../rpmdrake:1111
 #, c-format
 msgid "Software Packages Installation"
 msgstr "Installasjon av Programvarepakker"
 
-#: ../rpmdrake:1115
-#: ../rpmdrake:1118
-#: ../rpmdrake:1127
-#: ../rpmdrake:1138
-#: ../rpmdrake:1143
+#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
 msgstr "/_Fil"
 
-#: ../rpmdrake:1118
+#: ../rpmdrake:1120
 #, c-format
 msgid "/_Update media"
 msgstr "/_Oppdater media"
 
-#: ../rpmdrake:1127
+#: ../rpmdrake:1129
 #, c-format
 msgid "/_Reset the selection"
 msgstr "/_Nullstill valget"
 
-#: ../rpmdrake:1138
+#: ../rpmdrake:1140
 #, c-format
 msgid "/Reload the _packages list"
 msgstr "/Last _pakkelisten på nytt"
 
-#: ../rpmdrake:1143
+#: ../rpmdrake:1145
 #, c-format
 msgid "/_Quit"
 msgstr "/_Avslutt"
 
-#: ../rpmdrake:1146
-#: ../rpmdrake:1147
-#: ../rpmdrake:1154
+#: ../rpmdrake:1145
+#, c-format
+msgid "<control>Q"
+msgstr "<control>Q"
+
+#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr "/_Valg"
 
-#: ../rpmdrake:1147
-#: ../rpmdrake:1154
+#: ../rpmdrake:1149 ../rpmdrake:1156
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/_Vis valgte pakker automatisk"
 
-#: ../rpmdrake:1151
-#: ../rpmdrake:1152
+#: ../rpmdrake:1153 ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr "/_Hjelp"
 
-#: ../rpmdrake:1168
+#: ../rpmdrake:1170
 #, c-format
 msgid "Find:"
 msgstr "Finn:"
 
-#: ../rpmdrake:1173
+#: ../rpmdrake:1175
 #, c-format
 msgid "Search"
 msgstr "Søk"
 
-#: ../rpmdrake:1179
+#: ../rpmdrake:1181
 #, c-format
 msgid "Install"
 msgstr "Installer"
 
-#: ../rpmdrake:1184
+#: ../rpmdrake:1186
 #, c-format
 msgid "Quit"
 msgstr "Avslutt"
 
-#: ../rpmdrake:1225
+#: ../rpmdrake:1227
 #, c-format
 msgid "Fatal error"
 msgstr "Kritisk feil"
 
-#: ../rpmdrake:1226
+#: ../rpmdrake:1228
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "En kritisk feil oppsto: %s."
 
-#: ../rpmdrake:1234
+#: ../rpmdrake:1236
 #, c-format
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
@@ -1715,12 +1672,12 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake:1243
+#: ../rpmdrake:1245
 #, c-format
 msgid "Already existing update media"
 msgstr "Allerede eksisterende oppdateringsmedia"
 
-#: ../rpmdrake:1244
+#: ../rpmdrake:1246
 #, c-format
 msgid ""
 "You already have at least one update medium configured, but\n"
@@ -1737,12 +1694,12 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1254
+#: ../rpmdrake:1256
 #, c-format
 msgid "How to choose manually your mirror"
 msgstr "Hvordan velge ditt speil manuelt"
 
-#: ../rpmdrake:1255
+#: ../rpmdrake:1257
 #, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
@@ -1757,67 +1714,62 @@ msgstr ""
 "\n"
 "Start så %s på nytt."
 
-#: ../rpmdrake:1288
+#: ../rpmdrake:1290
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "Vennligst vent, finner tilgjengelige pakker..."
 
-#: ../rpmdrake:1366
+#: ../rpmdrake:1368
 #, c-format
 msgid "Inspecting %s"
 msgstr "Sjekker %s"
 
-#: ../rpmdrake:1389
+#: ../rpmdrake:1391
 #, c-format
 msgid "changes:"
 msgstr "endringer:"
 
-#: ../rpmdrake:1397
+#: ../rpmdrake:1399
 #, c-format
 msgid "Remove .%s"
 msgstr "Fjern .%s"
 
-#: ../rpmdrake:1401
+#: ../rpmdrake:1403
 #, c-format
 msgid "Use .%s as main file"
 msgstr "Bruk .%s som hovedfil"
 
-#: ../rpmdrake:1405
+#: ../rpmdrake:1407
 #, c-format
 msgid "Do nothing"
 msgstr "Ikke gjør noe"
 
-#: ../rpmdrake:1421
+#: ../rpmdrake:1423
 #, c-format
 msgid "Installation finished"
 msgstr "Installasjon ferdig"
 
-#: ../rpmdrake:1436
+#: ../rpmdrake:1438
 #, c-format
 msgid "Inspect..."
 msgstr "Sjekk..."
 
-#: ../rpmdrake:1465
-#: ../rpmdrake:1622
+#: ../rpmdrake:1468 ../rpmdrake:1623
 #, c-format
 msgid "Everything installed successfully"
 msgstr "Alt ble vellykket installert"
 
-#: ../rpmdrake:1466
-#: ../rpmdrake:1623
+#: ../rpmdrake:1469 ../rpmdrake:1624
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "Alle forespurte pakker ble vellykket installert."
 
-#: ../rpmdrake:1468
-#: ../rpmdrake:1607
+#: ../rpmdrake:1471 ../rpmdrake:1608
 #, c-format
 msgid "Problem during installation"
 msgstr "Problemer under installasjon"
 
-#: ../rpmdrake:1469
-#: ../rpmdrake:1608
-#: ../rpmdrake:1663
+#: ../rpmdrake:1472 ../rpmdrake:1609 ../rpmdrake:1664
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1828,18 +1780,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1482
+#: ../rpmdrake:1485
 #, c-format
 msgid "Unable to get source packages."
 msgstr "Ikke i stand til å få tak i kildepakker."
 
-#: ../rpmdrake:1483
+#: ../rpmdrake:1486
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "Ikke i stand til å hente kildepakker, beklager. %s"
 
-#: ../rpmdrake:1484
-#: ../rpmdrake:1555
+#: ../rpmdrake:1487 ../rpmdrake:1558
 #, c-format
 msgid ""
 "\n"
@@ -1852,37 +1803,37 @@ msgstr ""
 "Feil rapportert:\n"
 "%s"
 
-#: ../rpmdrake:1491
+#: ../rpmdrake:1494
 #, c-format
 msgid "Package installation..."
 msgstr "Pakkeinstallasjon..."
 
-#: ../rpmdrake:1491
+#: ../rpmdrake:1494
 #, c-format
 msgid "Initializing..."
 msgstr "Klargjør..."
 
-#: ../rpmdrake:1500
+#: ../rpmdrake:1503
 #, c-format
 msgid "Change medium"
 msgstr "Endre medium"
 
-#: ../rpmdrake:1501
+#: ../rpmdrake:1504
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Vennligst sett inn medium kalt \"%s\" på enhet [%s]"
 
-#: ../rpmdrake:1508
+#: ../rpmdrake:1511
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "Laster ned pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1531
+#: ../rpmdrake:1534
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "Sjekker pakkersignaturer..."
 
-#: ../rpmdrake:1544
+#: ../rpmdrake:1547
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1897,13 +1848,12 @@ msgstr ""
 "\n"
 "Vil du fortsette installasjon?"
 
-#: ../rpmdrake:1552
-#: ../rpmdrake:1662
+#: ../rpmdrake:1555 ../rpmdrake:1663
 #, c-format
 msgid "Installation failed"
 msgstr "Installasjon mislyktes"
 
-#: ../rpmdrake:1553
+#: ../rpmdrake:1556
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1916,22 +1866,22 @@ msgstr ""
 "\n"
 "Du vil kanskje oppdatere din mediadatabase."
 
-#: ../rpmdrake:1566
+#: ../rpmdrake:1569
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "Forbereder pakker for installasjon..."
 
-#: ../rpmdrake:1569
+#: ../rpmdrake:1572
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
-#: ../rpmdrake:1585
+#: ../rpmdrake:1588
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "klarte ikke å åpne rpm-fil [%s]"
 
-#: ../rpmdrake:1620
+#: ../rpmdrake:1621
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -1944,47 +1894,47 @@ msgstr ""
 "Noen oppsettsfiler ble opprettet som `.rpmnew' ellr `.rpmsave',\n"
 "du kan nå sjekke noen for å utføre noen handlinger:"
 
-#: ../rpmdrake:1620
+#: ../rpmdrake:1621
 #, c-format
 msgid "everything was installed correctly"
 msgstr "alt ble riktig installert"
 
-#: ../rpmdrake:1628
+#: ../rpmdrake:1629
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "Disse pakkene kommer med oppgraderingsinformasjon"
 
-#: ../rpmdrake:1640
+#: ../rpmdrake:1641
 #, c-format
 msgid "More information on package... [%s]"
 msgstr "Mer informasjon om pakke... [%s]"
 
-#: ../rpmdrake:1653
+#: ../rpmdrake:1654
 #, c-format
 msgid "No package found for installation."
 msgstr "Ingen pakker ble funnet for installasjon."
 
-#: ../rpmdrake:1654
+#: ../rpmdrake:1655
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "Uopprettelig feil: ingen pakke ble funnet for installasjon, beklager."
 
-#: ../rpmdrake:1676
+#: ../rpmdrake:1677
 #, c-format
 msgid "Please wait, reading packages database..."
 msgstr "Leser pakkedatabase, vennligst vent..."
 
-#: ../rpmdrake:1723
+#: ../rpmdrake:1724
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "Vennligst vent, fjerner pakker..."
 
-#: ../rpmdrake:1728
+#: ../rpmdrake:1729
 #, c-format
 msgid "Problem during removal"
 msgstr "Problem under fjerning"
 
-#: ../rpmdrake:1729
+#: ../rpmdrake:1730
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -1995,7 +1945,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:1762
+#: ../rpmdrake:1763
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -2008,7 +1958,7 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge hvilken programvare du skal fjerne\n"
 "fra maskinen din."
 
-#: ../rpmdrake:1767
+#: ../rpmdrake:1768
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -2021,207 +1971,213 @@ msgstr ""
 "Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
 "på maskinen din."
 
-#: ../rpmdrake:1772
+#: ../rpmdrake:1773
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "Velkommen til installasjonsprogrammet for programvarepakker!"
 
-#: ../rpmdrake:1773
+#: ../rpmdrake:1774
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
-"Your Mandrakelinux system comes with several thousands of software\n"
+"Your Mandriva Linux system comes with several thousands of software\n"
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
 "Velkommen til verktøyet for installering av programvare!\n"
 "\n"
-"Mandrakelinux-systemet ditt kommer med flere tusen programvarepakker\n"
+"Mandriva Linux-systemet ditt kommer med flere tusen programvarepakker\n"
 "på CDROM eller DVD. Dette verktøyet hjelper deg å velge hvilken\n"
 "programvare du ønsker å installere på maskinen din."
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
 #, c-format
 msgid "Software Update"
 msgstr "Programvareoppdatering"
 
-#: ../rpmdrake.pm:94
+#: ../rpmdrake.pm:95
 #, c-format
-msgid "Mandrakelinux Update"
-msgstr "Mandrakelinux Oppdatering"
+msgid "Mandriva Linux Update"
+msgstr "Mandriva Linux Oppdatering"
+
+#: ../rpmdrake.pm:122
+#, fuzzy, c-format
+msgid "Please enter your credentials for accessing proxy\n"
+msgstr "Vennligst skriv inn e-postadressen din nedenfor"
 
-#: ../rpmdrake.pm:183
+#: ../rpmdrake.pm:123
+#, fuzzy, c-format
+msgid "User name:"
+msgstr "Brukernavn:"
+
+#: ../rpmdrake.pm:215
 #, c-format
 msgid "No"
 msgstr "Nei"
 
-#: ../rpmdrake.pm:187
+#: ../rpmdrake.pm:219
 #, c-format
 msgid "Yes"
 msgstr "Ja"
 
-#: ../rpmdrake.pm:235
+#: ../rpmdrake.pm:267
 #, c-format
 msgid "Info..."
 msgstr "Info..."
 
-#: ../rpmdrake.pm:311
+#: ../rpmdrake.pm:343
 #, c-format
 msgid "Austria"
 msgstr "Østerrike"
 
-#: ../rpmdrake.pm:312
+#: ../rpmdrake.pm:344
 #, c-format
 msgid "Australia"
 msgstr "Australia"
 
-#: ../rpmdrake.pm:313
+#: ../rpmdrake.pm:345
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: ../rpmdrake.pm:314
+#: ../rpmdrake.pm:346
 #, c-format
 msgid "Brazil"
 msgstr "Brasil"
 
-#: ../rpmdrake.pm:315
+#: ../rpmdrake.pm:347
 #, c-format
 msgid "Canada"
 msgstr "Canada"
 
-#: ../rpmdrake.pm:316
+#: ../rpmdrake.pm:348
 #, c-format
 msgid "Switzerland"
 msgstr "Sveits"
 
-#: ../rpmdrake.pm:317
+#: ../rpmdrake.pm:349
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../rpmdrake.pm:318
+#: ../rpmdrake.pm:350
 #, c-format
 msgid "Czech Republic"
 msgstr "Tjekkiske Republikk"
 
-#: ../rpmdrake.pm:319
+#: ../rpmdrake.pm:351
 #, c-format
 msgid "Germany"
 msgstr "Tyskland"
 
-#: ../rpmdrake.pm:320
+#: ../rpmdrake.pm:352
 #, c-format
 msgid "Danmark"
 msgstr "Danmark"
 
-#: ../rpmdrake.pm:321
-#: ../rpmdrake.pm:325
+#: ../rpmdrake.pm:353 ../rpmdrake.pm:357
 #, c-format
 msgid "Greece"
 msgstr "Hellas"
 
-#: ../rpmdrake.pm:322
+#: ../rpmdrake.pm:354
 #, c-format
 msgid "Spain"
 msgstr "Spania"
 
-#: ../rpmdrake.pm:323
+#: ../rpmdrake.pm:355
 #, c-format
 msgid "Finland"
 msgstr "Finland"
 
-#: ../rpmdrake.pm:324
+#: ../rpmdrake.pm:356
 #, c-format
 msgid "France"
 msgstr "Frankrike"
 
-#: ../rpmdrake.pm:326
+#: ../rpmdrake.pm:358
 #, c-format
 msgid "Hungary"
 msgstr "Hungarn"
 
-#: ../rpmdrake.pm:327
+#: ../rpmdrake.pm:359
 #, c-format
 msgid "Israel"
 msgstr "Israel"
 
-#: ../rpmdrake.pm:328
+#: ../rpmdrake.pm:360
 #, c-format
 msgid "Italy"
 msgstr "Italia"
 
-#: ../rpmdrake.pm:329
+#: ../rpmdrake.pm:361
 #, c-format
 msgid "Japan"
 msgstr "Japan"
 
-#: ../rpmdrake.pm:330
+#: ../rpmdrake.pm:362
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: ../rpmdrake.pm:331
+#: ../rpmdrake.pm:363
 #, c-format
 msgid "Netherlands"
 msgstr "Nederland"
 
-#: ../rpmdrake.pm:332
+#: ../rpmdrake.pm:364
 #, c-format
 msgid "Norway"
 msgstr "Norge"
 
-#: ../rpmdrake.pm:333
+#: ../rpmdrake.pm:365
 #, c-format
 msgid "Poland"
 msgstr "Polen"
 
-#: ../rpmdrake.pm:334
+#: ../rpmdrake.pm:366
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: ../rpmdrake.pm:335
+#: ../rpmdrake.pm:367
 #, c-format
 msgid "Russia"
 msgstr "Russland"
 
-#: ../rpmdrake.pm:336
+#: ../rpmdrake.pm:368
 #, c-format
 msgid "Sweden"
 msgstr "Sverige"
 
-#: ../rpmdrake.pm:337
+#: ../rpmdrake.pm:369
 #, c-format
 msgid "Slovakia"
 msgstr "Slovakia"
 
-#: ../rpmdrake.pm:338
+#: ../rpmdrake.pm:370
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: ../rpmdrake.pm:339
+#: ../rpmdrake.pm:371
 #, c-format
 msgid "United Kingdom"
 msgstr "Storbritannia"
 
-#: ../rpmdrake.pm:340
+#: ../rpmdrake.pm:372
 #, c-format
 msgid "China"
 msgstr "Kina"
 
-#: ../rpmdrake.pm:341
-#: ../rpmdrake.pm:342
-#: ../rpmdrake.pm:343
-#: ../rpmdrake.pm:344
-#: ../rpmdrake.pm:421
+#: ../rpmdrake.pm:373 ../rpmdrake.pm:374 ../rpmdrake.pm:375 ../rpmdrake.pm:376
+#: ../rpmdrake.pm:453
 #, c-format
 msgid "United States"
 msgstr "USA"
 
-#: ../rpmdrake.pm:433
+#: ../rpmdrake.pm:468
 #, c-format
 msgid ""
 "I need to access internet to get the mirror list.\n"
@@ -2234,35 +2190,35 @@ msgstr ""
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake.pm:437
+#: ../rpmdrake.pm:472
 #, c-format
 msgid ""
-"I need to contact the Mandrakesoft website to get the mirror list.\n"
+"I need to contact the Mandriva website to get the mirror list.\n"
 "Please check that your network is currently running.\n"
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Jeg må kontakte Mandrakesoft-nettsiden for å få speillisten.\n"
+"Jeg må kontakte Mandriva-nettsiden for å få speillisten.\n"
 "Vennligst sjekk at nettverket ditt er oppe og går.\n"
 "\n"
 "Er det ok å fortsette?"
 
-#: ../rpmdrake.pm:443
+#: ../rpmdrake.pm:478
 #, c-format
 msgid "Please wait, downloading mirror addresses."
 msgstr "Laster ned speiladresser, vennligst vent."
 
-#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:479
 #, c-format
-msgid "Please wait, downloading mirror addresses from the Mandrakesoft website."
-msgstr "Laster ned liste over speil fra Mandrakesoft-nettsiden, vennligst vent."
+msgid "Please wait, downloading mirror addresses from the Mandriva website."
+msgstr "Laster ned liste over speil fra Mandriva-nettsiden, vennligst vent."
 
-#: ../rpmdrake.pm:450
+#: ../rpmdrake.pm:485
 #, c-format
 msgid "Error during download"
 msgstr "Feil under nedlasting"
 
-#: ../rpmdrake.pm:452
+#: ../rpmdrake.pm:487
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
@@ -2277,138 +2233,141 @@ msgstr ""
 "Nettverket, eller nettsiden, er kanskje ikke tilgjengelig.\n"
 "Vennligst prøv igjen senere."
 
-#: ../rpmdrake.pm:457
+#: ../rpmdrake.pm:492
 #, c-format
 msgid ""
 "There was an error downloading the mirror list:\n"
 "\n"
 "%s\n"
-"The network, or the Mandrakesoft website, may be unavailable.\n"
+"The network, or the Mandriva website, may be unavailable.\n"
 "Please try again later."
 msgstr ""
 "Det oppsto en feil ved nedlasting av speilliste:\n"
 "\n"
 "%s\n"
-"Nettverket, eller Mandrakesoft-nettsiden, er kanskje ikke tilgjengelig.\n"
+"Nettverket, eller Mandriva-nettsiden, er kanskje ikke tilgjengelig.\n"
 "Vennligst prøv igjen senere."
 
-#: ../rpmdrake.pm:466
+#: ../rpmdrake.pm:501
 #, c-format
 msgid "No mirror"
 msgstr "Inget speil"
 
-#: ../rpmdrake.pm:468
+#: ../rpmdrake.pm:503
 #, c-format
 msgid "I can't find any suitable mirror."
 msgstr "Jeg kan ikke finne noe passende speil."
 
-#: ../rpmdrake.pm:469
+#: ../rpmdrake.pm:504
 #, c-format
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
 "There can be many reasons for this problem; the most frequent is\n"
 "the case when the architecture of your processor is not supported\n"
-"by Mandrakelinux Official Updates."
+"by Mandriva Linux Official Updates."
 msgstr ""
 "Jeg kan ikke finne noe passende speil.\n"
 "\n"
 "Det kan være mange årsaker til dette problemet; den mest vanlige er\n"
 "når arkitekturen til prosessoren din ikke er støttet\n"
-"av Mandrakelinux' offisielle oppdateringer."
+"av Mandriva Linux' offisielle oppdateringer."
 
-#: ../rpmdrake.pm:488
+#: ../rpmdrake.pm:523
 #, c-format
 msgid "Please choose the desired mirror."
 msgstr "Vennligst velg ønsket speil."
 
-#: ../rpmdrake.pm:547
+#: ../rpmdrake.pm:581
 #, c-format
 msgid "Copying file for medium `%s'..."
 msgstr "Kopierer fil for medium `%s'..."
 
-#: ../rpmdrake.pm:550
+#: ../rpmdrake.pm:584
 #, c-format
 msgid "Examining file of medium `%s'..."
 msgstr "Kontrollerer fil fra medium `%s'..."
 
-#: ../rpmdrake.pm:553
+#: ../rpmdrake.pm:587
 #, c-format
 msgid "Examining remote file of medium `%s'..."
 msgstr "Kontrollerer ekstern fil fra medium `%s'..."
 
-#: ../rpmdrake.pm:557
+#: ../rpmdrake.pm:591
 #, c-format
 msgid " done."
 msgstr " ferdig."
 
-#: ../rpmdrake.pm:561
+#: ../rpmdrake.pm:595
 #, c-format
 msgid " failed!"
 msgstr " mislyktes!"
 
 #. -PO: We're downloading the said file from the said medium
-#: ../rpmdrake.pm:565
+#: ../rpmdrake.pm:599
 #, c-format
 msgid "%s from medium %s"
 msgstr "%s fra medium %s"
 
-#: ../rpmdrake.pm:569
+#: ../rpmdrake.pm:603
 #, c-format
 msgid "Starting download of `%s'..."
 msgstr "Starter nedlastning av `%s'..."
 
-#: ../rpmdrake.pm:573
+#: ../rpmdrake.pm:607
 #, 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:576
+#: ../rpmdrake.pm:610
 #, c-format
 msgid "Download of `%s', speed:%s"
 msgstr "Nedlastning av `%s', hastighet:%s"
 
-#: ../rpmdrake.pm:613
+#: ../rpmdrake.pm:647
 #, c-format
 msgid "Error retrieving packages"
 msgstr "Feil ved henting av pakker"
 
-#: ../rpmdrake.pm:614
+#: ../rpmdrake.pm:648
 #, c-format
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
-"you should use the Software Media Manager to remove it and re-add it in order\n"
+"you should use the Software Media Manager to remove it and re-add it in "
+"order\n"
 "to reconfigure it, either it is currently unreachable and you should retry\n"
 "later."
 msgstr ""
 "Det er umulig å hente ned listen over nye pakker fra mediet\n"
 "`%s'. Enten så er dette oppdateringsmediet feilkonfigurert, og isåfall\n"
-"så bør du bruke Programvare-Mediahåndtereren for å fjerne det og legge det til på nytt for å\n"
-"kunne sette det opp på nyttomkonfigurere det, eller så er det for øyeblikket ikke mulig å rekke det\n"
+"så bør du bruke Programvare-Mediahåndtereren for å fjerne det og legge det "
+"til på nytt for å\n"
+"kunne sette det opp på nyttomkonfigurere det, eller så er det for øyeblikket "
+"ikke mulig å rekke det\n"
 "og du bør da prøve på nytt senere."
 
-#: ../rpmdrake.pm:645
+#: ../rpmdrake.pm:679
 #, c-format
 msgid "Update media"
 msgstr "Oppdaterer media"
 
-#: ../rpmdrake.pm:653
+#: ../rpmdrake.pm:687
 #, c-format
 msgid "Select the media you wish to update:"
 msgstr "Velg mediet du ønsker å oppdatere:"
 
-#: ../rpmdrake.pm:667
+#: ../rpmdrake.pm:701
 #, c-format
 msgid "Select all"
 msgstr "Velg alle"
 
-#: ../rpmdrake.pm:671
+#: ../rpmdrake.pm:705
 #, c-format
 msgid "Update"
 msgstr "Oppdater"
 
-#: ../rpmdrake.pm:693
+#: ../rpmdrake.pm:727
 #, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
@@ -2421,8 +2380,7 @@ msgstr ""
 "Feil:\n"
 "%s"
 
-#: ../rpmdrake.pm:717
-#: ../rpmdrake.pm:726
+#: ../rpmdrake.pm:751 ../rpmdrake.pm:760
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2433,17 +2391,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:738
+#: ../rpmdrake.pm:772
 #, c-format
 msgid "Unable to create medium."
 msgstr "Kan ikke opprette medium."
 
-#: ../rpmdrake.pm:743
+#: ../rpmdrake.pm:777
 #, c-format
 msgid "Failure when adding medium"
 msgstr "Feil under forsøk på å legge til medium"
 
-#: ../rpmdrake.pm:744
+#: ../rpmdrake.pm:778
 #, c-format
 msgid ""
 "There was a problem adding medium:\n"
@@ -2454,33 +2412,39 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake.pm:757
+#: ../rpmdrake.pm:791
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of %s you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of %s you're "
+"running (%s).\n"
 "It will be disabled."
 msgstr ""
-"Ditt medium `%s', som brukes for oppdateringer stemmer ikke overens med versjonen av %s du kjører (%s).\n"
+"Ditt medium `%s', som brukes for oppdateringer stemmer ikke overens med "
+"versjonen av %s du kjører (%s).\n"
 "Det vil bli deaktivert"
 
-#: ../rpmdrake.pm:760
+#: ../rpmdrake.pm:794
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of Mandrakelinux you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of Mandriva "
+"Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
-"Ditt medium `%s', som brukes for oppdateringer stemmer ikke overens med versjonen av Mandrakelinux du kjører (%s).\n"
+"Ditt medium `%s', som brukes for oppdateringer stemmer ikke overens med "
+"versjonen av Mandriva Linux du kjører (%s).\n"
 "Det vil bli deaktivert"
 
-#: ../rpmdrake.pm:776
+#: ../rpmdrake.pm:810
 #, c-format
 msgid "Help launched in background"
 msgstr "Hjelp startet opp i bakgrunn"
 
-#: ../rpmdrake.pm:777
+#: ../rpmdrake.pm:811
 #, c-format
-msgid "The help window has been started, it should appear shortly on your desktop."
-msgstr "Hjelpevinduet har blitt startet, det bør straks dukke opp på ditt skrivebord."
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
+"Hjelpevinduet har blitt startet, det bør straks dukke opp på ditt skrivebord."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -2752,3 +2716,8 @@ msgstr "Fjern programvare"
 msgid "Software Media Manager"
 msgstr "Programvare-Mediahåndterer"
 
+#~ msgid "Keys"
+#~ msgstr "Nøkler"
+
+#~ msgid "Rpmdrake %s"
+#~ msgstr "Rpmdrake %s"