fix testcase framework to test correctly for virtual packages

[apt.git] / po / en_GB.po

diff --git a/po/en_GB.po b/po/en_GB.po
index 39163a47e7038ba5b4967d794e1f57bda9028890..e8b2b0e8d892f84b11e9e13957c852bedf1af219 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,151 +7,156 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-01-11 15:17+0100\n"
+"POT-Creation-Date: 2010-07-30 12:45+0200\n"

 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"
 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"

+"Language: \n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 

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

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

-#: 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"
-msgstr "Unable to locate package %s"
-
-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:284

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

-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:286
+#, fuzzy
+msgid "Total package structures: "
+msgstr "Total package names: "
+
+#: cmdline/apt-cache.cc:326

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194

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

-#: cmdline/apt-cache.cc:1297
-msgid "You must give exactly one pattern"
+#: cmdline/apt-cache.cc:1273
+#, fuzzy
+msgid "You must give at least one search pattern"

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

-#: cmdline/apt-cache.cc:1451
+#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
+#: cmdline/apt-cache.cc:1508

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

-#: cmdline/apt-cache.cc:1528
+#: cmdline/apt-cache.cc:1503
+#, c-format
+msgid "Unable to locate package %s"
+msgstr "Unable to locate package %s"
+
+#: cmdline/apt-cache.cc:1533

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

-#: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638

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

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

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

-#: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618

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

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

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

-#: cmdline/apt-cache.cc:1584 cmdline/apt-cache.cc:1592
-msgid "(none)"
-msgstr "(none)"
-
-#. Candidate Version
-#: cmdline/apt-cache.cc:1589
+#: cmdline/apt-cache.cc:1576

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

-#: cmdline/apt-cache.cc:1599
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+msgid "(none)"
+msgstr "(none)"
+
+#: cmdline/apt-cache.cc:1615

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

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

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

-#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
+#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144

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

-#: cmdline/apt-cache.cc:1725
+#: cmdline/apt-cache.cc:1739
+#, fuzzy

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


@@ -172,6 +177,7 @@ msgid ""
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"
 "   unmet - Show unmet dependencies\n"
 "   search - Search the package list for a regex pattern\n"
 "   show - Show a readable record for the package\n"

+"   showauto - Display a list of automatically installed packages\n"

 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   pkgnames - List the names of all packages in the system\n"


@@ -234,7 +240,12 @@ msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’"
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Please insert a Disc in the drive and press enter"
 
 msgid "Please insert a Disc in the drive and press enter"
 msgstr "Please insert a Disc in the drive and press enter"
 

-#: cmdline/apt-cdrom.cc:114
+#: cmdline/apt-cdrom.cc:127
+#, fuzzy, c-format
+msgid "Failed to mount '%s' to '%s'"
+msgstr "Failed to rename %s to %s"
+
+#: cmdline/apt-cdrom.cc:162

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


@@ -299,40 +310,40 @@ msgstr ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 

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

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

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

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

-#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338
+#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345

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

-#: 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:170 ftparchive/apt-ftparchive.cc:187
+#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:260
+#: ftparchive/apt-ftparchive.cc:274 ftparchive/apt-ftparchive.cc:296

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

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

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

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

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

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

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

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

 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"


@@ -412,11 +423,11 @@ msgstr ""
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 
 "  -c=?  Read this configuration file\n"
 "  -o=?  Set an arbitrary configuration option"
 

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

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

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

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


@@ -459,87 +470,87 @@ msgstr "Archive has no control record"
 msgid "Unable to get a cursor"
 msgstr "Unable to get a cursor"
 
 msgid "Unable to get a cursor"
 msgstr "Unable to get a cursor"
 

-#: ftparchive/writer.cc:76
+#: ftparchive/writer.cc:73

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

-#: ftparchive/writer.cc:81
+#: ftparchive/writer.cc:78

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

-#: ftparchive/writer.cc:132
+#: ftparchive/writer.cc:134

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

-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:136

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

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

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

-#: ftparchive/writer.cc:158 ftparchive/writer.cc:188
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:193

 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Could not resolve ‘%s’"
 
 #, c-format
 msgid "Failed to resolve %s"
 msgstr "Could not resolve ‘%s’"
 

-#: ftparchive/writer.cc:170
+#: ftparchive/writer.cc:174

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

-#: ftparchive/writer.cc:195
+#: ftparchive/writer.cc:201

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

-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:260

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

-#: ftparchive/writer.cc:262
+#: ftparchive/writer.cc:268

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

-#: ftparchive/writer.cc:266
+#: ftparchive/writer.cc:272

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

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

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

-#: ftparchive/writer.cc:283
+#: ftparchive/writer.cc:289

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

-#: ftparchive/writer.cc:389
+#: ftparchive/writer.cc:393

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

-#: ftparchive/writer.cc:397 ftparchive/writer.cc:628
+#: ftparchive/writer.cc:401 ftparchive/writer.cc:688

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

-#: ftparchive/writer.cc:458 ftparchive/writer.cc:716
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:790

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

-#: ftparchive/writer.cc:638
+#: ftparchive/writer.cc:698

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

-#: ftparchive/writer.cc:642
+#: ftparchive/writer.cc:702

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


@@ -639,79 +650,79 @@ msgstr "Problem unlinking %s"
 msgid "Failed to rename %s to %s"
 msgstr "Failed to rename %s to %s"
 
 msgid "Failed to rename %s to %s"
 msgstr "Failed to rename %s to %s"
 

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

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

