Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental

1 files changed, 845 insertions, 850 deletions

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 90ed92e3a..73b033876 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: apt 1.1~exp3\n"
+"Project-Id-Version: apt 1.0.9.7\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2014-11-06 09:45+0100\n"
+"POT-Creation-Date: 2015-03-09 02:17+0100\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"
@@ -21,144 +21,144 @@ msgstr ""
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:317
+#: cmdline/apt-cache.cc:320
 msgid "Total package names: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:319
+#: cmdline/apt-cache.cc:322
 msgid "Total package structures: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:359
+#: cmdline/apt-cache.cc:362
 msgid "  Normal packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:360
+#: cmdline/apt-cache.cc:363
 msgid "  Pure virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:361
+#: cmdline/apt-cache.cc:364
 msgid "  Single virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:362
+#: cmdline/apt-cache.cc:365
 msgid "  Mixed virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:363
+#: cmdline/apt-cache.cc:366
 msgid "  Missing: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:365
+#: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:367
+#: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:369
+#: cmdline/apt-cache.cc:372
 msgid "Total dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:372
+#: cmdline/apt-cache.cc:375
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:374
+#: cmdline/apt-cache.cc:377
 msgid "Total Desc/File relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:376
+#: cmdline/apt-cache.cc:379
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:428
+#: cmdline/apt-cache.cc:433
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:434
+#: cmdline/apt-cache.cc:439
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:449
+#: cmdline/apt-cache.cc:454
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:585 cmdline/apt-cache.cc:1234
+#: cmdline/apt-cache.cc:590 cmdline/apt-cache.cc:1239
 #: apt-private/private-show.cc:58
 #, c-format
 msgid "Package file %s is out of sync."
 msgstr ""
 
-#: cmdline/apt-cache.cc:663 cmdline/apt-cache.cc:1521
-#: cmdline/apt-cache.cc:1523 cmdline/apt-cache.cc:1600 cmdline/apt-mark.cc:59
-#: cmdline/apt-mark.cc:106 cmdline/apt-mark.cc:232
+#: cmdline/apt-cache.cc:668 cmdline/apt-cache.cc:1526
+#: cmdline/apt-cache.cc:1528 cmdline/apt-cache.cc:1605 cmdline/apt-mark.cc:56
+#: cmdline/apt-mark.cc:103 cmdline/apt-mark.cc:229
 #: apt-private/private-show.cc:171 apt-private/private-show.cc:173
 msgid "No packages found"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1333 apt-private/private-search.cc:41
+#: cmdline/apt-cache.cc:1338 apt-private/private-search.cc:41
 msgid "You must give at least one search pattern"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1500
+#: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
 msgstr ""
 
-#: cmdline/apt-cache.cc:1595 apt-pkg/cacheset.cc:658
+#: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1625
+#: cmdline/apt-cache.cc:1630
 msgid "Package files:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1632 cmdline/apt-cache.cc:1723
+#: cmdline/apt-cache.cc:1637 cmdline/apt-cache.cc:1728
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1646
+#: cmdline/apt-cache.cc:1651
 msgid "Pinned packages:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1658 cmdline/apt-cache.cc:1703
+#: cmdline/apt-cache.cc:1663 cmdline/apt-cache.cc:1708
 msgid "(not found)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1666
+#: cmdline/apt-cache.cc:1671
 msgid "  Installed: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1667
+#: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1685 cmdline/apt-cache.cc:1693
+#: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1700
+#: cmdline/apt-cache.cc:1705
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1709
+#: cmdline/apt-cache.cc:1714
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1822 cmdline/apt-cdrom.cc:207 cmdline/apt-config.cc:83
-#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:75 cmdline/apt-mark.cc:388
-#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:220
-#: ftparchive/apt-ftparchive.cc:620 cmdline/apt-internal-solver.cc:45
-#: cmdline/apt-sortpkgs.cc:147
+#: cmdline/apt-cache.cc:1827 cmdline/apt-cdrom.cc:208 cmdline/apt-config.cc:83
+#: cmdline/apt-get.cc:1610 cmdline/apt-helper.cc:86 cmdline/apt-mark.cc:446
+#: cmdline/apt.cc:42 cmdline/apt-extracttemplates.cc:222
+#: ftparchive/apt-ftparchive.cc:619 cmdline/apt-internal-solver.cc:47
+#: cmdline/apt-sortpkgs.cc:149
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1829
+#: cmdline/apt-cache.cc:1834
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
@@ -195,20 +195,20 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:76
+#: cmdline/apt-cdrom.cc:77
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:91
+#: cmdline/apt-cdrom.cc:92
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:139
+#: cmdline/apt-cdrom.cc:140
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:178
+#: cmdline/apt-cdrom.cc:179
 msgid ""
 "No CD-ROM could be auto-detected or found using the default mount point.\n"
 "You may try the --cdrom option to set the CD-ROM mount point.\n"
@@ -216,7 +216,7 @@ msgid ""
 "mount point."
 msgstr ""
 
-#: cmdline/apt-cdrom.cc:182
+#: cmdline/apt-cdrom.cc:183
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
@@ -240,83 +240,78 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:246
+#: cmdline/apt-get.cc:224
 #, c-format
 msgid "Can not find a package for architecture '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:322
+#: cmdline/apt-get.cc:311
 #, c-format
 msgid "Can not find a package '%s' with version '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:314
 #, c-format
 msgid "Can not find a package '%s' with release '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:362
+#: cmdline/apt-get.cc:358
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:418
+#: cmdline/apt-get.cc:414
 #, c-format
 msgid "Can not find version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:449
+#: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:454 cmdline/apt-mark.cc:81
+#: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
 #: apt-private/private-install.cc:863
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:456 cmdline/apt-mark.cc:83
+#: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:464 cmdline/apt-mark.cc:127
+#: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:533 cmdline/apt-get.cc:541
+#: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:572 cmdline/apt-get.cc:585 apt-pkg/acquire.cc:157
-#, c-format
-msgid "Unable to lock directory %s"
-msgstr ""
-
-#: cmdline/apt-get.cc:620
+#: cmdline/apt-get.cc:598
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:738
+#: cmdline/apt-get.cc:716
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:776 cmdline/apt-get.cc:1083
+#: cmdline/apt-get.cc:760 cmdline/apt-get.cc:1074
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:796
+#: cmdline/apt-get.cc:780
 #, c-format
 msgid ""
 "NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
 "%s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:801
+#: cmdline/apt-get.cc:785
 #, c-format
 msgid ""
 "Please use:\n"
