* apt-pkg/indexrecords.cc:

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 41b46ae..82d61f4 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,163 +7,169 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-03-14 16:30+0100\n"
+"POT-Creation-Date: 2011-12-19 14:28+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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

+"Language: \n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 

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

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

-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
-#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021
-#: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
-#, c-format
-msgid "Unable to locate package %s"
+#: cmdline/apt-cache.cc:286
+msgid "Total package names: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:245
-msgid "Total package names: "
+#: cmdline/apt-cache.cc:288
+msgid "Total package structures: "

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:515 cmdline/apt-cache.cc:1143

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

-#: cmdline/apt-cache.cc:1297
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:593 cmdline/apt-cache.cc:1378
+#: cmdline/apt-cache.cc:1380 cmdline/apt-cache.cc:1457 cmdline/apt-mark.cc:39
+#: cmdline/apt-mark.cc:86 cmdline/apt-mark.cc:162
+msgid "No packages found"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1451
-msgid "No packages found"
+#: cmdline/apt-cache.cc:1222
+msgid "You must give at least one search pattern"
+msgstr ""
+
+#: cmdline/apt-cache.cc:1357
+msgid "This command is deprecated. Please use 'apt-mark showauto' instead."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1452 apt-pkg/cacheset.cc:459
+#, c-format
+msgid "Unable to locate package %s"
+msgstr ""
+
+#: cmdline/apt-cache.cc:1482

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

-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1489 cmdline/apt-cache.cc:1580

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 #. Show any packages have explicit pins

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

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

-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1515 cmdline/apt-cache.cc:1560

 msgid "(not found)"
 msgstr ""
 
 msgid "(not found)"
 msgstr ""
 

-#. Installed version
-#: cmdline/apt-cache.cc:1582
+#: cmdline/apt-cache.cc:1523

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

-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
-msgid "(none)"
+#: cmdline/apt-cache.cc:1524
+msgid "  Candidate: "

 msgstr ""
 
 msgstr ""
 

-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
-msgid "  Candidate: "
+#: cmdline/apt-cache.cc:1542 cmdline/apt-cache.cc:1550
+msgid "(none)"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2693 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1679 cmdline/apt-cdrom.cc:199 cmdline/apt-config.cc:75
+#: cmdline/apt-extracttemplates.cc:227 ftparchive/apt-ftparchive.cc:590
+#: cmdline/apt-get.cc:3255 cmdline/apt-internal-solver.cc:32
+#: cmdline/apt-mark.cc:266 cmdline/apt-sortpkgs.cc:147

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

-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1686

 msgid ""
 "Usage: apt-cache [options] command\n"
 msgid ""
 "Usage: apt-cache [options] command\n"

-"       apt-cache [options] add file1 [file2 ...]\n"

 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"
 "       apt-cache [options] showpkg pkg1 [pkg2 ...]\n"
 "       apt-cache [options] showsrc pkg1 [pkg2 ...]\n"
 "\n"

-"apt-cache is a low-level tool used to manipulate APT's binary\n"
-"cache files, and query information from them\n"
+"apt-cache is a low-level tool used to query information\n"
+"from APT's binary cache files\n"

 "\n"
 "Commands:\n"
 "\n"
 "Commands:\n"

-"   add - Add a package file to the source cache\n"

 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"
 "   gencaches - Build both the package and source cache\n"
 "   showpkg - Show some general information for a single package\n"
 "   showsrc - Show source records\n"


@@ -191,28 +197,28 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:77
+#: cmdline/apt-cdrom.cc:79

 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 
 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:92
+#: cmdline/apt-cdrom.cc:94

 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:127
+#: cmdline/apt-cdrom.cc:129

 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 
 #, c-format
 msgid "Failed to mount '%s' to '%s'"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:162
+#: cmdline/apt-cdrom.cc:164

 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 

-#: cmdline/apt-config.cc:41
+#: cmdline/apt-config.cc:46

 msgid "Arguments not in pairs"
 msgstr ""
 
 msgid "Arguments not in pairs"
 msgstr ""
 

-#: cmdline/apt-config.cc:76
+#: cmdline/apt-config.cc:81

 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"
 msgid ""
 "Usage: apt-config [options] command\n"
 "\n"


@@ -228,12 +234,12 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:98
+#: cmdline/apt-extracttemplates.cc:100

 #, c-format
 msgid "%s not a valid DEB package."
 msgstr ""
 
 #, c-format
 msgid "%s not a valid DEB package."
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:232
+#: cmdline/apt-extracttemplates.cc:234

 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-extracttemplates file1 [file2 ...]\n"
 "\n"


@@ -247,40 +253,40 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

-#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863
+#: cmdline/apt-extracttemplates.cc:269 apt-pkg/pkgcachegen.cc:1271

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

-#: cmdline/apt-extracttemplates.cc:310
+#: cmdline/apt-extracttemplates.cc:311

 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+#: ftparchive/apt-ftparchive.cc:171 ftparchive/apt-ftparchive.cc:348

 msgid "Package extension list is too long"
 msgstr ""
 
 msgid "Package extension list is too long"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
-#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
-#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289
+#: ftparchive/apt-ftparchive.cc:173 ftparchive/apt-ftparchive.cc:190
+#: ftparchive/apt-ftparchive.cc:213 ftparchive/apt-ftparchive.cc:263
+#: ftparchive/apt-ftparchive.cc:277 ftparchive/apt-ftparchive.cc:299

 #, c-format
 msgid "Error processing directory %s"
 msgstr ""
 
 #, c-format
 msgid "Error processing directory %s"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:251
+#: ftparchive/apt-ftparchive.cc:261

 msgid "Source extension list is too long"
 msgstr ""
 
 msgid "Source extension list is too long"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:368
+#: ftparchive/apt-ftparchive.cc:378

 msgid "Error writing header to contents file"
 msgstr ""
 
 msgid "Error writing header to contents file"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:398
+#: ftparchive/apt-ftparchive.cc:408

 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:553
+#: ftparchive/apt-ftparchive.cc:596

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -322,141 +328,136 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:759
+#: ftparchive/apt-ftparchive.cc:802

 msgid "No selections matched"
 msgstr ""
 
 msgid "No selections matched"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:832
+#: ftparchive/apt-ftparchive.cc:880

 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 

-#: ftparchive/cachedb.cc:43
+#: ftparchive/cachedb.cc:46

 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 

-#: ftparchive/cachedb.cc:61
+#: ftparchive/cachedb.cc:64

 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr ""
 
 #, c-format
 msgid "DB is old, attempting to upgrade %s"
 msgstr ""
 

-#: ftparchive/cachedb.cc:72
+#: ftparchive/cachedb.cc:75

 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 
 msgid ""
 "DB format is invalid. If you upgraded from an older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 

-#: ftparchive/cachedb.cc:77
+#: ftparchive/cachedb.cc:80

 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to open DB file %s: %s"
 msgstr ""
 

-#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
-#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
+#: ftparchive/cachedb.cc:126 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121

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

-#: ftparchive/cachedb.cc:242
+#: ftparchive/cachedb.cc:248

 msgid "Archive has no control record"
 msgstr ""
 
 msgid "Archive has no control record"
 msgstr ""
 

-#: ftparchive/cachedb.cc:448
+#: ftparchive/cachedb.cc:489

 msgid "Unable to get a cursor"
 msgstr ""
 
 msgid "Unable to get a cursor"
 msgstr ""
 

-#: ftparchive/writer.cc:72
+#: ftparchive/writer.cc:80

 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 

-#: ftparchive/writer.cc:77
+#: ftparchive/writer.cc:85

 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 

-#: ftparchive/writer.cc:133
+#: ftparchive/writer.cc:141

 msgid "E: "
 msgstr ""
 
 msgid "E: "
 msgstr ""
 

-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:143

 msgid "W: "
 msgstr ""
 
 msgid "W: "
 msgstr ""
 

-#: ftparchive/writer.cc:142
+#: ftparchive/writer.cc:150

 msgid "E: Errors apply to file "
 msgstr ""
 
 msgid "E: Errors apply to file "
 msgstr ""
 

-#: ftparchive/writer.cc:160 ftparchive/writer.cc:192
+#: ftparchive/writer.cc:168 ftparchive/writer.cc:200

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

-#: ftparchive/writer.cc:173
+#: ftparchive/writer.cc:181

 msgid "Tree walking failed"
 msgstr ""
 
 msgid "Tree walking failed"
 msgstr ""
 

-#: ftparchive/writer.cc:200
+#: ftparchive/writer.cc:208

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

-#: ftparchive/writer.cc:259
+#: ftparchive/writer.cc:267

 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 

-#: ftparchive/writer.cc:267
+#: ftparchive/writer.cc:275

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

-#: ftparchive/writer.cc:271
+#: ftparchive/writer.cc:279

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

