Re-generate PO(T) files

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 46672e159ca2a0fe3609f1e41c6b30562317f693..9c5de47a071dbee0ffabcaa035f4ec938ea6e866 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"
-"POT-Creation-Date: 2005-08-19 11:53+0200\n"
+"POT-Creation-Date: 2007-07-06 07:19+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"
@@ -15,145 +15,153 @@ msgstr ""
 "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 ""
 
-#: 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 ""
 
-#: cmdline/apt-cache.cc:232
+#: cmdline/apt-cache.cc:247
 msgid "Total package names : "
 msgstr ""
 
-#: cmdline/apt-cache.cc:272
+#: cmdline/apt-cache.cc:287
 msgid "  Normal packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:273
+#: cmdline/apt-cache.cc:288
 msgid "  Pure virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:274
+#: cmdline/apt-cache.cc:289
 msgid "  Single virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:275
+#: cmdline/apt-cache.cc:290
 msgid "  Mixed virtual packages: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:276
+#: cmdline/apt-cache.cc:291
 msgid "  Missing: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:278
+#: cmdline/apt-cache.cc:293
 msgid "Total distinct versions: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:280
+#: cmdline/apt-cache.cc:295
+msgid "Total Distinct Descriptions: "
+msgstr ""
+
+#: cmdline/apt-cache.cc:297
 msgid "Total dependencies: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:283
+#: cmdline/apt-cache.cc:300
 msgid "Total ver/file relations: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:285
+#: cmdline/apt-cache.cc:302
+msgid "Total Desc/File relations: "
+msgstr ""
+
+#: cmdline/apt-cache.cc:304
 msgid "Total Provides mappings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:297
+#: cmdline/apt-cache.cc:316
 msgid "Total globbed strings: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:311
+#: cmdline/apt-cache.cc:330
 msgid "Total dependency version space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:316
+#: cmdline/apt-cache.cc:335
 msgid "Total slack space: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:324
+#: cmdline/apt-cache.cc:343
 msgid "Total space accounted for: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:471 cmdline/apt-cache.cc:1218
 #, 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 ""
 
-#: cmdline/apt-cache.cc:1385
+#: cmdline/apt-cache.cc:1447
 msgid "No packages found"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1462
+#: cmdline/apt-cache.cc:1524
 msgid "Package files:"
 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 ""
 
-#: cmdline/apt-cache.cc:1470
+#: cmdline/apt-cache.cc:1532
 #, c-format
 msgid "%4i %s\n"
 msgstr ""
 
 #. Show any packages have explicit pins
-#: cmdline/apt-cache.cc:1482
+#: cmdline/apt-cache.cc:1544
 msgid "Pinned packages:"
 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
-#: cmdline/apt-cache.cc:1515
+#: cmdline/apt-cache.cc:1577
 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
-#: cmdline/apt-cache.cc:1522
+#: cmdline/apt-cache.cc:1584
 msgid "  Candidate: "
 msgstr ""
 
-#: cmdline/apt-cache.cc:1532
+#: cmdline/apt-cache.cc:1594
 msgid "  Package pin: "
 msgstr ""
 
 #. Show the priority tables
-#: cmdline/apt-cache.cc:1541
+#: cmdline/apt-cache.cc:1603
 msgid "  Version table:"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1556
+#: cmdline/apt-cache.cc:1618
 #, c-format
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2322 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:2584 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 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"
@@ -192,6 +200,18 @@ msgid ""
 "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 ""
@@ -231,7 +251,7 @@ msgid ""
 "  -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 ""
@@ -240,31 +260,31 @@ 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 ""
 
-#: 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
 msgid "Error processing directory %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:250
+#: ftparchive/apt-ftparchive.cc:251
 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 ""
 
-#: ftparchive/apt-ftparchive.cc:397
+#: ftparchive/apt-ftparchive.cc:398
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:551
+#: ftparchive/apt-ftparchive.cc:553
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -306,124 +326,135 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:757
+#: ftparchive/apt-ftparchive.cc:759
 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 ""
 
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:43
 #, 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 ""
 
-#: 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 ""
 
-#: 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 methods/gpgv.cc:272
 #, c-format
-msgid "File date has changed %s"
+msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:238
 msgid "Archive has no control record"
 msgstr ""
 
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:444
 msgid "Unable to get a cursor"
 msgstr ""
 
-#: ftparchive/writer.cc:79
+#: ftparchive/writer.cc:75
 #, c-format
 msgid "W: Unable to read directory %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:84
+#: ftparchive/writer.cc:80
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:126
+#: ftparchive/writer.cc:131
 msgid "E: "
 msgstr ""
 
-#: ftparchive/writer.cc:128
+#: ftparchive/writer.cc:133
 msgid "W: "
 msgstr ""
 
-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:140
 msgid "E: Errors apply to file "
 msgstr ""
 
-#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
+#: ftparchive/writer.cc:157 ftparchive/writer.cc:187
 #, c-format
 msgid "Failed to resolve %s"
 msgstr ""
 
-#: ftparchive/writer.cc:164
+#: ftparchive/writer.cc:169
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:189
+#: ftparchive/writer.cc:194
 #, c-format
 msgid "Failed to open %s"
 msgstr ""
 
-#: ftparchive/writer.cc:246
+#: ftparchive/writer.cc:253
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:261
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:258
+#: ftparchive/writer.cc:265
 #, c-format
 msgid "Failed to unlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:265
+#: ftparchive/writer.cc:272
 #, c-format
 msgid "*** Failed to link %s to %s"
 msgstr ""
 
-#: ftparchive/writer.cc:275
+#: ftparchive/writer.cc:282
 #, 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 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/writer.cc:378