-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740
+#: cmdline/apt-get.cc:156

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: 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!"
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"


@@ -719,144 +730,233 @@ msgstr ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:669
+#: cmdline/apt-get.cc:634
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr "Note, selecting %s for regex ‘%s’\n"
+
+#: cmdline/apt-get.cc:640
+#, fuzzy, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr "Note, selecting %s for regex ‘%s’\n"
+
+#: cmdline/apt-get.cc:647
+#, fuzzy, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr "Selected version %s (%s) for %s\n"
+
+#: cmdline/apt-get.cc:657
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr "Package %s is a virtual package provided by:\n"
+
+#: cmdline/apt-get.cc:668
+msgid " [Installed]"
+msgstr " [Installed]"
+
+#: cmdline/apt-get.cc:677
+#, fuzzy
+msgid " [Not candidate version]"
+msgstr "Candidate versions"
+
+#: cmdline/apt-get.cc:679
+msgid "You should explicitly select one to install."
+msgstr "You should explicitly select one to install."
+
+#: cmdline/apt-get.cc:682
+#, 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 ""
+"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"
+
+#: cmdline/apt-get.cc:700
+msgid "However the following packages replace it:"
+msgstr "However the following packages replace it:"
+
+#: cmdline/apt-get.cc:712
+#, fuzzy, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr "Package %s has no installation candidate"
+
+#: cmdline/apt-get.cc:723
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:754
+#, fuzzy, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr "Note, selecting %s instead of %s\n"
+
+#: cmdline/apt-get.cc:784
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
+
+#: cmdline/apt-get.cc:788
+#, fuzzy, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
+
+#: cmdline/apt-get.cc:798
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr "%s is already the newest version.\n"
+
+#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr "%s set to manually installed.\n"
+
+#: cmdline/apt-get.cc:859
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr "Package %s is not installed, so not removed\n"
+
+#: cmdline/apt-get.cc:934

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:684
-msgid "You might want to run `apt-get -f install' to correct these."
+#: cmdline/apt-get.cc:949
+msgid "You might want to run 'apt-get -f install' to correct these."

 msgstr "You might want to run ‘apt-get -f install’ to correct these."
 
 msgstr "You might want to run ‘apt-get -f install’ to correct these."
 

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115
-msgid "Unable to lock the download directory"
-msgstr "Unable to lock the download directory"
-
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416
-#: apt-pkg/cachefile.cc:65
+#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
+#: apt-pkg/cachefile.cc:106

 msgid "The list of sources could not be read."
 msgstr "The list of sources could not be read."
 
 msgid "The list of sources could not be read."
 msgstr "The list of sources could not be read."
 

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

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

-#: cmdline/apt-get.cc:841
+#: cmdline/apt-get.cc:1105

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

-#: cmdline/apt-get.cc:844
+#: cmdline/apt-get.cc:1108

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

-#: cmdline/apt-get.cc:849
+#: cmdline/apt-get.cc:1113

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

-#: cmdline/apt-get.cc:852
+#: cmdline/apt-get.cc:1116

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

-#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
-#: cmdline/apt-get.cc:2262
+#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
+#: cmdline/apt-get.cc:2322

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

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

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

-#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180

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

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

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

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

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


@@ -867,28 +967,28 @@ msgstr ""
 "To continue type in the phrase ‘%s’\n"
 " ?] "
 
 "To continue type in the phrase ‘%s’\n"
 " ?] "
 

-#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
+#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189

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

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

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

-#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434

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

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

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

-#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384

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

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

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


@@ -896,139 +996,87 @@ msgstr ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1086
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr "Note, selecting %s instead of %s\n"
-
-#: cmdline/apt-get.cc:1097
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
-
-#: cmdline/apt-get.cc:1115
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr "Package %s is not installed, so not removed\n"
-
-#: cmdline/apt-get.cc:1126
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr "Package %s is a virtual package provided by:\n"
-
-#: cmdline/apt-get.cc:1138
-msgid " [Installed]"
-msgstr " [Installed]"
-
-#: cmdline/apt-get.cc:1143
-msgid "You should explicitly select one to install."
-msgstr "You should explicitly select one to install."
-
-#: cmdline/apt-get.cc:1148
-#, c-format
+#: cmdline/apt-get.cc:1320

 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"
+"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:1324
+msgid "Note: This is done automatic and on purpose by dpkg."

 msgstr ""
 msgstr ""

-"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"
-
-#: cmdline/apt-get.cc:1167
-msgid "However the following packages replace it:"
-msgstr "However the following packages replace it:"
-
-#: cmdline/apt-get.cc:1170
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr "Package %s has no installation candidate"
-
-#: cmdline/apt-get.cc:1190
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-
-#: cmdline/apt-get.cc:1198
-#, c-format
-msgid "%s is already the newest version.\n"
-msgstr "%s is already the newest version.\n"
-
-#: cmdline/apt-get.cc:1227
-#, c-format
-msgid "Release '%s' for '%s' was not found"
-msgstr "Release ‘%s’ for ‘%s’ was not found"
-
-#: cmdline/apt-get.cc:1229
-#, c-format
-msgid "Version '%s' for '%s' was not found"
-msgstr "Version ‘%s’ for ‘%s’ was not found"
-
-#: cmdline/apt-get.cc:1235
-#, c-format
-msgid "Selected version %s (%s) for %s\n"
-msgstr "Selected version %s (%s) for %s\n"

 
 

-#: cmdline/apt-get.cc:1321
+#: cmdline/apt-get.cc:1454

 #, 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:1352