-#: ftparchive/writer.cc:278
+#: ftparchive/writer.cc:286

 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 

-#: ftparchive/writer.cc:288
+#: ftparchive/writer.cc:296

 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 

-#: ftparchive/writer.cc:392
+#: ftparchive/writer.cc:401

 msgid "Archive had no package field"
 msgstr ""
 
 msgid "Archive had no package field"
 msgstr ""
 

-#: ftparchive/writer.cc:400 ftparchive/writer.cc:636
+#: ftparchive/writer.cc:409 ftparchive/writer.cc:711

 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 

-#: ftparchive/writer.cc:461 ftparchive/writer.cc:741
+#: ftparchive/writer.cc:477 ftparchive/writer.cc:827

 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 

-#: ftparchive/writer.cc:646
+#: ftparchive/writer.cc:721

 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 

-#: ftparchive/writer.cc:650
+#: ftparchive/writer.cc:725

 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
 

-#: ftparchive/contents.cc:321
-#, c-format
-msgid "Internal error, could not locate member %s"
-msgstr ""
-
-#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
+#: ftparchive/contents.cc:339 ftparchive/contents.cc:370

 msgid "realloc - Failed to allocate memory"
 msgstr ""
 
 msgid "realloc - Failed to allocate memory"
 msgstr ""
 


@@ -467,17 +468,17 @@ msgstr ""
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format
 
 #: ftparchive/override.cc:60 ftparchive/override.cc:166
 #, c-format

-msgid "Malformed override %s line %lu #1"
+msgid "Malformed override %s line %llu #1"

 msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format
 msgstr ""
 
 #: ftparchive/override.cc:74 ftparchive/override.cc:178
 #, c-format

-msgid "Malformed override %s line %lu #2"
+msgid "Malformed override %s line %llu #2"

 msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format
 msgstr ""
 
 #: ftparchive/override.cc:88 ftparchive/override.cc:191
 #, c-format

-msgid "Malformed override %s line %lu #3"
+msgid "Malformed override %s line %llu #3"

 msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201
 msgstr ""
 
 #: ftparchive/override.cc:127 ftparchive/override.cc:201


@@ -485,283 +486,368 @@ msgstr ""
 msgid "Failed to read the override file %s"
 msgstr ""
 
 msgid "Failed to read the override file %s"
 msgstr ""
 

-#: ftparchive/multicompress.cc:72
+#: ftparchive/multicompress.cc:70

 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 

-#: ftparchive/multicompress.cc:102
+#: ftparchive/multicompress.cc:100

 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 

-#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:97

 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 

-#: ftparchive/multicompress.cc:195
+#: ftparchive/multicompress.cc:189

 msgid "Failed to create FILE*"
 msgstr ""
 
 msgid "Failed to create FILE*"
 msgstr ""
 

-#: ftparchive/multicompress.cc:198
+#: ftparchive/multicompress.cc:192

 msgid "Failed to fork"
 msgstr ""
 
 msgid "Failed to fork"
 msgstr ""
 

-#: ftparchive/multicompress.cc:212
+#: ftparchive/multicompress.cc:206

 msgid "Compress child"
 msgstr ""
 
 msgid "Compress child"
 msgstr ""
 

-#: ftparchive/multicompress.cc:235
+#: ftparchive/multicompress.cc:229

 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr ""
 
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr ""
 

-#: ftparchive/multicompress.cc:286
-msgid "Failed to create subprocess IPC"
-msgstr ""
-
-#: ftparchive/multicompress.cc:321
-msgid "Failed to exec compressor "
-msgstr ""
-
-#: ftparchive/multicompress.cc:360
-msgid "decompressor"
-msgstr ""
-
-#: ftparchive/multicompress.cc:403
+#: ftparchive/multicompress.cc:304

 msgid "IO to subprocess/file failed"
 msgstr ""
 
 msgid "IO to subprocess/file failed"
 msgstr ""
 

-#: ftparchive/multicompress.cc:455
+#: ftparchive/multicompress.cc:342

 msgid "Failed to read while computing MD5"
 msgstr ""
 
 msgid "Failed to read while computing MD5"
 msgstr ""
 

-#: ftparchive/multicompress.cc:472
+#: ftparchive/multicompress.cc:358

 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 

-#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
+#: ftparchive/multicompress.cc:373 apt-inst/extract.cc:188

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

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

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

-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1752
+#: cmdline/apt-get.cc:140
+msgid "N"
+msgstr ""
+
+#: cmdline/apt-get.cc:162 apt-pkg/cachefilter.cc:31

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:632
+#, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:637
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:654
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:665
+msgid " [Installed]"
+msgstr ""
+
+#: cmdline/apt-get.cc:674
+msgid " [Not candidate version]"
+msgstr ""
+
+#: cmdline/apt-get.cc:676
+msgid "You should explicitly select one to install."
+msgstr ""
+
+#: cmdline/apt-get.cc:679
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:697
+msgid "However the following packages replace it:"
+msgstr ""
+
+#: cmdline/apt-get.cc:709
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: cmdline/apt-get.cc:720
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:764
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:794
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:810
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:815
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:834 cmdline/apt-get.cc:2114 cmdline/apt-mark.cc:61
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:860
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:865
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:907
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:985

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

-#: cmdline/apt-get.cc:672
+#: cmdline/apt-get.cc:988

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

-#: cmdline/apt-get.cc:675
+#: cmdline/apt-get.cc:991

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

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

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

-#: cmdline/apt-get.cc:680
+#: cmdline/apt-get.cc:996

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

-#: cmdline/apt-get.cc:684
+#: cmdline/apt-get.cc:1000

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

-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:1003

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

-#: cmdline/apt-get.cc:712
+#: cmdline/apt-get.cc:1028

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

-#: cmdline/apt-get.cc:716
+#: cmdline/apt-get.cc:1032

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

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

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

-#: cmdline/apt-get.cc:725
+#: cmdline/apt-get.cc:1041

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

-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:1050 cmdline/apt-get.cc:1211

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

-#: cmdline/apt-get.cc:775
+#: cmdline/apt-get.cc:1091

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

-#: cmdline/apt-get.cc:784
+#: cmdline/apt-get.cc:1100

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

-#: cmdline/apt-get.cc:795
+#: cmdline/apt-get.cc:1111

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

-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2129
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2177 cmdline/apt-get.cc:2434
-#: apt-pkg/cachefile.cc:65
-msgid "The list of sources could not be read."
-msgstr ""
-
-#: cmdline/apt-get.cc:836
+#: cmdline/apt-get.cc:1149

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2273
-#: cmdline/apt-get.cc:2276
+#: cmdline/apt-get.cc:1188 cmdline/apt-get.cc:1191 cmdline/apt-get.cc:2534
+#: cmdline/apt-get.cc:2537

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

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

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

-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:1217 cmdline/apt-get.cc:1237

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

-#: cmdline/apt-get.cc:898
+#: cmdline/apt-get.cc:1219

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

-#: cmdline/apt-get.cc:900
+#: cmdline/apt-get.cc:1221

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


@@ -769,170 +855,84 @@ msgid ""
 " ?] "
 msgstr ""
 
 " ?] "
 msgstr ""
 

-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:1227 cmdline/apt-get.cc:1246

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

-#: cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:1242

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

-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2329 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1314 cmdline/apt-get.cc:2599 apt-pkg/algorithms.cc:1492

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

-#: cmdline/apt-get.cc:1011
+#: cmdline/apt-get.cc:1332

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

-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2338
+#: cmdline/apt-get.cc:1333 cmdline/apt-get.cc:2611

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

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

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

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

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

-#: cmdline/apt-get.cc:1027
+#: cmdline/apt-get.cc:1348

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

-#: cmdline/apt-get.cc:1028
+#: cmdline/apt-get.cc:1349

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

-#: cmdline/apt-get.cc:1086
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1097
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1107
-#, c-format
-msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1125
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1136
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1148
-msgid " [Installed]"
-msgstr ""
-
-#: cmdline/apt-get.cc:1153
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1158
-#, c-format
+#: cmdline/apt-get.cc:1377

 msgid ""
 msgid ""

-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1177
-msgid "However the following packages replace it:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1180
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:1200
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1208
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1237
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr ""
-
-#: cmdline/apt-get.cc:1239
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr ""
+"The following package disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgid_plural ""
+"The following packages disappeared from your system as\n"
+"all files have been overwritten by other packages:"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:1245
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
+#: cmdline/apt-get.cc:1381
+msgid "Note: This is done automatic and on purpose by dpkg."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1331
+#: cmdline/apt-get.cc:1519

 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
 #, c-format
 msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:1362
+#: cmdline/apt-get.cc:1551

 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)
 #, c-format
 msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
 #. if (VerTag.empty() == false && Last == 0)

-#: cmdline/apt-get.cc:1399
+#: cmdline/apt-get.cc:1589

 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
 #, c-format
 msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 

