Merge strings

1 files changed, 417 insertions, 279 deletions

diff --git a/po/nb.po b/po/nb.po
index f48014fd..d867fb34 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-02-02 19:45+0800\n"
+"POT-Creation-Date: 2006-02-14 14:40+0100\n"
 "PO-Revision-Date: 2005-07-07 02:19+0200\n"
 "Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
 "Language-Team: Norsk Bokmål <cooker-i18n@mandrivalinux.org>\n"
@@ -150,7 +150,7 @@ msgstr " (å installere)"
 msgid "Package choice"
 msgstr "Pakkevalg"
 
-#: ../gurpmi2:124 ../urpmi:402
+#: ../gurpmi2:124 ../urpmi:414
 msgid "One of the following packages is needed:"
 msgstr "En av følgende pakker behøves:"
 
@@ -184,11 +184,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "Pakkeinstallasjon..."
 
-#: ../gurpmi2:190 ../urpmi:556
+#: ../gurpmi2:190 ../urpmi:569
 msgid "unable to get source packages, aborting"
 msgstr "kunne ikke få tak i kildepakker, avslutter"
 
-#: ../gurpmi2:203 ../urpmi:566
+#: ../gurpmi2:203 ../urpmi:579
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "Sett inn mediumet kalt \"%s\" på enhet [%s]"
@@ -212,7 +212,7 @@ msgstr ""
 "Vil du fortsette installasjonen?"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:253 ../gurpmi2:302 ../urpmi:638 ../urpmi:764
+#: ../gurpmi2:253 ../gurpmi2:309 ../urpmi:651 ../urpmi:782
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -224,12 +224,12 @@ msgstr ""
 "Du ønsker antageligvis å oppdatere urpmidatabasen din"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:260 ../urpme:124 ../urpmi:682
+#: ../gurpmi2:260 ../urpme:129 ../urpmi:698
 #, c-format
 msgid "removing %s"
 msgstr "fjerner %s"
 
-#: ../gurpmi2:268 ../urpm.pm:2895
+#: ../gurpmi2:268 ../urpm.pm:2905
 msgid "Preparing..."
 msgstr "Forbereder..."
 
@@ -239,19 +239,19 @@ msgid "Installing package `%s' (%s/%s)..."
 msgstr "Installerer pakke `%s' (%s/%s)..."
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../gurpmi2:288 ../urpmi:649 ../urpmi:703 ../urpmi:723 ../urpmi:741
+#: ../gurpmi2:295 ../urpmi:663 ../urpmi:721 ../urpmi:741 ../urpmi:759
 msgid "Installation failed"
 msgstr "Installasjon mislyktes"
 
-#: ../gurpmi2:297
+#: ../gurpmi2:304
 msgid "_Done"
 msgstr "_Ferdig"
 
-#: ../gurpmi2:305 ../urpmi:781
+#: ../gurpmi2:312 ../urpmi:799
 msgid "The package(s) are already installed"
 msgstr "Pakken(e) er allerede installert"
 
-#: ../gurpmi2:307
+#: ../gurpmi2:314
 msgid "Installation finished"
 msgstr "Installasjon ferdig"
 
@@ -282,7 +282,7 @@ msgid "                    defaults is %s.\n"
 msgstr "                    standard er %s.\n"
 
 #. - need to be root if binary rpms are to be installed
-#: ../rurpmi:11 ../urpmi:239
+#: ../rurpmi:11 ../urpmi:242
 msgid "Only superuser is allowed to install packages"
 msgstr "Bare superbruker har adgang til å installere pakker"
 
@@ -290,49 +290,49 @@ msgstr "Bare superbruker har adgang til å installere pakker"
 msgid "Running urpmi in restricted mode..."
 msgstr "Kjører urpmi i begrenset modus..."
 
-#: ../urpm.pm:68
+#: ../urpm.pm:73
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "ukjent protokoll definert for %s"
 
-#: ../urpm.pm:104
+#: ../urpm.pm:109
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "ingen webfetch funnet, støttede webfetch er: %s\n"
 
-#: ../urpm.pm:120
+#: ../urpm.pm:125
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "kunne ikke håndtere protokoll: %s"
 
-#: ../urpm.pm:215
+#: ../urpm.pm:221
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "medium \"%s\" prøver å bruke en allerede brukt hdlist, medium ignorert"
 
-#: ../urpm.pm:216
+#: ../urpm.pm:222
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "medium \"%s\" prøver å bruke en allerede brukt liste, medium ignorert"
 
-#: ../urpm.pm:229 ../urpm.pm:1304 ../urpm.pm:1314
+#: ../urpm.pm:235 ../urpm.pm:1310 ../urpm.pm:1320
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "kunne ikke nå hdlist-fil av \"%s\", medium ignorert"
 
 #. list file exists but isn't readable
 #. report error only if no result found, list files are only readable by root
-#: ../urpm.pm:232 ../urpm.pm:2510
+#: ../urpm.pm:238 ../urpm.pm:2516
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "kan ikke få tilgang til liste-fil av \"%s\", medium ignorert"
 
-#: ../urpm.pm:260
+#: ../urpm.pm:266
 #, fuzzy, c-format
 msgid "trying to override existing medium \"%s\", skipping"
 msgstr "prøver å forbigå eksisterende medium \"%s\", unngår"
 
-#: ../urpm.pm:271
+#: ../urpm.pm:277
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -341,103 +341,103 @@ msgstr ""
 "virtuelt medium \"%s\" skal ikke ha definert hdlist- eller list-fil, medium "
 "ignorert"
 
-#: ../urpm.pm:276
+#: ../urpm.pm:282
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "virtuelt medium \"%s\" burde ha en klar url, medium ignorert"
 
-#: ../urpm.pm:285
+#: ../urpm.pm:291
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "kunne ikke finne hdlist-fil for \"%s\", medium ignorert"
 
-#: ../urpm.pm:292
+#: ../urpm.pm:298
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "kunne ikke finne liste fil for \"%s\", medium ignorert"
 
-#: ../urpm.pm:316
+#: ../urpm.pm:322
 #, c-format
 msgid "inconsistent list file for \"%s\", medium ignored"
 msgstr "usammenhengende liste-fil for \"%s\", medium ignorert"
 
-#: ../urpm.pm:326
+#: ../urpm.pm:332
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "kunne ikke inspisere liste-fil for \"%s\", medium ignorert"
 
 #. - return value is suitable for an hash.
-#: ../urpm.pm:366
+#: ../urpm.pm:372
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "for mange monteringspunkter for fjernbart medium \"%s\""
 
-#: ../urpm.pm:367
+#: ../urpm.pm:373
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "tar fjernbar enhet som \"%s\""
 
-#: ../urpm.pm:370
+#: ../urpm.pm:376
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr ""
 "Mediet «%s» er et ISO-avtrykk og vil bli montert mens operasjonen utføres"
 
-#: ../urpm.pm:373
+#: ../urpm.pm:379
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "bruker forskjellige fjernbare enheter [%s] for \"%s\""
 