+#: cmdline/apt-get.cc:1486

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

-#: cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1524

 #, 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:1405
+#: cmdline/apt-get.cc:1540

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

-#: cmdline/apt-get.cc:1418
-msgid "Unable to lock the list directory"
-msgstr "Unable to lock the list directory"
-
-#: cmdline/apt-get.cc:1474
+#: cmdline/apt-get.cc:1605

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

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1653
+#, fuzzy

 msgid ""
 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:"
 "The following packages were automatically installed and are no longer "
 "required:"

-msgstr ""
+msgstr[0] ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[1] ""

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

-#: cmdline/apt-get.cc:1525
+#: cmdline/apt-get.cc:1657

 #, fuzzy, c-format
 #, fuzzy, c-format

-msgid "%lu packages were automatically installed and are no longer required.\n"
-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] ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr[1] ""

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

-#: cmdline/apt-get.cc:1526
+#: cmdline/apt-get.cc:1659

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

-#: cmdline/apt-get.cc:1531
+#: cmdline/apt-get.cc:1664

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


@@ -1046,43 +1094,23 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824
+#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809

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

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

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

-#: cmdline/apt-get.cc:1557
+#: cmdline/apt-get.cc:1690

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

-#: cmdline/apt-get.cc:1612
-#, c-format
-msgid "Couldn't find task %s"
-msgstr "Couldn't find task %s"
-
-#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763
-#, c-format
-msgid "Couldn't find package %s"
-msgstr "Couldn't find package %s"
-
-#: cmdline/apt-get.cc:1750
-#, c-format
-msgid "Note, selecting %s for regex '%s'\n"
-msgstr "Note, selecting %s for regex ‘%s’\n"
-
-#: cmdline/apt-get.cc:1781
-#, c-format
-msgid "%s set to manually installed.\n"
-msgstr "%s set to manually installed.\n"
-
-#: cmdline/apt-get.cc:1794
-msgid "You might want to run `apt-get -f install' to correct these:"
+#: cmdline/apt-get.cc:1779
+msgid "You might want to run 'apt-get -f install' to correct these:"

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

-#: cmdline/apt-get.cc:1797
+#: cmdline/apt-get.cc:1782

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


@@ -1090,7 +1118,7 @@ msgstr ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 

-#: cmdline/apt-get.cc:1809
+#: cmdline/apt-get.cc:1794

 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"


@@ -1102,116 +1130,145 @@ msgstr ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 

-#: cmdline/apt-get.cc:1827
+#: cmdline/apt-get.cc:1812

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

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

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

-#: cmdline/apt-get.cc:1945
+#: cmdline/apt-get.cc:1931

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

-#: cmdline/apt-get.cc:1946
+#: cmdline/apt-get.cc:1932

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

-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:1974
+#, c-format
+msgid "Couldn't find package %s"
+msgstr "Couldn't find package %s"
+
+#: cmdline/apt-get.cc:1981
+#, fuzzy, c-format
+msgid "%s set to automatically installed.\n"
+msgstr "%s set to manually installed.\n"
+
+#: cmdline/apt-get.cc:2002

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

-#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112
+#: cmdline/apt-get.cc:2005 methods/ftp.cc:707 methods/connect.cc:111

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

-#: cmdline/apt-get.cc:1983
+#: cmdline/apt-get.cc:2010

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

-#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058
+#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085

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

-#: cmdline/apt-get.cc:2158
+#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
+msgid "Unable to lock the download directory"
+msgstr "Unable to lock the download directory"
+
+#: cmdline/apt-get.cc:2185

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

-#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434
+#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501

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

-#: cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2241
+#, c-format
+msgid ""
+"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
+"%s\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2246
+#, 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:2297

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

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

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

-#: cmdline/apt-get.cc:2278
+#: cmdline/apt-get.cc:2338

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

-#: cmdline/apt-get.cc:2281
+#: cmdline/apt-get.cc:2341

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

-#: cmdline/apt-get.cc:2287
+#: cmdline/apt-get.cc:2347

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

-#: cmdline/apt-get.cc:2318
+#: cmdline/apt-get.cc:2380

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

-#: cmdline/apt-get.cc:2346
+#: cmdline/apt-get.cc:2410

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

-#: cmdline/apt-get.cc:2358
+#: cmdline/apt-get.cc:2422

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

-#: cmdline/apt-get.cc:2359
+#: cmdline/apt-get.cc:2423

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

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

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

-#: cmdline/apt-get.cc:2395
+#: cmdline/apt-get.cc:2460

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

-#: cmdline/apt-get.cc:2411
+#: cmdline/apt-get.cc:2476

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

-#: cmdline/apt-get.cc:2439
+#: cmdline/apt-get.cc:2506

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

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

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

-#: cmdline/apt-get.cc:2511
+#: cmdline/apt-get.cc:2577

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


@@ -1220,7 +1277,7 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 

-#: cmdline/apt-get.cc:2564
+#: cmdline/apt-get.cc:2630

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1229,31 +1286,31 @@ msgstr ""
 "%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 no available versions of "
 "package %s can satisfy version requirements"
 

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

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

-#: cmdline/apt-get.cc:2627
+#: cmdline/apt-get.cc:2693

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

-#: cmdline/apt-get.cc:2643
+#: cmdline/apt-get.cc:2709

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

-#: cmdline/apt-get.cc:2648
+#: cmdline/apt-get.cc:2714

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

-#: cmdline/apt-get.cc:2680
+#: cmdline/apt-get.cc:2745

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

