Merge branch 'debian/experimental' into feature/srv-records

Conflicts:
	cmdline/apt-helper.cc
	cmdline/makefile

1 files changed, 1442 insertions, 1360 deletions

diff --git a/po/nn.po b/po/nn.po
index bf5e0ae07..b3622b6cd 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,14 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-04-25 13:17+0200\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\n"
 "PO-Revision-Date: 2005-02-14 23:30+0100\n"
 "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n"
-"Language: \n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.9.1\n"
 
 #: cmdline/apt-cache.cc:149
@@ -24,152 +25,148 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "Pakken %s versjon %s har eit krav som ikkje er oppfylt:\n"
 
-#: cmdline/apt-cache.cc:277
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr "Tal på pakkenamn: "
 
-#: cmdline/apt-cache.cc:279
+#: cmdline/apt-cache.cc:322
 #, fuzzy
 msgid "Total package structures: "
 msgstr "Tal på pakkenamn: "
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr "  Vanlege pakkar: "
 
-#: cmdline/apt-cache.cc:320
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr "  Reine virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:321
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr "  Enkle virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:322
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr "  Samansette virtuelle pakkar: "
 
-#: cmdline/apt-cache.cc:323
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr "  Manglar: "
 
-#: cmdline/apt-cache.cc:325
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr "Tal på einskildversjonar: "
 
-#: cmdline/apt-cache.cc:327
+#: cmdline/apt-cache.cc:370
 #, fuzzy
 msgid "Total distinct descriptions: "
 msgstr "Tal på einskildversjonar: "
 
-#: cmdline/apt-cache.cc:329
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr "Tal på krav: "
 
-#: cmdline/apt-cache.cc:332
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr "Tal på ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:334
+#: cmdline/apt-cache.cc:377
 #, fuzzy
 msgid "Total Desc/File relations: "
 msgstr "Tal på ver./fil-forhold: "
 
-#: cmdline/apt-cache.cc:336
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr "Tal på tilbyr-forhold: "
 
-#: cmdline/apt-cache.cc:348
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr "Tal på strengar med jokerteikn: "
 
-#: cmdline/apt-cache.cc:362
-msgid "Total dependency version space: "
-msgstr "Storleik på kravs- og versjonsrom: "
-
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr "Slingringsmon: "
 
-#: cmdline/apt-cache.cc:375
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
-#: cmdline/apt-cache.cc:506 cmdline/apt-cache.cc:1155
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 
-#: cmdline/apt-cache.cc:584 cmdline/apt-cache.cc:1441
-#: cmdline/apt-cache.cc:1443 cmdline/apt-cache.cc:1520 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr "Fann ingen pakkar"
 
-#: cmdline/apt-cache.cc:1254
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Du må oppgi nøyaktig eitt mnster"
 
-#: cmdline/apt-cache.cc:1420
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1515 apt-pkg/cacheset.cc:594
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 
-#: cmdline/apt-cache.cc:1545
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1552 cmdline/apt-cache.cc:1643
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr "Mellomlageret er ute av takt, kan ikkje x-referera ei pakkefil"
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1566
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1578 cmdline/apt-cache.cc:1623
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
-#: cmdline/apt-cache.cc:1586
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1605 cmdline/apt-cache.cc:1613
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1620
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1629
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1742 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1578 cmdline/apt-helper.cc:58 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:217
-#: ftparchive/apt-ftparchive.cc:600 cmdline/apt-internal-solver.cc:42
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s %s kompilert på %s %s\n"
 
-#: cmdline/apt-cache.cc:1749
+#: cmdline/apt-cache.cc:1834
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
@@ -242,11 +239,11 @@ msgstr ""
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 "Du finn meir informasjon på manualsidene apt-cache(8) og apt.conf(5).\n"
 
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
 #, fuzzy
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
@@ -254,12 +251,12 @@ msgstr ""
 " «%s»\n"
 "i stasjonen «%s» og trykk Enter.\n"
 
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
 #, fuzzy, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr "Klarte ikkje endra namnet på %s til %s"
 
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
 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.\n"
@@ -267,7 +264,7 @@ msgid ""
 "mount point."
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -303,78 +300,79 @@ msgstr ""
 "  -c=? Les denne oppsettsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
-#: cmdline/apt-get.cc:245
+#: cmdline/apt-get.cc:224
 #, fuzzy, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:311
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:314
 #, fuzzy, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:367
+#: cmdline/apt-get.cc:358
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Klarte ikkje få status på kjeldepakkelista %s"
 
-#: cmdline/apt-get.cc:423
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:454
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:459 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
+#: apt-private/private-install.cc:863
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:461 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:469 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:538 cmdline/apt-get.cc:546
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: cmdline/apt-get.cc:574 cmdline/apt-get.cc:611
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:726
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
 
-#: cmdline/apt-get.cc:765 cmdline/apt-get.cc:1058
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:787
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -382,115 +380,114 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:833
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 
-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:864
-#: apt-private/private-install.cc:186 apt-private/private-install.cc:189
-#, fuzzy, c-format
-msgid "Couldn't determine free space in %s"
-msgstr "Du har ikkje nok ledig plass i %s"
-
-#: cmdline/apt-get.cc:874
-#, c-format
-msgid "You don't have enough free space in %s"
-msgstr "Du har ikkje 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:883
+#: cmdline/apt-get.cc:863
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Må henta %sB/%sB med kjeldekodearkiv.\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:888
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Må henta %sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:917 apt-private/private-install.cc:313
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
-#: cmdline/apt-get.cc:942
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Hoppar over utpakking av kjeldekode som er utpakka frå før i %s\n"
 
-#: cmdline/apt-get.cc:954
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
 
-#: cmdline/apt-get.cc:955
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 
-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:1021
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Du må velja minst ein pakke som byggjekrava skal sjekkast for"
 
-#: cmdline/apt-get.cc:1046
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1070 cmdline/apt-get.cc:1073
+#: cmdline/apt-get.cc:1047
+#, c-format
+msgid "Note, using directory '%s' to get the build dependencies\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1057
+#, fuzzy, c-format
+msgid "Note, using file '%s' to get the build dependencies\n"
+msgstr "Klarte ikkje behandla byggjekrava"
+
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:1263
+#: cmdline/apt-get.cc:1279
 #, 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 ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:1281
+#: cmdline/apt-get.cc:1297
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:1304
+#: cmdline/apt-get.cc:1320
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny"
 
-#: cmdline/apt-get.cc:1343
+#: cmdline/apt-get.cc:1359
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
@@ -499,37 +496,37 @@ msgstr ""
 "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon "
 "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava"
 
-#: cmdline/apt-get.cc:1349
+#: cmdline/apt-get.cc:1365
 #, fuzzy, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst"
 
-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:1387
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:1392
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:1485 cmdline/apt-get.cc:1497
+#: cmdline/apt-get.cc:1501 cmdline/apt-get.cc:1516
 #, fuzzy, c-format
 msgid "Changelog for %s (%s)"
 msgstr "Koplar til %s (%s)"
 
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1615
 msgid "Supported modules:"
 msgstr "Støtta modular:"
 
-#: cmdline/apt-get.cc:1624
+#: cmdline/apt-get.cc:1656
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -615,16 +612,20 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
-#: cmdline/apt-helper.cc:35
+#: cmdline/apt-helper.cc:36
+msgid "Need one URL as argument"
+msgstr ""
+
+#: cmdline/apt-helper.cc:49
 #, fuzzy
 msgid "Must specify at least one pair url/filename"
 msgstr "Du må velja minst éin pakke som kjeldekoden skal hentast for"
 
-#: cmdline/apt-helper.cc:52
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:65
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -633,57 +634,58 @@ msgid ""
 "\n"
 "Commands:\n"
 "   download-file - download the given uri to the target-path\n"
+"   auto-detect-proxy - detect proxy using apt.conf\n"
 "\n"
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
 #, fuzzy, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "men er ikkje installert"
 
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
 #, fuzzy, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
 #, fuzzy, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
 #, fuzzy, c-format
 msgid "%s was already set on hold.\n"
 msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
 #, fuzzy, c-format
 msgid "%s was already not hold.\n"
 msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339
-#: apt-pkg/contrib/fileutl.cc:815 apt-pkg/contrib/gpgv.cc:219
-#: apt-pkg/deb/dpkgpm.cc:1201
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
+#: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta på %s, men den fanst ikkje"
 
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
 #, fuzzy, c-format
 msgid "%s set on hold.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
 #, fuzzy, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "Klarte ikkje opna %s"
 
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -760,16 +762,16 @@ msgstr ""
 msgid "Disk not found."
 msgstr "Fann ikkje fila"
 
-#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:278
+#: methods/cdrom.cc:262 methods/file.cc:83 methods/rsh.cc:281
 msgid "File not found"
 msgstr "Fann ikkje fila"
 
-#: methods/copy.cc:47 methods/gzip.cc:117 methods/rred.cc:598
+#: methods/copy.cc:61 methods/gzip.cc:127 methods/rred.cc:598
 #: methods/rred.cc:608
 msgid "Failed to stat"
 msgstr "Klarte ikkje få status"
 
-#: methods/copy.cc:83 methods/gzip.cc:124 methods/rred.cc:605
+#: methods/copy.cc:113 methods/gzip.cc:134 methods/rred.cc:605
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 
@@ -778,34 +780,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "Ugyldig URI. Lokale URI-ar kan ikkje starta med //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:177
+#: methods/ftp.cc:178
 msgid "Logging in"
 msgstr "Loggar inn"
 
-#: methods/ftp.cc:183
+#: methods/ftp.cc:184
 msgid "Unable to determine the peer name"
 msgstr "Klarte ikkje avgjera namnet på motparten"
 
-#: methods/ftp.cc:188
+#: methods/ftp.cc:189
 msgid "Unable to determine the local name"
 msgstr "Klarte ikkje avgjera det lokale namnet"
 
-#: methods/ftp.cc:219 methods/ftp.cc:247
+#: methods/ftp.cc:220 methods/ftp.cc:248
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Tenaren nekta oss å kopla til, og sa: %s"
 
-#: methods/ftp.cc:225
+#: methods/ftp.cc:226
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:232
+#: methods/ftp.cc:233
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:252
+#: methods/ftp.cc:253
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -813,123 +815,123 @@ msgstr ""
 "Ein mellomtenar er oppgitt, men ikkje noko innloggingsskript. Feltet "
 "«Acquire::ftp::ProxyLogin» er tomt."
 
-#: methods/ftp.cc:280
+#: methods/ftp.cc:281
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr "Kommandoen «%s» i innlogginsskriptet mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:306
+#: methods/ftp.cc:307
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:344 methods/ftp.cc:456 methods/rsh.cc:195 methods/rsh.cc:240
+#: methods/ftp.cc:345 methods/ftp.cc:457 methods/rsh.cc:195 methods/rsh.cc:243
 msgid "Connection timeout"
 msgstr "Tidsavbrot på samband"
 
-#: methods/ftp.cc:350
+#: methods/ftp.cc:351
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
-#: methods/ftp.cc:353 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1478
-#: apt-pkg/contrib/fileutl.cc:1487 apt-pkg/contrib/fileutl.cc:1492
-#: apt-pkg/contrib/fileutl.cc:1494
+#: methods/ftp.cc:354 methods/rsh.cc:202 apt-pkg/contrib/fileutl.cc:1515
+#: apt-pkg/contrib/fileutl.cc:1524 apt-pkg/contrib/fileutl.cc:1529
+#: apt-pkg/contrib/fileutl.cc:1531
 msgid "Read error"
 msgstr "Lesefeil"
 
-#: methods/ftp.cc:360 methods/rsh.cc:209
+#: methods/ftp.cc:361 methods/rsh.cc:209
 msgid "A response overflowed the buffer."
 msgstr "Eit svar flaumde over bufferen."
 
-#: methods/ftp.cc:377 methods/ftp.cc:389
+#: methods/ftp.cc:378 methods/ftp.cc:390
 msgid "Protocol corruption"
 msgstr "Protokolløydeleggjing"
 
-#: methods/ftp.cc:462 methods/rsh.cc:246 apt-pkg/contrib/fileutl.cc:875
-#: apt-pkg/contrib/fileutl.cc:1600 apt-pkg/contrib/fileutl.cc:1609
-#: apt-pkg/contrib/fileutl.cc:1614 apt-pkg/contrib/fileutl.cc:1616
-#: apt-pkg/contrib/fileutl.cc:1641
+#: methods/ftp.cc:463 methods/rsh.cc:249 apt-pkg/contrib/fileutl.cc:911
+#: apt-pkg/contrib/fileutl.cc:1637 apt-pkg/contrib/fileutl.cc:1646
+#: apt-pkg/contrib/fileutl.cc:1651 apt-pkg/contrib/fileutl.cc:1653
+#: apt-pkg/contrib/fileutl.cc:1678
 msgid "Write error"
 msgstr "Skrivefeil"
 