-#: ../urpm.pm:378 ../urpm.pm:381
+#: ../urpm.pm:384 ../urpm.pm:387
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "kunne ikke motta sti for fjernbart medium \"%s\""
 
-#: ../urpm.pm:407
+#: ../urpm.pm:413
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "kunne ikke skrive oppsettsfil [%s]"
 
-#: ../urpm.pm:417
+#: ../urpm.pm:423
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "skriv oppsettsfil [%s]"
 
-#: ../urpm.pm:445
+#: ../urpm.pm:451
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "Kan ikke bruke parallell-modus med use-distrib-modus"
 
-#: ../urpm.pm:455
+#: ../urpm.pm:461
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "kunne ikke spalte \"%s\" i fil [%s]"
 
-#: ../urpm.pm:467
+#: ../urpm.pm:473
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "sjekker parallelhåndterer i fil [%s]"
 
-#: ../urpm.pm:478
+#: ../urpm.pm:484
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "fant parallellhåndterer for noder: %s"
 
-#: ../urpm.pm:482
+#: ../urpm.pm:488
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "bruker assosiert media for parallellmodus: %s"
 
-#: ../urpm.pm:486
+#: ../urpm.pm:492
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "kunne ikke bruke parallell-valg \"%s\""
 
-#: ../urpm.pm:494
+#: ../urpm.pm:500
 #, c-format
 msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr "det ser ikke ut til å være enheter i chrooten til  \"%s\""
 
-#: ../urpm.pm:500
+#: ../urpm.pm:506
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
@@ -454,144 +454,144 @@ msgstr ""
 #. - (However links need to be managed. see bug #12391.)
 #. - as previously done, just read synthesis file here, this is enough.
 #. - read default synthesis (we have to make sure nothing get out of depslist).
-#: ../urpm.pm:564 ../urpm.pm:590 ../urpm.pm:1076 ../urpm.pm:1087
-#: ../urpm.pm:1159 ../urpm.pm:1176 ../urpm.pm:1231 ../urpm.pm:1287
-#: ../urpm.pm:1497 ../urpm.pm:1617 ../urpm.pm:1734 ../urpm.pm:1740
-#: ../urpm.pm:1843 ../urpm.pm:1929 ../urpm.pm:1933
+#: ../urpm.pm:570 ../urpm.pm:596 ../urpm.pm:1082 ../urpm.pm:1093
+#: ../urpm.pm:1165 ../urpm.pm:1182 ../urpm.pm:1237 ../urpm.pm:1293
+#: ../urpm.pm:1503 ../urpm.pm:1623 ../urpm.pm:1740 ../urpm.pm:1746
+#: ../urpm.pm:1849 ../urpm.pm:1935 ../urpm.pm:1939
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "sjekker syntese-fil [%s]"
 
-#: ../urpm.pm:568 ../urpm.pm:583 ../urpm.pm:596 ../urpm.pm:1079
-#: ../urpm.pm:1090 ../urpm.pm:1165 ../urpm.pm:1171 ../urpm.pm:1236
-#: ../urpm.pm:1291 ../urpm.pm:1501 ../urpm.pm:1621 ../urpm.pm:1728
-#: ../urpm.pm:1746 ../urpm.pm:1939
+#: ../urpm.pm:574 ../urpm.pm:589 ../urpm.pm:602 ../urpm.pm:1085
+#: ../urpm.pm:1096 ../urpm.pm:1171 ../urpm.pm:1177 ../urpm.pm:1242
+#: ../urpm.pm:1297 ../urpm.pm:1507 ../urpm.pm:1627 ../urpm.pm:1734
+#: ../urpm.pm:1752 ../urpm.pm:1945
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "sjekker hdlist-fil [%s]"
 
-#: ../urpm.pm:578 ../urpm.pm:1083
+#: ../urpm.pm:584 ../urpm.pm:1089
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "virtuelt medium \"%s\" er ikke lokalt, medium ignorert"
 
-#: ../urpm.pm:608
+#: ../urpm.pm:614
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "Søk start: %s slutt: %s"
 
 #. - this is almost a fatal error, ignore it by default?
-#: ../urpm.pm:613 ../urpm.pm:1097 ../urpm.pm:1184 ../urpm.pm:1240
-#: ../urpm.pm:1625
+#: ../urpm.pm:619 ../urpm.pm:1103 ../urpm.pm:1190 ../urpm.pm:1246
+#: ../urpm.pm:1631
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "problem med å lese syntese-fil av medium \"%s\""
 
-#: ../urpm.pm:620 ../urpm.pm:1881
+#: ../urpm.pm:626 ../urpm.pm:1887
 msgid "performing second pass to compute dependencies\n"
 msgstr "utfører andre rundgang for å beregne avhengigheter\n"
 
-#: ../urpm.pm:636
+#: ../urpm.pm:642
 #, c-format
 msgid "skipping package %s"
 msgstr "hopper over pakke %s"
 
-#: ../urpm.pm:649
+#: ../urpm.pm:655
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "ville installert i stedet for å oppgradere pakke %s"
 
 #. - beware this can be a child process or the main process now...
 #. - open in read/write mode unless testing installation.
-#: ../urpm.pm:660 ../urpm.pm:2316 ../urpm.pm:2377 ../urpm.pm:2567
-#: ../urpm.pm:2960 ../urpm.pm:3084
+#: ../urpm.pm:666 ../urpm.pm:2324 ../urpm.pm:2385 ../urpm.pm:2573
+#: ../urpm.pm:2970 ../urpm.pm:3087
 msgid "unable to open rpmdb"
 msgstr "kunne ikke åpne rpmdb"
 
-#: ../urpm.pm:700
+#: ../urpm.pm:706
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "medium \"%s\" eksisterer allerede"
 
-#: ../urpm.pm:707
+#: ../urpm.pm:713
 msgid "virtual medium needs to be local"
 msgstr "virtuelt medium trenger å være lokalt"
 
-#: ../urpm.pm:732
+#: ../urpm.pm:738
 #, c-format
 msgid "added medium %s"
 msgstr "lagt til medium %s"
 
-#: ../urpm.pm:777
+#: ../urpm.pm:783
 msgid "unable to access first installation medium"
 msgstr "kan ikke få tilgang til første installasjonsmedium"
 
-#: ../urpm.pm:781
+#: ../urpm.pm:787
 msgid "copying hdlists file..."
 msgstr "kopierer hdlists-fil..."
 
-#: ../urpm.pm:783 ../urpm.pm:1200 ../urpm.pm:1257
+#: ../urpm.pm:789 ../urpm.pm:1206 ../urpm.pm:1263
 msgid "...copying done"
 msgstr "...kopiering ferdig"
 
-#: ../urpm.pm:784 ../urpm.pm:1201 ../urpm.pm:1332 ../urpm.pm:1395
-#: ../urpm.pm:1563 ../urpm.pm:1570
+#: ../urpm.pm:790 ../urpm.pm:1207 ../urpm.pm:1338 ../urpm.pm:1401
+#: ../urpm.pm:1569 ../urpm.pm:1576
 msgid "...copying failed"
 msgstr "...kopiering mislyktes"
 
