Merge branch 'debian/sid' into ubuntu/master

Conflicts:
	debian/changelog
	debian/gbp.conf

1 files changed, 964 insertions, 903 deletions

diff --git a/po/nb.po b/po/nb.po
index 0a6cd5dff..cc15361fe 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2013-07-31 16:24+0200\n"
+"POT-Creation-Date: 2013-12-07 14:40+0100\n"
 "PO-Revision-Date: 2010-09-01 21:10+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -22,151 +22,153 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Virtaal 0.6.1\n"
 
-#: cmdline/apt-cache.cc:158
+#: cmdline/apt-cache.cc:140
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n"
 
-#: cmdline/apt-cache.cc:286
+#: cmdline/apt-cache.cc:268
 msgid "Total package names: "
 msgstr "Antall pakkenavn: "
 
-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:270
 msgid "Total package structures: "
 msgstr "Antall pakkestrukturer: "
 
-#: cmdline/apt-cache.cc:328
+#: cmdline/apt-cache.cc:310
 msgid "  Normal packages: "
 msgstr "  Vanlige pakker: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:311
 msgid "  Pure virtual packages: "
 msgstr "  Rent virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:312
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:331
+#: cmdline/apt-cache.cc:313
 msgid "  Mixed virtual packages: "
 msgstr "  Sammensatte virtuelle pakker: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:314
 msgid "  Missing: "
 msgstr "  Mangler: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:316
 msgid "Total distinct versions: "
 msgstr "Antall unike versjoner: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:318
 msgid "Total distinct descriptions: "
 msgstr "Antall unike beskrivelser: "
 
-#: cmdline/apt-cache.cc:338
+#: cmdline/apt-cache.cc:320
 msgid "Total dependencies: "
 msgstr "Antall avhengighetsforhold: "
 
-#: cmdline/apt-cache.cc:341
+#: cmdline/apt-cache.cc:323
 msgid "Total ver/file relations: "
 msgstr "Antall forhold versjon/fil: "
 
-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:325
 msgid "Total Desc/File relations: "
 msgstr "Antall forhold beskrivelse/fil: "
 
-#: cmdline/apt-cache.cc:345
+#: cmdline/apt-cache.cc:327
 msgid "Total Provides mappings: "
 msgstr "Antall tilbudte tilknyttinger: "
 
-#: cmdline/apt-cache.cc:357
+#: cmdline/apt-cache.cc:339
 msgid "Total globbed strings: "
 msgstr "Antall utvidede strenger: "
 
-#: cmdline/apt-cache.cc:371
+#: cmdline/apt-cache.cc:353
 msgid "Total dependency version space: "
 msgstr "Total plass for avhengighetsforhold/versjoner: "
 
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:358
 msgid "Total slack space: "
 msgstr "Plass brukt av slark: "
 
-#: cmdline/apt-cache.cc:384
+#: cmdline/apt-cache.cc:366
 msgid "Total space accounted for: "
 msgstr "Samlet mengde redegjort plass: "
 
-#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1165
+#: cmdline/apt-cache.cc:497 cmdline/apt-cache.cc:1146
+#: apt-private/private-show.cc:52
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ikke oppdatert."
 
-#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1452
-#: cmdline/apt-cache.cc:1454 cmdline/apt-cache.cc:1531 cmdline/apt-mark.cc:46
-#: cmdline/apt-mark.cc:93 cmdline/apt-mark.cc:219
+#: cmdline/apt-cache.cc:575 cmdline/apt-cache.cc:1432
+#: cmdline/apt-cache.cc:1434 cmdline/apt-cache.cc:1511 cmdline/apt-mark.cc:48
+#: cmdline/apt-mark.cc:95 cmdline/apt-mark.cc:221
+#: apt-private/private-show.cc:114 apt-private/private-show.cc:116
 msgid "No packages found"
 msgstr "Fant ingen pakker"
 
-#: cmdline/apt-cache.cc:1265
+#: cmdline/apt-cache.cc:1245
 msgid "You must give at least one search pattern"
 msgstr "Du må oppgi minst ett søkemønster"
 
-#: cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1411
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1526 apt-pkg/cacheset.cc:510
+#: cmdline/apt-cache.cc:1506 apt-pkg/cacheset.cc:574
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Klarer ikke å finne pakken %s"
 
-#: cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1536
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1563 cmdline/apt-cache.cc:1654
+#: cmdline/apt-cache.cc:1543 cmdline/apt-cache.cc:1634
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 "Mellomlageret er ikke oppdatert, kan ikke kryssreferere til en pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1557
 msgid "Pinned packages:"
 msgstr "Låste pakker:"
 
-#: cmdline/apt-cache.cc:1589 cmdline/apt-cache.cc:1634
+#: cmdline/apt-cache.cc:1569 cmdline/apt-cache.cc:1614
 msgid "(not found)"
 msgstr "(ikke funnet)"
 
-#: cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1577
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1598
+#: cmdline/apt-cache.cc:1578
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1616 cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1596 cmdline/apt-cache.cc:1604
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1631
+#: cmdline/apt-cache.cc:1611
 msgid "  Package pin: "
 msgstr "  Pakke låst til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1640
+#: cmdline/apt-cache.cc:1620
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1753 cmdline/apt-cdrom.cc:206 cmdline/apt-config.cc:81
-#: cmdline/apt-get.cc:3392 cmdline/apt-mark.cc:375
+#: cmdline/apt-cache.cc:1733 cmdline/apt-cdrom.cc:210 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1524 cmdline/apt-mark.cc:377 cmdline/apt.cc:66
 #: cmdline/apt-extracttemplates.cc:229 ftparchive/apt-ftparchive.cc:591
-#: cmdline/apt-internal-solver.cc:33 cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-internal-solver.cc:34 cmdline/apt-sortpkgs.cc:147
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s kompilert på %s %s\n"
 
-#: cmdline/apt-cache.cc:1760
+#: cmdline/apt-cache.cc:1740
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -242,35 +244,35 @@ msgstr ""
 "Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
 
 #. }}}
-#: cmdline/apt-cdrom.cc:43
+#: cmdline/apt-cdrom.cc:45
 msgid ""
 "No CD-ROM could be auto-detected or found using the default mount point.\n"
 "You may try the --cdrom option to set the CD-ROM mount point. See 'man apt-"
 "cdrom' for more information about the CD-ROM auto-detection and mount point."
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:85
+#: cmdline/apt-cdrom.cc:89
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»"
 
-#: cmdline/apt-cdrom.cc:100
+#: cmdline/apt-cdrom.cc:104
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Sett inn en disk i lagringsenheten og trykk Enter"
 
-#: cmdline/apt-cdrom.cc:135
+#: cmdline/apt-cdrom.cc:139
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikke montere «%s» på «%s»"
 
-#: cmdline/apt-cdrom.cc:170
+#: cmdline/apt-cdrom.cc:174
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr "Gjenta denne prosessen for resten av CD-ene i ditt sett."
 
-#: cmdline/apt-config.cc:46
+#: cmdline/apt-config.cc:48
 msgid "Arguments not in pairs"
 msgstr "Ikke parvise argumenter"
 
