* merged with main

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index c91fca0212c39f589cdfcf5b7020167030f89470..541a90df494262c2b3e59614ca79eab2b9fe4d62 100644 (file)
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2005-01-26 18:00+0100\n"
+"POT-Creation-Date: 2005-10-17 19:31+0200\n"

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


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

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

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

-#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615
-#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357
-#: cmdline/apt-cache.cc:1508
+#: cmdline/apt-cache.cc: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

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

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

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

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:297
-msgid "Total Globbed Strings: "
+#: cmdline/apt-cache.cc:302
+msgid "Total Provides mappings: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:311
-msgid "Total Dependency Version space: "
+#: cmdline/apt-cache.cc:314
+msgid "Total globbed strings: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:316
-msgid "Total Slack space: "
+#: cmdline/apt-cache.cc:328
+msgid "Total dependency version space: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:324
-msgid "Total Space Accounted for: "
+#: cmdline/apt-cache.cc:333
+msgid "Total slack space: "

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189
+#: cmdline/apt-cache.cc:341
+msgid "Total space accounted for: "
+msgstr ""
+
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212

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

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

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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:353 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1713 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2325 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:1658
+#: cmdline/apt-cache.cc:1720

 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"


@@ -188,7 +196,7 @@ msgid ""
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"
 "  -q   Disable progress indicator.\n"
 "  -i   Show only important deps for the unmet command.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

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


@@ -209,7 +217,7 @@ msgid ""
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"
 "Options:\n"
 "  -h   This help text.\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:98
 msgstr ""
 
 #: cmdline/apt-extracttemplates.cc:98


@@ -228,10 +236,10 @@ msgid ""
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -t   Set the temp dir\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 msgstr ""
 

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

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


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

-#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341

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

-#: ftparchive/apt-ftparchive.cc:165 ftparchive/apt-ftparchive.cc:179
-#: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252
-#: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288
+#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183
+#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256
+#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"


@@ -303,14 +311,14 @@ msgid ""
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"
 "  --no-delink Enable delinking debug mode\n"
 "  --contents  Control contents file generation\n"
 "  -c=?  Read this configuration file\n"

-"  -o=?  Set an arbitary configuration option"
+"  -o=?  Set an arbitrary configuration option"

 msgstr ""
 
 msgstr ""
 

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

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

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

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


@@ -343,90 +351,90 @@ msgstr ""
 msgid "Unable to get a cursor"
 msgstr ""
 
 msgid "Unable to get a cursor"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

-#: ftparchive/writer.cc:152 ftparchive/writer.cc:182
+#: ftparchive/writer.cc:151 ftparchive/writer.cc:181

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 #, c-format
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
 #: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
 #, 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
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256

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

-#: ftparchive/writer.cc:378
+#: ftparchive/writer.cc:386

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

-#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:602

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

-#: ftparchive/writer.cc:429 ftparchive/writer.cc:677
+#: ftparchive/writer.cc:437 ftparchive/writer.cc:688

 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
 #: ftparchive/contents.cc:317
 #, c-format
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
 #: ftparchive/contents.cc:317
 #, c-format

-msgid "Internal Error, could not locate member %s"
+msgid "Internal error, could not locate member %s"

 msgstr ""
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384
 msgstr ""
 
 #: ftparchive/contents.cc:353 ftparchive/contents.cc:384


@@ -460,7 +468,7 @@ msgstr ""
 
 #: ftparchive/multicompress.cc:75
 #, c-format
 
 #: ftparchive/multicompress.cc:75
 #, c-format

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

 msgstr ""
 
 #: ftparchive/multicompress.cc:105
 msgstr ""
 
 #: ftparchive/multicompress.cc:105


@@ -481,12 +489,12 @@ msgid "Failed to fork"
 msgstr ""
 
 #: ftparchive/multicompress.cc:215
 msgstr ""
 
 #: ftparchive/multicompress.cc:215

-msgid "Compress Child"
+msgid "Compress child"

 msgstr ""
 
 #: ftparchive/multicompress.cc:238
 #, c-format
 msgstr ""
 
 #: ftparchive/multicompress.cc:238
 #, c-format

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

 msgstr ""
 
 #: ftparchive/multicompress.cc:289
 msgstr ""
 
 #: ftparchive/multicompress.cc:289


