X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0205540433440a9ff4ad4ea4cce44c700a4b401c..727eae451a4cf0d7191745eaabc9fb500104e5bc:/po/nn.po

diff --git a/po/nn.po b/po/nn.po
index 5781ba03a..e33aa27c7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_nn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-23 18:41-0400\n"
+"POT-Creation-Date: 2011-02-15 06:09+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"
@@ -95,84 +95,82 @@ msgstr "Slingringsmon: "
 msgid "Total space accounted for: "
 msgstr "Brukt plass i alt: "
 
-#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1142
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr "Pakkefila %s er ute av takt."
 
-#: cmdline/apt-cache.cc:1273
+#: cmdline/apt-cache.cc:591 cmdline/apt-cache.cc:1377
+#: cmdline/apt-cache.cc:1379 cmdline/apt-cache.cc:1456
+msgid "No packages found"
+msgstr "Fann ingen pakkar"
+
+#: cmdline/apt-cache.cc:1221
 #, fuzzy
 msgid "You must give at least one search pattern"
 msgstr "Du må oppgi nøyaktig eitt mnster"
 
-#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
-#: cmdline/apt-cache.cc:1508
-msgid "No packages found"
-msgstr "Fann ingen pakkar"
-
-#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
+#: cmdline/apt-cache.cc:1451 apt-pkg/cacheset.cc:440
 #, c-format
 msgid "Unable to locate package %s"
 msgstr "Finn ikkje pakken %s"
 
-#: cmdline/apt-cache.cc:1533
+#: cmdline/apt-cache.cc:1481
 msgid "Package files:"
 msgstr "Pakkefiler:"
 
-#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
+#: cmdline/apt-cache.cc:1488 cmdline/apt-cache.cc:1586
 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:1554
+#: cmdline/apt-cache.cc:1502
 msgid "Pinned packages:"
 msgstr "Spikra pakkar:"
 
-#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1514 cmdline/apt-cache.cc:1566
 msgid "(not found)"
 msgstr "(ikkje funne)"
 
-#: cmdline/apt-cache.cc:1575
+#: cmdline/apt-cache.cc:1523
 msgid "  Installed: "
 msgstr "  Installert: "
 
-#: cmdline/apt-cache.cc:1576
+#: cmdline/apt-cache.cc:1524
 msgid "  Candidate: "
 msgstr "  Kandidat: "
 
-#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+#: cmdline/apt-cache.cc:1548 cmdline/apt-cache.cc:1556
 msgid "(none)"
 msgstr "(ingen)"
 
-#: cmdline/apt-cache.cc:1615
+#: cmdline/apt-cache.cc:1563
 msgid "  Package pin: "
 msgstr "  Pakke spikra til: "
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1624
+#: cmdline/apt-cache.cc:1572
 msgid "  Version table:"
 msgstr "  Versjonstabell:"
 
-#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
-#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1686 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
+#: cmdline/apt-get.cc:3047 cmdline/apt-sortpkgs.cc:144
 #, 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:1739
+#: cmdline/apt-cache.cc:1693
 #, fuzzy
 msgid ""
 "Usage: apt-cache [options] command\n"
-"       apt-cache [options] add file1 [file2 ...]\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"
-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
+"apt-cache is a low-level tool used to query information\n"
+"from APT's binary cache files\n"
 "\n"
 "Commands:\n"
-"   add - Add a package file to the source cache\n"
 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"
@@ -318,7 +316,7 @@ msgstr ""
 "  -c=? Les denne innstillingsfila.\n"
 "  -o=? Set ei vilkårleg innstilling, t.d. «-o dir::cache=/tmp».\n"
 
-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1175
 #, c-format
 msgid "Unable to write to %s"
 msgstr "Klarte ikkje skriva til %s"
@@ -327,31 +325,31 @@ msgstr "Klarte ikkje skriva til %s"
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr "Finn ikkje debconf-versjonen. Er debconf installert?"
 
-#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347
 msgid "Package extension list is too long"
 msgstr "Lista over pakkeutvidingar er for lang"
 
-#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:187
-#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
-#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296
+#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
+#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
+#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298
 #, c-format
 msgid "Error processing directory %s"
 msgstr "Feil ved lesing av katalogen %s"
 
-#: ftparchive/apt-ftparchive.cc:258
+#: ftparchive/apt-ftparchive.cc:260
 msgid "Source extension list is too long"
 msgstr "Lista over kjeldeutvidingar er for lang"
 
-#: ftparchive/apt-ftparchive.cc:375
+#: ftparchive/apt-ftparchive.cc:377
 msgid "Error writing header to contents file"
 msgstr "Feil ved skriving av topptekst til innhaldsfila"
 
-#: ftparchive/apt-ftparchive.cc:405
+#: ftparchive/apt-ftparchive.cc:407
 #, c-format
 msgid "Error processing contents %s"
 msgstr "Feil ved lesing av %s"
 
-#: ftparchive/apt-ftparchive.cc:590
+#: ftparchive/apt-ftparchive.cc:595
 #, fuzzy
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
@@ -431,11 +429,11 @@ msgstr ""
 "  -c=?  Les denne oppsettsfila.\n"
 "  -o=? Set ei vilkårleg innstilling."
 
-#: ftparchive/apt-ftparchive.cc:796
+#: ftparchive/apt-ftparchive.cc:801
 msgid "No selections matched"
 msgstr "Ingen utval passa"
 
-#: ftparchive/apt-ftparchive.cc:874
+#: ftparchive/apt-ftparchive.cc:879
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "Enkelte filer manglar i pakkefilgruppa %s"
@@ -545,7 +543,7 @@ msgstr "Arkivet har ikkje noko pakkefelt"
 msgid "  %s has no override entry\n"
 msgstr "  %s har inga overstyringsoppføring\n"
 
-#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:793
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-vedlikehaldaren er %s, ikkje %s\n"
@@ -655,79 +653,79 @@ 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-get.cc:134
+#: cmdline/apt-get.cc:135
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:156 apt-pkg/cachefilter.cc:29
+#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex-kompileringsfeil - %s"
 
-#: cmdline/apt-get.cc:251
+#: cmdline/apt-get.cc:252
 msgid "The following packages have unmet dependencies:"
 msgstr "Følgjande pakkar har krav som ikkje er oppfylte:"
 
-#: cmdline/apt-get.cc:341
+#: cmdline/apt-get.cc:342
 #, c-format
 msgid "but %s is installed"
 msgstr "men %s er installert"
 
