apt-pkg/contrib/strutl.cc: increase the size limit

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index b9148fe16048218c3af0a273fe08e6755c164073..ae7cb479566ed705a8159d2649d79489fee18857 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ 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: 2005-01-20 19:31+0100\n"
+"POT-Creation-Date: 2008-05-22 16:56+0200\n"

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


@@ -15,145 +15,153 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 

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

 #, 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:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
-#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
-#: cmdline/apt-cache.cc:1508
+#: 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"
 msgstr ""
 
 #, c-format
 msgid "Unable to locate package %s"
 msgstr ""
 

-#: cmdline/apt-cache.cc:232
-msgid "Total Package Names : "
+#: cmdline/apt-cache.cc:247
+msgid "Total package names: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:272
-msgid "  Normal Packages: "
+#: cmdline/apt-cache.cc:287
+msgid "  Normal packages: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:273
-msgid "  Pure Virtual Packages: "
+#: cmdline/apt-cache.cc:288
+msgid "  Pure virtual packages: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:274
-msgid "  Single Virtual Packages: "
+#: cmdline/apt-cache.cc:289
+msgid "  Single virtual packages: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:275
-msgid "  Mixed Virtual Packages: "
+#: cmdline/apt-cache.cc:290
+msgid "  Mixed virtual packages: "

 msgstr ""
 
 msgstr ""
 

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

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

-#: cmdline/apt-cache.cc:278
-msgid "Total Distinct Versions: "
+#: cmdline/apt-cache.cc:293
+msgid "Total distinct versions: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:280
-msgid "Total Dependencies: "
+#: cmdline/apt-cache.cc:295
+msgid "Total distinct descriptions: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:283
-msgid "Total Ver/File relations: "
+#: cmdline/apt-cache.cc:297
+msgid "Total dependencies: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:285
-msgid "Total Provides Mappings: "
+#: cmdline/apt-cache.cc:300
+msgid "Total ver/file relations: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:297
-msgid "Total Globbed Strings: "
+#: cmdline/apt-cache.cc:302
+msgid "Total Desc/File relations: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:311
-msgid "Total Dependency Version space: "
+#: cmdline/apt-cache.cc:304
+msgid "Total Provides mappings: "

 msgstr ""
 
 #: cmdline/apt-cache.cc:316
 msgstr ""
 
 #: cmdline/apt-cache.cc:316

-msgid "Total Slack space: "
+msgid "Total globbed strings: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:324
-msgid "Total Space Accounted for: "
+#: cmdline/apt-cache.cc:330
+msgid "Total dependency version space: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:335
+msgid "Total slack space: "
+msgstr ""
+
+#: cmdline/apt-cache.cc:343
+msgid "Total space accounted for: "
+msgstr ""
+
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218

 #, 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:1231
+#: cmdline/apt-cache.cc:1293

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

-#: cmdline/apt-cache.cc:1385
+#: cmdline/apt-cache.cc:1447

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

-#: cmdline/apt-cache.cc:1462
-msgid "Package Files:"
+#: cmdline/apt-cache.cc:1524
+msgid "Package files:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555
+#: cmdline/apt-cache.cc:1531 cmdline/apt-cache.cc:1617

 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 
 msgid "Cache is out of sync, can't x-ref a package file"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1470
+#: cmdline/apt-cache.cc:1532

 #, c-format
 msgid "%4i %s\n"
 msgstr ""
 
 #. Show any packages have explicit pins
 #, c-format
 msgid "%4i %s\n"
 msgstr ""
 
 #. Show any packages have explicit pins

-#: cmdline/apt-cache.cc:1482
-msgid "Pinned Packages:"
+#: cmdline/apt-cache.cc:1544
+msgid "Pinned packages:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535
+#: cmdline/apt-cache.cc:1556 cmdline/apt-cache.cc:1597

 msgid "(not found)"
 msgstr ""
 
 #. Installed version
 msgid "(not found)"
 msgstr ""
 
 #. Installed version

-#: cmdline/apt-cache.cc:1515
+#: cmdline/apt-cache.cc:1577

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