@@ -523,7 +531,7 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
 msgid "Y"
 msgstr ""
 

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

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


@@ -593,7 +601,7 @@ msgstr ""
 
 #: cmdline/apt-get.cc:544
 msgid ""
 
 #: cmdline/apt-get.cc:544
 msgid ""

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

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


@@ -654,140 +662,161 @@ msgstr ""
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 
 msgid "WARNING: The following packages cannot be authenticated!"
 msgstr ""
 

+#: cmdline/apt-get.cc:691
+msgid "Authentication warning overridden.\n"
+msgstr ""
+

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

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

 msgstr ""
 
 #: cmdline/apt-get.cc:700
 msgid "Some packages could not be authenticated"
 msgstr ""
 
 msgstr ""
 
 #: cmdline/apt-get.cc:700
 msgid "Some packages could not be authenticated"
 msgstr ""
 

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

 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
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+

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

-msgid "Packages need to be removed but Remove is disabled."
+msgid "Packages need to be removed but remove is disabled."

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802
+#: cmdline/apt-get.cc:773
+msgid "Internal error, Ordering didn't finish"
+msgstr ""
+
+#: cmdline/apt-get.cc:789 cmdline/apt-get.cc:1780 cmdline/apt-get.cc:1813

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

-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061
+#: cmdline/apt-get.cc:799 cmdline/apt-get.cc:1861 cmdline/apt-get.cc:2073

 #: 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:818
+#: cmdline/apt-get.cc:814
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+
+#: cmdline/apt-get.cc:819

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

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

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

-#: cmdline/apt-get.cc:826
+#: cmdline/apt-get.cc:827

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

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

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

-#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:862 cmdline/apt-get.cc:882

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:872 cmdline/apt-get.cc:891

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

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

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:959 cmdline/apt-get.cc:1336 cmdline/apt-get.cc:1970

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

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

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

-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:978 cmdline/apt-get.cc:1979

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

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

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

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

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

-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:993

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 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:1372
-msgid "Internal Error, AllUpgrade broke stuff"
+#: cmdline/apt-get.cc:1374
+msgid "Internal error, AllUpgrade broke stuff"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498
+#: cmdline/apt-get.cc:1473 cmdline/apt-get.cc:1509

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1530
+#: cmdline/apt-get.cc:1541

 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"


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

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

 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
 
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
 

-#: cmdline/apt-get.cc:1543
+#: cmdline/apt-get.cc:1554

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

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

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

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

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

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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

-#: cmdline/apt-get.cc:1845
+#: cmdline/apt-get.cc:1748 cmdline/apt-get.cc:1756
+msgid "Internal error, problem resolver broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1856

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

-#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079
+#: cmdline/apt-get.cc:1883 cmdline/apt-get.cc:2091

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

-#: cmdline/apt-get.cc:1919
+#: cmdline/apt-get.cc:1930

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

-#: cmdline/apt-get.cc:1924
+#: cmdline/apt-get.cc:1935

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

-#: cmdline/apt-get.cc:1927
+#: cmdline/apt-get.cc:1938

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

-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1944

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

-#: cmdline/apt-get.cc:2004
+#: cmdline/apt-get.cc:2015

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:2084
+#: cmdline/apt-get.cc:2096

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

-#: cmdline/apt-get.cc:2104
+#: cmdline/apt-get.cc:2116

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

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

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

-#: cmdline/apt-get.cc:2208
+#: cmdline/apt-get.cc:2220

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

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

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

-#: cmdline/apt-get.cc:2268
+#: cmdline/apt-get.cc:2280

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

-#: cmdline/apt-get.cc:2282
+#: cmdline/apt-get.cc:2294

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

-#: cmdline/apt-get.cc:2286
+#: cmdline/apt-get.cc:2298

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

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

 msgstr ""
 
 msgstr ""
 

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

 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"