-#: methods/ftp.cc:701 methods/ftp.cc:707 methods/ftp.cc:742
+#: methods/ftp.cc:702 methods/ftp.cc:708 methods/ftp.cc:743
 msgid "Could not create a socket"
 msgstr "Klarte ikkje oppretta sokkel"
 
-#: methods/ftp.cc:712
+#: methods/ftp.cc:713
 msgid "Could not connect data socket, connection timed out"
 msgstr "Klarte ikkje kopla til datasokkel, tidsavbrot på sambandet"
 
-#: methods/ftp.cc:716 methods/connect.cc:116 apt-private/private-upgrade.cc:28
+#: methods/ftp.cc:717 methods/connect.cc:116
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: methods/ftp.cc:718
+#: methods/ftp.cc:719
 msgid "Could not connect passive socket."
 msgstr "Klarte ikkje kopla til passiv sokkel."
 
-#: methods/ftp.cc:735
+#: methods/ftp.cc:736
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "getaddrinfo klarte ikkje oppretta ein lyttesokkel"
 
-#: methods/ftp.cc:749
+#: methods/ftp.cc:750
 msgid "Could not bind a socket"
 msgstr "Klarte ikkje binda til sokkel"
 
-#: methods/ftp.cc:753
+#: methods/ftp.cc:754
 msgid "Could not listen on the socket"
 msgstr "Klarte ikkje lytta til sokkel"
 
-#: methods/ftp.cc:760
+#: methods/ftp.cc:761
 msgid "Could not determine the socket's name"
 msgstr "Klarte ikkje avgjera sokkelnamnet"
 
-#: methods/ftp.cc:792
+#: methods/ftp.cc:793
 msgid "Unable to send PORT command"
 msgstr "Klarte ikkje senda PORT-kommandoen"
 
-#: methods/ftp.cc:802
+#: methods/ftp.cc:803
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Ukjend adressefamilie %u (AF_*)"
 
-#: methods/ftp.cc:811
+#: methods/ftp.cc:812
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT mislukkast, tenaren sa: %s"
 
-#: methods/ftp.cc:831
+#: methods/ftp.cc:832
 msgid "Data socket connect timed out"
 msgstr "Tidsavbrot på tilkopling til datasokkel"
 
-#: methods/ftp.cc:838
+#: methods/ftp.cc:839
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:877 methods/server.cc:352 methods/rsh.cc:316
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
-#: methods/ftp.cc:890
+#: methods/ftp.cc:892
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Klarte ikkje henta fila, tenaren sa «%s»"
 
-#: methods/ftp.cc:905 methods/rsh.cc:335
+#: methods/ftp.cc:907 methods/rsh.cc:338
 msgid "Data socket timed out"
 msgstr "Tidsavbrot på datasokkelen"
 
-#: methods/ftp.cc:935
+#: methods/ftp.cc:944
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Dataoverføringa mislukkast, tenaren sa «%s»"
 
 #. Get the files information
-#: methods/ftp.cc:1014
+#: methods/ftp.cc:1027
 msgid "Query"
 msgstr "Spørjing"
 
-#: methods/ftp.cc:1128
+#: methods/ftp.cc:1141
 msgid "Unable to invoke "
 msgstr "Klarte ikkje starta "
 
@@ -965,7 +967,7 @@ msgstr "Klarte ikkje kopla til %s:%s (%s)."
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
-#: methods/connect.cc:154 methods/rsh.cc:439
+#: methods/connect.cc:154 methods/rsh.cc:442
 #, c-format
 msgid "Connecting to %s"
 msgstr "Koplar til %s"
@@ -995,208 +997,367 @@ msgstr "Det hende noko dumt ved oppslag av «%s:%s» (%i)"
 msgid "Unable to connect to %s:%s:"
 msgstr "Klarte ikkje kopla til %s %s:"
 
-#: methods/gpgv.cc:168
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:172
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:174
-msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:164
+msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:180
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:184
-msgid "Unknown error executing gpgv"
+#: methods/gpgv.cc:174
+msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:217 methods/gpgv.cc:224
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 #, fuzzy
 msgid "The following signatures were invalid:\n"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
-#: methods/gpgv.cc:231
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgstr ""
 
-#: methods/gzip.cc:69
+#: methods/gzip.cc:79
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:508
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:522
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:524
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 
-#: methods/http.cc:560
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:620
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:625
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr "Tidsavbrot på sambandet"
 
-#: methods/http.cc:648
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/server.cc:51
+#: methods/server.cc:52
 msgid "Waiting for headers"
 msgstr "Ventar på hovud"
 
-#: methods/server.cc:109
+#: methods/server.cc:111
 msgid "Bad header line"
 msgstr "Øydelagd hovudlinje"
 
-#: methods/server.cc:134 methods/server.cc:141
+#: methods/server.cc:136 methods/server.cc:143
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 
-#: methods/server.cc:171
+#: methods/server.cc:173
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
 
-#: methods/server.cc:194
+#: methods/server.cc:193
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
 
-#: methods/server.cc:196
+#: methods/server.cc:195
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
 
-#: methods/server.cc:220
+#: methods/server.cc:219
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/server.cc:489
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 
-#: methods/server.cc:506 methods/server.cc:562
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/server.cc:654
+#: methods/server.cc:589
+#, c-format
+msgid ""
+"Automatically disabled %s due to incorrect response from server/proxy. (man "
+"5 apt.conf)"
+msgstr ""
+
+#: methods/server.cc:712
 msgid "Internal error"
 msgstr "Intern feil"
 
-#: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "Treff "
-
-#: apt-private/acqprogress.cc:90
-msgid "Get:"
-msgstr "Hent:"
-
-#: apt-private/acqprogress.cc:121
-msgid "Ign "
-msgstr "Ign "
-
-#: apt-private/acqprogress.cc:125
-msgid "Err "
-msgstr "Feil "
-
-#: apt-private/acqprogress.cc:146
-#, c-format
-msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Henta %sB på %s (%sB/s)\n"
-
-#: apt-private/acqprogress.cc:236
-#, c-format
-msgid " [Working]"
-msgstr " [Arbeider]"
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
 
-#: apt-private/acqprogress.cc:297
+#: apt-private/private-list.cc:151
 #, c-format
-msgid ""
-"Media change: please insert the disc labeled\n"
-" '%s'\n"
-"in the drive '%s' and press enter\n"
-msgstr ""
-"Skifte av medum: Set inn plata merkt\n"
-" «%s»\n"
-"i stasjonen «%s» og trykk Enter.\n"
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
 
-#: apt-private/private-cachefile.cc:93
+#: apt-private/private-cachefile.cc:95
 msgid "Correcting dependencies..."
 msgstr "Rettar på krav ..."
 
-#: apt-private/private-cachefile.cc:96
+#: apt-private/private-cachefile.cc:98
 msgid " failed."
 msgstr " mislukkast."
 
-#: apt-private/private-cachefile.cc:99
+#: apt-private/private-cachefile.cc:101
 msgid "Unable to correct dependencies"
 msgstr "Klarte ikkje retta på krav"
 
-#: apt-private/private-cachefile.cc:102
+#: apt-private/private-cachefile.cc:104
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarte ikkje minimera oppgraderingsmengda"
 
-#: apt-private/private-cachefile.cc:104
+#: apt-private/private-cachefile.cc:106
 msgid " Done"
 msgstr " Ferdig"
 
-#: apt-private/private-cachefile.cc:108
+#: apt-private/private-cachefile.cc:110
 msgid "You might want to run 'apt-get -f install' to correct these."
 msgstr ""
 "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
 
-#: apt-private/private-cachefile.cc:111
+#: apt-private/private-cachefile.cc:113
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»."
 
-#: apt-private/private-cacheset.cc:35 apt-private/private-search.cc:47
-msgid "Sorting"
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
 msgstr ""
 
-#: apt-private/private-download.cc:31
-msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
+#: apt-private/private-output.cc:265
+#, fuzzy, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr " [Installert]"
 
-#: apt-private/private-download.cc:35
-msgid "Authentication warning overridden.\n"
+#: apt-private/private-output.cc:268
+#, fuzzy
+msgid "[installed,local]"
+msgstr " [Installert]"
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
 msgstr ""
 
-#: apt-private/private-download.cc:40 apt-private/private-download.cc:47
-msgid "Some packages could not be authenticated"
-msgstr "Nokre pakkar kunne ikkje bli autentisert"
+#: apt-private/private-output.cc:272
+#, fuzzy
+msgid "[installed,automatic]"
+msgstr " [Installert]"
 
-#: apt-private/private-download.cc:45
-msgid "Install these packages without verification?"
-msgstr "Installer desse pakkane utan verifikasjon?"
+#: apt-private/private-output.cc:274
+#, fuzzy
+msgid "[installed]"
+msgstr " [Installert]"
 
-#: apt-private/private-download.cc:54 apt-private/private-install.cc:209
-msgid "There are problems and -y was used without --force-yes"
-msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
 
-#: apt-private/private-download.cc:86 apt-pkg/update.cc:77
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "Klarte ikkje henta %s  %s\n"
+msgid "but %s is installed"
+msgstr "men %s er installert"
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr "men %s skal installerast"
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr "men lèt seg ikkje installera"
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr "men er ein virtuell pakke"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr "men er ikkje installert"
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr "men skal ikkje installerast"
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr " eller"
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr "Dei følgjande NYE pakkane vil verta installerte:"
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr "Dei følgjande pakkane vil verta FJERNA:"
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr "Dei følgjande pakkane er haldne tilbake:"
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr "Dei følgjande pakkane vil verta oppgraderte:"
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr "%s (fordi %s) "
+
+#: apt-private/private-output.cc:696
+#, fuzzy
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+"ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n"
+"Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr "%lu oppgraderte, %lu nyleg installerte, "
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr "%lu installerte på nytt, "
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr "%lu nedgraderte, "
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr "%lu ikkje fullstendig installerte eller fjerna.\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:761
+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:767
+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:778
+msgid "Y"
+msgstr "J"
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr "N"
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr "Regex-kompileringsfeil - %s"
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr "Oppdateringskommandoen tek ingen argument"
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
+#: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
+msgid "Sorting"
+msgstr ""
+
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+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 ""
 
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
@@ -1243,23 +1404,22 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 
-#: apt-private/private-install.cc:199
-#, c-format
-msgid "You don't have enough free space in %s."
-msgstr "Du har ikkje nok ledig plass i %s."
+#: apt-private/private-install.cc:185 apt-private/private-download.cc:117
+msgid "There are problems and -y was used without --force-yes"
+msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
 
-#: apt-private/private-install.cc:215 apt-private/private-install.cc:237
+#: apt-private/private-install.cc:191 apt-private/private-install.cc:213
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling."
 
 #. 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:219
+#: apt-private/private-install.cc:195
 msgid "Yes, do as I say!"
 msgstr "Ja, gjer som eg seier!"
 
-#: apt-private/private-install.cc:221
+#: apt-private/private-install.cc:197
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -1270,19 +1430,19 @@ msgstr ""
 "For å halda fram, må du skriva nøyaktig «%s».\n"
 " ?] "
 
-#: apt-private/private-install.cc:227 apt-private/private-install.cc:245
+#: apt-private/private-install.cc:203 apt-private/private-install.cc:221
 msgid "Abort."
 msgstr "Avbryt."
 
-#: apt-private/private-install.cc:242
+#: apt-private/private-install.cc:218
 msgid "Do you want to continue?"
 msgstr "Vil du halda fram?"
 
-#: apt-private/private-install.cc:312
+#: apt-private/private-install.cc:288
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: apt-private/private-install.cc:319
+#: apt-private/private-install.cc:295
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1290,19 +1450,19 @@ msgstr ""
 "Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller "
 "«--fix-missing»."
 
-#: apt-private/private-install.cc:323
+#: apt-private/private-install.cc:299
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida"
 
-#: apt-private/private-install.cc:328
+#: apt-private/private-install.cc:304
 msgid "Unable to correct missing packages."
 msgstr "Klarte ikkje retta opp manglande pakkar."
 
