* apt-pkg/acquire.cc:

[apt.git] / po / apt-all.pot

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 81a84a928f5ee424a05ad81858942861786f4023..b8305c25ce7b85f8f446c25a96b26d77c9a69a16 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2008-05-28 14:25+0200\n"
+"POT-Creation-Date: 2009-07-21 15:49+0200\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -15,153 +15,148 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 

-#: cmdline/apt-cache.cc:143
+#: cmdline/apt-cache.cc:141

 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
 #, c-format
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
+#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575

 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 

-#: cmdline/apt-cache.cc:247
+#: cmdline/apt-cache.cc:245

 msgid "Total package names: "
 msgstr ""
 
 msgid "Total package names: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:287
+#: cmdline/apt-cache.cc:285

 msgid "  Normal packages: "
 msgstr ""
 
 msgid "  Normal packages: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:288
+#: cmdline/apt-cache.cc:286

 msgid "  Pure virtual packages: "
 msgstr ""
 
 msgid "  Pure virtual packages: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:289
+#: cmdline/apt-cache.cc:287

 msgid "  Single virtual packages: "
 msgstr ""
 
 msgid "  Single virtual packages: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:290
+#: cmdline/apt-cache.cc:288

 msgid "  Mixed virtual packages: "
 msgstr ""
 
 msgid "  Mixed virtual packages: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:291
+#: cmdline/apt-cache.cc:289

 msgid "  Missing: "
 msgstr ""
 
 msgid "  Missing: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:293
+#: cmdline/apt-cache.cc:291

 msgid "Total distinct versions: "
 msgstr ""
 
 msgid "Total distinct versions: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:293

 msgid "Total distinct descriptions: "
 msgstr ""
 
 msgid "Total distinct descriptions: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:295

 msgid "Total dependencies: "
 msgstr ""
 
 msgid "Total dependencies: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:300
+#: cmdline/apt-cache.cc:298

 msgid "Total ver/file relations: "
 msgstr ""
 
 msgid "Total ver/file relations: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:300

 msgid "Total Desc/File relations: "
 msgstr ""
 
 msgid "Total Desc/File relations: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:304
+#: cmdline/apt-cache.cc:302

 msgid "Total Provides mappings: "
 msgstr ""
 
 msgid "Total Provides mappings: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:314

 msgid "Total globbed strings: "
 msgstr ""
 
 msgid "Total globbed strings: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:330
+#: cmdline/apt-cache.cc:328

 msgid "Total dependency version space: "
 msgstr ""
 
 msgid "Total dependency version space: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:335
+#: cmdline/apt-cache.cc:333

 msgid "Total slack space: "
 msgstr ""
 
 msgid "Total slack space: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:343
+#: cmdline/apt-cache.cc:341

 msgid "Total space accounted for: "
 msgstr ""
 
 msgid "Total space accounted for: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222

 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 

-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1297

 msgid "You must give exactly one pattern"
 msgstr ""
 
 msgid "You must give exactly one pattern"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1447
+#: cmdline/apt-cache.cc:1451

 msgid "No packages found"
 msgstr ""
 
 msgid "No packages found"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1528

 msgid "Package files:"
 msgstr ""
 
 msgid "Package files:"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
+#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
-msgstr ""
-

 #. Show any packages have explicit pins
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1544
+#: cmdline/apt-cache.cc:1549

 msgid "Pinned packages:"
 msgstr ""
 
 msgid "Pinned packages:"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602

 msgid "(not found)"
 msgstr ""
 
 #. Installed version
 msgid "(not found)"
 msgstr ""
 
 #. Installed version

-#: cmdline/apt-cache.cc:1577
+#: cmdline/apt-cache.cc:1582

 msgid "  Installed: "
 msgstr ""
 
 msgid "  Installed: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
+#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592

 msgid "(none)"
 msgstr ""
 
 #. Candidate Version
 msgid "(none)"
 msgstr ""
 
 #. Candidate Version

-#: cmdline/apt-cache.cc:1584
+#: cmdline/apt-cache.cc:1589

 msgid "  Candidate: "
 msgstr ""
 
 msgid "  Candidate: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:1594