@@ -324,137 +319,137 @@ msgid ""
 "to retrieve the latest (possibly unreleased) updates to the package.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:833
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:879
+#: cmdline/apt-get.cc:863
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
 #. TRANSLATOR: The required space between number and unit is already included
 #. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
-#: cmdline/apt-get.cc:884
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:915
+#: cmdline/apt-get.cc:899
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:920 apt-private/private-install.cc:289
+#: cmdline/apt-get.cc:904 apt-private/private-install.cc:289
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:945
+#: cmdline/apt-get.cc:929
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:958
+#: cmdline/apt-get.cc:942
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:959
+#: cmdline/apt-get.cc:943
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:987
+#: cmdline/apt-get.cc:971
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1006
+#: cmdline/apt-get.cc:990
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1025
+#: cmdline/apt-get.cc:1009
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1043
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid ""
 "No architecture information available for %s. See apt.conf(5) APT::"
 "Architectures for setup"
 msgstr ""
 
-#: cmdline/apt-get.cc:1060
+#: cmdline/apt-get.cc:1047
 #, c-format
 msgid "Note, using directory '%s' to get the build dependencies\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1070
+#: cmdline/apt-get.cc:1057
 #, c-format
 msgid "Note, using file '%s' to get the build dependencies\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1095 cmdline/apt-get.cc:1098
+#: cmdline/apt-get.cc:1086 cmdline/apt-get.cc:1089
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1118
+#: cmdline/apt-get.cc:1109
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1288
+#: cmdline/apt-get.cc:1279
 #, c-format
 msgid ""
 "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 "packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1306
+#: cmdline/apt-get.cc:1297
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1329
+#: cmdline/apt-get.cc:1320
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:1368
+#: cmdline/apt-get.cc:1359
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because candidate version of "
 "package %s can't satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1365
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because package %s has no candidate "
 "version"
 msgstr ""
 
-#: cmdline/apt-get.cc:1397
+#: cmdline/apt-get.cc:1388
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1412
+#: cmdline/apt-get.cc:1403
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:1417
+#: cmdline/apt-get.cc:1408
 msgid "Failed to process build dependencies"
 msgstr ""
 
@@ -521,11 +516,11 @@ msgstr ""
 msgid "Must specify at least one pair url/filename"
 msgstr ""
 
-#: cmdline/apt-helper.cc:69
+#: cmdline/apt-helper.cc:75 cmdline/apt-helper.cc:79
 msgid "Download Failed"
 msgstr ""
 
-#: cmdline/apt-helper.cc:82
+#: cmdline/apt-helper.cc:93
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] download-file uri target-path\n"
@@ -539,52 +534,53 @@ msgid ""
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:68
+#: cmdline/apt-mark.cc:65
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:74
+#: cmdline/apt-mark.cc:71
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:76
+#: cmdline/apt-mark.cc:73
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:241
+#: cmdline/apt-mark.cc:238
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:243
+#: cmdline/apt-mark.cc:240
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:258 cmdline/apt-mark.cc:339 apt-pkg/deb/dpkgpm.cc:1285
+#: cmdline/apt-mark.cc:255 cmdline/apt-mark.cc:333 cmdline/apt-mark.cc:397
 #: apt-pkg/contrib/fileutl.cc:834 apt-pkg/contrib/gpgv.cc:192
+#: apt-pkg/deb/dpkgpm.cc:1303
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: cmdline/apt-mark.cc:273 cmdline/apt-mark.cc:322
+#: cmdline/apt-mark.cc:270 cmdline/apt-mark.cc:380
 #, c-format
 msgid "%s set on hold.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:275 cmdline/apt-mark.cc:327
+#: cmdline/apt-mark.cc:272 cmdline/apt-mark.cc:385
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr ""
 
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:337 cmdline/apt-mark.cc:403
 msgid "Executing dpkg failed. Are you root?"
 msgstr ""
 
-#: cmdline/apt-mark.cc:392
+#: cmdline/apt-mark.cc:450
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -801,7 +797,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:879 methods/server.cc:353 methods/rsh.cc:319
+#: methods/ftp.cc:879 methods/server.cc:362 methods/rsh.cc:319
 msgid "Problem hashing file"
 msgstr ""
 
@@ -890,36 +886,36 @@ msgstr ""
 msgid "Unable to connect to %s:%s:"
 msgstr ""
 
-#: methods/gpgv.cc:179
+#: methods/gpgv.cc:158
 msgid ""
 "Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: methods/gpgv.cc:183
+#: methods/gpgv.cc:162
 msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: methods/gpgv.cc:185
+#: methods/gpgv.cc:164
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr ""
 
 #. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:170
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr ""
 
-#: methods/gpgv.cc:195
+#: methods/gpgv.cc:174
 msgid "Unknown error executing apt-key"
 msgstr ""
 
-#: methods/gpgv.cc:228 methods/gpgv.cc:235
+#: methods/gpgv.cc:207 methods/gpgv.cc:214
 msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:221
 msgid ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
@@ -929,31 +925,31 @@ msgstr ""
 msgid "Empty files can't be valid archives"
 msgstr ""
 
-#: methods/http.cc:515
+#: methods/http.cc:517
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:529
+#: methods/http.cc:531
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:531
+#: methods/http.cc:533
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:567
+#: methods/http.cc:569
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:627
+#: methods/http.cc:629
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:632
+#: methods/http.cc:634
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:655
+#: methods/http.cc:657
 msgid "Error writing to output file"
 msgstr ""
 
@@ -961,53 +957,289 @@ msgstr ""
 msgid "Waiting for headers"
 msgstr ""
 
-#: methods/server.cc:110
+#: methods/server.cc:111
 msgid "Bad header line"
 msgstr ""
 
-#: methods/server.cc:135 methods/server.cc:142
+#: methods/server.cc:136 methods/server.cc:143
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: methods/server.cc:172
+#: methods/server.cc:173
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: methods/server.cc:195
+#: methods/server.cc:193
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: methods/server.cc:197
+#: methods/server.cc:195
 msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: methods/server.cc:221
+#: methods/server.cc:219
 msgid "Unknown date format"
 msgstr ""
 
-#: methods/server.cc:497
+#: methods/server.cc:506
 msgid "Bad header data"
 msgstr ""
 
-#: methods/server.cc:514 methods/server.cc:608
+#: methods/server.cc:523 methods/server.cc:617
 msgid "Connection failed"
 msgstr ""
 
-#: methods/server.cc:580
+#: methods/server.cc:589
 #, c-format
 msgid ""
 "Automatically disabled %s due to incorrect response from server/proxy. (man "
 "5 apt.conf)"
 msgstr ""
 
