* methods/rred.cc:

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 55f35cafa753488f1bd175cf7407260549993812..71e212509c4600e9b9ae97bf1232bef717cee2e9 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,161 +7,154 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2007-06-07 00:57+0200\n"
+"POT-Creation-Date: 2011-01-12 17:42+0100\n"

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

+"Language: \n"

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

+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"

 
 

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

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

-#: cmdline/apt-cache.cc:183 cmdline/apt-cache.cc:552 cmdline/apt-cache.cc:640
-#: cmdline/apt-cache.cc:796 cmdline/apt-cache.cc:1018
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
-#, c-format
-msgid "Unable to locate package %s"
+#: cmdline/apt-cache.cc:284
+msgid "Total package names: "

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:295
-msgid "Total Distinct Descriptions: "
+#: cmdline/apt-cache.cc:334
+msgid "Total distinct descriptions: "

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
+#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194

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

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

 msgstr ""
 
 msgstr ""
 

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

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

-#: cmdline/apt-cache.cc:1524
-msgid "Package files:"
+#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
+#, c-format
+msgid "Unable to locate package %s"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617
-msgid "Cache is out of sync, can't x-ref a package file"
+#: cmdline/apt-cache.cc:1533
+msgid "Package files:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1532
-#, c-format
-msgid "%4i %s\n"
+#: cmdline/apt-cache.cc:1540 cmdline/apt-cache.cc:1638
+msgid "Cache is out of sync, can't x-ref a package file"

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

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

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

-#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597
+#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618

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

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

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

-#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587
-msgid "(none)"
+#: cmdline/apt-cache.cc:1576
+msgid "  Candidate: "

 msgstr ""
 
 msgstr ""
 

-#. Candidate Version
-#: cmdline/apt-cache.cc:1584
-msgid "  Candidate: "
+#: cmdline/apt-cache.cc:1600 cmdline/apt-cache.cc:1608
+msgid "(none)"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

-#: cmdline/apt-cache.cc:1618
-#, c-format
-msgid "       %4i %s\n"
-msgstr ""
-
-#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2564 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1738 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:589
+#: cmdline/apt-get.cc:2793 cmdline/apt-sortpkgs.cc:144

 #, c-format
 #, c-format

-msgid "%s %s for %s %s compiled on %s %s\n"
+msgid "%s %s for %s compiled on %s %s\n"

 msgstr ""
 
 msgstr ""
 

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

 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"


@@ -182,10 +175,11 @@ 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"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"

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

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


@@ -200,15 +194,20 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+#: cmdline/apt-cdrom.cc:77
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"

 msgstr ""
 
 msgstr ""
 

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

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

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

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


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

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

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

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

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

-#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
+#: ftparchive/apt-ftparchive.cc:170 ftparchive/apt-ftparchive.cc:347

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

-#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
-#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
-#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292
+#: ftparchive/apt-ftparchive.cc:172 ftparchive/apt-ftparchive.cc:189
+#: ftparchive/apt-ftparchive.cc:212 ftparchive/apt-ftparchive.cc:262
+#: ftparchive/apt-ftparchive.cc:276 ftparchive/apt-ftparchive.cc:298

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

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

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

-#: ftparchive/apt-ftparchive.cc:371
+#: ftparchive/apt-ftparchive.cc:377

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

-#: ftparchive/apt-ftparchive.cc:401
+#: ftparchive/apt-ftparchive.cc:407

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

-#: ftparchive/apt-ftparchive.cc:556
+#: ftparchive/apt-ftparchive.cc:595

 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"


@@ -327,38 +325,38 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:762
+#: ftparchive/apt-ftparchive.cc:801

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

-#: ftparchive/apt-ftparchive.cc:835
+#: ftparchive/apt-ftparchive.cc:879

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

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

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

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

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

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

 msgid ""
 msgid ""

-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "

 "remove and re-create the database."
 msgstr ""
 
 "remove and re-create the database."
 msgstr ""
 

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

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

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

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


@@ -371,401 +369,495 @@ msgstr ""
 msgid "Unable to get a cursor"
 msgstr ""
 
 msgid "Unable to get a cursor"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

-#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:193

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
+#: ftparchive/writer.cc:401 ftparchive/writer.cc:688

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

-#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
+#: ftparchive/writer.cc:464 ftparchive/writer.cc:793

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

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

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

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

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

-#: ftparchive/contents.cc:317
+#: ftparchive/contents.cc:321

 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr ""
 
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr ""
 

-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+#: ftparchive/contents.cc:358 ftparchive/contents.cc:389

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

-#: ftparchive/override.cc:38 ftparchive/override.cc:146
+#: ftparchive/override.cc:34 ftparchive/override.cc:142

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

-#: ftparchive/override.cc:64 ftparchive/override.cc:170
+#: ftparchive/override.cc:60 ftparchive/override.cc:166

 #, c-format
 msgid "Malformed override %s line %lu #1"
 msgstr ""
 
 #, c-format
 msgid "Malformed override %s line %lu #1"
 msgstr ""
 

-#: ftparchive/override.cc:78 ftparchive/override.cc:182
+#: ftparchive/override.cc:74 ftparchive/override.cc:178

 #, c-format
 msgid "Malformed override %s line %lu #2"
 msgstr ""
 
 #, c-format
 msgid "Malformed override %s line %lu #2"
 msgstr ""
 