-#: ../urpm.pm:787 ../urpm.pm:812 ../urpm.pm:851
+#: ../urpm.pm:793 ../urpm.pm:818 ../urpm.pm:857
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr ""
 "kan ikke få adgang til første installasjonsmedium (ingen hdlists-fil funnet)"
 
-#: ../urpm.pm:794
+#: ../urpm.pm:800
 msgid "retrieving hdlists file..."
 msgstr "mottar hdlists-fil..."
 
-#: ../urpm.pm:806 ../urpm.pm:1607 ../urpm.pm:2105 ../urpm.pm:2825
+#: ../urpm.pm:812 ../urpm.pm:1613 ../urpm.pm:2114 ../urpm.pm:2831
 msgid "...retrieving done"
 msgstr "...ferdig mottatt"
 
-#: ../urpm.pm:808 ../urpm.pm:1591 ../urpm.pm:2109 ../urpm.pm:2827
+#: ../urpm.pm:814 ../urpm.pm:1597 ../urpm.pm:2118 ../urpm.pm:2833
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...mottak mislyktes: %s"
 
-#: ../urpm.pm:832
+#: ../urpm.pm:838
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "ugyldig hdlist beskrivelse «%s» i hdlists-filen"
 
-#: ../urpm.pm:888
+#: ../urpm.pm:894
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "prøver å velge ikke-eksisterende medium «%s»"
 
 #. - several elements in found and/or foundi lists.
-#: ../urpm.pm:890
+#: ../urpm.pm:896
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "velger flere media: %s"
 
-#: ../urpm.pm:906
+#: ../urpm.pm:912
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "fjerner medium «%s»"
 
-#: ../urpm.pm:957
+#: ../urpm.pm:963
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "setter opp urpmi for media «%s» på nytt"
 
-#: ../urpm.pm:986
+#: ../urpm.pm:992
 msgid "...reconfiguration failed"
 msgstr "...oppsett på nytt mislyktes"
 
-#: ../urpm.pm:993
+#: ../urpm.pm:999
 msgid "reconfiguration done"
 msgstr "oppsett på nytt fullført"
 
-#: ../urpm.pm:1137
+#: ../urpm.pm:1143
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -602,7 +602,7 @@ msgstr ""
 "dette kan ha skjedd hvis du monterte katalogen manuelt når mediumet ble "
 "opprettet."
 
-#: ../urpm.pm:1188
+#: ../urpm.pm:1194
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
@@ -611,135 +611,135 @@ msgstr ""
 "virtuelt medium «%s» burde ha en gyldig kildehdlist eller syntese, medium "
 "ignorert"
 
-#: ../urpm.pm:1198
+#: ../urpm.pm:1204
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "kopierer beskrivelsesfil av \"%s\"..."
 
-#: ../urpm.pm:1253
+#: ../urpm.pm:1259
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "kopierer kildehdlist (eller syntese) av \"%s\"..."
 
-#: ../urpm.pm:1267
+#: ../urpm.pm:1273
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "kopiering av [%s] mislyktes (fil er mistenkelig liten)"
 
-#: ../urpm.pm:1272
+#: ../urpm.pm:1278
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "regner ut md5sum av kopierte kildehdlist (eller syntese)"
 
-#: ../urpm.pm:1274
+#: ../urpm.pm:1280
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "kopiering av [%s] mislyktes (md5sum stemmer ikke)"
 
-#: ../urpm.pm:1295 ../urpm.pm:1505 ../urpm.pm:1846
+#: ../urpm.pm:1301 ../urpm.pm:1511 ../urpm.pm:1852
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "problem med å lese syntese-fil av medium \"%s\""
 
-#: ../urpm.pm:1353
+#: ../urpm.pm:1359
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "leser rpm-filer fra [%s]"
 
-#: ../urpm.pm:1368
+#: ../urpm.pm:1374
 msgid "no rpms read"
 msgstr "ingen rpmer lest"
 
-#: ../urpm.pm:1378
+#: ../urpm.pm:1384
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "kunne ikke lese rpm-filer fra [%s]: %s"
 
-#: ../urpm.pm:1383
+#: ../urpm.pm:1389
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "ingen rpm-filer funnet fra [%s]"
 
 #. - try to probe for possible with_hdlist parameter, unless
 #. - it is already defined (and valid).
-#: ../urpm.pm:1520
+#: ../urpm.pm:1526
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "mottar kildehdlist (eller syntese) av \"%s\"..."
 
-#: ../urpm.pm:1548
+#: ../urpm.pm:1554
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "fant test hdlist (eller syntese) som %s"
 
-#: ../urpm.pm:1598
+#: ../urpm.pm:1604
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "regner ut md5sum av mottatt kildehdlist (eller syntese)"
 
-#: ../urpm.pm:1600
+#: ../urpm.pm:1606
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "...mottak mislyktes: md5sum stemmer ikke overens"
 
-#: ../urpm.pm:1698
+#: ../urpm.pm:1704
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "mottak av kildehdlist (eller syntese) mislyktes"
 
-#: ../urpm.pm:1705
+#: ../urpm.pm:1711
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "ingen hdlist-fil funnet for medium \"%s\""
 
-#: ../urpm.pm:1716 ../urpm.pm:1770
+#: ../urpm.pm:1722 ../urpm.pm:1776
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "filen [%s] er allerede brukt i det samme mediumet \"%s\""
 
-#: ../urpm.pm:1756
+#: ../urpm.pm:1762
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "ikke i stand til å tolke hdlist-fil av  \"%s\""
 
-#: ../urpm.pm:1795
+#: ../urpm.pm:1801
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "kunne ikke skrive liste-fil av \"%s\""
 
-#: ../urpm.pm:1803
+#: ../urpm.pm:1809
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "skriver listefil for medium \"%s\""
 
-#: ../urpm.pm:1805
+#: ../urpm.pm:1811
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "ingenting skrevet i liste-fil for \"%s\""
 
-#: ../urpm.pm:1820
+#: ../urpm.pm:1826
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "mottar offentlignøkkel-fil med beskrivelse av \"%s\"..."
 
-#: ../urpm.pm:1827
+#: ../urpm.pm:1833
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...importerer nøkkel %s fra offentlignøkkel-fil av \"%s\""
 
-#: ../urpm.pm:1830
+#: ../urpm.pm:1836
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "kunne ikke importere offentlignøkkel-fil av \"%s\""
 
-#: ../urpm.pm:1895
+#: ../urpm.pm:1901
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "leser hoder fra medium \"%s\""
 
-#: ../urpm.pm:1900
+#: ../urpm.pm:1906
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "bygger hdlist [%s]"
 
 #. - XXX this happens when building a synthesis for a local media from RPMs... why ?
-#: ../urpm.pm:1915 ../urpm.pm:1951
+#: ../urpm.pm:1921 ../urpm.pm:1957
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -748,95 +748,91 @@ msgstr ""
 "Ikke i stand til å bygge syntese-fil for medium \"%s\". Din hdlist-fil kan "
 "være korrupt."
 