-#: cmdline/apt-get.cc:343
+#: cmdline/apt-get.cc:344
 #, c-format
 msgid "but %s is to be installed"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:351
 msgid "but it is not installable"
 msgstr "men lèt seg ikkje installera"
 
-#: cmdline/apt-get.cc:352
+#: cmdline/apt-get.cc:353
 msgid "but it is a virtual package"
 msgstr "men er ein virtuell pakke"
 
-#: cmdline/apt-get.cc:355
+#: cmdline/apt-get.cc:356
 msgid "but it is not installed"
 msgstr "men er ikkje installert"
 
-#: cmdline/apt-get.cc:355
+#: cmdline/apt-get.cc:356
 msgid "but it is not going to be installed"
 msgstr "men skal ikkje installerast"
 
-#: cmdline/apt-get.cc:360
+#: cmdline/apt-get.cc:361
 msgid " or"
 msgstr " eller"
 
-#: cmdline/apt-get.cc:391
+#: cmdline/apt-get.cc:392
 msgid "The following NEW packages will be installed:"
 msgstr "Dei følgjande NYE pakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:419
+#: cmdline/apt-get.cc:420
 msgid "The following packages will be REMOVED:"
 msgstr "Dei følgjande pakkane vil verta FJERNA:"
 
-#: cmdline/apt-get.cc:441
+#: cmdline/apt-get.cc:442
 msgid "The following packages have been kept back:"
 msgstr "Dei følgjande pakkane er haldne tilbake:"
 
-#: cmdline/apt-get.cc:464
+#: cmdline/apt-get.cc:465
 msgid "The following packages will be upgraded:"
 msgstr "Dei følgjande pakkane vil verta oppgraderte:"
 
-#: cmdline/apt-get.cc:487
+#: cmdline/apt-get.cc:488
 msgid "The following packages will be DOWNGRADED:"
 msgstr "Dei følgjande pakkane vil verta NEDGRADERTE:"
 
-#: cmdline/apt-get.cc:507
+#: cmdline/apt-get.cc:508
 msgid "The following held packages will be changed:"
 msgstr "Dei følgjande pakkane som er haldne tilbake vil verta endra:"
 
-#: cmdline/apt-get.cc:560
+#: cmdline/apt-get.cc:563
 #, c-format
 msgid "%s (due to %s) "
 msgstr "%s (fordi %s) "
 
-#: cmdline/apt-get.cc:568
+#: cmdline/apt-get.cc:571
 #, fuzzy
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
@@ -736,65 +734,60 @@ 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!"
 
-#: cmdline/apt-get.cc:602
+#: cmdline/apt-get.cc:605
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr "%lu oppgraderte, %lu nyleg installerte, "
 
-#: cmdline/apt-get.cc:606
+#: cmdline/apt-get.cc:609
 #, c-format
 msgid "%lu reinstalled, "
 msgstr "%lu installerte på nytt, "
 
-#: cmdline/apt-get.cc:608
+#: cmdline/apt-get.cc:611
 #, c-format
 msgid "%lu downgraded, "
 msgstr "%lu nedgraderte, "
 
-#: cmdline/apt-get.cc:610
+#: cmdline/apt-get.cc:613
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr "%lu skal fjernast og %lu skal ikkje oppgraderast.\n"
 
-#: cmdline/apt-get.cc:614
+#: cmdline/apt-get.cc:617
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr "%lu ikkje fullstendig installerte eller fjerna.\n"
 
-#: cmdline/apt-get.cc:634
+#: cmdline/apt-get.cc:639
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for task '%s'\n"
 msgstr "Merk, vel %s i staden for regex «%s»\n"
 
-#: cmdline/apt-get.cc:640
+#: cmdline/apt-get.cc:645
 #, fuzzy, c-format
 msgid "Note, selecting '%s' for regex '%s'\n"
 msgstr "Merk, vel %s i staden for regex «%s»\n"
 
-#: cmdline/apt-get.cc:647
-#, fuzzy, c-format
-msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Vald versjon %s (%s) for %s\n"
-
-#: cmdline/apt-get.cc:657
+#: cmdline/apt-get.cc:662
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pakken %s er ein virtuell pakke, tilbydd av:\n"
 
-#: cmdline/apt-get.cc:668
+#: cmdline/apt-get.cc:673
 msgid " [Installed]"
 msgstr " [Installert]"
 
-#: cmdline/apt-get.cc:677
+#: cmdline/apt-get.cc:682
 #, fuzzy
 msgid " [Not candidate version]"
 msgstr "Kandidatversjonar"
 
-#: cmdline/apt-get.cc:679
+#: cmdline/apt-get.cc:684
 msgid "You should explicitly select one to install."
 msgstr "Du må velja ein som skal installerast."
 
-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:687
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -805,171 +798,184 @@ msgstr ""
 "av ein annan pakke. Dette tyder at pakket manglar, er gjort overflødig\n"
 "eller er berre tilgjengeleg frå ei anna kjelde\n"
 
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:705
 msgid "However the following packages replace it:"
 msgstr "Dei følgjande pakkane kan brukast i staden:"
 
-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:717
 #, fuzzy, c-format
 msgid "Package '%s' has no installation candidate"
 msgstr "Det finst ingen installasjonskandidat for pakken %s"
 
-#: cmdline/apt-get.cc:723
+#: cmdline/apt-get.cc:728
 #, c-format
 msgid "Virtual packages like '%s' can't be removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:754
+#: cmdline/apt-get.cc:759
 #, fuzzy, c-format
 msgid "Note, selecting '%s' instead of '%s'\n"
 msgstr "Merk, vel %s i staden for %s\n"
 
-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:789
 #, c-format
 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"
 
-#: cmdline/apt-get.cc:788
+#: cmdline/apt-get.cc:793
 #, fuzzy, c-format
 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"
 
-#: cmdline/apt-get.cc:798
+#: cmdline/apt-get.cc:803
 #, c-format
 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"
 
-#: cmdline/apt-get.cc:803
+#: cmdline/apt-get.cc:808
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Den nyaste versjonen av %s er installert frå før.\n"
 
-#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2024
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:859
+#: cmdline/apt-get.cc:853
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
+
+#: cmdline/apt-get.cc:858
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr "Vald versjon %s (%s) for %s\n"
+
+#: cmdline/apt-get.cc:899
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakken %s er ikkje installert, og vert difor ikkje fjerna\n"
 
-#: cmdline/apt-get.cc:934
+#: cmdline/apt-get.cc:977
 msgid "Correcting dependencies..."
 msgstr "Rettar på krav ..."
 