-#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525
+#: cmdline/apt-cache.cc:1579 cmdline/apt-cache.cc:1587

 msgid "(none)"
 msgstr ""
 
 #. Candidate Version
 msgid "(none)"
 msgstr ""
 
 #. Candidate Version

-#: cmdline/apt-cache.cc:1522
+#: cmdline/apt-cache.cc:1584

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

-#: cmdline/apt-cache.cc:1532
-msgid "  Package Pin: "
+#: cmdline/apt-cache.cc:1594
+msgid "  Package pin: "

 msgstr ""
 
 #. Show the priority tables
 msgstr ""
 
 #. Show the priority tables

-#: cmdline/apt-cache.cc:1541
-msgid "  Version Table:"
+#: cmdline/apt-cache.cc:1603
+msgid "  Version table:"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 
 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1714 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
+#: cmdline/apt-get.cc:2571 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:1658
+#: cmdline/apt-cache.cc:1721

 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"


@@ -192,6 +200,18 @@ 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'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+

 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr ""
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr ""


@@ -231,7 +251,7 @@ 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:710
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815

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


@@ -240,31 +260,31 @@ msgstr ""
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 

-#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337
+#: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338

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

-#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179
-#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
-#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
+#: ftparchive/apt-ftparchive.cc:166 ftparchive/apt-ftparchive.cc:180
+#: ftparchive/apt-ftparchive.cc:203 ftparchive/apt-ftparchive.cc:253
+#: ftparchive/apt-ftparchive.cc:267 ftparchive/apt-ftparchive.cc:289

 #, c-format
 #, c-format

-msgid "Error Processing directory %s"
+msgid "Error processing directory %s"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

 #, c-format
 #, c-format

-msgid "Error Processing Contents %s"
+msgid "Error processing contents %s"

 msgstr ""
 
 msgstr ""
 

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

 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"


@@ -306,488 +326,520 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 

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

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

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

 #, 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:45
+#: 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:63
+#: 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:73
+#: ftparchive/cachedb.cc:72
+msgid ""
+"DB format is invalid. If you upgraded from a older version of apt, please "
+"remove and re-create the database."
+msgstr ""
+
+#: ftparchive/cachedb.cc: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:114
+#: 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
 #, c-format

-msgid "File date has changed %s"
+msgid "Failed to stat %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:238

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

-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:444

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

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

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

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

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

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

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

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

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

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

-#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
+#: ftparchive/writer.cc:158 ftparchive/writer.cc:188

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/writer.cc:378
+#: ftparchive/writer.cc:387

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

-#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
+#: ftparchive/writer.cc:395 ftparchive/writer.cc:610

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

-#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
+#: ftparchive/writer.cc:440 ftparchive/writer.cc:698

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

-#: ftparchive/contents.cc:317
+#: ftparchive/writer.cc:620
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:624

 #, c-format
 #, c-format

-msgid "Internal Error, could not locate member %s"
+msgid "  %s has no binary override entry either\n"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/contents.cc:353 ftparchive/contents.cc:384
+#: ftparchive/contents.cc:321
+#, c-format
+msgid "Internal error, could not locate member %s"
+msgstr ""
+
+#: 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
 #, c-format

-msgid "Unknown Compresison Algorithm '%s'"
+msgid "Unknown compression algorithm '%s'"

 msgstr ""
 
 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
-msgid "Compress Child"
+#: ftparchive/multicompress.cc:212
+msgid "Compress child"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Internal Error, Failed to create %s"
+msgid "Internal error, failed to create %s"

 msgstr ""
 
 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:118
+#: cmdline/apt-get.cc:124

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

-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475
+#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651

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

-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:241

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

-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:331

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

-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:333

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:379

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

-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:405

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

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

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

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

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

-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:469

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

-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:489

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

-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:542

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

-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:550

 msgid ""
 msgid ""

-"WARNING: The following essential packages will be removed\n"
+"WARNING: The following essential packages will be removed.\n"

 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 

-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:581

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

-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:585

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

-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:587

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

-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:589

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:676

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

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

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

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

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

-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:685

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

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

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

-#: cmdline/apt-get.cc:698
-msgid "Install these packages without verification? [y/N] "
+#: cmdline/apt-get.cc:711
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:718
+msgid "Install these packages without verification [y/N]? "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:720

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