-#: ../urpm.pm:1919 ../urpm.pm:1955 ../urpmi:359
+#: ../urpm.pm:1925 ../urpm.pm:1961 ../urpmi:370
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "bygd hdlist syntese-fil for medium \"%s\""
 
-#: ../urpm.pm:1978
+#: ../urpm.pm:1984
 #, c-format
 msgid "found %d headers in cache"
 msgstr "fant %d hoder i cache"
 
-#: ../urpm.pm:1982
+#: ../urpm.pm:1988
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "fjerner %d foreldede hoder fra cache"
 
-#: ../urpm.pm:2003
+#: ../urpm.pm:2009
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr ""
 
-#: ../urpm.pm:2008
+#: ../urpm.pm:2014
 #, c-format
 msgid "Error generating names file: Can't write to file (%s)"
 msgstr ""
 
-#: ../urpm.pm:2044
+#: ../urpm.pm:2050
 #, c-format
 msgid "mounting %s"
 msgstr "monterer %s"
 
-#: ../urpm.pm:2066
+#: ../urpm.pm:2074
 #, c-format
 msgid "unmounting %s"
 msgstr "avmonterer %s"
 
-#: ../urpm.pm:2090
+#: ../urpm.pm:2099
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "ugyldig rpm-filnavn [%s]"
 
-#: ../urpm.pm:2096
+#: ../urpm.pm:2105
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "mottar rpm-fil [%s] ..."
 
-#: ../urpm.pm:2114
+#: ../urpm.pm:2123
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "kunne ikke nå rpm-fil [%s]"
 
-#: ../urpm.pm:2119
+#: ../urpm.pm:2128
 #, fuzzy, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "kunne ikke spalte \"%s\" i fil [%s]"
 
-#: ../urpm.pm:2129
+#: ../urpm.pm:2138
 msgid "unable to register rpm file"
 msgstr "ikke i stand til å registrere rpm-fil"
 
-#: ../urpm.pm:2133
+#: ../urpm.pm:2142
 msgid "error registering local packages"
 msgstr "feil ved registrering av lokale pakker"
 
-#: ../urpm.pm:2157
-msgid "Search"
-msgstr "Søk"
-
-#: ../urpm.pm:2244
+#: ../urpm.pm:2252
 #, c-format
 msgid "no package named %s"
 msgstr "ingen pakke kalt %s"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm.pm:2246 ../urpme:97
+#: ../urpm.pm:2254 ../urpme:102
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "Følgende pakker inneholder %s: %s"
 
-#: ../urpm.pm:2440 ../urpm.pm:2487 ../urpm.pm:2518
+#: ../urpm.pm:2447 ../urpm.pm:2493 ../urpm.pm:2524
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "det er flere pakker med samme rpm-filnavn \"%s\""
 
-#: ../urpm.pm:2501
+#: ../urpm.pm:2507
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "kunne ikke korrekt tolke [%s] på verdi \"%s\""
 
-#: ../urpm.pm:2534
+#: ../urpm.pm:2540
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -846,58 +842,58 @@ msgstr ""
 "  speilet er sannsynligvis ikke oppdatert, prøver å bruke en alternativ "
 "metode"
 
-#: ../urpm.pm:2538
+#: ../urpm.pm:2544
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "medium \"%s\" definerer ikke noen lokasjon for rpm-filer"
 
-#: ../urpm.pm:2550
+#: ../urpm.pm:2556
 #, c-format
 msgid "package %s is not found."
 msgstr "pakke %s er ikke funnet."
 
-#: ../urpm.pm:2601 ../urpm.pm:2615 ../urpm.pm:2635 ../urpm.pm:2649
+#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655
 msgid "urpmi database locked"
 msgstr "urpmi-database låst"
 
-#: ../urpm.pm:2701 ../urpm.pm:2706 ../urpm.pm:2732
+#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "medium \"%s\" er ikke valgt"
 
 #. - fallback to use other method for retrieving the file later.
-#: ../urpm.pm:2728
+#: ../urpm.pm:2734
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "kunne ikke lese rpm-fil [%s] fra medium \"%s\""
 
 #. - we have a removable device that is not removable, well...
-#: ../urpm.pm:2736
+#: ../urpm.pm:2742
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "usammenhengende medium \"%s\" merket fjernbart, men er det ikke"
 
-#: ../urpm.pm:2748
+#: ../urpm.pm:2754
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "kunne ikke nå medium \"%s\""
 
-#: ../urpm.pm:2803
+#: ../urpm.pm:2809
 #, fuzzy, c-format
 msgid "malformed URL: [%s]"
 msgstr "maltraktert inndata: [%s]"
 
-#: ../urpm.pm:2810
+#: ../urpm.pm:2816
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "mottar rpm-filer fra medium \"%s\"..."
 
-#: ../urpm.pm:2933
+#: ../urpm.pm:2943
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "bruker prosess %d for å utføre transaksjon"
 
-#: ../urpm.pm:2964
+#: ../urpm.pm:2975
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
@@ -905,133 +901,133 @@ msgstr ""
 "opprettet transaksjon for installasjon på %s (fjern=%d, installer=%d, "
 "oppgrader=%d)"
 
-#: ../urpm.pm:2967
+#: ../urpm.pm:2978
 msgid "unable to create transaction"
 msgstr "kunne ikke opprette transaksjon"
 
-#: ../urpm.pm:2975
+#: ../urpm.pm:2986
 #, c-format
 msgid "removing package %s"
 msgstr "fjerner pakke %s"
 
-#: ../urpm.pm:2977
+#: ../urpm.pm:2988
 #, c-format
 msgid "unable to remove package %s"
 msgstr "kan ikke fjerne pakke %s"
 
-#: ../urpm.pm:2989
+#: ../urpm.pm:3000
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "klarte ikke å pakke ut rpm fra delta-rpm-pakke %s"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:3006
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "legger til pakke %s (id=%d, eid=%d, oppdater=%d, fil=%s)"
 
-#: ../urpm.pm:2998
+#: ../urpm.pm:3009
 #, c-format
 msgid "unable to install package %s"
 msgstr "kunne ikke installere pakke %s"
 
-#: ../urpm.pm:3055
+#: ../urpm.pm:3058
 #, c-format
 msgid "More information on package %s"
 msgstr "Mer informasjon om pakke %s"
 
-#: ../urpm.pm:3227 ../urpm.pm:3265
+#: ../urpm.pm:3230 ../urpm.pm:3268
 #, c-format
 msgid "due to missing %s"
 msgstr "pga. manglende %s"
 
-#: ../urpm.pm:3228 ../urpm.pm:3263
+#: ../urpm.pm:3231 ../urpm.pm:3266
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "pga. utilfredsstilt %s"
 
-#: ../urpm.pm:3234
+#: ../urpm.pm:3237
 #, c-format
 msgid "trying to promote %s"
 msgstr "prøver å promotere %s"
 