-#: cmdline/apt-get.cc:1415
+#: cmdline/apt-get.cc:1605

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

-#: cmdline/apt-get.cc:1428
-msgid "Unable to lock the list directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:1484
+#: cmdline/apt-get.cc:1668

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

-#: cmdline/apt-get.cc:1532
-msgid ""
-"The following package is automatically installed and is no longer required:"
-msgid_plural ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1536
-#, c-format
-msgid "%lu package was automatically installed and is no longer required.\n"
-msgid_plural ""
-"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: cmdline/apt-get.cc:1538
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1772

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


@@ -948,49 +948,50 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1546 cmdline/apt-get.cc:1838
+#: cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1944

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

-#: cmdline/apt-get.cc:1550
+#: cmdline/apt-get.cc:1779

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

-#: cmdline/apt-get.cc:1569
-msgid "Internal error, AllUpgrade broke stuff"
-msgstr ""
-
-#: cmdline/apt-get.cc:1624
-#, c-format
-msgid "Couldn't find task %s"
-msgstr ""
+#: cmdline/apt-get.cc:1786
+msgid ""
+"The following package was automatically installed and is no longer required:"
+msgid_plural ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:1739 cmdline/apt-get.cc:1775
+#: cmdline/apt-get.cc:1790

 #, c-format
 #, c-format

-msgid "Couldn't find package %s"
-msgstr ""
+msgid "%lu package was automatically installed and is no longer required.\n"
+msgid_plural ""
+"%lu packages were automatically installed and are no longer required.\n"
+msgstr[0] ""
+msgstr[1] ""

 
 

-#: cmdline/apt-get.cc:1762
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
+#: cmdline/apt-get.cc:1792
+msgid "Use 'apt-get autoremove' to remove them."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1795
-#, c-format
-msgid "%s set to manually installed.\n"
+#: cmdline/apt-get.cc:1811
+msgid "Internal error, AllUpgrade broke stuff"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1808
+#: cmdline/apt-get.cc:1910

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

-#: cmdline/apt-get.cc:1811
+#: cmdline/apt-get.cc:1914

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

-#: cmdline/apt-get.cc:1823
+#: cmdline/apt-get.cc:1929

 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"


@@ -998,152 +999,222 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1841
+#: cmdline/apt-get.cc:1950

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

-#: cmdline/apt-get.cc:1870
+#: cmdline/apt-get.cc:1976

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

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

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

-#: cmdline/apt-get.cc:1960
+#: cmdline/apt-get.cc:2067

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

-#: cmdline/apt-get.cc:1989
+#: cmdline/apt-get.cc:2109
+#, c-format
+msgid "Couldn't find package %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:2116 cmdline/apt-mark.cc:63
+#, c-format
+msgid "%s set to automatically installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2124 cmdline/apt-mark.cc:107
+msgid ""
+"This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
+"instead."
+msgstr ""
+
+#: cmdline/apt-get.cc:2140

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

-#: cmdline/apt-get.cc:1992 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2143 methods/ftp.cc:711 methods/connect.cc:115

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

-#: cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:2148

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

-#: cmdline/apt-get.cc:2064 cmdline/apt-get.cc:2072
+#: cmdline/apt-get.cc:2215 cmdline/apt-get.cc:2223

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

-#: cmdline/apt-get.cc:2172
+#: cmdline/apt-get.cc:2251 cmdline/apt-get.cc:2287
+msgid "Unable to lock the download directory"
+msgstr ""
+
+#: cmdline/apt-get.cc:2338
+#, c-format
+msgid "Downloading %s %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:2396

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

-#: cmdline/apt-get.cc:2202 cmdline/apt-get.cc:2452
+#: cmdline/apt-get.cc:2436 cmdline/apt-get.cc:2748

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

-#: cmdline/apt-get.cc:2251
+#: cmdline/apt-get.cc:2453
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2458
+#, c-format
+msgid ""
+"Please use:\n"
+"bzr get %s\n"
+"to retrieve the latest (possibly unreleased) updates to the package.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2511

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

-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2548

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

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

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

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

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

-#: cmdline/apt-get.cc:2301
+#: cmdline/apt-get.cc:2568

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

-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2606

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

-#: cmdline/apt-get.cc:2363
+#: cmdline/apt-get.cc:2637

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

-#: cmdline/apt-get.cc:2375
+#: cmdline/apt-get.cc:2649

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

-#: cmdline/apt-get.cc:2376
+#: cmdline/apt-get.cc:2650

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

-#: cmdline/apt-get.cc:2393
+#: cmdline/apt-get.cc:2672

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

-#: cmdline/apt-get.cc:2413
+#: cmdline/apt-get.cc:2692

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

-#: cmdline/apt-get.cc:2429
+#: cmdline/apt-get.cc:2711

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

-#: cmdline/apt-get.cc:2457
+#: cmdline/apt-get.cc:2736
+#, c-format
+msgid ""
+"No architecture information available for %s. See apt.conf(5) APT::"
+"Architectures for setup"
+msgstr ""
+
+#: cmdline/apt-get.cc:2753

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

-#: cmdline/apt-get.cc:2477
+#: cmdline/apt-get.cc:2773

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

-#: cmdline/apt-get.cc:2529
+#: cmdline/apt-get.cc:2903
+#, c-format
+msgid ""
+"%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
+"packages"
+msgstr ""
+
+#: cmdline/apt-get.cc:2924

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

-#: cmdline/apt-get.cc:2582
+#: cmdline/apt-get.cc:2947
+#, c-format
+msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgstr ""
+
+#: cmdline/apt-get.cc:2986

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"%s dependency for %s cannot be satisfied because no available versions of "
-"package %s can satisfy version requirements"
+"%s dependency for %s cannot be satisfied because candidate version of "
+"package %s can't satisfy version requirements"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2618
+#: cmdline/apt-get.cc:2992

 #, c-format
 #, c-format

-msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
+msgid ""
+"%s dependency for %s cannot be satisfied because package %s has no candidate "
+"version"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:2645
+#: cmdline/apt-get.cc:3015

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

-#: cmdline/apt-get.cc:2661
+#: cmdline/apt-get.cc:3031

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

-#: cmdline/apt-get.cc:2666
+#: cmdline/apt-get.cc:3036

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

-#: cmdline/apt-get.cc:2698
+#: cmdline/apt-get.cc:3129 cmdline/apt-get.cc:3141
+#, c-format
+msgid "Changelog for %s (%s)"
+msgstr ""
+
+#: cmdline/apt-get.cc:3260

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

-#: cmdline/apt-get.cc:2739
+#: cmdline/apt-get.cc:3301

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


@@ -1167,6 +1238,8 @@ msgid ""
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"
 "   clean - Erase downloaded archive files\n"
 "   autoclean - Erase old downloaded archive files\n"
 "   check - Verify that there are no broken dependencies\n"

+"   changelog - Download and display the changelog for the given package\n"
+"   download - Download the binary package into the current directory\n"

 "\n"
 "Options:\n"
 "  -h  This help text.\n"
 "\n"
 "Options:\n"
 "  -h  This help text.\n"


@@ -1187,7 +1260,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2908
+#: cmdline/apt-get.cc:3466

 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"


@@ -1195,33 +1268,33 @@ msgid ""
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 
 "      so don't depend on the relevance to the real current situation!"
 msgstr ""
 

-#: cmdline/acqprogress.cc:55
+#: cmdline/acqprogress.cc:59

 msgid "Hit "
 msgstr ""
 
 msgid "Hit "
 msgstr ""
 

-#: cmdline/acqprogress.cc:79
+#: cmdline/acqprogress.cc:83

 msgid "Get:"
 msgstr ""
 
 msgid "Get:"
 msgstr ""
 

-#: cmdline/acqprogress.cc:110
+#: cmdline/acqprogress.cc:114

 msgid "Ign "
 msgstr ""
 
 msgid "Ign "
 msgstr ""
 

-#: cmdline/acqprogress.cc:114
+#: cmdline/acqprogress.cc:118

 msgid "Err "
 msgstr ""
 
 msgid "Err "
 msgstr ""
 

-#: cmdline/acqprogress.cc:135
+#: cmdline/acqprogress.cc:139

 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 
 #, c-format
 msgid "Fetched %sB in %s (%sB/s)\n"
 msgstr ""
 

-#: cmdline/acqprogress.cc:225
+#: cmdline/acqprogress.cc:229

 #, c-format
 msgid " [Working]"
 msgstr ""
 
 #, c-format
 msgid " [Working]"
 msgstr ""
 

-#: cmdline/acqprogress.cc:271
+#: cmdline/acqprogress.cc:285

 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"
 #, c-format
 msgid ""
 "Media change: please insert the disc labeled\n"