-#: cmdline/apt-get.cc:2721
+#: cmdline/apt-get.cc:2786

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1278,6 +1335,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"

+"   markauto - Mark the given packages as automatically installed\n"
+"   unmarkauto - Mark the given packages as manually installed\n"

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


@@ -1338,7 +1397,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 

-#: cmdline/apt-get.cc:2889
+#: cmdline/apt-get.cc:2958

 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"


@@ -1584,10 +1643,10 @@ msgstr "File %s/%s overwrites the one in the package %s"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 
 #. 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:157
-#: 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:90
-#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166
+#: apt-pkg/contrib/fileutl.cc:290 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:471 apt-pkg/init.cc:98
+#: apt-pkg/init.cc:106 apt-pkg/clean.cc:33 apt-pkg/policy.cc:306

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


@@ -1616,10 +1675,9 @@ msgstr "Failed to stat %sinfo"
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "The info and temp directories need to be on the same filesystem"
 
 msgid "The info and temp directories need to be on the same filesystem"
 msgstr "The info and temp directories need to be on the same filesystem"
 

-#. 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:135 apt-pkg/pkgcachegen.cc:1070
+#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
+#: apt-pkg/pkgcachegen.cc:1326

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


@@ -1722,12 +1780,12 @@ msgstr "Failed to locate a valid control file"
 msgid "Unparsable control file"
 msgstr "Unparsable control file"
 
 msgid "Unparsable control file"
 msgstr "Unparsable control file"
 

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

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

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

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


@@ -1735,7 +1793,7 @@ msgstr ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 

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

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


@@ -1752,12 +1810,12 @@ msgstr "Disk not found."
 msgid "File not found"
 msgstr "File not found"
 
 msgid "File not found"
 msgstr "File not found"
 

-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:483 methods/rred.cc:492
+#: methods/copy.cc:43 methods/gzip.cc:96 methods/gzip.cc:105
+#: methods/rred.cc:486 methods/rred.cc:495

 msgid "Failed to stat"
 msgstr "Failed to stat"
 
 msgid "Failed to stat"
 msgstr "Failed to stat"
 

-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
+#: methods/copy.cc:80 methods/gzip.cc:102 methods/rred.cc:492

 msgid "Failed to set modification time"
 msgstr "Failed to set modification time"
 
 msgid "Failed to set modification time"
 msgstr "Failed to set modification time"
 


@@ -1819,7 +1877,7 @@ msgstr "Connection timeout"
 msgid "Server closed the connection"
 msgstr "Server closed the connection"
 
 msgid "Server closed the connection"
 msgstr "Server closed the connection"
 

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

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


@@ -1831,182 +1889,174 @@ msgstr "A response overflowed the buffer."
 msgid "Protocol corruption"
 msgstr "Protocol corruption"
 
 msgid "Protocol corruption"
 msgstr "Protocol corruption"
 

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

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

-#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302

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

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

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

-#: methods/ftp.cc:898 methods/rsh.cc:322
+#: methods/ftp.cc:897 methods/rsh.cc:321

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, c-format
 msgid "Could not connect to %s:%s (%s)."
 msgstr "Could not connect to %s:%s (%s)."
 
 #. 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 "Could not connect to %s:%s (%s)."
 
 #. 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:149 methods/rsh.cc:424

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

-#: methods/connect.cc:166 methods/connect.cc:185
+#: methods/connect.cc:168 methods/connect.cc:187

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

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

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

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

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

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

 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Unable to connect to %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory
 #, fuzzy, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Unable to connect to %s %s:"
 
 #. TRANSLATOR: %s is the trusted keyring parts directory

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

 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Aborting install."
 
 #, fuzzy, c-format
 msgid "No keyring installed in %s."
 msgstr "Aborting install."
 

-#: 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 "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:163

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

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

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

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

 msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
 
 msgstr "Could not execute '%s' to verify signature (is gpgv installed?)"
 

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

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

-#: methods/gpgv.cc:285 methods/gpgv.cc:292
+#: methods/gpgv.cc:211 methods/gpgv.cc:218

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

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

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


@@ -2014,16 +2064,6 @@ msgstr ""
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 
 "The following signatures couldn't be verified because the public key is not "
 "available:\n"
 

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

 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Waiting for headers"
 #: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "Waiting for headers"


@@ -2057,98 +2097,118 @@ msgstr "This HTTP server has broken range support"
 msgid "Unknown date format"
 msgstr "Unknown date format"
 
 msgid "Unknown date format"
 msgstr "Unknown date format"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281

 msgid "Failed to truncate file"
 msgstr "Failed to truncate file"
 
 msgid "Failed to truncate file"
 msgstr "Failed to truncate file"
 

-#: methods/http.cc:1150
+#: methods/http.cc:1154

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

-#: methods/http.cc:1167 methods/http.cc:1222
+#: methods/http.cc:1171 methods/http.cc:1226

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

-#: methods/http.cc:1314
+#: methods/http.cc:1318

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

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

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

-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
+#: apt-pkg/contrib/mmap.cc:89
+#, fuzzy, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr "Couldn't open pipe for %s"
+
+#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250

 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Couldn't make mmap of %lu bytes"
 
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Couldn't make mmap of %lu bytes"
 

-#: apt-pkg/contrib/mmap.cc:252
+#: apt-pkg/contrib/mmap.cc:124
+#, fuzzy
+msgid "Unable to close mmap"
+msgstr "Unable to open %s"
+
+#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+#, fuzzy
+msgid "Unable to synchronize mmap"
+msgstr "Unable to invoke"
+
+#: apt-pkg/contrib/mmap.cc:300

 #, 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:347