-#: ../urpm.pm:3235
+#: ../urpm.pm:3238
 #, c-format
 msgid "in order to keep %s"
 msgstr "for å kunne beholde %s"
 
-#: ../urpm.pm:3258
+#: ../urpm.pm:3261
 #, c-format
 msgid "in order to install %s"
 msgstr "for å kunne installere %s"
 
-#: ../urpm.pm:3269
+#: ../urpm.pm:3272
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "pga. konflikter med %s"
 
-#: ../urpm.pm:3270
+#: ../urpm.pm:3273
 msgid "unrequested"
 msgstr "ikke etterspurt"
 
-#: ../urpm.pm:3288
+#: ../urpm.pm:3291
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "Ugyldig signatur (%s)"
 
-#: ../urpm.pm:3321
+#: ../urpm.pm:3324
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "Ugyldig nøkkelid (%s)"
 
-#: ../urpm.pm:3323
+#: ../urpm.pm:3326
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "Mangler signatur (%s)"
 
-#: ../urpm.pm:3382
+#: ../urpm.pm:3385
 msgid "examining MD5SUM file"
 msgstr "kontrollerer MD5SUM-fil"
 
-#: ../urpm.pm:3392
+#: ../urpm.pm:3395
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "advarsel: md5sum-en for %s er ikke tilgjengelig i MD5SUM-filen"
 
-#: ../urpm.pm:3403
+#: ../urpm.pm:3406
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "regner ut md5sum av eksisterende kildehdlist(eller syntese)"
 
-#: ../urpm.pm:3433
+#: ../urpm.pm:3436
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "Denne operasjonen er ikke lovlig kjørendes i begrenset modus"
 
-#: ../urpm/args.pm:105 ../urpm/args.pm:114
+#: ../urpm/args.pm:106 ../urpm/args.pm:115
 msgid "bad proxy declaration on command line\n"
 msgstr "ugyldig proxydeklarasjon på kommandolinjen\n"
 
-#: ../urpm/args.pm:224
+#: ../urpm/args.pm:229
 #, fuzzy
 msgid "You need to be root to use --use-distrib"
 msgstr "Du må være root for å bruke denne kommandoen!\n"
 
-#: ../urpm/args.pm:256
+#: ../urpm/args.pm:261
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: kan ikke lese rpm-fil \"%s\"\n"
 
 #. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../urpm/msg.pm:46 ../urpme:33 ../urpmi:439 ../urpmi:457 ../urpmi:495
-#: ../urpmi:545 ../urpmi:628 ../urpmi:709
+#: ../urpm/msg.pm:46 ../urpme:32 ../urpmi:452 ../urpmi:470 ../urpmi:508
+#: ../urpmi:558 ../urpmi:641 ../urpmi:727
 msgid "Nn"
 msgstr "Nn"
 
 #. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:47 ../urpme:35 ../urpmi:440 ../urpmi:458 ../urpmi:496
-#: ../urpmi:546 ../urpmi:629 ../urpmi:710
+#: ../urpm/msg.pm:47 ../urpme:34 ../urpmi:453 ../urpmi:471 ../urpmi:509
+#: ../urpmi:559 ../urpmi:642 ../urpmi:728
 msgid "Yy"
 msgstr "JjYy"
 
-#: ../urpm/msg.pm:85
+#: ../urpm/msg.pm:92
 msgid "Sorry, bad choice, try again\n"
 msgstr "Beklager, ugyldig valg, prøv igjen\n"
 
@@ -1079,7 +1075,7 @@ msgid "Installation failed on node %s"
 msgstr "Installasjon mislyktes"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:778
+#: ../urpm/parallel_ka_run.pm:239 ../urpm/parallel_ssh.pm:254 ../urpmi:796
 msgid "Installation is possible"
 msgstr "Installasjon er mulig"
 
@@ -1135,15 +1131,11 @@ msgstr "installerer %s fra %s"
 msgid "Preparing install on %s..."
 msgstr "Pakkeinstallasjon..."
 
-#: ../urpme:31
-msgid "Is this OK?"
-msgstr "Er dette ok?"
-
-#: ../urpme:38
-#, c-format
+#: ../urpme:37
+#, fuzzy, c-format
 msgid ""
 "urpme version %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1155,49 +1147,55 @@ msgstr ""
 "\n"
 "bruk:\n"
 
-#: ../urpme:43 ../urpmf:34 ../urpmi:80 ../urpmi.addmedia:44
-#: ../urpmi.removemedia:50 ../urpmi.update:31 ../urpmq:44
+#: ../urpme:42 ../urpmf:34 ../urpmi:80 ../urpmi.addmedia:44
+#: ../urpmi.recover:31 ../urpmi.removemedia:54 ../urpmi.update:31 ../urpmq:44
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - vis denne hjelpemeldingen.\n"
 
-#: ../urpme:44
+#: ../urpme:43
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - velg automatisk en pakke i valg.\n"
 
-#: ../urpme:45
+#: ../urpme:44
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr ""
 "  --test         - kontroller at fjerningen kan bli riktig gjennomført.\n"
 
-#: ../urpme:46 ../urpmi:102 ../urpmq:63
+#: ../urpme:45 ../urpmi:102 ../urpmq:63
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr ""
 "  --force        - tving påkallelse selv om noen pakker ikke eksisterer.\n"
 
-#: ../urpme:47 ../urpmi:107 ../urpmq:64
+#: ../urpme:46 ../urpmi:107 ../urpmq:65
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - distribuert urpmi over maskiner av alias.\n"
 
+#: ../urpme:47 ../urpmi:134
+#, fuzzy
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --packager     - vis etikett packager: pakker.\n"
+
 #: ../urpme:48
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - bruk en annen rot for rpm-fjerning.\n"
 
-#: ../urpme:49 ../urpmi:132
+#: ../urpme:49
 #, fuzzy
-msgid "  --noscripts    - do not execute package scriptlet(s)\n"
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --description  - vis etikett description: beskrivelse.\n"
 
 #: ../urpme:50
+#, fuzzy
 msgid ""
-"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
 msgstr ""
 "  --use-distrib  - setter opp urpmi fortgående fra et distrib-tre, nyttig\n"
 "                   for å (av)installere en chroot med --root-opsjon.\n"
 
-#: ../urpme:52 ../urpmi:143 ../urpmi.addmedia:70 ../urpmi.removemedia:55
-#: ../urpmi.update:49 ../urpmq:90
+#: ../urpme:52 ../urpmi:145 ../urpmi.addmedia:70 ../urpmi.removemedia:59
+#: ../urpmi.update:49 ../urpmq:91
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - informativt modus.\n"
 
@@ -1205,47 +1203,52 @@ msgstr "  -v             - informativt modus.\n"
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - velg alle pakker som matcher uttrykket.\n"
 
-#: ../urpme:69
+#: ../urpme:70
 msgid "Only superuser is allowed to remove packages"
 msgstr "Bare superbruker har adgang til å fjerne pakker"
 