+#: cmdline/apt-cache.cc:1599

 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1603
+#: cmdline/apt-cache.cc:1608

 msgid "  Version table:"
 msgstr ""
 
 msgid "  Version table:"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1618
+#: cmdline/apt-cache.cc:1623

 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 
 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70

 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547

-#: cmdline/apt-get.cc:2571 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2586 cmdline/apt-sortpkgs.cc:144

 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1721
+#: cmdline/apt-cache.cc:1726

 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"


@@ -184,8 +179,8 @@ msgid ""
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"

-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphVis\n"
+"   pkgnames - List the names of all packages in the system\n"
+"   dotty - Generate package graphs for GraphViz\n"

 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"
 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"


@@ -251,7 +246,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:827

 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""


@@ -550,221 +545,221 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
 msgid "Failed to rename %s to %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127

 msgid "Y"
 msgstr ""
 
 msgid "Y"
 msgstr ""
 

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1661

 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244

 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 

-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334

 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:333
+#: cmdline/apt-get.cc:336

 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343

 msgid "but it is not installable"
 msgstr ""
 
 msgid "but it is not installable"
 msgstr ""
 

-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345

 msgid "but it is a virtual package"
 msgstr ""
 
 msgid "but it is a virtual package"
 msgstr ""
 

-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348

 msgid "but it is not installed"
 msgstr ""
 
 msgid "but it is not installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348

 msgid "but it is not going to be installed"
 msgstr ""
 
 msgid "but it is not going to be installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353

 msgid " or"
 msgstr ""
 
 msgid " or"
 msgstr ""
 

-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382

 msgid "The following NEW packages will be installed:"
 msgstr ""
 
 msgid "The following NEW packages will be installed:"
 msgstr ""
 

-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408

 msgid "The following packages will be REMOVED:"
 msgstr ""
 
 msgid "The following packages will be REMOVED:"
 msgstr ""
 

-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430

 msgid "The following packages have been kept back:"
 msgstr ""
 
 msgid "The following packages have been kept back:"
 msgstr ""
 

-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451

 msgid "The following packages will be upgraded:"
 msgstr ""
 
 msgid "The following packages will be upgraded:"
 msgstr ""
 

-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472

 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 

-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492

 msgid "The following held packages will be changed:"
 msgstr ""
 
 msgid "The following held packages will be changed:"
 msgstr ""
 

-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545

 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 

-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553

 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 

-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584

 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 

-#: cmdline/apt-get.cc:585
+#: cmdline/apt-get.cc:588

 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 

-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590

 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 

-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:593
+#: cmdline/apt-get.cc:596

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:667
+#: cmdline/apt-get.cc:670

 msgid "Correcting dependencies..."
 msgstr ""
 
 msgid "Correcting dependencies..."
 msgstr ""
 

-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:673

 msgid " failed."
 msgstr ""
 
 msgid " failed."
 msgstr ""
 

-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:676

 msgid "Unable to correct dependencies"
 msgstr ""
 
 msgid "Unable to correct dependencies"
 msgstr ""
 

-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:679

 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 

-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:681

 msgid " Done"
 msgstr ""
 
 msgid " Done"
 msgstr ""
 

-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:685

 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 

-#: cmdline/apt-get.cc:685
+#: cmdline/apt-get.cc:688

 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 

-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:710

 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 

-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:714

 msgid "Authentication warning overridden.\n"
 msgstr ""
 
 msgid "Authentication warning overridden.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:721

 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 

-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:723

 msgid "Some packages could not be authenticated"
 msgstr ""
 
 msgid "Some packages could not be authenticated"
 msgstr ""
 

-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:732 cmdline/apt-get.cc:884

 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 

-#: cmdline/apt-get.cc:773
+#: cmdline/apt-get.cc:776

 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
 

-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:785

 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 

-#: cmdline/apt-get.cc:793
+#: cmdline/apt-get.cc:796

 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:812 cmdline/apt-get.cc:2003 cmdline/apt-get.cc:2036

 msgid "Unable to lock the download directory"
 msgstr ""
 
 msgid "Unable to lock the download directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:2084 cmdline/apt-get.cc:2330

 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
 