-#: ftparchive/override.cc:92 ftparchive/override.cc:195
+#: ftparchive/override.cc:88 ftparchive/override.cc:191

 #, c-format
 msgid "Malformed override %s line %lu #3"
 msgstr ""
 
 #, c-format
 msgid "Malformed override %s line %lu #3"
 msgstr ""
 

-#: ftparchive/override.cc:131 ftparchive/override.cc:205
+#: ftparchive/override.cc:127 ftparchive/override.cc:201

 #, c-format
 msgid "Failed to read the override file %s"
 msgstr ""
 
 #, c-format
 msgid "Failed to read the override file %s"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ftparchive/multicompress.cc:289
+#: ftparchive/multicompress.cc:286

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

-#: ftparchive/multicompress.cc:324
+#: ftparchive/multicompress.cc:321

 msgid "Failed to exec compressor "
 msgstr ""
 
 msgid "Failed to exec compressor "
 msgstr ""
 

-#: ftparchive/multicompress.cc:363
+#: ftparchive/multicompress.cc:360

 msgid "decompressor"
 msgstr ""
 
 msgid "decompressor"
 msgstr ""
 

-#: ftparchive/multicompress.cc:406
+#: ftparchive/multicompress.cc:403

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:157 apt-pkg/cachefilter.cc:29

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

-#: cmdline/apt-get.cc:238
+#: cmdline/apt-get.cc:252

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

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

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

-#: cmdline/apt-get.cc:330
+#: cmdline/apt-get.cc:344

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

-#: cmdline/apt-get.cc:337
+#: cmdline/apt-get.cc:351

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:376
+#: cmdline/apt-get.cc:392

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

-#: cmdline/apt-get.cc:402
+#: cmdline/apt-get.cc:420

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

-#: cmdline/apt-get.cc:424
+#: cmdline/apt-get.cc:442

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

-#: cmdline/apt-get.cc:445
+#: cmdline/apt-get.cc:465

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

-#: cmdline/apt-get.cc:466
+#: cmdline/apt-get.cc:488

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

-#: cmdline/apt-get.cc:486
+#: cmdline/apt-get.cc:508

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

-#: cmdline/apt-get.cc:539
+#: cmdline/apt-get.cc:563

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

-#: cmdline/apt-get.cc:547
+#: cmdline/apt-get.cc:571

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

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

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

-#: cmdline/apt-get.cc:582
+#: cmdline/apt-get.cc:609

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

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

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

-#: cmdline/apt-get.cc:586
+#: cmdline/apt-get.cc:613

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

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

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

-#: cmdline/apt-get.cc:664
+#: cmdline/apt-get.cc:639
+#, c-format
+msgid "Note, selecting '%s' for task '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:645
+#, c-format
+msgid "Note, selecting '%s' for regex '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:662
+#, c-format
+msgid "Package %s is a virtual package provided by:\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:673
+msgid " [Installed]"
+msgstr ""
+
+#: cmdline/apt-get.cc:682
+msgid " [Not candidate version]"
+msgstr ""
+
+#: cmdline/apt-get.cc:684
+msgid "You should explicitly select one to install."
+msgstr ""
+
+#: cmdline/apt-get.cc:687
+#, c-format
+msgid ""
+"Package %s is not available, but is referred to by another package.\n"
+"This may mean that the package is missing, has been obsoleted, or\n"
+"is only available from another source\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:705
+msgid "However the following packages replace it:"
+msgstr ""
+
+#: cmdline/apt-get.cc:717
+#, c-format
+msgid "Package '%s' has no installation candidate"
+msgstr ""
+
+#: cmdline/apt-get.cc:728
+#, c-format
+msgid "Virtual packages like '%s' can't be removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:759
+#, c-format
+msgid "Note, selecting '%s' instead of '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:789
+#, c-format
+msgid "Skipping %s, it is already installed and upgrade is not set.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:793
+#, c-format
+msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:803
+#, c-format
+msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:808
+#, c-format
+msgid "%s is already the newest version.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:2027
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:853
+#, c-format
+msgid "Selected version '%s' (%s) for '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:858
+#, c-format
+msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:898
+#, c-format
+msgid "Package %s is not installed, so not removed\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:973

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

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

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

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

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

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

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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

-#: cmdline/apt-get.cc:708
+#: cmdline/apt-get.cc:1020

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

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

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

-#: cmdline/apt-get.cc:717
+#: cmdline/apt-get.cc:1029

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

-#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
+#: cmdline/apt-get.cc:1038 cmdline/apt-get.cc:1199

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

-#: cmdline/apt-get.cc:770
+#: cmdline/apt-get.cc:1079

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

-#: cmdline/apt-get.cc:779
+#: cmdline/apt-get.cc:1088

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

-#: cmdline/apt-get.cc:790
+#: cmdline/apt-get.cc:1099

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

-#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:1995 cmdline/apt-get.cc:2028
-msgid "Unable to lock the download directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2076 cmdline/apt-get.cc:2312
-#: apt-pkg/cachefile.cc:63 apt-pkg/cachefile.cc:65
-msgid "The list of sources could not be read."
-msgstr ""
-
-#: cmdline/apt-get.cc:831
+#: cmdline/apt-get.cc:1137

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

-#: cmdline/apt-get.cc:836
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1144

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

-#: cmdline/apt-get.cc:839
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1149

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

-#: cmdline/apt-get.cc:844
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1156

 #, c-format
 #, c-format