-#: apt-private/private-install.cc:329
+#: apt-private/private-install.cc:305
 msgid "Aborting install."
 msgstr "Avbryt installasjon."
 
-#: apt-private/private-install.cc:365
+#: apt-private/private-install.cc:341
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1312,15 +1472,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:369
+#: apt-private/private-install.cc:345
 msgid "Note: This is done automatically and on purpose by dpkg."
 msgstr ""
 
-#: apt-private/private-install.cc:390
+#: apt-private/private-install.cc:366
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: apt-private/private-install.cc:498
+#: apt-private/private-install.cc:474
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1336,16 +1496,16 @@ msgstr ""
 #. "that package should be filed.") << std::endl;
 #. }
 #.
-#: apt-private/private-install.cc:501 apt-private/private-install.cc:642
+#: apt-private/private-install.cc:477 apt-private/private-install.cc:627
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
 
-#: apt-private/private-install.cc:505
+#: apt-private/private-install.cc:481
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: apt-private/private-install.cc:512
+#: apt-private/private-install.cc:488
 #, fuzzy
 msgid ""
 "The following package was automatically installed and is no longer required:"
@@ -1355,7 +1515,7 @@ msgid_plural ""
 msgstr[0] "Dei følgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
 
-#: apt-private/private-install.cc:516
+#: apt-private/private-install.cc:492
 #, fuzzy, c-format
 msgid "%lu package was automatically installed and is no longer required.\n"
 msgid_plural ""
@@ -1363,18 +1523,18 @@ msgid_plural ""
 msgstr[0] "Dei følgjande NYE pakkane vil verta installerte:"
 msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
 
-#: apt-private/private-install.cc:518
+#: apt-private/private-install.cc:494
 msgid "Use 'apt-get autoremove' to remove it."
 msgid_plural "Use 'apt-get autoremove' to remove them."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apt-private/private-install.cc:612
+#: apt-private/private-install.cc:587
 msgid "You might want to run 'apt-get -f install' to correct these:"
 msgstr ""
 "Du vil kanskje prøva å retta på desse ved å køyra «apt-get -f install»."
 
-#: apt-private/private-install.cc:614
+#: apt-private/private-install.cc:589
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1382,7 +1542,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
 "ei løysing)."
 
-#: apt-private/private-install.cc:627
+#: apt-private/private-install.cc:612
 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"
@@ -1394,223 +1554,104 @@ msgstr ""
 "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
 "er laga enno eller at dei framleis ligg i «Incoming»."
 
-#: apt-private/private-install.cc:648
+#: apt-private/private-install.cc:633
 msgid "Broken packages"
 msgstr "Øydelagde pakkar"
 
-#: apt-private/private-install.cc:701
+#: apt-private/private-install.cc:710
 msgid "The following extra packages will be installed:"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
-#: apt-private/private-install.cc:791
+#: apt-private/private-install.cc:800
 msgid "Suggested packages:"
 msgstr "Føreslåtte pakkar:"
 
-#: apt-private/private-install.cc:792
+#: apt-private/private-install.cc:801
 msgid "Recommended packages:"
 msgstr "Tilrådde pakkar"
 
-#: apt-private/private-list.cc:131
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:164
+#: apt-private/private-install.cc:823
 #, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-main.cc:23
-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!"
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
+"Hoppar over %s, for den er installert frå før og ikkje sett til "
+"oppgradering.\n"
 
-#: apt-private/private-output.cc:81 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:211
+#: apt-private/private-install.cc:827
 #, fuzzy, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:215
-#, fuzzy
-msgid "[installed,local]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:218
-msgid "[installed,auto-removable]"
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
 msgstr ""
+"Hoppar over %s, for den er installert frå før og ikkje sett til "
+"oppgradering.\n"
 
-#: apt-private/private-output.cc:220
-#, fuzzy
-msgid "[installed,automatic]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:222
-#, fuzzy
-msgid "[installed]"
-msgstr " [Installert]"
-
-#: apt-private/private-output.cc:226
+#: apt-private/private-install.cc:839
 #, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n"
 
-#: apt-private/private-output.cc:230
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:330
-msgid "The following packages have unmet dependencies:"
-msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
-
-#: apt-private/private-output.cc:420
+#: apt-private/private-install.cc:844
 #, c-format
-msgid "but %s is installed"
-msgstr "men %s er installert"
-
-#: apt-private/private-output.cc:422
-#, c-format
-msgid "but %s is to be installed"
-msgstr "men %s skal installerast"
-
-#: apt-private/private-output.cc:429
-msgid "but it is not installable"
-msgstr "men lèt seg ikkje installera"
-
-#: apt-private/private-output.cc:431
-msgid "but it is a virtual package"
-msgstr "men er ein virtuell pakke"
-
-#: apt-private/private-output.cc:434
-msgid "but it is not installed"
-msgstr "men er ikkje installert"
-
-#: apt-private/private-output.cc:434
-msgid "but it is not going to be installed"
-msgstr "men skal ikkje installerast"
-
-#: apt-private/private-output.cc:439
-msgid " or"
-msgstr " eller"
-
-#: apt-private/private-output.cc:468
-msgid "The following NEW packages will be installed:"
-msgstr "Dei følgjande NYE pakkane vil verta installerte:"
-
-#: apt-private/private-output.cc:494
-msgid "The following packages will be REMOVED:"
-msgstr "Dei følgjande pakkane vil verta FJERNA:"
+msgid "%s is already the newest version.\n"
+msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 
-#: apt-private/private-output.cc:516
-msgid "The following packages have been kept back:"
-msgstr "Dei følgjande pakkane er haldne tilbake:"
+#: apt-private/private-install.cc:892
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
 
-#: apt-private/private-output.cc:537
-msgid "The following packages will be upgraded:"
-msgstr "Dei følgjande pakkane vil verta oppgraderte:"
+#: apt-private/private-install.cc:897
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
 
-#: apt-private/private-output.cc:558
-msgid "The following packages will be DOWNGRADED:"
-msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
+#. TRANSLATORS: Note, this is not an interactive question
+#: apt-private/private-install.cc:939
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
+msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
-#: apt-private/private-output.cc:578
-msgid "The following held packages will be changed:"
-msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
+#: apt-private/private-install.cc:945
+#, fuzzy, c-format
+msgid "Package '%s' is not installed, so not removed\n"
+msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
-#: apt-private/private-output.cc:633
+#: apt-private/private-download.cc:62
 #, c-format
-msgid "%s (due to %s) "
-msgstr "%s (fordi %s) "
-
-#: apt-private/private-output.cc:641
-#, fuzzy
 msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
+"Can't drop privileges for downloading as file '%s' couldn't be accessed by "
+"user '%s'."
 msgstr ""
-"ÅTVARING: Dei følgjande nødvendige pakkane vil verta fjerna.\n"
-"Dette bør IKKJE gjerast utan at du er fullstendig klar over kva du gjer!"
-
-#: apt-private/private-output.cc:672
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr "%lu oppgraderte, %lu nyleg installerte, "
-
-#: apt-private/private-output.cc:676
-#, c-format
-msgid "%lu reinstalled, "
-msgstr "%lu installerte på nytt, "
-
-#: apt-private/private-output.cc:678
-#, c-format
-msgid "%lu downgraded, "
-msgstr "%lu nedgraderte, "
-
-#: apt-private/private-output.cc:680
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
-
-#: apt-private/private-output.cc:684
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikkje fullstendig installerte eller fjerna.\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:706
-msgid "[Y/n]"
-msgstr "[J/n]"
+#: apt-private/private-download.cc:94
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
 
-#. 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:712
-msgid "[y/N]"
-msgstr "[j/N]"
+#: apt-private/private-download.cc:98
+msgid "Authentication warning overridden.\n"
+msgstr ""
 
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:723
-msgid "Y"
-msgstr "J"
+#: apt-private/private-download.cc:103 apt-private/private-download.cc:110
+msgid "Some packages could not be authenticated"
+msgstr "Nokre pakkar kunne ikkje bli autentisert"
 
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:729
-msgid "N"
-msgstr "N"
+#: apt-private/private-download.cc:108
+msgid "Install these packages without verification?"
+msgstr "Installer desse pakkane utan verifikasjon?"
 
-#: apt-private/private-output.cc:751 apt-pkg/cachefilter.cc:35
+#: apt-private/private-download.cc:149 apt-pkg/update.cc:77
 #, c-format
-msgid "Regex compilation error - %s"
-msgstr "Regex-kompileringsfeil - %s"
+msgid "Failed to fetch %s  %s\n"
+msgstr "Klarte ikkje henta %s  %s\n"
 
-#: apt-private/private-search.cc:51
-msgid "Full Text Search"
-msgstr ""
+#: apt-private/private-download.cc:171 apt-private/private-download.cc:174
+#, fuzzy, c-format
+msgid "Couldn't determine free space in %s"
+msgstr "Du har ikkje nok ledig plass i %s"
 
-#: apt-private/private-show.cc:156
+#: apt-private/private-download.cc:188
 #, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
+msgid "You don't have enough free space in %s."
+msgstr "Du har ikkje nok ledig plass i %s."
 
 #: apt-private/private-sources.cc:58
 #, fuzzy, c-format
@@ -1622,37 +1663,61 @@ msgstr "Klarte ikkje endra namnet på %s til %s"
 msgid "Your '%s' file changed, please run 'apt-get update'."
 msgstr ""
 
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr "Oppdateringskommandoen tek ingen argument"
+#: apt-private/private-search.cc:69
+msgid "Full Text Search"
+msgstr ""
 
-#: apt-private/private-upgrade.cc:25
-msgid "Calculating upgrade... "
-msgstr "Reknar ut oppgradering ... "
+#: apt-private/acqprogress.cc:66
+msgid "Hit "
+msgstr "Treff "
 
-#: apt-private/private-upgrade.cc:30
-#, fuzzy
-msgid "Internal error, Upgrade broke stuff"
-msgstr "Intern feil. AllUpgrade øydelagde noko"
+#: apt-private/acqprogress.cc:88
+msgid "Get:"
+msgstr "Hent:"
 
-#: apt-private/private-upgrade.cc:32
-msgid "Done"
-msgstr "Ferdig"
+#: apt-private/acqprogress.cc:119
+msgid "Ign "
+msgstr "Ign "
+
+#: apt-private/acqprogress.cc:126
+msgid "Err "
+msgstr "Feil "
+
+#: apt-private/acqprogress.cc:150
+#, c-format
+msgid "Fetched %sB in %s (%sB/s)\n"
+msgstr "Henta %sB på %s (%sB/s)\n"
+
+#: apt-private/acqprogress.cc:240
+#, c-format
+msgid " [Working]"
+msgstr " [Arbeider]"
+
+#: apt-private/acqprogress.cc:301
+#, c-format
+msgid ""
+"Media change: please insert the disc labeled\n"
+" '%s'\n"
+"in the drive '%s' and press enter\n"
+msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" «%s»\n"
+"i stasjonen «%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:471 apt-pkg/acquire.cc:491
-#: apt-pkg/clean.cc:40 apt-pkg/init.cc:102 apt-pkg/init.cc:110
-#: apt-pkg/policy.cc:381 apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/cdromutl.cc:205 apt-pkg/contrib/fileutl.cc:371
-#: apt-pkg/contrib/fileutl.cc:484
+#: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:497
-#: apt-pkg/acquire.cc:522 apt-pkg/clean.cc:46 apt-pkg/clean.cc:64
-#: apt-pkg/clean.cc:127 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1686,7 +1751,7 @@ msgstr ""
 msgid "Failed to create IPC pipe to subprocess"
 msgstr "Klarte ikkje oppretta IPC-røyr til underprosessen"
 
-#: methods/rsh.cc:343
+#: methods/rsh.cc:346
 msgid "Connection closed prematurely"
 msgstr "Sambandet vart uventa stengd"
 
@@ -1726,7 +1791,7 @@ msgstr "er viktige. Rett opp dei feila og [i]nstaller på nytt."
 msgid "Merging available information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: cmdline/apt-extracttemplates.cc:224
+#: cmdline/apt-extracttemplates.cc:229
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1750,45 +1815,46 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
-#: cmdline/apt-extracttemplates.cc:254
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
 #, fuzzy, c-format
 msgid "Unable to mkstemp %s"
 msgstr "Klarte ikkje få status til %s"
 
-#: cmdline/apt-extracttemplates.cc:259 apt-pkg/pkgcachegen.cc:1400
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
+#: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Klarte ikkje skriva til %s"
 