+#: ftparchive/writer.cc:386
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:609
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
+#: ftparchive/writer.cc:439 ftparchive/writer.cc:697
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
+#: ftparchive/writer.cc:619
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:623
+#, c-format
+msgid "  %s has no binary override entry either\n"
+msgstr ""
+
 #: ftparchive/contents.cc:317
 #, c-format
 msgid "Internal error, could not locate member %s"
@@ -433,286 +464,307 @@ 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: ftparchive/multicompress.cc:75
+#: ftparchive/multicompress.cc:71
 #, c-format
 msgid "Unknown compression algorithm '%s'"
 msgstr ""
 
-#: ftparchive/multicompress.cc:105
+#: ftparchive/multicompress.cc:101
 #, c-format
 msgid "Compressed output %s needs a compression set"
 msgstr ""
 
-#: ftparchive/multicompress.cc:172 methods/rsh.cc:91
+#: ftparchive/multicompress.cc:168 methods/rsh.cc:91
 msgid "Failed to create IPC pipe to subprocess"
 msgstr ""
 
-#: ftparchive/multicompress.cc:198
+#: ftparchive/multicompress.cc:194
 msgid "Failed to create FILE*"
 msgstr ""
 
-#: ftparchive/multicompress.cc:201
+#: ftparchive/multicompress.cc:197
 msgid "Failed to fork"
 msgstr ""
 
-#: ftparchive/multicompress.cc:215
+#: ftparchive/multicompress.cc:211
 msgid "Compress child"
 msgstr ""
 
-#: ftparchive/multicompress.cc:238
+#: ftparchive/multicompress.cc:234
 #, c-format
 msgid "Internal error, failed to create %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:289
+#: ftparchive/multicompress.cc:285
 msgid "Failed to create subprocess IPC"
 msgstr ""
 
-#: ftparchive/multicompress.cc:324
+#: ftparchive/multicompress.cc:320
 msgid "Failed to exec compressor "
 msgstr ""
 
-#: ftparchive/multicompress.cc:363
+#: ftparchive/multicompress.cc:359
 msgid "decompressor"
 msgstr ""
 
-#: ftparchive/multicompress.cc:406
+#: ftparchive/multicompress.cc:402
 msgid "IO to subprocess/file failed"
 msgstr ""
 
-#: ftparchive/multicompress.cc:458
+#: ftparchive/multicompress.cc:454
 msgid "Failed to read while computing MD5"
 msgstr ""
 
-#: ftparchive/multicompress.cc:475
+#: ftparchive/multicompress.cc:471
 #, c-format
 msgid "Problem unlinking %s"
 msgstr ""
 
-#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188
+#: ftparchive/multicompress.cc:486 apt-inst/extract.cc:185
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:121
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
+#: cmdline/apt-get.cc:143 cmdline/apt-get.cc:1672
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:235
+#: cmdline/apt-get.cc:238
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:328
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:327
+#: cmdline/apt-get.cc:330
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:337
 msgid "but it is not installable"
 msgstr ""
 
-#: cmdline/apt-get.cc:336
+#: cmdline/apt-get.cc:339
 msgid "but it is a virtual package"
 msgstr ""
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
 msgid "but it is not installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:342
 msgid "but it is not going to be installed"
 msgstr ""
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:347
 msgid " or"
 msgstr ""
 
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:376
 msgid "The following NEW packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:399
+#: cmdline/apt-get.cc:402
 msgid "The following packages will be REMOVED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:424
 msgid "The following packages have been kept back:"
 msgstr ""
 
-#: cmdline/apt-get.cc:442
+#: cmdline/apt-get.cc:445
 msgid "The following packages will be upgraded:"
 msgstr ""
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:466
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
-#: cmdline/apt-get.cc:483
+#: cmdline/apt-get.cc:486
 msgid "The following held packages will be changed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:539
 #, c-format
 msgid "%s (due to %s) "
 msgstr ""
 
-#: cmdline/apt-get.cc:544
+#: cmdline/apt-get.cc:547
 msgid ""
 "WARNING: The following essential packages will be removed.\n"
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:578
 #, c-format
 msgid "%lu upgraded, %lu newly installed, "
 msgstr ""
 
-#: cmdline/apt-get.cc:579
+#: cmdline/apt-get.cc:582
 #, c-format
 msgid "%lu reinstalled, "
 msgstr ""
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:584
 #, c-format
 msgid "%lu downgraded, "
 msgstr ""
 
-#: cmdline/apt-get.cc:583
+#: cmdline/apt-get.cc:586
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:590
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:647
+#: cmdline/apt-get.cc:664
 msgid "Correcting dependencies..."
 msgstr ""
 
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:667
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:670
 msgid "Unable to correct dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:673
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:675
 msgid " Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:662
+#: cmdline/apt-get.cc:679
 msgid "You might want to run `apt-get -f install' to correct these."
 msgstr ""
 
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:682
 msgid "Unmet dependencies. Try using -f."
 msgstr ""
 
-#: cmdline/apt-get.cc:687
+#: cmdline/apt-get.cc:704
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
-#: cmdline/apt-get.cc:698
+#: cmdline/apt-get.cc:708
+msgid "Authentication warning overridden.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:715
 msgid "Install these packages without verification [y/N]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:700