-#: cmdline/apt-get.cc:937
+#: cmdline/apt-get.cc:980
 msgid " failed."
 msgstr " mislukkast."
 
-#: cmdline/apt-get.cc:940
+#: cmdline/apt-get.cc:983
 msgid "Unable to correct dependencies"
 msgstr "Klarte ikkje retta på krav"
 
-#: cmdline/apt-get.cc:943
+#: cmdline/apt-get.cc:986
 msgid "Unable to minimize the upgrade set"
 msgstr "Klarte ikkje minimera oppgraderingsmengda"
 
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:988
 msgid " Done"
 msgstr " Ferdig"
 
-#: cmdline/apt-get.cc:949
+#: cmdline/apt-get.cc:992
 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»."
 
-#: cmdline/apt-get.cc:952
+#: cmdline/apt-get.cc:995
 msgid "Unmet dependencies. Try using -f."
 msgstr "Nokre krav er ikkje oppfylte. Prøv med «-f»."
 
-#: cmdline/apt-get.cc:977
+#: cmdline/apt-get.cc:1020
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr "ÅTVARING: Klarer ikkje autentisere desse pakkane."
 
-#: cmdline/apt-get.cc:981
+#: cmdline/apt-get.cc:1024
 msgid "Authentication warning overridden.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:988
+#: cmdline/apt-get.cc:1031
 msgid "Install these packages without verification [y/N]? "
 msgstr "Installer desse pakkane utan verifikasjon [j/N]? "
 
-#: cmdline/apt-get.cc:990
+#: cmdline/apt-get.cc:1033
 msgid "Some packages could not be authenticated"
 msgstr "Nokre pakkar kunne ikkje bli autentisert"
 
-#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
+#: cmdline/apt-get.cc:1042 cmdline/apt-get.cc:1203
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Det oppstod problem, og «-y» vart brukt utan «--force-yes»"
 
-#: cmdline/apt-get.cc:1040
+#: cmdline/apt-get.cc:1083
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
-#: cmdline/apt-get.cc:1049
+#: cmdline/apt-get.cc:1092
 msgid "Packages need to be removed but remove is disabled."
 msgstr "Nokre pakkar må fjernast, men fjerning er slått av."
 
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1103
 #, fuzzy
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern feil ved tilleggjing av avleiing"
 
-#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
-#: apt-pkg/cachefile.cc:106
-msgid "The list of sources could not be read."
-msgstr "Kjeldelista kan ikkje lesast."
-
-#: cmdline/apt-get.cc:1100
+#: cmdline/apt-get.cc:1141
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
-#: cmdline/apt-get.cc:1105
+#. 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:1148
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr "Må henta %sB/%sB med arkiv.\n"
 
-#: cmdline/apt-get.cc:1108
+#. 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:1153
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr "Må henta %sB med arkiv.\n"
 
-#: cmdline/apt-get.cc:1113
+#. 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:1160
 #, fuzzy, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n"
 
-#: cmdline/apt-get.cc:1116
+#. 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:1165
 #, fuzzy, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n"
 
-#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:1180 cmdline/apt-get.cc:1183 cmdline/apt-get.cc:2428
+#: cmdline/apt-get.cc:2431
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1193
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikkje nok ledig plass i %s."
 
-#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
+#: cmdline/apt-get.cc:1209 cmdline/apt-get.cc:1229
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "«Trivial Only» var spesifisert, men dette er ikkje noka triviell handling."
 
-#: cmdline/apt-get.cc:1162
+#: cmdline/apt-get.cc:1211
 msgid "Yes, do as I say!"
 msgstr "Ja, gjer som eg seier!"
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1213
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -980,28 +986,28 @@ msgstr ""
 "For å halda fram, må du skriva nøyaktig «%s».\n"
 " ?] "
 
-#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
+#: cmdline/apt-get.cc:1219 cmdline/apt-get.cc:1238
 msgid "Abort."
 msgstr "Avbryt."
 
-#: cmdline/apt-get.cc:1185
+#: cmdline/apt-get.cc:1234
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du halda fram [J/n]? "
 
-#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
+#: cmdline/apt-get.cc:1306 cmdline/apt-get.cc:2488 apt-pkg/algorithms.cc:1491
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Klarte ikkje henta %s  %s\n"
 
-#: cmdline/apt-get.cc:1275
+#: cmdline/apt-get.cc:1324
 msgid "Some files failed to download"
 msgstr "Klarte ikkje henta nokre av filene"
 
-#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
+#: cmdline/apt-get.cc:1325 cmdline/apt-get.cc:2497
 msgid "Download complete and in download only mode"
 msgstr "Nedlastinga er ferdig i nedlastingsmodus"
 
-#: cmdline/apt-get.cc:1282
+#: cmdline/apt-get.cc:1331
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -1009,19 +1015,19 @@ msgstr ""
 "Klarte ikkje henta nokre av arkiva. Du kan prøva med «apt-get update» eller "
 "«--fix-missing»."
 
-#: cmdline/apt-get.cc:1286
+#: cmdline/apt-get.cc:1335
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "«--fix-missing» og byte av medium er ikkje støtta for tida"
 
-#: cmdline/apt-get.cc:1291
+#: cmdline/apt-get.cc:1340
 msgid "Unable to correct missing packages."
 msgstr "Klarte ikkje retta opp manglande pakkar."
 
-#: cmdline/apt-get.cc:1292
+#: cmdline/apt-get.cc:1341
 msgid "Aborting install."
 msgstr "Avbryt installasjon."
 
-#: cmdline/apt-get.cc:1320
+#: cmdline/apt-get.cc:1369
 msgid ""
 "The following package disappeared from your system as\n"
 "all files have been overwritten by other packages:"
@@ -1031,57 +1037,35 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: cmdline/apt-get.cc:1324
+#: cmdline/apt-get.cc:1373
 msgid "Note: This is done automatic and on purpose by dpkg."
 msgstr ""
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1503
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:1535
 #, fuzzy, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr "Klarte ikkje få status på kjeldepakkelista %s"
 
 #. if (VerTag.empty() == false && Last == 0)
-#: cmdline/apt-get.cc:1524
+#: cmdline/apt-get.cc:1573
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1540
+#: cmdline/apt-get.cc:1589
 msgid "The update command takes no arguments"
 msgstr "Oppdateringskommandoen tek ingen argument"
 