-msgid "After unpacking %sB of additional disk space will be used.\n"
+msgid "After this operation, %sB of additional disk space will be used.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:847
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:1161

 #, c-format
 #, c-format

-msgid "After unpacking %sB disk space will be freed.\n"
+msgid "After this operation, %sB disk space will be freed.\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2166
+#: cmdline/apt-get.cc:1176 cmdline/apt-get.cc:1179 cmdline/apt-get.cc:2367
+#: cmdline/apt-get.cc:2370

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

-#: cmdline/apt-get.cc:864
+#: cmdline/apt-get.cc:1189

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

-#: cmdline/apt-get.cc:879 cmdline/apt-get.cc:899
+#: cmdline/apt-get.cc:1205 cmdline/apt-get.cc:1225

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

-#: cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:1207

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

-#: cmdline/apt-get.cc:883
+#: cmdline/apt-get.cc:1209

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


@@ -773,194 +865,143 @@ msgid ""
 " ?] "
 msgstr ""
 
 " ?] "
 msgstr ""
 

-#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
+#: cmdline/apt-get.cc:1215 cmdline/apt-get.cc:1234

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

-#: cmdline/apt-get.cc:904
+#: cmdline/apt-get.cc:1230

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

-#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2209
-#: apt-pkg/algorithms.cc:1348
+#: cmdline/apt-get.cc:1302 cmdline/apt-get.cc:2427 apt-pkg/algorithms.cc:1470

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

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

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

-#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2218
+#: cmdline/apt-get.cc:1321 cmdline/apt-get.cc:2436

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

-#: cmdline/apt-get.cc:1001
+#: cmdline/apt-get.cc:1327

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

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

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

-#: cmdline/apt-get.cc:1010
+#: cmdline/apt-get.cc:1336

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

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

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

-#: cmdline/apt-get.cc:1045
-#, c-format
-msgid "Note, selecting %s instead of %s\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1055
-#, c-format
-msgid "Skipping %s, it is already installed and upgrade is not set.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1073
-#, c-format
-msgid "Package %s is not installed, so not removed\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1084
-#, c-format
-msgid "Package %s is a virtual package provided by:\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1096
-msgid " [Installed]"
-msgstr ""
-
-#: cmdline/apt-get.cc:1101
-msgid "You should explicitly select one to install."
-msgstr ""
-
-#: cmdline/apt-get.cc:1106
-#, c-format
+#: cmdline/apt-get.cc:1365

 msgid ""
 msgid ""

-"Package %s is not available, but is referred to by another package.\n"
-"This may mean that the package is missing, has been obsoleted, or\n"
-"is only available from another source\n"
-msgstr ""
+"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:1125
-msgid "However the following packages replace it:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1128
-#, c-format
-msgid "Package %s has no installation candidate"
-msgstr ""
-
-#: cmdline/apt-get.cc:1148
-#, c-format
-msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
+#: cmdline/apt-get.cc:1369
+msgid "Note: This is done automatic and on purpose by dpkg."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "%s is already the newest version.\n"
-msgstr ""
-
-#: cmdline/apt-get.cc:1185
-#, c-format
-msgid "Release '%s' for '%s' was not found"
+msgid "Ignore unavailable target release '%s' of package '%s'"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Version '%s' for '%s' was not found"
+msgid "Picking '%s' as source package instead of '%s'\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1193
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1569

 #, c-format
 #, c-format

-msgid "Selected version %s (%s) for %s\n"
+msgid "Ignore unavailable version '%s' of package '%s'"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1330
+#: cmdline/apt-get.cc:1585

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

-#: cmdline/apt-get.cc:1343
-msgid "Unable to lock the list directory"
-msgstr ""
-
-#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412 apt-pkg/algorithms.cc:1374
-#: apt-pkg/algorithms.cc:1376
-msgid ""
-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
-msgstr ""
-
-#: cmdline/apt-get.cc:1433
+#: cmdline/apt-get.cc:1647

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

-#: cmdline/apt-get.cc:1465
-msgid ""
-"The following packages were automatically installed and are no longer "
-"required:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1467
-msgid "Use 'apt-get autoremove' to remove them."
-msgstr ""
-
-#: cmdline/apt-get.cc:1472
+#: cmdline/apt-get.cc:1699

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

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

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

-#: cmdline/apt-get.cc:1479
+#: cmdline/apt-get.cc:1706

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

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

 
 

-#: cmdline/apt-get.cc:1642 cmdline/apt-get.cc:1678
+#: cmdline/apt-get.cc:1717

 #, c-format
 #, c-format

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

 
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1711
+#: cmdline/apt-get.cc:1831

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

-#: cmdline/apt-get.cc:1723
+#: cmdline/apt-get.cc:1843

 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"


@@ -968,160 +1009,185 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

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

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

-#: cmdline/apt-get.cc:1770
+#: cmdline/apt-get.cc:1889

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

-#: cmdline/apt-get.cc:1859
+#: cmdline/apt-get.cc:1979

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

-#: cmdline/apt-get.cc:1860
+#: cmdline/apt-get.cc:1980

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

-#: cmdline/apt-get.cc:1888
+#: cmdline/apt-get.cc:2022
+#, c-format
+msgid "Couldn't find package %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:2029
+#, c-format
+msgid "%s set to automatically installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2050

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