-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:837

 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 
 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
 msgstr ""
 

-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:842

 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:845

 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:847
+#: cmdline/apt-get.cc:850

 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 
 #, c-format
 msgid "After this operation, %sB of additional disk space will be used.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:853

 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
 #, c-format
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:2179

 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:874

 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 

-#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:890 cmdline/apt-get.cc:910

 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 

-#: cmdline/apt-get.cc:889
+#: cmdline/apt-get.cc:892

 msgid "Yes, do as I say!"
 msgstr ""
 
 msgid "Yes, do as I say!"
 msgstr ""
 

-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:894

 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"


@@ -772,74 +767,74 @@ msgid ""
 " ?] "
 msgstr ""
 
 " ?] "
 msgstr ""
 

-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:900 cmdline/apt-get.cc:919

 msgid "Abort."
 msgstr ""
 
 msgid "Abort."
 msgstr ""
 

-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:915

 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344
+#: cmdline/apt-get.cc:987 cmdline/apt-get.cc:2227 apt-pkg/algorithms.cc:1407

 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1005

 msgid "Some files failed to download"
 msgstr ""
 
 msgid "Some files failed to download"
 msgstr ""
 

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223
+#: cmdline/apt-get.cc:1006 cmdline/apt-get.cc:2236

 msgid "Download complete and in download only mode"
 msgstr ""
 
 msgid "Download complete and in download only mode"
 msgstr ""
 

-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1012

 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 

-#: cmdline/apt-get.cc:1013
+#: cmdline/apt-get.cc:1016

 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 

-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1021

 msgid "Unable to correct missing packages."
 msgstr ""
 
 msgid "Unable to correct missing packages."
 msgstr ""
 

-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1022

 msgid "Aborting install."
 msgstr ""
 
 msgid "Aborting install."
 msgstr ""
 

-#: cmdline/apt-get.cc:1053
+#: cmdline/apt-get.cc:1056

 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1063
+#: cmdline/apt-get.cc:1066

 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1081
+#: cmdline/apt-get.cc:1084

 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1092
+#: cmdline/apt-get.cc:1095

 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1104
+#: cmdline/apt-get.cc:1107

 msgid " [Installed]"
 msgstr ""
 
 msgid " [Installed]"
 msgstr ""
 

-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1112

 msgid "You should explicitly select one to install."
 msgstr ""
 
 msgid "You should explicitly select one to install."
 msgstr ""
 

-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1117

 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"


@@ -847,111 +842,126 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
 "is only available from another source\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1133
+#: cmdline/apt-get.cc:1136

 msgid "However the following packages replace it:"
 msgstr ""
 
 msgid "However the following packages replace it:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1136
+#: cmdline/apt-get.cc:1139

 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 

-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1159

 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1167

 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1193
+#: cmdline/apt-get.cc:1196

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 

-#: cmdline/apt-get.cc:1195
+#: cmdline/apt-get.cc:1198

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 

-#: cmdline/apt-get.cc:1201
+#: cmdline/apt-get.cc:1204

 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1338
+#: cmdline/apt-get.cc:1310
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1348

 msgid "The update command takes no arguments"
 msgstr ""
 
 msgid "The update command takes no arguments"
 msgstr ""
 

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1361

 msgid "Unable to lock the list directory"
 msgstr ""
 
 msgid "Unable to lock the list directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:1403