@@ -1053,7 +1091,7 @@ msgid ""
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"
 "  -b  Build the source package after fetching it\n"
 "  -V  Show verbose version numbers\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 "See the apt-get(8), sources.list(5) and apt.conf(5) manual\n"
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"


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

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

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


@@ -1108,7 +1146,7 @@ msgid ""
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"
 "  -h   This help text\n"
 "  -s   Use source file sorting\n"
 "  -c=? Read this configuration file\n"

-"  -o=? Set an arbitary configuration option, eg -o dir::cache=/tmp\n"
+"  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"

 msgstr ""
 
 #: dselect/install:32
 msgstr ""
 
 #: dselect/install:32


@@ -1138,7 +1176,7 @@ msgid ""
 msgstr ""
 
 #: dselect/update:30
 msgstr ""
 
 #: dselect/update:30

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

 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:117


@@ -1154,7 +1192,7 @@ msgid "Corrupted archive"
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:195
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:195

-msgid "Tar Checksum failed, archive corrupted"
+msgid "Tar checksum failed, archive corrupted"

 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:298
 msgstr ""
 
 #: apt-inst/contrib/extracttar.cc:298


@@ -1195,7 +1233,7 @@ msgid "Failed to allocate diversion"
 msgstr ""
 
 #: apt-inst/filelist.cc:468
 msgstr ""
 
 #: apt-inst/filelist.cc:468

-msgid "Internal Error in AddDiversion"
+msgid "Internal error in AddDiversion"

 msgstr ""
 
 #: apt-inst/filelist.cc:481
 msgstr ""
 
 #: apt-inst/filelist.cc:481


@@ -1215,7 +1253,7 @@ msgstr ""
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 #, c-format
 
 #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53
 #, c-format

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

 msgstr ""
 
 #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88
 msgstr ""
 
 #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88


@@ -1270,8 +1308,8 @@ msgstr ""
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 

-#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:709
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
+#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:417 apt-pkg/clean.cc:38

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


@@ -1301,10 +1339,10 @@ 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:643
-#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
-#: apt-pkg/pkgcachegen.cc:840
-msgid "Reading Package Lists"
+#: apt-inst/deb/dpkgdb.cc:139 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
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:180


@@ -1314,11 +1352,11 @@ msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448
 
 #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355
 #: apt-inst/deb/dpkgdb.cc:448

-msgid "Internal Error getting a Package Name"
+msgid "Internal error getting a package name"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:205
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:205

-msgid "Reading File Listing"
+msgid "Reading file listing"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:216
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:216


@@ -1335,7 +1373,7 @@ msgid "Failed reading the list file %sinfo/%s"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:266
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:266

-msgid "Internal Error getting a Node"
+msgid "Internal error getting a node"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:309
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:309


@@ -1354,20 +1392,20 @@ msgid "Invalid line in the diversion file: %s"
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:362
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:362

-msgid "Internal Error adding a diversion"
+msgid "Internal error adding a diversion"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:383
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:383

-msgid "The pkg cache must be initialize first"
+msgid "The pkg cache must be initialized first"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:386
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:386

-msgid "Reading File List"
+msgid "Reading file list"

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:443
 #, c-format

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

 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:465
 msgstr ""
 
 #: apt-inst/deb/dpkgdb.cc:465


@@ -1396,7 +1434,7 @@ msgid "Couldn't change to %s"
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:138
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:138

-msgid "Internal Error, could not locate member"
+msgid "Internal error, could not locate member"

 msgstr ""
 
 #: apt-inst/deb/debfile.cc:171
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:171


@@ -1404,42 +1442,48 @@ msgid "Failed to locate a valid control file"
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:256
 msgstr ""
 
 #: apt-inst/deb/debfile.cc:256

-msgid "Unparsible control file"
+msgid "Unparsable control file"

 msgstr ""
 
 msgstr ""
 

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

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

-#: methods/cdrom.cc:122
+#: methods/cdrom.cc:123

 msgid ""
 msgid ""

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

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

-#: methods/cdrom.cc:177 methods/file.cc:77
+#: methods/cdrom.cc:169
+msgid "Disk not found."
+msgstr ""
+
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264

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

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

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

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

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

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

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


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

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

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


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

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

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


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

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

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


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

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

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