-#: cmdline/apt-get.cc:1891 methods/ftp.cc:702 methods/connect.cc:101
-#: methods/connect.cc:111
+#: cmdline/apt-get.cc:2053 methods/ftp.cc:707 methods/connect.cc:111

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

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

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

-#: cmdline/apt-get.cc:1963 cmdline/apt-get.cc:1971
+#: cmdline/apt-get.cc:2125 cmdline/apt-get.cc:2133

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

-#: cmdline/apt-get.cc:2071
+#: cmdline/apt-get.cc:2157 cmdline/apt-get.cc:2190
+msgid "Unable to lock the download directory"
+msgstr ""
+
+#: cmdline/apt-get.cc:2233

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

-#: cmdline/apt-get.cc:2101 cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2273 cmdline/apt-get.cc:2554

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

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

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

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

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

-#: cmdline/apt-get.cc:2174
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement strings, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:2388

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

-#: cmdline/apt-get.cc:2177
+#. TRANSLATOR: The required space between number and unit is already included
+#. in the replacement string, so %sB will be correctly translate in e.g. 1,5 MB
+#: cmdline/apt-get.cc:2393

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

-#: cmdline/apt-get.cc:2183
+#: cmdline/apt-get.cc:2399

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

-#: cmdline/apt-get.cc:2214
+#: cmdline/apt-get.cc:2432

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

-#: cmdline/apt-get.cc:2242
+#: cmdline/apt-get.cc:2462

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

-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2474

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

-#: cmdline/apt-get.cc:2255
+#: cmdline/apt-get.cc:2475

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

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

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

-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2512

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

-#: cmdline/apt-get.cc:2307
+#: cmdline/apt-get.cc:2528

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

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

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

-#: cmdline/apt-get.cc:2355
+#: cmdline/apt-get.cc:2579

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

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

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

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

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

-#: cmdline/apt-get.cc:2494
+#: cmdline/apt-get.cc:2719

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

-#: cmdline/apt-get.cc:2519
+#: cmdline/apt-get.cc:2746

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

-#: cmdline/apt-get.cc:2533
+#: cmdline/apt-get.cc:2762

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

-#: cmdline/apt-get.cc:2537
+#: cmdline/apt-get.cc:2767

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

-#: cmdline/apt-get.cc:2569
+#: cmdline/apt-get.cc:2798

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

-#: cmdline/apt-get.cc:2610
+#: cmdline/apt-get.cc:2839

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


@@ -1136,6 +1202,8 @@ msgid ""
 "   upgrade - Perform an upgrade\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   upgrade - Perform an upgrade\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"

+"   autoremove - Remove automatically all unused packages\n"
+"   purge - Remove packages and config files\n"

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


@@ -1143,6 +1211,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"


@@ -1151,7 +1221,7 @@ msgid ""
 "  -d  Download only - do NOT install or unpack archives\n"
 "  -s  No-act. Perform ordering simulation\n"
 "  -y  Assume Yes to all queries and do not prompt\n"
 "  -d  Download only - do NOT install or unpack archives\n"
 "  -s  No-act. Perform ordering simulation\n"
 "  -y  Assume Yes to all queries and do not prompt\n"

-"  -f  Attempt to continue if the integrity check fails\n"
+"  -f  Attempt to correct a system with broken dependencies in place\n"

 "  -m  Attempt to continue if archives are unlocatable\n"
 "  -u  Show a list of upgraded packages as well\n"
 "  -b  Build the source package after fetching it\n"
 "  -m  Attempt to continue if archives are unlocatable\n"
 "  -u  Show a list of upgraded packages as well\n"
 "  -b  Build the source package after fetching it\n"


@@ -1163,33 +1233,41 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 

-#: cmdline/acqprogress.cc:55
+#: cmdline/apt-get.cc:2995
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+
+#: cmdline/acqprogress.cc:57

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -1219,24 +1297,28 @@ msgstr ""
 msgid "Bad default setting!"
 msgstr ""
 
 msgid "Bad default setting!"
 msgstr ""
 

-#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93
-#: dselect/install:104 dselect/update:45
+#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
+#: dselect/install:105 dselect/update:45

 msgid "Press enter to continue."
 msgstr ""
 
 msgid "Press enter to continue."
 msgstr ""
 

-#: dselect/install:100
-msgid "Some errors occurred while unpacking. I'm going to configure the"
+#: dselect/install:91
+msgid "Do you want to erase any previously downloaded .deb files?"

 msgstr ""
 
 #: dselect/install:101
 msgstr ""
 
 #: dselect/install:101

-msgid "packages that were installed. This may result in duplicate errors"
+msgid "Some errors occurred while unpacking. Packages that were installed"

 msgstr ""
 
 #: dselect/install:102
 msgstr ""
 
 #: dselect/install:102

-msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgid "will be configured. This may result in duplicate errors"

 msgstr ""
 
 #: dselect/install:103
 msgstr ""
 
 #: dselect/install:103

+msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgstr ""
+
+#: dselect/install:104

 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""


@@ -1245,192 +1327,196 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
 msgid "Merging available information"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105
+#: apt-inst/contrib/arfile.cc:90
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:102

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 

-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:753
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
-#: apt-pkg/contrib/configuration.cc:821 apt-pkg/acquire.cc:419
-#: methods/mirror.cc:85
+#. 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:179
+#: apt-pkg/contrib/fileutl.cc:329 apt-pkg/sourcelist.cc:204
+#: apt-pkg/sourcelist.cc:210 apt-pkg/acquire.cc:450 apt-pkg/init.cc:100
+#: apt-pkg/init.cc:108 apt-pkg/clean.cc:33 apt-pkg/policy.cc:307
+#: methods/mirror.cc:87

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

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

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

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

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

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

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

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

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

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

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