-#: cmdline/apt-get.cc:1605
+#: cmdline/apt-get.cc:1651
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1653
-#, fuzzy
-msgid ""
-"The following package was automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] "Dei følgjande NYE pakkane vil verta installerte:"
-msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
-
-#: cmdline/apt-get.cc:1657
-#, fuzzy, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] "Dei følgjande NYE pakkane vil verta installerte:"
-msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
-
-#: cmdline/apt-get.cc:1659
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1664
+#: cmdline/apt-get.cc:1703
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1097,25 +1081,47 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
+#: cmdline/apt-get.cc:1706 cmdline/apt-get.cc:1855
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgjande informasjon kan hjelpa med å løysa situasjonen:"
 
-#: cmdline/apt-get.cc:1671
+#: cmdline/apt-get.cc:1710
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: cmdline/apt-get.cc:1690
+#: cmdline/apt-get.cc:1717
+#, fuzzy
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] "Dei følgjande NYE pakkane vil verta installerte:"
+msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
+
+#: cmdline/apt-get.cc:1721
+#, fuzzy, c-format
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] "Dei følgjande NYE pakkane vil verta installerte:"
+msgstr[1] "Dei følgjande NYE pakkane vil verta installerte:"
+
+#: cmdline/apt-get.cc:1723
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1742
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: cmdline/apt-get.cc:1779
+#: cmdline/apt-get.cc:1825
 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»."
 
-#: cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:1828
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1123,7 +1129,7 @@ msgstr ""
 "Nokre krav er ikkje oppfylte. Du kan prøva «apt-get -f install» (eller velja "
 "ei løysing)."
 
-#: cmdline/apt-get.cc:1794
+#: cmdline/apt-get.cc:1840
 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"
@@ -1135,70 +1141,75 @@ msgstr ""
 "distribusjonen, kan det òg henda at nokre av pakkane som trengst ikkje\n"
 "er laga enno eller at dei framleis ligg i «Incoming»."
 
-#: cmdline/apt-get.cc:1812
+#: cmdline/apt-get.cc:1858
 msgid "Broken packages"
 msgstr "Øydelagde pakkar"
 
-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1886
 msgid "The following extra packages will be installed:"
 msgstr "Dei følgjande tilleggspakkane vil verta installerte:"
 
-#: cmdline/apt-get.cc:1931
+#: cmdline/apt-get.cc:1976
 msgid "Suggested packages:"
 msgstr "Føreslåtte pakkar:"
 
-#: cmdline/apt-get.cc:1932
+#: cmdline/apt-get.cc:1977
 msgid "Recommended packages:"
 msgstr "Tilrådde pakkar"
 
-#: cmdline/apt-get.cc:1974
+#: cmdline/apt-get.cc:2019
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Fann ikkje pakken %s"
 
-#: cmdline/apt-get.cc:1981
+#: cmdline/apt-get.cc:2026
 #, fuzzy, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "men %s skal installerast"
 
-#: cmdline/apt-get.cc:2002
+#: cmdline/apt-get.cc:2047
 msgid "Calculating upgrade... "
 msgstr "Reknar ut oppgradering ... "
 
-#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111
+#: cmdline/apt-get.cc:2050 methods/ftp.cc:707 methods/connect.cc:111
 msgid "Failed"
 msgstr "Mislukkast"
 
-#: cmdline/apt-get.cc:2010
+#: cmdline/apt-get.cc:2055
 msgid "Done"
 msgstr "Ferdig"
 
-#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
+#: cmdline/apt-get.cc:2122 cmdline/apt-get.cc:2130
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern feil. AllUpgrade øydelagde noko"
 
-#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
+#: cmdline/apt-get.cc:2154 cmdline/apt-get.cc:2187
 msgid "Unable to lock the download directory"
 msgstr "Klarte ikkje låsa nedlastingskatalogen"
 
-#: cmdline/apt-get.cc:2185
+#: cmdline/apt-get.cc:2238
+#, c-format
+msgid "Downloading %s %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:2294
 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:2225 cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2334 cmdline/apt-get.cc:2615
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Finn ingen kjeldepakke for %s"
 
-#: cmdline/apt-get.cc:2241
+#: cmdline/apt-get.cc:2350
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2246
+#: cmdline/apt-get.cc:2355
 #, c-format
 msgid ""
 "Please use:\n"
@@ -1206,81 +1217,85 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2297
+#: cmdline/apt-get.cc:2406
 #, 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:2332
+#: cmdline/apt-get.cc:2441
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikkje nok ledig plass i %s"
 
-#: cmdline/apt-get.cc:2338
+#. 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:2449
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Må henta %sB/%sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:2341
+#. 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:2454
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Må henta %sB med kjeldekodearkiv.\n"
 
-#: cmdline/apt-get.cc:2347
+#: cmdline/apt-get.cc:2460
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Hent kjeldekode %s\n"
 
-#: cmdline/apt-get.cc:2380
+#: cmdline/apt-get.cc:2493
 msgid "Failed to fetch some archives."
 msgstr "Klarte ikkje henta nokre av arkiva."
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2523
 #, 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:2422
+#: cmdline/apt-get.cc:2535
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Utpakkingskommandoen «%s» mislukkast.\n"
 
-#: cmdline/apt-get.cc:2423
+#: cmdline/apt-get.cc:2536
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2440
+#: cmdline/apt-get.cc:2553
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Byggjekommandoen «%s» mislukkast.\n"
 
-#: cmdline/apt-get.cc:2460
+#: cmdline/apt-get.cc:2573
 msgid "Child process failed"
 msgstr "Barneprosessen mislukkast"
 
-#: cmdline/apt-get.cc:2476
+#: cmdline/apt-get.cc:2589
 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:2506
+#: cmdline/apt-get.cc:2620
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Klarte ikkje henta byggjekrav for %s"
 
-#: cmdline/apt-get.cc:2526
+#: cmdline/apt-get.cc:2640
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen byggjekrav.\n"
 
-#: cmdline/apt-get.cc:2577
+#: cmdline/apt-get.cc:2691
 #, 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:2630
+#: cmdline/apt-get.cc:2744
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1289,31 +1304,36 @@ 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:2666
+#: cmdline/apt-get.cc:2780
 #, 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:2693
+#: cmdline/apt-get.cc:2807
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Klarte ikkje oppfylla kravet %s for %s: %s"
 
-#: cmdline/apt-get.cc:2709
+#: cmdline/apt-get.cc:2823
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Byggjekrav for %s kunne ikkje tilfredstillast."
 