-#: methods/server.cc:703
+#: methods/server.cc:712
 msgid "Internal error"
 msgstr ""
 
+#: apt-private/private-list.cc:121
+msgid "Listing"
+msgstr ""
+
+#: apt-private/private-list.cc:151
+#, c-format
+msgid "There is %i additional version. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional versions. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-cachefile.cc:95
+msgid "Correcting dependencies..."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:98
+msgid " failed."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:101
+msgid "Unable to correct dependencies"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:104
+msgid "Unable to minimize the upgrade set"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:106
+msgid " Done"
+msgstr ""
+
+#: apt-private/private-cachefile.cc:110
+msgid "You might want to run 'apt-get -f install' to correct these."
+msgstr ""
+
+#: apt-private/private-cachefile.cc:113
+msgid "Unmet dependencies. Try using -f."
+msgstr ""
+
+#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
+#: apt-private/private-show.cc:89
+msgid "unknown"
+msgstr ""
+
+#: apt-private/private-output.cc:265
+#, c-format
+msgid "[installed,upgradable to: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:268
+msgid "[installed,local]"
+msgstr ""
+
+#: apt-private/private-output.cc:270
+msgid "[installed,auto-removable]"
+msgstr ""
+
+#: apt-private/private-output.cc:272
+msgid "[installed,automatic]"
+msgstr ""
+
+#: apt-private/private-output.cc:274
+msgid "[installed]"
+msgstr ""
+
+#: apt-private/private-output.cc:277
+#, c-format
+msgid "[upgradable from: %s]"
+msgstr ""
+
+#: apt-private/private-output.cc:281
+msgid "[residual-config]"
+msgstr ""
+
+#: apt-private/private-output.cc:455
+#, c-format
+msgid "but %s is installed"
+msgstr ""
+
+#: apt-private/private-output.cc:457
+#, c-format
+msgid "but %s is to be installed"
+msgstr ""
+
+#: apt-private/private-output.cc:464
+msgid "but it is not installable"
+msgstr ""
+
+#: apt-private/private-output.cc:466
+msgid "but it is a virtual package"
+msgstr ""
+
+#: apt-private/private-output.cc:469
+msgid "but it is not installed"
+msgstr ""
+
+#: apt-private/private-output.cc:469
+msgid "but it is not going to be installed"
+msgstr ""
+
+#: apt-private/private-output.cc:474
+msgid " or"
+msgstr ""
+
+#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
+msgid "The following packages have unmet dependencies:"
+msgstr ""
+
+#: apt-private/private-output.cc:523
+msgid "The following NEW packages will be installed:"
+msgstr ""
+
+#: apt-private/private-output.cc:549
+msgid "The following packages will be REMOVED:"
+msgstr ""
+
+#: apt-private/private-output.cc:571
+msgid "The following packages have been kept back:"
+msgstr ""
+
+#: apt-private/private-output.cc:592
+msgid "The following packages will be upgraded:"
+msgstr ""
+
+#: apt-private/private-output.cc:613
+msgid "The following packages will be DOWNGRADED:"
+msgstr ""
+
+#: apt-private/private-output.cc:633
+msgid "The following held packages will be changed:"
+msgstr ""
+
+#: apt-private/private-output.cc:688
+#, c-format
+msgid "%s (due to %s) "
+msgstr ""
+
+#: apt-private/private-output.cc:696
+msgid ""
+"WARNING: The following essential packages will be removed.\n"
+"This should NOT be done unless you know exactly what you are doing!"
+msgstr ""
+
+#: apt-private/private-output.cc:727
+#, c-format
+msgid "%lu upgraded, %lu newly installed, "
+msgstr ""
+
+#: apt-private/private-output.cc:731
+#, c-format
+msgid "%lu reinstalled, "
+msgstr ""
+
+#: apt-private/private-output.cc:733
+#, c-format
+msgid "%lu downgraded, "
+msgstr ""
+
+#: apt-private/private-output.cc:735
+#, c-format
+msgid "%lu to remove and %lu not upgraded.\n"
+msgstr ""
+
+#: apt-private/private-output.cc:739
+#, c-format
+msgid "%lu not fully installed or removed.\n"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
+#. e.g. "Do you want to continue? [Y/n] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:761
+msgid "[Y/n]"
+msgstr ""
+
+#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
+#. e.g. "Should this file be removed? [y/N] "
+#. The user has to answer with an input matching the
+#. YESEXPR/NOEXPR defined in your l10n.
+#: apt-private/private-output.cc:767
+msgid "[y/N]"
+msgstr ""
+
+#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
+#: apt-private/private-output.cc:778
+msgid "Y"
+msgstr ""
+
+#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
+#: apt-private/private-output.cc:784
+msgid "N"
+msgstr ""
+
+#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
+#, c-format
+msgid "Regex compilation error - %s"
+msgstr ""
+
+#: apt-private/private-update.cc:31
+msgid "The update command takes no arguments"
+msgstr ""
+
+#: apt-private/private-update.cc:95
+#, c-format
+msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
+msgid_plural ""
+"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-update.cc:99
+msgid "All packages are up to date."
+msgstr ""
+
 #: apt-private/private-cacheset.cc:37 apt-private/private-search.cc:65
 msgid "Sorting"
 msgstr ""
 
+#: apt-private/private-show.cc:156
+#, c-format
+msgid "There is %i additional record. Please use the '-a' switch to see it"
+msgid_plural ""
+"There are %i additional records. Please use the '-a' switch to see them."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apt-private/private-show.cc:163
+msgid "not a real package (virtual)"
+msgstr ""
+
+#: apt-private/private-main.cc:32
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
 #: apt-private/private-install.cc:81
 msgid "Internal error, InstallPackages was called with broken packages!"
 msgstr ""
@@ -1244,242 +1476,6 @@ msgstr ""
 msgid "Package '%s' is not installed, so not removed\n"
 msgstr ""
 