@@ -1229,11 +1302,88 @@ msgid ""
 "in the drive '%s' and press enter\n"
 msgstr ""
 
 "in the drive '%s' and press enter\n"
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:86
+#: cmdline/apt-internal-solver.cc:36
+msgid ""
+"Usage: apt-internal-resolver\n"
+"\n"
+"apt-internal-resolver is an interface to use the current internal\n"
+"like an external resolver for the APT family for debugging or alike\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"apt.conf(5) manual pages for more information and options.\n"
+"                       This APT has Super Cow Powers.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:48
+#, c-format
+msgid "%s can not be marked as it is not installed.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:54
+#, c-format
+msgid "%s was already set to manually installed.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:56
+#, c-format
+msgid "%s was already set to automatically installed.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:171
+#, c-format
+msgid "%s was already set on hold.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:173
+#, c-format
+msgid "%s was already not hold.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:187 cmdline/apt-mark.cc:209
+#, c-format
+msgid "%s set on hold.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:189 cmdline/apt-mark.cc:214
+#, c-format
+msgid "Canceled hold on %s.\n"
+msgstr ""
+
+#: cmdline/apt-mark.cc:222
+msgid "Executing dpkg failed. Are you root?"
+msgstr ""
+
+#: cmdline/apt-mark.cc:270
+msgid ""
+"Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
+"\n"
+"apt-mark is a simple command line interface for marking packages\n"
+"as manual or automatical installed. It can also list marks.\n"
+"\n"
+"Commands:\n"
+"   auto - Mark the given packages as automatically installed\n"
+"   manual - Mark the given packages as manually installed\n"
+"\n"
+"Options:\n"
+"  -h  This help text.\n"
+"  -q  Loggable output - no progress indicator\n"
+"  -qq No output except for errors\n"
+"  -s  No-act. Just prints what would be done.\n"
+"  -f  read/write auto/manual marking in the given file\n"
+"  -c=? Read this configuration file\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
+"See the apt-mark(8) and apt.conf(5) manual pages for more information."
+msgstr ""
+
+#: cmdline/apt-sortpkgs.cc:89

 msgid "Unknown package record!"
 msgstr ""
 
 msgid "Unknown package record!"
 msgstr ""
 

-#: cmdline/apt-sortpkgs.cc:150
+#: cmdline/apt-sortpkgs.cc:153

 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"
 msgid ""
 "Usage: apt-sortpkgs [options] file1 [file2 ...]\n"
 "\n"


@@ -1281,196 +1431,196 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
 msgid "Merging available information"
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:114
+#: apt-inst/contrib/extracttar.cc:117

 msgid "Failed to create pipes"
 msgstr ""
 
 msgid "Failed to create pipes"
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:141
+#: apt-inst/contrib/extracttar.cc:144

 msgid "Failed to exec gzip "
 msgstr ""
 
 msgid "Failed to exec gzip "
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:211

 msgid "Corrupted archive"
 msgstr ""
 
 msgid "Corrupted archive"
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:193
+#: apt-inst/contrib/extracttar.cc:196

 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:296
+#: apt-inst/contrib/extracttar.cc:303

 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 
 #, c-format
 msgid "Unknown TAR header type %u, member %s"
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:70
+#: apt-inst/contrib/arfile.cc:74

 msgid "Invalid archive signature"
 msgstr ""
 
 msgid "Invalid archive signature"
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:78
+#: apt-inst/contrib/arfile.cc:82

 msgid "Error reading archive member header"
 msgstr ""
 
 msgid "Error reading archive member header"
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:90
+#: apt-inst/contrib/arfile.cc:94

 #, c-format
 msgid "Invalid archive member header %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid archive member header %s"
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:106

 msgid "Invalid archive member header"
 msgstr ""
 
 msgid "Invalid archive member header"
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:128
+#: apt-inst/contrib/arfile.cc:132

 msgid "Archive is too short"
 msgstr ""
 
 msgid "Archive is too short"
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:132
+#: apt-inst/contrib/arfile.cc:136

 msgid "Failed to read the archive headers"
 msgstr ""
 
 msgid "Failed to read the archive headers"
 msgstr ""
 

-#: apt-inst/filelist.cc:380
+#: apt-inst/filelist.cc:382

 msgid "DropNode called on still linked node"
 msgstr ""
 
 msgid "DropNode called on still linked node"
 msgstr ""
 

-#: apt-inst/filelist.cc:412
+#: apt-inst/filelist.cc:414

 msgid "Failed to locate the hash element!"
 msgstr ""
 
 msgid "Failed to locate the hash element!"
 msgstr ""
 

-#: apt-inst/filelist.cc:459
+#: apt-inst/filelist.cc:461

 msgid "Failed to allocate diversion"
 msgstr ""
 
 msgid "Failed to allocate diversion"
 msgstr ""
 

-#: apt-inst/filelist.cc:464
+#: apt-inst/filelist.cc:466

 msgid "Internal error in AddDiversion"
 msgstr ""
 
 msgid "Internal error in AddDiversion"
 msgstr ""
 

-#: apt-inst/filelist.cc:477
+#: apt-inst/filelist.cc:479

 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 

-#: apt-inst/filelist.cc:506
+#: apt-inst/filelist.cc:508

 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr ""
 

-#: apt-inst/filelist.cc:549
+#: apt-inst/filelist.cc:551

 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr ""
 

-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
+#: apt-inst/dirstream.cc:43 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:55

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

-#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
+#: apt-inst/dirstream.cc:100 apt-inst/dirstream.cc:108

 #, c-format
 msgid "Failed to close file %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to close file %s"
 msgstr ""
 

-#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
+#: apt-inst/extract.cc:96 apt-inst/extract.cc:167

 #, c-format
 msgid "The path %s is too long"
 msgstr ""
 
 #, c-format
 msgid "The path %s is too long"
 msgstr ""
 

-#: apt-inst/extract.cc:124
+#: apt-inst/extract.cc:127

 #, c-format
 msgid "Unpacking %s more than once"
 msgstr ""
 
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr ""
 

-#: apt-inst/extract.cc:134
+#: apt-inst/extract.cc:137

 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 
 #, c-format
 msgid "The directory %s is diverted"
 msgstr ""
 

-#: apt-inst/extract.cc:144
+#: apt-inst/extract.cc:147

 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr ""
 

-#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
+#: apt-inst/extract.cc:157 apt-inst/extract.cc:300

 msgid "The diversion path is too long"
 msgstr ""
 
 msgid "The diversion path is too long"
 msgstr ""
 

-#: apt-inst/extract.cc:240
+#: apt-inst/extract.cc:243

 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr ""
 

-#: apt-inst/extract.cc:280
+#: apt-inst/extract.cc:283

 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 
 msgid "Failed to locate node in its hash bucket"
 msgstr ""
 

-#: apt-inst/extract.cc:284
+#: apt-inst/extract.cc:287

 msgid "The path is too long"
 msgstr ""
 
 msgid "The path is too long"
 msgstr ""
 

-#: apt-inst/extract.cc:414
+#: apt-inst/extract.cc:415

 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr ""
 

-#: apt-inst/extract.cc:431
+#: apt-inst/extract.cc:432

 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.

-#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
-#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
-#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:92
-#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
+#: apt-inst/extract.cc:465 apt-pkg/contrib/cdromutl.cc:183
+#: apt-pkg/contrib/fileutl.cc:372 apt-pkg/sourcelist.cc:208
+#: apt-pkg/sourcelist.cc:214 apt-pkg/acquire.cc:456 apt-pkg/init.cc:108
+#: apt-pkg/init.cc:116 apt-pkg/clean.cc:36 apt-pkg/policy.cc:359
+#: methods/mirror.cc:95

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

-#: apt-inst/extract.cc:491
+#: apt-inst/extract.cc:492

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

-#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
+#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61

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

-#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
+#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112

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

-#: apt-inst/deb/dpkgdb.cc:114
+#: apt-inst/deb/dpkgdb.cc:118

 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr ""
 
 #, c-format
 msgid "Failed to stat %sinfo"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:119
+#: apt-inst/deb/dpkgdb.cc:123

 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 

-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
-#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
-#: apt-pkg/pkgcachegen.cc:1008
+#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:1170
+#: apt-pkg/pkgcachegen.cc:1274 apt-pkg/pkgcachegen.cc:1280
+#: apt-pkg/pkgcachegen.cc:1436

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

-#: apt-inst/deb/dpkgdb.cc:176
+#: apt-inst/deb/dpkgdb.cc:180

 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr ""
 
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
-#: apt-inst/deb/dpkgdb.cc:444
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
+#: apt-inst/deb/dpkgdb.cc:448

 msgid "Internal error getting a package name"
 msgstr ""
 
 msgid "Internal error getting a package name"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386

 msgid "Reading file listing"
 msgstr ""
 
 msgid "Reading file listing"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:212
+#: apt-inst/deb/dpkgdb.cc:216

 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "


@@ -1478,594 +1628,602 @@ msgid ""
 "package!"
 msgstr ""
 
 "package!"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
+#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242

 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 
 #, c-format
 msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:262
+#: apt-inst/deb/dpkgdb.cc:266

 msgid "Internal error getting a node"
 msgstr ""
 
 msgid "Internal error getting a node"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:305
+#: apt-inst/deb/dpkgdb.cc:309

 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:320
+#: apt-inst/deb/dpkgdb.cc:324

 msgid "The diversion file is corrupted"
 msgstr ""
 
 msgid "The diversion file is corrupted"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
-#: apt-inst/deb/dpkgdb.cc:337
+#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336
+#: apt-inst/deb/dpkgdb.cc:341

 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid line in the diversion file: %s"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:358
+#: apt-inst/deb/dpkgdb.cc:362

 msgid "Internal error adding a diversion"
 msgstr ""
 
 msgid "Internal error adding a diversion"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:379
+#: apt-inst/deb/dpkgdb.cc:383

 msgid "The pkg cache must be initialized first"
 msgstr ""
 
 msgid "The pkg cache must be initialized first"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:439
+#: apt-inst/deb/dpkgdb.cc:443

 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:461
+#: apt-inst/deb/dpkgdb.cc:465

 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:466
+#: apt-inst/deb/dpkgdb.cc:470

 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 
 #, c-format
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47

 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:50
+#. FIXME: add data.tar.xz here - adding it now would require a Translation round for a very small gain
+#: apt-inst/deb/debfile.cc:56

 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
 
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:110
+#: apt-inst/deb/debfile.cc:116
+#, c-format
+msgid "Couldn't change to %s"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:157
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:192
+msgid "Failed to locate a valid control file"
+msgstr ""
+
+#: apt-inst/deb/debfile.cc:277
+msgid "Unparsable control file"
+msgstr ""
+
+#: methods/bzip2.cc:63 methods/gzip.cc:54
+msgid "Empty files can't be valid archives"
+msgstr ""
+
+#: methods/bzip2.cc:67

 #, c-format
 #, c-format

-msgid "Couldn't change to %s"
+msgid "Couldn't open pipe for %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:140
-msgid "Internal error, could not locate member"
+#: methods/bzip2.cc:111
+#, c-format
+msgid "Read error from %s process"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:173
-msgid "Failed to locate a valid control file"
+#: methods/bzip2.cc:143 methods/bzip2.cc:152 methods/copy.cc:46
+#: methods/gzip.cc:94 methods/gzip.cc:103 methods/rred.cc:491
+#: methods/rred.cc:500
+msgid "Failed to stat"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:258
-msgid "Unparsable control file"
+#: methods/bzip2.cc:149 methods/copy.cc:83 methods/gzip.cc:100
+#: methods/rred.cc:497
+msgid "Failed to set modification time"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:199
+#: methods/cdrom.cc:203

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

-#: methods/cdrom.cc:208
+#: methods/cdrom.cc:212

 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
 
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
 

-#: methods/cdrom.cc:218
+#: methods/cdrom.cc:222

 msgid "Wrong CD-ROM"
 msgstr ""
 
 msgid "Wrong CD-ROM"
 msgstr ""
 

-#: methods/cdrom.cc:245
+#: methods/cdrom.cc:249

 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 

-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:254

 msgid "Disk not found."
 msgstr ""
 
 msgid "Disk not found."
 msgstr ""
 

-#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:262 methods/file.cc:82 methods/rsh.cc:271

 msgid "File not found"
 msgstr ""
 
 msgid "File not found"
 msgstr ""
 

-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
-msgid "Failed to stat"
-msgstr ""
-
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
-msgid "Failed to set modification time"
-msgstr ""
-
-#: methods/file.cc:44
+#: methods/file.cc:47

 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.

-#: methods/ftp.cc:168
+#: methods/ftp.cc:172

 msgid "Logging in"
 msgstr ""
 
 msgid "Logging in"
 msgstr ""
 

-#: methods/ftp.cc:174
+#: methods/ftp.cc:178

 msgid "Unable to determine the peer name"
 msgstr ""
 
 msgid "Unable to determine the peer name"
 msgstr ""
 

-#: methods/ftp.cc:179
+#: methods/ftp.cc:183

 msgid "Unable to determine the local name"
 msgstr ""
 
 msgid "Unable to determine the local name"
 msgstr ""
 

-#: methods/ftp.cc:210 methods/ftp.cc:238
+#: methods/ftp.cc:214 methods/ftp.cc:242

 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 

-#: methods/ftp.cc:216
+#: methods/ftp.cc:220

 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:223
+#: methods/ftp.cc:227

 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:243
+#: methods/ftp.cc:247

 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 

-#: methods/ftp.cc:271
+#: methods/ftp.cc:275

 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:297
+#: methods/ftp.cc:301

 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:339 methods/ftp.cc:450 methods/rsh.cc:190 methods/rsh.cc:233

 msgid "Connection timeout"
 msgstr ""
 
 msgid "Connection timeout"
 msgstr ""
 

-#: methods/ftp.cc:341
+#: methods/ftp.cc:345

 msgid "Server closed the connection"
 msgstr ""
 
 msgid "Server closed the connection"
 msgstr ""
 

-#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190
+#: methods/ftp.cc:348 apt-pkg/contrib/fileutl.cc:1065 methods/rsh.cc:197

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

-#: methods/ftp.cc:351 methods/rsh.cc:197
+#: methods/ftp.cc:355 methods/rsh.cc:204

 msgid "A response overflowed the buffer."
 msgstr ""
 
 msgid "A response overflowed the buffer."
 msgstr ""
 

-#: methods/ftp.cc:368 methods/ftp.cc:380
+#: methods/ftp.cc:372 methods/ftp.cc:384

 msgid "Protocol corruption"
 msgstr ""
 
 msgid "Protocol corruption"
 msgstr ""
 

-#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232
+#: methods/ftp.cc:456 apt-pkg/contrib/fileutl.cc:1139 methods/rsh.cc:239

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

-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:696 methods/ftp.cc:702 methods/ftp.cc:738

 msgid "Could not create a socket"
 msgstr ""
 
 msgid "Could not create a socket"
 msgstr ""
 

-#: methods/ftp.cc:704
+#: methods/ftp.cc:707

 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 

-#: methods/ftp.cc:710
+#: methods/ftp.cc:713

 msgid "Could not connect passive socket."
 msgstr ""
 
 msgid "Could not connect passive socket."
 msgstr ""
 

-#: methods/ftp.cc:728
+#: methods/ftp.cc:731

 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 

-#: methods/ftp.cc:742
+#: methods/ftp.cc:745

 msgid "Could not bind a socket"
 msgstr ""
 
 msgid "Could not bind a socket"
 msgstr ""
 

-#: methods/ftp.cc:746
+#: methods/ftp.cc:749

 msgid "Could not listen on the socket"
 msgstr ""
 
 msgid "Could not listen on the socket"
 msgstr ""
 

-#: methods/ftp.cc:753
+#: methods/ftp.cc:756

 msgid "Could not determine the socket's name"
 msgstr ""
 
 msgid "Could not determine the socket's name"
 msgstr ""
 

-#: methods/ftp.cc:785
+#: methods/ftp.cc:788

 msgid "Unable to send PORT command"
 msgstr ""
 
 msgid "Unable to send PORT command"
 msgstr ""
 

-#: methods/ftp.cc:795
+#: methods/ftp.cc:798

 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 

-#: methods/ftp.cc:804
+#: methods/ftp.cc:807

 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:824
+#: methods/ftp.cc:827

 msgid "Data socket connect timed out"
 msgstr ""
 
 msgid "Data socket connect timed out"
 msgstr ""
 

-#: methods/ftp.cc:831
+#: methods/ftp.cc:834

 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303
+#: methods/ftp.cc:873 methods/http.cc:1022 methods/rsh.cc:309

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

-#: methods/ftp.cc:883
+#: methods/ftp.cc:886

 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 

-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:901 methods/rsh.cc:328

 msgid "Data socket timed out"
 msgstr ""
 
 msgid "Data socket timed out"
 msgstr ""
 

-#: methods/ftp.cc:928
+#: methods/ftp.cc:931

 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information

-#: methods/ftp.cc:1005
+#: methods/ftp.cc:1008

 msgid "Query"
 msgstr ""
 
 msgid "Query"
 msgstr ""
 

-#: methods/ftp.cc:1117
+#: methods/ftp.cc:1120

 msgid "Unable to invoke "
 msgstr ""
 
 msgid "Unable to invoke "
 msgstr ""
 

-#: methods/connect.cc:70
+#: methods/connect.cc:75

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

-#: methods/connect.cc:81
+#: methods/connect.cc:86

 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 
 #, c-format
 msgid "[IP: %s %s]"
 msgstr ""
 