+#: cmdline/apt-get.cc:717
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+#: cmdline/apt-get.cc:726 cmdline/apt-get.cc:873
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:770
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
+#: cmdline/apt-get.cc:779
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
+#: cmdline/apt-get.cc:790
+msgid "Internal error, Ordering didn't finish"
+msgstr ""
+
+#: cmdline/apt-get.cc:806 cmdline/apt-get.cc:2010 cmdline/apt-get.cc:2043
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
-#: apt-pkg/cachefile.cc:67
+#: cmdline/apt-get.cc:816 cmdline/apt-get.cc:2091 cmdline/apt-get.cc:2332
+#: apt-pkg/cachefile.cc:63
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:818
+#: cmdline/apt-get.cc:831
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+
+#: cmdline/apt-get.cc:836
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:839
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:826
+#: cmdline/apt-get.cc:844
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:847
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:2186
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:864
 #, 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:879 cmdline/apt-get.cc:899
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:863
+#: cmdline/apt-get.cc:881
 msgid "Yes, do as I say!"
 msgstr ""
 
-#: cmdline/apt-get.cc:865
+#: cmdline/apt-get.cc:883
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -720,74 +772,74 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:889 cmdline/apt-get.cc:908
 msgid "Abort."
 msgstr ""
 
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:904
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:976 cmdline/apt-get.cc:1383 cmdline/apt-get.cc:2229
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:994
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
+#: cmdline/apt-get.cc:995 cmdline/apt-get.cc:2238
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:1001
 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:1005
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:1010
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:1011
 msgid "Aborting install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1026
+#: cmdline/apt-get.cc:1045
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1036
+#: cmdline/apt-get.cc:1055
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1054
+#: cmdline/apt-get.cc:1073
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:1084
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1096
 msgid " [Installed]"
 msgstr ""
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1101
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1087
+#: cmdline/apt-get.cc:1106
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -795,79 +847,117 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1125
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1128
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1129
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1137
+#: cmdline/apt-get.cc:1156
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1185
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1187
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1172
+#: cmdline/apt-get.cc:1193
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1282
+#: cmdline/apt-get.cc:1330
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1343
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1353
+#: cmdline/apt-get.cc:1410 cmdline/apt-get.cc:1412
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1433
+msgid "We are not supposed to delete stuff, can't start AutoRemover"
+msgstr ""
+
+#: cmdline/apt-get.cc:1465
+msgid ""
+"The following packages were automatically installed and are no longer "
+"required:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1467
+msgid "Use 'apt-get autoremove' to remove them."
+msgstr ""
+
+#: cmdline/apt-get.cc:1472
+msgid ""
+"Hmm, seems like the AutoRemover destroyed something which really\n"
+"shouldn't happen. Please file a bug report against apt."
+msgstr ""
+
+#: cmdline/apt-get.cc:1475 cmdline/apt-get.cc:1753
+msgid "The following information may help to resolve the situation:"
+msgstr ""
+
+#: cmdline/apt-get.cc:1479
+msgid "Internal Error, AutoRemover broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1498
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
+#: cmdline/apt-get.cc:1544
+#, c-format
+msgid "Couldn't find task %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:1659 cmdline/apt-get.cc:1695
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1494
+#: cmdline/apt-get.cc:1682
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1524
+#: cmdline/apt-get.cc:1712
+#, c-format
+msgid "%s set to manual installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1725
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1728
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1740
 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 +965,159 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1748
 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:1552
-msgid "The following information may help to resolve the situation:"
-msgstr ""
-
-#: cmdline/apt-get.cc:1555
+#: cmdline/apt-get.cc:1756
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1785
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1874
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1875
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1673
+#: cmdline/apt-get.cc:1903
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1906 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1911
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1978 cmdline/apt-get.cc:1986
+msgid "Internal error, problem resolver broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:2086
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:2116 cmdline/apt-get.cc:2350
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1928
+#: cmdline/apt-get.cc:2165
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2189
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:2194
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:2197
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1942
+#: cmdline/apt-get.cc:2203
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:2234
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:2262
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2013
+#: cmdline/apt-get.cc:2274
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2275
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2292
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2311
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:2327
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:2355
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2113
+#: cmdline/apt-get.cc:2375
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2427
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2479
 #, 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:2252
+#: cmdline/apt-get.cc:2514
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2539
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2553
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2295
+#: cmdline/apt-get.cc:2557
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2589
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2368
+#: cmdline/apt-get.cc:2630
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1032,6 +1132,7 @@ msgid ""
 "   upgrade - Perform an upgrade\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove 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"
@@ -1141,187 +1242,188 @@ msgstr ""
 msgid "Merging available information"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:117
+#: apt-inst/contrib/extracttar.cc:114
 msgid "Failed to create pipes"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:141
 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 ""
 
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:193
 msgid "Tar checksum failed, archive corrupted"
 msgstr ""
 
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:296
 #, 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 ""
 
-#: apt-inst/contrib/arfile.cc:81
+#: apt-inst/contrib/arfile.cc:78
 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 ""
 
-#: apt-inst/contrib/arfile.cc:131
+#: apt-inst/contrib/arfile.cc:128
 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 ""
 
-#: apt-inst/filelist.cc:384
+#: apt-inst/filelist.cc:380
 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 ""
 
-#: apt-inst/filelist.cc:463
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:468
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr ""
 
-#: apt-inst/filelist.cc:481
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr ""
 
-#: apt-inst/filelist.cc:510
+#: apt-inst/filelist.cc:506
 #, 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 ""
 
-#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
 #, c-format
 msgid "Failed to write file %s"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: apt-inst/extract.cc:127
+#: apt-inst/extract.cc:124
 #, 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 ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: apt-inst/extract.cc:243
+#: apt-inst/extract.cc:240
 #, 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 ""
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:284
 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 ""
 
-#: apt-inst/extract.cc:434
+#: apt-inst/extract.cc:431
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:748
+#: 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 ""
 
-#: apt-inst/extract.cc:494
+#: apt-inst/extract.cc:491
 #, 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 ""
 