-#: apt-private/private-list.cc:121
-msgid "Listing"
-msgstr ""
-
-#: apt-private/private-list.cc:151
-#, c-format
-msgid "There is %i additional version. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional versions. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-cachefile.cc:95
-msgid "Correcting dependencies..."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:98
-msgid " failed."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:101
-msgid "Unable to correct dependencies"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:104
-msgid "Unable to minimize the upgrade set"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:106
-msgid " Done"
-msgstr ""
-
-#: apt-private/private-cachefile.cc:110
-msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr ""
-
-#: apt-private/private-cachefile.cc:113
-msgid "Unmet dependencies. Try using -f."
-msgstr ""
-
-#: apt-private/private-output.cc:103 apt-private/private-show.cc:84
-#: apt-private/private-show.cc:89
-msgid "unknown"
-msgstr ""
-
-#: apt-private/private-output.cc:265
-#, c-format
-msgid "[installed,upgradable to: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:268
-msgid "[installed,local]"
-msgstr ""
-
-#: apt-private/private-output.cc:270
-msgid "[installed,auto-removable]"
-msgstr ""
-
-#: apt-private/private-output.cc:272
-msgid "[installed,automatic]"
-msgstr ""
-
-#: apt-private/private-output.cc:274
-msgid "[installed]"
-msgstr ""
-
-#: apt-private/private-output.cc:277
-#, c-format
-msgid "[upgradable from: %s]"
-msgstr ""
-
-#: apt-private/private-output.cc:281
-msgid "[residual-config]"
-msgstr ""
-
-#: apt-private/private-output.cc:455
-#, c-format
-msgid "but %s is installed"
-msgstr ""
-
-#: apt-private/private-output.cc:457
-#, c-format
-msgid "but %s is to be installed"
-msgstr ""
-
-#: apt-private/private-output.cc:464
-msgid "but it is not installable"
-msgstr ""
-
-#: apt-private/private-output.cc:466
-msgid "but it is a virtual package"
-msgstr ""
-
-#: apt-private/private-output.cc:469
-msgid "but it is not installed"
-msgstr ""
-
-#: apt-private/private-output.cc:469
-msgid "but it is not going to be installed"
-msgstr ""
-
-#: apt-private/private-output.cc:474
-msgid " or"
-msgstr ""
-
-#: apt-private/private-output.cc:488 apt-private/private-output.cc:500
-msgid "The following packages have unmet dependencies:"
-msgstr ""
-
-#: apt-private/private-output.cc:523
-msgid "The following NEW packages will be installed:"
-msgstr ""
-
-#: apt-private/private-output.cc:549
-msgid "The following packages will be REMOVED:"
-msgstr ""
-
-#: apt-private/private-output.cc:571
-msgid "The following packages have been kept back:"
-msgstr ""
-
-#: apt-private/private-output.cc:592
-msgid "The following packages will be upgraded:"
-msgstr ""
-
-#: apt-private/private-output.cc:613
-msgid "The following packages will be DOWNGRADED:"
-msgstr ""
-
-#: apt-private/private-output.cc:633
-msgid "The following held packages will be changed:"
-msgstr ""
-
-#: apt-private/private-output.cc:688
-#, c-format
-msgid "%s (due to %s) "
-msgstr ""
-
-#: apt-private/private-output.cc:696
-msgid ""
-"WARNING: The following essential packages will be removed.\n"
-"This should NOT be done unless you know exactly what you are doing!"
-msgstr ""
-
-#: apt-private/private-output.cc:727
-#, c-format
-msgid "%lu upgraded, %lu newly installed, "
-msgstr ""
-
-#: apt-private/private-output.cc:731
-#, c-format
-msgid "%lu reinstalled, "
-msgstr ""
-
-#: apt-private/private-output.cc:733
-#, c-format
-msgid "%lu downgraded, "
-msgstr ""
-
-#: apt-private/private-output.cc:735
-#, c-format
-msgid "%lu to remove and %lu not upgraded.\n"
-msgstr ""
-
-#: apt-private/private-output.cc:739
-#, c-format
-msgid "%lu not fully installed or removed.\n"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to Y[es]
-#. e.g. "Do you want to continue? [Y/n] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:761
-msgid "[Y/n]"
-msgstr ""
-
-#. TRANSLATOR: Yes/No question help-text: defaulting to N[o]
-#. e.g. "Should this file be removed? [y/N] "
-#. The user has to answer with an input matching the
-#. YESEXPR/NOEXPR defined in your l10n.
-#: apt-private/private-output.cc:767
-msgid "[y/N]"
-msgstr ""
-
-#. TRANSLATOR: "Yes" answer printed for a yes/no question if --assume-yes is set
-#: apt-private/private-output.cc:778
-msgid "Y"
-msgstr ""
-
-#. TRANSLATOR: "No" answer printed for a yes/no question if --assume-no is set
-#: apt-private/private-output.cc:784
-msgid "N"
-msgstr ""
-
-#: apt-private/private-output.cc:806 apt-pkg/cachefilter.cc:40
-#, c-format
-msgid "Regex compilation error - %s"
-msgstr ""
-
-#: apt-private/private-update.cc:31
-msgid "The update command takes no arguments"
-msgstr ""
-
-#: apt-private/private-update.cc:95
-#, c-format
-msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
-msgid_plural ""
-"%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-update.cc:99
-msgid "All packages are up to date."
-msgstr ""
-
-#: apt-private/private-show.cc:156
-#, c-format
-msgid "There is %i additional record. Please use the '-a' switch to see it"
-msgid_plural ""
-"There are %i additional records. Please use the '-a' switch to see them."
-msgstr[0] ""
-msgstr[1] ""
-
-#: apt-private/private-show.cc:163
-msgid "not a real package (virtual)"
-msgstr ""
-
-#: apt-private/private-main.cc:32
-msgid ""
-"NOTE: This is only a simulation!\n"
-"      apt-get needs root privileges for real execution.\n"
-"      Keep also in mind that locking is deactivated,\n"
-"      so don't depend on the relevance to the real current situation!"
-msgstr ""
-
 #: apt-private/private-download.cc:62
 #, c-format
 msgid ""
@@ -1533,19 +1529,23 @@ msgid "Full Text Search"
 msgstr ""
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
+#, c-format
+msgid "Hit:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
+#, c-format
+msgid "Get:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
+#, c-format
+msgid "Ign:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
+#, c-format
+msgid "Err:%lu %s"
 msgstr ""
 
 #: apt-private/acqprogress.cc:150
@@ -1569,17 +1569,17 @@ msgstr ""
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #: methods/mirror.cc:95 apt-pkg/init.cc:113 apt-pkg/init.cc:121
-#: apt-pkg/acquire.cc:552 apt-pkg/clean.cc:43 apt-pkg/policy.cc:381
-#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286
-#: apt-pkg/contrib/fileutl.cc:374 apt-pkg/contrib/fileutl.cc:487
-#: apt-pkg/contrib/cdromutl.cc:205 apt-inst/extract.cc:471
+#: apt-pkg/sourcelist.cc:280 apt-pkg/sourcelist.cc:286 apt-pkg/clean.cc:43
+#: apt-pkg/acquire.cc:557 apt-pkg/policy.cc:381 apt-pkg/contrib/fileutl.cc:374
+#: apt-pkg/contrib/fileutl.cc:487 apt-pkg/contrib/cdromutl.cc:205
+#: apt-inst/extract.cc:471
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
 