+#: cmdline/apt-get.cc:1413

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1445

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1447

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1452

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("Since you only requested a single operation it is extremely likely that\n"
+#. "the package is simply not installable and a bug report against\n"
+#. "that package should be filed.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1455 cmdline/apt-get.cc:1745

 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1449
+#: cmdline/apt-get.cc:1459

 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1478

 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1533

 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1648 cmdline/apt-get.cc:1684

 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1671

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1692
+#: cmdline/apt-get.cc:1702

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1715

 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1708
+#: cmdline/apt-get.cc:1718

 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 

-#: cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:1730

 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"
 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"


@@ -959,159 +969,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1728
-msgid ""
-"Since you only requested a single operation it is extremely likely that\n"
-"the package is simply not installable and a bug report against\n"
-"that package should be filed."
-msgstr ""
-
-#: cmdline/apt-get.cc:1736
+#: cmdline/apt-get.cc:1748

 msgid "Broken packages"
 msgstr ""
 
 msgid "Broken packages"
 msgstr ""
 

-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1777

 msgid "The following extra packages will be installed:"
 msgstr ""
 
 msgid "The following extra packages will be installed:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1866

 msgid "Suggested packages:"
 msgstr ""
 
 msgid "Suggested packages:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1855
+#: cmdline/apt-get.cc:1867

 msgid "Recommended packages:"
 msgstr ""
 
 msgid "Recommended packages:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1896

 msgid "Calculating upgrade... "
 msgstr ""
 
 msgid "Calculating upgrade... "
 msgstr ""
 

-#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112
+#: cmdline/apt-get.cc:1899 methods/ftp.cc:702 methods/connect.cc:112

 msgid "Failed"
 msgstr ""
 
 msgid "Failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:1891
+#: cmdline/apt-get.cc:1904

 msgid "Done"
 msgstr ""
 
 msgid "Done"
 msgstr ""
 

-#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:1971 cmdline/apt-get.cc:1979

 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 

-#: cmdline/apt-get.cc:2066
+#: cmdline/apt-get.cc:2079

 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2348

 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2145
+#: cmdline/apt-get.cc:2158

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2173
+#: cmdline/apt-get.cc:2186

 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2179
+#: cmdline/apt-get.cc:2192

 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2182
+#: cmdline/apt-get.cc:2195

 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2188
+#: cmdline/apt-get.cc:2201

 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2219
+#: cmdline/apt-get.cc:2232

 msgid "Failed to fetch some archives."
 msgstr ""
 
 msgid "Failed to fetch some archives."
 msgstr ""
 

-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2260

 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2272

 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2260
+#: cmdline/apt-get.cc:2273

 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2290

 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2296
+#: cmdline/apt-get.cc:2309

 msgid "Child process failed"
 msgstr ""
 
 msgid "Child process failed"
 msgstr ""
 

-#: cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:2325

 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 

-#: cmdline/apt-get.cc:2340
+#: cmdline/apt-get.cc:2353

 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2360
+#: cmdline/apt-get.cc:2373

 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2425

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 

-#: cmdline/apt-get.cc:2465
+#: cmdline/apt-get.cc:2478

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 

-#: cmdline/apt-get.cc:2501
+#: cmdline/apt-get.cc:2514

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 

-#: cmdline/apt-get.cc:2526
+#: cmdline/apt-get.cc:2541

 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2555

 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 

-#: cmdline/apt-get.cc:2544
+#: cmdline/apt-get.cc:2559

 msgid "Failed to process build dependencies"
 msgstr ""
 
 msgid "Failed to process build dependencies"
 msgstr ""
 

-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2591

 msgid "Supported modules:"
 msgstr ""
 
 msgid "Supported modules:"
 msgstr ""
 

-#: cmdline/apt-get.cc:2617
+#: cmdline/apt-get.cc:2632

 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"


@@ -1127,7 +1130,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1155,6 +1158,14 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 

+#: cmdline/apt-get.cc:2799
+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 ""
+

 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""


@@ -1370,9 +1381,9 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 

-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822

 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
 #: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320

-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
+#: apt-pkg/acquire.cc:419 apt-pkg/clean.cc:34 apt-pkg/policy.cc:268

 #, c-format
 msgid "Unable to read %s"
 msgstr ""
 #, c-format
 msgid "Unable to read %s"
 msgstr ""


@@ -1402,9 +1413,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
 #. Build the status cache
 msgstr ""
 
 #. Build the status cache

-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:760
+#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
+#: apt-pkg/pkgcachegen.cc:957

 msgid "Reading package lists"
 msgstr ""
 
 msgid "Reading package lists"
 msgstr ""
 


@@ -1597,7 +1608,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
 msgid "Server closed the connection"
 msgstr ""
 

-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:541 methods/rsh.cc:190

 msgid "Read error"
 msgstr ""
 
 msgid "Read error"
 msgstr ""
 


@@ -1609,7 +1620,7 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
 msgid "Protocol corruption"
 msgstr ""
 

-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:580 methods/rsh.cc:232

 msgid "Write error"
 msgstr ""
 
 msgid "Write error"
 msgstr ""
 


@@ -1663,7 +1674,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:991 methods/rsh.cc:303

 msgid "Problem hashing file"
 msgstr ""
 
 msgid "Problem hashing file"
 msgstr ""
 


@@ -1747,38 +1758,38 @@ msgstr ""
 msgid "Unable to connect to %s %s:"
 msgstr ""
 
 msgid "Unable to connect to %s %s:"
 msgstr ""
 

-#: methods/gpgv.cc:65
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 

-#: methods/gpgv.cc:101
+#: methods/gpgv.cc:107

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:205
+#: methods/gpgv.cc:223

 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 

-#: methods/gpgv.cc:210
+#: methods/gpgv.cc:228

 msgid "At least one invalid signature was encountered."
 msgstr ""
 
 msgid "At least one invalid signature was encountered."
 msgstr ""
 

-#: methods/gpgv.cc:214
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

-#: methods/gpgv.cc:219
+#: methods/gpgv.cc:237

 msgid "Unknown error executing gpgv"
 msgstr ""
 
 msgid "Unknown error executing gpgv"
 msgstr ""
 

-#: methods/gpgv.cc:250
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

 msgid "The following signatures were invalid:\n"
 msgstr ""
 
 msgid "The following signatures were invalid:\n"
 msgstr ""
 

-#: methods/gpgv.cc:257
+#: methods/gpgv.cc:285

 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"


@@ -1794,76 +1805,80 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
 msgid "Read error from %s process"
 msgstr ""
 

-#: methods/http.cc:377
+#: methods/http.cc:379

 msgid "Waiting for headers"
 msgstr ""
 
 msgid "Waiting for headers"
 msgstr ""
 

-#: methods/http.cc:523
+#: methods/http.cc:525

 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr ""
 

-#: methods/http.cc:531
+#: methods/http.cc:533

 msgid "Bad header line"
 msgstr ""
 
 msgid "Bad header line"
 msgstr ""
 

-#: methods/http.cc:550 methods/http.cc:557
+#: methods/http.cc:552 methods/http.cc:559

 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 

-#: methods/http.cc:586
+#: methods/http.cc:588

 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 

-#: methods/http.cc:601
+#: methods/http.cc:603

 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 

-#: methods/http.cc:603
+#: methods/http.cc:605

 msgid "This HTTP server has broken range support"
 msgstr ""
 
 msgid "This HTTP server has broken range support"
 msgstr ""
 

-#: methods/http.cc:627
+#: methods/http.cc:629

 msgid "Unknown date format"
 msgstr ""
 
 msgid "Unknown date format"
 msgstr ""
 

-#: methods/http.cc:774
+#: methods/http.cc:782

 msgid "Select failed"
 msgstr ""
 
 msgid "Select failed"
 msgstr ""
 

-#: methods/http.cc:779
+#: methods/http.cc:787

 msgid "Connection timed out"
 msgstr ""
 
 msgid "Connection timed out"
 msgstr ""
 

-#: methods/http.cc:802
+#: methods/http.cc:810

 msgid "Error writing to output file"
 msgstr ""
 
 msgid "Error writing to output file"
 msgstr ""
 

-#: methods/http.cc:833
+#: methods/http.cc:841

 msgid "Error writing to file"
 msgstr ""
 
 msgid "Error writing to file"
 msgstr ""
 

-#: methods/http.cc:861
+#: methods/http.cc:869

 msgid "Error writing to the file"
 msgstr ""
 
 msgid "Error writing to the file"
 msgstr ""
 

-#: methods/http.cc:875
+#: methods/http.cc:883

 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 

-#: methods/http.cc:877
+#: methods/http.cc:885

 msgid "Error reading from server"
 msgstr ""
 
 msgid "Error reading from server"
 msgstr ""
 

-#: methods/http.cc:1104
+#: methods/http.cc:976 apt-pkg/contrib/mmap.cc:196
+msgid "Failed to truncate file"
+msgstr ""
+
+#: methods/http.cc:1141

 msgid "Bad header data"
 msgstr ""
 
 msgid "Bad header data"
 msgstr ""
 

-#: methods/http.cc:1121 methods/http.cc:1176
+#: methods/http.cc:1158 methods/http.cc:1213

 msgid "Connection failed"
 msgstr ""
 
 msgid "Connection failed"
 msgstr ""
 

-#: methods/http.cc:1228
+#: methods/http.cc:1305

 msgid "Internal error"
 msgstr ""
 
 msgid "Internal error"
 msgstr ""
 


@@ -1876,7 +1891,38 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014
+#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#, 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 ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:335
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:342
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:349
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:354
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1029

 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 #, c-format
 msgid "Selection %s not found"
 msgstr ""


@@ -1891,42 +1937,42 @@ msgstr ""
 msgid "Opening configuration file %s"
 msgstr ""
 
 msgid "Opening configuration file %s"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:662
+#: apt-pkg/contrib/configuration.cc:663

 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:681
+#: apt-pkg/contrib/configuration.cc:682

 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:698
+#: apt-pkg/contrib/configuration.cc:699

 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:738
+#: apt-pkg/contrib/configuration.cc:739

 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:745
+#: apt-pkg/contrib/configuration.cc:746

 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755

 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:758
+#: apt-pkg/contrib/configuration.cc:759

 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:809
+#: apt-pkg/contrib/configuration.cc:810

 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""


@@ -1992,12 +2038,13 @@ msgstr ""
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
 msgid "Unable to stat the mount point %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
+#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:40

 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:187
+#: apt-pkg/contrib/cdromutl.cc:188

 msgid "Failed to stat the cdrom"
 msgstr ""
 
 msgid "Failed to stat the cdrom"
 msgstr ""
 


@@ -2026,143 +2073,152 @@ msgstr ""
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:454
+#: apt-pkg/contrib/fileutl.cc:455

 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:457
 #, c-format
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:457
 #, c-format

+msgid "Sub-process %s received signal %u."
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:460
+#, c-format

 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:459
+#: apt-pkg/contrib/fileutl.cc:462

 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:506

 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:562

 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:589
+#: apt-pkg/contrib/fileutl.cc:592

 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:664
+#: apt-pkg/contrib/fileutl.cc:667

 msgid "Problem closing the file"
 msgstr ""
 
 msgid "Problem closing the file"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:670
+#: apt-pkg/contrib/fileutl.cc:673

 msgid "Problem unlinking the file"
 msgstr ""
 
 msgid "Problem unlinking the file"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:681
+#: apt-pkg/contrib/fileutl.cc:684

 msgid "Problem syncing the file"
 msgstr ""
 
 msgid "Problem syncing the file"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:132
+#: apt-pkg/pkgcache.cc:133

 msgid "Empty package cache"
 msgstr ""
 
 msgid "Empty package cache"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:138
+#: apt-pkg/pkgcache.cc:139

 msgid "The package cache file is corrupted"
 msgstr ""
 
 msgid "The package cache file is corrupted"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:143
+#: apt-pkg/pkgcache.cc:144

 msgid "The package cache file is an incompatible version"
 msgstr ""
 
 msgid "The package cache file is an incompatible version"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:148
+#: apt-pkg/pkgcache.cc:149

 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:153
+#: apt-pkg/pkgcache.cc:154

 msgid "The package cache was built for a different architecture"
 msgstr ""
 
 msgid "The package cache was built for a different architecture"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225

 msgid "Depends"
 msgstr ""
 
 msgid "Depends"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225

 msgid "PreDepends"
 msgstr ""
 
 msgid "PreDepends"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:224
+#: apt-pkg/pkgcache.cc:225

 msgid "Suggests"
 msgstr ""
 
 msgid "Suggests"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226

 msgid "Recommends"
 msgstr ""
 
 msgid "Recommends"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226

 msgid "Conflicts"
 msgstr ""
 
 msgid "Conflicts"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:226

 msgid "Replaces"
 msgstr ""
 
 msgid "Replaces"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227

 msgid "Obsoletes"
 msgstr ""
 
 msgid "Obsoletes"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:227

 msgid "Breaks"
 msgstr ""
 
 msgid "Breaks"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238

 msgid "important"
 msgstr ""
 
 msgid "important"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238

 msgid "required"
 msgstr ""
 
 msgid "required"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:238

 msgid "standard"
 msgstr ""
 
 msgid "standard"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239

 msgid "optional"
 msgstr ""
 
 msgid "optional"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:239

 msgid "extra"
 msgstr ""
 
 msgid "extra"
 msgstr ""
 

-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152

 msgid "Building dependency tree"
 msgstr ""
 
 msgid "Building dependency tree"
 msgstr ""
 

-#: apt-pkg/depcache.cc:122
+#: apt-pkg/depcache.cc:124

 msgid "Candidate versions"
 msgstr ""
 
 msgid "Candidate versions"
 msgstr ""
 

-#: apt-pkg/depcache.cc:151
+#: apt-pkg/depcache.cc:153

 msgid "Dependency generation"
 msgstr ""
 
 msgid "Dependency generation"
 msgstr ""
 

-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197

 msgid "Reading state information"
 msgstr ""
 
 msgid "Reading state information"
 msgstr ""
 

-#: apt-pkg/depcache.cc:219
+#: apt-pkg/depcache.cc:221

 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr ""
 

-#: apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:227

 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""


@@ -2240,46 +2296,46 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/algorithms.cc:247
+#: apt-pkg/algorithms.cc:248

 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1106
+#: apt-pkg/algorithms.cc:1154

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1108
+#: apt-pkg/algorithms.cc:1156

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372
+#: apt-pkg/algorithms.cc:1433 apt-pkg/algorithms.cc:1435

 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 

-#: apt-pkg/acquire.cc:59
+#: apt-pkg/acquire.cc:60

 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 

-#: apt-pkg/acquire.cc:63
+#: apt-pkg/acquire.cc:64

 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:827
+#: apt-pkg/acquire.cc:829

 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 

-#: apt-pkg/acquire.cc:829
+#: apt-pkg/acquire.cc:831

 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""


@@ -2294,17 +2350,17 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:399
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 

-#: apt-pkg/init.cc:124
+#: apt-pkg/init.cc:125

 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/init.cc:140
+#: apt-pkg/init.cc:141

 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
 msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 


@@ -2325,16 +2381,17 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 

-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:329
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:289
+#: apt-pkg/policy.cc:351

 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 

-#: apt-pkg/policy.cc:297
+#: apt-pkg/policy.cc:359

 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 


@@ -2352,82 +2409,82 @@ msgstr ""
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
 msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:153
+#: apt-pkg/pkgcachegen.cc:164

 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:178
+#: apt-pkg/pkgcachegen.cc:189

 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:182
+#: apt-pkg/pkgcachegen.cc:193

 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:213
+#: apt-pkg/pkgcachegen.cc:224

 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:217
+#: apt-pkg/pkgcachegen.cc:228

 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:221
+#: apt-pkg/pkgcachegen.cc:232

 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:245
+#: apt-pkg/pkgcachegen.cc:256

 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:251
+#: apt-pkg/pkgcachegen.cc:262

 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/pkgcachegen.cc:265

 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:257
+#: apt-pkg/pkgcachegen.cc:268

 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:271

 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:288
+#: apt-pkg/pkgcachegen.cc:299

 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:312

 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
 #, c-format
 msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:307
+#: apt-pkg/pkgcachegen.cc:318

 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
 #, c-format
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:678
+#: apt-pkg/pkgcachegen.cc:690

 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't stat source package list %s"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:775

 msgid "Collecting File Provides"
 msgstr ""
 
 msgid "Collecting File Provides"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+#: apt-pkg/pkgcachegen.cc:902 apt-pkg/pkgcachegen.cc:909

 msgid "IO Error saving source cache"
 msgstr ""
 
 msgid "IO Error saving source cache"
 msgstr ""
 


@@ -2440,38 +2497,53 @@ msgstr ""
 msgid "MD5Sum mismatch"
 msgstr ""
 
 msgid "MD5Sum mismatch"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+#: apt-pkg/acquire-item.cc:658 apt-pkg/acquire-item.cc:1426

 msgid "Hash Sum mismatch"
 msgstr ""
 
 msgid "Hash Sum mismatch"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1100
+#: apt-pkg/acquire-item.cc:1118

 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1213
+#: apt-pkg/acquire-item.cc:1231

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1272
+#: apt-pkg/acquire-item.cc:1290

 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1313
+#: apt-pkg/acquire-item.cc:1331

 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1400
+#: apt-pkg/acquire-item.cc:1418

 msgid "Size mismatch"
 msgstr ""
 
 msgid "Size mismatch"
 msgstr ""
 

+#: apt-pkg/indexrecords.cc:40
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+

 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"


@@ -2526,6 +2598,12 @@ msgid ""
 "zu signatures\n"
 msgstr ""
 
 "zu signatures\n"
 msgstr ""
 

+#: apt-pkg/cdrom.cc:689
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+

 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"
 #: apt-pkg/cdrom.cc:715
 #, c-format
 msgid "Found label '%s'\n"


@@ -2554,100 +2632,119 @@ msgstr ""
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:833

 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:835

 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:838

 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:841

 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:486
+#: apt-pkg/deb/dpkgpm.cc:49

 #, c-format
 #, c-format

-msgid "Directory '%s' missing"
+msgid "Installing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:569
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642

 #, c-format
 #, c-format

-msgid "Preparing %s"
+msgid "Configuring %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:570
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649

 #, c-format
 #, c-format

-msgid "Unpacking %s"
+msgid "Removing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:575
+#: apt-pkg/deb/dpkgpm.cc:52

 #, c-format
 #, c-format

-msgid "Preparing to configure %s"
+msgid "Running post-installation trigger %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605
+#: apt-pkg/deb/dpkgpm.cc:546

 #, c-format
 #, c-format

-msgid "Configuring %s"
+msgid "Directory '%s' missing"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579
+#: apt-pkg/deb/dpkgpm.cc:635

 #, c-format
 #, c-format

-msgid "Processing triggers for %s"
+msgid "Preparing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:581
+#: apt-pkg/deb/dpkgpm.cc:636

 #, c-format
 #, c-format

-msgid "Installed %s"
+msgid "Unpacking %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588
-#: apt-pkg/deb/dpkgpm.cc:589
+#: apt-pkg/deb/dpkgpm.cc:641

 #, c-format
 #, c-format

-msgid "Preparing for removal of %s"
+msgid "Preparing to configure %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606
+#: apt-pkg/deb/dpkgpm.cc:643

 #, c-format
 #, c-format

-msgid "Removing %s"
+msgid "Installed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:648
+#, c-format
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:592
+#: apt-pkg/deb/dpkgpm.cc:650

 #, c-format
 msgid "Removed %s"
 msgstr ""
 
 #, c-format
 msgid "Removed %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:597
+#: apt-pkg/deb/dpkgpm.cc:655

 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:598
+#: apt-pkg/deb/dpkgpm.cc:656

 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 
 #, c-format
 msgid "Completely removed %s"
 msgstr ""
 

-#. populate the "processing" map
-#: apt-pkg/deb/dpkgpm.cc:604
+#: apt-pkg/deb/dpkgpm.cc:820
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:848
+msgid "Running dpkg"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:70

 #, c-format
 #, c-format

-msgid "Installing %s"
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:607
+#: apt-pkg/deb/debsystem.cc:73

 #, c-format
 #, c-format

-msgid "Running post-installation trigger %s"
+msgid "Unable to lock the administration directory (%s), are you root?"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:756
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: apt-pkg/deb/debsystem.cc:82
+msgid ""
+"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
+"the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:100
+msgid "Not locked"

 msgstr ""
 
 #: methods/rred.cc:219
 msgstr ""
 
 #: methods/rred.cc:219