-#: cmdline/apt-extracttemplates.cc:300
+#: cmdline/apt-extracttemplates.cc:305
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
 
-#: ftparchive/apt-ftparchive.cc:180 ftparchive/apt-ftparchive.cc:358
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
 msgid "Package extension list is too long"
 msgstr "Lista over pakkeutvidingar er for lang"
 
-#: ftparchive/apt-ftparchive.cc:182 ftparchive/apt-ftparchive.cc:199
-#: ftparchive/apt-ftparchive.cc:222 ftparchive/apt-ftparchive.cc:273
-#: ftparchive/apt-ftparchive.cc:287 ftparchive/apt-ftparchive.cc:309
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
 #, c-format
 msgid "Error processing directory %s"
 msgstr "Feil ved lesing av katalogen %s"
 
-#: ftparchive/apt-ftparchive.cc:271
+#: ftparchive/apt-ftparchive.cc:280
 msgid "Source extension list is too long"
 msgstr "Lista over kjeldeutvidingar er for lang"
 
-#: ftparchive/apt-ftparchive.cc:388
+#: ftparchive/apt-ftparchive.cc:400
 msgid "Error writing header to contents file"
 msgstr "Feil ved skriving av topptekst til innhaldsfila"
 
-#: ftparchive/apt-ftparchive.cc:418
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Feil ved lesing av %s"
 
-#: ftparchive/apt-ftparchive.cc:606
+#: ftparchive/apt-ftparchive.cc:625
 #, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
@@ -1868,136 +1934,141 @@ msgstr ""
 "  -c=?  Les denne oppsettsfila.\n"
 "  -o=? Set ei vilkårleg innstilling."
 
-#: ftparchive/apt-ftparchive.cc:812
+#: ftparchive/apt-ftparchive.cc:821
 msgid "No selections matched"
 msgstr "Ingen utval passa"
 
-#: ftparchive/apt-ftparchive.cc:890
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Enkelte filer manglar i pakkefilgruppa %s"
 
-#: ftparchive/cachedb.cc:51
+#: ftparchive/cachedb.cc:67
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr "Databasen er øydelagd. Filnamnet er endra til %s.old"
 
-#: ftparchive/cachedb.cc:69
+#: ftparchive/cachedb.cc:85
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr "DB er for gammal, forsøkjer å oppgradere %s"
 
-#: ftparchive/cachedb.cc:80
+#: ftparchive/cachedb.cc:96
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
-#: ftparchive/cachedb.cc:85
+#: ftparchive/cachedb.cc:101
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr "Klarte ikkje opna DB-fila %s: %s"
 
-#: ftparchive/cachedb.cc:131 apt-inst/extract.cc:186 apt-inst/extract.cc:199
+#: ftparchive/cachedb.cc:184 apt-inst/extract.cc:186 apt-inst/extract.cc:199
 #: apt-inst/extract.cc:216
 #, c-format
 msgid "Failed to stat %s"
 msgstr "Klarte ikkje få status til %s"
 
-#: ftparchive/cachedb.cc:253
+#: ftparchive/cachedb.cc:326
+#, fuzzy
+msgid "Failed to read .dsc"
+msgstr "Klarte ikkje lesa lenkja %s"
+
+#: ftparchive/cachedb.cc:359
 msgid "Archive has no control record"
 msgstr "Arkivet har ingen kontrollpost"
 
-#: ftparchive/cachedb.cc:494
+#: ftparchive/cachedb.cc:526
 msgid "Unable to get a cursor"
 msgstr "Klarte ikkje få peikar"
 
-#: ftparchive/writer.cc:91
+#: ftparchive/writer.cc:104
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr "Å: Klarte ikkje lesa katalogen %s\n"
 
-#: ftparchive/writer.cc:96
+#: ftparchive/writer.cc:109
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr "Å: Klarte ikkje få status til %s\n"
 
-#: ftparchive/writer.cc:152
+#: ftparchive/writer.cc:165
 msgid "E: "
 msgstr "F: "
 
-#: ftparchive/writer.cc:154
+#: ftparchive/writer.cc:167
 msgid "W: "
 msgstr "Å: "
 
-#: ftparchive/writer.cc:161
+#: ftparchive/writer.cc:174
 msgid "E: Errors apply to file "
 msgstr "F: Det er feil ved fila "
 
-#: ftparchive/writer.cc:179 ftparchive/writer.cc:211
+#: ftparchive/writer.cc:192 ftparchive/writer.cc:224
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Klarte ikkje slå opp %s"
 
-#: ftparchive/writer.cc:192
+#: ftparchive/writer.cc:205
 msgid "Tree walking failed"
 msgstr "Treklatring mislukkast"
 
-#: ftparchive/writer.cc:219
+#: ftparchive/writer.cc:232
 #, c-format
 msgid "Failed to open %s"
 msgstr "Klarte ikkje opna %s"
 
-#: ftparchive/writer.cc:278
+#: ftparchive/writer.cc:291
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr " DeLink %s [%s]\n"
 
-#: ftparchive/writer.cc:286
+#: ftparchive/writer.cc:299
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "Klarte ikkje lesa lenkja %s"
 
-#: ftparchive/writer.cc:290
+#: ftparchive/writer.cc:303
 #, c-format
 msgid "Failed to unlink %s"
 msgstr "Klarte ikkje oppheva lenkja %s"
 
-#: ftparchive/writer.cc:298
+#: ftparchive/writer.cc:311
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr "*** Klarte ikkje lenkja %s til %s"
 
-#: ftparchive/writer.cc:308
+#: ftparchive/writer.cc:321
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-grensa på %sB er nådd.\n"
 
-#: ftparchive/writer.cc:413
+#: ftparchive/writer.cc:427
 msgid "Archive had no package field"
 msgstr "Arkivet har ikkje noko pakkefelt"
 
-#: ftparchive/writer.cc:421 ftparchive/writer.cc:711
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har inga overstyringsoppføring\n"
 
-#: ftparchive/writer.cc:489 ftparchive/writer.cc:855
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
 
-#: ftparchive/writer.cc:721
+#: ftparchive/writer.cc:712
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har inga overstyringsoppføring\n"
 
-#: ftparchive/writer.cc:725
+#: ftparchive/writer.cc:716
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s har inga overstyringsoppføring\n"
 
-#: ftparchive/contents.cc:340 ftparchive/contents.cc:371
+#: ftparchive/contents.cc:351 ftparchive/contents.cc:382
 msgid "realloc - Failed to allocate memory"
 msgstr "realloc - Klarte ikkje tildela minne"
 
@@ -2078,7 +2149,7 @@ msgstr "Problem ved oppheving av lenkje til %s"
 msgid "Failed to rename %s to %s"
 msgstr "Klarte ikkje endra namnet på %s til %s"
 
-#: cmdline/apt-internal-solver.cc:46
+#: cmdline/apt-internal-solver.cc:51
 #, fuzzy
 msgid ""
 "Usage: apt-internal-solver\n"
@@ -2103,11 +2174,11 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
 msgid "Unknown package record!"
 msgstr "Ukjend pakkeoppslag"
 
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -2131,248 +2202,449 @@ msgstr ""
 "  -c=? Les denne oppsettsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
-#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
-#, fuzzy, c-format
-msgid "Failed to write file %s"
-msgstr "Klarte ikkje skriva fila %s"
-
-#: apt-inst/dirstream.cc:105
+#: apt-pkg/install-progress.cc:59
 #, c-format
-msgid "Failed to close file %s"
-msgstr "Klarte ikkje lukka fila %s"
+msgid "Progress: [%3i%%]"
+msgstr ""
 
-#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
-#, c-format
-msgid "The path %s is too long"
-msgstr "Stigen %s er for lang"
+#: apt-pkg/install-progress.cc:93 apt-pkg/install-progress.cc:176
+msgid "Running dpkg"
+msgstr ""
 
-#: apt-inst/extract.cc:132
+#: apt-pkg/init.cc:156
 #, c-format
-msgid "Unpacking %s more than once"
-msgstr "Pakkar ut %s meir enn éin gong"
+msgid "Packaging system '%s' is not supported"
+msgstr "Pakkesystemet «%s» er ikkje støtta"
 
-#: apt-inst/extract.cc:142
+#: apt-pkg/init.cc:172
+msgid "Unable to determine a suitable packaging system type"
+msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
+
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:775
 #, c-format
-msgid "The directory %s is diverted"
-msgstr "Katalogen %s er avleidd"
+msgid "Wrote %i records.\n"
+msgstr "Skreiv %i postar.\n"
 
-#: apt-inst/extract.cc:152
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:777
 #, c-format
-msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Pakken prøver å skriva til avleiingsmålet %s/%s"
+msgid "Wrote %i records with %i missing files.\n"
+msgstr "Skreiv %i postar med %i manglande filer.\n"
 
-#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
-msgid "The diversion path is too long"
-msgstr "Avleiingsstigen er for lang"
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:780
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
 
-#: apt-inst/extract.cc:249
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:783
 #, c-format
-msgid "The directory %s is being replaced by a non-directory"
-msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
 
-#: apt-inst/extract.cc:289
-msgid "Failed to locate node in its hash bucket"
-msgstr "Fann ikkje noden i nøkkelbøtta"
+#: apt-pkg/indexcopy.cc:515
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
 
-#: apt-inst/extract.cc:293
-msgid "The path is too long"
-msgstr "Stigen er for lang"
+#: apt-pkg/indexcopy.cc:521
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Feil MD5-sum"
 
-#: apt-inst/extract.cc:421
+#: apt-pkg/acquire-worker.cc:133
 #, c-format
-msgid "Overwrite package match with no version for %s"
-msgstr "Skriv over pakketreff utan versjon for %s"
+msgid "The method driver %s could not be found."
+msgstr "Finn ikkje metodedrivaren %s."
 
-#: apt-inst/extract.cc:438
+#: apt-pkg/acquire-worker.cc:135
 #, c-format
-msgid "File %s/%s overwrites the one in the package %s"
-msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
+msgid "Is the package %s installed?"
+msgstr ""
 
-#: apt-inst/extract.cc:498
+#: apt-pkg/acquire-worker.cc:186
 #, c-format
-msgid "Unable to stat %s"
-msgstr "Klarte ikkje få status til %s"
+msgid "Method %s did not start correctly"
+msgstr "Metoden %s starta ikkje rett"
 
-#: apt-inst/filelist.cc:380
-msgid "DropNode called on still linked node"
-msgstr "DropNode vart kalla på ein node som framleis er lenkja"
+#: apt-pkg/acquire-worker.cc:485
+#, fuzzy, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+"Skifte av medum: Set inn plata merkt\n"
+" «%s»\n"
+"i stasjonen «%s» og trykk Enter.\n"
 
-#: apt-inst/filelist.cc:412
-msgid "Failed to locate the hash element!"
-msgstr "Fann ikkje nøkkelelementet."
+#: apt-pkg/cachefile.cc:94
+msgid "The package lists or status file could not be parsed or opened."
+msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
 
-#: apt-inst/filelist.cc:459
-msgid "Failed to allocate diversion"
-msgstr "Klarte ikkje tildela avleiing"
+#: apt-pkg/cachefile.cc:98
+msgid "You may want to run apt-get update to correct these problems"
+msgstr ""
+"Du vil kanskje prøva å retta på desse problema ved å køyra «apt-get update»."
 
-#: apt-inst/filelist.cc:464
-msgid "Internal error in AddDiversion"
-msgstr "Intern feil i AddDiversion"
+#: apt-pkg/cachefile.cc:116
+msgid "The list of sources could not be read."
+msgstr "Kjeldelista kan ikkje lesast."
 
-#: apt-inst/filelist.cc:477
-#, c-format
-msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Prøver å skriva over ei avleiing, %s -> %s og %s/%s"
+#: apt-pkg/pkgcache.cc:154
+msgid "Empty package cache"
+msgstr "Tomt pakkelager"
 
-#: apt-inst/filelist.cc:506
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
+msgid "The package cache file is corrupted"
+msgstr "Pakkelagerfila er øydelagd"
+
+#: apt-pkg/pkgcache.cc:165
+msgid "The package cache file is an incompatible version"
+msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
+
+#: apt-pkg/pkgcache.cc:168
+#, fuzzy
+msgid "The package cache file is corrupted, it is too small"
+msgstr "Pakkelagerfila er øydelagd"
+
+#: apt-pkg/pkgcache.cc:175
 #, c-format