@@ -1608,43 +1652,79 @@ msgstr ""
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
 msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 

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

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

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

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

-#: methods/connect.cc:132 methods/rsh.cc:425
+#: methods/connect.cc:134 methods/rsh.cc:425

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

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

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

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

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

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

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

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

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

+#: methods/gpgv.cc:92
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+msgstr ""
+
+#: methods/gpgv.cc:191
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
+msgstr ""
+
+#: methods/gpgv.cc:196
+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?)"
+msgstr ""
+
+#: methods/gpgv.cc:206
+msgid "Unknown error executing gpgv"
+msgstr ""
+
+#: methods/gpgv.cc:237
+msgid "The following signatures were invalid:\n"
+msgstr ""
+
+#: methods/gpgv.cc:244
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
+msgstr ""
+

 #: methods/gzip.cc:57
 #, c-format
 msgid "Couldn't open pipe for %s"
 #: methods/gzip.cc:57
 #, c-format
 msgid "Couldn't open pipe for %s"


@@ -1655,87 +1735,79 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
 msgid "Read error from %s process"
 msgstr ""
 

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

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

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

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

-#: methods/http.cc:498
+#: methods/http.cc:499

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

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr ""
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr ""
-

 #: apt-pkg/contrib/mmap.cc:82
 msgid "Can't mmap an empty file"
 msgstr ""
 #: apt-pkg/contrib/mmap.cc:82
 msgid "Can't mmap an empty file"
 msgstr ""


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

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

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

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

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

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

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

-#: apt-pkg/contrib/configuration.cc:471
+#: apt-pkg/contrib/configuration.cc:512

 #, c-format
 msgid "Line %d too long (max %d)"
 msgstr ""
 
 #, c-format
 msgid "Line %d too long (max %d)"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:567
+#: apt-pkg/contrib/configuration.cc:608

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

-#: apt-pkg/contrib/configuration.cc:586
+#: apt-pkg/contrib/configuration.cc:627

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

-#: apt-pkg/contrib/configuration.cc:643
+#: apt-pkg/contrib/configuration.cc:684

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

-#: apt-pkg/contrib/configuration.cc:650
+#: apt-pkg/contrib/configuration.cc:691

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

-#: apt-pkg/contrib/configuration.cc:654 apt-pkg/contrib/configuration.cc:659
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700

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

-#: apt-pkg/contrib/configuration.cc:663
+#: apt-pkg/contrib/configuration.cc:704

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

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

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


@@ -1866,7 +1938,7 @@ 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:422 apt-pkg/clean.cc:44
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:423 apt-pkg/clean.cc:44

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


@@ -1875,156 +1947,152 @@ msgstr ""
 msgid "Failed to stat the cdrom"
 msgstr ""
 
 msgid "Failed to stat the cdrom"
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: apt-pkg/contrib/fileutl.cc:359
+#: apt-pkg/contrib/fileutl.cc:377

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

-#: apt-pkg/contrib/fileutl.cc:372
+#: apt-pkg/contrib/fileutl.cc:390

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

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

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

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

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

-#: apt-pkg/contrib/fileutl.cc:474
+#: apt-pkg/contrib/fileutl.cc:492

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

-#: apt-pkg/contrib/fileutl.cc:492
-msgid "Write error"
-msgstr ""
-
-#: apt-pkg/contrib/fileutl.cc:504
+#: apt-pkg/contrib/fileutl.cc:522

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

-#: apt-pkg/contrib/fileutl.cc:579
+#: apt-pkg/contrib/fileutl.cc:597

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

-#: apt-pkg/contrib/fileutl.cc:585
+#: apt-pkg/contrib/fileutl.cc:603

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

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

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

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

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

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

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

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

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

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgid "extra"
 msgstr ""
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
 msgid "extra"
 msgstr ""
 
 #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89

-msgid "Building Dependency Tree"
+msgid "Building dependency tree"

 msgstr ""
 
 #: apt-pkg/depcache.cc:61
 msgstr ""
 
 #: apt-pkg/depcache.cc:61