-#: cmdline/apt-config.cc:87
+#: cmdline/apt-config.cc:89
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
@@ -298,601 +300,55 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
 
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: cmdline/apt-get.cc:146
-msgid "[Y/n]"
-msgstr "[J/n]"
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: cmdline/apt-get.cc:152
-msgid "[y/N]"
-msgstr "[j/N]"
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: cmdline/apt-get.cc:163
-msgid "Y"
-msgstr "J"
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: cmdline/apt-get.cc:169
-msgid "N"
-msgstr ""
-
-#: cmdline/apt-get.cc:191 apt-pkg/cachefilter.cc:33
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr "Kompileringsfeil i regulært uttrykk - %s"
-
-#: cmdline/apt-get.cc:289
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
-
-#: cmdline/apt-get.cc:379
-#, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: cmdline/apt-get.cc:381
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installeres"
-
-#: cmdline/apt-get.cc:388
-msgid "but it is not installable"
-msgstr "men lar seg ikke installere"
-
-#: cmdline/apt-get.cc:390
-msgid "but it is a virtual package"
-msgstr "men er en virtuell pakke"
-
-#: cmdline/apt-get.cc:393
-msgid "but it is not installed"
-msgstr "men er ikke installert"
-
-#: cmdline/apt-get.cc:393
-msgid "but it is not going to be installed"
-msgstr "men skal ikke installeres"
-
-#: cmdline/apt-get.cc:398
-msgid " or"
-msgstr " eller"
-
-#: cmdline/apt-get.cc:427
-msgid "The following NEW packages will be installed:"
-msgstr "Følgende NYE pakker vil bli installert:"
-
-#: cmdline/apt-get.cc:453
-msgid "The following packages will be REMOVED:"
-msgstr "Følgende pakker vil bli FJERNET:"
-
-#: cmdline/apt-get.cc:475
-msgid "The following packages have been kept back:"
-msgstr "Følgende pakker er holdt tilbake:"
-
-#: cmdline/apt-get.cc:496
-msgid "The following packages will be upgraded:"
-msgstr "Følgende pakker vil bli oppgradert:"
-
-#: cmdline/apt-get.cc:517
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Følgende pakker vil bli NEDGRADERT:"
-
-#: cmdline/apt-get.cc:537
-msgid "The following held packages will be changed:"
-msgstr "Følgende pakker vil bli endret:"
-
-#: cmdline/apt-get.cc:592
-#, c-format
-msgid "%s (due to %s) "
-msgstr "%s (pga. %s) "
-
-#: cmdline/apt-get.cc:600
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
-"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
-
-#: cmdline/apt-get.cc:631
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nylig installerte, "
-
-#: cmdline/apt-get.cc:635
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installert på nytt, "
-
-#: cmdline/apt-get.cc:637
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: cmdline/apt-get.cc:639
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
-
-#: cmdline/apt-get.cc:643
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
-
-#: cmdline/apt-get.cc:664
-#, c-format
-msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Merk, velger «%s» for oppgaven «%s»\n"
-
-#: cmdline/apt-get.cc:669
-#, c-format
-msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Merk, velger «%s» for det regulære uttrykket «%s»\n"
-
-#: cmdline/apt-get.cc:686
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
-
-#: cmdline/apt-get.cc:697
-msgid " [Installed]"
-msgstr " [Installert]"
-
-#: cmdline/apt-get.cc:706
-msgid " [Not candidate version]"
-msgstr " [Ikke versjonskandidat]"
-
-#: cmdline/apt-get.cc:708
-msgid "You should explicitly select one to install."
-msgstr "Du må velge en pakke som skal installeres."
-
-#: cmdline/apt-get.cc:711
-#, c-format
-msgid ""
-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-"Pakken %s er ikke tilgjengelig, men en annen pakke henviser til den.\n"
-"Dette kan bety at pakken mangler, er utgått, eller bare finnes \n"
-"tilgjengelig fra en annen kilde.\n"
-
-#: cmdline/apt-get.cc:729
-msgid "However the following packages replace it:"
-msgstr "Følgende pakker erstatter den imidlertid:"
-
-#: cmdline/apt-get.cc:741
-#, c-format
-msgid "Package '%s' has no installation candidate"
-msgstr "Pakken «%s» har ingen installasjonskandidat"
-
-#: cmdline/apt-get.cc:754
-#, c-format
-msgid "Virtual packages like '%s' can't be removed\n"
-msgstr "Virtuelle pakker som «%s» kan ikke fjernes\n"
-
-#. TRANSLATORS: Note, this is not an interactive question
-#: cmdline/apt-get.cc:766 cmdline/apt-get.cc:969
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-
-#: cmdline/apt-get.cc:772 cmdline/apt-get.cc:975
-#, fuzzy, c-format
-msgid "Package '%s' is not installed, so not removed\n"
-msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
-
-#: cmdline/apt-get.cc:817
-#, c-format
-msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Merk, velger «%s» istedenfor «%s»\n"
-
-#: cmdline/apt-get.cc:847
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
-
-#: cmdline/apt-get.cc:851
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-"Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
-"ønsket.\n"
-
-#: cmdline/apt-get.cc:863
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
-
-#: cmdline/apt-get.cc:868
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s er allerede nyeste versjon.\n"
-
-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:2187 cmdline/apt-mark.cc:68
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s satt til manuell installasjon.\n"
-
-#: cmdline/apt-get.cc:913
-#, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
-
-#: cmdline/apt-get.cc:918
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
-
-#: cmdline/apt-get.cc:1054
-msgid "Correcting dependencies..."
-msgstr "Retter på avhengighetsforhold ..."
-
-#: cmdline/apt-get.cc:1057
-msgid " failed."
-msgstr " mislyktes."
-
-#: cmdline/apt-get.cc:1060
-msgid "Unable to correct dependencies"
-msgstr "Klarer ikke å rette på avhengighetsforholdene"
-
-#: cmdline/apt-get.cc:1063
-msgid "Unable to minimize the upgrade set"
-msgstr "Klarer ikke å minimere oppgraderingsettet"
-
-#: cmdline/apt-get.cc:1065
-msgid " Done"
-msgstr " Utført"
-
-#: cmdline/apt-get.cc:1069
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
-
-#: cmdline/apt-get.cc:1072
-msgid "Unmet dependencies. Try using -f."
-msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
-
-#: cmdline/apt-get.cc:1097
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
-
-#: cmdline/apt-get.cc:1101
-msgid "Authentication warning overridden.\n"
-msgstr "Autentiseringsadvarsel overstyrt.\n"
-
-#: cmdline/apt-get.cc:1108
-msgid "Install these packages without verification?"
-msgstr "Installer disse pakkene uten verifikasjon?"
-
-#: cmdline/apt-get.cc:1110
-msgid "Some packages could not be authenticated"
-msgstr "Noen pakker ble ikke autentisert"
-
-#: cmdline/apt-get.cc:1119 cmdline/apt-get.cc:1280
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
-
-#: cmdline/apt-get.cc:1160
-msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
-
-#: cmdline/apt-get.cc:1169
-msgid "Packages need to be removed but remove is disabled."
-msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
-
-#: cmdline/apt-get.cc:1180
-msgid "Internal error, Ordering didn't finish"
-msgstr "Intern feil, sortering fullførte ikke"
-
-#: cmdline/apt-get.cc:1218
-msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr ""
-"Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
-"apt@packages.debian.org"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1225
-#, c-format
-msgid "Need to get %sB/%sB of archives.\n"
-msgstr "Må hente %sB/%sB med arkiver.\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1230
-#, c-format
-msgid "Need to get %sB of archives.\n"
-msgstr "Må hente %sB med arkiver.\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1237
-#, c-format
-msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
-
-#. TRANSLATOR: The required space between number and unit is already included
-#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:1242
-#, c-format
-msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
-
-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:1260 cmdline/apt-get.cc:2621
-#: cmdline/apt-get.cc:2624
-#, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Klarte ikke bestemme ledig plass i %s"
-
-#: cmdline/apt-get.cc:1270
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Dessverre, ikke nok ledig plass i %s"
-
-#: cmdline/apt-get.cc:1286 cmdline/apt-get.cc:1308
-msgid "Trivial Only specified but this is not a trivial operation."
-msgstr ""
-"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
-
-#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
-#. careful with hard to type or special characters (like non-breaking spaces)
-#: cmdline/apt-get.cc:1290
-msgid "Yes, do as I say!"
-msgstr "Ja, gjør som jeg sier!"
-
-#: cmdline/apt-get.cc:1292
-#, c-format
-msgid ""
-"You are about to do something potentially harmful.\n"
-"To continue type in the phrase '%s'\n"
-" ?] "
-msgstr ""
-"Du er iferd med å utføre en mulig skadelig handling.\n"
-"For å fortsette skriv inn teksten «%s»\n"
-" ?] "
-
-#: cmdline/apt-get.cc:1298 cmdline/apt-get.cc:1317
-msgid "Abort."
-msgstr "Avbryter."
-
-#: cmdline/apt-get.cc:1313
-msgid "Do you want to continue?"
-msgstr "Vil du fortsette?"
-
-#: cmdline/apt-get.cc:1385 cmdline/apt-get.cc:2686 apt-pkg/algorithms.cc:1566
-#, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Klarte ikke å skaffe %s  %s\n"
-
-#: cmdline/apt-get.cc:1403
-msgid "Some files failed to download"
-msgstr "Klarte ikke laste ned alle filene"
-
-#: cmdline/apt-get.cc:1404 cmdline/apt-get.cc:2698
-msgid "Download complete and in download only mode"
-msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
-
-#: cmdline/apt-get.cc:1410
-msgid ""
-"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
-"missing?"
-msgstr ""
-"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
-"«--fix-missing»."
-
-#: cmdline/apt-get.cc:1414
-msgid "--fix-missing and media swapping is not currently supported"
-msgstr "«--fix-missing» og bytte av media støttes nå ikke"
-
-#: cmdline/apt-get.cc:1419
-msgid "Unable to correct missing packages."
-msgstr "Klarer ikke å rette på manglende pakker."
-
-#: cmdline/apt-get.cc:1420
-msgid "Aborting install."
-msgstr "Avbryter installasjonen."
-
-#: cmdline/apt-get.cc:1448
-msgid ""
-"The following package disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgid_plural ""
-"The following packages disappeared from your system as\n"
-"all files have been overwritten by other packages:"
-msgstr[0] ""
-"Den følgende pakken forsvant fra systemet ditt siden\n"
-"alle filene er overskrevet av andre pakker:"
-msgstr[1] ""
-"De følgende pakkene forsvant fra systemet ditt siden\n"
-"alle filene er overskrevet av andre pakker:"
-
-#: cmdline/apt-get.cc:1452
-msgid "Note: This is done automatically and on purpose by dpkg."
-msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
-
-#: cmdline/apt-get.cc:1590
-#, c-format
-msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr "Ignorer utilgjengelig målutgave «%s» av pakke «%s»"
-
-#: cmdline/apt-get.cc:1622
+#: cmdline/apt-get.cc:313
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Velger «%s» som kildepakke istedenfor «%s»\n"
 
-#. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1660
+#: cmdline/apt-get.cc:367
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»"
 