-#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/acquire.cc:558
-#: apt-pkg/acquire.cc:583 apt-pkg/clean.cc:49 apt-pkg/clean.cc:67
-#: apt-pkg/clean.cc:130 apt-pkg/contrib/cdromutl.cc:201
+#: methods/mirror.cc:101 methods/mirror.cc:130 apt-pkg/clean.cc:49
+#: apt-pkg/clean.cc:67 apt-pkg/clean.cc:130 apt-pkg/acquire.cc:563
+#: apt-pkg/acquire.cc:588 apt-pkg/contrib/cdromutl.cc:201
 #: apt-pkg/contrib/cdromutl.cc:235
 #, c-format
 msgid "Unable to change to %s"
@@ -1651,7 +1651,7 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:227
+#: cmdline/apt-extracttemplates.cc:229
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
@@ -1665,46 +1665,46 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:257 apt-pkg/contrib/fileutl.cc:2092
+#: cmdline/apt-extracttemplates.cc:259 apt-pkg/contrib/fileutl.cc:2092
 #, c-format
 msgid "Unable to mkstemp %s"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:262 apt-pkg/pkgcachegen.cc:1392
+#: cmdline/apt-extracttemplates.cc:264 apt-pkg/pkgcachegen.cc:1385
 #: apt-pkg/contrib/fileutl.cc:2097
 #, c-format
 msgid "Unable to write to %s"
 msgstr ""
 
-#: cmdline/apt-extracttemplates.cc:303
+#: cmdline/apt-extracttemplates.cc:305
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:187 ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:186 ftparchive/apt-ftparchive.cc:370
 msgid "Package extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:189 ftparchive/apt-ftparchive.cc:206
-#: ftparchive/apt-ftparchive.cc:229 ftparchive/apt-ftparchive.cc:283
-#: ftparchive/apt-ftparchive.cc:297 ftparchive/apt-ftparchive.cc:319
+#: ftparchive/apt-ftparchive.cc:188 ftparchive/apt-ftparchive.cc:205
+#: ftparchive/apt-ftparchive.cc:228 ftparchive/apt-ftparchive.cc:282
+#: ftparchive/apt-ftparchive.cc:296 ftparchive/apt-ftparchive.cc:318
 #, c-format
 msgid "Error processing directory %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:281
+#: ftparchive/apt-ftparchive.cc:280
 msgid "Source extension list is too long"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:400
 msgid "Error writing header to contents file"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:431
+#: ftparchive/apt-ftparchive.cc:430
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:626
+#: ftparchive/apt-ftparchive.cc:625
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -1746,11 +1746,11 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:822
+#: ftparchive/apt-ftparchive.cc:821
 msgid "No selections matched"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:907
+#: ftparchive/apt-ftparchive.cc:906
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
@@ -1859,22 +1859,22 @@ msgstr ""
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:435 ftparchive/writer.cc:706
+#: ftparchive/writer.cc:435 ftparchive/writer.cc:698
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:502 ftparchive/writer.cc:870
+#: ftparchive/writer.cc:502 ftparchive/writer.cc:862
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:720
+#: ftparchive/writer.cc:712
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:724
+#: ftparchive/writer.cc:716
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -1960,7 +1960,7 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-internal-solver.cc:49
+#: cmdline/apt-internal-solver.cc:51
 msgid ""
 "Usage: apt-internal-solver\n"
 "\n"
@@ -1974,11 +1974,11 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:89
+#: cmdline/apt-sortpkgs.cc:91
 msgid "Unknown package record!"
 msgstr ""
 
-#: cmdline/apt-sortpkgs.cc:153
+#: cmdline/apt-sortpkgs.cc:155
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
@@ -2040,6 +2040,26 @@ msgstr ""
 msgid "Hash mismatch for: %s"
 msgstr ""
 
+#: apt-pkg/acquire-worker.cc:133
+#, c-format
+msgid "The method driver %s could not be found."
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:135
+#, c-format
+msgid "Is the package %s installed?"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:186
+#, c-format
+msgid "Method %s did not start correctly"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:485
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+
 #: apt-pkg/cachefile.cc:94
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
@@ -2052,173 +2072,294 @@ msgstr ""
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:154
 msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:155 apt-pkg/pkgcache.cc:166
+#: apt-pkg/pkgcache.cc:160 apt-pkg/pkgcache.cc:171
 msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:160
+#: apt-pkg/pkgcache.cc:165
 msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:163
+#: apt-pkg/pkgcache.cc:168
 msgid "The package cache file is corrupted, it is too small"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:170
+#: apt-pkg/pkgcache.cc:175
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:180
+#: apt-pkg/pkgcache.cc:185
 #, c-format
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
 msgid "Depends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
 msgid "PreDepends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:317
+#: apt-pkg/pkgcache.cc:322
 msgid "Suggests"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
 msgid "Recommends"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
 msgid "Conflicts"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:318
+#: apt-pkg/pkgcache.cc:323
 msgid "Replaces"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
 msgid "Obsoletes"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
 msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:319
+#: apt-pkg/pkgcache.cc:324
 msgid "Enhances"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
 msgid "important"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
 msgid "required"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:330
+#: apt-pkg/pkgcache.cc:335
 msgid "standard"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
 msgid "optional"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:331
+#: apt-pkg/pkgcache.cc:336
 msgid "extra"
 msgstr ""
 
-#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:132 apt-pkg/upgrade.cc:178
+#: apt-pkg/upgrade.cc:34 apt-pkg/upgrade.cc:136 apt-pkg/upgrade.cc:182
 msgid "Calculating upgrade"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:133
+#: apt-pkg/pkgrecords.cc:38
 #, c-format
-msgid "The method driver %s could not be found."
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:135
+#: apt-pkg/sourcelist.cc:127
 #, c-format
-msgid "Is the package %s installed?"
+msgid "Malformed stanza %u in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:186
+#: apt-pkg/sourcelist.cc:170
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:485
+#: apt-pkg/sourcelist.cc:173
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Malformed line %lu in source list %s ([option] too short)"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:38
+#: apt-pkg/sourcelist.cc:184
 #, c-format