-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881

 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:762
-msgid "Packages need to be removed but Remove is disabled."
+#: cmdline/apt-get.cc:773
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
+#: cmdline/apt-get.cc:782
+msgid "Packages need to be removed but remove is disabled."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:793
+msgid "Internal error, Ordering didn't finish"
+msgstr ""
+
+#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023

 msgid "Unable to lock the download directory"
 msgstr ""
 
 msgid "Unable to lock the download directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
-#: apt-pkg/cachefile.cc:67
+#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317
+#: apt-pkg/cachefile.cc:65

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

-#: cmdline/apt-get.cc:818
+#: cmdline/apt-get.cc:834
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+
+#: cmdline/apt-get.cc:839

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

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

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

 #, 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:846
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:871

 #, 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:861 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:887 cmdline/apt-get.cc:907

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

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

-#: cmdline/apt-get.cc:865
+#: cmdline/apt-get.cc:891

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

-"You are about to do something potentially harmful\n"
+"You are about to do something potentially harmful.\n"

 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
 
 "To continue type in the phrase '%s'\n"
 " ?] "
 msgstr ""
 

-#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916

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

-#: cmdline/apt-get.cc:886
-msgid "Do you want to continue? [Y/n] "
+#: cmdline/apt-get.cc:912
+msgid "Do you want to continue [Y/n]? "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344

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

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

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

-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223

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

-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:1009

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

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

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

-#: cmdline/apt-get.cc:993
-msgid "Aborting Install."
+#: cmdline/apt-get.cc:1019
+msgid "Aborting install."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1026
+#: cmdline/apt-get.cc:1053

 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1036
+#: cmdline/apt-get.cc:1063

 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1081

 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:1092

 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1104

 msgid " [Installed]"
 msgstr ""
 
 msgid " [Installed]"
 msgstr ""
 

-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1109

 msgid "You should explicitly select one to install."
 msgstr ""
 
 msgid "You should explicitly select one to install."
 msgstr ""
 

-#: cmdline/apt-get.cc:1087
+#: cmdline/apt-get.cc:1114

 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"


@@ -795,79 +847,111 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
 "is only available from another source\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1133

 msgid "However the following packages replace it:"
 msgstr ""
 
 msgid "However the following packages replace it:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1136

 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 

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

 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 

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

 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 

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

 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 

-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1195

 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 

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

 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 

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

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

-#: cmdline/apt-get.cc:1295
+#: cmdline/apt-get.cc:1351

 msgid "Unable to lock the list directory"
 msgstr ""
 
 msgid "Unable to lock the list directory"
 msgstr ""
 

-#: cmdline/apt-get.cc:1353
+#: cmdline/apt-get.cc:1403
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1435

 msgid ""
 msgid ""

-"Some index files failed to download, they have been ignored, or old ones "
-"used instead."
+"The following packages were automatically installed and are no longer "
+"required:"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1372
-msgid "Internal Error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1437
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1442
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1449
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1468
+msgid "Internal error, AllUpgrade broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1523
+#, c-format
+msgid "Couldn't find task %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674

 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:1485
+#: cmdline/apt-get.cc:1661

 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:1692
+#, c-format
+msgid "%s set to manually installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1705

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

-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1708

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

 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"


@@ -875,149 +959,159 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

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

 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 ""
 
 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:1543
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1546
+#: cmdline/apt-get.cc:1736

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

-#: cmdline/apt-get.cc:1572
+#: cmdline/apt-get.cc:1765

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

-#: cmdline/apt-get.cc:1643
+#: cmdline/apt-get.cc:1854

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

-#: cmdline/apt-get.cc:1644
+#: cmdline/apt-get.cc:1855

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

-#: cmdline/apt-get.cc:1664
-msgid "Calculating Upgrade... "
+#: cmdline/apt-get.cc:1883
+msgid "Calculating upgrade... "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112

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

-#: cmdline/apt-get.cc:1672
+#: cmdline/apt-get.cc:1891

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

-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966
+msgid "Internal error, problem resolver broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:2066

 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:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2335

 #, 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:1919