-#: cmdline/apt-get.cc:1676
-msgid "The update command takes no arguments"
-msgstr "Oppdaterings-kommandoen tar ingen argumenter"
-
-#: cmdline/apt-get.cc:1742
-msgid "We are not supposed to delete stuff, can't start AutoRemover"
-msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
-
-#: cmdline/apt-get.cc:1846
-msgid ""
-"Hmm, seems like the AutoRemover destroyed something which really\n"
-"shouldn't happen. Please file a bug report against apt."
-msgstr ""
-"Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n"
-"virkelig ikke skje. Send inn en feilmelding til apt-utviklerne."
-
-#.
-#. if (Packages == 1)
-#. {
-#. c1out << endl;
-#. c1out <<
-#. _("Since you only requested a single operation it is extremely likely that\n"
-#. "the package is simply not installable and a bug report against\n"
-#. "that package should be filed.") << endl;
-#. }
-#.
-#: cmdline/apt-get.cc:1849 cmdline/apt-get.cc:2017
-msgid "The following information may help to resolve the situation:"
-msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
-
-#: cmdline/apt-get.cc:1853
-msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
-
-#: cmdline/apt-get.cc:1860
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-"Følgende pakke ble automatisk installert og er ikke lenger påkrevet:"
-msgstr[1] ""
-"Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
-
-#: cmdline/apt-get.cc:1864
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n"
-msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
-
-#: cmdline/apt-get.cc:1866
-#, fuzzy
-msgid "Use 'apt-get autoremove' to remove it."
-msgid_plural "Use 'apt-get autoremove' to remove them."
-msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem."
-msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem."
-
-#: cmdline/apt-get.cc:1885
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Intern feil - «AllUpgrade» ødela noe"
-
-#: cmdline/apt-get.cc:1984
-msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
-
-#: cmdline/apt-get.cc:1988
-msgid ""
-"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
-"solution)."
-msgstr ""
-"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
-"angi en løsning)."
-
-#: cmdline/apt-get.cc:2002
-msgid ""
-"Some packages could not be installed. This may mean that you have\n"
-"requested an impossible situation or if you are using the unstable\n"
-"distribution that some required packages have not yet been created\n"
-"or been moved out of Incoming."
-msgstr ""
-"Noen pakker ble ikke installeres. Dette kan bety at du har bedt om\n"
-"en umulig tilstand eller, hvis du bruker den ustabile utgaven av Debian,\n"
-"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
-"distribusjonen."
-
-#: cmdline/apt-get.cc:2023
-msgid "Broken packages"
-msgstr "Ødelagte pakker"
-
-#: cmdline/apt-get.cc:2049
-msgid "The following extra packages will be installed:"
-msgstr "Følgende ekstra pakker vil bli installert."
-
-#: cmdline/apt-get.cc:2139
-msgid "Suggested packages:"
-msgstr "Foreslåtte pakker:"
-
-#: cmdline/apt-get.cc:2140
-msgid "Recommended packages:"
-msgstr "Anbefalte pakker"
-
-#: cmdline/apt-get.cc:2182
+#: cmdline/apt-get.cc:398
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Klarte ikke å finne pakken %s"
 
-#: cmdline/apt-get.cc:2189 cmdline/apt-mark.cc:70
+#: cmdline/apt-get.cc:403 cmdline/apt-mark.cc:70
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s satt til manuell installasjon.\n"
+
+#: cmdline/apt-get.cc:405 cmdline/apt-mark.cc:72
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s satt til automatisk installasjon.\n"
 
-#: cmdline/apt-get.cc:2197 cmdline/apt-mark.cc:114
+#: cmdline/apt-get.cc:413 cmdline/apt-mark.cc:116
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:2213
-msgid "Calculating upgrade... "
-msgstr "Beregner oppgradering... "
-
-#: cmdline/apt-get.cc:2216 methods/ftp.cc:712 methods/connect.cc:116
-msgid "Failed"
-msgstr "Mislyktes"
-
-#: cmdline/apt-get.cc:2221
-msgid "Done"
-msgstr "Utført"
-
-#: cmdline/apt-get.cc:2288 cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:482 cmdline/apt-get.cc:490
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil, problemløser ødela noe"
 
-#: cmdline/apt-get.cc:2324 cmdline/apt-get.cc:2361
+#: cmdline/apt-get.cc:518 cmdline/apt-get.cc:555
 msgid "Unable to lock the download directory"
 msgstr "Klarer ikke å låse nedlastingsmappa"
 
-#: cmdline/apt-get.cc:2418
-#, c-format
-msgid "Can't find a source to download version '%s' of '%s'"
-msgstr ""
-
-#: cmdline/apt-get.cc:2423
-#, c-format
-msgid "Downloading %s %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:2483
+#: cmdline/apt-get.cc:667
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må angi minst en pakke du vil ha kildekoden til"
 
-#: cmdline/apt-get.cc:2523 cmdline/apt-get.cc:2835
+#: cmdline/apt-get.cc:707 cmdline/apt-get.cc:1002
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Klarer ikke å finne en kildekodepakke for %s"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:724
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
@@ -901,7 +357,7 @@ msgstr ""
 "MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
 "%s\n"
 
-#: cmdline/apt-get.cc:2545
+#: cmdline/apt-get.cc:729
 #, fuzzy, c-format
 msgid ""
 "Please use:\n"
@@ -912,106 +368,116 @@ msgstr ""
 "bzr get %s\n"
 "for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
 
-#: cmdline/apt-get.cc:2598
+#: cmdline/apt-get.cc:782
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hopper over allerede nedlastet fil «%s»\n"
 
-#: cmdline/apt-get.cc:2635
+#: cmdline/apt-get.cc:805 cmdline/apt-get.cc:808
+#: apt-private/private-install.cc:198 apt-private/private-install.cc:201
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Klarte ikke bestemme ledig plass i %s"
+
+#: cmdline/apt-get.cc:819
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plass i %s"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2644
+#: cmdline/apt-get.cc:828
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:2649
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
 
-#: cmdline/apt-get.cc:2655
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Skaffer kildekode %s\n"
 
-#: cmdline/apt-get.cc:2693
+#: cmdline/apt-get.cc:860
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikke å skaffe alle arkivene."
 
-#: cmdline/apt-get.cc:2724
+#: cmdline/apt-get.cc:865 apt-private/private-install.cc:325
+msgid "Download complete and in download only mode"
+msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
+
+#: cmdline/apt-get.cc:891
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
 
-#: cmdline/apt-get.cc:2736
+#: cmdline/apt-get.cc:903
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:2737
+#: cmdline/apt-get.cc:904
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
 
-#: cmdline/apt-get.cc:2759
+#: cmdline/apt-get.cc:926
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggekommandoen «%s» mislyktes.\n"
 
-#: cmdline/apt-get.cc:2779
+#: cmdline/apt-get.cc:946
 msgid "Child process failed"
 msgstr "Barneprosessen mislyktes"
 
-#: cmdline/apt-get.cc:2798
+#: cmdline/apt-get.cc:965
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
 
-#: cmdline/apt-get.cc:2823
+#: cmdline/apt-get.cc:990
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:2847 cmdline/apt-get.cc:2850
+#: cmdline/apt-get.cc:1014 cmdline/apt-get.cc:1017
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
 
-#: cmdline/apt-get.cc:2870
+#: cmdline/apt-get.cc:1037
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen avhengigheter.\n"
 
-#: cmdline/apt-get.cc:3040
+#: cmdline/apt-get.cc:1207
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:3058
+#: cmdline/apt-get.cc:1225
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:3081
+#: cmdline/apt-get.cc:1248
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken "
 "%s er for ny"
 
-#: cmdline/apt-get.cc:3120
+#: cmdline/apt-get.cc:1287
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -1020,37 +486,37 @@ msgstr ""
 "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige "
 "versjoner av pakken %s som oppfyller versjonskravene"
 
-#: cmdline/apt-get.cc:3126
+#: cmdline/apt-get.cc:1293
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes"
 
-#: cmdline/apt-get.cc:3149
+#: cmdline/apt-get.cc:1316
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
 
-#: cmdline/apt-get.cc:3164
+#: cmdline/apt-get.cc:1331
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
 
-#: cmdline/apt-get.cc:3169
+#: cmdline/apt-get.cc:1336
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikke å behandle forutsetningene for bygging"
 
-#: cmdline/apt-get.cc:3262 cmdline/apt-get.cc:3274
+#: cmdline/apt-get.cc:1429 cmdline/apt-get.cc:1441
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Kobler til %s (%s)"
 
-#: cmdline/apt-get.cc:3397
+#: cmdline/apt-get.cc:1529
 msgid "Supported modules:"
 msgstr "Støttede moduler:"
 
-#: cmdline/apt-get.cc:3438
+#: cmdline/apt-get.cc:1570
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1139,102 +605,53 @@ msgstr ""
 "for mer informasjon og flere valg.\n"
 "                       Denne APT har kraften til en Superku.\n"
 
-#: cmdline/apt-get.cc:3603
-msgid ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
-msgstr ""
-"MERK: Dette er kun en simulering.\n"
-"      apt-get må ha root-rettigheter for reell utførelse.\n"
-"      Husk også at låsing er deaktivert, så ikke regn med \n"
-"      relevans i forhold til den reelle gjeldende situasjonen."
-
-#: cmdline/acqprogress.cc:60
-msgid "Hit "
-msgstr "Funnet "
-
-#: cmdline/acqprogress.cc:84
-msgid "Get:"
-msgstr "Hent:"
-
-#: cmdline/acqprogress.cc:115
-msgid "Ign "
-msgstr "Ign "
-
-#: cmdline/acqprogress.cc:119
-msgid "Err "
-msgstr "Feil "
-
-#: cmdline/acqprogress.cc:140
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Hentet %sB på %s (%sB/s)\n"
-
-#: cmdline/acqprogress.cc:230
-#, c-format
-msgid " [Working]"
-msgstr " [Arbeider]"
-
-#: cmdline/acqprogress.cc:286
-#, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Bytte av media: sett inn CD-en som er merket\n"
-"  «%s»\n"
-"i «%s» og trykk «Enter»\n"
-
-#: cmdline/apt-mark.cc:55
+#: cmdline/apt-mark.cc:57
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "men er ikke installert"
 