-#: 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 ""
 
-#: apt-inst/deb/dpkgdb.cc:118
+#: apt-inst/deb/dpkgdb.cc:114
 #, 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
-#: 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
+#: 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 ""
 
-#: apt-inst/deb/dpkgdb.cc:180
+#: apt-inst/deb/dpkgdb.cc:176
 #, c-format
 msgid "Failed to change to the admin dir %sinfo"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
-#: apt-inst/deb/dpkgdb.cc:448
+#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
+#: apt-inst/deb/dpkgdb.cc:444
 msgid "Internal error getting a package name"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
 msgid "Reading file listing"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:216
+#: apt-inst/deb/dpkgdb.cc:212
 #, c-format
 msgid ""
 "Failed to open the list file '%sinfo/%s'. If you cannot restore this file "
@@ -1329,1144 +1431,1199 @@ msgid ""
 "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 ""
 
-#: apt-inst/deb/dpkgdb.cc:266
+#: apt-inst/deb/dpkgdb.cc:262
 msgid "Internal error getting a node"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:309
+#: apt-inst/deb/dpkgdb.cc:305
 #, c-format
 msgid "Failed to open the diversions file %sdiversions"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:324
+#: apt-inst/deb/dpkgdb.cc:320
 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 ""
 
-#: apt-inst/deb/dpkgdb.cc:362
+#: apt-inst/deb/dpkgdb.cc:358
 msgid "Internal error adding a diversion"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:383
+#: apt-inst/deb/dpkgdb.cc:379
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
-#: 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
 msgid "Failed to find a Package: header, offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:465
+#: apt-inst/deb/dpkgdb.cc:461
 #, c-format
 msgid "Bad ConfFile section in the status file. Offset %lu"
 msgstr ""
 
-#: apt-inst/deb/dpkgdb.cc:470
+#: apt-inst/deb/dpkgdb.cc:466
 #, 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 ""
 
-#: apt-inst/deb/debfile.cc:52
+#: apt-inst/deb/debfile.cc:48
 #, c-format
 msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:112
+#: apt-inst/deb/debfile.cc:108
 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:138
+#: apt-inst/deb/debfile.cc:134
 msgid "Internal error, could not locate member"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:171
+#: apt-inst/deb/debfile.cc:167
 msgid "Failed to locate a valid control file"
 msgstr ""
 
-#: apt-inst/deb/debfile.cc:256
+#: apt-inst/deb/debfile.cc:252
 msgid "Unparsable control file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:82
-msgid "Can't mmap an empty file"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:87
+#: methods/cdrom.cc:114
 #, c-format
-msgid "Couldn't make mmap of %lu bytes"
+msgid "Unable to read the cdrom database %s"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:941
-#, c-format
-msgid "Selection %s not found"
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:436
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:494
+#: methods/cdrom.cc:166
 #, c-format
-msgid "Opening configuration file %s"
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:512
-#, c-format
-msgid "Line %d too long (max %d)"
+#: methods/cdrom.cc:171
+msgid "Disk not found."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:608
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:627
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150 methods/rred.cc:234 methods/rred.cc:243
+msgid "Failed to stat"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:644
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
+#: methods/rred.cc:240
+msgid "Failed to set modification time"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:684
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:691
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:704
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:154
+#: methods/ftp.cc:210
 #, c-format
-msgid "%c%s... Error!"
+msgid "USER failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:156
+#: methods/ftp.cc:217
 #, c-format
-msgid "%c%s... Done"
+msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:80
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: methods/ftp.cc:265
 #, c-format
-msgid "Command line option %s is not understood"
+msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:127
+#: methods/ftp.cc:291
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
-#, c-format
-msgid "Option %s requires an argument."
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:237
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:469 methods/rsh.cc:190
+msgid "Read error"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:268
-#, c-format
-msgid "Option '%s' is too long"
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:301
-#, c-format
-msgid "Sense %s is not understood, try true or false."
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:351
-#, c-format
-msgid "Invalid operation %s"
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:508 methods/rsh.cc:232
+msgid "Write error"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:55
-#, c-format
-msgid "Unable to stat the mount point %s"
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
-#, c-format
-msgid "Unable to change to %s"
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:190
-msgid "Failed to stat the cdrom"
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:82
-#, c-format
-msgid "Not using locking for read only lock file %s"
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:87
-#, c-format
-msgid "Could not open lock file %s"
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:105
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:109
-#, c-format
-msgid "Could not get lock %s"
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:377
-#, c-format
-msgid "Waited for %s but it wasn't there"
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:387
+#: methods/ftp.cc:789
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
+msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:390
+#: methods/ftp.cc:798
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
+msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:392
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:436
-#, c-format
-msgid "Could not open file %s"
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:471 methods/ftp.cc:338 methods/rsh.cc:190
-msgid "Read error"
+#: methods/ftp.cc:864 methods/http.cc:959 methods/rsh.cc:303
+msgid "Problem hashing file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:492
+#: methods/ftp.cc:877
 #, c-format
-msgid "read, still have %lu to read but none left"
+msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:510 methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write error"
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:522
+#: methods/ftp.cc:922
 #, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:597