-msgid "Index file type '%s' is not supported"
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
-msgid "Building dependency tree"
+#: apt-pkg/sourcelist.cc:190
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:139
-msgid "Candidate versions"
+#: apt-pkg/sourcelist.cc:193
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:168
-msgid "Dependency generation"
+#: apt-pkg/sourcelist.cc:206
+#, c-format
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
-msgid "Reading state information"
+#: apt-pkg/sourcelist.cc:208
+#, c-format
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:250
+#: apt-pkg/sourcelist.cc:211
 #, c-format
-msgid "Failed to open StateFile %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:256
+#: apt-pkg/sourcelist.cc:217
 #, c-format
-msgid "Failed to write temporary StateFile %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:224
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:335
+#, c-format
+msgid "Opening %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:347 apt-pkg/cdrom.cc:497
+#, c-format
+msgid "Line %u too long in source list %s."
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:371
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:375
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:416
+#, c-format
+msgid "Type '%s' is not known on stanza %u in source list %s"
+msgstr ""
+
+#: apt-pkg/clean.cc:39 apt-pkg/acquire.cc:553
+#, c-format
+msgid "Clean of %s is not supported"
+msgstr ""
+
+#: apt-pkg/clean.cc:64
+#, c-format
+msgid "Unable to stat %s."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:113
+msgid "Cache has an incompatible versioning system"
+msgstr ""
+
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
+#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
+#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
+#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
+#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
+#: apt-pkg/pkgcachegen.cc:584
+#, c-format
+msgid "Error occurred while processing %s (%s%d)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:273
+msgid "Wow, you exceeded the number of package names this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:276
+msgid "Wow, you exceeded the number of versions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:279
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:282
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:591
+#, c-format
+msgid "Package %s %s was not found while processing file dependencies"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1196
+#, c-format
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1284 apt-pkg/pkgcachegen.cc:1388
+#: apt-pkg/pkgcachegen.cc:1394 apt-pkg/pkgcachegen.cc:1551
+msgid "Reading package lists"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1301
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:1493 apt-pkg/pkgcachegen.cc:1500
+msgid "IO Error saving source cache"
+msgstr ""
+
+#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:244
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:323
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:330
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:622 apt-pkg/edsp.cc:625 apt-pkg/edsp.cc:630
+msgid "Execute external solver"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:98
 msgid "Use --allow-insecure-repositories to force the update"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:220 apt-pkg/contrib/fileutl.cc:2108
+#: apt-pkg/acquire-item.cc:215 apt-pkg/contrib/fileutl.cc:2108
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:245
+#: apt-pkg/acquire-item.cc:240
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:250
+#: apt-pkg/acquire-item.cc:245
 msgid "Size mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:250
 msgid "Invalid file format"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:260
+#: apt-pkg/acquire-item.cc:255
 msgid "Signature error"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:264
+#: apt-pkg/acquire-item.cc:259
 msgid "Does not start with a cleartext signature"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1588
+#: apt-pkg/acquire-item.cc:1584
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -2226,7 +2367,7 @@ msgid ""
 msgstr ""
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1598 apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1594 apt-pkg/acquire-item.cc:1600
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr ""
@@ -2242,170 +2383,102 @@ msgid ""
 "AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2194
+#: apt-pkg/acquire-item.cc:1727 apt-pkg/acquire-item.cc:2202
 #, c-format
 msgid ""
 "The data from '%s' is not signed. Packages from that repository can not be "
 "authenticated."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1952
+#: apt-pkg/acquire-item.cc:1956
 #, c-format
 msgid ""
 "Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
 "or malformed file)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1971
+#: apt-pkg/acquire-item.cc:1975
 #, c-format
 msgid "Unable to find hash sum for '%s' in Release file"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1995
+#: apt-pkg/acquire-item.cc:1999
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2033
+#: apt-pkg/acquire-item.cc:2037
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
 "repository will not be applied."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2055
+#: apt-pkg/acquire-item.cc:2059
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2074
+#: apt-pkg/acquire-item.cc:2078
 #, c-format
 msgid ""
 "The repository '%s' does not have a Release file. This is deprecated, please "
 "contact the owner of the repository."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2241
+#: apt-pkg/acquire-item.cc:2249
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2307
+#: apt-pkg/acquire-item.cc:2315
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:2343
+#: apt-pkg/acquire-item.cc:2351
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:113
-msgid "Cache has an incompatible versioning system"
-msgstr ""
-
-#. TRANSLATOR: The first placeholder is a package name,
-#. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:240 apt-pkg/pkgcachegen.cc:250
-#: apt-pkg/pkgcachegen.cc:316 apt-pkg/pkgcachegen.cc:382
-#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:403
-#: apt-pkg/pkgcachegen.cc:411 apt-pkg/pkgcachegen.cc:415
-#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:440
-#: apt-pkg/pkgcachegen.cc:479 apt-pkg/pkgcachegen.cc:525
-#: apt-pkg/pkgcachegen.cc:539 apt-pkg/pkgcachegen.cc:570
-#: apt-pkg/pkgcachegen.cc:584
-#, c-format
-msgid "Error occurred while processing %s (%s%d)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:276
-msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:279
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:282
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:591
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1203
-#, c-format
-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1291 apt-pkg/pkgcachegen.cc:1395
-#: apt-pkg/pkgcachegen.cc:1401 apt-pkg/pkgcachegen.cc:1558
-msgid "Reading package lists"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1308
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:1500 apt-pkg/pkgcachegen.cc:1507
-msgid "IO Error saving source cache"
-msgstr ""
-
-#: apt-pkg/vendorlist.cc:85
+#: apt-pkg/vendorlist.cc:83
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: apt-pkg/acquire.cc:123 apt-pkg/acquire.cc:143 apt-pkg/cdrom.cc:829
+#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:146 apt-pkg/cdrom.cc:832
 #, c-format
 msgid "List directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:126 apt-pkg/acquire.cc:148
+#: apt-pkg/acquire.cc:129 apt-pkg/acquire.cc:151
 #, c-format
 msgid "Archives directory %spartial is missing."
 msgstr ""
 
-#: apt-pkg/acquire.cc:548 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:162
 #, c-format
-msgid "Clean of %s is not supported"
+msgid "Unable to lock directory %s"
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
-#: apt-pkg/acquire.cc:976
+#: apt-pkg/acquire.cc:981
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: apt-pkg/acquire.cc:978
+#: apt-pkg/acquire.cc:983
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
 
-#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
-msgid ""
-"Some index files failed to download. They have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: apt-pkg/srcrecords.cc:52
+#: apt-pkg/srcrecords.cc:53
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: apt-pkg/clean.cc:64
-#, c-format
-msgid "Unable to stat %s."
-msgstr ""
-
 #: apt-pkg/policy.cc:83
 #, c-format
 msgid ""