+#: apt-pkg/contrib/mmap.cc:399

 #, 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:402
+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:346
+#: 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:353
+#: 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:360
+#: 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:365
+#: apt-pkg/contrib/strutl.cc:390

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

-#: apt-pkg/contrib/strutl.cc:1040
+#: apt-pkg/contrib/strutl.cc:1119

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


@@ -2198,7 +2258,12 @@ msgstr "Syntax error %s:%u: Included from here"
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
 
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
 

-#: apt-pkg/contrib/configuration.cc:825
+#: apt-pkg/contrib/configuration.cc:777
+#, fuzzy, c-format
+msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
+msgstr "Syntax error %s:%u: Directives can only be done at the top level"
+
+#: apt-pkg/contrib/configuration.cc:827

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


@@ -2229,32 +2294,32 @@ msgstr "Command line option %s is not understood"
 msgid "Command line option %s is not boolean"
 msgstr "Command line option %s is not boolean"
 
 msgid "Command line option %s is not boolean"
 msgstr "Command line option %s is not boolean"
 

-#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186

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

-#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204
+#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206

 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Option %s: Configuration item specification must have an =<val>."
 
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "Option %s: Configuration item specification must have an =<val>."
 

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

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

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

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

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

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

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

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


@@ -2264,191 +2329,213 @@ msgstr "Invalid operation %s"
 msgid "Unable to stat the mount point %s"
 msgstr "Unable to stat the mount point %s"
 
 msgid "Unable to stat the mount point %s"
 msgstr "Unable to stat the mount point %s"
 

-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
-#: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
+#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
+#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/contrib/fileutl.cc:568
+#: apt-pkg/contrib/fileutl.cc:621

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

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

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

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

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

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

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

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

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

-#: apt-pkg/contrib/fileutl.cc:632
+#: apt-pkg/contrib/fileutl.cc:697

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

-#: apt-pkg/contrib/fileutl.cc:688
+#: apt-pkg/contrib/fileutl.cc:714
+#, fuzzy, c-format
+msgid "Could not open file descriptor %d"
+msgstr "Couldn't open pipe for %s"
+
+#: apt-pkg/contrib/fileutl.cc:774

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

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

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

-#: apt-pkg/contrib/fileutl.cc:793
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:906
+#, fuzzy, c-format
+msgid "Problem closing the gzip file %s"
+msgstr "Problem closing the file"
+
+#: apt-pkg/contrib/fileutl.cc:909
+#, fuzzy, c-format
+msgid "Problem closing the file %s"

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

-#: apt-pkg/contrib/fileutl.cc:799
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:914
+#, fuzzy, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr "Problem syncing the file"
+
+#: apt-pkg/contrib/fileutl.cc:925
+#, fuzzy, c-format
+msgid "Problem unlinking the file %s"

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgid "Enhances"
 msgstr ""
 
 msgid "Enhances"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153

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

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

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

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

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

-#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
+#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211

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

-#: apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:236

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

-#: apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:242

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

+#: apt-pkg/depcache.cc:921
+#, c-format
+msgid "Internal error, group '%s' has no installable pseudo package"
+msgstr ""
+

 #: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"
 #: apt-pkg/tagfile.cc:102
 #, c-format
 msgid "Unable to parse package file %s (1)"


@@ -2459,64 +2546,84 @@ msgstr "Unable to parse package file %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Unable to parse package file %s (2)"
 
 msgid "Unable to parse package file %s (2)"
 msgstr "Unable to parse package file %s (2)"
 

-#: apt-pkg/sourcelist.cc:83
+#: apt-pkg/sourcelist.cc:92
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] unparseable)"
+msgstr "Malformed line %lu in source list %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:95
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([option] too short)"
+msgstr "Malformed line %lu in source list %s (dist)"
+
+#: apt-pkg/sourcelist.cc:106
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
+msgstr "Malformed line %lu in source list %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:112
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] has no key)"
+msgstr "Malformed line %lu in source list %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:115
+#, fuzzy, c-format
+msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
+msgstr "Malformed line %lu in source list %s (dist parse)"
+
+#: apt-pkg/sourcelist.cc:128

 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Malformed line %lu in source list %s (URI)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI)"
 msgstr "Malformed line %lu in source list %s (URI)"
 

-#: apt-pkg/sourcelist.cc:85
+#: apt-pkg/sourcelist.cc:130

 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Malformed line %lu in source list %s (dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist)"
 msgstr "Malformed line %lu in source list %s (dist)"
 

-#: apt-pkg/sourcelist.cc:88
+#: apt-pkg/sourcelist.cc:133

 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Malformed line %lu in source list %s (URI parse)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr "Malformed line %lu in source list %s (URI parse)"
 

-#: apt-pkg/sourcelist.cc:94
+#: apt-pkg/sourcelist.cc:139

 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Malformed line %lu in source list %s (absolute dist)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr "Malformed line %lu in source list %s (absolute dist)"
 

-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:146

 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Malformed line %lu in source list %s (dist parse)"
 
 #, c-format
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr "Malformed line %lu in source list %s (dist parse)"
 

-#: apt-pkg/sourcelist.cc:199
+#: apt-pkg/sourcelist.cc:244

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

-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438

 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Line %u too long in source list %s."
 
 #, c-format
 msgid "Line %u too long in source list %s."
 msgstr "Line %u too long in source list %s."
 