-#: ../urpme:91
+#: ../urpme:96
 msgid "unknown package"
 msgstr "ukjent pakke"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:91
+#: ../urpme:96
 msgid "unknown packages"
 msgstr "ukjente pakker"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:103 ../urpmi:475
+#: ../urpme:108 ../urpmi:488
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "fjerning av pakke %s vil ødelegge systemet ditt"
 
-#: ../urpme:106
+#: ../urpme:111
 msgid "Nothing to remove"
 msgstr "Ingenting å fjerne"
 
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:111
+#: ../urpme:116
 msgid "Checking to remove the following packages"
 msgstr "Sjekker fjerning av følgende pakker"
 
-#: ../urpme:118
+#: ../urpme:123
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr ""
 "For å tilfredsstille avhengigheter vil følgende %d pakker bli fjernet (%d MB)"
 
-#: ../urpme:120 ../urpmi:497 ../urpmi:630
+#: ../urpme:125 ../urpmi:510 ../urpmi:643
 msgid " (y/N) "
 msgstr " (j/N) "
 
+#: ../urpme:125
+#, fuzzy, c-format
+msgid "Remove %d packages?"
+msgstr "fjerner pakke %s"
+
 #. - Warning : the following message is parsed in urpm::parallel_*
-#: ../urpme:142
+#: ../urpme:149
 msgid "Removal failed"
 msgstr "Fjerning mislyktes"
 
@@ -1253,7 +1256,7 @@ msgstr "Fjerning mislyktes"
 #, fuzzy, c-format
 msgid ""
 "urpmf version %s\n"
-"Copyright (C) 2002-2005 Mandriva.\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1270,7 +1273,7 @@ msgstr ""
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --help         - vis denne hjelpemeldingen.\n"
 
-#: ../urpmf:36 ../urpmi:125 ../urpmq:73
+#: ../urpmf:36 ../urpmi:125 ../urpmq:74
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - bruk spesifikt miljø (typisk en feilrapport).\n"
 
@@ -1475,7 +1478,7 @@ msgstr "  --verbose      - informativt modus.\n"
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -l             - list opp filer i pakke.\n"
 
-#: ../urpmf:79 ../urpmq:79
+#: ../urpmf:79 ../urpmq:80
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - vis versjon, utgivelse og arkitektur med navn.\n"
 
@@ -1483,7 +1486,7 @@ msgstr "  -f             - vis versjon, utgivelse og arkitektur med navn.\n"
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:173 ../urpmi:228 ../urpmq:125
+#: ../urpmf:173 ../urpmi:231 ../urpmq:126
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "bruker spesifikt miljø på %s\n"
@@ -1501,10 +1504,10 @@ msgid "You may want to use --name to search for package names.\n"
 msgstr "Det kan være at du ønsker å bruke --name for å søke etter pakkenavn.\n"
 
 #: ../urpmi:75
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmi version %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -1623,11 +1626,11 @@ msgstr ""
 "  --use-distrib  - setter opp urpmi fortgående fra et distrib-tre, nyttig\n"
 "                   for å installere en chroot med --root-opsjon.\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:67
+#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:68
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - bruk wget til å motta fjerne filer.\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:68
+#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33 ../urpmq:69
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - bruk curl til å motta fjerne filer.\n"
 
@@ -1655,7 +1658,7 @@ msgstr ""
 "  --resume       - gjenoppta overføring av delvis nedlastede filer\n"
 "                   (--no-resume deaktiverer det, deaktivert er standard).\n"
 
-#: ../urpmi:119 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:69
+#: ../urpmi:119 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:70
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1663,7 +1666,7 @@ msgstr ""
 "  --proxy        - bruk spesifisert HTTP-proxy, portnummeret antas\n"
 "                   å være 1080 som standard (format er <proxyhost[:port]>).\n"
 
-#: ../urpmi:121 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:71
+#: ../urpmi:121 ../urpmi.addmedia:50 ../urpmi.update:37 ../urpmq:72
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1711,11 +1714,21 @@ msgstr ""
 "  --no-uninstall - aldri spørr om å avinstallere en pakke, avbryt "
 "installasjonen.\n"
 
+#: ../urpmi:132
+#, fuzzy
+msgid "  --ignorearch   - allow to install rpms for unmatched architectures.\n"
+msgstr "  --url          - vis etikett url: url.\n"
+
 #: ../urpmi:133
+#, fuzzy
+msgid "  --noscripts    - do not execute package scriptlet(s)\n"
+msgstr "  --description  - vis etikett description: beskrivelse.\n"
+
+#: ../urpmi:135
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - pakker som installasjon av bør hoppes over\n"
 
-#: ../urpmi:134
+#: ../urpmi:136
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1723,47 +1736,47 @@ msgstr ""
 "  --more-choices - når flere valgte pakker blir funner, foreslå flere valg\n"
 "                   enn hva som er standard.\n"
 
-#: ../urpmi:136 ../urpmi.addmedia:64 ../urpmi.update:42
+#: ../urpmi:138 ../urpmi.addmedia:64 ../urpmi.update:42
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr ""
 "  --norebuild    - ikke prøv å bygge hdlist på nytt hvis den ikke lesbar.\n"
 
-#: ../urpmi:137
+#: ../urpmi:139
 #, fuzzy
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --noclean      - ikke fjern rpm-pakker fra cache.\n"
 
-#: ../urpmi:138
+#: ../urpmi:140
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - bare oppgrader pakker med samme arkitektur.\n"
 
-#: ../urpmi:139 ../urpmq:76
+#: ../urpmi:141 ../urpmq:77
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - velg alle treff på kommandolinjen.\n"
 
-#: ../urpmi:140
+#: ../urpmi:142
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - tillat søk i tilbud for å finne pakke.\n"
 
-#: ../urpmi:141
+#: ../urpmi:143
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - ikke søk i tilbud for å finne pakke.\n"
 
-#: ../urpmi:142 ../urpmi.addmedia:69 ../urpmi.removemedia:54
+#: ../urpmi:144 ../urpmi.addmedia:69 ../urpmi.removemedia:58
 #: ../urpmi.update:48
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - stillemodus.\n"
 
-#: ../urpmi:144
+#: ../urpmi:146
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  navn eller rpm-filer gitt på kommandolinjen vil bli installert.\n"
 
-#: ../urpmi:195
+#: ../urpmi:197
 #, fuzzy
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "Hva som kan gjøres med binære rpm-filer når man bruker --install-src"
 
-#: ../urpmi:218
+#: ../urpmi:220
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
@@ -1772,15 +1785,20 @@ msgstr ""
 "Katalogen [%s] eksisterer allerede, bruk en annen katalog for "
 "feilrapportering eller slett den"
 
-#: ../urpmi:219
+#: ../urpmi:221
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "Kan ikke opprette katalog [%s] for feilrapport"
 
-#: ../urpmi:222 ../urpmi:369
+#: ../urpmi:224 ../urpmi:380
 msgid "Copying failed"
 msgstr "Kopiering mislyktes"
 