-msgid "Double add of diversion %s -> %s"
-msgstr "Dobbel tilleggjing av avleiing %s -> %s"
+msgid "This APT does not support the versioning system '%s'"
+msgstr "APT støttar ikkje versjonssystemet «%s»"
 
-#: apt-inst/filelist.cc:549
+#: apt-pkg/pkgcache.cc:185
+#, fuzzy, c-format
+msgid "The package cache was built for different architectures: %s vs %s"
+msgstr "Pakkelageret er bygd for ein annan arkitektur"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Depends"
+msgstr "Krav"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "PreDepends"
+msgstr "Forkrav"
+
+#: apt-pkg/pkgcache.cc:322
+msgid "Suggests"
+msgstr "Forslag"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Recommends"
+msgstr "Tilrådingar"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Conflicts"
+msgstr "Konflikt"
+
+#: apt-pkg/pkgcache.cc:323
+msgid "Replaces"
+msgstr "Byter ut"
+
+#: apt-pkg/pkgcache.cc:324
+msgid "Obsoletes"
+msgstr "Foreldar"
+
+#: apt-pkg/pkgcache.cc:324
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:324
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:335
+msgid "important"
+msgstr "viktig"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "required"
+msgstr "påkravd"
+
+#: apt-pkg/pkgcache.cc:335
+msgid "standard"
+msgstr "vanleg"
+
+#: apt-pkg/pkgcache.cc:336
+msgid "optional"
+msgstr "valfri"
+
+#: apt-pkg/pkgcache.cc:336
+msgid "extra"
+msgstr "tillegg"
+
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
+msgid "Calculating upgrade"
+msgstr "Reknar ut oppgradering"
+
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "Duplicate conf file %s/%s"
-msgstr "Dobbel oppsettsfil %s/%s"
+msgid "Index file type '%s' is not supported"
+msgstr "Indeksfiltypen «%s» er ikkje støtta"
 
-#: apt-inst/contrib/arfile.cc:76
-msgid "Invalid archive signature"
-msgstr "Ugyldig arkivsignatur"
+#: apt-pkg/sourcelist.cc:127
+#, fuzzy, c-format
+msgid "Malformed stanza %u in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
 
-#: apt-inst/contrib/arfile.cc:84
-msgid "Error reading archive member header"
-msgstr "Feil ved lesing av arkivmedlemshovud"
+#: apt-pkg/sourcelist.cc:170
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-inst/contrib/arfile.cc:96
+#: apt-pkg/sourcelist.cc:173
 #, fuzzy, c-format
-msgid "Invalid archive member header %s"
-msgstr "Ugyldig arkivmedlemshovud"
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 
-#: apt-inst/contrib/arfile.cc:108
-msgid "Invalid archive member header"
-msgstr "Ugyldig arkivmedlemshovud"
+#: apt-pkg/sourcelist.cc:184
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-inst/contrib/arfile.cc:137
-msgid "Archive is too short"
-msgstr "Arkivet er for kort"
+#: apt-pkg/sourcelist.cc:190
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-inst/contrib/arfile.cc:141
-msgid "Failed to read the archive headers"
-msgstr "Klarte ikkje lesa arkivhovuda"
+#: apt-pkg/sourcelist.cc:193
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-inst/contrib/extracttar.cc:124
-msgid "Failed to create pipes"
-msgstr "Klarte ikkje oppretta røyr"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI)"
 
-#: apt-inst/contrib/extracttar.cc:151
-msgid "Failed to exec gzip "
-msgstr "Klarte ikkje køyra gzip "
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist)"
 
-#: apt-inst/contrib/extracttar.cc:188 apt-inst/contrib/extracttar.cc:218
-msgid "Corrupted archive"
-msgstr "Øydelagt arkiv"
+#: apt-pkg/sourcelist.cc:211
+#, c-format
+msgid "Malformed line %lu in source list %s (URI parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
 
-#: apt-inst/contrib/extracttar.cc:203
-msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
+#: apt-pkg/sourcelist.cc:217
+#, c-format
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
 
-#: apt-inst/contrib/extracttar.cc:308
+#: apt-pkg/sourcelist.cc:224
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "Ukjend TAR-hovud type %u, medlem %s"
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
 
-#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
-#: apt-inst/deb/debfile.cc:63
+#: apt-pkg/sourcelist.cc:335
 #, c-format
-msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar «%s»-medlemmen"
+msgid "Opening %s"
+msgstr "Opnar %s"
 
-#: apt-inst/deb/debfile.cc:132
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
 #, c-format
-msgid "Internal error, could not locate member %s"
-msgstr "Intern feil, fann ikkje medlemmen %s"
+msgid "Line %u too long in source list %s."
+msgstr "Linja %u i kjeldelista %s er for lang."
 
-#: apt-inst/deb/debfile.cc:227
-msgid "Unparsable control file"
-msgstr "Kontrollfila kan ikkje tolkast"
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr "Misforma linje %u i kjeldelista %s (type)"
 
-#: apt-pkg/acquire.cc:87 apt-pkg/cdrom.cc:816
+#: apt-pkg/sourcelist.cc:375
 #, fuzzy, c-format
-msgid "List directory %spartial is missing."
-msgstr "Listekatalogen %spartial manglar."
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
 
-#: apt-pkg/acquire.cc:91
+#: apt-pkg/sourcelist.cc:416
 #, fuzzy, c-format
-msgid "Archives directory %spartial is missing."
-msgstr "Arkivkatalogen %spartial manglar."
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
 
-#: apt-pkg/acquire.cc:99
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
 #, fuzzy, c-format
-msgid "Unable to lock directory %s"
-msgstr "Klarte ikkje låsa listekatalogen"
+msgid "Clean of %s is not supported"
+msgstr "Indeksfiltypen «%s» er ikkje støtta"
 
-#. only show the ETA if it makes sense
-#. two days
-#: apt-pkg/acquire.cc:899
+#: apt-pkg/clean.cc:64
 #, c-format
-msgid "Retrieving file %li of %li (%s remaining)"
-msgstr ""
+msgid "Unable to stat %s."
+msgstr "Klarte ikkje få status på %s."
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
 
-#: apt-pkg/acquire.cc:901
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
 #, fuzzy, c-format
-msgid "Retrieving file %li of %li"
-msgstr "Les filliste"
+msgid "Error occurred while processing %s (%s%d)"
+msgstr "Feil ved behandling av %s (FindPkg)"
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr "Jøss, du har overgått talet på pakkenamn som APT kan handtera."
 
-#: apt-pkg/acquire-item.cc:148 apt-pkg/contrib/fileutl.cc:2054
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:279
+#, fuzzy
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr "Jøss, du har overgått talet på krav som APT kan handtera."
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr "Klarte ikkje få status på kjeldepakkelista %s"
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr "Les pakkelister"
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr "Samlar inn filtilbod"
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr "IU-feil ved lagring av kjeldelager"
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:98
+msgid "Use --allow-insecure-repositories to force the update"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "endring av namn mislukkast, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:163
+#: apt-pkg/acquire-item.cc:240
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:168
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
-#: apt-pkg/acquire-item.cc:173
+#: apt-pkg/acquire-item.cc:250
 #, fuzzy
 msgid "Invalid file format"
 msgstr "Ugyldig operasjon %s"
 
-#: apt-pkg/acquire-item.cc:1579
+#: apt-pkg/acquire-item.cc:255
+#, fuzzy
+msgid "Signature error"
+msgstr "Skrivefeil"
+
+#: apt-pkg/acquire-item.cc:259
+msgid "Does not start with a cleartext signature"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1584
+#, c-format
+msgid ""
+"An error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"
+msgstr ""
+
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1707
+#, fuzzy, c-format
+msgid "The repository '%s' is no longer signed."
+msgstr "Katalogen %s er avleidd"
+
+#: apt-pkg/acquire-item.cc:1714
+msgid ""
+"This is normally not allowed, but the option Acquire::"
+"AllowDowngradeToInsecureRepositories was given to override it."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
+#, c-format
+msgid ""
+"The data from '%s' is not signed. Packages from that repository can not be "
+"authenticated."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1956
 #, 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:1595
+#: apt-pkg/acquire-item.cc:1975
 #, fuzzy, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/acquire-item.cc:1637
+#: apt-pkg/acquire-item.cc:1999
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1675
+#: apt-pkg/acquire-item.cc:2037
 #, 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:1697
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1727
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
-"An error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used. GPG error: %s: %s\n"
+"The repository '%s' does not have a Release file. This is deprecated, please "
+"contact the owner of the repository."
 msgstr ""
 
-#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1737 apt-pkg/acquire-item.cc:1742
-#, c-format
-msgid "GPG error: %s: %s"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:1865
+#: apt-pkg/acquire-item.cc:2249
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2381,183 +2653,161 @@ msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv "
 "(fordi arkitekturen manglar)."
 
-#: apt-pkg/acquire-item.cc:1931
+#: apt-pkg/acquire-item.cc:2315
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1989
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Pakkeindeksfilene er øydelagde. Feltet «Filename:» manglar for pakken %s."
 
-#: apt-pkg/acquire-worker.cc:116
+#: apt-pkg/vendorlist.cc:83
 #, c-format
-msgid "The method driver %s could not be found."
-msgstr "Finn ikkje metodedrivaren %s."
+msgid "Vendor block %s contains no fingerprint"
+msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
 
-#: apt-pkg/acquire-worker.cc:118
-#, c-format
-msgid "Is the package %s installed?"
-msgstr ""
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."
+msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/acquire-worker.cc:169
-#, c-format
-msgid "Method %s did not start correctly"
-msgstr "Metoden %s starta ikkje rett"
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."
+msgstr "Arkivkatalogen %spartial manglar."
 
-#: apt-pkg/acquire-worker.cc:455
+#: apt-pkg/acquire.cc:162
 #, fuzzy, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr ""
-"Skifte av medum: Set inn plata merkt\n"
-" «%s»\n"
-"i stasjonen «%s» og trykk Enter.\n"
+msgid "Unable to lock directory %s"
+msgstr "Klarte ikkje låsa listekatalogen"
 
-#: apt-pkg/algorithms.cc:265
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:981
 #, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
-msgstr "Pakken %s må installerast på nytt, men arkivet finst ikkje."
-
-#: apt-pkg/algorithms.cc:1086
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
-msgstr ""
-"Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar "
-"som er haldne tilbake."
-
-#: apt-pkg/algorithms.cc:1088
-msgid "Unable to correct problems, you have held broken packages."
-msgstr ""
-"Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
-
-#: apt-pkg/cachefile.cc:94
-msgid "The package lists or status file could not be parsed or opened."
-msgstr "Klarte ikkje tolka eller opna pakkelista eller tilstandsfila."
-
-#: apt-pkg/cachefile.cc:98
-msgid "You may want to run apt-get update to correct these problems"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
-"Du vil kanskje prøva å retta på desse problema ved å køyra «apt-get update»."
 
-#: apt-pkg/cachefile.cc:116
-msgid "The list of sources could not be read."
-msgstr "Kjeldelista kan ikkje lesast."
+#: apt-pkg/acquire.cc:983
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Les filliste"
 
-#: apt-pkg/cacheset.cc:487
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Fann ikkje utgåva «%s» av «%s»"
+#: apt-pkg/srcrecords.cc:53
+msgid "You must put some 'source' URIs in your sources.list"
+msgstr "Du må leggja nokre kjelde-URI-ar i fila sources.list."
 
-#: apt-pkg/cacheset.cc:490
+#: apt-pkg/policy.cc:83
 #, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Fann ikkje versjonen «%s» av «%s»"
-
-#: apt-pkg/cacheset.cc:601
-#, fuzzy, c-format
-msgid "Couldn't find task '%s'"
-msgstr "Fann ikkje pakken %s"
-
-#: apt-pkg/cacheset.cc:607
-#, fuzzy, c-format
-msgid "Couldn't find any package by regex '%s'"
-msgstr "Fann ikkje pakken %s"
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
 
-#: apt-pkg/cacheset.cc:613
+#: apt-pkg/policy.cc:422
 #, fuzzy, c-format
-msgid "Couldn't find any package by glob '%s'"
-msgstr "Fann ikkje pakken %s"
+msgid "Invalid record in the preferences file %s, no Package header"
+msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
 
-#: apt-pkg/cacheset.cc:624
+#: apt-pkg/policy.cc:444
 #, c-format
-msgid "Can't select versions from package '%s' as it is purely virtual"
-msgstr ""
+msgid "Did not understand pin type %s"
+msgstr "Skjønar ikkje spikringstypen %s"
 