-#: apt-pkg/sourcelist.cc:236
+#: apt-pkg/sourcelist.cc:281

 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Malformed line %u in source list %s (type)"
 
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "Malformed line %u in source list %s (type)"
 

-#: apt-pkg/sourcelist.cc:240
+#: apt-pkg/sourcelist.cc:285

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Type ‘%s’ is not known on line %u in source list %s"
 
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "Type ‘%s’ is not known on line %u in source list %s"
 

-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
-msgstr "Malformed line %u in source list %s (vendor id)"
-
-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616

 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:440
+#: apt-pkg/packagemanager.cc:452

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2527,7 +2634,7 @@ msgstr ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 

-#: apt-pkg/packagemanager.cc:478
+#: apt-pkg/packagemanager.cc:495

 #, c-format
 msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "
 #, c-format
 msgid ""
 "Could not perform immediate configuration on already unpacked '%s'.Please "


@@ -2539,14 +2646,14 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr "Index file type ‘%s’ is not supported"
 
 msgid "Index file type '%s' is not supported"
 msgstr "Index file type ‘%s’ is not supported"
 

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

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

-#: apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1182

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


@@ -2554,11 +2661,11 @@ msgstr ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 

-#: apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1184

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

-#: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
+#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462

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


@@ -2566,24 +2673,29 @@ msgstr ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 

-#: apt-pkg/acquire.cc:60
-#, c-format
-msgid "Lists directory %spartial is missing."
+#: apt-pkg/acquire.cc:79
+#, fuzzy, c-format
+msgid "List directory %spartial is missing."

 msgstr "Lists directory %spartial is missing."
 
 msgstr "Lists directory %spartial is missing."
 

-#: apt-pkg/acquire.cc:64
-#, c-format
-msgid "Archive directory %spartial is missing."
+#: apt-pkg/acquire.cc:83
+#, fuzzy, c-format
+msgid "Archives directory %spartial is missing."

 msgstr "Archive directory %spartial is missing."
 
 msgstr "Archive directory %spartial is missing."
 

+#: apt-pkg/acquire.cc:91
+#, fuzzy, c-format
+msgid "Unable to lock directory %s"
+msgstr "Unable to lock the list directory"
+

 #. only show the ETA if it makes sense
 #. two days
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:878

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

-#: apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:880

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


@@ -2604,12 +2716,12 @@ msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 
 msgstr ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 

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

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

-#: apt-pkg/init.cc:149
+#: apt-pkg/init.cc:157

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


@@ -2622,139 +2734,161 @@ msgstr "Unable to stat %s."
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "You must put some 'source' URIs in your sources.list"
 
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "You must put some 'source' URIs in your sources.list"
 

-#: apt-pkg/cachefile.cc:71
+#: apt-pkg/cachefile.cc:84

 msgid "The package lists or status file could not be parsed or opened."
 msgstr "The package lists or status file could not be parsed or opened."
 
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "The package lists or status file could not be parsed or opened."
 

-#: apt-pkg/cachefile.cc:75
+#: apt-pkg/cachefile.cc:88

 msgid "You may want to run apt-get update to correct these problems"
 msgstr "You may want to run apt-get update to correct these problems"
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "You may want to run apt-get update to correct these problems"
 

-#: apt-pkg/policy.cc:316
+#: apt-pkg/policy.cc:343

 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Invalid record in the preferences file, no Package header"
 
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Invalid record in the preferences file, no Package header"
 

-#: apt-pkg/policy.cc:338
+#: apt-pkg/policy.cc:365

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

-#: apt-pkg/policy.cc:346
+#: apt-pkg/policy.cc:373

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

-#: apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:80

 msgid "Cache has an incompatible versioning system"
 msgstr "Cache has an incompatible versioning system"
 
 msgid "Cache has an incompatible versioning system"
 msgstr "Cache has an incompatible versioning system"
 

-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:198

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

-#: apt-pkg/pkgcachegen.cc:132
+#: apt-pkg/pkgcachegen.cc:215

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

-#: apt-pkg/pkgcachegen.cc:166
+#: apt-pkg/pkgcachegen.cc:253

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

-#: apt-pkg/pkgcachegen.cc:191
+#: apt-pkg/pkgcachegen.cc:285

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

-#: apt-pkg/pkgcachegen.cc:195
+#: apt-pkg/pkgcachegen.cc:289

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

-#: apt-pkg/pkgcachegen.cc:226
-#, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
+#: apt-pkg/pkgcachegen.cc:324
+#, fuzzy, c-format
+msgid "Error occurred while processing %s (NewVersion%d)"

 msgstr "Error occurred while processing %s (NewVersion1)"
 
 msgstr "Error occurred while processing %s (NewVersion1)"
 

-#: apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:320

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

-#: apt-pkg/pkgcachegen.cc:234
-#, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
-msgstr "Error occurred while processing %s (NewVersion2)"
-
-#: apt-pkg/pkgcachegen.cc:258
+#: apt-pkg/pkgcachegen.cc:353

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

-#: apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:360

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

-#: apt-pkg/pkgcachegen.cc:267
+#: apt-pkg/pkgcachegen.cc:363

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

-#: apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:366

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

-#: apt-pkg/pkgcachegen.cc:273
+#: apt-pkg/pkgcachegen.cc:369

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

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

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

-#: apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/pkgcachegen.cc:412

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

-#: apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:418

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

-#: apt-pkg/pkgcachegen.cc:706
+#: apt-pkg/pkgcachegen.cc:982

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