-#: cmdline/apt-mark.cc:61
+#: cmdline/apt-mark.cc:63
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-mark.cc:63
+#: cmdline/apt-mark.cc:65
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s satt til automatisk installasjon.\n"
 
-#: cmdline/apt-mark.cc:228
+#: cmdline/apt-mark.cc:230
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-mark.cc:230
+#: cmdline/apt-mark.cc:232
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s er allerede nyeste versjon.\n"
 
-#: cmdline/apt-mark.cc:245 cmdline/apt-mark.cc:326
-#: apt-pkg/contrib/fileutl.cc:832 apt-pkg/contrib/gpgv.cc:223
-#: apt-pkg/deb/dpkgpm.cc:1032
+#: cmdline/apt-mark.cc:247 cmdline/apt-mark.cc:328
+#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:223
+#: apt-pkg/deb/dpkgpm.cc:1174
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Ventet på %s, men den ble ikke funnet"
 
-#: cmdline/apt-mark.cc:260 cmdline/apt-mark.cc:309
+#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:311
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "%s satt til manuell installasjon.\n"
 
-#: cmdline/apt-mark.cc:262 cmdline/apt-mark.cc:314
+#: cmdline/apt-mark.cc:264 cmdline/apt-mark.cc:316
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Klarte ikke å åpne %s"
 
-#: cmdline/apt-mark.cc:332
+#: cmdline/apt-mark.cc:334
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:379
+#: cmdline/apt-mark.cc:381
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1256,6 +673,23 @@ msgid ""
 "See the apt-mark(8) and apt.conf(5) manual pages for more information."
 msgstr ""
 
+#: cmdline/apt.cc:71
+msgid ""
+"Usage: apt [options] command\n"
+"\n"
+"CLI for apt.\n"
+"Commands: \n"
+" list - list packages based on package names\n"
+" search - search in package descriptions\n"
+" show - show package details\n"
+"\n"
+" update - update list of available packages\n"
+" install - install packages\n"
+" upgrade - upgrade the systems packages\n"
+"\n"
+" edit-sources - edit the source information file\n"
+msgstr ""
+
 #: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
@@ -1355,8 +789,8 @@ msgstr "Tidsavbrudd på forbindelsen"
 msgid "Server closed the connection"
 msgstr "Tjeneren lukket forbindelsen"
 
-#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1264
-#: apt-pkg/contrib/fileutl.cc:1273 apt-pkg/contrib/fileutl.cc:1276
+#: methods/ftp.cc:349 methods/rsh.cc:199 apt-pkg/contrib/fileutl.cc:1292
+#: apt-pkg/contrib/fileutl.cc:1301 apt-pkg/contrib/fileutl.cc:1304
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -1369,8 +803,8 @@ msgid "Protocol corruption"
 msgstr "Protokollødeleggelse"
 
 #: methods/ftp.cc:458 methods/rred.cc:238 methods/rsh.cc:243
-#: apt-pkg/contrib/fileutl.cc:1360 apt-pkg/contrib/fileutl.cc:1369
-#: apt-pkg/contrib/fileutl.cc:1372 apt-pkg/contrib/fileutl.cc:1397
+#: apt-pkg/contrib/fileutl.cc:1388 apt-pkg/contrib/fileutl.cc:1397
+#: apt-pkg/contrib/fileutl.cc:1400 apt-pkg/contrib/fileutl.cc:1425
 msgid "Write error"
 msgstr "Skrivefeil"
 
@@ -1382,6 +816,10 @@ msgstr "Klarte ikke å opprette en sokkel"
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
 
+#: methods/ftp.cc:712 methods/connect.cc:116 apt-private/private-upgrade.cc:21
+msgid "Failed"
+msgstr "Mislyktes"
+
 #: methods/ftp.cc:714
 msgid "Could not connect passive socket."
 msgstr "Klarte ikke å koble til en passiv sokkel."
@@ -1424,7 +862,7 @@ msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
 msgid "Unable to accept connection"
 msgstr "Klarte ikke å godta tilkoblingen"
 
-#: methods/ftp.cc:873 methods/http.cc:1038 methods/rsh.cc:313
+#: methods/ftp.cc:873 methods/server.cc:353 methods/rsh.cc:313
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
@@ -1555,81 +993,603 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:394
+#: methods/http.cc:519
+msgid "Error writing to the file"
+msgstr "Feil ved skriving til fila"
+
+#: methods/http.cc:533
+msgid "Error reading from server. Remote end closed connection"
+msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
+
+#: methods/http.cc:535
+msgid "Error reading from server"
+msgstr "Feil ved lesing fra tjeneren"
+
+#: methods/http.cc:571
+msgid "Error writing to file"
+msgstr "Feil ved skriving til fil"
+
+#: methods/http.cc:631
+msgid "Select failed"
+msgstr "Utvalget mislykkes"
+
+#: methods/http.cc:636
+msgid "Connection timed out"
+msgstr "Tidsavbrudd på forbindelsen"
+
+#: methods/http.cc:659
+msgid "Error writing to output file"
+msgstr "Feil ved skriving til utfil"
+
+#: methods/server.cc:56
 msgid "Waiting for headers"
 msgstr "Venter på hoder"
 
-#: methods/http.cc:544
+#: methods/server.cc:114
 msgid "Bad header line"
 msgstr "Ødelagt hodelinje"
 
-#: methods/http.cc:569 methods/http.cc:576
+#: methods/server.cc:139 methods/server.cc:146
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
 
-#: methods/http.cc:606
+#: methods/server.cc:176
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
 
-#: methods/http.cc:621
+#: methods/server.cc:199
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
 
-#: methods/http.cc:623
+#: methods/server.cc:201
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
 
-#: methods/http.cc:647
+#: methods/server.cc:225
 msgid "Unknown date format"
 msgstr "Ukjent datoformat"
 
-#: methods/http.cc:826
-msgid "Select failed"
-msgstr "Utvalget mislykkes"
+#: methods/server.cc:490
+msgid "Bad header data"
+msgstr "Ødelagte hodedata"
 
-#: methods/http.cc:831
-msgid "Connection timed out"
-msgstr "Tidsavbrudd på forbindelsen"
+#: methods/server.cc:507 methods/server.cc:564
+msgid "Connection failed"
+msgstr "Forbindelsen mislykkes"
 
-#: methods/http.cc:854
-msgid "Error writing to output file"
-msgstr "Feil ved skriving til utfil"
+#: methods/server.cc:656
+msgid "Internal error"
+msgstr "Intern feil"
 
-#: methods/http.cc:885
-msgid "Error writing to file"
-msgstr "Feil ved skriving til fil"
+#: apt-private/private-list.cc:143
+msgid "Listing"
+msgstr ""
 
-#: methods/http.cc:913
-msgid "Error writing to the file"
-msgstr "Feil ved skriving til fila"
+#: apt-private/private-install.cc:93
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
 
-#: methods/http.cc:927
-msgid "Error reading from server. Remote end closed connection"
-msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden"
+#: apt-private/private-install.cc:102
+msgid "Packages need to be removed but remove is disabled."
+msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
 
-#: methods/http.cc:929
-msgid "Error reading from server"
-msgstr "Feil ved lesing fra tjeneren"
+#: apt-private/private-install.cc:121
+msgid "Internal error, Ordering didn't finish"
+msgstr "Intern feil, sortering fullførte ikke"
 
-#: methods/http.cc:1197
-msgid "Bad header data"
-msgstr "Ødelagte hodedata"
+#: apt-private/private-install.cc:159
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+"Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
+"apt@packages.debian.org"
 
-#: methods/http.cc:1214 methods/http.cc:1269
-msgid "Connection failed"
-msgstr "Forbindelsen mislykkes"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:166
+#, c-format
+msgid "Need to get %sB/%sB of archives.\n"
+msgstr "Må hente %sB/%sB med arkiver.\n"
 