+#: cmdline/apt-get.cc:2145
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2173

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

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

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

 #, c-format
 #, c-format

-msgid "Fetch Source %s\n"
+msgid "Fetch source %s\n"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1964
+#: cmdline/apt-get.cc:2219

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

-#: cmdline/apt-get.cc:1992
+#: cmdline/apt-get.cc:2247

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

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

-#: cmdline/apt-get.cc:2021
+#: cmdline/apt-get.cc:2260
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2277

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

-#: cmdline/apt-get.cc:2040
+#: cmdline/apt-get.cc:2296

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

-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2312

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

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

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

-#: cmdline/apt-get.cc:2156
+#: cmdline/apt-get.cc:2412

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

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

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

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

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

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

-#: cmdline/apt-get.cc:2318
-msgid "Supported Modules:"
+#: cmdline/apt-get.cc:2576
+msgid "Supported modules:"

 msgstr ""
 
 msgstr ""
 

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

 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"


@@ -1032,6 +1126,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 and purge packages\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"


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


@@ -1088,7 +1184,7 @@ msgstr ""
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""
 #: cmdline/acqprogress.cc:271
 #, c-format
 msgid ""

-"Media Change: Please insert the disc labeled\n"
+"Media change: please insert the disc labeled\n"

 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""
 " '%s'\n"
 "in the drive '%s' and press enter\n"
 msgstr ""


@@ -1115,213 +1211,218 @@ 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. I'm going to configure the"

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

-msgid "or errors caused by missing dependencies. This is OK, only the errors"
+msgid "packages that were installed. 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 ""
 
 #: dselect/update:30
 msgid ""
 "above this message are important. Please fix them and run [I]nstall again"
 msgstr ""
 
 #: dselect/update:30

-msgid "Merging Available information"
+msgid "Merging available information"

 msgstr ""
 
 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:143
+#: apt-inst/contrib/extracttar.cc:141

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

-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: 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:195
-msgid "Tar Checksum failed, archive corrupted"
+#: apt-inst/contrib/extracttar.cc:193
+msgid "Tar checksum failed, archive corrupted"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:298
+#: 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 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
-msgid "Internal Error in AddDiversion"
+#: apt-inst/filelist.cc:464
+msgid "Internal error in AddDiversion"

 msgstr ""
 
 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
 #, c-format

-msgid "Failed write file %s"
+msgid "Failed to write file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: 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:709
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
+#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
+#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34

 #, 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 ""
 
 #. Build the status cache
 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:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
-msgid "Reading Package Lists"
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
+#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
+#: apt-pkg/pkgcachegen.cc:945
+msgid "Reading package lists"

 msgstr ""
 
 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
-msgid "Internal Error getting a Package Name"
+#: 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 ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:205
-msgid "Reading File Listing"
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
+msgid "Reading file listing"

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


@@ -1329,117 +1430,118 @@ 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
-msgid "Internal Error getting a Node"
+#: apt-inst/deb/dpkgdb.cc:262
+msgid "Internal error getting a node"

 msgstr ""
 
 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
-msgid "Internal Error adding a diversion"
+#: apt-inst/deb/dpkgdb.cc:358
+msgid "Internal error adding a diversion"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:383
-msgid "The pkg cache must be initialize first"
+#: apt-inst/deb/dpkgdb.cc:379
+msgid "The pkg cache must be initialized first"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading File List"
-msgstr ""
-
-#: apt-inst/deb/dpkgdb.cc:443
+#: apt-inst/deb/dpkgdb.cc:439

 #, c-format
 #, c-format

-msgid "Failed to find a Package: Header, offset %lu"
+msgid "Failed to find a Package: header, offset %lu"

 msgstr ""
 
 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
-msgid "Internal Error, could not locate member"
+#: apt-inst/deb/debfile.cc:140
+msgid "Internal error, could not locate member"

 msgstr ""
 
 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
-msgid "Unparsible control file"
+#: apt-inst/deb/debfile.cc:258
+msgid "Unparsable control file"

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:113
+#: methods/cdrom.cc:114

 #, 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:122