-#: apt-pkg/pkgcachegen.cc:808
+#: apt-pkg/pkgcachegen.cc:1087

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

-#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959
+#: apt-pkg/pkgcachegen.cc:1265 apt-pkg/pkgcachegen.cc:1272

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

-#: apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:136

 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename failed, %s (%s -> %s)."
 
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename failed, %s (%s -> %s)."
 

-#: apt-pkg/acquire-item.cc:432
+#: apt-pkg/acquire-item.cc:484

 msgid "MD5Sum mismatch"
 msgstr "MD5Sum mismatch"
 
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum mismatch"
 

-#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
+#: apt-pkg/acquire-item.cc:1713

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

-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:1240

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

-#: apt-pkg/acquire-item.cc:1260
+#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
+#. the time since then the file is invalid - formated in the same way as in
+#. the download progress display (e.g. 7d 3h 42min 1s)
+#: apt-pkg/acquire-item.cc:1277
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1298
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1324
+#, 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 ""
+
+#: apt-pkg/acquire-item.cc:1333
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1361

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


@@ -2763,7 +2897,7 @@ msgstr ""
 "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)"
 
 "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)"
 

-#: apt-pkg/acquire-item.cc:1319
+#: apt-pkg/acquire-item.cc:1420

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


@@ -2772,38 +2906,48 @@ msgstr ""
 "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 file for the %s package. This might mean you need to "
 "manually fix this package."
 

-#: apt-pkg/acquire-item.cc:1360
+#: apt-pkg/acquire-item.cc:1475

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

-#: apt-pkg/acquire-item.cc:1447
+#: apt-pkg/acquire-item.cc:1562

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

-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/indexrecords.cc:53

 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Unable to parse package file %s (1)"
 
 #, fuzzy, c-format
 msgid "Unable to parse Release file %s"
 msgstr "Unable to parse package file %s (1)"
 

-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/indexrecords.cc:60

 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Note, selecting %s instead of %s\n"
 
 #, fuzzy, c-format
 msgid "No sections in Release file %s"
 msgstr "Note, selecting %s instead of %s\n"
 

-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/indexrecords.cc:94

 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr ""
 

+#: apt-pkg/indexrecords.cc:107
+#, fuzzy, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr "Invalid line in the diversion file: %s"
+
+#: apt-pkg/indexrecords.cc:122
+#, fuzzy, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr "Unable to parse package file %s (1)"
+

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

-#: apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:518

 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"
 #, c-format
 msgid ""
 "Using CD-ROM mount point %s\n"


@@ -2812,66 +2956,66 @@ msgstr ""
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 
 "Using CD-ROM mount point %s\n"
 "Mounting CD-ROM\n"
 

-#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615

 msgid "Identifying.. "
 msgstr "Identifying.. "
 
 msgid "Identifying.. "
 msgstr "Identifying.. "
 

-#: apt-pkg/cdrom.cc:559
+#: apt-pkg/cdrom.cc:552

 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Stored label: %s\n"
 
 #, c-format
 msgid "Stored label: %s\n"
 msgstr "Stored label: %s\n"
 

-#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827

 msgid "Unmounting CD-ROM...\n"
 msgstr "Unmounting CD-ROM...\n"
 
 msgid "Unmounting CD-ROM...\n"
 msgstr "Unmounting CD-ROM...\n"
 

-#: apt-pkg/cdrom.cc:585
+#: apt-pkg/cdrom.cc:578

 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Using CD-ROM mount point %s\n"
 
 #, c-format
 msgid "Using CD-ROM mount point %s\n"
 msgstr "Using CD-ROM mount point %s\n"
 

-#: apt-pkg/cdrom.cc:603
+#: apt-pkg/cdrom.cc:596

 msgid "Unmounting CD-ROM\n"
 msgstr "Unmounting CD-ROM\n"
 
 msgid "Unmounting CD-ROM\n"
 msgstr "Unmounting CD-ROM\n"
 

-#: apt-pkg/cdrom.cc:607
+#: apt-pkg/cdrom.cc:600

 msgid "Waiting for disc...\n"
 msgstr "Waiting for disc...\n"
 
 #. Mount the new CDROM
 msgid "Waiting for disc...\n"
 msgstr "Waiting for disc...\n"
 
 #. Mount the new CDROM

-#: apt-pkg/cdrom.cc:615
+#: apt-pkg/cdrom.cc:608

 msgid "Mounting CD-ROM...\n"
 msgstr "Mounting CD-ROM...\n"
 
 msgid "Mounting CD-ROM...\n"
 msgstr "Mounting CD-ROM...\n"
 

-#: apt-pkg/cdrom.cc:633
+#: apt-pkg/cdrom.cc:626

 msgid "Scanning disc for index files..\n"
 msgstr "Scanning disc for index files..\n"
 
 msgid "Scanning disc for index files..\n"
 msgstr "Scanning disc for index files..\n"
 

-#: apt-pkg/cdrom.cc:673
+#: apt-pkg/cdrom.cc:666

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

-"Found %zu package indices, %zu source indices, %zu translation indices and %"
-"zu signatures\n"
+"Found %zu package indices, %zu source indices, %zu translation indices and "
+"%zu signatures\n"

 
 

-#: apt-pkg/cdrom.cc:684
+#: apt-pkg/cdrom.cc:677

 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:710
+#: apt-pkg/cdrom.cc:703

 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Found label: %s\n"
 
 #, c-format
 msgid "Found label '%s'\n"
 msgstr "Found label: %s\n"
 