-#: cmdline/apt-get.cc:2714
+#: cmdline/apt-get.cc:2828
 msgid "Failed to process build dependencies"
 msgstr "Klarte ikkje behandla byggjekrava"
 
-#: cmdline/apt-get.cc:2745
+#: cmdline/apt-get.cc:2921 cmdline/apt-get.cc:2933
+#, fuzzy, c-format
+msgid "Changelog for %s (%s)"
+msgstr "Koplar til %s (%s)"
+
+#: cmdline/apt-get.cc:3052
 msgid "Supported modules:"
 msgstr "Støtta modular:"
 
-#: cmdline/apt-get.cc:2786
+#: cmdline/apt-get.cc:3093
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1340,6 +1360,8 @@ msgid ""
 "   check - Verify that there are no broken dependencies\n"
 "   markauto - Mark the given packages as automatically installed\n"
 "   unmarkauto - Mark the given packages as manually installed\n"
+"   changelog - Download and display the changelog for the given package\n"
+"   download - Download the binary package into the current directory\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"
@@ -1399,7 +1421,7 @@ msgstr ""
 "til apt-get(8), sources.list(5) og apt.conf(5).\n"
 "                       APT har superku-krefter.\n"
 
-#: cmdline/apt-get.cc:2958
+#: cmdline/apt-get.cc:3254
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1407,33 +1429,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
-#: cmdline/acqprogress.cc:55
+#: cmdline/acqprogress.cc:57
 msgid "Hit "
 msgstr "Treff "
 
-#: cmdline/acqprogress.cc:79
+#: cmdline/acqprogress.cc:81
 msgid "Get:"
 msgstr "Hent:"
 
-#: cmdline/acqprogress.cc:110
+#: cmdline/acqprogress.cc:112
 msgid "Ign "
 msgstr "Ign "
 
-#: cmdline/acqprogress.cc:114
+#: cmdline/acqprogress.cc:116
 msgid "Err "
 msgstr "Feil "
 
-#: cmdline/acqprogress.cc:135
+#: cmdline/acqprogress.cc:137
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr "Henta %sB på %s (%sB/s)\n"
 
-#: cmdline/acqprogress.cc:225
+#: cmdline/acqprogress.cc:227
 #, c-format
 msgid " [Working]"
 msgstr " [Arbeider]"
 
-#: cmdline/acqprogress.cc:271
+#: cmdline/acqprogress.cc:283
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
@@ -1516,7 +1538,7 @@ msgstr "Klarte ikkje oppretta r
 msgid "Failed to exec gzip "
 msgstr "Klarte ikkje køyra gzip "
 
-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:208
 msgid "Corrupted archive"
 msgstr "Øydelagt arkiv"
 
@@ -1524,7 +1546,7 @@ msgstr "
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar-sjekksummen mislukkast, arkivet er øydelagt"
 
-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:300
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr "Ukjend TAR-hovud type %u, medlem %s"
@@ -1632,28 +1654,28 @@ msgstr "Fann ikkje noden i n
 msgid "The path is too long"
 msgstr "Stigen er for lang"
 
-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:412
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "Skriv over pakketreff utan versjon for %s"
 
-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:429
 #, 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"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
-#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
-#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306
+#: apt-inst/extract.cc:462 apt-pkg/contrib/cdromutl.cc:179
+#: apt-pkg/contrib/fileutl.cc:334 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:103
+#: apt-pkg/init.cc:111 apt-pkg/clean.cc:33 apt-pkg/policy.cc:309
 #: methods/mirror.cc:87
 #, c-format
 msgid "Unable to read %s"
 msgstr "Klarte ikkje lesa %s"
 
-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:489
 #, c-format
 msgid "Unable to stat %s"
 msgstr "Klarte ikkje få status til %s"
@@ -1678,9 +1700,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 "Infokatalogen og den mellombelse katalogen må vera på det same filsystemet"
 
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
-#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
-#: apt-pkg/pkgcachegen.cc:1326
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1074
+#: apt-pkg/pkgcachegen.cc:1178 apt-pkg/pkgcachegen.cc:1184
+#: apt-pkg/pkgcachegen.cc:1330
 msgid "Reading package lists"
 msgstr "Les pakkelister"
 
@@ -1784,24 +1806,28 @@ msgstr "Fann ikkje noka gyldig kontrollfil"
 msgid "Unparsable control file"
 msgstr "Kontrollfila kan ikkje tolkast"
 
-#: methods/bzip2.cc:68
+#: methods/bzip2.cc:60 methods/gzip.cc:52
+msgid "Empty files can't be valid archives"
+msgstr ""
+
+#: methods/bzip2.cc:64
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr "Klarte ikkje opna røyr for %s"
 
-#: methods/bzip2.cc:113
+#: methods/bzip2.cc:108
 #, c-format
 msgid "Read error from %s process"
 msgstr "Lesefeil frå %s-prosessen"
 
-#: methods/bzip2.cc:145 methods/bzip2.cc:154 methods/copy.cc:43
-#: methods/gzip.cc:96 methods/gzip.cc:105 methods/rred.cc:486
-#: methods/rred.cc:495
+#: methods/bzip2.cc:140 methods/bzip2.cc:149 methods/copy.cc:43
+#: methods/gzip.cc:92 methods/gzip.cc:101 methods/rred.cc:524
+#: methods/rred.cc:533
 msgid "Failed to stat"
 msgstr "Klarte ikkje få status"
 
-#: methods/bzip2.cc:151 methods/copy.cc:80 methods/gzip.cc:102
-#: methods/rred.cc:492
+#: methods/bzip2.cc:146 methods/copy.cc:80 methods/gzip.cc:98
+#: methods/rred.cc:530
 msgid "Failed to set modification time"
 msgstr "Klarte ikkje setja endringstidspunkt"
 
@@ -1895,7 +1921,7 @@ msgstr "Tidsavbrot p
 msgid "Server closed the connection"
 msgstr "Tenaren lukka sambandet"
 
-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:811 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Lesefeil"
 
@@ -1907,7 +1933,7 @@ msgstr "Eit svar flaumde over bufferen."
 msgid "Protocol corruption"
 msgstr "Protokolløydeleggjing"
 
-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:853 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Skrivefeil"
 
@@ -1961,7 +1987,7 @@ msgstr "Tidsavbrot p
 msgid "Unable to accept connection"
 msgstr "Klarte ikkje godta tilkoplinga"
 
-#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
+#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302
 msgid "Problem hashing file"
 msgstr "Problem ved oppretting av nøkkel for fil"
 