-#. Build the status cache
-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:760
-#: apt-pkg/pkgcachegen.cc:829 apt-pkg/pkgcachegen.cc:834
-#: apt-pkg/pkgcachegen.cc:957
+#: 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 ""
 
 msgid "Reading package lists"
 msgstr ""
 

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

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

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

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

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

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

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

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


@@ -1438,514 +1524,566 @@ msgid ""
 "package!"
 msgstr ""
 
 "package!"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-inst/deb/debfile.cc:52
+#: apt-inst/deb/debfile.cc:50

 #, c-format
 #, c-format

-msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
+msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:112
+#: apt-inst/deb/debfile.cc:110

 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:138
+#: apt-inst/deb/debfile.cc:140

 msgid "Internal error, could not locate member"
 msgstr ""
 
 msgid "Internal error, could not locate member"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:171
+#: apt-inst/deb/debfile.cc:173

 msgid "Failed to locate a valid control file"
 msgstr ""
 
 msgid "Failed to locate a valid control file"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:256
+#: apt-inst/deb/debfile.cc:258

 msgid "Unparsable control file"
 msgstr ""
 
 msgid "Unparsable control file"
 msgstr ""
 

-#: methods/cdrom.cc:114
+#: methods/bzip2.cc:65
+#, c-format
+msgid "Couldn't open pipe for %s"
+msgstr ""
+
+#: methods/bzip2.cc:109
+#, c-format
+msgid "Read error from %s process"
+msgstr ""
+
+#: methods/bzip2.cc:141 methods/bzip2.cc:150 methods/copy.cc:43
+#: methods/gzip.cc:93 methods/gzip.cc:102 methods/rred.cc:486
+#: methods/rred.cc:495
+msgid "Failed to stat"
+msgstr ""
+
+#: methods/bzip2.cc:147 methods/copy.cc:80 methods/gzip.cc:99
+#: methods/rred.cc:492
+msgid "Failed to set modification time"
+msgstr ""
+
+#: methods/cdrom.cc:199

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

-#: methods/cdrom.cc:123
+#: 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"
 msgstr ""
 
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr ""
 

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

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

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

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

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

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

-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264

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

-#: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
-msgid "Failed to stat"
-msgstr ""
-
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
-msgid "Failed to set modification time"
-msgstr ""
-

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

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

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

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

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

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

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

-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: methods/ftp.cc:210 methods/ftp.cc:238

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

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

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

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

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

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

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

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

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

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

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

-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226

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

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

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

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

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

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

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

-#: methods/ftp.cc:362 methods/ftp.cc:374
+#: methods/ftp.cc:368 methods/ftp.cc:380

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

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

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

-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
-#: methods/http.cc:993
+#: methods/ftp.cc:869 methods/http.cc:1006 methods/rsh.cc:302

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: methods/connect.cc:108 methods/connect.cc:118
+#: methods/connect.cc:121

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

-#: methods/connect.cc:136 methods/rsh.cc:425 methods/connect.cc:146
+#: methods/connect.cc:149 methods/rsh.cc:424

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

-#: methods/connect.cc:167 methods/connect.cc:164 methods/connect.cc:183
+#: methods/connect.cc:168 methods/connect.cc:187

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

-#: methods/connect.cc:173 methods/connect.cc:189
+#: methods/connect.cc:193

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

-#: methods/connect.cc:176 methods/connect.cc:192
+#: methods/connect.cc:196

 #, c-format
 #, c-format

-msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"

 msgstr ""
 
 msgstr ""
 

-#: methods/connect.cc:223 methods/connect.cc:239
+#: methods/connect.cc:243

 #, c-format
 #, c-format

-msgid "Unable to connect to %s %s:"
+msgid "Unable to connect to %s:%s:"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:65 methods/gpgv.cc:71
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:71

 #, c-format
 #, c-format

-msgid "Couldn't access keyring: '%s'"
+msgid "No keyring installed in %s."

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:101 methods/gpgv.cc:107
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-msgstr ""
-
-#: methods/gpgv.cc:205 methods/gpgv.cc:223
+#: methods/gpgv.cc:163

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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: methods/http.cc:523 methods/http.cc:524
+#: methods/http.cc:531

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

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

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

-#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:551
-#: methods/http.cc:558
+#: methods/http.cc:564 methods/http.cc:571

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

-#: methods/http.cc:586 methods/http.cc:587
+#: methods/http.cc:600

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

-#: methods/http.cc:601 methods/http.cc:602
+#: methods/http.cc:615

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

-#: methods/http.cc:603 methods/http.cc:604
+#: methods/http.cc:617

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

-#: methods/http.cc:627 methods/http.cc:628
+#: methods/http.cc:641

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

-#: methods/http.cc:774 methods/http.cc:781
+#: methods/http.cc:799

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

-#: methods/http.cc:779 methods/http.cc:786
+#: methods/http.cc:804

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

-#: methods/http.cc:802 methods/http.cc:809
+#: methods/http.cc:827

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

-#: methods/http.cc:833 methods/http.cc:840
+#: methods/http.cc:858

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