-msgid "Problem closing the file"
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:603
-msgid "Problem unlinking the file"
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:614
-msgid "Problem syncing the file"
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:126
-msgid "Empty package cache"
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:132
-msgid "The package cache file is corrupted"
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:137
-msgid "The package cache file is an incompatible version"
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:142
+#: methods/connect.cc:93
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:147
-msgid "The package cache was built for a different architecture"
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:218
-msgid "Depends"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:218
-msgid "PreDepends"
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:218
-msgid "Suggests"
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
-msgid "Recommends"
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
-msgid "Conflicts"
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
-msgid "Replaces"
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:220
-msgid "Obsoletes"
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
-msgid "important"
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
-msgid "required"
+#: methods/gpgv.cc:100
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
-msgid "standard"
+#: methods/gpgv.cc:204
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:232
-msgid "optional"
+#: methods/gpgv.cc:209
+msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:232
-msgid "extra"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building dependency tree"
+#: methods/gpgv.cc:218
+msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: apt-pkg/depcache.cc:61
-msgid "Candidate versions"
+#: methods/gpgv.cc:249
+msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: apt-pkg/depcache.cc:90
-msgid "Dependency generation"
+#: methods/gpgv.cc:256
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:73
+#: methods/gzip.cc:64
 #, c-format
-msgid "Unable to parse package file %s (1)"
+msgid "Couldn't open pipe for %s"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:160
+#: methods/gzip.cc:109
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Read error from %s process"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:87
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+#: methods/http.cc:377
+msgid "Waiting for headers"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:89
+#: methods/http.cc:523
 #, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+#: methods/http.cc:531
+msgid "Bad header line"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:98
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+#: methods/http.cc:550 methods/http.cc:557
+msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:105
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+#: methods/http.cc:586
+msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:156
-#, c-format
-msgid "Opening %s"
+#: methods/http.cc:601
+msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
-#, c-format
-msgid "Line %u too long in source list %s."
+#: methods/http.cc:603
+msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:187
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
+#: methods/http.cc:627
+msgid "Unknown date format"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: methods/http.cc:774
+msgid "Select failed"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
+#: methods/http.cc:779
+msgid "Connection timed out"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:402
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+#: methods/http.cc:802
+msgid "Error writing to output file"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:37
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: methods/http.cc:833
+msgid "Error writing to file"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:241
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+#: methods/http.cc:861
+msgid "Error writing to the file"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1059
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: methods/http.cc:875
+msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1061
-msgid "Unable to correct problems, you have held broken packages."
+#: methods/http.cc:877
+msgid "Error reading from server"
 msgstr ""
 
-#: apt-pkg/acquire.cc:62
-#, c-format
-msgid "Lists directory %spartial is missing."
+#: methods/http.cc:1108
+msgid "Bad header data"
 msgstr ""
 
-#: apt-pkg/acquire.cc:66
-#, c-format
-msgid "Archive directory %spartial is missing."
+#: methods/http.cc:1125
+msgid "Connection failed"
 msgstr ""
 
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+#: methods/http.cc:1216
+msgid "Internal error"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:113 apt-pkg/acquire-worker.cc:112
-#, c-format
-msgid "The method driver %s could not be found."
+#: apt-pkg/contrib/mmap.cc:78
+msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:162 apt-pkg/acquire-worker.cc:161
+#: apt-pkg/contrib/mmap.cc:83
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/contrib/strutl.cc:978
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/init.cc:119
+#: apt-pkg/contrib/configuration.cc:434
 #, c-format
-msgid "Packaging system '%s' is not supported"
-msgstr ""
-
-#: apt-pkg/init.cc:135
-msgid "Unable to determine a suitable packaging system type"
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/contrib/configuration.cc:492
 #, c-format
-msgid "Unable to stat %s."
+msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:48
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/contrib/configuration.cc:510
+#, c-format
+msgid "Line %d too long (max %lu)"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:73
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/contrib/configuration.cc:606
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/cachefile.cc:77
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/contrib/configuration.cc:625
+#, c-format
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/policy.cc:269
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/contrib/configuration.cc:642
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/policy.cc:291
+#: apt-pkg/contrib/configuration.cc:682
 #, c-format
-msgid "Did not understand pin type %s"
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/policy.cc:299
-msgid "No priority (or zero) specified for pin"
+#: apt-pkg/contrib/configuration.cc:689
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:74
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/contrib/configuration.cc:693 apt-pkg/contrib/configuration.cc:698
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/contrib/configuration.cc:702
 #, c-format
-msgid "Error occurred while processing %s (NewPackage)"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/contrib/configuration.cc:736
 #, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/contrib/progress.cc:152
 #, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
+msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/contrib/progress.cc:154
 #, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
+msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/contrib/cmndline.cc:77
 #, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
+#: apt-pkg/contrib/cmndline.cc:119
 #, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/contrib/cmndline.cc:124
 #, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:207
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184
+#, c-format
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:210
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: 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 ""
 
-#: apt-pkg/pkgcachegen.cc:213
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/contrib/cmndline.cc:234
+#, c-format
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/contrib/cmndline.cc:265
 #, c-format
-msgid "Error occurred while processing %s (FindPkg)"
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/contrib/cmndline.cc:298
 #, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
+#: apt-pkg/contrib/cmndline.cc:348
 #, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/contrib/cdromutl.cc:52
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:658
-msgid "Collecting File Provides"
+#: 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 ""
 
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
-msgid "IO Error saving source cache"
+#: apt-pkg/contrib/cdromutl.cc:187
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/contrib/fileutl.cc:80
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:618 apt-pkg/acquire-item.cc:1290
-#: apt-pkg/acquire-item.cc:553 apt-pkg/acquire-item.cc:1218
-msgid "MD5Sum mismatch"
+#: apt-pkg/contrib/fileutl.cc:85
+#, c-format
+msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1104 apt-pkg/acquire-item.cc:1032
+#: apt-pkg/contrib/fileutl.cc:103
 #, 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)"
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1157 apt-pkg/acquire-item.cc:1085
+#: apt-pkg/contrib/fileutl.cc:107
 #, c-format