-#: methods/http.cc:1361
-msgid "Internal error"
-msgstr "Intern feil"
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:171
+#, c-format
+msgid "Need to get %sB of archives.\n"
+msgstr "Må hente %sB med arkiver.\n"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:178
+#, c-format
+msgid "After this operation, %sB of additional disk space will be used.\n"
+msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n"
+
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: apt-private/private-install.cc:183
+#, c-format
+msgid "After this operation, %sB disk space will be freed.\n"
+msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n"
+
+#: apt-private/private-install.cc:211
+#, c-format
+msgid "You don't have enough free space in %s."
+msgstr "Dessverre, ikke nok ledig plass i %s"
+
+#: apt-private/private-install.cc:221 apt-private/private-download.cc:55
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
+
+#: apt-private/private-install.cc:227 apt-private/private-install.cc:249
+msgid "Trivial Only specified but this is not a trivial operation."
+msgstr ""
+"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
+
+#. TRANSLATOR: This string needs to be typed by the user as a confirmation, so be
+#. careful with hard to type or special characters (like non-breaking spaces)
+#: apt-private/private-install.cc:231
+msgid "Yes, do as I say!"
+msgstr "Ja, gjør som jeg sier!"
+
+#: apt-private/private-install.cc:233
+#, c-format
+msgid ""
+"You are about to do something potentially harmful.\n"
+"To continue type in the phrase '%s'\n"
+" ?] "
+msgstr ""
+"Du er iferd med å utføre en mulig skadelig handling.\n"
+"For å fortsette skriv inn teksten «%s»\n"
+" ?] "
+
+#: apt-private/private-install.cc:239 apt-private/private-install.cc:257
+msgid "Abort."
+msgstr "Avbryter."
+
+#: apt-private/private-install.cc:254
+msgid "Do you want to continue?"
+msgstr "Vil du fortsette?"
+
+#: apt-private/private-install.cc:324
+msgid "Some files failed to download"
+msgstr "Klarte ikke laste ned alle filene"
+
+#: apt-private/private-install.cc:331
+msgid ""
+"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
+"missing?"
+msgstr ""
+"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
+"«--fix-missing»."
+
+#: apt-private/private-install.cc:335
+msgid "--fix-missing and media swapping is not currently supported"
+msgstr "«--fix-missing» og bytte av media støttes nå ikke"
+
+#: apt-private/private-install.cc:340
+msgid "Unable to correct missing packages."
+msgstr "Klarer ikke å rette på manglende pakker."
+
+#: apt-private/private-install.cc:341
+msgid "Aborting install."
+msgstr "Avbryter installasjonen."
+
+#: apt-private/private-install.cc:377
+msgid ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+"Den følgende pakken forsvant fra systemet ditt siden\n"
+"alle filene er overskrevet av andre pakker:"
+msgstr[1] ""
+"De følgende pakkene forsvant fra systemet ditt siden\n"
+"alle filene er overskrevet av andre pakker:"
+
+#: apt-private/private-install.cc:381
+msgid "Note: This is done automatically and on purpose by dpkg."
+msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
+
+#: apt-private/private-install.cc:402
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
+
+#: apt-private/private-install.cc:510
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+"Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n"
+"virkelig ikke skje. Send inn en feilmelding til apt-utviklerne."
+
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << std::endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << std::endl;
+#. }
+#.
+#: apt-private/private-install.cc:513 apt-private/private-install.cc:654
+msgid "The following information may help to resolve the situation:"
+msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
+
+#: apt-private/private-install.cc:517
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
+
+#: apt-private/private-install.cc:524
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+"Følgende pakke ble automatisk installert og er ikke lenger påkrevet:"
+msgstr[1] ""
+"Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
+
+#: apt-private/private-install.cc:528
+#, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n"
+msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
+
+#: apt-private/private-install.cc:530
+#, fuzzy
+msgid "Use 'apt-get autoremove' to remove it."
+msgid_plural "Use 'apt-get autoremove' to remove them."
+msgstr[0] "Bruk «apt-get autoremove» for å fjerne dem."
+msgstr[1] "Bruk «apt-get autoremove» for å fjerne dem."
+
+#: apt-private/private-install.cc:624
+msgid "You might want to run 'apt-get -f install' to correct these:"
+msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
+
+#: apt-private/private-install.cc:626
+msgid ""
+"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
+"solution)."
+msgstr ""
+"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
+"angi en løsning)."
+
+#: apt-private/private-install.cc:639
+msgid ""
+"Some packages could not be installed. This may mean that you have\n"
+"requested an impossible situation or if you are using the unstable\n"
+"distribution that some required packages have not yet been created\n"
+"or been moved out of Incoming."
+msgstr ""
+"Noen pakker ble ikke installeres. Dette kan bety at du har bedt om\n"
+"en umulig tilstand eller, hvis du bruker den ustabile utgaven av Debian,\n"
+"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
+"distribusjonen."
+
+#: apt-private/private-install.cc:660
+msgid "Broken packages"
+msgstr "Ødelagte pakker"
+
+#: apt-private/private-install.cc:713
+msgid "The following extra packages will be installed:"
+msgstr "Følgende ekstra pakker vil bli installert."
+
+#: apt-private/private-install.cc:803
+msgid "Suggested packages:"
+msgstr "Foreslåtte pakker:"
+
+#: apt-private/private-install.cc:804
+msgid "Recommended packages:"
+msgstr "Anbefalte pakker"
+
+#: apt-private/private-download.cc:32
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
+
+#: apt-private/private-download.cc:36
+msgid "Authentication warning overridden.\n"
+msgstr "Autentiseringsadvarsel overstyrt.\n"
+
+#: apt-private/private-download.cc:41 apt-private/private-download.cc:48
+msgid "Some packages could not be authenticated"
+msgstr "Noen pakker ble ikke autentisert"
+
+#: apt-private/private-download.cc:46
+msgid "Install these packages without verification?"
+msgstr "Installer disse pakkene uten verifikasjon?"
+
+#: apt-private/private-download.cc:87 apt-pkg/update.cc:84
+#, c-format
+msgid "Failed to fetch %s  %s\n"
+msgstr "Klarte ikke å skaffe %s  %s\n"
+
+#: apt-private/private-output.cc:198
+msgid "installed,upgradable to: "
+msgstr ""
+
+#: apt-private/private-output.cc:204
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:207
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:209
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:211
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:217
+msgid "[upgradable from: "
+msgstr ""
+
+#: apt-private/private-output.cc:223
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:314
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
+
+#: apt-private/private-output.cc:404
+#, c-format
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:406
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installeres"
+
+#: apt-private/private-output.cc:413
+msgid "but it is not installable"
+msgstr "men lar seg ikke installere"
+
+#: apt-private/private-output.cc:415
+msgid "but it is a virtual package"
+msgstr "men er en virtuell pakke"
+
+#: apt-private/private-output.cc:418
+msgid "but it is not installed"
+msgstr "men er ikke installert"
+
+#: apt-private/private-output.cc:418
+msgid "but it is not going to be installed"
+msgstr "men skal ikke installeres"
+
+#: apt-private/private-output.cc:423
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:452
+msgid "The following NEW packages will be installed:"
+msgstr "Følgende NYE pakker vil bli installert:"
+
+#: apt-private/private-output.cc:478
+msgid "The following packages will be REMOVED:"
+msgstr "Følgende pakker vil bli FJERNET:"
+
+#: apt-private/private-output.cc:500
+msgid "The following packages have been kept back:"
+msgstr "Følgende pakker er holdt tilbake:"
+
+#: apt-private/private-output.cc:521
+msgid "The following packages will be upgraded:"
+msgstr "Følgende pakker vil bli oppgradert:"
+
+#: apt-private/private-output.cc:542
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Følgende pakker vil bli NEDGRADERT:"
+
+#: apt-private/private-output.cc:562
+msgid "The following held packages will be changed:"
+msgstr "Følgende pakker vil bli endret:"
+
+#: apt-private/private-output.cc:617
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (pga. %s) "
+
+#: apt-private/private-output.cc:625
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
+"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
+
+#: apt-private/private-output.cc:656
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nylig installerte, "
+
+#: apt-private/private-output.cc:660
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installert på nytt, "
+
+#: apt-private/private-output.cc:662
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:664
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
+
+#: apt-private/private-output.cc:668
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:690
+msgid "[Y/n]"
+msgstr "[J/n]"
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:696
+msgid "[y/N]"
+msgstr "[j/N]"
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:707
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:713
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:735 apt-pkg/cachefilter.cc:33
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Kompileringsfeil i regulært uttrykk - %s"
+
+#: apt-private/private-cachefile.cc:87
+msgid "Correcting dependencies..."
+msgstr "Retter på avhengighetsforhold ..."
+
+#: apt-private/private-cachefile.cc:90
+msgid " failed."
+msgstr " mislyktes."
+
+#: apt-private/private-cachefile.cc:93
+msgid "Unable to correct dependencies"
+msgstr "Klarer ikke å rette på avhengighetsforholdene"
+
+#: apt-private/private-cachefile.cc:96
+msgid "Unable to minimize the upgrade set"
+msgstr "Klarer ikke å minimere oppgraderingsettet"
+
+#: apt-private/private-cachefile.cc:98
+msgid " Done"
+msgstr " Utført"
+
+#: apt-private/private-cachefile.cc:102
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
+
+#: apt-private/private-cachefile.cc:105
+msgid "Unmet dependencies. Try using -f."
+msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
+
+#: apt-private/private-cacheset.cc:26 apt-private/private-search.cc:57
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-update.cc:45
+msgid "The update command takes no arguments"
+msgstr "Oppdaterings-kommandoen tar ingen argumenter"
+
+#: apt-private/private-upgrade.cc:18
+msgid "Calculating upgrade... "
+msgstr "Beregner oppgradering... "
+
+#: apt-private/private-upgrade.cc:23
+#, fuzzy
+msgid "Internal error, Upgrade broke stuff"
+msgstr "Intern feil - «AllUpgrade» ødela noe"
+
+#: apt-private/private-upgrade.cc:25
+msgid "Done"
+msgstr "Utført"
+
+#: apt-private/private-search.cc:61
+msgid "Full Text Search"
+msgstr ""
+
+#: apt-private/private-show.cc:106
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:19
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+"MERK: Dette er kun en simulering.\n"
+"      apt-get må ha root-rettigheter for reell utførelse.\n"
+"      Husk også at låsing er deaktivert, så ikke regn med \n"
+"      relevans i forhold til den reelle gjeldende situasjonen."
+
+#: apt-private/private-sources.cc:41
+#, fuzzy, c-format
+msgid "Failed to parse %s. Edit again? "
+msgstr "Klarte ikke å endre navnet på %s til %s"
+
+#: apt-private/private-sources.cc:52
+#, c-format
+msgid "Your '%s' file changed, please run 'apt-get update'."
+msgstr ""
+
+#: apt-private/acqprogress.cc:60
+msgid "Hit "
+msgstr "Funnet "
+
+#: apt-private/acqprogress.cc:84
+msgid "Get:"
+msgstr "Hent:"
+
+#: apt-private/acqprogress.cc:115
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:119
+msgid "Err "
+msgstr "Feil "
+
+#: apt-private/acqprogress.cc:140
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Hentet %sB på %s (%sB/s)\n"
+
+#: apt-private/acqprogress.cc:230
+#, c-format
+msgid " [Working]"
+msgstr " [Arbeider]"
+
+#: apt-private/acqprogress.cc:291
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Bytte av media: sett inn CD-en som er merket\n"
+"  «%s»\n"
+"i «%s» og trykk «Enter»\n"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-inst/extract.cc:464
-#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:404
-#: apt-pkg/contrib/fileutl.cc:517 apt-pkg/sourcelist.cc:208
-#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:108
-#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:362
+#: apt-pkg/contrib/cdromutl.cc:184 apt-pkg/contrib/fileutl.cc:406
+#: apt-pkg/contrib/fileutl.cc:519 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:485 apt-pkg/init.cc:100
+#: apt-pkg/init.cc:108 apt-pkg/clean.cc:36 apt-pkg/policy.cc:373
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarer ikke å lese %s"
@@ -1692,35 +1652,35 @@ msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen ble uventet stengt"
 