+#: methods/cdrom.cc:123

 msgid ""
 msgid ""

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

 msgstr ""
 
 msgstr ""
 

-#: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD"
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"

 msgstr ""
 
 msgstr ""
 

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

 #, 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:177 methods/file.cc:77
+#: methods/cdrom.cc:171
+msgid "Disk not found."
+msgstr ""
+
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264

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

-#: methods/copy.cc:42 methods/gzip.cc:133 methods/gzip.cc:142
+#: 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 ""
 
 msgid "Failed to stat"
 msgstr ""
 

-#: methods/copy.cc:79 methods/gzip.cc:139
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240

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

-#: methods/file.cc:42
+#: methods/file.cc:44

 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 


@@ -1458,7 +1560,7 @@ msgstr ""
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
 
 #: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format

-msgid "Server refused our connection and said: %s"
+msgid "The server refused the connection and said: %s"

 msgstr ""
 
 #: methods/ftp.cc:210
 msgstr ""
 
 #: methods/ftp.cc:210


@@ -1495,7 +1597,7 @@ msgstr ""
 msgid "Server closed the connection"
 msgstr ""
 
 msgid "Server closed the connection"
 msgstr ""
 

-#: methods/ftp.cc:338 methods/rsh.cc:190 apt-pkg/contrib/fileutl.cc:452
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190

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


@@ -1507,8 +1609,8 @@ msgstr ""
 msgid "Protocol corruption"
 msgstr ""
 
 msgid "Protocol corruption"
 msgstr ""
 

-#: methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write Error"
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232
+msgid "Write error"

 msgstr ""
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
 msgstr ""
 
 #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729


@@ -1561,7 +1663,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303

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


@@ -1584,510 +1686,548 @@ msgstr ""
 msgid "Query"
 msgstr ""
 
 msgid "Query"
 msgstr ""
 

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

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

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

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

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

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

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

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

 #, 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:92
+#: methods/connect.cc:104

 #, 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:104
+#: methods/connect.cc:119

 #, 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:132 methods/rsh.cc:425
+#: methods/connect.cc:147 methods/rsh.cc:425

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

-#: methods/connect.cc:163
+#: methods/connect.cc:165 methods/connect.cc:184

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

-#: methods/connect.cc:167
+#: methods/connect.cc:190

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

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

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

-#: methods/connect.cc:216
+#: methods/connect.cc:240

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

-#: methods/gzip.cc:57
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr ""
+
+#: methods/gpgv.cc:101
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:205
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+
+#: methods/gpgv.cc:210
+msgid "At least one invalid signature was encountered."
+msgstr ""
+
+#: methods/gpgv.cc:214
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
+msgstr ""
+
+#: methods/gpgv.cc:219
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:250
+msgid "The following signatures were invalid:\n"
+msgstr ""
+
+#: methods/gpgv.cc:257
+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 ""
 
 #, c-format
 msgid "Couldn't open pipe for %s"
 msgstr ""
 

-#: methods/gzip.cc:102
+#: methods/gzip.cc:109

 #, c-format
 msgid "Read error from %s process"
 msgstr ""
 
 #, c-format
 msgid "Read error from %s process"
 msgstr ""
 

-#: methods/http.cc:344
+#: methods/http.cc:377

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

-#: methods/http.cc:490
+#: methods/http.cc:523

 #, 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:498
+#: methods/http.cc:531

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

-#: methods/http.cc:517 methods/http.cc:524
-msgid "The http server sent an invalid reply header"
+#: methods/http.cc:550 methods/http.cc:557
+msgid "The HTTP server sent an invalid reply header"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:553
-msgid "The http server sent an invalid Content-Length header"
+#: methods/http.cc:586
+msgid "The HTTP server sent an invalid Content-Length header"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:568
-msgid "The http server sent an invalid Content-Range header"
+#: methods/http.cc:601
+msgid "The HTTP server sent an invalid Content-Range header"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:570
-msgid "This http server has broken range support"
+#: methods/http.cc:603
+msgid "This HTTP server has broken range support"

 msgstr ""
 
 msgstr ""
 

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

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

-#: methods/http.cc:737
+#: methods/http.cc:774

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