@@ -2427,19 +2500,19 @@ msgstr ""
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:958
+#: apt-pkg/packagemanager.cc:304 apt-pkg/packagemanager.cc:984
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:551 apt-pkg/packagemanager.cc:581
+#: apt-pkg/packagemanager.cc:563 apt-pkg/packagemanager.cc:593
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:631
+#: apt-pkg/packagemanager.cc:643
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2447,9 +2520,10 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:497 apt-pkg/sourcelist.cc:347
-#, c-format
-msgid "Line %u too long in source list %s."
+#: apt-pkg/update.cc:103 apt-pkg/update.cc:105
+msgid ""
+"Some index files failed to download. They have been ignored, or old ones "
+"used instead."
 msgstr ""
 
 #: apt-pkg/cdrom.cc:571
@@ -2515,11 +2589,11 @@ msgstr ""
 msgid "Copying package lists..."
 msgstr ""
 
-#: apt-pkg/cdrom.cc:863
+#: apt-pkg/cdrom.cc:866
 msgid "Writing new source list\n"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:874
+#: apt-pkg/cdrom.cc:877
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
@@ -2529,144 +2603,45 @@ msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1084
+#: apt-pkg/algorithms.cc:1090
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1086
+#: apt-pkg/algorithms.cc:1092
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: apt-pkg/edsp.cc:52 apt-pkg/edsp.cc:78
-msgid "Send scenario to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:237
-msgid "Send request to solver"
-msgstr ""
-
-#: apt-pkg/edsp.cc:316
-msgid "Prepare for receiving solution"
-msgstr ""
-
-#: apt-pkg/edsp.cc:323
-msgid "External solver failed without a proper error message"
-msgstr ""
-
-#: apt-pkg/edsp.cc:615 apt-pkg/edsp.cc:618 apt-pkg/edsp.cc:623
-msgid "Execute external solver"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:169
-#, c-format
-msgid "Unable to parse package file %s (1)"
-msgstr ""
-
-#: apt-pkg/tagfile.cc:269
-#, c-format
-msgid "Unable to parse package file %s (2)"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:83
-#, c-format
-msgid "Unable to parse Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:91
-#, c-format
-msgid "No sections in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:139
-#, c-format
-msgid "No Hash entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:152
-#, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/indexrecords.cc:171
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:127
-#, c-format
-msgid "Malformed stanza %u in source list %s (URI parse)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:170
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:173
-#, c-format
-msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:184
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:190
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:193
-#, c-format
-msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:206
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:208
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:211
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+#: apt-pkg/depcache.cc:138 apt-pkg/depcache.cc:167
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:217
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+#: apt-pkg/depcache.cc:139
+msgid "Candidate versions"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:224
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+#: apt-pkg/depcache.cc:168
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:335
-#, c-format
-msgid "Opening %s"
+#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+msgid "Reading state information"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:371
+#: apt-pkg/depcache.cc:252
 #, c-format
-msgid "Malformed line %u in source list %s (type)"
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:375
+#: apt-pkg/depcache.cc:258
 #, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:416
+#: apt-pkg/tagfile.cc:186 apt-pkg/tagfile.cc:286 apt-pkg/deb/debrecords.cc:207
 #, c-format
-msgid "Type '%s' is not known on stanza %u in source list %s"
+msgid "Unable to parse package file %s (%d)"
 msgstr ""
 
 #: apt-pkg/cacheset.cc:501
@@ -2679,207 +2654,100 @@ msgstr ""
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:634
+#: apt-pkg/cacheset.cc:629
 #, c-format
 msgid "Couldn't find task '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:640
+#: apt-pkg/cacheset.cc:635
 #, c-format
 msgid "Couldn't find any package by regex '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:646
+#: apt-pkg/cacheset.cc:641
 #, c-format
 msgid "Couldn't find any package by glob '%s'"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:690
+#: apt-pkg/cacheset.cc:680
 #, c-format
 msgid "Can't select versions from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:734
+#: apt-pkg/cacheset.cc:719
 #, c-format
 msgid "Can't select newest version from package '%s' as it is purely virtual"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:742
+#: apt-pkg/cacheset.cc:727
 #, c-format
 msgid "Can't select candidate version from package %s as it has no candidate"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:750
+#: apt-pkg/cacheset.cc:735
 #, c-format
 msgid "Can't select installed version from package %s as it is not installed"
 msgstr ""
 
-#: apt-pkg/cacheset.cc:758 apt-pkg/cacheset.cc:766
+#: apt-pkg/cacheset.cc:743 apt-pkg/cacheset.cc:751
 #, c-format
 msgid ""
 "Can't select installed nor candidate version from package '%s' as it has "
 "neither of them"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:107
-#, c-format
-msgid "Installing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:108 apt-pkg/deb/dpkgpm.cc:1011
-#, c-format
-msgid "Configuring %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:109 apt-pkg/deb/dpkgpm.cc:1018
-#, c-format
-msgid "Removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:110
-#, c-format
-msgid "Completely removing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:111
-#, c-format
-msgid "Noting disappearance of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:112
-#, c-format
-msgid "Running post-installation trigger %s"
-msgstr ""
-
-#. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:842
-#, c-format
-msgid "Directory '%s' missing"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:857 apt-pkg/deb/dpkgpm.cc:879
-#, c-format
-msgid "Could not open file '%s'"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1004
-#, c-format
-msgid "Preparing %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1005
-#, c-format
-msgid "Unpacking %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1010
+#: apt-pkg/indexrecords.cc:83
 #, c-format
-msgid "Preparing to configure %s"
+msgid "Unable to parse Release file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1012
+#: apt-pkg/indexrecords.cc:91
 #, c-format
-msgid "Installed %s"
+msgid "No sections in Release file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1017
+#: apt-pkg/indexrecords.cc:132
 #, c-format
-msgid "Preparing for removal of %s"
+msgid "No Hash entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1019
+#: apt-pkg/indexrecords.cc:145
 #, c-format
-msgid "Removed %s"
+msgid "Invalid 'Valid-Until' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/indexrecords.cc:164
 #, c-format
-msgid "Preparing to completely remove %s"
+msgid "Invalid 'Date' entry in Release file %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1025
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:425
 #, c-format
-msgid "Completely removed %s"
+msgid "%lid %lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1134
-#: apt-pkg/deb/dpkgpm.cc:1160
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:432
 #, c-format