-#: dselect/install:32
+#: dselect/install:33
 msgid "Bad default setting!"
 msgstr "Feil standardinnstilling!"
 
-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
-#: dselect/install:105 dselect/update:45
+#: dselect/install:52 dselect/install:84 dselect/install:88 dselect/install:95
+#: dselect/install:106 dselect/update:45
 msgid "Press enter to continue."
 msgstr "Trykk «Enter» og fortsett"
 
-#: dselect/install:91
+#: dselect/install:92
 msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Vil du slettet alle tidligere nedlastede .deb-filer?"
 
 # Note to translators: The following four messages belong together. It doesn't

 # matter where sentences start, but it has to fit in just these four lines, and

 # at only 80 characters per line, if possible.

-#: dselect/install:101
+#: dselect/install:102
 msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr "Feil oppstod ved utpakkinga. Setter nå opp de installerte pakkene."
 
-#: dselect/install:102
+#: dselect/install:103
 msgid "will be configured. This may result in duplicate errors"
 msgstr "Det kan lede til fordobling av feil eller feil forårsaket av "
 
-#: dselect/install:103
+#: dselect/install:104
 msgid "or errors caused by missing dependencies. This is OK, only the errors"
 msgstr "manglende forutsetninger. Det er greit, bare de nevnte feilene er"
 
-#: dselect/install:104
+#: dselect/install:105
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
@@ -1971,36 +1931,36 @@ msgstr "Klarte ikke å lese lenken %s"
 msgid "Failed to unlink %s"
 msgstr "Klarte ikke å oppheve lenken %s"
 
-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:289
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Klarte ikke å lenke %s til %s"
 
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:299
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-grensa på %s B er nådd.\n"
 
-#: ftparchive/writer.cc:403
+#: ftparchive/writer.cc:404
 msgid "Archive had no package field"
 msgstr "Arkivet har ikke noe pakkefelt"
 
-#: ftparchive/writer.cc:411 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:412 ftparchive/writer.cc:702
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen overstyringsoppføring\n"
 
-#: ftparchive/writer.cc:479 ftparchive/writer.cc:845
+#: ftparchive/writer.cc:480 ftparchive/writer.cc:846
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " %s-vedlikeholderen er %s, ikke %s\n"
 
-#: ftparchive/writer.cc:711
+#: ftparchive/writer.cc:712
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen kildeoverstyringsoppføring\n"
 
-#: ftparchive/writer.cc:715
+#: ftparchive/writer.cc:716
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har ingen binæroverstyringsoppføring heller\n"
@@ -2079,7 +2039,7 @@ msgstr "Problem ved oppheving av lenken til %s"
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikke å endre navnet på %s til %s"
 
-#: cmdline/apt-internal-solver.cc:37
+#: cmdline/apt-internal-solver.cc:38
 #, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
@@ -2149,7 +2109,7 @@ msgstr "Ødelagt arkiv"
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
 
-#: apt-inst/contrib/extracttar.cc:302
+#: apt-inst/contrib/extracttar.cc:300
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjent TAR-hode: type %u, medlem %s"
@@ -2273,24 +2233,17 @@ msgid "Unable to stat %s"
 msgstr "Klarte ikke å få statusen på %s"
 
 #: apt-inst/deb/debfile.cc:41 apt-inst/deb/debfile.cc:46
+#: apt-inst/deb/debfile.cc:54
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
 
-#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
-#: apt-inst/deb/debfile.cc:55
-#, c-format
-msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
-msgstr ""
-"Dette er ikke et gyldig DEB-arkiv, det har ikke noe «%s»-, «%s»- eller «%s»-"
-"medlem"
-
-#: apt-inst/deb/debfile.cc:120
+#: apt-inst/deb/debfile.cc:119
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "Intern feil, fant ikke medlemmet %s"
 
-#: apt-inst/deb/debfile.cc:214
+#: apt-inst/deb/debfile.cc:213
 msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikke tolkes"
 
@@ -2351,85 +2304,85 @@ msgstr ""
 "av brukeren."
 
 #. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:378
+#: apt-pkg/contrib/strutl.cc:401
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%lid %lit %lim %lis"
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:385
+#: apt-pkg/contrib/strutl.cc:408
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%lit %lim %lis"
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:392
+#: apt-pkg/contrib/strutl.cc:415
 #, c-format
 msgid "%limin %lis"
 msgstr "%lim %lis"
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:397
+#: apt-pkg/contrib/strutl.cc:420
 #, c-format
 msgid "%lis"
 msgstr "%lis"
 
-#: apt-pkg/contrib/strutl.cc:1173
+#: apt-pkg/contrib/strutl.cc:1229
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fant ikke utvalget %s"
 
-#: apt-pkg/contrib/configuration.cc:491
+#: apt-pkg/contrib/configuration.cc:503
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Ukjent typeforkortelse: «%c»"
 
-#: apt-pkg/contrib/configuration.cc:605
+#: apt-pkg/contrib/configuration.cc:617
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Åpner oppsettsfila %s"
 
-#: apt-pkg/contrib/configuration.cc:773
+#: apt-pkg/contrib/configuration.cc:785
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
 
-#: apt-pkg/contrib/configuration.cc:792
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntaksfeil %s:%u: Feil på taggen"
 
-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:821
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
 
-#: apt-pkg/contrib/configuration.cc:849
+#: apt-pkg/contrib/configuration.cc:861
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det øverste nivået"
 
-#: apt-pkg/contrib/configuration.cc:856
+#: apt-pkg/contrib/configuration.cc:868
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer"
 
-#: apt-pkg/contrib/configuration.cc:860 apt-pkg/contrib/configuration.cc:865
+#: apt-pkg/contrib/configuration.cc:872 apt-pkg/contrib/configuration.cc:877
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "Syntaksfeil %s:%u: Inkludert herfra"
 
-#: apt-pkg/contrib/configuration.cc:869
+#: apt-pkg/contrib/configuration.cc:881
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikke støttet"
 
-#: apt-pkg/contrib/configuration.cc:872
+#: apt-pkg/contrib/configuration.cc:884
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "Syntaksfeil %s:%u: clear-direktivet krever et valgtre som argument"
 
-#: apt-pkg/contrib/configuration.cc:922
+#: apt-pkg/contrib/configuration.cc:934
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila"
@@ -2454,48 +2407,48 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr "%c%s ... Ferdig"
 
-#: apt-pkg/contrib/cmndline.cc:80
+#: apt-pkg/contrib/cmndline.cc:116
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)."
 
-#: apt-pkg/contrib/cmndline.cc:105 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:141 apt-pkg/contrib/cmndline.cc:150
+#: apt-pkg/contrib/cmndline.cc:158
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr "Skjønner ikke kommandolinjevalget %s"
 
-#: apt-pkg/contrib/cmndline.cc:127
+#: apt-pkg/contrib/cmndline.cc:163
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "Kommandolinjevalget %s er ikke boolsk"
 
-#: apt-pkg/contrib/cmndline.cc:168 apt-pkg/contrib/cmndline.cc:189
+#: apt-pkg/contrib/cmndline.cc:204 apt-pkg/contrib/cmndline.cc:225
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "Valget %s krever et argument."
 
-#: apt-pkg/contrib/cmndline.cc:202 apt-pkg/contrib/cmndline.cc:208
+#: apt-pkg/contrib/cmndline.cc:238 apt-pkg/contrib/cmndline.cc:244
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>."
 
-#: apt-pkg/contrib/cmndline.cc:237
+#: apt-pkg/contrib/cmndline.cc:273
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "Valget %s må ha et heltallsargument, ikke «%s»"
 
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:304
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "Valget «%s» er for langt"
 
-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:336
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "Skjønner ikke %s. Prøv «true» eller «false»."
 
-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:386
 #, c-format
 msgid "Invalid operation %s"
 msgstr "Ugyldig operasjon %s"
@@ -2509,116 +2462,116 @@ msgstr "Klarer ikke å fastsette monteringspunktet %s"
 msgid "Failed to stat the cdrom"
 msgstr "Klarer ikke å få statusen på CD-spilleren"
 