-#: methods/http.cc:742
+#: methods/http.cc:779

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

-#: methods/http.cc:765
+#: methods/http.cc:802

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

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

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

-#: methods/http.cc:818
+#: methods/http.cc:861

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

-#: methods/http.cc:832
-msgid "Error reading from server Remote end closed connection"
+#: methods/http.cc:875
+msgid "Error reading from server. Remote end closed connection"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:834
+#: methods/http.cc:877

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

-#: methods/http.cc:1065
-msgid "Bad header Data"
+#: methods/http.cc:1104
+msgid "Bad header data"

 msgstr ""
 
 msgstr ""
 

-#: methods/http.cc:1082
+#: methods/http.cc:1121 methods/http.cc:1176

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

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

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

-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr ""
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:82
+#: apt-pkg/contrib/mmap.cc:80

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

-#: apt-pkg/contrib/mmap.cc:87
+#: apt-pkg/contrib/mmap.cc:85

 #, 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:941
+#: apt-pkg/contrib/strutl.cc:1014

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

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

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

-#: apt-pkg/contrib/configuration.cc:453
+#: apt-pkg/contrib/configuration.cc:497

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

-#: apt-pkg/contrib/configuration.cc:471
-#, c-format
-msgid "Line %d too long (max %d)"
-msgstr ""
-
-#: apt-pkg/contrib/configuration.cc:567
+#: apt-pkg/contrib/configuration.cc:662

 #, 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:586
+#: apt-pkg/contrib/configuration.cc:681

 #, c-format
 #, c-format

-msgid "Syntax error %s:%u: Malformed Tag"
+msgid "Syntax error %s:%u: Malformed tag"

 msgstr ""
 
 msgstr ""
 

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

 #, 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:643
+#: apt-pkg/contrib/configuration.cc:738

 #, 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:650
+#: apt-pkg/contrib/configuration.cc:745

 #, 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:654 apt-pkg/contrib/configuration.cc:659
+#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754

 #, 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:663
+#: apt-pkg/contrib/configuration.cc:758

 #, 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:697
+#: apt-pkg/contrib/configuration.cc:809

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

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

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

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

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

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

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

-#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119

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

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

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

-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184

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

-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
+#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204

 #, 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:237
+#: apt-pkg/contrib/cmndline.cc:234

 #, 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:268
+#: apt-pkg/contrib/cmndline.cc:265

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

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

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

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

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

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

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

-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:422 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/acquire.cc:424 apt-pkg/clean.cc:40

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

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

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

-#: apt-pkg/contrib/fileutl.cc:80
+#: apt-pkg/contrib/fileutl.cc:147

 #, 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:85
+#: apt-pkg/contrib/fileutl.cc:152

 #, 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:103
+#: apt-pkg/contrib/fileutl.cc:170

 #, 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:107
+#: apt-pkg/contrib/fileutl.cc:174

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

-#: apt-pkg/contrib/fileutl.cc:358
+#: apt-pkg/contrib/fileutl.cc:442

 #, c-format
 #, c-format

-msgid "Waited, for %s but it wasn't there"
+msgid "Waited for %s but it wasn't there"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:368
+#: apt-pkg/contrib/fileutl.cc:452

 #, 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:371
+#: apt-pkg/contrib/fileutl.cc:455

 #, 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:373
+#: apt-pkg/contrib/fileutl.cc:457

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

-#: apt-pkg/contrib/fileutl.cc:417
+#: apt-pkg/contrib/fileutl.cc:501

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

-#: apt-pkg/contrib/fileutl.cc:473
+#: apt-pkg/contrib/fileutl.cc:557

 #, 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:491
-msgid "Write error"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:503
+#: apt-pkg/contrib/fileutl.cc:587

 #, 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:578
+#: apt-pkg/contrib/fileutl.cc:662

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

-#: apt-pkg/contrib/fileutl.cc:584
+#: apt-pkg/contrib/fileutl.cc:668

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

-#: apt-pkg/contrib/fileutl.cc:595
+#: apt-pkg/contrib/fileutl.cc:679

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

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

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

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

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

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

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

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

 #, c-format
 #, c-format