-#: methods/http.cc:861 methods/http.cc:868
+#: methods/http.cc:886

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

-#: methods/http.cc:875 methods/http.cc:882
+#: methods/http.cc:900

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

-#: methods/http.cc:877 methods/http.cc:884
+#: methods/http.cc:902

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

-#: methods/http.cc:1104 methods/http.cc:1143
+#: methods/http.cc:991 apt-pkg/contrib/mmap.cc:281
+msgid "Failed to truncate file"
+msgstr ""
+
+#: methods/http.cc:1160

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

-#: methods/http.cc:1121 methods/http.cc:1176 methods/http.cc:1160
-#: methods/http.cc:1215
+#: methods/http.cc:1177 methods/http.cc:1232

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

-#: methods/http.cc:1228 methods/http.cc:1307
+#: methods/http.cc:1324

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

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

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

-#: apt-pkg/contrib/mmap.cc:85
+#: apt-pkg/contrib/mmap.cc:89
+#, c-format
+msgid "Couldn't duplicate file descriptor %i"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250

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

-#: apt-pkg/contrib/strutl.cc:978 apt-pkg/contrib/strutl.cc:1018
+#: apt-pkg/contrib/mmap.cc:124
+msgid "Unable to close mmap"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
+msgid "Unable to synchronize mmap"
+msgstr ""
+
+#: apt-pkg/contrib/mmap.cc:300

 #, c-format
 #, c-format

-msgid "Selection %s not found"
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:439
+#: apt-pkg/contrib/mmap.cc:399

 #, c-format
 #, c-format

-msgid "Unrecognized type abbreviation: '%c'"
+msgid ""
+"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 ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:497
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:371

 #, c-format
 #, c-format

-msgid "Opening configuration file %s"
+msgid "%lid %lih %limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:515
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:378
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:385

 #, c-format
 #, c-format

-msgid "Line %d too long (max %u)"
+msgid "%limin %lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:611 apt-pkg/contrib/configuration.cc:662
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:390
+#, c-format
+msgid "%lis"
+msgstr ""
+
+#: apt-pkg/contrib/strutl.cc:1119
+#, c-format
+msgid "Selection %s not found"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:452
+#, c-format
+msgid "Unrecognized type abbreviation: '%c'"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:510
+#, c-format
+msgid "Opening configuration file %s"
+msgstr ""
+
+#: apt-pkg/contrib/configuration.cc:678

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

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

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

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

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

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

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

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

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

-#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:703
-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770

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

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

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

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

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


@@ -1976,32 +2114,32 @@ msgstr ""
 msgid "Command line option %s is not boolean"
 msgstr ""
 
 msgid "Command line option %s is not boolean"
 msgstr ""
 

-#: 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 ""
 
 #, c-format
 msgid "Option %s requires an argument."
 msgstr ""
 

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

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

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

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

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

-#: 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 ""
 
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr ""
 

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

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


@@ -2011,183 +2149,219 @@ msgstr ""
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
 msgid "Unable to stat the mount point %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40
-#: apt-pkg/contrib/cdromutl.cc:180 apt-pkg/acquire.cc:425
-#: apt-pkg/acquire.cc:450 methods/mirror.cc:91
+#: apt-pkg/contrib/cdromutl.cc:175 apt-pkg/contrib/cdromutl.cc:209
+#: apt-pkg/acquire.cc:456 apt-pkg/acquire.cc:481 apt-pkg/clean.cc:39
+#: methods/mirror.cc:93

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/contrib/fileutl.cc:377 apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:321
+#, c-format
+msgid "List of files can't be created as '%s' is not a directory"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:661

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

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

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

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

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

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

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

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

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

-#: apt-pkg/contrib/fileutl.cc:492 apt-pkg/contrib/fileutl.cc:559
+#: apt-pkg/contrib/fileutl.cc:763
+#, c-format
+msgid "Could not open file descriptor %d"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:823

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

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

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

-#: apt-pkg/contrib/fileutl.cc:597 apt-pkg/contrib/fileutl.cc:664
-msgid "Problem closing the file"
+#: apt-pkg/contrib/fileutl.cc:985
+#, c-format
+msgid "Problem closing the gzip file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:603 apt-pkg/contrib/fileutl.cc:670
-msgid "Problem unlinking the file"
+#: apt-pkg/contrib/fileutl.cc:988
+#, c-format
+msgid "Problem closing the file %s"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:993
+#, c-format
+msgid "Problem renaming the file %s to %s"
+msgstr ""
+
+#: apt-pkg/contrib/fileutl.cc:1004
+#, c-format
+msgid "Problem unlinking the file %s"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/pkgcache.cc:237
+#: apt-pkg/pkgcache.cc:295
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:306

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

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

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

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

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

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

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

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

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

-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+#: apt-pkg/depcache.cc:125 apt-pkg/depcache.cc:154

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

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

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

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

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

-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+#: apt-pkg/depcache.cc:175 apt-pkg/depcache.cc:208 apt-pkg/depcache.cc:212

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

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

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

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

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

+#: apt-pkg/depcache.cc:922
+#, 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)"


@@ -2198,57 +2372,84 @@ msgstr ""
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 
 msgid "Unable to parse package file %s (2)"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616

 #, c-format
 #, c-format

-msgid "Malformed line %u in source list %s (vendor id)"
+msgid ""
+"Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:428
+#: 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 "


@@ -2256,45 +2457,63 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 