-#: methods/connect.cc:90
+#: methods/connect.cc:93

 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
 #, c-format
 msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 

-#: methods/connect.cc:96
+#: methods/connect.cc:99

 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
 #, c-format
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 

-#: methods/connect.cc:104
+#: methods/connect.cc:107

 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
 #, c-format
 msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 

-#: methods/connect.cc:119
+#: methods/connect.cc:125

 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going
 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
 #. We say this mainly because the pause here is for the
 #. ssh connection that is still going

-#: methods/connect.cc:147 methods/rsh.cc:425
+#: methods/connect.cc:153 methods/rsh.cc:431

 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 

-#: methods/connect.cc:166 methods/connect.cc:185
+#: methods/connect.cc:172 methods/connect.cc:191

 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 
 #, c-format
 msgid "Could not resolve '%s'"
 msgstr ""
 

-#: methods/connect.cc:191
+#: methods/connect.cc:197

 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 
 #, c-format
 msgid "Temporary failure resolving '%s'"
 msgstr ""
 

-#: methods/connect.cc:194
+#: methods/connect.cc:200

 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
 #, c-format
 msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 

-#: methods/connect.cc:241
+#: methods/connect.cc:247

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

-#. TRANSLATOR: %s is the trusted keyring parts directory
-#: methods/gpgv.cc:78
-#, c-format
-msgid "No keyring installed in %s."
-msgstr ""
-
-#: methods/gpgv.cc:104
-msgid "E: Too many keyrings should be passed to gpgv. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:121
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:172

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

-#: methods/gpgv.cc:242
+#: methods/gpgv.cc:177

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

-#: methods/gpgv.cc:246
-#, c-format
-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+#: methods/gpgv.cc:181
+msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:251
+#: methods/gpgv.cc:186

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

-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:220 methods/gpgv.cc:227

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

-#: methods/gpgv.cc:299
+#: methods/gpgv.cc:234

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

-#: methods/gzip.cc:64
-#, c-format
-msgid "Couldn't open pipe for %s"
-msgstr ""
-
-#: methods/gzip.cc:109
-#, c-format
-msgid "Read error from %s process"
-msgstr ""
-
-#: methods/http.cc:385
+#: methods/http.cc:393

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

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

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

-#: methods/http.cc:539
+#: methods/http.cc:547

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

-#: methods/http.cc:558 methods/http.cc:565
+#: methods/http.cc:572 methods/http.cc:579

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

-#: methods/http.cc:594
+#: methods/http.cc:608

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

-#: methods/http.cc:609
+#: methods/http.cc:623

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

-#: methods/http.cc:611
+#: methods/http.cc:625

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

-#: methods/http.cc:635
+#: methods/http.cc:649

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

-#: methods/http.cc:793
+#: methods/http.cc:808

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

-#: methods/http.cc:798
+#: methods/http.cc:813

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

-#: methods/http.cc:821
+#: methods/http.cc:836

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

-#: methods/http.cc:852
+#: methods/http.cc:867

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

-#: methods/http.cc:880
+#: methods/http.cc:895

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

-#: methods/http.cc:894
+#: methods/http.cc:909

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

-#: methods/http.cc:896
+#: methods/http.cc:911

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

-#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281
-msgid "Failed to truncate file"
-msgstr ""
-
-#: methods/http.cc:1156
+#: methods/http.cc:1181

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

-#: methods/http.cc:1173 methods/http.cc:1228
+#: methods/http.cc:1198 methods/http.cc:1253

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

-#: methods/http.cc:1320
+#: methods/http.cc:1345

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

-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:79

 msgid "Can't mmap an empty file"
 msgstr ""
 
 msgid "Can't mmap an empty file"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:89
+#: apt-pkg/contrib/mmap.cc:109

 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
+#: apt-pkg/contrib/mmap.cc:117

 #, c-format
 #, c-format

-msgid "Couldn't make mmap of %lu bytes"
+msgid "Couldn't make mmap of %llu bytes"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:124
+#: apt-pkg/contrib/mmap.cc:144

 msgid "Unable to close mmap"
 msgstr ""
 
 msgid "Unable to close mmap"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#: apt-pkg/contrib/mmap.cc:172 apt-pkg/contrib/mmap.cc:200

 msgid "Unable to synchronize mmap"
 msgstr ""
 
 msgid "Unable to synchronize mmap"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:300
+#: apt-pkg/contrib/mmap.cc:278
+#, c-format
+msgid "Couldn't make mmap of %lu bytes"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:311
+msgid "Failed to truncate file"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:330

 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:395
+#: apt-pkg/contrib/mmap.cc:429

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"The size of a MMap has already reached the defined limit of %lu bytes,abort "
-"the try to grow the MMap."
+"Unable to increase the size of the MMap as the limit of %lu bytes is already "
+"reached."
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:432
+msgid ""
+"Unable to increase size of the MMap as automatic growing is disabled by user."

 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds
 msgstr ""
 
 #. d means days, h means hours, min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:363
+#: apt-pkg/contrib/strutl.cc:371

 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:370
+#: apt-pkg/contrib/strutl.cc:378

 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds

-#: apt-pkg/contrib/strutl.cc:377
+#: apt-pkg/contrib/strutl.cc:385

 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds

-#: apt-pkg/contrib/strutl.cc:382
+#: apt-pkg/contrib/strutl.cc:390

 #, c-format
 msgid "%lis"
 msgstr ""
 
 #, c-format
 msgid "%lis"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1075
+#: apt-pkg/contrib/strutl.cc:1165

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

-#: apt-pkg/contrib/configuration.cc:452
+#: apt-pkg/contrib/configuration.cc:468

 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:510
+#: apt-pkg/contrib/configuration.cc:526

 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 
 #, c-format
 msgid "Opening configuration file %s"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:678
+#: apt-pkg/contrib/configuration.cc:694

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

-#: apt-pkg/contrib/configuration.cc:697
+#: apt-pkg/contrib/configuration.cc:713

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

-#: apt-pkg/contrib/configuration.cc:714
+#: apt-pkg/contrib/configuration.cc:730

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

-#: apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:770

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

-#: apt-pkg/contrib/configuration.cc:761
+#: apt-pkg/contrib/configuration.cc:777

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

-#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
+#: apt-pkg/contrib/configuration.cc:781 apt-pkg/contrib/configuration.cc:786

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

-#: apt-pkg/contrib/configuration.cc:774
+#: apt-pkg/contrib/configuration.cc:790

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

-#: apt-pkg/contrib/configuration.cc:825
+#: apt-pkg/contrib/configuration.cc:793
+#, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:843

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

-#: apt-pkg/contrib/progress.cc:153
+#: apt-pkg/contrib/progress.cc:146

 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 
 #, c-format
 msgid "%c%s... Error!"
 msgstr ""
 

-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:148

 #, c-format
 msgid "%c%s... Done"
 msgstr ""
 
 #, c-format
 msgid "%c%s... Done"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:77
+#: apt-pkg/contrib/cmndline.cc:80

 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
 #, c-format
 msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
-#: apt-pkg/contrib/cmndline.cc:119
+#: apt-pkg/contrib/cmndline.cc:104 apt-pkg/contrib/cmndline.cc:112
+#: apt-pkg/contrib/cmndline.cc:120

 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 
 #, c-format
 msgid "Command line option %s is not understood"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:124
+#: apt-pkg/contrib/cmndline.cc:125

 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187

 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""


@@ -2075,284 +2233,360 @@ msgstr ""
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:236
+#: apt-pkg/contrib/cmndline.cc:235

 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:267
+#: apt-pkg/contrib/cmndline.cc:266

 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 
 #, c-format
 msgid "Option '%s' is too long"
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:300
+#: apt-pkg/contrib/cmndline.cc:298

 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 

-#: apt-pkg/contrib/cmndline.cc:350
+#: apt-pkg/contrib/cmndline.cc:348

 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 
 #, c-format
 msgid "Invalid operation %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:52
+#: apt-pkg/contrib/cdromutl.cc:56

 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
+#: apt-pkg/contrib/cdromutl.cc:179 apt-pkg/contrib/cdromutl.cc:213
+#: apt-pkg/acquire.cc:462 apt-pkg/acquire.cc:487 apt-pkg/clean.cc:42
+#: methods/mirror.cc:101

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

-#: apt-pkg/contrib/cdromutl.cc:204
+#: apt-pkg/contrib/cdromutl.cc:224

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

-#: apt-pkg/contrib/fileutl.cc:151
+#: apt-pkg/contrib/fileutl.cc:197

 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 
 #, c-format
 msgid "Not using locking for read only lock file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:156
+#: apt-pkg/contrib/fileutl.cc:202

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

-#: apt-pkg/contrib/fileutl.cc:174
+#: apt-pkg/contrib/fileutl.cc:220

 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
 #, c-format
 msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:178