-msgid "Candidate Versions"
+msgid "Candidate versions"

 msgstr ""
 
 #: apt-pkg/depcache.cc:90
 msgstr ""
 
 #: apt-pkg/depcache.cc:90

-msgid "Dependency Generation"
+msgid "Dependency generation"

 msgstr ""
 
 #: apt-pkg/tagfile.cc:73
 msgstr ""
 
 #: apt-pkg/tagfile.cc:73


@@ -2054,7 +2122,7 @@ msgstr ""
 
 #: apt-pkg/sourcelist.cc:98
 #, c-format
 
 #: apt-pkg/sourcelist.cc:98
 #, c-format

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

 msgstr ""
 
 #: apt-pkg/sourcelist.cc:105
 msgstr ""
 
 #: apt-pkg/sourcelist.cc:105


@@ -2067,7 +2135,7 @@ msgstr ""
 msgid "Opening %s"
 msgstr ""
 
 msgid "Opening %s"
 msgstr ""
 

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

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


@@ -2116,32 +2184,42 @@ msgstr ""
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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


@@ -2181,109 +2259,124 @@ msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format
 
 #: apt-pkg/pkgcachegen.cc:117
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:184
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

-#: apt-pkg/pkgcachegen.cc:210
+#: apt-pkg/pkgcachegen.cc:256

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

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

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

-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/pkgcachegen.cc:290

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/pkgcachegen.cc:679

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

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

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

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

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

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

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

-#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+#: apt-pkg/acquire-item.cc:391 apt-pkg/acquire-item.cc:635
+#: apt-pkg/acquire-item.cc:1336

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

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

 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:771
+#: apt-pkg/acquire-item.cc:1203

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

-#: apt-pkg/acquire-item.cc:807
+#: apt-pkg/acquire-item.cc:1239

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

-#: apt-pkg/acquire-item.cc:894
+#: apt-pkg/acquire-item.cc:1326

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


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

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

 #, 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:496 apt-pkg/cdrom.cc:578
+#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622

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

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

 #, c-format
 #, c-format

-msgid "Stored Label: %s \n"
+msgid "Stored label: %s \n"

 msgstr ""
 
 msgstr ""
 

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

 #, 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:559
+#: apt-pkg/cdrom.cc:603

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

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

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

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

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

-#: apt-pkg/cdrom.cc:589
-msgid "Scanning Disc for index files..\n"
+#: apt-pkg/cdrom.cc:633
+msgid "Scanning disc for index files..\n"

 msgstr ""
 
 msgstr ""
 

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

 #, c-format
 #, c-format

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

 msgstr ""
 
 msgstr ""
 

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

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

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

-"This Disc is called: \n"
+"This disc is called: \n"

 "'%s'\n"
 msgstr ""
 
 "'%s'\n"
 msgstr ""
 

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

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

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

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

-#: apt-pkg/cdrom.cc:737
-msgid "Source List entries for this Disc are:\n"
+#: apt-pkg/cdrom.cc:792
+msgid "Source list entries for this disc are:\n"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

 #, 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:266
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838

 #, c-format
 #, c-format

-msgid "Wrote %i records with %i mismachted files\n"
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexcopy.cc:269
+#: apt-pkg/deb/dpkgpm.cc:358

 #, c-format
 #, c-format

-msgid "Wrote %i records with %i missing files and %i mismachted files\n"
+msgid "Preparing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:359
+#, c-format
+msgid "Unpacking %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:364
+#, c-format
+msgid "Preparing to configure %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:365
+#, c-format
+msgid "Configuring %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:366
+#, c-format
+msgid "Installed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:371
+#, c-format
+msgid "Preparing for removal of %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:372
+#, c-format
+msgid "Removing %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:373
+#, c-format
+msgid "Removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:378
+#, c-format
+msgid "Preparing for remove with config %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:379
+#, c-format
+msgid "Removed with config %s"
+msgstr ""
+
+#: methods/rred.cc:219
+msgid "Could not patch file"
+msgstr ""
+
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"

 msgstr ""
 msgstr ""