+#: apt-pkg/packagemanager.cc:495
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'. Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+

 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/algorithms.cc:247 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 ""
 
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1105 apt-pkg/algorithms.cc:1107
+#: apt-pkg/algorithms.cc:1218

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

-#: apt-pkg/algorithms.cc:1107 apt-pkg/algorithms.cc:1109
+#: apt-pkg/algorithms.cc:1220

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

-#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60
+#: apt-pkg/algorithms.cc:1496 apt-pkg/algorithms.cc:1498
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: apt-pkg/acquire.cc:79
+#, c-format
+msgid "List directory %spartial is missing."
+msgstr ""
+
+#: apt-pkg/acquire.cc:83

 #, c-format
 #, c-format

-msgid "Lists directory %spartial is missing."
+msgid "Archives directory %spartial is missing."

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Archive directory %spartial is missing."
+msgid "Unable to lock directory %s"

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

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

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

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

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


@@ -2309,21 +2528,21 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
 msgid "Method %s did not start correctly"
 msgstr ""
 

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

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

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

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

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

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

-#: apt-pkg/clean.cc:57
+#: apt-pkg/clean.cc:56

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


@@ -2332,478 +2551,554 @@ msgstr ""
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 

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

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

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

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

-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/cachefile.cc:106
+msgid "The list of sources could not be read."

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, c-format
 #, c-format

-msgid "Error occurred while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewVersion%d)"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
-#: apt-pkg/acquire-item.cc:707 apt-pkg/acquire-item.cc:1478
+#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1574
+#: apt-pkg/acquire-item.cc:1717

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

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

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

-#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1283
+#. 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:1281
+#, c-format
+msgid "Release file expired, ignoring %s (invalid since %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1302
+#, c-format
+msgid "Conflicting distribution: %s (expected %s but got %s)"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1328
+#, 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:1337
+#, c-format
+msgid "GPG error: %s: %s"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1365

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

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

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

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

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

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

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

+#: apt-pkg/indexrecords.cc:53
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:60
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:94
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:107
+#, c-format
+msgid "Invalid 'Valid-Until' entry in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:122
+#, c-format
+msgid "Invalid 'Date' entry in Release file %s"
+msgstr ""
+

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

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

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

-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627
+#: apt-pkg/cdrom.cc:527 apt-pkg/cdrom.cc:615

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

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

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

-#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 

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

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

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

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

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

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

-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823 apt-pkg/indexcopy.cc:832
+#: apt-pkg/indexcopy.cc:270 apt-pkg/indexcopy.cc:908

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

-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825 apt-pkg/indexcopy.cc:834
+#: apt-pkg/indexcopy.cc:272 apt-pkg/indexcopy.cc:910

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

-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:275 apt-pkg/indexcopy.cc:913

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

-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:278 apt-pkg/indexcopy.cc:916

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

-#: apt-pkg/deb/dpkgpm.cc:513 apt-pkg/deb/dpkgpm.cc:532
+#: apt-pkg/indexcopy.cc:537

 #, c-format
 #, c-format

-msgid "Directory '%s' missing"
+msgid "Skipping nonexistent file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:596 apt-pkg/deb/dpkgpm.cc:621
+#: apt-pkg/indexcopy.cc:543

 #, c-format
 #, c-format

-msgid "Preparing %s"
+msgid "Can't find authentication record for: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:597 apt-pkg/deb/dpkgpm.cc:622
+#: apt-pkg/indexcopy.cc:549

 #, c-format
 #, c-format

-msgid "Unpacking %s"
+msgid "Hash mismatch for: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:602 apt-pkg/deb/dpkgpm.cc:627
+#: apt-pkg/cacheset.cc:337

 #, c-format
 #, c-format

-msgid "Preparing to configure %s"
+msgid "Release '%s' for '%s' was not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:603 apt-pkg/deb/dpkgpm.cc:52
-#: apt-pkg/deb/dpkgpm.cc:628
+#: apt-pkg/cacheset.cc:340

 #, c-format
 #, c-format

-msgid "Configuring %s"
+msgid "Version '%s' for '%s' was not found"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:606
-#: apt-pkg/deb/dpkgpm.cc:630 apt-pkg/deb/dpkgpm.cc:631
+#: apt-pkg/cacheset.cc:447

 #, c-format
 #, c-format

-msgid "Processing triggers for %s"
+msgid "Couldn't find task '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:633
+#: apt-pkg/cacheset.cc:454

 #, c-format
 #, c-format

-msgid "Installed %s"
+msgid "Couldn't find any package by regex '%s'"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:613 apt-pkg/deb/dpkgpm.cc:615
-#: apt-pkg/deb/dpkgpm.cc:616 apt-pkg/deb/dpkgpm.cc:638
-#: apt-pkg/deb/dpkgpm.cc:640 apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/cacheset.cc:467

 #, c-format
 #, c-format

-msgid "Preparing for removal of %s"
+msgid "Can't select versions from package '%s' as it purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:618 apt-pkg/deb/dpkgpm.cc:53
-#: apt-pkg/deb/dpkgpm.cc:643
+#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483

 #, c-format
 #, c-format

-msgid "Removing %s"
+msgid ""
+"Can't select installed nor candidate version from package '%s' as it has "
+"neither of them"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:619 apt-pkg/deb/dpkgpm.cc:644
+#: apt-pkg/cacheset.cc:491

 #, c-format
 #, c-format