-#: apt-pkg/contrib/fileutl.cc:93
+#: apt-pkg/contrib/fileutl.cc:95
 #, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av gzip-fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:226
+#: apt-pkg/contrib/fileutl.cc:228
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:231
+#: apt-pkg/contrib/fileutl.cc:233
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikke åpne låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:254
+#: apt-pkg/contrib/fileutl.cc:256
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:259
+#: apt-pkg/contrib/fileutl.cc:261
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Får ikke låst %s"
 
-#: apt-pkg/contrib/fileutl.cc:396 apt-pkg/contrib/fileutl.cc:510
+#: apt-pkg/contrib/fileutl.cc:398 apt-pkg/contrib/fileutl.cc:512
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:430
+#: apt-pkg/contrib/fileutl.cc:432
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:448
+#: apt-pkg/contrib/fileutl.cc:450
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:457
+#: apt-pkg/contrib/fileutl.cc:459
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:844
+#: apt-pkg/contrib/fileutl.cc:862
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok et minnefeilsignal."
 
-#: apt-pkg/contrib/fileutl.cc:846
+#: apt-pkg/contrib/fileutl.cc:864
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok signalet %u."
 
-#: apt-pkg/contrib/fileutl.cc:850 apt-pkg/contrib/gpgv.cc:243
+#: apt-pkg/contrib/fileutl.cc:868 apt-pkg/contrib/gpgv.cc:243
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s ga en feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:236
+#: apt-pkg/contrib/fileutl.cc:870 apt-pkg/contrib/gpgv.cc:236
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avsluttet uventet"
 
-#: apt-pkg/contrib/fileutl.cc:988
+#: apt-pkg/contrib/fileutl.cc:1016
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikke åpne fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1065
+#: apt-pkg/contrib/fileutl.cc:1093
 #, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikke åpne fildeskriptor %d"
 
-#: apt-pkg/contrib/fileutl.cc:1150
+#: apt-pkg/contrib/fileutl.cc:1178
 msgid "Failed to create subprocess IPC"
 msgstr "Klarte ikke å opprette underprosessen IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1205
+#: apt-pkg/contrib/fileutl.cc:1233
 msgid "Failed to exec compressor "
 msgstr "Klarte ikke å kjøre komprimeringen"
 
-#: apt-pkg/contrib/fileutl.cc:1298
+#: apt-pkg/contrib/fileutl.cc:1326
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
 
-#: apt-pkg/contrib/fileutl.cc:1385 apt-pkg/contrib/fileutl.cc:1407
+#: apt-pkg/contrib/fileutl.cc:1413 apt-pkg/contrib/fileutl.cc:1435
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
 
-#: apt-pkg/contrib/fileutl.cc:1695
+#: apt-pkg/contrib/fileutl.cc:1726
 #, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved låsing av fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1707
+#: apt-pkg/contrib/fileutl.cc:1738
 #, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved endring av navn på fila %s til %s"
 
-#: apt-pkg/contrib/fileutl.cc:1718
+#: apt-pkg/contrib/fileutl.cc:1749
 #, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenke til fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1731
+#: apt-pkg/contrib/fileutl.cc:1762
 msgid "Problem syncing the file"
 msgstr "Problem ved oppdatering av fila"
 
@@ -2736,12 +2689,12 @@ msgstr "Klarte ikke å åpne StateFile %s"
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikke å skrive midlertidig StateFile %s"
 
-#: apt-pkg/tagfile.cc:129
+#: apt-pkg/tagfile.cc:138
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr "Klarer ikke å fortolke pakkefila %s (1)"
 
-#: apt-pkg/tagfile.cc:216
+#: apt-pkg/tagfile.cc:231
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr "Klarer ikke å fortolke pakkefila %s (2)"
@@ -2816,7 +2769,7 @@ msgstr "Feil på %u i kildelista %s (type)"
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
 
-#: apt-pkg/packagemanager.cc:297 apt-pkg/packagemanager.cc:923
+#: apt-pkg/packagemanager.cc:296 apt-pkg/packagemanager.cc:922
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
@@ -2825,12 +2778,12 @@ msgstr ""
 "Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf "
 "under APT::Immediate-Configure for detaljer. (%d)"
 
-#: apt-pkg/packagemanager.cc:498 apt-pkg/packagemanager.cc:529
+#: apt-pkg/packagemanager.cc:497 apt-pkg/packagemanager.cc:528
 #, fuzzy, c-format
 msgid "Could not configure '%s'. "
 msgstr "Klarte ikke åpne fila «%s»"
 
-#: apt-pkg/packagemanager.cc:571
+#: apt-pkg/packagemanager.cc:570
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2853,7 +2806,7 @@ msgid ""
 msgstr ""
 "Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
 
-#: apt-pkg/algorithms.cc:1238
+#: apt-pkg/algorithms.cc:1068
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2861,19 +2814,10 @@ msgstr ""
 "Feil, pkgProblemResolver::Resolve skapte et brudd, det kan skyldes pakker "
 "som holdes tilbake."
 
-#: apt-pkg/algorithms.cc:1240
+#: apt-pkg/algorithms.cc:1070
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
 
-#: apt-pkg/algorithms.cc:1592 apt-pkg/algorithms.cc:1594
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
-"ble brukt isteden. "
-
 #: apt-pkg/acquire.cc:81 apt-pkg/cdrom.cc:838
 #, c-format
 msgid "List directory %spartial is missing."
@@ -2916,12 +2860,12 @@ msgstr "Metoden %s startet ikke korrekt"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
 
-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:143
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet «%s» støttes ikke"
 
-#: apt-pkg/init.cc:167
+#: apt-pkg/init.cc:159
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarer ikke bestemme en passende pakkesystemtype"
 
@@ -2955,17 +2899,17 @@ msgid ""
 "available in the sources"
 msgstr ""
 
-#: apt-pkg/policy.cc:399
+#: apt-pkg/policy.cc:410
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode"
 
-#: apt-pkg/policy.cc:421
+#: apt-pkg/policy.cc:432
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Forsto ikke spikring av typen %s"
 
-#: apt-pkg/policy.cc:429
+#: apt-pkg/policy.cc:440
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) spesifisert for pin"
 
@@ -3032,45 +2976,49 @@ msgstr "IO-feil ved lagring av kildekode-lager"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:599
-msgid "MD5Sum mismatch"
-msgstr "Feil MD5sum"
-
-#: apt-pkg/acquire-item.cc:870 apt-pkg/acquire-item.cc:1887
-#: apt-pkg/acquire-item.cc:2030
+#: apt-pkg/acquire-item.cc:154
 msgid "Hash Sum mismatch"
 msgstr "Hashsummen stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:1388
+#: apt-pkg/acquire-item.cc:159
+msgid "Size mismatch"
+msgstr "Feil størrelse"
+
+#: apt-pkg/acquire-item.cc:164
+#, fuzzy
+msgid "Invalid file format"
+msgstr "Ugyldig operasjon %s"
+
+#: apt-pkg/acquire-item.cc:1419
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1404
+#: apt-pkg/acquire-item.cc:1435
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarer ikke å fortolke Release-fila %s"
 
-#: apt-pkg/acquire-item.cc:1446
+#: apt-pkg/acquire-item.cc:1477
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
 
-#: apt-pkg/acquire-item.cc:1484
+#: apt-pkg/acquire-item.cc:1515
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1506
+#: apt-pkg/acquire-item.cc:1537
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
 
-#: apt-pkg/acquire-item.cc:1536
+#: apt-pkg/acquire-item.cc:1567
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -3080,12 +3028,12 @@ msgstr ""
 "forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1546 apt-pkg/acquire-item.cc:1551
+#: apt-pkg/acquire-item.cc:1577 apt-pkg/acquire-item.cc:1582
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG-feil: %s: %s"
 
-#: apt-pkg/acquire-item.cc:1663
+#: apt-pkg/acquire-item.cc:1705
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -3094,31 +3042,23 @@ msgstr ""
 "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
 "selv (fordi arkitekturen mangler)."
 
-#: apt-pkg/acquire-item.cc:1722
+#: apt-pkg/acquire-item.cc:1771
 #, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package."
+msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
-"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
-"pakken selv."
 
-#: apt-pkg/acquire-item.cc:1781
+#: apt-pkg/acquire-item.cc:1829
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
 
-#: apt-pkg/acquire-item.cc:1879
-msgid "Size mismatch"
-msgstr "Feil størrelse"
-
-#: apt-pkg/indexrecords.cc:68
+#: apt-pkg/indexrecords.cc:73
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Klarer ikke å fortolke Release-fila %s"
 
-#: apt-pkg/indexrecords.cc:78
+#: apt-pkg/indexrecords.cc:81
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "Ingen avsnitt i Release-fila %s"
@@ -3263,32 +3203,32 @@ msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
 msgid "Hash mismatch for: %s"
 msgstr "Hashsummen stemmer ikke for: %s"
 
-#: apt-pkg/cacheset.cc:403
+#: apt-pkg/cacheset.cc:467
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Utgave «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/cacheset.cc:406
+#: apt-pkg/cacheset.cc:470
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versjon «%s» av «%s» ble ikke funnet"
 
-#: apt-pkg/cacheset.cc:517
+#: apt-pkg/cacheset.cc:581
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr "Klarte ikke å finne oppgave «%s»"
 
-#: apt-pkg/cacheset.cc:523
+#: apt-pkg/cacheset.cc:587
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr "Klarte ikke finne noen pakken med regex «%s»"
 