-msgid "This APT does not support the Versioning System '%s'"
+msgid "This APT does not support the versioning system '%s'"

 msgstr ""
 
 msgstr ""
 

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

 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:218
+#: apt-pkg/pkgcache.cc:224

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/pkgcache.cc:231
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:237

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

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

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

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

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

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

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

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

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

-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building Dependency Tree"
+#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150
+msgid "Building dependency tree"
+msgstr ""
+
+#: apt-pkg/depcache.cc:122
+msgid "Candidate versions"
+msgstr ""
+
+#: apt-pkg/depcache.cc:151
+msgid "Dependency generation"
+msgstr ""
+
+#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195
+msgid "Reading state information"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:61
-msgid "Candidate Versions"
+#: apt-pkg/depcache.cc:219
+#, c-format
+msgid "Failed to open StateFile %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/depcache.cc:90
-msgid "Dependency Generation"
+#: apt-pkg/depcache.cc:225
+#, c-format
+msgid "Failed to write temporary StateFile %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:102

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

-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:189

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

-#: apt-pkg/sourcelist.cc:87
+#: apt-pkg/sourcelist.cc:90

 #, 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:89
+#: apt-pkg/sourcelist.cc:92

 #, 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:92
+#: apt-pkg/sourcelist.cc:95

 #, 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:98
+#: apt-pkg/sourcelist.cc:101

 #, c-format
 #, c-format

-msgid "Malformed line %lu in source list %s (Absolute dist)"
+msgid "Malformed line %lu in source list %s (absolute dist)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:105
+#: apt-pkg/sourcelist.cc:108

 #, 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:156
+#: apt-pkg/sourcelist.cc:199

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

-#: apt-pkg/sourcelist.cc:170
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448

 #, 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:187
+#: apt-pkg/sourcelist.cc:236

 #, 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:191
+#: apt-pkg/sourcelist.cc:240

 #, 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:199 apt-pkg/sourcelist.cc:202
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251

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

-#: apt-pkg/packagemanager.cc:402
+#: apt-pkg/packagemanager.cc:428

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


@@ -2095,195 +2235,240 @@ 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/pkgrecords.cc:37
+#: apt-pkg/pkgrecords.cc:32

 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/algorithms.cc:241
+#: apt-pkg/algorithms.cc:247

 #, 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:1059
+#: apt-pkg/algorithms.cc:1106

 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:1061
+#: apt-pkg/algorithms.cc:1108

 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:61
+#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372
+msgid ""
+"Some index files failed to download, they have been ignored, or old ones "
+"used instead."
+msgstr ""
+
+#: apt-pkg/acquire.cc:59

 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 
 #, c-format
 msgid "Lists directory %spartial is missing."
 msgstr ""
 

-#: apt-pkg/acquire.cc:65
+#: apt-pkg/acquire.cc:63

 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:112
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:827
+#, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire.cc:829
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr ""
+
+#: apt-pkg/acquire-worker.cc:110

 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:161
+#: apt-pkg/acquire-worker.cc:159

 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/init.cc:119
+#: apt-pkg/acquire-worker.cc:399
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgstr ""
+
+#: apt-pkg/init.cc:124

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

-#: apt-pkg/init.cc:135
+#: apt-pkg/init.cc:140

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

-#: apt-pkg/clean.cc:61
+#: apt-pkg/clean.cc:57

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

-#: apt-pkg/srcrecords.cc:48
+#: apt-pkg/srcrecords.cc:44

 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:73
+#: apt-pkg/cachefile.cc:71

 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:77
+#: apt-pkg/cachefile.cc:75

 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:269
+#: apt-pkg/policy.cc:267

 msgid "Invalid record in the preferences file, no Package header"
 msgstr ""
 
 msgid "Invalid record in the preferences file, no Package header"
 msgstr ""
 

-#: apt-pkg/policy.cc:291
+#: apt-pkg/policy.cc:289

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