+#: apt-pkg/contrib/fileutl.cc:224

 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 
 #, c-format
 msgid "Could not get lock %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:568
+#: apt-pkg/contrib/fileutl.cc:364
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:391
+#, c-format
+msgid "Ignoring '%s' in directory '%s' as it is not a regular file"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:409
+#, c-format
+msgid "Ignoring file '%s' in directory '%s' as it has no filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:418
+#, c-format
+msgid ""
+"Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:719

 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:580
+#: apt-pkg/contrib/fileutl.cc:731

 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:582
+#: apt-pkg/contrib/fileutl.cc:733

 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s received signal %u."
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:586
+#: apt-pkg/contrib/fileutl.cc:737

 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:588
+#: apt-pkg/contrib/fileutl.cc:739

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

-#: apt-pkg/contrib/fileutl.cc:632
+#: apt-pkg/contrib/fileutl.cc:877 apt-pkg/indexcopy.cc:655

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

-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:923
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:970
+msgid "Failed to create subprocess IPC"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1019
+msgid "Failed to exec compressor "
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1087
+#, c-format
+msgid "read, still have %llu to read but none left"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1152
+#, c-format
+msgid "write, still have %llu to write but couldn't"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1410

 #, c-format
 #, c-format

-msgid "read, still have %lu to read but none left"
+msgid "Problem closing the gzip file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:718
+#: apt-pkg/contrib/fileutl.cc:1414

 #, c-format
 #, c-format

-msgid "write, still have %lu to write but couldn't"
+msgid "Problem closing the file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:793
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:1419
+#, c-format
+msgid "Problem renaming the file %s to %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:799
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:1430
+#, c-format
+msgid "Problem unlinking the file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:810
+#: apt-pkg/contrib/fileutl.cc:1450

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

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

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

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

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

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

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

-#: apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:162
+msgid "The package cache file is corrupted, it is too small"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:167

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgid "Enhances"
 msgstr ""
 
 msgid "Enhances"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:132 apt-pkg/depcache.cc:161

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

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

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

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

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

-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:198
+#: apt-pkg/depcache.cc:182 apt-pkg/depcache.cc:215 apt-pkg/depcache.cc:219

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

-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:244

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

-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:250

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

-#: apt-pkg/tagfile.cc:102
+#: apt-pkg/tagfile.cc:126

 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 
 #, c-format
 msgid "Unable to parse package file %s (1)"
 msgstr ""
 

-#: apt-pkg/tagfile.cc:189
+#: apt-pkg/tagfile.cc:213

 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
 #, c-format
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:83
+#: apt-pkg/sourcelist.cc:96
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:99
+#, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:110
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:116
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:119
+#, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr ""
+
+#: apt-pkg/sourcelist.cc:132

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:85
+#: apt-pkg/sourcelist.cc:134

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:137

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:94
+#: apt-pkg/sourcelist.cc:143

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:150

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:248

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

-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:446
+#: apt-pkg/sourcelist.cc:265 apt-pkg/cdrom.cc:485

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:285

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:289

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#: apt-pkg/packagemanager.cc:298 apt-pkg/packagemanager.cc:775

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (vendor id)"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#: apt-pkg/packagemanager.cc:437 apt-pkg/packagemanager.cc:467

 #, c-format
 #, c-format

-msgid ""
-"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
+msgid "Could not configure '%s'. "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:440
+#: apt-pkg/packagemanager.cc:507

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2360,508 +2594,663 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:478
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'.Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-
-#: apt-pkg/pkgrecords.cc:32
+#: apt-pkg/pkgrecords.cc:34

 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

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

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

-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1191

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

-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1193

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

-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1518 apt-pkg/algorithms.cc:1520

 msgid ""
 msgid ""

-"Some index files failed to download, they have been ignored, or old ones "
+"Some index files failed to download. They have been ignored, or old ones "

 "used instead."
 msgstr ""
 
 "used instead."
 msgstr ""
 

-#: apt-pkg/acquire.cc:60
+#: apt-pkg/acquire.cc:81
+#, c-format
+msgid "List directory %spartial is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc:85

 #, c-format
 #, c-format

-msgid "Lists directory %spartial is missing."
+msgid "Archives directory %spartial is missing."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Archive directory %spartial is missing."
+msgid "Unable to lock directory %s"

 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:864

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

-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:866

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

-#: apt-pkg/acquire-worker.cc:110
+#: apt-pkg/acquire-worker.cc:112

 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:159
+#: apt-pkg/acquire-worker.cc:161

 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 

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

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

-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:151

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

-#: apt-pkg/init.cc:151
+#: apt-pkg/init.cc:167

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

-#: apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:59

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

-#: apt-pkg/srcrecords.cc:44
+#: apt-pkg/srcrecords.cc:47

 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 

-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:87

 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
 msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 

-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:91

 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 

-#: apt-pkg/policy.cc:316
+#: apt-pkg/cachefile.cc:109
+msgid "The list of sources could not be read."
+msgstr ""
+
+#: apt-pkg/policy.cc:74
+#, c-format
+msgid ""
+"The value '%s' is invalid for APT::Default-Release as such a release is not "
+"available in the sources"
+msgstr ""
+
+#: apt-pkg/policy.cc:396

 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr ""
 

-#: apt-pkg/policy.cc:338
+#: apt-pkg/policy.cc:418

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

-#: apt-pkg/policy.cc:346
+#: apt-pkg/policy.cc:426

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

-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:85

 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:117
-#, c-format
-msgid "Error occurred while processing %s (NewPackage)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:132
+#. TRANSLATOR: The first placeholder is a package name,
+#. the other two should be copied verbatim as they include debug info
+#: apt-pkg/pkgcachegen.cc:211 apt-pkg/pkgcachegen.cc:277
+#: apt-pkg/pkgcachegen.cc:313 apt-pkg/pkgcachegen.cc:355
+#: apt-pkg/pkgcachegen.cc:359 apt-pkg/pkgcachegen.cc:376
+#: apt-pkg/pkgcachegen.cc:386 apt-pkg/pkgcachegen.cc:390
+#: apt-pkg/pkgcachegen.cc:394 apt-pkg/pkgcachegen.cc:415
+#: apt-pkg/pkgcachegen.cc:420 apt-pkg/pkgcachegen.cc:465
+#: apt-pkg/pkgcachegen.cc:496 apt-pkg/pkgcachegen.cc:510

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (%s%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:166
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc1)"
+#: apt-pkg/pkgcachegen.cc:234
+msgid "Wow, you exceeded the number of package names this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:191
-#, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
+#: apt-pkg/pkgcachegen.cc:237
+msgid "Wow, you exceeded the number of versions this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:195
-#, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
+#: apt-pkg/pkgcachegen.cc:240
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:226
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:243
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:517

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (UsePackage3)"
+msgid "Package %s %s was not found while processing file dependencies"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:1082

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (NewVersion2)"
+msgid "Couldn't stat source package list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:258
-#, c-format
-msgid "Error occurred while processing %s (NewFileDesc2)"
+#: apt-pkg/pkgcachegen.cc:1187
+msgid "Collecting File Provides"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:264
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/pkgcachegen.cc:1378 apt-pkg/pkgcachegen.cc:1385
+msgid "IO Error saving source cache"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:267
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/acquire-item.cc:139
+#, c-format
+msgid "rename failed, %s (%s -> %s)."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:270
-msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+#: apt-pkg/acquire-item.cc:640
+msgid "MD5Sum mismatch"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:273
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/acquire-item.cc:911 apt-pkg/acquire-item.cc:1863
+#: apt-pkg/acquire-item.cc:2006
+msgid "Hash Sum mismatch"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/acquire-item.cc:1399

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (FindPkg)"
+msgid ""
+"Unable to find expected entry '%s' in Release file (Wrong sources.list entry "
+"or malformed file)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/acquire-item.cc:1415

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (CollectFileProvides)"
+msgid "Unable to find hash sum for '%s' in Release file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:320
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/acquire-item.cc:1450
+msgid "There is no public key available for the following key IDs:\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:706
+#: apt-pkg/acquire-item.cc:1488

 #, c-format
 #, c-format

-msgid "Couldn't stat source package list %s"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:808
-msgid "Collecting File Provides"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
-msgid "IO Error saving source cache"
+msgid ""
+"Release file for %s is expired (invalid since %s). Updates for this "
+"repository will not be applied."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:1510

 #, c-format
 #, c-format

-msgid "rename failed, %s (%s -> %s)."
+msgid "Conflicting distribution: %s (expected %s but got %s)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:432
-msgid "MD5Sum mismatch"
-msgstr ""
-
-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
-msgid "Hash Sum mismatch"
+#: apt-pkg/acquire-item.cc:1543
+#, c-format
+msgid ""
+"A error occurred during the signature verification. The repository is not "
+"updated and the previous index files will be used. GPG error: %s: %s\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1150
-msgid "There is no public key available for the following key IDs:\n"
+#. Invalid signature file, reject (LP: #346386) (Closes: #627642)
+#: apt-pkg/acquire-item.cc:1553 apt-pkg/acquire-item.cc:1558
+#, c-format
+msgid "GPG error: %s: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1260
+#: apt-pkg/acquire-item.cc:1650

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