-#: apt-pkg/cacheset.cc:534
+#: apt-pkg/cacheset.cc:598
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
 
-#: apt-pkg/cacheset.cc:541 apt-pkg/cacheset.cc:548
+#: apt-pkg/cacheset.cc:605 apt-pkg/cacheset.cc:612
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
@@ -3297,20 +3237,20 @@ msgstr ""
 "Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
 "har ingen av dem"
 
-#: apt-pkg/cacheset.cc:555
+#: apt-pkg/cacheset.cc:619
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 "Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
 
-#: apt-pkg/cacheset.cc:563
+#: apt-pkg/cacheset.cc:627
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 "Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
 "kandidat"
 
-#: apt-pkg/cacheset.cc:571
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
@@ -3337,109 +3277,132 @@ msgstr ""
 msgid "Execute external solver"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:73
+#: apt-pkg/install-progress.cc:50
+#, c-format
+msgid "Progress: [%3i%%]"
+msgstr ""
+
+#: apt-pkg/install-progress.cc:84 apt-pkg/install-progress.cc:167
+msgid "Running dpkg"
+msgstr "Kjører dpkg"
+
+#: apt-pkg/update.cc:110 apt-pkg/update.cc:112
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
+msgstr ""
+"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
+"ble brukt isteden. "
+
+#: apt-pkg/deb/dpkgpm.cc:90
 #, c-format
 msgid "Installing %s"
 msgstr "Installerer %s"
 
-#: apt-pkg/deb/dpkgpm.cc:74 apt-pkg/deb/dpkgpm.cc:982
+#: apt-pkg/deb/dpkgpm.cc:91 apt-pkg/deb/dpkgpm.cc:977
 #, c-format
 msgid "Configuring %s"
 msgstr "Setter opp %s"
 
-#: apt-pkg/deb/dpkgpm.cc:75 apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/deb/dpkgpm.cc:92 apt-pkg/deb/dpkgpm.cc:984
 #, c-format
 msgid "Removing %s"
 msgstr "Fjerner %s"
 
-#: apt-pkg/deb/dpkgpm.cc:76
+#: apt-pkg/deb/dpkgpm.cc:93
 #, c-format
 msgid "Completely removing %s"
 msgstr "Fjerner %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:77
+#: apt-pkg/deb/dpkgpm.cc:94
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "Legger merke til at %s forsvinner"
 
-#: apt-pkg/deb/dpkgpm.cc:78
+#: apt-pkg/deb/dpkgpm.cc:95
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Kjører etter-installasjonsutløser %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:735
+#: apt-pkg/deb/dpkgpm.cc:808
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Mappa «%s» mangler"
 
-#: apt-pkg/deb/dpkgpm.cc:750 apt-pkg/deb/dpkgpm.cc:770
+#: apt-pkg/deb/dpkgpm.cc:823 apt-pkg/deb/dpkgpm.cc:845
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikke åpne fila «%s»"
 
-#: apt-pkg/deb/dpkgpm.cc:975
+#: apt-pkg/deb/dpkgpm.cc:970
 #, c-format
 msgid "Preparing %s"
 msgstr "Forbereder %s"
 
-#: apt-pkg/deb/dpkgpm.cc:976
+#: apt-pkg/deb/dpkgpm.cc:971
 #, c-format
 msgid "Unpacking %s"
 msgstr "Pakker ut %s"
 
-#: apt-pkg/deb/dpkgpm.cc:981
+#: apt-pkg/deb/dpkgpm.cc:976
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Forbereder oppsett av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:983
+#: apt-pkg/deb/dpkgpm.cc:978
 #, c-format
 msgid "Installed %s"
 msgstr "Installerte %s"
 
-#: apt-pkg/deb/dpkgpm.cc:988
+#: apt-pkg/deb/dpkgpm.cc:983
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Forbereder fjerning av %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:985
 #, c-format
 msgid "Removed %s"
 msgstr "Fjernet %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/deb/dpkgpm.cc:990
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Forbereder å fullstendig slette %s"
 
-#: apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/deb/dpkgpm.cc:991
 #, c-format
 msgid "Completely removed %s"
 msgstr "Fjernet %s fullstendig"
 
-#: apt-pkg/deb/dpkgpm.cc:1243
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
+#: apt-pkg/deb/dpkgpm.cc:1041 apt-pkg/deb/dpkgpm.cc:1062
+#, fuzzy, c-format
+msgid "Can not write log (%s)"
+msgstr "Kan ikke skrive til %s"
+
+#: apt-pkg/deb/dpkgpm.cc:1041
+msgid "Is /dev/pts mounted?"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1273
-msgid "Running dpkg"
-msgstr "Kjører dpkg"
+#: apt-pkg/deb/dpkgpm.cc:1062
+msgid "Is stdout a terminal?"
+msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1445
+#: apt-pkg/deb/dpkgpm.cc:1545
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1507
+#: apt-pkg/deb/dpkgpm.cc:1607
 msgid "No apport report written because MaxReports is reached already"
 msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1512
+#: apt-pkg/deb/dpkgpm.cc:1612
 msgid "dependency problems - leaving unconfigured"
 msgstr "avhengighetsproblemer - lar den være uoppsatt"
 
-#: apt-pkg/deb/dpkgpm.cc:1514
+#: apt-pkg/deb/dpkgpm.cc:1614
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
@@ -3447,7 +3410,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
 "følgefeil fra en tidligere feil."
 
-#: apt-pkg/deb/dpkgpm.cc:1520
+#: apt-pkg/deb/dpkgpm.cc:1620
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
@@ -3455,7 +3418,7 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
 "feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1526
+#: apt-pkg/deb/dpkgpm.cc:1627
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
@@ -3463,7 +3426,16 @@ msgstr ""
 "Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
 "minne»-feil"
 
-#: apt-pkg/deb/dpkgpm.cc:1533
+#: apt-pkg/deb/dpkgpm.cc:1634 apt-pkg/deb/dpkgpm.cc:1640
+#, fuzzy
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
+"feil"
+
+#: apt-pkg/deb/dpkgpm.cc:1661
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
@@ -3494,6 +3466,95 @@ msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
 msgid "Not locked"
 msgstr "Ikke låst"
 
+#~ msgid "Note, selecting '%s' for task '%s'\n"
+#~ msgstr "Merk, velger «%s» for oppgaven «%s»\n"
+
+#~ msgid "Note, selecting '%s' for regex '%s'\n"
+#~ msgstr "Merk, velger «%s» for det regulære uttrykket «%s»\n"
+
+#~ msgid "Package %s is a virtual package provided by:\n"
+#~ msgstr "Pakken %s er en virtuell pakke, som oppfylt av:\n"
+
+#~ msgid " [Not candidate version]"
+#~ msgstr " [Ikke versjonskandidat]"
+
+#~ msgid "You should explicitly select one to install."
+#~ msgstr "Du må velge en pakke som skal installeres."
+
+#~ msgid ""
+#~ "Package %s is not available, but is referred to by another package.\n"
+#~ "This may mean that the package is missing, has been obsoleted, or\n"
+#~ "is only available from another source\n"
+#~ msgstr ""
+#~ "Pakken %s er ikke tilgjengelig, men en annen pakke henviser til den.\n"
+#~ "Dette kan bety at pakken mangler, er utgått, eller bare finnes \n"
+#~ "tilgjengelig fra en annen kilde.\n"
+
+#~ msgid "However the following packages replace it:"
+#~ msgstr "Følgende pakker erstatter den imidlertid:"
+
+#~ msgid "Package '%s' has no installation candidate"
+#~ msgstr "Pakken «%s» har ingen installasjonskandidat"
+
+#~ msgid "Virtual packages like '%s' can't be removed\n"
+#~ msgstr "Virtuelle pakker som «%s» kan ikke fjernes\n"
+
+#, fuzzy
+#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+#~ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+
+#, fuzzy
+#~ msgid "Package '%s' is not installed, so not removed\n"
+#~ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
+
+#~ msgid "Note, selecting '%s' instead of '%s'\n"
+#~ msgstr "Merk, velger «%s» istedenfor «%s»\n"
+
+#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+#~ msgstr ""
+#~ "Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
+
+#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+#~ msgstr ""
+#~ "Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
+#~ "ønsket.\n"
+
+#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#~ msgstr ""
+#~ "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
+
+#~ msgid "%s is already the newest version.\n"
+#~ msgstr "%s er allerede nyeste versjon.\n"
+
+#~ msgid "Selected version '%s' (%s) for '%s'\n"
+#~ msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
+
+#, fuzzy
+#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+#~ msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
+
+#~ msgid "Ignore unavailable target release '%s' of package '%s'"
+#~ msgstr "Ignorer utilgjengelig målutgave «%s» av pakke «%s»"
+
+#~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
+#~ msgstr ""
+#~ "Dette er ikke et gyldig DEB-arkiv, det har ikke noe «%s»-, «%s»- eller "
+#~ "«%s»-medlem"
+
+#~ msgid "MD5Sum mismatch"
+#~ msgstr "Feil MD5sum"
+
+#~ msgid ""
+#~ "I wasn't able to locate a file for the %s package. This might mean you "
+#~ "need to manually fix this package."
+#~ msgstr ""
+#~ "Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne "
+#~ "denne pakken selv."
+
+#~ msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#~ msgstr ""
+#~ "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
+
 #~ msgid "Skipping nonexistent file %s"
 #~ msgstr "Hopper over den ikke-eksisterende fila %s"