-msgid "Can not write log (%s)"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1079 apt-pkg/deb/dpkgpm.cc:1160
-msgid "Is /dev/pts mounted?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1134
-msgid "Is stdout a terminal?"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1638
-msgid "Operation was interrupted before it could finish"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1700
-msgid "No apport report written because MaxReports is reached already"
-msgstr ""
-
-#. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:1705
-msgid "dependency problems - leaving unconfigured"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1707
-msgid ""
-"No apport report written because the error message indicates its a followup "
-"error from a previous failure."
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1713
-msgid ""
-"No apport report written because the error message indicates a disk full "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1720
-msgid ""
-"No apport report written because the error message indicates a out of memory "
-"error"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1727 apt-pkg/deb/dpkgpm.cc:1733
-msgid ""
-"No apport report written because the error message indicates an issue on the "
-"local system"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:1755
-msgid ""
-"No apport report written because the error message indicates a dpkg I/O error"
+msgid "%lih %limin %lis"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:91
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:439
 #, c-format
-msgid ""
-"Unable to lock the administration directory (%s), is another process using "
-"it?"
+msgid "%limin %lis"
 msgstr ""
 
-#: apt-pkg/deb/debsystem.cc:94
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:444
 #, c-format
-msgid "Unable to lock the administration directory (%s), are you root?"
+msgid "%lis"
 msgstr ""
 
-#. TRANSLATORS: the %s contains the recovery command, usually
-#. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:110
+#: apt-pkg/contrib/strutl.cc:1290
 #, c-format
-msgid ""
-"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
-
-#: apt-pkg/deb/debsystem.cc:128
-msgid "Not locked"
+msgid "Selection %s not found"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:196
@@ -3015,35 +2883,6 @@ msgstr ""
 msgid "%c%s... %u%%"
 msgstr ""
 
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:425
-#, c-format
-msgid "%lid %lih %limin %lis"
-msgstr ""
-
-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:432
-#, c-format
-msgid "%lih %limin %lis"
-msgstr ""
-
-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:439
-#, c-format
-msgid "%limin %lis"
-msgstr ""
-
-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:444
-#, c-format
-msgid "%lis"
-msgstr ""
-
-#: apt-pkg/contrib/strutl.cc:1290
-#, c-format
-msgid "Selection %s not found"
-msgstr ""
-
 #: apt-pkg/contrib/mmap.cc:79
 msgid "Can't mmap an empty file"
 msgstr ""
@@ -3103,107 +2942,263 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:522
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:630
+#: apt-pkg/contrib/configuration.cc:636
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:798
+#: apt-pkg/contrib/configuration.cc:804
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:817
+#: apt-pkg/contrib/configuration.cc:823
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:834
+#: apt-pkg/contrib/configuration.cc:840
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:874
+#: apt-pkg/contrib/configuration.cc:880
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:881
+#: apt-pkg/contrib/configuration.cc:887
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:885 apt-pkg/contrib/configuration.cc:890
+#: apt-pkg/contrib/configuration.cc:891 apt-pkg/contrib/configuration.cc:896
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:894
+#: apt-pkg/contrib/configuration.cc:900
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:897
+#: apt-pkg/contrib/configuration.cc:903
 #, c-format
 msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:947
+#: apt-pkg/contrib/configuration.cc:953
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:149 apt-pkg/contrib/cmndline.cc:158
-#: apt-pkg/contrib/cmndline.cc:166
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:171
+#: apt-pkg/contrib/cmndline.cc:174
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:212 apt-pkg/contrib/cmndline.cc:233
+#: apt-pkg/contrib/cmndline.cc:215 apt-pkg/contrib/cmndline.cc:236
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:246 apt-pkg/contrib/cmndline.cc:252
+#: apt-pkg/contrib/cmndline.cc:249 apt-pkg/contrib/cmndline.cc:255
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:281
+#: apt-pkg/contrib/cmndline.cc:284
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:312
+#: apt-pkg/contrib/cmndline.cc:315
 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:344
+#: apt-pkg/contrib/cmndline.cc:347
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:394
+#: apt-pkg/contrib/cmndline.cc:397
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
+#: apt-pkg/deb/dpkgpm.cc:112
+#, c-format
+msgid "Installing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:113 apt-pkg/deb/dpkgpm.cc:1008
+#, c-format
+msgid "Configuring %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:114 apt-pkg/deb/dpkgpm.cc:1015
+#, c-format
+msgid "Removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:115
+#, c-format
+msgid "Completely removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:116
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:117
+#, c-format
+msgid "Running post-installation trigger %s"
+msgstr ""
+
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:839
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:854 apt-pkg/deb/dpkgpm.cc:876
+#, c-format
+msgid "Could not open file '%s'"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1001
+#, c-format
+msgid "Preparing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1002
+#, c-format
+msgid "Unpacking %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1007
+#, c-format
+msgid "Preparing to configure %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1009
+#, c-format
+msgid "Installed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1014
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1016
+#, c-format
+msgid "Removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1021
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1022
+#, c-format
+msgid "Completely removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+#, c-format
+msgid "Can not write log (%s)"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1081 apt-pkg/deb/dpkgpm.cc:1169
+msgid "Is /dev/pts mounted?"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1656
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1718
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1723
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1725
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1731
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1738
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1745 apt-pkg/deb/dpkgpm.cc:1751
+msgid ""
+"No apport report written because the error message indicates an issue on the "
+"local system"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1773
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:91
+#, c-format
+msgid ""
+"Unable to lock the administration directory (%s), is another process using "
+"it?"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:94
+#, c-format
+msgid "Unable to lock the administration directory (%s), are you root?"
+msgstr ""
+
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:110
+#, c-format
+msgid ""
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:128
+msgid "Not locked"
+msgstr ""
+
 #: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr ""
@@ -3308,7 +3303,7 @@ msgstr ""
 msgid "Internal error, could not locate member %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:227
+#: apt-inst/deb/debfile.cc:231
 msgid "Unparsable control file"
 msgstr ""
 
@@ -3337,23 +3332,23 @@ msgstr ""
 msgid "Failed to read the archive headers"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:123
+#: apt-inst/contrib/extracttar.cc:128
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:150
+#: apt-inst/contrib/extracttar.cc:155
 msgid "Failed to exec gzip "
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:187 apt-inst/contrib/extracttar.cc:217
+#: apt-inst/contrib/extracttar.cc:192 apt-inst/contrib/extracttar.cc:222
 msgid "Corrupted archive"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:202
+#: apt-inst/contrib/extracttar.cc:207
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:307
+#: apt-inst/contrib/extracttar.cc:312
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""