-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1193 apt-pkg/acquire-item.cc:1121
+#: apt-pkg/contrib/fileutl.cc:375
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1280 apt-pkg/acquire-item.cc:1208
-msgid "Size mismatch"
+#: apt-pkg/contrib/fileutl.cc:385
+#, c-format
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:66
+#: apt-pkg/contrib/fileutl.cc:388
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:507 apt-pkg/cdrom.cc:504
+#: apt-pkg/contrib/fileutl.cc:390
 #, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
+msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 apt-pkg/cdrom.cc:513
-#: apt-pkg/cdrom.cc:595
-msgid "Identifying.. "
+#: apt-pkg/contrib/fileutl.cc:434
+#, c-format
+msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:538
+#: apt-pkg/contrib/fileutl.cc:490
 #, c-format
-msgid "Stored label: %s \n"
+msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:561 apt-pkg/cdrom.cc:558
+#: apt-pkg/contrib/fileutl.cc:520
 #, c-format
-msgid "Using CD-ROM mount point %s\n"
+msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:579 apt-pkg/cdrom.cc:576
-msgid "Unmounting CD-ROM\n"
+#: apt-pkg/contrib/fileutl.cc:595
+msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:583 apt-pkg/cdrom.cc:580
-msgid "Waiting for disc...\n"
+#: apt-pkg/contrib/fileutl.cc:601
+msgid "Problem unlinking the file"
 msgstr ""
 
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591 apt-pkg/cdrom.cc:588
-msgid "Mounting CD-ROM...\n"
+#: apt-pkg/contrib/fileutl.cc:612
+msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:609 apt-pkg/cdrom.cc:606
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/pkgcache.cc:132
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:647 apt-pkg/cdrom.cc:644
-#, c-format
-msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+#: apt-pkg/pkgcache.cc:138
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:704 apt-pkg/cdrom.cc:701
-msgid "That is not a valid name, try again.\n"
+#: apt-pkg/pkgcache.cc:143
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:720 apt-pkg/cdrom.cc:717
+#: apt-pkg/pkgcache.cc:148
 #, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:724 apt-pkg/cdrom.cc:721
-msgid "Copying package lists..."
+#: apt-pkg/pkgcache.cc:153
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:748 apt-pkg/cdrom.cc:745
-msgid "Writing new source list\n"
+#: apt-pkg/pkgcache.cc:224
+msgid "Depends"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:757 apt-pkg/cdrom.cc:754
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/pkgcache.cc:224
+msgid "PreDepends"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:791 apt-pkg/cdrom.cc:788
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/pkgcache.cc:224
+msgid "Suggests"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:261
-#, c-format
-msgid "Wrote %i records.\n"
+#: apt-pkg/pkgcache.cc:225
+msgid "Recommends"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
+#: apt-pkg/pkgcache.cc:225
+msgid "Conflicts"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:266
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+#: apt-pkg/pkgcache.cc:225
+msgid "Replaces"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:269
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+#: apt-pkg/pkgcache.cc:226
+msgid "Obsoletes"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:358
-#, c-format
-msgid "Preparing %s"
+#: apt-pkg/pkgcache.cc:226
+msgid "Breaks"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:359
-#, c-format
-msgid "Unpacking %s"
+#: apt-pkg/pkgcache.cc:237
+msgid "important"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:364
-#, c-format
-msgid "Preparing to configure %s"
+#: apt-pkg/pkgcache.cc:237
+msgid "required"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:237
+msgid "standard"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
+msgid "optional"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238
+msgid "extra"
+msgstr ""
+
+#: apt-pkg/depcache.cc:100 apt-pkg/depcache.cc:129
+msgid "Building dependency tree"
+msgstr ""
+
+#: apt-pkg/depcache.cc:101
+msgid "Candidate versions"
+msgstr ""
+
+#: apt-pkg/depcache.cc:130
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:365
+#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:170 apt-pkg/depcache.cc:174
+msgid "Reading state information"
+msgstr ""
+
+#: apt-pkg/depcache.cc:198
 #, c-format
-msgid "Configuring %s"
+msgid "Failed to open StateFile %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:366
+#: apt-pkg/depcache.cc:204
 #, c-format
-msgid "Installed %s"
+msgid "Failed to write temporary StateFile %s"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:371
+#: apt-pkg/tagfile.cc:102
 #, c-format
-msgid "Preparing for removal of %s"
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:372
+#: apt-pkg/tagfile.cc:189
 #, c-format
-msgid "Removing %s"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:373
+#: apt-pkg/sourcelist.cc:90
 #, c-format
-msgid "Removed %s"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:378
+#: apt-pkg/sourcelist.cc:92
 #, c-format
-msgid "Preparing for remove with config %s"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:379
+#: apt-pkg/sourcelist.cc:95
 #, c-format
-msgid "Removed with config %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: methods/cdrom.cc:113
+#: apt-pkg/sourcelist.cc:101
 #, c-format
-msgid "Unable to read the cdrom database %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: methods/cdrom.cc:122
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
+#: apt-pkg/sourcelist.cc:108
+#, c-format
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD-ROM"
+#: apt-pkg/sourcelist.cc:199
+#, c-format
+msgid "Opening %s"
 msgstr ""
 
-#: methods/cdrom.cc:163
+#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448
 #, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
-msgid "File not found"
+#: apt-pkg/sourcelist.cc:236
+#, c-format
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142
-msgid "Failed to stat"
+#: apt-pkg/sourcelist.cc:240
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-msgid "Failed to set modification time"
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 
-#: methods/file.cc:42
-msgid "Invalid URI, local URIS must not start with //"
+#: apt-pkg/packagemanager.cc:399
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
-msgid "Logging in"
+#: apt-pkg/pkgrecords.cc:32
+#, c-format
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#: methods/ftp.cc:168
-msgid "Unable to determine the peer name"
+#: 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 ""
 
-#: methods/ftp.cc:173
-msgid "Unable to determine the local name"
+#: apt-pkg/algorithms.cc:1103
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: apt-pkg/algorithms.cc:1105
+msgid "Unable to correct problems, you have held broken packages."
+msgstr ""
+
+#: apt-pkg/acquire.cc:59
 #, c-format
-msgid "The server refused the connection and said: %s"
+msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: methods/ftp.cc:210
+#: apt-pkg/acquire.cc:63
 #, c-format
-msgid "USER failed, server said: %s"
+msgid "Archive directory %spartial is missing."
 msgstr ""
 
-#: methods/ftp.cc:217
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:827
 #, c-format
-msgid "PASS failed, server said: %s"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: methods/ftp.cc:237
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+#: apt-pkg/acquire.cc:829
+#, c-format
+msgid "Retrieving file %li of %li"
 msgstr ""
 
-#: methods/ftp.cc:265
+#: apt-pkg/acquire-worker.cc:110
 #, c-format
-msgid "Login script command '%s' failed, server said: %s"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: methods/ftp.cc:291
+#: apt-pkg/acquire-worker.cc:159
 #, c-format
-msgid "TYPE failed, server said: %s"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
+#: apt-pkg/acquire-worker.cc:381
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: methods/ftp.cc:335
-msgid "Server closed the connection"
+#: apt-pkg/init.cc:126
+#, c-format
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: methods/ftp.cc:345 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
+#: apt-pkg/init.cc:142
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: methods/ftp.cc:362 methods/ftp.cc:374
-msgid "Protocol corruption"
+#: apt-pkg/clean.cc:57
+#, c-format
+msgid "Unable to stat %s."
 msgstr ""
 
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
-msgid "Could not create a socket"
+#: apt-pkg/srcrecords.cc:44
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: methods/ftp.cc:698
-msgid "Could not connect data socket, connection timed out"
+#: apt-pkg/cachefile.cc:69
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: methods/ftp.cc:704
-msgid "Could not connect passive socket."
+#: apt-pkg/cachefile.cc:73
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: methods/ftp.cc:722
-msgid "getaddrinfo was unable to get a listening socket"
+#: apt-pkg/policy.cc:267
+msgid "Invalid record in the preferences file, no Package header"
 msgstr ""
 
-#: methods/ftp.cc:736
-msgid "Could not bind a socket"
+#: apt-pkg/policy.cc:289
+#, c-format
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: methods/ftp.cc:740
-msgid "Could not listen on the socket"
+#: apt-pkg/policy.cc:297
+msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: methods/ftp.cc:747
-msgid "Could not determine the socket's name"
+#: apt-pkg/pkgcachegen.cc:72
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: methods/ftp.cc:779
-msgid "Unable to send PORT command"
+#: apt-pkg/pkgcachegen.cc:115
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: methods/ftp.cc:789
+#: apt-pkg/pkgcachegen.cc:130
 #, c-format
-msgid "Unknown address family %u (AF_*)"
+msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: methods/ftp.cc:798
+#: apt-pkg/pkgcachegen.cc:153
 #, c-format
-msgid "EPRT failed, server said: %s"
+msgid "Error occurred while processing %s (NewFileDesc1)"
 msgstr ""
 
-#: methods/ftp.cc:818
-msgid "Data socket connect timed out"
+#: apt-pkg/pkgcachegen.cc:178
+#, c-format
+msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: methods/ftp.cc:825
-msgid "Unable to accept connection"
+#: apt-pkg/pkgcachegen.cc:182
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
-msgid "Problem hashing file"
+#: apt-pkg/pkgcachegen.cc:213
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
-#: methods/ftp.cc:877
+#: apt-pkg/pkgcachegen.cc:217
 #, c-format
-msgid "Unable to fetch file, server said '%s'"
+msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: methods/ftp.cc:892 methods/rsh.cc:322
-msgid "Data socket timed out"
+#: apt-pkg/pkgcachegen.cc:221
+#, c-format
+msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
-#: methods/ftp.cc:922
+#: apt-pkg/pkgcachegen.cc:245
 #, c-format
-msgid "Data transfer failed, server said '%s'"
+msgid "Error occurred while processing %s (NewFileDesc2)"
 msgstr ""
 
-#. Get the files information
-#: methods/ftp.cc:997
-msgid "Query"
+#: apt-pkg/pkgcachegen.cc:251
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: methods/ftp.cc:1106
-msgid "Unable to invoke "
+#: apt-pkg/pkgcachegen.cc:254
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#: methods/connect.cc:64
-#, c-format
-msgid "Connecting to %s (%s)"
+#: apt-pkg/pkgcachegen.cc:257
+msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr ""
 
-#: methods/connect.cc:71
+#: apt-pkg/pkgcachegen.cc:260
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:288
 #, c-format
-msgid "[IP: %s %s]"
+msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: methods/connect.cc:80
+#: apt-pkg/pkgcachegen.cc:301
 #, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: methods/connect.cc:86
+#: apt-pkg/pkgcachegen.cc:307
 #, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: methods/connect.cc:92
+#: apt-pkg/pkgcachegen.cc:678
 #, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
+msgid "Couldn't stat source package list %s"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:763
+msgid "Collecting File Provides"
+msgstr ""
+
+#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: methods/connect.cc:104
+#: apt-pkg/acquire-item.cc:127
 #, c-format
-msgid "Could not connect to %s:%s (%s)."
+msgid "rename failed, %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
+#: apt-pkg/acquire-item.cc:406 apt-pkg/acquire-item.cc:661
+#: apt-pkg/acquire-item.cc:1411
+msgid "MD5Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1106
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1219
 #, c-format
-msgid "Connecting to %s"
+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 ""
 
-#: methods/connect.cc:163
+#: apt-pkg/acquire-item.cc:1278
 #, c-format
-msgid "Could not resolve '%s'"
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
 msgstr ""
 
-#: methods/connect.cc:167
+#: apt-pkg/acquire-item.cc:1314
 #, c-format
-msgid "Temporary failure resolving '%s'"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:1401
+msgid "Size mismatch"
 msgstr ""
 
-#: methods/connect.cc:169
+#: apt-pkg/vendorlist.cc:66
 #, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: methods/connect.cc:216
+#: apt-pkg/cdrom.cc:529
 #, c-format
-msgid "Unable to connect to %s %s:"
+msgid ""
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
 msgstr ""
 
-#: methods/gpgv.cc:92
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:620
+msgid "Identifying.. "
 msgstr ""
 
-#: methods/gpgv.cc:191
-msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+#: apt-pkg/cdrom.cc:563
+#, c-format
+msgid "Stored label: %s \n"
 msgstr ""
 
-#: methods/gpgv.cc:196
-msgid "At least one invalid signature was encountered."
+#: apt-pkg/cdrom.cc:583
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
+#: apt-pkg/cdrom.cc:601
+msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: apt-pkg/cdrom.cc:605
+msgid "Waiting for disc...\n"
 msgstr ""
 
-#: methods/gpgv.cc:206
-msgid "Unknown error executing gpgv"
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:613
+msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: methods/gpgv.cc:237
-msgid "The following signatures were invalid:\n"
+#: apt-pkg/cdrom.cc:631
+msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: methods/gpgv.cc:244
+#: apt-pkg/cdrom.cc:671
+#, c-format
 msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
+"Found %i package indexes, %i source indexes, %i translation indexes and %i "
+"signatures\n"
 msgstr ""
 
-#: methods/gzip.cc:57
+#: apt-pkg/cdrom.cc:708
 #, c-format
-msgid "Couldn't open pipe for %s"
+msgid "Found label '%s'\n"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:737
+msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: methods/gzip.cc:102
+#: apt-pkg/cdrom.cc:753
 #, c-format
-msgid "Read error from %s process"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
 msgstr ""
 
-#: methods/http.cc:381
-msgid "Waiting for headers"
+#: apt-pkg/cdrom.cc:757
+msgid "Copying package lists..."
 msgstr ""
 
-#: methods/http.cc:527
-#, c-format
-msgid "Got a single header line over %u chars"
+#: apt-pkg/cdrom.cc:783
+msgid "Writing new source list\n"
 msgstr ""
 
-#: methods/http.cc:535
-msgid "Bad header line"
+#: apt-pkg/cdrom.cc:792
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: methods/http.cc:554 methods/http.cc:561
-msgid "The HTTP server sent an invalid reply header"
+#: apt-pkg/cdrom.cc:834
+msgid "Unmounting CD-ROM...\n"
 msgstr ""
 
-#: methods/http.cc:590
-msgid "The HTTP server sent an invalid Content-Length header"
+#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#, c-format
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: methods/http.cc:605
-msgid "The HTTP server sent an invalid Content-Range header"
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: methods/http.cc:607
-msgid "This HTTP server has broken range support"
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: methods/http.cc:631
-msgid "Unknown date format"
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: methods/http.cc:778
-msgid "Select failed"
+#: apt-pkg/deb/dpkgpm.cc:355
+#, c-format
+msgid "Preparing %s"
 msgstr ""
 
-#: methods/http.cc:783
-msgid "Connection timed out"
+#: apt-pkg/deb/dpkgpm.cc:356
+#, c-format
+msgid "Unpacking %s"
 msgstr ""
 
-#: methods/http.cc:806
-msgid "Error writing to output file"
+#: apt-pkg/deb/dpkgpm.cc:361
+#, c-format
+msgid "Preparing to configure %s"
 msgstr ""
 
-#: methods/http.cc:834
-msgid "Error writing to file"
+#: apt-pkg/deb/dpkgpm.cc:362
+#, c-format
+msgid "Configuring %s"
 msgstr ""
 
-#: methods/http.cc:859
-msgid "Error writing to the file"
+#: apt-pkg/deb/dpkgpm.cc:363
+#, c-format
+msgid "Installed %s"
 msgstr ""
 
-#: methods/http.cc:873
-msgid "Error reading from server. Remote end closed connection"
+#: apt-pkg/deb/dpkgpm.cc:368
+#, c-format
+msgid "Preparing for removal of %s"
 msgstr ""
 
-#: methods/http.cc:875
-msgid "Error reading from server"
+#: apt-pkg/deb/dpkgpm.cc:369
+#, c-format
+msgid "Removing %s"
 msgstr ""
 
-#: methods/http.cc:1106
-msgid "Bad header data"
+#: apt-pkg/deb/dpkgpm.cc:370
+#, c-format
+msgid "Removed %s"
 msgstr ""
 
-#: methods/http.cc:1123
-msgid "Connection failed"
+#: apt-pkg/deb/dpkgpm.cc:375
+#, c-format
+msgid "Preparing to completely remove %s"
 msgstr ""
 
-#: methods/http.cc:1214
-msgid "Internal error"
+#: apt-pkg/deb/dpkgpm.cc:376
+#, c-format
+msgid "Completely removed %s"
+msgstr ""
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
 msgstr ""
 
 #: methods/rsh.cc:330