@@ -2092,68 +2118,68 @@ msgstr "Fekk ei enkel hovudlinje over %u teikn"
 msgid "Bad header line"
 msgstr "Øydelagd hovudlinje"
 
-#: methods/http.cc:558 methods/http.cc:565
+#: methods/http.cc:564 methods/http.cc:571
 msgid "The HTTP server sent an invalid reply header"
 msgstr "HTTP-tenaren sende eit ugyldig svarhovud"
 
-#: methods/http.cc:594
+#: methods/http.cc:600
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Length»-hovud"
 
-#: methods/http.cc:609
+#: methods/http.cc:615
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "HTTP-tenaren sende eit ugyldig «Content-Range»-hovud"
 
-#: methods/http.cc:611
+#: methods/http.cc:617
 msgid "This HTTP server has broken range support"
 msgstr "Denne HTTP-tenaren har øydelagd støtte for område"
 
-#: methods/http.cc:635
+#: methods/http.cc:641
 msgid "Unknown date format"
 msgstr "Ukjend datoformat"
 
-#: methods/http.cc:793
+#: methods/http.cc:799
 msgid "Select failed"
 msgstr "Utvalet mislukkast"
 
-#: methods/http.cc:798
+#: methods/http.cc:804
 msgid "Connection timed out"
 msgstr "Tidsavbrot på sambandet"
 
-#: methods/http.cc:821
+#: methods/http.cc:827
 msgid "Error writing to output file"
 msgstr "Feil ved skriving til utfil"
 
-#: methods/http.cc:852
+#: methods/http.cc:858
 msgid "Error writing to file"
 msgstr "Feil ved skriving til fil"
 
-#: methods/http.cc:880
+#: methods/http.cc:886
 msgid "Error writing to the file"
 msgstr "Feil ved skriving til fila"
 
-#: methods/http.cc:894
+#: methods/http.cc:900
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Feil ved lesing frå tenaren. Sambandet vart lukka i andre enden"
 
-#: methods/http.cc:896
+#: methods/http.cc:902
 msgid "Error reading from server"
 msgstr "Feil ved lesing frå tenaren"
 
-#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
+#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:283
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Klarte ikkje skriva fila %s"
 
-#: methods/http.cc:1154
+#: methods/http.cc:1160
 msgid "Bad header data"
 msgstr "Øydelagde hovuddata"
 
-#: methods/http.cc:1171 methods/http.cc:1226
+#: methods/http.cc:1177 methods/http.cc:1232
 msgid "Connection failed"
 msgstr "Sambandet mislukkast"
 
-#: methods/http.cc:1318
+#: methods/http.cc:1324
 msgid "Internal error"
 msgstr "Intern feil"
 
@@ -2181,21 +2207,21 @@ msgstr "Klarte ikkje opna %s"
 msgid "Unable to synchronize mmap"
 msgstr "Klarte ikkje starta "
 
-#: apt-pkg/contrib/mmap.cc:300
+#: apt-pkg/contrib/mmap.cc:302
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:399
+#: apt-pkg/contrib/mmap.cc:401
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:402
+#: apt-pkg/contrib/mmap.cc:404
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr ""
@@ -2224,7 +2250,7 @@ msgstr ""
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1119
+#: apt-pkg/contrib/strutl.cc:1136
 #, c-format
 msgid "Selection %s not found"
 msgstr "Fann ikkje utvalet %s"
@@ -2345,211 +2371,232 @@ msgstr "Ugyldig operasjon %s"
 msgid "Unable to stat the mount point %s"
 msgstr "Klarte ikkje få status til monteringspunktet %s"
 
-#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
-#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
+#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
+#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
 #: methods/mirror.cc:93
 #, c-format
 msgid "Unable to change to %s"
 msgstr "Klarte ikkje byta til %s"
 
-#: apt-pkg/contrib/cdromutl.cc:204
+#: apt-pkg/contrib/cdromutl.cc:217
 msgid "Failed to stat the cdrom"
 msgstr "Klarte ikkje få status til CD-ROM"
 
-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:159
 #, 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:159
+#: apt-pkg/contrib/fileutl.cc:164
 #, c-format
 msgid "Could not open lock file %s"
 msgstr "Klarte ikkje opna låsefila %s"
 
-#: apt-pkg/contrib/fileutl.cc:177
+#: apt-pkg/contrib/fileutl.cc:182
 #, 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:181
+#: apt-pkg/contrib/fileutl.cc:186
 #, c-format
 msgid "Could not get lock %s"
 msgstr "Klarte ikkje låsa %s"
 
-#: apt-pkg/contrib/fileutl.cc:621
+#: apt-pkg/contrib/fileutl.cc:326
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:353
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:371
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:380
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:670
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Venta på %s, men den fanst ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:633
+#: apt-pkg/contrib/fileutl.cc:682
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:635
+#: apt-pkg/contrib/fileutl.cc:684
 #, fuzzy, c-format
 msgid "Sub-process %s received signal %u."
 msgstr "Underprosessen %s mottok ein segmenteringsfeil."
 
-#: apt-pkg/contrib/fileutl.cc:639
+#: apt-pkg/contrib/fileutl.cc:688
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "Underprosessen %s returnerte ein feilkode (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:641
+#: apt-pkg/contrib/fileutl.cc:690
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "Underprosessen %s avslutta uventa"
 
-#: apt-pkg/contrib/fileutl.cc:697
+#: apt-pkg/contrib/fileutl.cc:755
 #, c-format
 msgid "Could not open file %s"
 msgstr "Klarte ikkje opna fila %s"
 
-#: apt-pkg/contrib/fileutl.cc:714
+#: apt-pkg/contrib/fileutl.cc:772
 #, fuzzy, c-format
 msgid "Could not open file descriptor %d"
 msgstr "Klarte ikkje opna røyr for %s"
 
-#: apt-pkg/contrib/fileutl.cc:774
+#: apt-pkg/contrib/fileutl.cc:832
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr "lese, har framleis %lu att å lesa, men ingen att"
 
-#: apt-pkg/contrib/fileutl.cc:807
+#: apt-pkg/contrib/fileutl.cc:865
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr "skrive, har framleis %lu att å skrive, men klarte ikkje"
 
-#: apt-pkg/contrib/fileutl.cc:906
+#: apt-pkg/contrib/fileutl.cc:1001
 #, fuzzy, c-format
 msgid "Problem closing the gzip file %s"
 msgstr "Problem ved låsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:909