-#: apt-pkg/policy.cc:299
+#: apt-pkg/policy.cc:297

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

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

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

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

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (NewPackage)"
+msgid "Error occurred while processing %s (NewPackage)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/pkgcachegen.cc:130

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (UsePackage1)"
+msgid "Error occurred while processing %s (UsePackage1)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/pkgcachegen.cc:153

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (UsePackage2)"
+msgid "Error occurred while processing %s (NewFileDesc1)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/pkgcachegen.cc:178

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (NewFileVer1)"
+msgid "Error occurred while processing %s (UsePackage2)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/pkgcachegen.cc:182

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (NewVersion1)"
+msgid "Error occurred while processing %s (NewFileVer1)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/pkgcachegen.cc:213

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (UsePackage3)"
+msgid "Error occurred while processing %s (NewVersion1)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/pkgcachegen.cc:217

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (NewVersion2)"
+msgid "Error occurred while processing %s (UsePackage3)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:207
+#: apt-pkg/pkgcachegen.cc:221
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:245
+#, c-format
+msgid "Error occurred while processing %s (NewFileDesc2)"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:251

 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:210
+#: apt-pkg/pkgcachegen.cc:254

 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:213
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:260

 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:241
+#: apt-pkg/pkgcachegen.cc:288

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (FindPkg)"
+msgid "Error occurred while processing %s (FindPkg)"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

-msgid "Error occured while processing %s (CollectFileProvides)"
+msgid "Error occurred while processing %s (CollectFileProvides)"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/pkgcachegen.cc:307

 #, 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:574
+#: apt-pkg/pkgcachegen.cc:678

 #, 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:658
+#: apt-pkg/pkgcachegen.cc:763

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

-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897

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

-#: apt-pkg/acquire-item.cc:126
+#: apt-pkg/acquire-item.cc:127

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

-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+#: apt-pkg/acquire-item.cc:401

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

-#: apt-pkg/acquire-item.cc:718
+#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
+msgid "Hash Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1100
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1213

 #, 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:771
+#: apt-pkg/acquire-item.cc:1272

 #, 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:807
+#: apt-pkg/acquire-item.cc:1313

 #, 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:894
+#: apt-pkg/acquire-item.cc:1400

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


@@ -2291,3 +2476,184 @@ msgstr ""
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""

+
+#: apt-pkg/cdrom.cc:529
+#, 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
+msgid "Identifying.. "
+msgstr ""
+
+#: apt-pkg/cdrom.cc:563
+#, c-format
+msgid "Stored label: %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841
+msgid "Unmounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:590
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:608
+msgid "Unmounting CD-ROM\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:612
+msgid "Waiting for disc...\n"
+msgstr ""
+
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:620
+msgid "Mounting CD-ROM...\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:638
+msgid "Scanning disc for index files..\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:678
+#, c-format
+msgid ""
+"Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
+"zu signatures\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:715
+#, c-format
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:744
+msgid "That is not a valid name, try again.\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:760
+#, c-format
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:764
+msgid "Copying package lists..."
+msgstr ""
+
+#: apt-pkg/cdrom.cc:790
+msgid "Writing new source list\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:799
+msgid "Source list entries for this disc are:\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:823
+#, c-format
+msgid "Wrote %i records.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:825
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:828
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:831
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:486
+#, c-format
+msgid "Directory '%s' missing"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:569
+#, c-format
+msgid "Preparing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:570
+#, c-format
+msgid "Unpacking %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:575
+#, c-format
+msgid "Preparing to configure %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:605
+#, c-format
+msgid "Configuring %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:578 apt-pkg/deb/dpkgpm.cc:579
+#, c-format
+msgid "Processing triggers for %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:581
+#, c-format
+msgid "Installed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:586 apt-pkg/deb/dpkgpm.cc:588
+#: apt-pkg/deb/dpkgpm.cc:589
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:591 apt-pkg/deb/dpkgpm.cc:606
+#, c-format
+msgid "Removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:592
+#, c-format
+msgid "Removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:597
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:598
+#, c-format
+msgid "Completely removed %s"
+msgstr ""
+
+#. populate the "processing" map
+#: apt-pkg/deb/dpkgpm.cc:604
+#, c-format
+msgid "Installing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:607
+#, c-format
+msgid "Triggering %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:756
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
+msgstr ""
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"
+msgstr ""