-#: apt-pkg/cacheset.cc:631 apt-pkg/cacheset.cc:638
+#: apt-pkg/policy.cc:452
+msgid "No priority (or zero) specified for pin"
+msgstr "Ingen prioritet (eller null) oppgitt for spiker"
+
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
 #, c-format
 msgid ""
-"Can't select installed nor candidate version from package '%s' as it has "
-"neither of them"
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:645
-#, c-format
-msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
+#, fuzzy, c-format
+msgid "Could not configure '%s'. "
+msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/cacheset.cc:653
+#: apt-pkg/packagemanager.cc:643
 #, c-format
-msgid "Can't select candidate version from package %s as it has no candidate"
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
+"Denne installasjonen vil verta nøydd til å mellombels fjerna den nødvendige "
+"pakken %s på grunn av ei konflikt/forkrav-løkkje. Dette er ofte uheldig, men "
+"om du verkeleg vil gjera det, kan du bruka innstillinga «APT::Force-"
+"LoopBreak»."
 
-#: apt-pkg/cacheset.cc:661
-#, c-format
-msgid "Can't select installed version from package %s as it is not installed"
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+#, fuzzy
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
+"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
+"filer er brukte i staden."
 
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
-msgstr "Linja %u i kjeldelista %s er for lang."
+#: apt-pkg/cdrom.cc:571
+msgid "Unmounting CD-ROM...\n"
+msgstr "Avmonterer CD-ROM ...\n"
 
-#: apt-pkg/cdrom.cc:577
+#: apt-pkg/cdrom.cc:586
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Brukar monteringspunktet %s for CD-ROM\n"
 
-#: apt-pkg/cdrom.cc:587 apt-pkg/cdrom.cc:657 apt-pkg/cdrom.cc:893
-msgid "Unmounting CD-ROM...\n"
-msgstr "Avmonterer CD-ROM ...\n"
-
-#: apt-pkg/cdrom.cc:592
+#: apt-pkg/cdrom.cc:599
 msgid "Waiting for disc...\n"
 msgstr "Ventar på disk ...\n"
 
-#: apt-pkg/cdrom.cc:602
+#: apt-pkg/cdrom.cc:609
 msgid "Mounting CD-ROM...\n"
 msgstr "Monterer CD-ROM ...\n"
 
-#: apt-pkg/cdrom.cc:610
+#: apt-pkg/cdrom.cc:620
 msgid "Identifying... "
 msgstr "Identifiserer ... "
 
-#: apt-pkg/cdrom.cc:648
+#: apt-pkg/cdrom.cc:662
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Lagra etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:672
+#: apt-pkg/cdrom.cc:680
 msgid "Scanning disc for index files...\n"
 msgstr "Leitar etter indeksfiler på disken ...\n"
 
-#: apt-pkg/cdrom.cc:722
+#: apt-pkg/cdrom.cc:734
 #, fuzzy, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and "
 "%zu signatures\n"
 msgstr "Fann %i pakkeindeksar, %i kjeldeindeksar og %i signaturar\n"
 
-#: apt-pkg/cdrom.cc:733
+#: apt-pkg/cdrom.cc:744
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:771
 #, fuzzy, c-format
 msgid "Found label '%s'\n"
 msgstr "Lagra etikett: %s \n"
 
-#: apt-pkg/cdrom.cc:789
+#: apt-pkg/cdrom.cc:800
 msgid "That is not a valid name, try again.\n"
 msgstr "Det er ikkje eit gyldig namn, prøv igjen.\n"
 
-#: apt-pkg/cdrom.cc:806
+#: apt-pkg/cdrom.cc:817
 #, c-format
 msgid ""
 "This disc is called: \n"
@@ -2566,22 +2816,36 @@ msgstr ""
 "Disken vert kalla: \n"
 "«%s»\n"
 
-#: apt-pkg/cdrom.cc:808
+#: apt-pkg/cdrom.cc:819
 msgid "Copying package lists..."
 msgstr "Kopierer pakkelister ..."
 
-#: apt-pkg/cdrom.cc:843
+#: apt-pkg/cdrom.cc:866
 msgid "Writing new source list\n"
 msgstr "Skriv ny kjeldeliste\n"
 
-#: apt-pkg/cdrom.cc:851
+#: apt-pkg/cdrom.cc:877
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppføringar for denne disken er:\n"
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/algorithms.cc:265
 #, c-format
-msgid "Unable to stat %s."
-msgstr "Klarte ikkje få status på %s."
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
+msgstr "Pakken %s må installerast på nytt, men arkivet finst ikkje."
+
+#: apt-pkg/algorithms.cc:1090
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
+msgstr ""
+"Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar "
+"som er haldne tilbake."
+
+#: apt-pkg/algorithms.cc:1092
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+"Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
 
 #: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
 msgid "Building dependency tree"
@@ -2600,631 +2864,259 @@ msgstr "Genererer kravforhold"
 msgid "Reading state information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/depcache.cc:252
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/depcache.cc:258
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikkje skriva fila %s"
 
-#: apt-pkg/edsp.cc:50 apt-pkg/edsp.cc:70
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:216
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:286
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:293
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:563 apt-pkg/edsp.cc:566 apt-pkg/edsp.cc:571
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:773
-#, c-format
-msgid "Wrote %i records.\n"
-msgstr "Skreiv %i postar.\n"
-
-#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:775
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
-msgstr "Skreiv %i postar med %i manglande filer.\n"
-
-#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:778
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
 #, c-format
-msgid "Wrote %i records with %i mismatched files\n"
-msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
+msgid "Unable to parse package file %s (%d)"
+msgstr "Klarte ikkje tolka pakkefila %s (%d)"
 
-#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:781
+#: apt-pkg/cacheset.cc:501
 #, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
-msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n"
+msgid "Release '%s' for '%s' was not found"
+msgstr "Fann ikkje utgåva «%s» av «%s»"
 
-#: apt-pkg/indexcopy.cc:515
+#: apt-pkg/cacheset.cc:504
 #, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:521
-#, fuzzy, c-format
-msgid "Hash mismatch for: %s"
-msgstr "Feil MD5-sum"
-
-#: apt-pkg/indexrecords.cc:78
-#, fuzzy, c-format
-msgid "Unable to parse Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
+msgid "Version '%s' for '%s' was not found"
+msgstr "Fann ikkje versjonen «%s» av «%s»"
 
-#: apt-pkg/indexrecords.cc:86
+#: apt-pkg/cacheset.cc:629
 #, fuzzy, c-format
-msgid "No sections in Release file %s"
-msgstr "Merk, vel %s i staden for %s\n"
-
-#: apt-pkg/indexrecords.cc:117
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
+msgid "Couldn't find task '%s'"
+msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/indexrecords.cc:130
+#: apt-pkg/cacheset.cc:635
 #, fuzzy, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig linje i avleiingsfila: %s"
+msgid "Couldn't find any package by regex '%s'"
+msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/indexrecords.cc:149
+#: apt-pkg/cacheset.cc:641
 #, fuzzy, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Klarte ikkje tolka pakkefila %s (1)"
-
-#: apt-pkg/init.cc:145
-#, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet «%s» er ikkje støtta"
-
-#: apt-pkg/init.cc:161
-msgid "Unable to determine a suitable packaging system type"
-msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
+msgid "Couldn't find any package by glob '%s'"
+msgstr "Fann ikkje pakken %s"
 
-#: apt-pkg/install-progress.cc:57
+#: apt-pkg/cacheset.cc:680
 #, c-format
-msgid "Progress: [%3i%%]"
-msgstr ""
-
-#: apt-pkg/install-progress.cc:91 apt-pkg/install-progress.cc:174
-msgid "Running dpkg"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:303 apt-pkg/packagemanager.cc:932
+#: apt-pkg/cacheset.cc:719
 #, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:504 apt-pkg/packagemanager.cc:535
-#, fuzzy, c-format
-msgid "Could not configure '%s'. "
-msgstr "Klarte ikkje opna fila %s"
-
-#: apt-pkg/packagemanager.cc:577
+#: apt-pkg/cacheset.cc:727
 #, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
-"Denne installasjonen vil verta nøydd til å mellombels fjerna den nødvendige "
-"pakken %s på grunn av ei konflikt/forkrav-løkkje. Dette er ofte uheldig, men "
-"om du verkeleg vil gjera det, kan du bruka innstillinga «APT::Force-"
-"LoopBreak»."
-
-#: apt-pkg/pkgcache.cc:155
-msgid "Empty package cache"
-msgstr "Tomt pakkelager"
-
-#: apt-pkg/pkgcache.cc:161
-msgid "The package cache file is corrupted"
-msgstr "Pakkelagerfila er øydelagd"
-
-#: apt-pkg/pkgcache.cc:166
-msgid "The package cache file is an incompatible version"
-msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
-
-#: apt-pkg/pkgcache.cc:169
-#, fuzzy
-msgid "The package cache file is corrupted, it is too small"
-msgstr "Pakkelagerfila er øydelagd"
 
-#: apt-pkg/pkgcache.cc:174
+#: apt-pkg/cacheset.cc:735
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
-msgstr "APT støttar ikkje versjonssystemet «%s»"
-
-#: apt-pkg/pkgcache.cc:179
-msgid "The package cache was built for a different architecture"
-msgstr "Pakkelageret er bygd for ein annan arkitektur"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Depends"
-msgstr "Krav"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "PreDepends"
-msgstr "Forkrav"
-
-#: apt-pkg/pkgcache.cc:321
-msgid "Suggests"
-msgstr "Forslag"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Recommends"
-msgstr "Tilrådingar"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Conflicts"
-msgstr "Konflikt"
-
-#: apt-pkg/pkgcache.cc:322
-msgid "Replaces"
-msgstr "Byter ut"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Obsoletes"
-msgstr "Foreldar"
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Breaks"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:323
-msgid "Enhances"
+msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:334
-msgid "important"
-msgstr "viktig"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "required"
-msgstr "påkravd"
-
-#: apt-pkg/pkgcache.cc:334
-msgid "standard"
-msgstr "vanleg"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "optional"
-msgstr "valfri"
-
-#: apt-pkg/pkgcache.cc:335
-msgid "extra"
-msgstr "tillegg"
-
-#: apt-pkg/pkgcachegen.cc:93
-msgid "Cache has an incompatible versioning system"
-msgstr "Mellomlageret brukar eit inkompatibelt versjonssystem"
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:224 apt-pkg/pkgcachegen.cc:234
-#: apt-pkg/pkgcachegen.cc:300 apt-pkg/pkgcachegen.cc:327
-#: apt-pkg/pkgcachegen.cc:340 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:517
-#: apt-pkg/pkgcachegen.cc:524 apt-pkg/pkgcachegen.cc:555
-#: apt-pkg/pkgcachegen.cc:569
-#, fuzzy, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr "Feil ved behandling av %s (FindPkg)"
-
-#: apt-pkg/pkgcachegen.cc:257
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Jøss, du har overgått talet på pakkenamn som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:260
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:263
-#, fuzzy
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jøss, du har overgått talet på versjonar som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:266
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Jøss, du har overgått talet på krav som APT kan handtera."
-
-#: apt-pkg/pkgcachegen.cc:576
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Fann ikkje pakken %s %s ved behandling av filkrav"
-
-#: apt-pkg/pkgcachegen.cc:1211
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr "Klarte ikkje få status på kjeldepakkelista %s"
-
-#: apt-pkg/pkgcachegen.cc:1299 apt-pkg/pkgcachegen.cc:1403
-#: apt-pkg/pkgcachegen.cc:1409 apt-pkg/pkgcachegen.cc:1566
-msgid "Reading package lists"
-msgstr "Les pakkelister"
-
-#: apt-pkg/pkgcachegen.cc:1316
-msgid "Collecting File Provides"
-msgstr "Samlar inn filtilbod"
-
-#: apt-pkg/pkgcachegen.cc:1508 apt-pkg/pkgcachegen.cc:1515
-msgid "IO Error saving source cache"
-msgstr "IU-feil ved lagring av kjeldelager"
-
-#: apt-pkg/pkgrecords.cc:38
-#, c-format
-msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiltypen «%s» er ikkje støtta"
-
-#: apt-pkg/policy.cc:83
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
 #, c-format
 msgid ""
-"The value '%s' is invalid for APT::Default-Release as such a release is not "
-"available in the sources"
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
 msgstr ""
 