-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1709

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package."

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1360
+#: apt-pkg/acquire-item.cc:1768

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

-#: apt-pkg/acquire-item.cc:1447
+#: apt-pkg/acquire-item.cc:1855

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

-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:61

 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr ""
 
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:71

 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "No sections in Release file %s"
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:105

 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 

-#: apt-pkg/vendorlist.cc:66
+#: apt-pkg/indexrecords.cc:118
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:137
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/vendorlist.cc:78

 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:526
+#: apt-pkg/cdrom.cc:566

 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:535 apt-pkg/cdrom.cc:623
+#: apt-pkg/cdrom.cc:575 apt-pkg/cdrom.cc:672

 msgid "Identifying.. "
 msgstr ""
 
 msgid "Identifying.. "
 msgstr ""
 

-#: apt-pkg/cdrom.cc:560
+#: apt-pkg/cdrom.cc:603

 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 
 #, c-format
 msgid "Stored label: %s\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:567 apt-pkg/cdrom.cc:835
+#: apt-pkg/cdrom.cc:612 apt-pkg/cdrom.cc:894

 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
 msgid "Unmounting CD-ROM...\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:586
+#: apt-pkg/cdrom.cc:632

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:604
+#: apt-pkg/cdrom.cc:650

 msgid "Unmounting CD-ROM\n"
 msgstr ""
 
 msgid "Unmounting CD-ROM\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:608
+#: apt-pkg/cdrom.cc:655

 msgid "Waiting for disc...\n"
 msgstr ""
 
 msgid "Waiting for disc...\n"
 msgstr ""
 

-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:616
+#: apt-pkg/cdrom.cc:664

 msgid "Mounting CD-ROM...\n"
 msgstr ""
 
 msgid "Mounting CD-ROM...\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:634
+#: apt-pkg/cdrom.cc:683

 msgid "Scanning disc for index files..\n"
 msgstr ""
 
 msgid "Scanning disc for index files..\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:674
+#: apt-pkg/cdrom.cc:731

 #, c-format
 msgid ""
 #, c-format
 msgid ""

-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
+"%zu signatures\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:685
+#: apt-pkg/cdrom.cc:742

 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 
 msgid ""
 "Unable to locate any package files, perhaps this is not a Debian Disc or the "
 "wrong architecture?"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:711
+#: apt-pkg/cdrom.cc:769

 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:740
+#: apt-pkg/cdrom.cc:798

 msgid "That is not a valid name, try again.\n"
 msgstr ""
 
 msgid "That is not a valid name, try again.\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:756
+#: apt-pkg/cdrom.cc:815

 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:760
+#: apt-pkg/cdrom.cc:817

 msgid "Copying package lists..."
 msgstr ""
 
 msgid "Copying package lists..."
 msgstr ""
 

-#: apt-pkg/cdrom.cc:786
+#: apt-pkg/cdrom.cc:844

 msgid "Writing new source list\n"
 msgstr ""
 
 msgid "Writing new source list\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:795
+#: apt-pkg/cdrom.cc:852

 msgid "Source list entries for this disc are:\n"
 msgstr ""
 
 msgid "Source list entries for this disc are:\n"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:236 apt-pkg/indexcopy.cc:873

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

-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:238 apt-pkg/indexcopy.cc:875

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

-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:241 apt-pkg/indexcopy.cc:878

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

-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:244 apt-pkg/indexcopy.cc:881

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

-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:503

 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr ""
 
 #, c-format
 msgid "Skipping nonexistent file %s"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:509

 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:542
+#: apt-pkg/indexcopy.cc:515

 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/indexcopy.cc:659
+#, c-format
+msgid "File %s doesn't start with a clearsigned message"
+msgstr ""
+
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: apt-pkg/indexcopy.cc:690
+#, c-format
+msgid "No keyring installed in %s."
+msgstr ""
+
+#: apt-pkg/cacheset.cc:352
+#, c-format
+msgid "Release '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:355
+#, c-format
+msgid "Version '%s' for '%s' was not found"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:466
+#, c-format
+msgid "Couldn't find task '%s'"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:472
+#, c-format
+msgid "Couldn't find any package by regex '%s'"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:483
+#, c-format
+msgid "Can't select versions from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:490 apt-pkg/cacheset.cc:497
+#, c-format
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:504
+#, c-format
+msgid "Can't select newest version from package '%s' as it is purely virtual"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:512
+#, c-format
+msgid "Can't select candidate version from package %s as it has no candidate"
+msgstr ""
+
+#: apt-pkg/cacheset.cc:520
+#, c-format
+msgid "Can't select installed version from package %s as it is not installed"
+msgstr ""
+
+#: apt-pkg/edsp.cc:41 apt-pkg/edsp.cc:61
+msgid "Send scenario to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:213
+msgid "Send request to solver"
+msgstr ""
+
+#: apt-pkg/edsp.cc:281
+msgid "Prepare for receiving solution"
+msgstr ""
+
+#: apt-pkg/edsp.cc:288
+msgid "External solver failed without a proper error message"
+msgstr ""
+
+#: apt-pkg/edsp.cc:559 apt-pkg/edsp.cc:562 apt-pkg/edsp.cc:567
+msgid "Execute external solver"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:71

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

-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:724
+#: apt-pkg/deb/dpkgpm.cc:72 apt-pkg/deb/dpkgpm.cc:866

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

-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:731
+#: apt-pkg/deb/dpkgpm.cc:73 apt-pkg/deb/dpkgpm.cc:873

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

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

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

-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:75
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:76

 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:569
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:672

 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 
 #, c-format
 msgid "Directory '%s' missing"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:584 apt-pkg/deb/dpkgpm.cc:597
+#: apt-pkg/deb/dpkgpm.cc:687 apt-pkg/deb/dpkgpm.cc:707

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

-#: apt-pkg/deb/dpkgpm.cc:717
+#: apt-pkg/deb/dpkgpm.cc:859

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

-#: apt-pkg/deb/dpkgpm.cc:718
+#: apt-pkg/deb/dpkgpm.cc:860

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

-#: apt-pkg/deb/dpkgpm.cc:723
+#: apt-pkg/deb/dpkgpm.cc:865

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

-#: apt-pkg/deb/dpkgpm.cc:725
+#: apt-pkg/deb/dpkgpm.cc:867

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

-#: apt-pkg/deb/dpkgpm.cc:730
+#: apt-pkg/deb/dpkgpm.cc:872

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:732
+#: apt-pkg/deb/dpkgpm.cc:874

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

-#: apt-pkg/deb/dpkgpm.cc:737
+#: apt-pkg/deb/dpkgpm.cc:879

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

-#: apt-pkg/deb/dpkgpm.cc:738
+#: apt-pkg/deb/dpkgpm.cc:880

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

-#: apt-pkg/deb/dpkgpm.cc:942
+#: apt-pkg/deb/dpkgpm.cc:1111

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:972
+#: apt-pkg/deb/dpkgpm.cc:1141

 msgid "Running dpkg"
 msgstr ""
 
 msgid "Running dpkg"
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1320
+msgid "Operation was interrupted before it could finish"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1377
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1382
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1384
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1390
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1396
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1403
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:84

 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr ""
 

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

 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:103
+#, c-format

 msgid ""
 msgid ""

-"dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct "
-"the problem. "
+"dpkg was interrupted, you must manually run '%s' to correct the problem. "

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:100
+#: apt-pkg/deb/debsystem.cc:121

 msgid "Not locked"
 msgstr ""
 
 msgid "Not locked"
 msgstr ""
 

-#: methods/rred.cc:465
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:279
+#, c-format
+msgid "No mirror file '%s' found "
+msgstr ""
+
+#. FIXME: fallback to a default mirror here instead
+#. and provide a config option to define that default
+#: methods/mirror.cc:286
+#, c-format
+msgid "Can not read mirror file '%s'"
+msgstr ""
+
+#: methods/mirror.cc:441
+#, c-format
+msgid "[Mirror: %s]"
+msgstr ""
+
+#: methods/rred.cc:470

 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not patch %s with mmap and with file operation usage - the patch seems "
 "to be corrupt."
 msgstr ""
 

-#: methods/rred.cc:470
+#: methods/rred.cc:475

 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
 "to be corrupt."
 msgstr ""
 

-#: methods/rsh.cc:330
+#: methods/rsh.cc:336

 msgid "Connection closed prematurely"
 msgstr ""
 msgid "Connection closed prematurely"
 msgstr ""