+#: ../urpmi:230
+#, c-format
+msgid "Environment directory %s does not exist"
+msgstr ""
+
 #: ../urpmi:248
 #, c-format
 msgid ""
@@ -1791,16 +1809,16 @@ msgstr ""
 "Bruk --allow-force for å tvinge operasjonen."
 
 #. - For translators : there are several media here
-#: ../urpmi:321
+#: ../urpmi:332
 msgid "Updating media..."
 msgstr ""
 
-#: ../urpmi:404
+#: ../urpmi:417
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "Hva er ditt valg? (1-%d) "
 
-#: ../urpmi:434
+#: ../urpmi:447
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1811,18 +1829,18 @@ msgstr ""
 "som er eldre enn de som er installert:\n"
 "%s"
 
-#: ../urpmi:442 ../urpmi:460
+#: ../urpmi:455 ../urpmi:473
 #, fuzzy
 msgid ""
 "\n"
 "Continue installation anyway?"
 msgstr "Fortsette likevel?"
 
-#: ../urpmi:442 ../urpmi:460 ../urpmi:547
+#: ../urpmi:455 ../urpmi:473 ../urpmi:560
 msgid " (Y/n) "
 msgstr " (J/n) "
 
-#: ../urpmi:453
+#: ../urpmi:466
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -1831,7 +1849,7 @@ msgstr ""
 "Noen av pakkene som er ønsket kan ikke installeres:\n"
 "%s"
 
-#: ../urpmi:483
+#: ../urpmi:496
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1842,7 +1860,7 @@ msgstr ""
 "må fjernes for at andre skal bli oppgradert:\n"
 "%s\n"
 
-#: ../urpmi:488
+#: ../urpmi:501
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1851,11 +1869,11 @@ msgstr ""
 "Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
 "%s"
 
-#: ../urpmi:490
+#: ../urpmi:503
 msgid "(test only, removal will not be actually done)"
 msgstr ""
 
-#: ../urpmi:526 ../urpmi:538
+#: ../urpmi:539 ../urpmi:551
 #, fuzzy
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed"
@@ -1864,18 +1882,18 @@ msgstr ""
 "installert:\n"
 "%s\n"
 
-#: ../urpmi:527 ../urpmi:539
+#: ../urpmi:540 ../urpmi:552
 #, fuzzy
 msgid "To satisfy dependencies, the following package is going to be installed"
 msgstr ""
 "Følgende pakker vil bli installert for å tilfredstille avhengigheter (%d MB)"
 
-#: ../urpmi:528
+#: ../urpmi:541
 #, c-format
 msgid "(%d packages, %d MB)"
 msgstr ""
 
-#: ../urpmi:534
+#: ../urpmi:547
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1884,71 +1902,71 @@ msgstr ""
 "Du må være root for å installere følgende avhengigheter:\n"
 "%s\n"
 
-#: ../urpmi:541
+#: ../urpmi:554
 msgid "(test only, installation will not be actually done)"
 msgstr ""
 
-#: ../urpmi:543
+#: ../urpmi:556
 #, c-format
 msgid "Proceed with the installation of the %d packages? (%d MB)"
 msgstr ""
 
-#: ../urpmi:567
+#: ../urpmi:580
 msgid "Press Enter when ready..."
 msgstr "Trykk Enter når det er klart..."
 
-#: ../urpmi:573
+#: ../urpmi:586
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../urpmi:573
+#: ../urpmi:586
 msgid "Ok"
 msgstr "Ok"
 
-#: ../urpmi:620
+#: ../urpmi:633
 msgid "The following packages have bad signatures"
 msgstr "Følgende pakker har ugyldige signaturer"
 
-#: ../urpmi:621
+#: ../urpmi:634
 msgid "Do you want to continue installation ?"
 msgstr "Ønsker du å fortsette installasjonen ?"
 
-#: ../urpmi:666
+#: ../urpmi:682
 #, c-format
 msgid "distributing %s"
 msgstr "distribuerer %s"
 
 #. - there's a common prefix, simplify message
-#: ../urpmi:677
+#: ../urpmi:693
 #, c-format
 msgid "installing %s from %s"
 msgstr "installerer %s fra %s"
 
-#: ../urpmi:679
+#: ../urpmi:695
 #, c-format
 msgid "installing %s"
 msgstr "installerer %s"
 
-#: ../urpmi:711
+#: ../urpmi:729
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "Prøv å installere uten å sjekke avhengigheter? (j/N) "
 
-#: ../urpmi:729
+#: ../urpmi:747
 #, fuzzy
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "Prøv å installere enda hardere (--force)? (j/N) "
 
-#: ../urpmi:769
+#: ../urpmi:787
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d installasjonstransjaksjon mislyktes"
 
-#: ../urpmi:785
+#: ../urpmi:803
 #, c-format
 msgid "The following package names were assumed: %s"
 msgstr "Følgende pakker ble antatt: %s"
 
-#: ../urpmi:802
+#: ../urpmi:820
 msgid "restarting urpmi"
 msgstr "starter urpmi på nytt"
 
@@ -2039,7 +2057,7 @@ msgstr ""
 "  --raw          - legg til media i oppsettet, men ikke oppdater det.\n"
 ".\n"
 
-#: ../urpmi.addmedia:67 ../urpmi.removemedia:52 ../urpmi.update:46
+#: ../urpmi.addmedia:67 ../urpmi.removemedia:56 ../urpmi.update:46
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - rengjør headers cache-katalog.\n"
 
@@ -2083,7 +2101,116 @@ msgstr "`with' mangler for nettverksmedia\n"
 msgid "unable to create medium \"%s\"\n"
 msgstr "kunne ikke opprette medium \"%s\"\n"
 