-#: apt-pkg/policy.cc:422
-#, fuzzy, c-format
-msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud"
-
-#: apt-pkg/policy.cc:444
-#, c-format
-msgid "Did not understand pin type %s"
-msgstr "Skjønar ikkje spikringstypen %s"
-
-#: apt-pkg/policy.cc:452
-msgid "No priority (or zero) specified for pin"
-msgstr "Ingen prioritet (eller null) oppgitt for spiker"
-
-#: apt-pkg/sourcelist.cc:127
-#, fuzzy, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-
-#: apt-pkg/sourcelist.cc:170
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:173
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-
-#: apt-pkg/sourcelist.cc:184
-#, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:190
+#: apt-pkg/indexrecords.cc:83
 #, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
+msgid "Unable to parse Release file %s"
+msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/sourcelist.cc:193
+#: apt-pkg/indexrecords.cc:91
 #, fuzzy, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Misforma linje %lu i kjeldelista %s (URI)"
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist)"
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)"
-
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)"
-
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)"
-
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
-msgstr "Opnar %s"
+msgid "No sections in Release file %s"
+msgstr "Merk, vel %s i staden for %s\n"
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
-msgstr "Misforma linje %u i kjeldelista %s (type)"
+msgid "No Hash entry in Release file %s"
+msgstr ""
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/indexrecords.cc:145
 #, fuzzy, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Ugyldig linje i avleiingsfila: %s"
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/indexrecords.cc:164
 #, fuzzy, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
-msgstr "Typen «%s» er ukjend i linja %u i kjeldelista %s"
-
-#: apt-pkg/srcrecords.cc:52
-msgid "You must put some 'source' URIs in your sources.list"
-msgstr "Du må leggja nokre kjelde-URI-ar i fila sources.list."
-
-#: apt-pkg/tagfile.cc:140
-#, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/tagfile.cc:237
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr "Klarte ikkje tolka pakkefila %s (2)"
-
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-#, fuzzy
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
+msgid "%lid %lih %limin %lis"
 msgstr ""
-"Klarte ikkje lasta ned nokre av indeksfilene. Dei er ignorerte, eller gamle "
-"filer er brukte i staden."
-
-#: apt-pkg/vendorlist.cc:85
-#, c-format
-msgid "Vendor block %s contains no fingerprint"
-msgstr "Utgjevarblokka %s inneheld ingen fingeravtrykk"
 
-#: apt-pkg/contrib/cdromutl.cc:65
-#, c-format
-msgid "Unable to stat the mount point %s"
-msgstr "Klarte ikkje få status til monteringspunktet %s"
-
-#: apt-pkg/contrib/cdromutl.cc:246
-msgid "Failed to stat the cdrom"
-msgstr "Klarte ikkje få status til CD-ROM"
-
-#: apt-pkg/contrib/cmndline.cc:121
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kjenner ikkje kommandolinjevalet «%c» (frå %s)."
-
-#: apt-pkg/contrib/cmndline.cc:146 apt-pkg/contrib/cmndline.cc:155
-#: apt-pkg/contrib/cmndline.cc:163
-#, c-format
-msgid "Command line option %s is not understood"
-msgstr "Skjønar ikkje kommandolinjevalet %s"
-
-#: apt-pkg/contrib/cmndline.cc:168
-#, c-format
-msgid "Command line option %s is not boolean"
-msgstr "Kommandolinjevalet %s er ikkje boolsk"
-
-#: apt-pkg/contrib/cmndline.cc:209 apt-pkg/contrib/cmndline.cc:230
-#, c-format
-msgid "Option %s requires an argument."
-msgstr "Valet %s krev eit argument."
-
-#: apt-pkg/contrib/cmndline.cc:243 apt-pkg/contrib/cmndline.cc:249
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
-msgstr "Val %s: Spesifikasjonen av oppsettselementet må ha ein =<verdi>."
-
-#: apt-pkg/contrib/cmndline.cc:278
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Valet %s må ha eit heiltalsargument, ikkje «%s»"
-
-#: apt-pkg/contrib/cmndline.cc:309
-#, c-format
-msgid "Option '%s' is too long"
-msgstr "Valet «%s» er for langt"
-
-#: apt-pkg/contrib/cmndline.cc:341
-#, c-format
-msgid "Sense %s is not understood, try true or false."
-msgstr "Skjønar ikkje %s. Prøv «true» eller «false»."
-
-#: apt-pkg/contrib/cmndline.cc:391
-#, c-format
-msgid "Invalid operation %s"
-msgstr "Ugyldig operasjon %s"
-
-#: apt-pkg/contrib/configuration.cc:519
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Ukjend typeforkorting: «%c»"
-
-#: apt-pkg/contrib/configuration.cc:633
-#, c-format
-msgid "Opening configuration file %s"
-msgstr "Opnar oppsettsfila %s"
-
-#: apt-pkg/contrib/configuration.cc:801
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
-msgstr "Syntaksfeil %s:%u: Blokka startar utan namn."
-
-#: apt-pkg/contrib/configuration.cc:820
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaksfeil %s:%u: Misforma tagg"
-
-#: apt-pkg/contrib/configuration.cc:837
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
-
-#: apt-pkg/contrib/configuration.cc:877
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det øvste nivået"
-
-#: apt-pkg/contrib/configuration.cc:884
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaksfeil %s:%u: For mange nøsta inkluderte filer"
+msgid "%lih %limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:888 apt-pkg/contrib/configuration.cc:893
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
-msgid "Syntax error %s:%u: Included from here"
-msgstr "Syntaksfeil %s:%u: Inkludert herifrå"
+msgid "%limin %lis"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:897
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikkje støtta"
-
-#: apt-pkg/contrib/configuration.cc:900
-#, fuzzy, c-format
-msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det øvste nivået"
+msgid "%lis"
+msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:950
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
+msgid "Selection %s not found"
+msgstr "Fann ikkje utvalet %s"
 
-#: apt-pkg/contrib/fileutl.cc:193
+#: apt-pkg/contrib/fileutl.cc:196
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr "Brukar ikkje låsing for den skrivebeskytta låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:198
+#: apt-pkg/contrib/fileutl.cc:201
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikkje opna låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:221
+#: apt-pkg/contrib/fileutl.cc:224
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr "Brukar ikkje låsing for den nfs-monterte låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:226
+#: apt-pkg/contrib/fileutl.cc:229
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Klarte ikkje låsa %s"
 
-#: apt-pkg/contrib/fileutl.cc:363 apt-pkg/contrib/fileutl.cc:477
+#: apt-pkg/contrib/fileutl.cc:366 apt-pkg/contrib/fileutl.cc:480
 #, c-format
 msgid "List of files can't be created as '%s' is not a directory"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:397
+#: apt-pkg/contrib/fileutl.cc:400
 #, c-format
 msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:415
+#: apt-pkg/contrib/fileutl.cc:418
 #, c-format
 msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:424
+#: apt-pkg/contrib/fileutl.cc:427
 #, c-format
 msgid ""
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:827
+#: apt-pkg/contrib/fileutl.cc:846
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:829
+#: apt-pkg/contrib/fileutl.cc:848
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:833 apt-pkg/contrib/gpgv.cc:239
+#: apt-pkg/contrib/fileutl.cc:852 apt-pkg/contrib/gpgv.cc:212
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:835 apt-pkg/contrib/gpgv.cc:232
+#: apt-pkg/contrib/fileutl.cc:854 apt-pkg/contrib/gpgv.cc:205
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"
 
-#: apt-pkg/contrib/fileutl.cc:916
+#: apt-pkg/contrib/fileutl.cc:952
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1104
+#: apt-pkg/contrib/fileutl.cc:1140
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:1163 apt-pkg/contrib/fileutl.cc:1210
+#: apt-pkg/contrib/fileutl.cc:1199 apt-pkg/contrib/fileutl.cc:1246
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikkje opna røyr for %s"
 
-#: apt-pkg/contrib/fileutl.cc:1317
+#: apt-pkg/contrib/fileutl.cc:1354 apt-pkg/contrib/fileutl.cc:2123
 msgid "Failed to create subprocess IPC"
 msgstr "Klarte ikkje oppretta underprosessen IPC"
 
-#: apt-pkg/contrib/fileutl.cc:1375
+#: apt-pkg/contrib/fileutl.cc:1412
 msgid "Failed to exec compressor "
 msgstr "Klarte ikkje køyra komprimeringa "
 
-#: apt-pkg/contrib/fileutl.cc:1516
+#: apt-pkg/contrib/fileutl.cc:1553
 #, fuzzy, c-format
 msgid "read, still have %llu to read but none left"
 msgstr "lese, har framleis %lu att å lesa, men ingen att"
 
-#: apt-pkg/contrib/fileutl.cc:1629 apt-pkg/contrib/fileutl.cc:1651
+#: apt-pkg/contrib/fileutl.cc:1666 apt-pkg/contrib/fileutl.cc:1688
 #, fuzzy, c-format
 msgid "write, still have %llu to write but couldn't"
 msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:1922
+#: apt-pkg/contrib/fileutl.cc:1954
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved låsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1934
+#: apt-pkg/contrib/fileutl.cc:1965
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/contrib/fileutl.cc:1945
+#: apt-pkg/contrib/fileutl.cc:1976
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenkje til fila"
 
-#: apt-pkg/contrib/fileutl.cc:1958
+#: apt-pkg/contrib/fileutl.cc:1989
 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: apt-pkg/contrib/gpgv.cc:72
+#: apt-pkg/contrib/progress.cc:148
+#, c-format
+msgid "%c%s... Error!"
+msgstr "%c%s ... Feil"
+
+#: apt-pkg/contrib/progress.cc:150
+#, c-format
+msgid "%c%s... Done"
+msgstr "%c%s ... Ferdig"
+
+#: apt-pkg/contrib/progress.cc:181
+msgid "..."
+msgstr ""
+
+#. Print the spinner
+#: apt-pkg/contrib/progress.cc:197
 #, fuzzy, c-format
-msgid "No keyring installed in %s."
-msgstr "Avbryt installasjon."
+msgid "%c%s... %u%%"
+msgstr "%c%s ... Ferdig"
 
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
@@ -3279,219 +3171,443 @@ msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:148
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
-msgid "%c%s... Error!"
-msgstr "%c%s ... Feil"
+msgid "Unable to stat the mount point %s"
+msgstr "Klarte ikkje få status til monteringspunktet %s"
 
-#: apt-pkg/contrib/progress.cc:150
+#: apt-pkg/contrib/cdromutl.cc:246
+msgid "Failed to stat the cdrom"
+msgstr "Klarte ikkje få status til CD-ROM"
+
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
-msgid "%c%s... Done"
-msgstr "%c%s ... Ferdig"
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr "Ukjend typeforkorting: «%c»"
 
-#: apt-pkg/contrib/progress.cc:181
-msgid "..."
-msgstr ""
+#: apt-pkg/contrib/configuration.cc:636
+#, c-format
+msgid "Opening configuration file %s"
+msgstr "Opnar oppsettsfila %s"
 
-#. Print the spinner
-#: apt-pkg/contrib/progress.cc:197
-#, fuzzy, c-format
-msgid "%c%s... %u%%"
-msgstr "%c%s ... Ferdig"
+#: apt-pkg/contrib/configuration.cc:804
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
+msgstr "Syntaksfeil %s:%u: Blokka startar utan namn."
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:406
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
+msgid "Syntax error %s:%u: Malformed tag"
+msgstr "Syntaksfeil %s:%u: Misforma tagg"
 
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:413
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
-msgid "%lih %limin %lis"
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk after value"
+msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien"
 
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:420
+#: apt-pkg/contrib/configuration.cc:880
 #, c-format
-msgid "%limin %lis"
-msgstr ""
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
+msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det øvste nivået"
 
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:425
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
-msgid "%lis"
-msgstr ""
+msgid "Syntax error %s:%u: Too many nested includes"
+msgstr "Syntaksfeil %s:%u: For mange nøsta inkluderte filer"
 
-#: apt-pkg/contrib/strutl.cc:1236
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
 #, c-format
-msgid "Selection %s not found"
-msgstr "Fann ikkje utvalet %s"
+msgid "Syntax error %s:%u: Included from here"
+msgstr "Syntaksfeil %s:%u: Inkludert herifrå"
 