+#: apt-pkg/contrib/fileutl.cc:1004
 #, fuzzy, c-format
 msgid "Problem closing the file %s"
 msgstr "Problem ved låsing av fila"
 
-#: apt-pkg/contrib/fileutl.cc:914
+#: apt-pkg/contrib/fileutl.cc:1009
 #, fuzzy, c-format
 msgid "Problem renaming the file %s to %s"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/contrib/fileutl.cc:925
+#: apt-pkg/contrib/fileutl.cc:1020
 #, fuzzy, c-format
 msgid "Problem unlinking the file %s"
 msgstr "Problem ved oppheving av lenkje til fila"
 
-#: apt-pkg/contrib/fileutl.cc:938
+#: apt-pkg/contrib/fileutl.cc:1033
 msgid "Problem syncing the file"
 msgstr "Problem ved synkronisering av fila"
 
-#: apt-pkg/pkgcache.cc:142
+#: apt-pkg/pkgcache.cc:145
 msgid "Empty package cache"
 msgstr "Tomt pakkelager"
 
-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:151
 msgid "The package cache file is corrupted"
 msgstr "Pakkelagerfila er øydelagd"
 
-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:156
 msgid "The package cache file is an incompatible version"
 msgstr "Versjonen til pakkelagerfila er ikkje kompatibel"
 
-#: apt-pkg/pkgcache.cc:158
+#: apt-pkg/pkgcache.cc:161
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "APT støttar ikkje versjonssystemet «%s»"
 
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:166
 msgid "The package cache was built for a different architecture"
 msgstr "Pakkelageret er bygd for ein annan arkitektur"
 
-#: apt-pkg/pkgcache.cc:290
+#: apt-pkg/pkgcache.cc:293
 msgid "Depends"
 msgstr "Krav"
 
-#: apt-pkg/pkgcache.cc:290
+#: apt-pkg/pkgcache.cc:293
 msgid "PreDepends"
 msgstr "Forkrav"
 
-#: apt-pkg/pkgcache.cc:290
+#: apt-pkg/pkgcache.cc:293
 msgid "Suggests"
 msgstr "Forslag"
 
-#: apt-pkg/pkgcache.cc:291
+#: apt-pkg/pkgcache.cc:294
 msgid "Recommends"
 msgstr "Tilrådingar"
 
-#: apt-pkg/pkgcache.cc:291
+#: apt-pkg/pkgcache.cc:294
 msgid "Conflicts"
 msgstr "Konflikt"
 
-#: apt-pkg/pkgcache.cc:291
+#: apt-pkg/pkgcache.cc:294
 msgid "Replaces"
 msgstr "Byter ut"
 
-#: apt-pkg/pkgcache.cc:292
+#: apt-pkg/pkgcache.cc:295
 msgid "Obsoletes"
 msgstr "Foreldar"
 
-#: apt-pkg/pkgcache.cc:292
+#: apt-pkg/pkgcache.cc:295
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:292
+#: apt-pkg/pkgcache.cc:295
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:303
+#: apt-pkg/pkgcache.cc:306
 msgid "important"
 msgstr "viktig"
 
-#: apt-pkg/pkgcache.cc:303
+#: apt-pkg/pkgcache.cc:306
 msgid "required"
 msgstr "påkravd"
 
-#: apt-pkg/pkgcache.cc:303
+#: apt-pkg/pkgcache.cc:306
 msgid "standard"
 msgstr "vanleg"
 
-#: apt-pkg/pkgcache.cc:304
+#: apt-pkg/pkgcache.cc:307
 msgid "optional"
 msgstr "valfri"
 
-#: apt-pkg/pkgcache.cc:304
+#: apt-pkg/pkgcache.cc:307
 msgid "extra"
 msgstr "tillegg"
 
-#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154
 msgid "Building dependency tree"
 msgstr "Byggjer kravtre"
 
-#: apt-pkg/depcache.cc:125
+#: apt-pkg/depcache.cc:126
 msgid "Candidate versions"
 msgstr "Kandidatversjonar"
 
-#: apt-pkg/depcache.cc:154
+#: apt-pkg/depcache.cc:155
 msgid "Dependency generation"
 msgstr "Genererer kravforhold"
 
-#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
+#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212
 #, fuzzy
 msgid "Reading state information"
 msgstr "Flettar informasjon om tilgjengelege pakkar"
 
-#: apt-pkg/depcache.cc:236
+#: apt-pkg/depcache.cc:237
 #, fuzzy, c-format
 msgid "Failed to open StateFile %s"
 msgstr "Klarte ikkje opna %s"
 
-#: apt-pkg/depcache.cc:242
+#: apt-pkg/depcache.cc:243
 #, fuzzy, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "Klarte ikkje skriva fila %s"
 
-#: apt-pkg/depcache.cc:921
+#: apt-pkg/depcache.cc:922
 #, c-format
 msgid "Internal error, group '%s' has no installable pseudo package"
 msgstr ""
@@ -2637,7 +2684,7 @@ msgstr "Typen 
 #: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
 #, c-format
 msgid ""
-"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
@@ -2656,7 +2703,7 @@ msgstr ""
 #: apt-pkg/packagemanager.cc:495
 #, c-format
 msgid ""
-"Could not perform immediate configuration on already unpacked '%s'.Please "
+"Could not perform immediate configuration on already unpacked '%s'. Please "
 "see man 5 apt.conf under APT::Immediate-Configure for details."
 msgstr ""
 
@@ -2665,13 +2712,13 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "Indeksfiltypen «%s» er ikkje støtta"
 
-#: apt-pkg/algorithms.cc:292
+#: apt-pkg/algorithms.cc:313
 #, 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:1182
+#: apt-pkg/algorithms.cc:1239
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
@@ -2679,14 +2726,15 @@ msgstr ""
 "Feil, «pkgProblemResolver::Resolve» har laga brot. Dette kan skuldast pakkar "
 "som er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1184
+#: apt-pkg/algorithms.cc:1241
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 "Klarte ikkje retta opp problema. Nokre øydelagde pakkar er haldne tilbake."
 
-#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
+#: apt-pkg/algorithms.cc:1517 apt-pkg/algorithms.cc:1519
+#, fuzzy
 msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
+"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 "
@@ -2709,12 +2757,12 @@ msgstr "Klarte ikkje l
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:878
+#: apt-pkg/acquire.cc:857
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:880
+#: apt-pkg/acquire.cc:859
 #, fuzzy, c-format
 msgid "Retrieving file %li of %li"
 msgstr "Les filliste"