-#: ../urpmi.removemedia:48
+#: ../urpmi.recover:26
+#, fuzzy, c-format
+msgid ""
+"urpmi.recover version %s\n"
+"Copyright (C) 2006 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpme versjon %s\n"
+"Copyright © 1999-2005 Mandriva.\n"
+"Dette er fri programvare og kan redistribueres under vilkårene til GNU GPL.\n"
+"\n"
+"bruk:\n"
+
+#: ../urpmi.recover:32
+msgid "  --checkpoint   - set repackaging start now\n"
+msgstr ""
+
+#: ../urpmi.recover:33
+#, fuzzy
+msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
+msgstr "  --noclean      - ikke fjern rpm-pakker fra cache.\n"
+
+#: ../urpmi.recover:34
+msgid ""
+"  --list         - list transactions since provided date/duration argument\n"
+msgstr ""
+
+#: ../urpmi.recover:35
+#, fuzzy
+msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+msgstr "  --list-url     - lister tilgjengelige medier og deres url.\n"
+
+#: ../urpmi.recover:36
+msgid ""
+"  --rollback     - rollback until specified date,\n"
+"                   or rollback the specified number of transactions\n"
+msgstr ""
+
+#: ../urpmi.recover:52
+#, c-format
+msgid "Invalid date or duration [%s]\n"
+msgstr ""
+
+#: ../urpmi.recover:62
+#, c-format
+msgid "Spurious command-line arguments [%s]\n"
+msgstr ""
+
+#: ../urpmi.recover:64
+msgid "You can't specify --checkpoint and --rollback at the same time\n"
+msgstr ""
+
+#: ../urpmi.recover:66
+msgid "You can't specify --checkpoint and --list at the same time\n"
+msgstr ""
+
+#: ../urpmi.recover:68
+msgid "You can't specify --rollback and --list at the same time\n"
+msgstr ""
+
+#: ../urpmi.recover:90
+#, c-format
+msgid "No transaction found since %s\n"
+msgstr ""
+
+#. - check we're running as root
+#: ../urpmi.recover:105
+msgid "You must be superuser to do this"
+msgstr ""
+
+#: ../urpmi.recover:114
+#, fuzzy
+msgid "Repackage directory not defined\n"
+msgstr "pakke %s er ikke funnet."
+
+#: ../urpmi.recover:117
+#, c-format
+msgid "Can't write to repackage directory [%s]\n"
+msgstr ""
+
+#: ../urpmi.recover:122
+#, c-format
+msgid "Cleaning up repackage directory [%s]...\n"
+msgstr ""
+
+#: ../urpmi.recover:124
+#, c-format
+msgid "%d files removed\n"
+msgstr ""
+
+#. - write rpm config file
+#: ../urpmi.recover:128
+#, fuzzy, c-format
+msgid "Writing rpm macros file [%s]...\n"
+msgstr "mottar rpm-fil [%s] ..."
+
+#: ../urpmi.recover:170
+#, fuzzy
+msgid "No rollback date found\n"
+msgstr "Ingen filliste funnet\n"
+
+#: ../urpmi.recover:173
+#, c-format
+msgid "Rollback until %s...\n"
+msgstr ""
+
+#: ../urpmi.removemedia:52
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -2091,15 +2218,15 @@ msgstr ""
 "bruk: urpmi.removemedia [-a] <navn> ...\n"
 "hvor <navn> er et mediumnavn som skal fjernes.\n"
 
-#: ../urpmi.removemedia:51
+#: ../urpmi.removemedia:55
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - velg alle media.\n"
 
-#: ../urpmi.removemedia:53
+#: ../urpmi.removemedia:57
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - uklart treff på medianavn.\n"
 
-#: ../urpmi.removemedia:56
+#: ../urpmi.removemedia:60
 #, c-format
 msgid ""
 "\n"
@@ -2108,15 +2235,15 @@ msgstr ""
 "\n"
 "ukjente valg '%s'\n"
 
-#: ../urpmi.removemedia:65
+#: ../urpmi.removemedia:70
 msgid "Only superuser is allowed to remove media"
 msgstr "Bare superbruker har adgang til å fjerne media"
 
-#: ../urpmi.removemedia:76
+#: ../urpmi.removemedia:81
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "ingenting å fjerne (bruk urpmi.addmedia for å legge til et media)\n"
 
-#: ../urpmi.removemedia:78
+#: ../urpmi.removemedia:83
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2186,10 +2313,10 @@ msgid "ignoring media %s"
 msgstr "ignorerer media %s"
 
 #: ../urpmq:39
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "urpmq version %s\n"
-"Copyright (C) 2000-2005 Mandriva.\n"
+"Copyright (C) 2000-2006 Mandriva.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
 "\n"
@@ -2248,7 +2375,12 @@ msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - gir alle kildepakker før nedlasting (kun root).\n"
 
-#: ../urpmq:65
+#: ../urpmq:64
+#, fuzzy
+msgid "  --ignorearch   - allow to query rpms for unmatched architectures.\n"
+msgstr "  --url          - vis etikett url: url.\n"
+
+#: ../urpmq:66
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -2256,64 +2388,64 @@ msgstr ""
 "  --use-distrib  - setter opp urpmi fortgående fra ett distrib-tre.\n"
 "                   Dette tillater å forespøre en distro.\n"
 
-#: ../urpmq:74
+#: ../urpmq:75
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - vis changelog.\n"
 
-#: ../urpmq:75
+#: ../urpmq:76
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - vis sammendrag.\n"
 
-#: ../urpmq:77
+#: ../urpmq:78
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr ""
 "  -c             - fullstendig utskrift med pakke som skal bli fjernet.\n"
 
-#: ../urpmq:78
+#: ../urpmq:79
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - utvid forespørsel til pakkeavhengigheter.\n"
 
-#: ../urpmq:80
+#: ../urpmq:81
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - vis grupper også med navn.\n"
 
-#: ../urpmq:81
+#: ../urpmq:82
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr ""
 "  -i             - vis verdigfull informasjon i menneskelig lesbart format.\n"
 
-#: ../urpmq:82
+#: ../urpmq:83
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - list opp filer i pakke.\n"
 
-#: ../urpmq:83
+#: ../urpmq:84
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - ikke søk i tilbud for å finne pakke.\n"
 
-#: ../urpmq:84
+#: ../urpmq:85
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - søk i tilbud for å finne pakke.\n"
 
-#: ../urpmq:85
+#: ../urpmq:86
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - vis versjon og utgivelse også med navn.\n"
 
-#: ../urpmq:86
+#: ../urpmq:87
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - reversert søk til hva som krever pakke.\n"
 
-#: ../urpmq:87
+#: ../urpmq:88
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr ""
 "  -RR            - utvidet reversert søk (inkluderer virtuell pakker).\n"
 
-#: ../urpmq:88
+#: ../urpmq:89
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - neste pakke er en kildepakke (samme som --src).\n"
 
-#: ../urpmq:89
+#: ../urpmq:90
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
@@ -2321,36 +2453,42 @@ msgstr ""
 "  -u             - fjerner pakke hvis en nyere versjon allerede er "
 "installert.\n"
 
-#: ../urpmq:91
+#: ../urpmq:92
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - pålegg uklart søk (samme som --fuzzy).\n"
 
-#: ../urpmq:92
+#: ../urpmq:93
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr ""
 "  -Y             - som -y, men tvinger samvsvar med store og små bokstaver.\n"
 
-#: ../urpmq:93
+#: ../urpmq:94
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  navn eller rpm-filer gitt på kommandolinjem er etterspurt.\n"
 
-#: ../urpmq:166
+#: ../urpmq:170
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes kan bare brukes med --parallel"
 
-#: ../urpmq:323
+#: ../urpmq:327
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "hopper over media %s: ingen hdlist"
 
-#: ../urpmq:397
+#: ../urpmq:401
 msgid "No filelist found\n"
 msgstr "Ingen filliste funnet\n"
 
-#: ../urpmq:409
+#: ../urpmq:413
 msgid "No changelog found\n"
 msgstr "Ingen changelog funnet\n"
 
+#~ msgid "Search"
+#~ msgstr "Søk"
+
+#~ msgid "Is this OK?"
+#~ msgstr "Er dette ok?"
+
 #~ msgid ""
 #~ "  --version      - use specified distribution version, the default is "
 #~ "taken\n"