-#: apt-pkg/deb/debsystem.cc:91
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
-msgstr ""
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
+msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikkje støtta"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/contrib/configuration.cc:903
 #, fuzzy, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Klarte ikkje låsa listekatalogen"
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det øvste nivået"
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+msgid "Syntax error %s:%u: Extra junk at end of file"
+msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila"
 
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
-msgstr ""
+#: apt-pkg/contrib/cmndline.cc:127
+#, c-format
+msgid "Command line option '%c' [from %s] is not known."
+msgstr "Kjenner ikkje kommandolinjevalet «%c» (frå %s)."
+
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
+#, c-format
+msgid "Command line option %s is not understood"
+msgstr "Skjønar ikkje kommandolinjevalet %s"
+
+#: apt-pkg/contrib/cmndline.cc:174
+#, c-format
+msgid "Command line option %s is not boolean"
+msgstr "Kommandolinjevalet %s er ikkje boolsk"
 
-#: apt-pkg/deb/dpkgpm.cc:95
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
+#, c-format
+msgid "Option %s requires an argument."
+msgstr "Valet %s krev eit argument."
+
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
+#, c-format
+msgid "Option %s: Configuration item specification must have an =<val>."
+msgstr "Val %s: Spesifikasjonen av oppsettselementet må ha ein =<verdi>."
+
+#: apt-pkg/contrib/cmndline.cc:284
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
+msgstr "Valet %s må ha eit heiltalsargument, ikkje «%s»"
+
+#: apt-pkg/contrib/cmndline.cc:315
+#, c-format
+msgid "Option '%s' is too long"
+msgstr "Valet «%s» er for langt"
+
+#: apt-pkg/contrib/cmndline.cc:347
+#, c-format
+msgid "Sense %s is not understood, try true or false."
+msgstr "Skjønar ikkje %s. Prøv «true» eller «false»."
+
+#: apt-pkg/contrib/cmndline.cc:397
+#, c-format
+msgid "Invalid operation %s"
+msgstr "Ugyldig operasjon %s"
+
+#: apt-pkg/deb/dpkgpm.cc:112
 #, fuzzy, c-format
 msgid "Installing %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:96 apt-pkg/deb/dpkgpm.cc:996
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
 #, fuzzy, c-format
 msgid "Configuring %s"
 msgstr "Koplar til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:97 apt-pkg/deb/dpkgpm.cc:1003
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
 #, fuzzy, c-format
 msgid "Removing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:98
+#: apt-pkg/deb/dpkgpm.cc:115
 #, fuzzy, c-format
 msgid "Completely removing %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:99
+#: apt-pkg/deb/dpkgpm.cc:116
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:100
+#: apt-pkg/deb/dpkgpm.cc:117
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:827
+#: apt-pkg/deb/dpkgpm.cc:839
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:842 apt-pkg/deb/dpkgpm.cc:864
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:989
+#: apt-pkg/deb/dpkgpm.cc:1001
 #, fuzzy, c-format
 msgid "Preparing %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:990
+#: apt-pkg/deb/dpkgpm.cc:1002
 #, fuzzy, c-format
 msgid "Unpacking %s"
 msgstr "Opnar %s"
 
-#: apt-pkg/deb/dpkgpm.cc:995
+#: apt-pkg/deb/dpkgpm.cc:1007
 #, fuzzy, c-format
 msgid "Preparing to configure %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:997
+#: apt-pkg/deb/dpkgpm.cc:1009
 #, fuzzy, c-format
 msgid "Installed %s"
 msgstr "  Installert: "
 
-#: apt-pkg/deb/dpkgpm.cc:1002
+#: apt-pkg/deb/dpkgpm.cc:1014
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1004
+#: apt-pkg/deb/dpkgpm.cc:1016
 #, fuzzy, c-format
 msgid "Removed %s"
 msgstr "Tilrådingar"
 
-#: apt-pkg/deb/dpkgpm.cc:1009
+#: apt-pkg/deb/dpkgpm.cc:1021
 #, fuzzy, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/deb/dpkgpm.cc:1022
 #, fuzzy, c-format
 msgid "Completely removed %s"
 msgstr "Klarte ikkje fjerna %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1065
-msgid "ioctl(TIOCGWINSZ) failed"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1068 apt-pkg/deb/dpkgpm.cc:1089
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 #, fuzzy, c-format
 msgid "Can not write log (%s)"
 msgstr "Klarte ikkje skriva til %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1068
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
 msgid "Is /dev/pts mounted?"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1089
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1567
+#: apt-pkg/deb/dpkgpm.cc:1656
 msgid "Operation was interrupted before it could finish"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1629
+#: apt-pkg/deb/dpkgpm.cc:1718
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1634
+#: apt-pkg/deb/dpkgpm.cc:1723
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1636
+#: apt-pkg/deb/dpkgpm.cc:1725
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1642
+#: apt-pkg/deb/dpkgpm.cc:1731
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1649
+#: apt-pkg/deb/dpkgpm.cc:1738
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1656 apt-pkg/deb/dpkgpm.cc:1662
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1683
+#: apt-pkg/deb/dpkgpm.cc:1773
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr ""
 
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, fuzzy, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr "Klarte ikkje låsa listekatalogen"
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
+#: apt-inst/filelist.cc:380
+msgid "DropNode called on still linked node"
+msgstr "DropNode vart kalla på ein node som framleis er lenkja"
+
+#: apt-inst/filelist.cc:412
+msgid "Failed to locate the hash element!"
+msgstr "Fann ikkje nøkkelelementet."
+
+#: apt-inst/filelist.cc:459
+msgid "Failed to allocate diversion"
+msgstr "Klarte ikkje tildela avleiing"
+
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"
+msgstr "Intern feil i AddDiversion"
+
+#: apt-inst/filelist.cc:477
+#, c-format
+msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
+msgstr "Prøver å skriva over ei avleiing, %s -> %s og %s/%s"
+
+#: apt-inst/filelist.cc:506
+#, c-format
+msgid "Double add of diversion %s -> %s"
+msgstr "Dobbel tilleggjing av avleiing %s -> %s"
+
+#: apt-inst/filelist.cc:549
+#, c-format
+msgid "Duplicate conf file %s/%s"
+msgstr "Dobbel oppsettsfil %s/%s"
+
+#: apt-inst/extract.cc:101 apt-inst/extract.cc:172
+#, c-format
+msgid "The path %s is too long"
+msgstr "Stigen %s er for lang"
+
+#: apt-inst/extract.cc:132
+#, c-format
+msgid "Unpacking %s more than once"
+msgstr "Pakkar ut %s meir enn éin gong"
+
+#: apt-inst/extract.cc:142
+#, c-format
+msgid "The directory %s is diverted"
+msgstr "Katalogen %s er avleidd"
+
+#: apt-inst/extract.cc:152
+#, c-format
+msgid "The package is trying to write to the diversion target %s/%s"
+msgstr "Pakken prøver å skriva til avleiingsmålet %s/%s"
+
+#: apt-inst/extract.cc:162 apt-inst/extract.cc:306
+msgid "The diversion path is too long"
+msgstr "Avleiingsstigen er for lang"
+
+#: apt-inst/extract.cc:249
+#, c-format
+msgid "The directory %s is being replaced by a non-directory"
+msgstr "Katalogen %s vert bytt ut med ein ikkje-katalog"
+
+#: apt-inst/extract.cc:289
+msgid "Failed to locate node in its hash bucket"
+msgstr "Fann ikkje noden i nøkkelbøtta"
+
+#: apt-inst/extract.cc:293
+msgid "The path is too long"
+msgstr "Stigen er for lang"
+
+#: apt-inst/extract.cc:421
+#, c-format
+msgid "Overwrite package match with no version for %s"
+msgstr "Skriv over pakketreff utan versjon for %s"
+
+#: apt-inst/extract.cc:438
+#, c-format
+msgid "File %s/%s overwrites the one in the package %s"
+msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s"
+
+#: apt-inst/extract.cc:498
+#, c-format
+msgid "Unable to stat %s"
+msgstr "Klarte ikkje få status til %s"
+
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
+#, fuzzy, c-format
+msgid "Failed to write file %s"
+msgstr "Klarte ikkje skriva fila %s"
+
+#: apt-inst/dirstream.cc:104
+#, c-format
+msgid "Failed to close file %s"
+msgstr "Klarte ikkje lukka fila %s"
+
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:54
+#: apt-inst/deb/debfile.cc:63
+#, c-format
+msgid "This is not a valid DEB archive, missing '%s' member"
+msgstr "Dette er ikkje eit gyldig DEB-arkiv, manglar «%s»-medlemmen"
+
+#: apt-inst/deb/debfile.cc:132
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr "Intern feil, fann ikkje medlemmen %s"
+
+#: apt-inst/deb/debfile.cc:231
+msgid "Unparsable control file"
+msgstr "Kontrollfila kan ikkje tolkast"
+
+#: apt-inst/contrib/arfile.cc:76
+msgid "Invalid archive signature"
+msgstr "Ugyldig arkivsignatur"
+
+#: apt-inst/contrib/arfile.cc:84
+msgid "Error reading archive member header"
+msgstr "Feil ved lesing av arkivmedlemshovud"
+
+#: apt-inst/contrib/arfile.cc:96
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Ugyldig arkivmedlemshovud"
+
+#: apt-inst/contrib/arfile.cc:108
+msgid "Invalid archive member header"
+msgstr "Ugyldig arkivmedlemshovud"
+
+#: apt-inst/contrib/arfile.cc:137
+msgid "Archive is too short"
+msgstr "Arkivet er for kort"
+
+#: apt-inst/contrib/arfile.cc:141
+msgid "Failed to read the archive headers"
+msgstr "Klarte ikkje lesa arkivhovuda"
+
+#: apt-inst/contrib/extracttar.cc:128
+msgid "Failed to create pipes"
+msgstr "Klarte ikkje oppretta røyr"
+
+#: apt-inst/contrib/extracttar.cc:155
+msgid "Failed to exec gzip "
+msgstr "Klarte ikkje køyra gzip "
+
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
+msgid "Corrupted archive"
+msgstr "Øydelagt arkiv"
+
+#: apt-inst/contrib/extracttar.cc:207
+msgid "Tar checksum failed, archive corrupted"
+msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
+
+#: apt-inst/contrib/extracttar.cc:312
+#, c-format
+msgid "Unknown TAR header type %u, member %s"
+msgstr "Ukjend TAR-hovud type %u, medlem %s"
+
+#~ msgid "Total dependency version space: "
+#~ msgstr "Storleik på kravs- og versjonsrom: "
+
+#~ msgid "You don't have enough free space in %s"
+#~ msgstr "Du har ikkje nok ledig plass i %s"
+
+#~ msgid "Done"
+#~ msgstr "Ferdig"
+
+#, fuzzy
+#~ msgid "No keyring installed in %s."
+#~ msgstr "Avbryt installasjon."
+
+#, fuzzy
+#~ msgid "Internal error, Upgrade broke stuff"
+#~ msgstr "Intern feil. AllUpgrade øydelagde noko"
+
 #~ msgid "%s not a valid DEB package."
 #~ msgstr "%s er ingen gyldig DEB-pakke."
 
@@ -3537,43 +3653,9 @@ msgstr ""
 #~ msgstr "Det finst ingen installasjonskandidat for pakken %s"
 
 #, fuzzy
-#~ msgid "Package '%s' is not installed, so not removed. Did you mean '%s'?\n"
-#~ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-
-#, fuzzy
-#~ msgid "Package '%s' is not installed, so not removed\n"
-#~ msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
-
-#, fuzzy
 #~ msgid "Note, selecting '%s' instead of '%s'\n"
 #~ msgstr "Merk, vel %s i staden for %s\n"
 
-#~ msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-#~ msgstr ""
-#~ "Hoppar over %s, for den er installert frå før og ikkje sett til "
-#~ "oppgradering.\n"
-
-#, fuzzy
-#~ msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-#~ msgstr ""
-#~ "Hoppar over %s, for den er installert frå før og ikkje sett til "
-#~ "oppgradering.\n"
-
-#~ msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-#~ msgstr ""
-#~ "%s kan ikkje installerast på nytt, for pakken kan ikkje lastast ned.\n"
-
-#~ msgid "%s is already the newest version.\n"
-#~ msgstr "Den nyaste versjonen av %s er installert frå før.\n"
-
-#, fuzzy
-#~ msgid "Selected version '%s' (%s) for '%s'\n"
-#~ msgstr "Vald versjon %s (%s) for %s\n"
-
-#, fuzzy
-#~ msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
-#~ msgstr "Vald versjon %s (%s) for %s\n"
-
 #, fuzzy
 #~ msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 #~ msgstr ""