@@ -2737,12 +2785,12 @@ msgstr ""
 " «%s»\n"
 "i stasjonen «%s» og trykk Enter.\n"
 
-#: apt-pkg/init.cc:141
+#: apt-pkg/init.cc:146
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Pakkesystemet «%s» er ikkje støtta"
 
-#: apt-pkg/init.cc:157
+#: apt-pkg/init.cc:162
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Klarte ikkje avgjera ein eigna pakkesystemtype"
 
@@ -2764,17 +2812,21 @@ 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-pkg/policy.cc:343
+#: apt-pkg/cachefile.cc:106
+msgid "The list of sources could not be read."
+msgstr "Kjeldelista kan ikkje lesast."
+
+#: apt-pkg/policy.cc:346
 #, 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:365
+#: apt-pkg/policy.cc:368
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "Skjønar ikkje spikringstypen %s"
 
-#: apt-pkg/policy.cc:373
+#: apt-pkg/policy.cc:376
 msgid "No priority (or zero) specified for pin"
 msgstr "Ingen prioritet (eller null) oppgitt for spiker"
 
@@ -2855,16 +2907,16 @@ msgstr "Feil ved behandling av %s (CollectFileProvides)"
 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:982
+#: apt-pkg/pkgcachegen.cc:986
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr "Klarte ikkje få status på kjeldepakkelista %s"
 
-#: apt-pkg/pkgcachegen.cc:1087
+#: apt-pkg/pkgcachegen.cc:1091
 msgid "Collecting File Provides"
 msgstr "Samlar inn filtilbod"
 
-#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272
+#: apt-pkg/pkgcachegen.cc:1269 apt-pkg/pkgcachegen.cc:1276
 msgid "IO Error saving source cache"
 msgstr "IU-feil ved lagring av kjeldelager"
 
@@ -2873,46 +2925,58 @@ msgstr "IU-feil ved lagring av kjeldelager"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "endring av namn mislukkast, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:484
+#: apt-pkg/acquire-item.cc:629
 msgid "MD5Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
-#: apt-pkg/acquire-item.cc:1713
+#: apt-pkg/acquire-item.cc:887 apt-pkg/acquire-item.cc:1781
+#: apt-pkg/acquire-item.cc:1924
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Feil MD5-sum"
 
-#: apt-pkg/acquire-item.cc:1240
+#: apt-pkg/acquire-item.cc:1341
+#, 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:1356
+#, 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:1415
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formated in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1277
+#: apt-pkg/acquire-item.cc:1452
 #, c-format
 msgid "Release file expired, ignoring %s (invalid since %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1298
+#: apt-pkg/acquire-item.cc:1473
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1324
+#: apt-pkg/acquire-item.cc:1506
 #, c-format
 msgid ""
 "A error occurred during the signature verification. The repository is not "
-"updated and the previous index files will be used.GPG error: %s: %s\n"
+"updated and the previous index files will be used. GPG error: %s: %s\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1333
+#: apt-pkg/acquire-item.cc:1515
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1361
+#: apt-pkg/acquire-item.cc:1572
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2921,7 +2985,7 @@ 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:1420
+#: apt-pkg/acquire-item.cc:1631
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2929,14 +2993,14 @@ msgid ""
 msgstr ""
 "Fann ikkje fila for pakken %s. Det kan henda du må fiksa denne pakken sjølv."
 
-#: apt-pkg/acquire-item.cc:1475
+#: apt-pkg/acquire-item.cc:1686
 #, 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-item.cc:1562
+#: apt-pkg/acquire-item.cc:1773
 msgid "Size mismatch"
 msgstr "Feil storleik"
 
@@ -2945,22 +3009,22 @@ msgstr "Feil storleik"
 msgid "Unable to parse Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
 
-#: apt-pkg/indexrecords.cc:60
+#: apt-pkg/indexrecords.cc:63
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Merk, vel %s i staden for %s\n"
 
-#: apt-pkg/indexrecords.cc:94
+#: apt-pkg/indexrecords.cc:97
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/indexrecords.cc:107
+#: apt-pkg/indexrecords.cc:110
 #, fuzzy, c-format
 msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr "Ugyldig linje i avleiingsfila: %s"
 
-#: apt-pkg/indexrecords.cc:122
+#: apt-pkg/indexrecords.cc:125
 #, fuzzy, c-format
 msgid "Invalid 'Date' entry in Release file %s"
 msgstr "Klarte ikkje tolka pakkefila %s (1)"
@@ -3058,37 +3122,37 @@ msgstr "Skriv ny kjeldeliste\n"
 msgid "Source list entries for this disc are:\n"
 msgstr "Kjeldelisteoppføringar for denne disken er:\n"
 
-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:909
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "Skreiv %i postar.\n"
 
-#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904
+#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:911
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "Skreiv %i postar med %i manglande filer.\n"
 
-#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:914
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "Skreiv %i postar med %i filer som ikkje passa\n"
 
-#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:917
 #, 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"
 
-#: apt-pkg/indexcopy.cc:532
+#: apt-pkg/indexcopy.cc:537
 #, fuzzy, c-format
 msgid "Skipping nonexistent file %s"
 msgstr "Opnar oppsettsfila %s"
 
-#: apt-pkg/indexcopy.cc:538
+#: apt-pkg/indexcopy.cc:543
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:544
+#: apt-pkg/indexcopy.cc:549
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Feil MD5-sum"
@@ -3115,7 +3179,7 @@ msgstr "Fann ikkje pakken %s"
 
 #: apt-pkg/cacheset.cc:467
 #, c-format
-msgid "Can't select versions from package '%s' as it purely virtual"
+msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
 #: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
@@ -3170,12 +3234,13 @@ msgstr ""
 msgid "Running post-installation trigger %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:643
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:642
 #, fuzzy, c-format
 msgid "Directory '%s' missing"
 msgstr "Listekatalogen %spartial manglar."
 
-#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
+#: apt-pkg/deb/dpkgpm.cc:657 apt-pkg/deb/dpkgpm.cc:671
 #, fuzzy, c-format
 msgid "Could not open file '%s'"
 msgstr "Klarte ikkje opna fila %s"
@@ -3296,14 +3361,14 @@ msgstr ""
 msgid "[Mirror: %s]"
 msgstr ""
 
-#: methods/rred.cc:465
+#: methods/rred.cc:503
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
-#: methods/rred.cc:470
+#: methods/rred.cc:508
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "