* get the mirror failure stuff really working

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 541a90df494262c2b3e59614ca79eab2b9fe4d62..39759f265854afbb381cf843c58fdd6d861ff227 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-10-17 19:31+0200\n"
+"POT-Creation-Date: 2007-02-01 12:41+0100\n"

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


@@ -15,153 +15,145 @@ 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:141
+#: cmdline/apt-cache.cc:135

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

-#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638
-#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012
-#: cmdline/apt-cache.cc:1419 cmdline/apt-cache.cc:1570
+#: 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

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

-#: cmdline/apt-cache.cc:245
+#: cmdline/apt-cache.cc:232

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:293
-msgid "Total Distinct Descriptions: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:295
+#: cmdline/apt-cache.cc:280

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

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

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

-#: cmdline/apt-cache.cc:300
-msgid "Total Desc/File relations: "
-msgstr ""
-
-#: cmdline/apt-cache.cc:302
+#: cmdline/apt-cache.cc:285

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212
+#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189

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

-#: cmdline/apt-cache.cc:1293
+#: cmdline/apt-cache.cc:1231

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

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

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

-#: cmdline/apt-cache.cc:1524
+#: cmdline/apt-cache.cc:1462

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

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

 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:1532
+#: cmdline/apt-cache.cc:1470

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70

 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550

-#: cmdline/apt-get.cc:2325 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144

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

-#: cmdline/apt-cache.cc:1720
+#: cmdline/apt-cache.cc:1659

 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"


@@ -200,6 +192,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 ""


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

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


@@ -323,115 +327,126 @@ msgstr ""
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 

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

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

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

 #, 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:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

 #, 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:83
+#: ftparchive/writer.cc:84

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

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

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

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

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

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

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

-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, 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 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr ""
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390

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

-#: ftparchive/writer.cc:394 ftparchive/writer.cc:602
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613

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

-#: ftparchive/writer.cc:437 ftparchive/writer.cc:688
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701

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

+#: ftparchive/writer.cc:623
+#, c-format
+msgid "  %s has no source override entry\n"
+msgstr ""
+
+#: ftparchive/writer.cc:627
+#, 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"
 #: ftparchive/contents.cc:317
 #, c-format
 msgid "Internal error, could not locate member %s"


@@ -527,221 +542,221 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
 msgid "Failed to rename %s to %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120

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

-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506

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

 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:327

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

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

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

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

 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:341

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

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

 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:346

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

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

 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:401

 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:423

 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:444

 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:465

 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:485

 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:538

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 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:660

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

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

 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:667

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

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

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

-#: cmdline/apt-get.cc:691
+#: cmdline/apt-get.cc:693

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

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

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

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

 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:856
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858

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

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

-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:764

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

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

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

-#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851

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

-#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135

 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr ""
 
 #: apt-pkg/cachefile.cc:67
 msgid "The list of sources could not be read."
 msgstr ""
 

-#: cmdline/apt-get.cc:814
+#: cmdline/apt-get.cc:816

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

-#: cmdline/apt-get.cc:819
+#: cmdline/apt-get.cc:821

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

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

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

-#: cmdline/apt-get.cc:830
+#: cmdline/apt-get.cc:832

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

-#: cmdline/apt-get.cc:844 cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989

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

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

 #, 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:862 cmdline/apt-get.cc:882
+#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884

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

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

-#: cmdline/apt-get.cc:866
+#: cmdline/apt-get.cc:868

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


@@ -749,74 +764,74 @@ msgid ""
 " ?] "
 msgstr ""
 
 " ?] "
 msgstr ""
 

-#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893

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

-#: cmdline/apt-get.cc:887
+#: cmdline/apt-get.cc:889

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

-#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032

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

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

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

-#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1084
+#: cmdline/apt-get.cc:1086

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

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

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


@@ -824,79 +839,79 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
 "is only available from another source\n"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1297 cmdline/apt-get.cc:1391
+#: cmdline/apt-get.cc:1326

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

-#: cmdline/apt-get.cc:1355
+#: cmdline/apt-get.cc:1384

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

-#: cmdline/apt-get.cc:1374
+#: cmdline/apt-get.cc:1403

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

-#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529

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

-#: cmdline/apt-get.cc:1496
+#: cmdline/apt-get.cc:1516

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

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

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

 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"


@@ -904,158 +919,163 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1549
+#: cmdline/apt-get.cc:1569

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

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

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

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

-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1603

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

-#: cmdline/apt-get.cc:1654
+#: cmdline/apt-get.cc:1692

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

-#: cmdline/apt-get.cc:1655
+#: cmdline/apt-get.cc:1693

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

-#: cmdline/apt-get.cc:1675
+#: cmdline/apt-get.cc:1713

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

-#: cmdline/apt-get.cc:1678 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:100

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

-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1721

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

-#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794

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

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

 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:1883 cmdline/apt-get.cc:2091
+#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153

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

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

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

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

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

-#: cmdline/apt-get.cc:1975
+#: cmdline/apt-get.cc:2037

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

-#: cmdline/apt-get.cc:2003
+#: cmdline/apt-get.cc:2065

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

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

-#: cmdline/apt-get.cc:2016
+#: cmdline/apt-get.cc:2078

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

-#: cmdline/apt-get.cc:2033
+#: cmdline/apt-get.cc:2095

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

-#: cmdline/apt-get.cc:2052
+#: cmdline/apt-get.cc:2114

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

-#: cmdline/apt-get.cc:2068
+#: cmdline/apt-get.cc:2130

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

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

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

-#: cmdline/apt-get.cc:2168
+#: cmdline/apt-get.cc:2230

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

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

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

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

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

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

-#: cmdline/apt-get.cc:2330
+#: cmdline/apt-get.cc:2392

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

-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2433

 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"


@@ -1183,19 +1203,19 @@ msgstr ""
 msgid "Failed to create pipes"
 msgstr ""
 
 msgid "Failed to create pipes"
 msgstr ""
 

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

 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:181 apt-inst/contrib/extracttar.cc:207

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

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

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

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

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


@@ -1256,7 +1276,7 @@ msgstr ""
 msgid "Failed to write file %s"
 msgstr ""
 
 msgid "Failed to write file %s"
 msgstr ""
 

-#: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
+#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104

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


@@ -1309,7 +1329,8 @@ msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
 msgstr ""
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750

-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 methods/mirror.cc:96

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


@@ -1339,9 +1360,9 @@ msgid "The info and temp directories need to be on the same filesystem"
 msgstr ""
 
 #. Build the status cache
 msgstr ""
 
 #. Build the status cache

-#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945
+#: apt-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"
 msgstr ""
 
 msgid "Reading package lists"
 msgstr ""
 


@@ -1355,7 +1376,7 @@ msgstr ""
 msgid "Internal error getting a package name"
 msgstr ""
 
 msgid "Internal error getting a package name"
 msgstr ""
 

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

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


@@ -1399,10 +1420,6 @@ msgstr ""
 msgid "The pkg cache must be initialized first"
 msgstr ""
 
 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
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgid "Failed to find a Package: header, offset %lu"


@@ -1473,13 +1490,12 @@ msgstr ""
 msgid "File not found"
 msgstr ""
 
 msgid "File not found"
 msgstr ""
 

-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150

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

-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-#: methods/rred.cc:240
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147

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


@@ -1605,7 +1621,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:864 methods/http.cc:921 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303

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


@@ -1628,183 +1644,184 @@ 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:65

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

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

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

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

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

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

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

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

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

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

-#: methods/connect.cc:165
+#: methods/connect.cc:166

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

-#: methods/connect.cc:171
+#: methods/connect.cc:172

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

-#: methods/connect.cc:174
+#: methods/connect.cc:175

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

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

-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr ""
+
+#: methods/gpgv.cc:100

 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 

-#: methods/gpgv.cc:191
+#: methods/gpgv.cc:204

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

-#: methods/gpgv.cc:196
+#: methods/gpgv.cc:209

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

-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr ""
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218

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

-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249

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

-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256

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

-#: methods/gzip.cc:57
+#: 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:345
+#: methods/http.cc:375

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

-#: methods/http.cc:491
+#: methods/http.cc:521

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

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

-#: methods/http.cc:518 methods/http.cc:525
+#: methods/http.cc:548 methods/http.cc:555

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

-#: methods/http.cc:554
+#: methods/http.cc:584

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

-#: methods/http.cc:569
+#: methods/http.cc:599

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

-#: methods/http.cc:571
+#: methods/http.cc:601

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

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

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

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

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

-#: methods/http.cc:747
+#: methods/http.cc:777

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

-#: methods/http.cc:770
+#: methods/http.cc:800

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

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

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

-#: methods/http.cc:823
+#: methods/http.cc:859

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

-#: methods/http.cc:837
+#: methods/http.cc:873

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

-#: methods/http.cc:839
+#: methods/http.cc:875

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

-#: methods/http.cc:1070
+#: methods/http.cc:1106

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

-#: methods/http.cc:1087
+#: methods/http.cc:1123

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

-#: methods/http.cc:1178
+#: methods/http.cc:1214

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


@@ -1817,7 +1834,7 @@ msgstr ""
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:984
+#: apt-pkg/contrib/strutl.cc:938

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


@@ -1938,7 +1955,8 @@ msgstr ""
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
 msgid "Unable to stat the mount point %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
+#: methods/mirror.cc:102

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


@@ -2014,143 +2032,143 @@ msgstr ""
 msgid "Problem syncing the file"
 msgstr ""
 
 msgid "Problem syncing the file"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90

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

-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62

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

-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91

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

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

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

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

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

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

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

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

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

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

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

-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:450
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426

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

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

 #, 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:252 apt-pkg/sourcelist.cc:255

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


@@ -2194,9 +2212,16 @@ msgstr ""
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 msgid "Archive directory %spartial is missing."
 msgstr ""
 

-#: apt-pkg/acquire.cc:817
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823

 #, c-format
 #, c-format

-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr ""
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"

 msgstr ""
 
 #: apt-pkg/acquire-worker.cc:113
 msgstr ""
 
 #: apt-pkg/acquire-worker.cc:113


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

-#: apt-pkg/init.cc:122
+#: apt-pkg/init.cc:121

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

-#: apt-pkg/init.cc:138
+#: apt-pkg/init.cc:137

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


@@ -2262,121 +2287,110 @@ msgstr ""
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
 msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 

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

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

-#: apt-pkg/pkgcachegen.cc:155
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc1)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:180
+#: apt-pkg/pkgcachegen.cc:150

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

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

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

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

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

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

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

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

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

-#: apt-pkg/pkgcachegen.cc:247
-#, c-format
-msgid "Error occured while processing %s (NewFileDesc2)"
-msgstr ""
-
-#: apt-pkg/pkgcachegen.cc:253
+#: apt-pkg/pkgcachegen.cc:207

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

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

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

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

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

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

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

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

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

-#: apt-pkg/pkgcachegen.cc:763
+#: apt-pkg/pkgcachegen.cc:658

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

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

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

-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/acquire-item.cc:131

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

-#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
-#: apt-pkg/acquire-item.cc:1336
+#: apt-pkg/acquire-item.cc:279 apt-pkg/acquire-item.cc:988

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

-#: apt-pkg/acquire-item.cc:1150
+#: apt-pkg/acquire-item.cc:683
+msgid "There is no public key available for the following key IDs:\n"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:796

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

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

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

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


@@ -2385,94 +2399,92 @@ msgstr ""
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:531
+#: apt-pkg/cdrom.cc:507

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

-#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598

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

-#: apt-pkg/cdrom.cc:565
+#: apt-pkg/cdrom.cc:541

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

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

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

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

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

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

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

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

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

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

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

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

 #, c-format
 #, c-format

-msgid ""
-"Found %i package indexes, %i source indexes, %i translation indexes and %i "
-"signatures\n"
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:737
+#: apt-pkg/cdrom.cc:710

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

-#: apt-pkg/cdrom.cc:753
+#: apt-pkg/cdrom.cc:726

 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "This disc is called: \n"
 "'%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:757
+#: apt-pkg/cdrom.cc:730

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

-#: apt-pkg/cdrom.cc:783
+#: apt-pkg/cdrom.cc:754

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

-#: apt-pkg/cdrom.cc:792
+#: apt-pkg/cdrom.cc:763

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

-#: apt-pkg/cdrom.cc:832
+#: apt-pkg/cdrom.cc:803

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

-#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830
+#: apt-pkg/indexcopy.cc:261

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

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

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

-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#: apt-pkg/indexcopy.cc:266

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

-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838
+#: apt-pkg/indexcopy.cc:269

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


@@ -2519,16 +2531,12 @@ msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format
 
 #: apt-pkg/deb/dpkgpm.cc:378
 #, c-format

-msgid "Preparing for remove with config %s"
+msgid "Preparing to completely remove %s"

 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format
 msgstr ""
 
 #: apt-pkg/deb/dpkgpm.cc:379
 #, c-format

-msgid "Removed with config %s"
-msgstr ""
-
-#: methods/rred.cc:219
-msgid "Could not patch file"
+msgid "Completely removed %s"

 msgstr ""
 
 #: methods/rsh.cc:330
 msgstr ""
 
 #: methods/rsh.cc:330