From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 7 Sep 2006 20:55:14 +0000 (+0200)
Subject: * merged from the apt--install-recommends branch
X-Git-Tag: 0.7.24ubuntu1~234
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/2ea152b6fb5799f180d4133dc76c52cf1a122f54

* merged from the apt--install-recommends branch
---

2ea152b6fb5799f180d4133dc76c52cf1a122f54
diff --cc configure.in
index 9fd92e84f,f0b0d6703..58fc4f60d
--- a/configure.in
+++ b/configure.in
@@@ -18,7 -18,7 +18,7 @@@ AC_CONFIG_AUX_DIR(buildlib
  AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
  
  dnl -- SET THIS TO THE RELEASE VERSION --
- AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu6")
 -AC_DEFINE_UNQUOTED(VERSION,"0.6.45.1")
++AC_DEFINE_UNQUOTED(VERSION,"0.6.45ubuntu7")
  PACKAGE="apt"
  AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
  AC_SUBST(PACKAGE)
diff --cc debian/changelog
index 0bd5e4532,65ec82cc1..c76ca0f69
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,59 -1,11 +1,66 @@@
 -apt (0.6.45.2) unstable; urgency=low
++apt (0.6.45ubuntu7) edgy; urgency=low
+ 
 -  * added "--install-recommends" to handle recommends as 
 -    dependencies (closes: #42266)
++  * apt-pkg/depcache.cc:
++    - fix a bug in the install-recommends-section code
+ 
 - --
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 18:22:38 +0200
+ 
 -apt (0.6.45.1) unstable; urgency=low
 +apt (0.6.45ubuntu6) edgy; urgency=low
 +
 +  [Michael Vogt]
 +  * cmdline/apt-get.cc:
 +    - always show auto-removable packages and give a hint how to remove 
 +      them
 +  * debian/apt.conf.ubuntu:
 +    - exlucde linux-image and linux-restricted-modules from ever being 
 +      auto-removed
 +    - added "metapackages" as the section we want to install recommends
 +      by default
 +  * apt-pkg/depcache.cc:
 +    - added support to turn install-recommends selectively on/off by
 +      section
 +  [Ian Jackson]
 +  * Tests pass without code changes!  Except that we need this:
 +  * Bump cache file major version to force rebuild so that Breaks
 +    dependencies are included.
 +  * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
 +    --auto-deconfigure is very very old and dpkg-dev's Breaks support
 +    is more or less orthogonal.
 +  * Initial draft of `Breaks' implementation.  Appears to compile,
 +    but as yet *completely untested*.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 11:50:52 +0200
 +
 +apt (0.6.45ubuntu5) edgy; urgency=low
 +
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase the APT::Cache-Limit to deal with the increased demand due
 +      to the translated descriptions
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - pass "--auto-deconfigure" to dpkg on install to support the
 +      new "breaks" in dpkg
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 12:06:26 +0200
 +
 +apt (0.6.45ubuntu4) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix in the new --fix-polciy code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Aug 2006 21:08:11 +0200
 +
 +apt (0.6.45ubuntu3) edgy; urgency=low
 +
 +  * ABI break
 +  * merged latest apt--install-recommends (closes: #559000)
 +  * added "--fix-policy" option to can be used as "--fix-broken" and
 +    will install missing weak depends (recommends, and/or suggests 
 +    depending on the settings)
 +  * merged the apt--ddtp branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 11 Aug 2006 12:53:23 +0200
 +
 +apt (0.6.45ubuntu2) edgy; urgency=low
  
    * debian/control:
      - switched to libdb4.4 for building (closes: #381019)
diff --cc po/apt-all.pot
index 978b0c191,d6d146428..a329525a6
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@@ -7,7 -7,7 +7,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2006-08-25 15:34+0100\n"
 -"POT-Creation-Date: 2006-08-09 18:35+0200\n"
++"POT-Creation-Date: 2006-08-09 23:46+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"
@@@ -154,9 -146,9 +146,9 @@@ msgstr "
  msgid "       %4i %s\n"
  msgstr ""
  
- #: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
- #: cmdline/apt-extracttemplates.cc:225 cmdline/apt-get.cc:2476
- #: cmdline/apt-sortpkgs.cc:144
+ #: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+ #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
 -#: cmdline/apt-get.cc:2389 cmdline/apt-sortpkgs.cc:144
++#: cmdline/apt-get.cc:2462 cmdline/apt-sortpkgs.cc:144
  #, c-format
  msgid "%s %s for %s %s compiled on %s %s\n"
  msgstr ""
@@@ -251,7 -243,7 +243,8 @@@ msgid "
  "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
  msgstr ""
  
- #: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:819
 -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710
++#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:714
++#: apt-pkg/pkgcachegen.cc:819
  #, c-format
  msgid "Unable to write to %s"
  msgstr ""
@@@ -260,11 -252,301 +253,301 @@@
  msgid "Cannot get debconf version. Is debconf installed?"
  msgstr ""
  
+ #: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+ msgid "Package extension list is too long"
+ msgstr ""
+ 
+ #: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+ #: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+ #: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+ #, c-format
+ msgid "Error processing directory %s"
+ msgstr ""
+ 
+ #: ftparchive/apt-ftparchive.cc:254
+ msgid "Source extension list is too long"
+ msgstr ""
+ 
+ #: ftparchive/apt-ftparchive.cc:371
+ msgid "Error writing header to contents file"
+ msgstr ""
+ 
+ #: ftparchive/apt-ftparchive.cc:401
+ #, c-format
+ msgid "Error processing contents %s"
+ msgstr ""
+ 
+ #: ftparchive/apt-ftparchive.cc:556
+ msgid ""
+ "Usage: apt-ftparchive [options] command\n"
+ "Commands: packages binarypath [overridefile [pathprefix]]\n"
+ "          sources srcpath [overridefile [pathprefix]]\n"
+ "          contents path\n"
+ "          release path\n"
+ "          generate config [groups]\n"
+ "          clean config\n"
+ "\n"
+ "apt-ftparchive generates index files for Debian archives. It supports\n"
+ "many styles of generation from fully automated to functional replacements\n"
+ "for dpkg-scanpackages and dpkg-scansources\n"
+ "\n"
+ "apt-ftparchive generates Package files from a tree of .debs. The\n"
+ "Package file contains the contents of all the control fields from\n"
+ "each package as well as the MD5 hash and filesize. An override file\n"
+ "is supported to force the value of Priority and Section.\n"
+ "\n"
+ "Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n"
+ "The --source-override option can be used to specify a src override file\n"
+ "\n"
+ "The 'packages' and 'sources' command should be run in the root of the\n"
+ "tree. BinaryPath should point to the base of the recursive search and \n"
+ "override file should contain the override flags. Pathprefix is\n"
+ "appended to the filename fields if present. Example usage from the \n"
+ "Debian archive:\n"
+ "   apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
+ "               dists/potato/main/binary-i386/Packages\n"
+ "\n"
+ "Options:\n"
+ "  -h    This help text\n"
+ "  --md5 Control MD5 generation\n"
+ "  -s=?  Source override file\n"
+ "  -q    Quiet\n"
+ "  -d=?  Select the optional caching database\n"
+ "  --no-delink Enable delinking debug mode\n"
+ "  --contents  Control contents file generation\n"
+ "  -c=?  Read this configuration file\n"
+ "  -o=?  Set an arbitrary configuration option"
+ msgstr ""
+ 
+ #: ftparchive/apt-ftparchive.cc:762
+ msgid "No selections matched"
+ msgstr ""
+ 
+ #: ftparchive/apt-ftparchive.cc:835
+ #, c-format
+ msgid "Some files are missing in the package file group `%s'"
+ msgstr ""
+ 
+ #: ftparchive/cachedb.cc:47
+ #, c-format
+ msgid "DB was corrupted, file renamed to %s.old"
+ msgstr ""
+ 
+ #: ftparchive/cachedb.cc:65
+ #, c-format
+ msgid "DB is old, attempting to upgrade %s"
+ msgstr ""
+ 
+ #: ftparchive/cachedb.cc:76
+ msgid ""
+ "DB format is invalid. If you upgraded from a older version of apt, please "
+ "remove and re-create the database."
+ msgstr ""
+ 
+ #: ftparchive/cachedb.cc:81
+ #, c-format
+ msgid "Unable to open DB file %s: %s"
+ msgstr ""
+ 
+ #: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+ #: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
+ #, c-format
+ msgid "Failed to stat %s"
+ msgstr ""
+ 
+ #: ftparchive/cachedb.cc:242
+ msgid "Archive has no control record"
+ msgstr ""
+ 
+ #: ftparchive/cachedb.cc:448
+ msgid "Unable to get a cursor"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:79
+ #, c-format
+ msgid "W: Unable to read directory %s\n"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:84
+ #, c-format
+ msgid "W: Unable to stat %s\n"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:135
+ msgid "E: "
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:137
+ msgid "W: "
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:144
+ msgid "E: Errors apply to file "
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:161 ftparchive/writer.cc:191
+ #, c-format
+ msgid "Failed to resolve %s"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:173
+ msgid "Tree walking failed"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:198
+ #, c-format
+ msgid "Failed to open %s"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:257
+ #, c-format
+ msgid " DeLink %s [%s]\n"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:265
+ #, c-format
+ msgid "Failed to readlink %s"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:269
+ #, c-format
+ msgid "Failed to unlink %s"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:276
+ #, c-format
+ msgid "*** Failed to link %s to %s"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:286
+ #, c-format
+ msgid " DeLink limit of %sB hit.\n"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:390
+ msgid "Archive had no package field"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:398 ftparchive/writer.cc:613
+ #, c-format
+ msgid "  %s has no override entry\n"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:443 ftparchive/writer.cc:701
+ #, c-format
+ msgid "  %s maintainer is %s not %s\n"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:623
+ #, c-format
+ msgid "  %s has no source override entry\n"
+ msgstr ""
+ 
+ #: ftparchive/writer.cc:627
+ #, c-format
+ msgid "  %s has no binary override entry either\n"
+ msgstr ""
+ 
+ #: ftparchive/contents.cc:317
+ #, c-format
+ msgid "Internal error, could not locate member %s"
+ msgstr ""
+ 
+ #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+ msgid "realloc - Failed to allocate memory"
+ msgstr ""
+ 
+ #: ftparchive/override.cc:38 ftparchive/override.cc:146
+ #, c-format
+ msgid "Unable to open %s"
+ msgstr ""
+ 
+ #: ftparchive/override.cc:64 ftparchive/override.cc:170
+ #, c-format
+ msgid "Malformed override %s line %lu #1"
+ msgstr ""
+ 
+ #: ftparchive/override.cc:78 ftparchive/override.cc:182
+ #, c-format
+ msgid "Malformed override %s line %lu #2"
+ msgstr ""
+ 
+ #: ftparchive/override.cc:92 ftparchive/override.cc:195
+ #, c-format
+ msgid "Malformed override %s line %lu #3"
+ msgstr ""
+ 
+ #: ftparchive/override.cc:131 ftparchive/override.cc:205
+ #, c-format
+ msgid "Failed to read the override file %s"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:75
+ #, c-format
+ msgid "Unknown compression algorithm '%s'"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:105
+ #, c-format
+ msgid "Compressed output %s needs a compression set"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+ msgid "Failed to create IPC pipe to subprocess"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:198
+ msgid "Failed to create FILE*"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:201
+ msgid "Failed to fork"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:215
+ msgid "Compress child"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:238
+ #, c-format
+ msgid "Internal error, failed to create %s"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:289
+ msgid "Failed to create subprocess IPC"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:324
+ msgid "Failed to exec compressor "
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:363
+ msgid "decompressor"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:406
+ msgid "IO to subprocess/file failed"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:458
+ msgid "Failed to read while computing MD5"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:475
+ #, c-format
+ msgid "Problem unlinking %s"
+ msgstr ""
+ 
+ #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+ #, c-format
+ msgid "Failed to rename %s to %s"
+ msgstr ""
+ 
 -#: cmdline/apt-get.cc:120
 +#: cmdline/apt-get.cc:121
  msgid "Y"
  msgstr ""
  
- #: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1588
 -#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1508
++#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1574
  #, c-format
  msgid "Regex compilation error - %s"
  msgstr ""
@@@ -363,118 -645,118 +646,118 @@@ msgstr "
  msgid "%lu not fully installed or removed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:664
 -#: cmdline/apt-get.cc:649
++#: cmdline/apt-get.cc:650
  msgid "Correcting dependencies..."
  msgstr ""
  
- #: cmdline/apt-get.cc:667
 -#: cmdline/apt-get.cc:652
++#: cmdline/apt-get.cc:653
  msgid " failed."
  msgstr ""
  
- #: cmdline/apt-get.cc:670
 -#: cmdline/apt-get.cc:655
++#: cmdline/apt-get.cc:656
  msgid "Unable to correct dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:673
 -#: cmdline/apt-get.cc:658
++#: cmdline/apt-get.cc:659
  msgid "Unable to minimize the upgrade set"
  msgstr ""
  
- #: cmdline/apt-get.cc:675
 -#: cmdline/apt-get.cc:660
++#: cmdline/apt-get.cc:661
  msgid " Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:679
 -#: cmdline/apt-get.cc:664
++#: cmdline/apt-get.cc:665
  msgid "You might want to run `apt-get -f install' to correct these."
  msgstr ""
  
- #: cmdline/apt-get.cc:682
 -#: cmdline/apt-get.cc:667
++#: cmdline/apt-get.cc:668
  msgid "Unmet dependencies. Try using -f."
  msgstr ""
  
- #: cmdline/apt-get.cc:704
 -#: cmdline/apt-get.cc:689
++#: cmdline/apt-get.cc:690
  msgid "WARNING: The following packages cannot be authenticated!"
  msgstr ""
  
- #: cmdline/apt-get.cc:708
 -#: cmdline/apt-get.cc:693
++#: cmdline/apt-get.cc:694
  msgid "Authentication warning overridden.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:715
 -#: cmdline/apt-get.cc:700
++#: cmdline/apt-get.cc:701
  msgid "Install these packages without verification [y/N]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:717
 -#: cmdline/apt-get.cc:702
++#: cmdline/apt-get.cc:703
  msgid "Some packages could not be authenticated"
  msgstr ""
  
- #: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
 -#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
++#: cmdline/apt-get.cc:712 cmdline/apt-get.cc:859
  msgid "There are problems and -y was used without --force-yes"
  msgstr ""
  
- #: cmdline/apt-get.cc:770
 -#: cmdline/apt-get.cc:755
++#: cmdline/apt-get.cc:756
  msgid "Internal error, InstallPackages was called with broken packages!"
  msgstr ""
  
- #: cmdline/apt-get.cc:779
 -#: cmdline/apt-get.cc:764
++#: cmdline/apt-get.cc:765
  msgid "Packages need to be removed but remove is disabled."
  msgstr ""
  
- #: cmdline/apt-get.cc:790
 -#: cmdline/apt-get.cc:775
++#: cmdline/apt-get.cc:776
  msgid "Internal error, Ordering didn't finish"
  msgstr ""
  
- #: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1907 cmdline/apt-get.cc:1940
 -#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1820 cmdline/apt-get.cc:1853
++#: cmdline/apt-get.cc:792 cmdline/apt-get.cc:1893 cmdline/apt-get.cc:1926
  msgid "Unable to lock the download directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:816 cmdline/apt-get.cc:1988 cmdline/apt-get.cc:2224
 -#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1901 cmdline/apt-get.cc:2137
++#: cmdline/apt-get.cc:802 cmdline/apt-get.cc:1974 cmdline/apt-get.cc:2210
  #: apt-pkg/cachefile.cc:67
  msgid "The list of sources could not be read."
  msgstr ""
  
- #: cmdline/apt-get.cc:831
 -#: cmdline/apt-get.cc:816
++#: cmdline/apt-get.cc:817
  msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
  msgstr ""
  
- #: cmdline/apt-get.cc:836
 -#: cmdline/apt-get.cc:821
++#: cmdline/apt-get.cc:822
  #, c-format
  msgid "Need to get %sB/%sB of archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:839
 -#: cmdline/apt-get.cc:824
++#: cmdline/apt-get.cc:825
  #, c-format
  msgid "Need to get %sB of archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:844
 -#: cmdline/apt-get.cc:829
++#: cmdline/apt-get.cc:830
  #, c-format
  msgid "After unpacking %sB of additional disk space will be used.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:847
 -#: cmdline/apt-get.cc:832
++#: cmdline/apt-get.cc:833
  #, c-format
  msgid "After unpacking %sB disk space will be freed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2078
 -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1991
++#: cmdline/apt-get.cc:847 cmdline/apt-get.cc:2064
  #, c-format
  msgid "Couldn't determine free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:864
 -#: cmdline/apt-get.cc:849
++#: cmdline/apt-get.cc:850
  #, c-format
  msgid "You don't have enough free space in %s."
  msgstr ""
  
- #: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
 -#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884
++#: cmdline/apt-get.cc:865 cmdline/apt-get.cc:885
  msgid "Trivial Only specified but this is not a trivial operation."
  msgstr ""
  
- #: cmdline/apt-get.cc:881
 -#: cmdline/apt-get.cc:866
++#: cmdline/apt-get.cc:867
  msgid "Yes, do as I say!"
  msgstr ""
  
- #: cmdline/apt-get.cc:883
 -#: cmdline/apt-get.cc:868
++#: cmdline/apt-get.cc:869
  #, c-format
  msgid ""
  "You are about to do something potentially harmful.\n"
@@@ -482,74 -764,74 +765,74 @@@
  " ?] "
  msgstr ""
  
- #: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
 -#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
++#: cmdline/apt-get.cc:875 cmdline/apt-get.cc:894
  msgid "Abort."
  msgstr ""
  
- #: cmdline/apt-get.cc:904
 -#: cmdline/apt-get.cc:889
++#: cmdline/apt-get.cc:890
  msgid "Do you want to continue [Y/n]? "
  msgstr ""
  
- #: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2121
 -#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1367 cmdline/apt-get.cc:2034
++#: cmdline/apt-get.cc:962 cmdline/apt-get.cc:1369 cmdline/apt-get.cc:2107
  #, c-format
  msgid "Failed to fetch %s  %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:994
 -#: cmdline/apt-get.cc:979
++#: cmdline/apt-get.cc:980
  msgid "Some files failed to download"
  msgstr ""
  
- #: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2130
 -#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2043
++#: cmdline/apt-get.cc:981 cmdline/apt-get.cc:2116
  msgid "Download complete and in download only mode"
  msgstr ""
  
- #: cmdline/apt-get.cc:1001
 -#: cmdline/apt-get.cc:986
++#: cmdline/apt-get.cc:987
  msgid ""
  "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
  "missing?"
  msgstr ""
  
- #: cmdline/apt-get.cc:1005
 -#: cmdline/apt-get.cc:990
++#: cmdline/apt-get.cc:991
  msgid "--fix-missing and media swapping is not currently supported"
  msgstr ""
  
- #: cmdline/apt-get.cc:1010
 -#: cmdline/apt-get.cc:995
++#: cmdline/apt-get.cc:996
  msgid "Unable to correct missing packages."
  msgstr ""
  
- #: cmdline/apt-get.cc:1011
 -#: cmdline/apt-get.cc:996
++#: cmdline/apt-get.cc:997
  msgid "Aborting install."
  msgstr ""
  
- #: cmdline/apt-get.cc:1045
 -#: cmdline/apt-get.cc:1030
++#: cmdline/apt-get.cc:1031
  #, c-format
  msgid "Note, selecting %s instead of %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1055
 -#: cmdline/apt-get.cc:1040
++#: cmdline/apt-get.cc:1041
  #, c-format
  msgid "Skipping %s, it is already installed and upgrade is not set.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1073
 -#: cmdline/apt-get.cc:1058
++#: cmdline/apt-get.cc:1059
  #, c-format
  msgid "Package %s is not installed, so not removed\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1084
 -#: cmdline/apt-get.cc:1069
++#: cmdline/apt-get.cc:1070
  #, c-format
  msgid "Package %s is a virtual package provided by:\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1096
 -#: cmdline/apt-get.cc:1081
++#: cmdline/apt-get.cc:1082
  msgid " [Installed]"
  msgstr ""
  
- #: cmdline/apt-get.cc:1101
 -#: cmdline/apt-get.cc:1086
++#: cmdline/apt-get.cc:1087
  msgid "You should explicitly select one to install."
  msgstr ""
  
- #: cmdline/apt-get.cc:1106
 -#: cmdline/apt-get.cc:1091
++#: cmdline/apt-get.cc:1092
  #, c-format
  msgid ""
  "Package %s is not available, but is referred to by another package.\n"
@@@ -557,97 -839,79 +840,97 @@@
  "is only available from another source\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1125
 -#: cmdline/apt-get.cc:1110
++#: cmdline/apt-get.cc:1111
  msgid "However the following packages replace it:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1128
 -#: cmdline/apt-get.cc:1113
++#: cmdline/apt-get.cc:1114
  #, c-format
  msgid "Package %s has no installation candidate"
  msgstr ""
  
- #: cmdline/apt-get.cc:1148
 -#: cmdline/apt-get.cc:1133
++#: cmdline/apt-get.cc:1134
  #, c-format
  msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1156
 -#: cmdline/apt-get.cc:1141
++#: cmdline/apt-get.cc:1142
  #, c-format
  msgid "%s is already the newest version.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1185
 -#: cmdline/apt-get.cc:1170
++#: cmdline/apt-get.cc:1171
  #, c-format
  msgid "Release '%s' for '%s' was not found"
  msgstr ""
  
- #: cmdline/apt-get.cc:1187
 -#: cmdline/apt-get.cc:1172
++#: cmdline/apt-get.cc:1173
  #, c-format
  msgid "Version '%s' for '%s' was not found"
  msgstr ""
  
- #: cmdline/apt-get.cc:1193
 -#: cmdline/apt-get.cc:1178
++#: cmdline/apt-get.cc:1179
  #, c-format
  msgid "Selected version %s (%s) for %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1330
 -#: cmdline/apt-get.cc:1315
++#: cmdline/apt-get.cc:1316
  msgid "The update command takes no arguments"
  msgstr ""
  
- #: cmdline/apt-get.cc:1343
 -#: cmdline/apt-get.cc:1328
++#: cmdline/apt-get.cc:1329
  msgid "Unable to lock the list directory"
  msgstr ""
  
- #: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
 -#: cmdline/apt-get.cc:1386
++#: cmdline/apt-get.cc:1396 cmdline/apt-get.cc:1398
  msgid ""
  "Some index files failed to download, they have been ignored, or old ones "
  "used instead."
  msgstr ""
  
- #: cmdline/apt-get.cc:1426
 -#: cmdline/apt-get.cc:1405
++#: cmdline/apt-get.cc:1412
 +msgid "We are not supposed to delete stuff, can't start AutoRemover"
 +msgstr ""
 +
- #: cmdline/apt-get.cc:1451
++#: cmdline/apt-get.cc:1437
 +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:1454 cmdline/apt-get.cc:1656
++#: cmdline/apt-get.cc:1440 cmdline/apt-get.cc:1642
 +msgid "The following information may help to resolve the situation:"
 +msgstr ""
 +
- #: cmdline/apt-get.cc:1458
++#: cmdline/apt-get.cc:1444
 +msgid "Internal Error, AutoRemover broke stuff"
 +msgstr ""
 +
- #: cmdline/apt-get.cc:1477
++#: cmdline/apt-get.cc:1463
  msgid "Internal error, AllUpgrade broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1575 cmdline/apt-get.cc:1611
 -#: cmdline/apt-get.cc:1495 cmdline/apt-get.cc:1531
++#: cmdline/apt-get.cc:1561 cmdline/apt-get.cc:1597
  #, c-format
  msgid "Couldn't find package %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:1598
 -#: cmdline/apt-get.cc:1518
++#: cmdline/apt-get.cc:1584
  #, c-format
  msgid "Note, selecting %s for regex '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:1628
 -#: cmdline/apt-get.cc:1548
++#: cmdline/apt-get.cc:1614
  msgid "You might want to run `apt-get -f install' to correct these:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1631
 -#: cmdline/apt-get.cc:1551
++#: cmdline/apt-get.cc:1617
  msgid ""
  "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
  "solution)."
  msgstr ""
  
- #: cmdline/apt-get.cc:1643
 -#: cmdline/apt-get.cc:1563
++#: cmdline/apt-get.cc:1629
  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"
@@@ -655,159 -919,163 +938,159 @@@
  "or been moved out of Incoming."
  msgstr ""
  
- #: cmdline/apt-get.cc:1651
 -#: cmdline/apt-get.cc:1571
++#: cmdline/apt-get.cc:1637
  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:1659
 -#: cmdline/apt-get.cc:1576
 -msgid "The following information may help to resolve the situation:"
 -msgstr ""
 -
 -#: cmdline/apt-get.cc:1579
++#: cmdline/apt-get.cc:1645
  msgid "Broken packages"
  msgstr ""
  
- #: cmdline/apt-get.cc:1690
 -#: cmdline/apt-get.cc:1605
++#: cmdline/apt-get.cc:1676
  msgid "The following extra packages will be installed:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1779
 -#: cmdline/apt-get.cc:1694
++#: cmdline/apt-get.cc:1765
  msgid "Suggested packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1780
 -#: cmdline/apt-get.cc:1695
++#: cmdline/apt-get.cc:1766
  msgid "Recommended packages:"
  msgstr ""
  
- #: cmdline/apt-get.cc:1800
 -#: cmdline/apt-get.cc:1715
++#: cmdline/apt-get.cc:1786
  msgid "Calculating upgrade... "
  msgstr ""
  
- #: cmdline/apt-get.cc:1803 methods/ftp.cc:702 methods/connect.cc:101
 -#: cmdline/apt-get.cc:1718 methods/ftp.cc:702 methods/connect.cc:101
++#: cmdline/apt-get.cc:1789 methods/ftp.cc:702 methods/connect.cc:101
  msgid "Failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:1808
 -#: cmdline/apt-get.cc:1723
++#: cmdline/apt-get.cc:1794
  msgid "Done"
  msgstr ""
  
- #: cmdline/apt-get.cc:1875 cmdline/apt-get.cc:1883
 -#: cmdline/apt-get.cc:1788 cmdline/apt-get.cc:1796
++#: cmdline/apt-get.cc:1861 cmdline/apt-get.cc:1869
  msgid "Internal error, problem resolver broke stuff"
  msgstr ""
  
- #: cmdline/apt-get.cc:1983
 -#: cmdline/apt-get.cc:1896
++#: cmdline/apt-get.cc:1969
  msgid "Must specify at least one package to fetch source for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2013 cmdline/apt-get.cc:2242
 -#: cmdline/apt-get.cc:1926 cmdline/apt-get.cc:2155
++#: cmdline/apt-get.cc:1999 cmdline/apt-get.cc:2228
  #, c-format
  msgid "Unable to find a source package for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2057
 -#: cmdline/apt-get.cc:1970
++#: cmdline/apt-get.cc:2043
  #, c-format
  msgid "Skipping already downloaded file '%s'\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2081
 -#: cmdline/apt-get.cc:1994
++#: cmdline/apt-get.cc:2067
  #, c-format
  msgid "You don't have enough free space in %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2086
 -#: cmdline/apt-get.cc:1999
++#: cmdline/apt-get.cc:2072
  #, c-format
  msgid "Need to get %sB/%sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2089
 -#: cmdline/apt-get.cc:2002
++#: cmdline/apt-get.cc:2075
  #, c-format
  msgid "Need to get %sB of source archives.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2095
 -#: cmdline/apt-get.cc:2008
++#: cmdline/apt-get.cc:2081
  #, c-format
  msgid "Fetch source %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2126
 -#: cmdline/apt-get.cc:2039
++#: cmdline/apt-get.cc:2112
  msgid "Failed to fetch some archives."
  msgstr ""
  
- #: cmdline/apt-get.cc:2154
 -#: cmdline/apt-get.cc:2067
++#: cmdline/apt-get.cc:2140
  #, c-format
  msgid "Skipping unpack of already unpacked source in %s\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2166
 -#: cmdline/apt-get.cc:2079
++#: cmdline/apt-get.cc:2152
  #, c-format
  msgid "Unpack command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2167
 -#: cmdline/apt-get.cc:2080
++#: cmdline/apt-get.cc:2153
  #, c-format
  msgid "Check if the 'dpkg-dev' package is installed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2184
 -#: cmdline/apt-get.cc:2097
++#: cmdline/apt-get.cc:2170
  #, c-format
  msgid "Build command '%s' failed.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2203
 -#: cmdline/apt-get.cc:2116
++#: cmdline/apt-get.cc:2189
  msgid "Child process failed"
  msgstr ""
  
- #: cmdline/apt-get.cc:2219
 -#: cmdline/apt-get.cc:2132
++#: cmdline/apt-get.cc:2205
  msgid "Must specify at least one package to check builddeps for"
  msgstr ""
  
- #: cmdline/apt-get.cc:2247
 -#: cmdline/apt-get.cc:2160
++#: cmdline/apt-get.cc:2233
  #, c-format
  msgid "Unable to get build-dependency information for %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2267
 -#: cmdline/apt-get.cc:2180
++#: cmdline/apt-get.cc:2253
  #, c-format
  msgid "%s has no build depends.\n"
  msgstr ""
  
- #: cmdline/apt-get.cc:2319
 -#: cmdline/apt-get.cc:2232
++#: cmdline/apt-get.cc:2305
  #, c-format
  msgid ""
  "%s dependency for %s cannot be satisfied because the package %s cannot be "
  "found"
  msgstr ""
  
- #: cmdline/apt-get.cc:2371
 -#: cmdline/apt-get.cc:2284
++#: cmdline/apt-get.cc:2357
  #, 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:2406
 -#: cmdline/apt-get.cc:2319
++#: cmdline/apt-get.cc:2392
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
  msgstr ""
  
- #: cmdline/apt-get.cc:2431
 -#: cmdline/apt-get.cc:2344
++#: cmdline/apt-get.cc:2417
  #, c-format
  msgid "Failed to satisfy %s dependency for %s: %s"
  msgstr ""
  
- #: cmdline/apt-get.cc:2445
 -#: cmdline/apt-get.cc:2358
++#: cmdline/apt-get.cc:2431
  #, c-format
  msgid "Build-dependencies for %s could not be satisfied."
  msgstr ""
  
- #: cmdline/apt-get.cc:2449
 -#: cmdline/apt-get.cc:2362
++#: cmdline/apt-get.cc:2435
  msgid "Failed to process build dependencies"
  msgstr ""
  
- #: cmdline/apt-get.cc:2481
 -#: cmdline/apt-get.cc:2394
++#: cmdline/apt-get.cc:2467
  msgid "Supported modules:"
  msgstr ""
  
- #: cmdline/apt-get.cc:2522
 -#: cmdline/apt-get.cc:2435
++#: cmdline/apt-get.cc:2508
  msgid ""
  "Usage: apt-get [options] command\n"
  "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@@ -1103,9 -1360,9 +1375,11 @@@ msgid "The info and temp directories ne
  msgstr ""
  
  #. Build the status cache
- #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:752
 -#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 -#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
 -#: apt-pkg/pkgcachegen.cc:840
++#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:647
++#: apt-pkg/pkgcachegen.cc:716 apt-pkg/pkgcachegen.cc:721
++#: apt-pkg/pkgcachegen.cc:844 apt-pkg/pkgcachegen.cc:752
 +#: apt-pkg/pkgcachegen.cc:821 apt-pkg/pkgcachegen.cc:826
 +#: apt-pkg/pkgcachegen.cc:949
  msgid "Reading package lists"
  msgstr ""
  
@@@ -1577,7 -1834,7 +1851,7 @@@ msgstr "
  msgid "Couldn't make mmap of %lu bytes"
  msgstr ""
  
- #: apt-pkg/contrib/strutl.cc:981
 -#: apt-pkg/contrib/strutl.cc:938
++#: apt-pkg/contrib/strutl.cc:938 apt-pkg/contrib/strutl.cc:981
  #, c-format
  msgid "Selection %s not found"
  msgstr ""
@@@ -1774,76 -2031,72 +2048,72 @@@ msgstr "
  msgid "Problem syncing the file"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:137
 -#: apt-pkg/pkgcache.cc:126
++#: apt-pkg/pkgcache.cc:126 apt-pkg/pkgcache.cc:137
  msgid "Empty package cache"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:143
 -#: apt-pkg/pkgcache.cc:132
++#: apt-pkg/pkgcache.cc:132 apt-pkg/pkgcache.cc:143
  msgid "The package cache file is corrupted"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:148
 -#: apt-pkg/pkgcache.cc:137
++#: apt-pkg/pkgcache.cc:137 apt-pkg/pkgcache.cc:148
  msgid "The package cache file is an incompatible version"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:153
 -#: apt-pkg/pkgcache.cc:142
++#: apt-pkg/pkgcache.cc:142 apt-pkg/pkgcache.cc:153
  #, c-format
  msgid "This APT does not support the versioning system '%s'"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:158
 -#: apt-pkg/pkgcache.cc:147
++#: apt-pkg/pkgcache.cc:147 apt-pkg/pkgcache.cc:158
  msgid "The package cache was built for a different architecture"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:229
 -#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
  msgid "Depends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:229
 -#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
  msgid "PreDepends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:229
 -#: apt-pkg/pkgcache.cc:218
++#: apt-pkg/pkgcache.cc:218 apt-pkg/pkgcache.cc:229
  msgid "Suggests"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:230
 -#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
  msgid "Recommends"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:230
 -#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
  msgid "Conflicts"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:230
 -#: apt-pkg/pkgcache.cc:219
++#: apt-pkg/pkgcache.cc:219 apt-pkg/pkgcache.cc:230
  msgid "Replaces"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:231
 -#: apt-pkg/pkgcache.cc:220
++#: apt-pkg/pkgcache.cc:220 apt-pkg/pkgcache.cc:231
  msgid "Obsoletes"
  msgstr ""
  
--#: apt-pkg/pkgcache.cc:231
- msgid "Breaks"
- msgstr ""
- 
- #: apt-pkg/pkgcache.cc:242
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
  msgid "important"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:242
 -#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
  msgid "required"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:242
 -#: apt-pkg/pkgcache.cc:231
++#: apt-pkg/pkgcache.cc:231 apt-pkg/pkgcache.cc:242
  msgid "standard"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:243
 -#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:232 apt-pkg/pkgcache.cc:243
  msgid "optional"
  msgstr ""
  
- #: apt-pkg/pkgcache.cc:243
 -#: apt-pkg/pkgcache.cc:232
++#: apt-pkg/pkgcache.cc:232 apt-pkg/pkgcache.cc:243
  msgid "extra"
  msgstr ""
  
@@@ -1913,7 -2152,7 +2183,7 @@@ msgstr "
  msgid "Opening %s"
  msgstr ""
  
- #: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450
 -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
++#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 apt-pkg/cdrom.cc:450
  #, c-format
  msgid "Line %u too long in source list %s."
  msgstr ""
@@@ -1946,19 -2185,19 +2216,19 @@@ msgstr "
  msgid "Index file type '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/algorithms.cc:248
 -#: apt-pkg/algorithms.cc:241
++#: apt-pkg/algorithms.cc:245 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 ""
  
- #: apt-pkg/algorithms.cc:1096
 -#: apt-pkg/algorithms.cc:1059
++#: apt-pkg/algorithms.cc:1075 apt-pkg/algorithms.cc:1096
  msgid ""
  "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
  "held packages."
  msgstr ""
  
- #: apt-pkg/algorithms.cc:1098
 -#: apt-pkg/algorithms.cc:1061
++#: apt-pkg/algorithms.cc:1077 apt-pkg/algorithms.cc:1098
  msgid "Unable to correct problems, you have held broken packages."
  msgstr ""
  
@@@ -1999,12 -2238,12 +2269,12 @@@ msgstr "
  msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
  msgstr ""
  
- #: apt-pkg/init.cc:125
 -#: apt-pkg/init.cc:122
++#: apt-pkg/init.cc:122 apt-pkg/init.cc:125
  #, c-format
  msgid "Packaging system '%s' is not supported"
  msgstr ""
  
- #: apt-pkg/init.cc:141
 -#: apt-pkg/init.cc:138
++#: apt-pkg/init.cc:138 apt-pkg/init.cc:141
  msgid "Unable to determine a suitable packaging system type"
  msgstr ""
  
@@@ -2047,87 -2286,73 +2317,74 @@@ msgstr "
  msgid "Error occurred while processing %s (NewPackage)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:134
 -#: apt-pkg/pkgcachegen.cc:129
++#: apt-pkg/pkgcachegen.cc:131 apt-pkg/pkgcachegen.cc:134
  #, c-format
  msgid "Error occurred while processing %s (UsePackage1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:157
- #, c-format
- msgid "Error occured while processing %s (NewFileDesc1)"
- msgstr ""
- 
- #: apt-pkg/pkgcachegen.cc:182
 -#: apt-pkg/pkgcachegen.cc:150
++#: apt-pkg/pkgcachegen.cc:152 apt-pkg/pkgcachegen.cc:182
  #, c-format
  msgid "Error occurred while processing %s (UsePackage2)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:186
 -#: apt-pkg/pkgcachegen.cc:154
++#: apt-pkg/pkgcachegen.cc:156 apt-pkg/pkgcachegen.cc:186
  #, c-format
  msgid "Error occurred while processing %s (NewFileVer1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:217
 -#: apt-pkg/pkgcachegen.cc:184
++#: apt-pkg/pkgcachegen.cc:186 apt-pkg/pkgcachegen.cc:217
  #, c-format
  msgid "Error occurred while processing %s (NewVersion1)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:221
 -#: apt-pkg/pkgcachegen.cc:188
++#: apt-pkg/pkgcachegen.cc:190 apt-pkg/pkgcachegen.cc:221
  #, c-format
  msgid "Error occurred while processing %s (UsePackage3)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:225
 -#: apt-pkg/pkgcachegen.cc:192
++#: apt-pkg/pkgcachegen.cc:194 apt-pkg/pkgcachegen.cc:225
  #, c-format
  msgid "Error occurred while processing %s (NewVersion2)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:249
- #, c-format
- msgid "Error occured while processing %s (NewFileDesc2)"
- msgstr ""
- 
- #: apt-pkg/pkgcachegen.cc:255
 -#: apt-pkg/pkgcachegen.cc:207
++#: apt-pkg/pkgcachegen.cc:209 apt-pkg/pkgcachegen.cc:255
  msgid "Wow, you exceeded the number of package names this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:258
 -#: apt-pkg/pkgcachegen.cc:210
++#: apt-pkg/pkgcachegen.cc:212 apt-pkg/pkgcachegen.cc:258
  msgid "Wow, you exceeded the number of versions this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:261
- msgid "Wow, you exceeded the number of descriptions this APT is capable of."
- msgstr ""
- 
- #: apt-pkg/pkgcachegen.cc:264
 -#: apt-pkg/pkgcachegen.cc:213
++#: apt-pkg/pkgcachegen.cc:215 apt-pkg/pkgcachegen.cc:264
  msgid "Wow, you exceeded the number of dependencies this APT is capable of."
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:292
 -#: apt-pkg/pkgcachegen.cc:241
++#: apt-pkg/pkgcachegen.cc:243 apt-pkg/pkgcachegen.cc:292
  #, c-format
  msgid "Error occurred while processing %s (FindPkg)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:305
 -#: apt-pkg/pkgcachegen.cc:254
++#: apt-pkg/pkgcachegen.cc:256 apt-pkg/pkgcachegen.cc:305
  #, c-format
  msgid "Error occurred while processing %s (CollectFileProvides)"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:311
 -#: apt-pkg/pkgcachegen.cc:260
++#: apt-pkg/pkgcachegen.cc:262 apt-pkg/pkgcachegen.cc:311
  #, c-format
  msgid "Package %s %s was not found while processing file dependencies"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:682
 -#: apt-pkg/pkgcachegen.cc:574
++#: apt-pkg/pkgcachegen.cc:577 apt-pkg/pkgcachegen.cc:682
  #, c-format
  msgid "Couldn't stat source package list %s"
  msgstr ""
  
- #: apt-pkg/pkgcachegen.cc:767
 -#: apt-pkg/pkgcachegen.cc:658
++#: apt-pkg/pkgcachegen.cc:662 apt-pkg/pkgcachegen.cc:767
  msgid "Collecting File Provides"
  msgstr ""
  
 -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
++#: apt-pkg/pkgcachegen.cc:789 apt-pkg/pkgcachegen.cc:796
 +#: apt-pkg/pkgcachegen.cc:894 apt-pkg/pkgcachegen.cc:901
  msgid "IO Error saving source cache"
  msgstr ""
  
@@@ -2136,35 -2361,35 +2393,36 @@@
  msgid "rename failed, %s (%s -> %s)."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:980
 -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
++#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:951
++#: apt-pkg/acquire-item.cc:980
  msgid "MD5Sum mismatch"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:675
 -#: apt-pkg/acquire-item.cc:640
++#: apt-pkg/acquire-item.cc:646 apt-pkg/acquire-item.cc:675
  msgid "There are no public key available for the following key IDs:\n"
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:788
 -#: apt-pkg/acquire-item.cc:753
++#: apt-pkg/acquire-item.cc:759 apt-pkg/acquire-item.cc:788
  #, 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:847
 -#: apt-pkg/acquire-item.cc:812
++#: apt-pkg/acquire-item.cc:818 apt-pkg/acquire-item.cc:847
  #, 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:883
 -#: apt-pkg/acquire-item.cc:848
++#: apt-pkg/acquire-item.cc:854 apt-pkg/acquire-item.cc:883
  #, c-format
  msgid ""
  "The package index files are corrupted. No Filename: field for package %s."
  msgstr ""
  
- #: apt-pkg/acquire-item.cc:970
 -#: apt-pkg/acquire-item.cc:935
++#: apt-pkg/acquire-item.cc:941 apt-pkg/acquire-item.cc:970
  msgid "Size mismatch"
  msgstr ""
  
@@@ -2173,94 -2398,92 +2431,93 @@@
  msgid "Vendor block %s contains no fingerprint"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:531
 -#: apt-pkg/cdrom.cc:507
++#: apt-pkg/cdrom.cc:507 apt-pkg/cdrom.cc:531
  #, c-format
  msgid ""
  "Using CD-ROM mount point %s\n"
  "Mounting CD-ROM\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
 -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
++#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 apt-pkg/cdrom.cc:540
++#: apt-pkg/cdrom.cc:622
  msgid "Identifying.. "
  msgstr ""
  
- #: apt-pkg/cdrom.cc:565
 -#: apt-pkg/cdrom.cc:541
++#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:565
  #, c-format
  msgid "Stored label: %s \n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:585
 -#: apt-pkg/cdrom.cc:561
++#: apt-pkg/cdrom.cc:561 apt-pkg/cdrom.cc:585
  #, c-format
  msgid "Using CD-ROM mount point %s\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:603
 -#: apt-pkg/cdrom.cc:579
++#: apt-pkg/cdrom.cc:579 apt-pkg/cdrom.cc:603
  msgid "Unmounting CD-ROM\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:607
 -#: apt-pkg/cdrom.cc:583
++#: apt-pkg/cdrom.cc:583 apt-pkg/cdrom.cc:607
  msgid "Waiting for disc...\n"
  msgstr ""
  
  #. Mount the new CDROM
- #: apt-pkg/cdrom.cc:615
 -#: apt-pkg/cdrom.cc:591
++#: apt-pkg/cdrom.cc:591 apt-pkg/cdrom.cc:615
  msgid "Mounting CD-ROM...\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:633
 -#: apt-pkg/cdrom.cc:609
++#: apt-pkg/cdrom.cc:609 apt-pkg/cdrom.cc:633
  msgid "Scanning disc for index files..\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:673
+ #: apt-pkg/cdrom.cc:647
  #, c-format
- msgid ""
- "Found %i package indexes, %i source indexes, %i translation indexes and %i "
- "signatures\n"
+ msgid "Found %i package indexes, %i source indexes and %i signatures\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:737
 -#: apt-pkg/cdrom.cc:710
++#: apt-pkg/cdrom.cc:710 apt-pkg/cdrom.cc:737
  msgid "That is not a valid name, try again.\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:753
 -#: apt-pkg/cdrom.cc:726
++#: apt-pkg/cdrom.cc:726 apt-pkg/cdrom.cc:753
  #, c-format
  msgid ""
  "This disc is called: \n"
  "'%s'\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:757
 -#: apt-pkg/cdrom.cc:730
++#: apt-pkg/cdrom.cc:730 apt-pkg/cdrom.cc:757
  msgid "Copying package lists..."
  msgstr ""
  
- #: apt-pkg/cdrom.cc:783
 -#: apt-pkg/cdrom.cc:754
++#: apt-pkg/cdrom.cc:754 apt-pkg/cdrom.cc:783
  msgid "Writing new source list\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:792
 -#: apt-pkg/cdrom.cc:763
++#: apt-pkg/cdrom.cc:763 apt-pkg/cdrom.cc:792
  msgid "Source list entries for this disc are:\n"
  msgstr ""
  
- #: apt-pkg/cdrom.cc:832
 -#: apt-pkg/cdrom.cc:803
++#: apt-pkg/cdrom.cc:803 apt-pkg/cdrom.cc:832
  msgid "Unmounting CD-ROM..."
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
 -#: apt-pkg/indexcopy.cc:261
++#: apt-pkg/indexcopy.cc:261 apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
  #, c-format
  msgid "Wrote %i records.\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
 -#: apt-pkg/indexcopy.cc:263
++#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
  #, c-format
  msgid "Wrote %i records with %i missing files.\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
 -#: apt-pkg/indexcopy.cc:266
++#: apt-pkg/indexcopy.cc:266 apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
  #, c-format
  msgid "Wrote %i records with %i mismatched files\n"
  msgstr ""
  
- #: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
 -#: apt-pkg/indexcopy.cc:269
++#: apt-pkg/indexcopy.cc:269 apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
  #, c-format
  msgid "Wrote %i records with %i missing files and %i mismatched files\n"
  msgstr ""
@@@ -2318,7 -2541,3 +2575,28 @@@ msgstr "
  #: methods/rsh.cc:330
  msgid "Connection closed prematurely"
  msgstr ""
++
++#: apt-pkg/pkgcache.cc:231
++msgid "Breaks"
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:157
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc1)"
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:249
++#, c-format
++msgid "Error occured while processing %s (NewFileDesc2)"
++msgstr ""
++
++#: apt-pkg/pkgcachegen.cc:261
++msgid "Wow, you exceeded the number of descriptions this APT is capable of."
++msgstr ""
++
++#: apt-pkg/cdrom.cc:673
++#, c-format
++msgid ""
++"Found %i package indexes, %i source indexes, %i translation indexes and %i "
++"signatures\n"
++msgstr ""