-#: apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:732

 msgid "That is not a valid name, try again.\n"
 msgstr "That is not a valid name, try again.\n"
 
 msgid "That is not a valid name, try again.\n"
 msgstr "That is not a valid name, try again.\n"
 

-#: apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:748

 #, c-format
 msgid ""
 "This disc is called: \n"
 #, c-format
 msgid ""
 "This disc is called: \n"


@@ -2880,150 +3024,194 @@ msgstr ""
 "This disc is called: \n"
 "'%s'\n"
 
 "This disc is called: \n"
 "'%s'\n"
 

-#: apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:752

 msgid "Copying package lists..."
 msgstr "Copying package lists..."
 
 msgid "Copying package lists..."
 msgstr "Copying package lists..."
 

-#: apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:778

 msgid "Writing new source list\n"
 msgstr "Writing new source list\n"
 
 msgid "Writing new source list\n"
 msgstr "Writing new source list\n"
 

-#: apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:787

 msgid "Source list entries for this disc are:\n"
 msgstr "Source list entries for this disc are:\n"
 
 msgid "Source list entries for this disc are:\n"
 msgstr "Source list entries for this disc are:\n"
 

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

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

-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:267 apt-pkg/indexcopy.cc:904

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

-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:907

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

-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:273 apt-pkg/indexcopy.cc:910

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

-#: apt-pkg/indexcopy.cc:530
+#: apt-pkg/indexcopy.cc:532

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

-#: apt-pkg/indexcopy.cc:536
+#: apt-pkg/indexcopy.cc:538

 #, 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:544

 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum mismatch"
 
 #, fuzzy, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash Sum mismatch"
 

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

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

-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819

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

-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826

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

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

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

-#: apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:57

 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Running post-installation trigger %s"
 
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Running post-installation trigger %s"
 

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

 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory '%s' missing."
 
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory '%s' missing."
 

-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
+#, fuzzy, c-format
+msgid "Could not open file '%s'"
+msgstr "Could not open file %s"
+
+#: apt-pkg/deb/dpkgpm.cc:812

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

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

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

-#: apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:818

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

-#: apt-pkg/deb/dpkgpm.cc:662
+#: apt-pkg/deb/dpkgpm.cc:820

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

-#: apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:825

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparing for removal of %s"
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparing for removal of %s"
 

-#: apt-pkg/deb/dpkgpm.cc:669
+#: apt-pkg/deb/dpkgpm.cc:827

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

-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:832

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

-#: apt-pkg/deb/dpkgpm.cc:675
+#: apt-pkg/deb/dpkgpm.cc:833

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

-#: apt-pkg/deb/dpkgpm.cc:879
+#: apt-pkg/deb/dpkgpm.cc:1039

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 

-#: apt-pkg/deb/dpkgpm.cc:909
+#: apt-pkg/deb/dpkgpm.cc:1070

 msgid "Running dpkg"
 msgstr ""
 
 msgid "Running dpkg"
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1273
+msgid "No apport report written because MaxReports is reached already"
+msgstr ""
+
+#. check if its not a follow up error
+#: apt-pkg/deb/dpkgpm.cc:1278
+msgid "dependency problems - leaving unconfigured"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1280
+msgid ""
+"No apport report written because the error message indicates its a followup "
+"error from a previous failure."
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1286
+msgid ""
+"No apport report written because the error message indicates a disk full "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1292
+msgid ""
+"No apport report written because the error message indicates a out of memory "
+"error"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:1299
+msgid ""
+"No apport report written because the error message indicates a dpkg I/O error"
+msgstr ""
+
+#: apt-pkg/deb/debsystem.cc:69

 #, 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:72

 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Unable to lock the list directory"
 
 #, fuzzy, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "Unable to lock the list directory"
 

-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, 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:106

 msgid "Not locked"
 msgstr ""
 
 msgid "Not locked"
 msgstr ""
 


@@ -3041,10 +3229,34 @@ msgid ""
 "to be corrupt."
 msgstr ""
 
 "to be corrupt."
 msgstr ""
 

-#: methods/rsh.cc:330
+#: methods/rsh.cc:329

 msgid "Connection closed prematurely"
 msgstr "Connection closed prematurely"
 
 msgid "Connection closed prematurely"
 msgstr "Connection closed prematurely"
 

+#~ msgid "Release '%s' for '%s' was not found"
+#~ msgstr "Release ‘%s’ for ‘%s’ was not found"
+
+#~ msgid "Version '%s' for '%s' was not found"
+#~ msgstr "Version ‘%s’ for ‘%s’ was not found"
+
+#~ msgid "Couldn't find task %s"
+#~ msgstr "Couldn't find task %s"
+
+#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#~ msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+
+#~ msgid "Couldn't open pipe for %s"
+#~ msgstr "Couldn't open pipe for %s"
+
+#~ msgid "Read error from %s process"
+#~ msgstr "Read error from %s process"
+
+#~ msgid "Error occurred while processing %s (NewVersion2)"
+#~ msgstr "Error occurred while processing %s (NewVersion2)"
+
+#~ msgid "Malformed line %u in source list %s (vendor id)"
+#~ msgstr "Malformed line %u in source list %s (vendor id)"
+

 #~ msgid "Couldn't access keyring: '%s'"
 #~ msgstr "Couldn't access keyring: '%s'"
 
 #~ msgid "Couldn't access keyring: '%s'"
 #~ msgstr "Couldn't access keyring: '%s'"