-msgid "Removed %s"
+msgid "Can't select newest version from package '%s' as it is purely virtual"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:624 apt-pkg/deb/dpkgpm.cc:649
+#: apt-pkg/cacheset.cc:499

 #, c-format
 #, c-format

-msgid "Preparing to completely remove %s"
+msgid "Can't select candidate version from package %s as it has no candidate"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:625 apt-pkg/deb/dpkgpm.cc:650
+#: apt-pkg/cacheset.cc:507

 #, c-format
 #, c-format

-msgid "Completely removed %s"
+msgid "Can't select installed version from package %s as it is not installed"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:775 apt-pkg/deb/dpkgpm.cc:805
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+#: apt-pkg/deb/dpkgpm.cc:52
+#, c-format
+msgid "Installing %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/rred.cc:219
-msgid "Could not patch file"
+#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:823
+#, c-format
+msgid "Configuring %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
+#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:830
+#, c-format
+msgid "Removing %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:232
+#: apt-pkg/deb/dpkgpm.cc:55

 #, c-format
 #, c-format

-msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgid "Completely removing %s"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:978 apt-pkg/contrib/mmap.cc:196
-msgid "Failed to truncate file"
+#: apt-pkg/deb/dpkgpm.cc:56
+#, c-format
+msgid "Noting disappearance of %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:213 apt-pkg/contrib/mmap.cc:276
+#: apt-pkg/deb/dpkgpm.cc:57

 #, c-format
 #, c-format

-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
+msgid "Running post-installation trigger %s"

 msgstr ""
 
 msgstr ""
 

-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:335
+#. FIXME: use a better string after freeze
+#: apt-pkg/deb/dpkgpm.cc:646

 #, c-format
 #, c-format

-msgid "%lid %lih %limin %lis"
+msgid "Directory '%s' missing"

 msgstr ""
 
 msgstr ""
 

-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:342
+#: apt-pkg/deb/dpkgpm.cc:661 apt-pkg/deb/dpkgpm.cc:675

 #, c-format
 #, c-format

-msgid "%lih %limin %lis"
+msgid "Could not open file '%s'"

 msgstr ""
 
 msgstr ""
 

-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:349
+#: apt-pkg/deb/dpkgpm.cc:816

 #, c-format
 #, c-format

-msgid "%limin %lis"
+msgid "Preparing %s"

 msgstr ""
 
 msgstr ""
 

-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:354
+#: apt-pkg/deb/dpkgpm.cc:817

 #, c-format
 #, c-format

-msgid "%lis"
+msgid "Unpacking %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1244
+#: apt-pkg/deb/dpkgpm.cc:822

 #, c-format
 #, 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"
+msgid "Preparing to configure %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1253
+#: apt-pkg/deb/dpkgpm.cc:824

 #, c-format
 #, c-format

-msgid "GPG error: %s: %s"
+msgid "Installed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/deb/dpkgpm.cc:829

 #, c-format
 #, c-format

-msgid "Unable to parse Release file %s"
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/deb/dpkgpm.cc:831

 #, c-format
 #, c-format

-msgid "No sections in Release file %s"
+msgid "Removed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/deb/dpkgpm.cc:836

 #, c-format
 #, c-format

-msgid "No Hash entry in Release file %s"
+msgid "Preparing to completely remove %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:678
+#: apt-pkg/deb/dpkgpm.cc:837

 #, c-format
 #, c-format

-msgid ""
-"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
-"zu signatures\n"
+msgid "Completely removed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:51
-#, c-format
-msgid "Installing %s"
+#: apt-pkg/deb/dpkgpm.cc:1043
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:54
-#, c-format
-msgid "Running post-installation trigger %s"
+#: apt-pkg/deb/dpkgpm.cc:1074
+msgid "Running dpkg"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1011
+#: apt-pkg/deb/dpkgpm.cc:1277

 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error
 msgid "No apport report written because MaxReports is reached already"
 msgstr ""
 
 #. check if its not a follow up error

-#: apt-pkg/deb/dpkgpm.cc:1016
+#: apt-pkg/deb/dpkgpm.cc:1282

 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 
 msgid "dependency problems - leaving unconfigured"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1018
+#: apt-pkg/deb/dpkgpm.cc:1284

 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1024
+#: apt-pkg/deb/dpkgpm.cc:1290

 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:1030
+#: apt-pkg/deb/dpkgpm.cc:1296

 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr ""
 

-#: apt-pkg/deb/debsystem.cc:70
+#: apt-pkg/deb/dpkgpm.cc:1303
+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

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

-#: apt-pkg/deb/debsystem.cc:82
+#. TRANSLATORS: the %s contains the recovery command, usually
+#. dpkg --configure -a
+#: apt-pkg/deb/debsystem.cc:88
+#, c-format

 msgid ""
 msgid ""

-"dpkg was interrupted, you must manually run 'sudo 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 ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default
 msgid "Not locked"
 msgstr ""
 
 #. FIXME: fallback to a default mirror here instead
 #. and provide a config option to define that default

-#: methods/mirror.cc:172
+#: methods/mirror.cc:200

 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""
 #, c-format
 msgid "No mirror file '%s' found "
 msgstr ""

+
+#: methods/mirror.cc:343
+#, c-format
+msgid "[Mirror: %s]"
+msgstr ""
+
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rsh.cc:329
+msgid "Connection closed prematurely"
+msgstr ""