X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/09af1a917c739e50e4e8590cc8402525b3f1f64d..f8477782df203e1998a8704e71a1a3cc699e9e3a:/po/apt-all.pot

diff --git a/po/apt-all.pot b/po/apt-all.pot
index 46672e159..0b647873f 100644
--- a/po/apt-all.pot
+++ b/po/apt-all.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-19 11:53+0200\n"
+"POT-Creation-Date: 2006-06-07 09:49+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"
@@ -146,14 +146,14 @@ msgstr ""
 msgid "       %4i %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
-#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545
-#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
+#: cmdline/apt-get.cc:2344 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s %s compiled on %s %s\n"
 msgstr ""
 
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
 msgid ""
 "Usage: apt-cache [options] command\n"
 "       apt-cache [options] add file1 [file2 ...]\n"
@@ -192,6 +192,18 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
+#: cmdline/apt-cdrom.cc:78
+msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:93
+msgid "Please insert a Disc in the drive and press enter"
+msgstr ""
+
+#: cmdline/apt-cdrom.cc:117
+msgid "Repeat this process for the rest of the CDs in your set."
+msgstr ""
+
 #: cmdline/apt-config.cc:41
 msgid "Arguments not in pairs"
 msgstr ""
@@ -240,31 +252,31 @@ msgstr ""
 msgid "Cannot get debconf version. Is debconf installed?"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:163 ftparchive/apt-ftparchive.cc:337
+#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341
 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
 msgid "Error processing directory %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:250
+#: ftparchive/apt-ftparchive.cc:254
 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 ""
 
-#: ftparchive/apt-ftparchive.cc:397
+#: ftparchive/apt-ftparchive.cc:401
 #, c-format
 msgid "Error processing contents %s"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:551
+#: ftparchive/apt-ftparchive.cc:556
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -306,11 +318,11 @@ msgid ""
 "  -o=?  Set an arbitrary configuration option"
 msgstr ""
 
-#: ftparchive/apt-ftparchive.cc:757
+#: ftparchive/apt-ftparchive.cc:762
 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 ""
@@ -343,83 +355,83 @@ 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 ""
 
-#: ftparchive/writer.cc:84
+#: ftparchive/writer.cc:83
 #, c-format
 msgid "W: Unable to stat %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:126
+#: ftparchive/writer.cc:125
 msgid "E: "
 msgstr ""
 
-#: ftparchive/writer.cc:128
+#: ftparchive/writer.cc:127
 msgid "W: "
 msgstr ""
 
-#: ftparchive/writer.cc:135
+#: ftparchive/writer.cc:134
 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 ""
 
-#: ftparchive/writer.cc:164
+#: ftparchive/writer.cc:163
 msgid "Tree walking failed"
 msgstr ""
 
-#: ftparchive/writer.cc:189
+#: ftparchive/writer.cc:188
 #, c-format
 msgid "Failed to open %s"
 msgstr ""
 
-#: ftparchive/writer.cc:246
+#: ftparchive/writer.cc:245
 #, c-format
 msgid " DeLink %s [%s]\n"
 msgstr ""
 
-#: ftparchive/writer.cc:254
+#: ftparchive/writer.cc:253
 #, c-format
 msgid "Failed to readlink %s"
 msgstr ""
 
-#: ftparchive/writer.cc:258
+#: ftparchive/writer.cc:257
 #, 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 ""
 
-#: 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
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
 #, c-format
 msgid "Failed to stat %s"
 msgstr ""
 
-#: ftparchive/writer.cc:378
+#: ftparchive/writer.cc:386
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:386 ftparchive/writer.cc:595
+#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
 #, 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:689
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
@@ -519,200 +531,221 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:118
+#: cmdline/apt-get.cc:120
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1481
 #, 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 ""
 
-#: cmdline/apt-get.cc:325
+#: cmdline/apt-get.cc:327
 #, 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 ""
 
-#: cmdline/apt-get.cc:334
+#: cmdline/apt-get.cc:336
 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 ""
 
-#: cmdline/apt-get.cc:339
+#: cmdline/apt-get.cc:341
 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 ""
 
-#: cmdline/apt-get.cc:344
+#: cmdline/apt-get.cc:346
 msgid " or"
 msgstr ""
 
-#: cmdline/apt-get.cc:373
+#: cmdline/apt-get.cc:375
 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 ""
 
-#: cmdline/apt-get.cc:421
+#: cmdline/apt-get.cc:423
 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 ""
 
-#: cmdline/apt-get.cc:463
+#: cmdline/apt-get.cc:465
 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 ""
 
-#: cmdline/apt-get.cc:536
+#: cmdline/apt-get.cc:538
 #, 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 ""
 
-#: cmdline/apt-get.cc:575
+#: cmdline/apt-get.cc:577
 #, 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 ""
 
-#: cmdline/apt-get.cc:581
+#: cmdline/apt-get.cc:583
 #, 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 ""
 
-#: cmdline/apt-get.cc:587
+#: cmdline/apt-get.cc:589
 #, 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 ""
 
-#: cmdline/apt-get.cc:650
+#: cmdline/apt-get.cc:652
 msgid " failed."
 msgstr ""
 
-#: cmdline/apt-get.cc:653
+#: cmdline/apt-get.cc:655
 msgid "Unable to correct dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:656
+#: cmdline/apt-get.cc:658
 msgid "Unable to minimize the upgrade set"
 msgstr ""
 
-#: cmdline/apt-get.cc:658
+#: cmdline/apt-get.cc:660
 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 ""
 
-#: cmdline/apt-get.cc:665
+#: cmdline/apt-get.cc:667
 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 ""
 
-#: cmdline/apt-get.cc:698
-msgid "Install these packages without verification [y/N]? "
+#: cmdline/apt-get.cc:693
+msgid "Authentication warning overridden.\n"
 msgstr ""
 
 #: cmdline/apt-get.cc:700
+msgid "Install these packages without verification [y/N]? "
+msgstr ""
+
+#: cmdline/apt-get.cc:702
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
-#: cmdline/apt-get.cc:762
+#: cmdline/apt-get.cc:755
+msgid "Internal error, InstallPackages was called with broken packages!"
+msgstr ""
+
+#: cmdline/apt-get.cc:764
 msgid "Packages need to be removed but remove is disabled."
 msgstr ""
 
-#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811
+#: cmdline/apt-get.cc:775
+msgid "Internal error, Ordering didn't finish"
+msgstr ""
+
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1775 cmdline/apt-get.cc:1808
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070
-#: apt-pkg/cachefile.cc:67
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1856 cmdline/apt-get.cc:2092
+#: apt-pkg/cachefile.cc:69
 msgid "The list of sources could not be read."
 msgstr ""
 
-#: cmdline/apt-get.cc:818
+#: cmdline/apt-get.cc:816
+msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
+msgstr ""
+
+#: cmdline/apt-get.cc:821
 #, c-format
 msgid "Need to get %sB/%sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:821
+#: cmdline/apt-get.cc:824
 #, c-format
 msgid "Need to get %sB of archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:826
+#: cmdline/apt-get.cc:829
 #, c-format
 msgid "After unpacking %sB of additional disk space will be used.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:829
+#: cmdline/apt-get.cc:832
 #, c-format
 msgid "After unpacking %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1946
+#, c-format
+msgid "Couldn't determine free space in %s"
+msgstr ""
+
+#: cmdline/apt-get.cc:849
 #, 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:864 cmdline/apt-get.cc:884
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:863
+#: cmdline/apt-get.cc:866
 msgid "Yes, do as I say!"
 msgstr ""
 
-#: cmdline/apt-get.cc:865
+#: cmdline/apt-get.cc:868
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -720,74 +753,74 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890
+#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
 msgid "Abort."
 msgstr ""
 
-#: cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:889
 msgid "Do you want to continue [Y/n]? "
 msgstr ""
 
-#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1989 apt-pkg/cachefile.cc:142
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:976
+#: cmdline/apt-get.cc:979
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:1998
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:983
+#: cmdline/apt-get.cc:986
 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:990
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:992
+#: cmdline/apt-get.cc:995
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:993
+#: cmdline/apt-get.cc:996
 msgid "Aborting install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1026
+#: cmdline/apt-get.cc:1030
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1036
+#: cmdline/apt-get.cc:1040
 #, 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:1058
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1065
+#: cmdline/apt-get.cc:1069
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1077
+#: cmdline/apt-get.cc:1081
 msgid " [Installed]"
 msgstr ""
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1087
+#: cmdline/apt-get.cc:1091
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -795,79 +828,79 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1106
+#: cmdline/apt-get.cc:1110
 msgid "However the following packages replace it:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1113
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1129
+#: cmdline/apt-get.cc:1133
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1137
+#: cmdline/apt-get.cc:1141
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1164
+#: cmdline/apt-get.cc:1168
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1172
+#: cmdline/apt-get.cc:1176
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1282
+#: cmdline/apt-get.cc:1313
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389
+#: cmdline/apt-get.cc:1326
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1353
+#: cmdline/apt-get.cc:1359
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
-#: cmdline/apt-get.cc:1372
+#: cmdline/apt-get.cc:1378
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507
+#: cmdline/apt-get.cc:1468 cmdline/apt-get.cc:1504
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1494
+#: cmdline/apt-get.cc:1491
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1524
+#: cmdline/apt-get.cc:1521
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1527
+#: cmdline/apt-get.cc:1524
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1539
+#: cmdline/apt-get.cc:1536
 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 +908,163 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1547
+#: cmdline/apt-get.cc:1544
 msgid ""
 "Since you only requested a single operation it is extremely likely that\n"
 "the package is simply not installable and a bug report against\n"
 "that package should be filed."
 msgstr ""
 
-#: cmdline/apt-get.cc:1552
+#: cmdline/apt-get.cc:1549
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1555
+#: cmdline/apt-get.cc:1552
 msgid "Broken packages"
 msgstr ""
 
-#: cmdline/apt-get.cc:1581
+#: cmdline/apt-get.cc:1578
 msgid "The following extra packages will be installed:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1652
+#: cmdline/apt-get.cc:1649
 msgid "Suggested packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1653
+#: cmdline/apt-get.cc:1650
 msgid "Recommended packages:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1673
+#: cmdline/apt-get.cc:1670
 msgid "Calculating upgrade... "
 msgstr ""
 
-#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99
+#: cmdline/apt-get.cc:1673 methods/ftp.cc:702 methods/connect.cc:101
 msgid "Failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:1681
+#: cmdline/apt-get.cc:1678
 msgid "Done"
 msgstr ""
 
-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1743 cmdline/apt-get.cc:1751
+msgid "Internal error, problem resolver broke stuff"
+msgstr ""
+
+#: cmdline/apt-get.cc:1851
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088
+#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2110
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1928
+#: cmdline/apt-get.cc:1925
+#, c-format
+msgid "Skipping already downloaded file '%s'\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1949
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1933
+#: cmdline/apt-get.cc:1954
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1936
+#: cmdline/apt-get.cc:1957
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1942
+#: cmdline/apt-get.cc:1963
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1973
+#: cmdline/apt-get.cc:1994
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2001
+#: cmdline/apt-get.cc:2022
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2013
+#: cmdline/apt-get.cc:2034
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2030
+#: cmdline/apt-get.cc:2035
+#, c-format
+msgid "Check if the 'dpkg-dev' package is installed.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:2052
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2049
+#: cmdline/apt-get.cc:2071
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2065
+#: cmdline/apt-get.cc:2087
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2093
+#: cmdline/apt-get.cc:2115
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2113
+#: cmdline/apt-get.cc:2135
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2165
+#: cmdline/apt-get.cc:2187
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2239
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2252
+#: cmdline/apt-get.cc:2274
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2299
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2291
+#: cmdline/apt-get.cc:2313
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2295
+#: cmdline/apt-get.cc:2317
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2327
+#: cmdline/apt-get.cc:2349
 msgid "Supported modules:"
 msgstr ""
 
-#: cmdline/apt-get.cc:2368
+#: cmdline/apt-get.cc:2390
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1218,7 +1265,7 @@ 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 ""
@@ -1271,7 +1318,8 @@ msgid "File %s/%s overwrites the one in the package %s"
 msgstr ""
 
 #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750
-#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
+#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324
+#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38
 #, c-format
 msgid "Unable to read %s"
 msgstr ""
@@ -1317,7 +1365,7 @@ 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 ""
 
@@ -1361,10 +1409,6 @@ 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"
@@ -1407,1066 +1451,1080 @@ msgstr ""
 msgid "Unparsable control file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:82
-msgid "Can't mmap an empty file"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:87
+#: methods/cdrom.cc:114
 #, c-format
-msgid "Couldn't make mmap of %lu bytes"
+msgid "Unable to read the cdrom database %s"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:941
-#, c-format
-msgid "Selection %s not found"
+#: methods/cdrom.cc:123
+msgid ""
+"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
+"cannot be used to add new CD-ROMs"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:436
-#, c-format
-msgid "Unrecognized type abbreviation: '%c'"
+#: methods/cdrom.cc:131
+msgid "Wrong CD-ROM"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:494
+#: methods/cdrom.cc:164
 #, c-format
-msgid "Opening configuration file %s"
+msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:512
-#, c-format
-msgid "Line %d too long (max %d)"
+#: methods/cdrom.cc:169
+msgid "Disk not found."
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:608
-#, c-format
-msgid "Syntax error %s:%u: Block starts with no name."
+#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264
+msgid "File not found"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:627
-#, c-format
-msgid "Syntax error %s:%u: Malformed tag"
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
+#: methods/gzip.cc:142
+msgid "Failed to stat"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:644
-#, c-format
-msgid "Syntax error %s:%u: Extra junk after value"
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
+msgid "Failed to set modification time"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:684
-#, c-format
-msgid "Syntax error %s:%u: Directives can only be done at the top level"
+#: methods/file.cc:44
+msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:691
-#, c-format
-msgid "Syntax error %s:%u: Too many nested includes"
+#. Login must be before getpeername otherwise dante won't work.
+#: methods/ftp.cc:162
+msgid "Logging in"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
-#, c-format
-msgid "Syntax error %s:%u: Included from here"
+#: methods/ftp.cc:168
+msgid "Unable to determine the peer name"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:704
-#, c-format
-msgid "Syntax error %s:%u: Unsupported directive '%s'"
+#: methods/ftp.cc:173
+msgid "Unable to determine the local name"
 msgstr ""
 
-#: apt-pkg/contrib/configuration.cc:738
+#: methods/ftp.cc:204 methods/ftp.cc:232
 #, c-format
-msgid "Syntax error %s:%u: Extra junk at end of file"
+msgid "The server refused the connection and said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:154
+#: methods/ftp.cc:210
 #, c-format
-msgid "%c%s... Error!"
+msgid "USER failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/progress.cc:156
+#: methods/ftp.cc:217
 #, c-format
-msgid "%c%s... Done"
+msgid "PASS failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:80
-#, c-format
-msgid "Command line option '%c' [from %s] is not known."
+#: methods/ftp.cc:237
+msgid ""
+"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
+"is empty."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
-#: apt-pkg/contrib/cmndline.cc:122
+#: methods/ftp.cc:265
 #, c-format
-msgid "Command line option %s is not understood"
+msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:127
+#: methods/ftp.cc:291
 #, c-format
-msgid "Command line option %s is not boolean"
+msgid "TYPE failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
-#, c-format
-msgid "Option %s requires an argument."
+#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
+msgid "Connection timeout"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
-#, c-format
-msgid "Option %s: Configuration item specification must have an =<val>."
+#: methods/ftp.cc:335
+msgid "Server closed the connection"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:237
-#, c-format
-msgid "Option %s requires an integer argument, not '%s'"
+#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:536 methods/rsh.cc:190
+msgid "Read error"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:268
-#, c-format
-msgid "Option '%s' is too long"
+#: methods/ftp.cc:345 methods/rsh.cc:197
+msgid "A response overflowed the buffer."
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:301
-#, c-format
-msgid "Sense %s is not understood, try true or false."
+#: methods/ftp.cc:362 methods/ftp.cc:374
+msgid "Protocol corruption"
 msgstr ""
 
-#: apt-pkg/contrib/cmndline.cc:351
-#, c-format
-msgid "Invalid operation %s"
+#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:575 methods/rsh.cc:232
+msgid "Write error"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:55
-#, c-format
-msgid "Unable to stat the mount point %s"
+#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
+msgid "Could not create a socket"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
-#, c-format
-msgid "Unable to change to %s"
+#: methods/ftp.cc:698
+msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
-#: apt-pkg/contrib/cdromutl.cc:190
-msgid "Failed to stat the cdrom"
+#: methods/ftp.cc:704
+msgid "Could not connect passive socket."
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:82
-#, c-format
-msgid "Not using locking for read only lock file %s"
+#: methods/ftp.cc:722
+msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:87
-#, c-format
-msgid "Could not open lock file %s"
+#: methods/ftp.cc:736
+msgid "Could not bind a socket"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:105
-#, c-format
-msgid "Not using locking for nfs mounted lock file %s"
+#: methods/ftp.cc:740
+msgid "Could not listen on the socket"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:109
-#, c-format
-msgid "Could not get lock %s"
+#: methods/ftp.cc:747
+msgid "Could not determine the socket's name"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:377
-#, c-format
-msgid "Waited for %s but it wasn't there"
+#: methods/ftp.cc:779
+msgid "Unable to send PORT command"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:387
+#: methods/ftp.cc:789
 #, c-format
-msgid "Sub-process %s received a segmentation fault."
+msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:390
+#: methods/ftp.cc:798
 #, c-format
-msgid "Sub-process %s returned an error code (%u)"
+msgid "EPRT failed, server said: %s"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:392
-#, c-format
-msgid "Sub-process %s exited unexpectedly"
+#: methods/ftp.cc:818
+msgid "Data socket connect timed out"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:436
-#, c-format
-msgid "Could not open file %s"
+#: methods/ftp.cc:825
+msgid "Unable to accept connection"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:471 methods/ftp.cc:338 methods/rsh.cc:190
-msgid "Read error"
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
+msgid "Problem hashing file"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:492
+#: methods/ftp.cc:877
 #, c-format
-msgid "read, still have %lu to read but none left"
+msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:510 methods/ftp.cc:446 methods/rsh.cc:232
-msgid "Write error"
+#: methods/ftp.cc:892 methods/rsh.cc:322
+msgid "Data socket timed out"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:522
+#: methods/ftp.cc:922
 #, c-format
-msgid "write, still have %lu to write but couldn't"
+msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:597
-msgid "Problem closing the file"
+#. Get the files information
+#: methods/ftp.cc:997
+msgid "Query"
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:603
-msgid "Problem unlinking the file"
+#: methods/ftp.cc:1109
+msgid "Unable to invoke "
 msgstr ""
 
-#: apt-pkg/contrib/fileutl.cc:614
-msgid "Problem syncing the file"
+#: methods/connect.cc:64
+#, c-format
+msgid "Connecting to %s (%s)"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:126
-msgid "Empty package cache"
+#: methods/connect.cc:71
+#, c-format
+msgid "[IP: %s %s]"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:132
-msgid "The package cache file is corrupted"
+#: methods/connect.cc:80
+#, c-format
+msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:137
-msgid "The package cache file is an incompatible version"
+#: methods/connect.cc:86
+#, c-format
+msgid "Cannot initiate the connection to %s:%s (%s)."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:142
+#: methods/connect.cc:93
 #, c-format
-msgid "This APT does not support the versioning system '%s'"
+msgid "Could not connect to %s:%s (%s), connection timed out"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:147
-msgid "The package cache was built for a different architecture"
+#: methods/connect.cc:108
+#, c-format
+msgid "Could not connect to %s:%s (%s)."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:218
-msgid "Depends"
+#. We say this mainly because the pause here is for the
+#. ssh connection that is still going
+#: methods/connect.cc:136 methods/rsh.cc:425
+#, c-format
+msgid "Connecting to %s"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:218
-msgid "PreDepends"
+#: methods/connect.cc:167
+#, c-format
+msgid "Could not resolve '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:218
-msgid "Suggests"
+#: methods/connect.cc:173
+#, c-format
+msgid "Temporary failure resolving '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
-msgid "Recommends"
+#: methods/connect.cc:176
+#, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i)"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
-msgid "Conflicts"
+#: methods/connect.cc:223
+#, c-format
+msgid "Unable to connect to %s %s:"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:219
-msgid "Replaces"
+#: methods/gpgv.cc:64
+#, c-format
+msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:220
-msgid "Obsoletes"
+#: methods/gpgv.cc:99
+msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
-msgid "important"
+#: methods/gpgv.cc:198
+msgid ""
+"Internal error: Good signature, but could not determine key fingerprint?!"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
-msgid "required"
+#: methods/gpgv.cc:203
+msgid "At least one invalid signature was encountered."
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:231
-msgid "standard"
+#: methods/gpgv.cc:207
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:232
-msgid "optional"
+#: methods/gpgv.cc:212
+msgid "Unknown error executing gpgv"
 msgstr ""
 
-#: apt-pkg/pkgcache.cc:232
-msgid "extra"
+#: methods/gpgv.cc:243
+msgid "The following signatures were invalid:\n"
 msgstr ""
 
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
-msgid "Building dependency tree"
+#: methods/gpgv.cc:250
+msgid ""
+"The following signatures couldn't be verified because the public key is not "
+"available:\n"
 msgstr ""
 
-#: apt-pkg/depcache.cc:61
-msgid "Candidate versions"
+#: methods/gzip.cc:57
+#, c-format
+msgid "Couldn't open pipe for %s"
 msgstr ""
 
-#: apt-pkg/depcache.cc:90
-msgid "Dependency generation"
+#: methods/gzip.cc:102
+#, c-format
+msgid "Read error from %s process"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:73
-#, c-format
-msgid "Unable to parse package file %s (1)"
+#: methods/http.cc:376
+msgid "Waiting for headers"
 msgstr ""
 
-#: apt-pkg/tagfile.cc:160
+#: methods/http.cc:522
 #, c-format
-msgid "Unable to parse package file %s (2)"
+msgid "Got a single header line over %u chars"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:87
-#, c-format
-msgid "Malformed line %lu in source list %s (URI)"
+#: methods/http.cc:530
+msgid "Bad header line"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:89
-#, c-format
-msgid "Malformed line %lu in source list %s (dist)"
+#: methods/http.cc:549 methods/http.cc:556
+msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:92
-#, c-format
-msgid "Malformed line %lu in source list %s (URI parse)"
+#: methods/http.cc:585
+msgid "The HTTP server sent an invalid Content-Length header"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:98
-#, c-format
-msgid "Malformed line %lu in source list %s (absolute dist)"
+#: methods/http.cc:600
+msgid "The HTTP server sent an invalid Content-Range header"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:105
-#, c-format
-msgid "Malformed line %lu in source list %s (dist parse)"
+#: methods/http.cc:602
+msgid "This HTTP server has broken range support"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:156
-#, c-format
-msgid "Opening %s"
+#: methods/http.cc:626
+msgid "Unknown date format"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:170 apt-pkg/cdrom.cc:426
-#, c-format
-msgid "Line %u too long in source list %s."
+#: methods/http.cc:773
+msgid "Select failed"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:187
-#, c-format
-msgid "Malformed line %u in source list %s (type)"
+#: methods/http.cc:778
+msgid "Connection timed out"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:191
-#, c-format
-msgid "Type '%s' is not known on line %u in source list %s"
+#: methods/http.cc:801
+msgid "Error writing to output file"
 msgstr ""
 
-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202
-#, c-format
-msgid "Malformed line %u in source list %s (vendor id)"
+#: methods/http.cc:832
+msgid "Error writing to file"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:402
-#, c-format
-msgid ""
-"This installation run will require temporarily removing the essential "
-"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
-"you really want to do it, activate the APT::Force-LoopBreak option."
+#: methods/http.cc:860
+msgid "Error writing to the file"
 msgstr ""
 
-#: apt-pkg/pkgrecords.cc:37
-#, c-format
-msgid "Index file type '%s' is not supported"
+#: methods/http.cc:874
+msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:241
-#, c-format
-msgid ""
-"The package %s needs to be reinstalled, but I can't find an archive for it."
+#: methods/http.cc:876
+msgid "Error reading from server"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1059
-msgid ""
-"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
-"held packages."
+#: methods/http.cc:1107
+msgid "Bad header data"
 msgstr ""
 
-#: apt-pkg/algorithms.cc:1061
-msgid "Unable to correct problems, you have held broken packages."
+#: methods/http.cc:1124
+msgid "Connection failed"
 msgstr ""
 
-#: apt-pkg/acquire.cc:62
-#, c-format
-msgid "Lists directory %spartial is missing."
+#: methods/http.cc:1215
+msgid "Internal error"
 msgstr ""
 
-#: apt-pkg/acquire.cc:66
-#, c-format
-msgid "Archive directory %spartial is missing."
+#: apt-pkg/contrib/mmap.cc:82
+msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/acquire.cc:821
+#: apt-pkg/contrib/mmap.cc:87
 #, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:113 apt-pkg/acquire-worker.cc:112
+#: apt-pkg/contrib/strutl.cc:938
 #, c-format
-msgid "The method driver %s could not be found."
+msgid "Selection %s not found"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:162 apt-pkg/acquire-worker.cc:161
+#: apt-pkg/contrib/configuration.cc:436
 #, c-format
-msgid "Method %s did not start correctly"
+msgid "Unrecognized type abbreviation: '%c'"
 msgstr ""
 
-#: apt-pkg/acquire-worker.cc:377
+#: apt-pkg/contrib/configuration.cc:494
 #, c-format
-msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
+msgid "Opening configuration file %s"
 msgstr ""
 
-#: apt-pkg/init.cc:119
+#: apt-pkg/contrib/configuration.cc:512
 #, c-format
-msgid "Packaging system '%s' is not supported"
+msgid "Line %d too long (max %d)"
 msgstr ""
 
-#: apt-pkg/init.cc:135
-msgid "Unable to determine a suitable packaging system type"
+#: apt-pkg/contrib/configuration.cc:608
+#, c-format
+msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
-#: apt-pkg/clean.cc:61
+#: apt-pkg/contrib/configuration.cc:627
 #, c-format
-msgid "Unable to stat %s."
+msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
-#: apt-pkg/srcrecords.cc:48
-msgid "You must put some 'source' URIs in your sources.list"
+#: apt-pkg/contrib/configuration.cc:644
+#, c-format
+msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:73
-msgid "The package lists or status file could not be parsed or opened."
+#: apt-pkg/contrib/configuration.cc:684
+#, c-format
+msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
-#: apt-pkg/cachefile.cc:77
-msgid "You may want to run apt-get update to correct these problems"
+#: apt-pkg/contrib/configuration.cc:691
+#, c-format
+msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
-#: apt-pkg/policy.cc:269
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700
+#, c-format
+msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
-#: apt-pkg/policy.cc:291
+#: apt-pkg/contrib/configuration.cc:704
 #, c-format
-msgid "Did not understand pin type %s"
+msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
-#: apt-pkg/policy.cc:299
-msgid "No priority (or zero) specified for pin"
+#: apt-pkg/contrib/configuration.cc:738
+#, c-format
+msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:74
-msgid "Cache has an incompatible versioning system"
+#: apt-pkg/contrib/progress.cc:154
+#, c-format
+msgid "%c%s... Error!"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/contrib/progress.cc:156
 #, c-format
-msgid "Error occurred while processing %s (NewPackage)"
+msgid "%c%s... Done"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:129
+#: apt-pkg/contrib/cmndline.cc:80
 #, c-format
-msgid "Error occurred while processing %s (UsePackage1)"
+msgid "Command line option '%c' [from %s] is not known."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:150
+#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114
+#: apt-pkg/contrib/cmndline.cc:122
 #, c-format
-msgid "Error occurred while processing %s (UsePackage2)"
+msgid "Command line option %s is not understood"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:154
+#: apt-pkg/contrib/cmndline.cc:127
 #, c-format
-msgid "Error occurred while processing %s (NewFileVer1)"
+msgid "Command line option %s is not boolean"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:184
+#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187
 #, c-format
-msgid "Error occurred while processing %s (NewVersion1)"
+msgid "Option %s requires an argument."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:188
+#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207
 #, c-format
-msgid "Error occurred while processing %s (UsePackage3)"
+msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:192
+#: apt-pkg/contrib/cmndline.cc:237
 #, c-format
-msgid "Error occurred while processing %s (NewVersion2)"
+msgid "Option %s requires an integer argument, not '%s'"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:207
-msgid "Wow, you exceeded the number of package names this APT is capable of."
+#: apt-pkg/contrib/cmndline.cc:268
+#, c-format
+msgid "Option '%s' is too long"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:210
-msgid "Wow, you exceeded the number of versions this APT is capable of."
+#: apt-pkg/contrib/cmndline.cc:301
+#, c-format
+msgid "Sense %s is not understood, try true or false."
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:213
-msgid "Wow, you exceeded the number of dependencies this APT is capable of."
+#: apt-pkg/contrib/cmndline.cc:351
+#, c-format
+msgid "Invalid operation %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:241
+#: apt-pkg/contrib/cdromutl.cc:55
 #, c-format
-msgid "Error occurred while processing %s (FindPkg)"
+msgid "Unable to stat the mount point %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:254
+#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44
 #, c-format
-msgid "Error occurred while processing %s (CollectFileProvides)"
+msgid "Unable to change to %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:260
-#, c-format
-msgid "Package %s %s was not found while processing file dependencies"
+#: apt-pkg/contrib/cdromutl.cc:190
+msgid "Failed to stat the cdrom"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:574
+#: apt-pkg/contrib/fileutl.cc:147
 #, c-format
-msgid "Couldn't stat source package list %s"
+msgid "Not using locking for read only lock file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:658
-msgid "Collecting File Provides"
+#: apt-pkg/contrib/fileutl.cc:152
+#, c-format
+msgid "Could not open lock file %s"
 msgstr ""
 
-#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
-msgid "IO Error saving source cache"
+#: apt-pkg/contrib/fileutl.cc:170
+#, c-format
+msgid "Not using locking for nfs mounted lock file %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:129
+#: apt-pkg/contrib/fileutl.cc:174
 #, c-format
-msgid "rename failed, %s (%s -> %s)."
+msgid "Could not get lock %s"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:618 apt-pkg/acquire-item.cc:1290
-#: apt-pkg/acquire-item.cc:553 apt-pkg/acquire-item.cc:1218
-msgid "MD5Sum mismatch"
+#: apt-pkg/contrib/fileutl.cc:442
+#, c-format
+msgid "Waited for %s but it wasn't there"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1104 apt-pkg/acquire-item.cc:1032
+#: apt-pkg/contrib/fileutl.cc:452
 #, c-format
-msgid ""
-"I wasn't able to locate a file for the %s package. This might mean you need "
-"to manually fix this package. (due to missing arch)"
+msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1157 apt-pkg/acquire-item.cc:1085
+#: apt-pkg/contrib/fileutl.cc:455
 #, c-format
-msgid ""
-"I wasn't able to locate file for the %s package. This might mean you need to "
-"manually fix this package."
+msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1193 apt-pkg/acquire-item.cc:1121
+#: apt-pkg/contrib/fileutl.cc:457
 #, c-format
-msgid ""
-"The package index files are corrupted. No Filename: field for package %s."
+msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1280 apt-pkg/acquire-item.cc:1208
-msgid "Size mismatch"
+#: apt-pkg/contrib/fileutl.cc:501
+#, c-format
+msgid "Could not open file %s"
 msgstr ""
 
-#: apt-pkg/vendorlist.cc:66
+#: apt-pkg/contrib/fileutl.cc:557
 #, c-format
-msgid "Vendor block %s contains no fingerprint"
+msgid "read, still have %lu to read but none left"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:507 apt-pkg/cdrom.cc:504
+#: apt-pkg/contrib/fileutl.cc:587
 #, c-format
-msgid ""
-"Using CD-ROM mount point %s\n"
-"Mounting CD-ROM\n"
+msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 apt-pkg/cdrom.cc:513
-#: apt-pkg/cdrom.cc:595
-msgid "Identifying.. "
+#: apt-pkg/contrib/fileutl.cc:662
+msgid "Problem closing the file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:541 apt-pkg/cdrom.cc:538
-#, c-format
-msgid "Stored label: %s \n"
+#: apt-pkg/contrib/fileutl.cc:668
+msgid "Problem unlinking the file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:561 apt-pkg/cdrom.cc:558
-#, c-format
-msgid "Using CD-ROM mount point %s\n"
+#: apt-pkg/contrib/fileutl.cc:679
+msgid "Problem syncing the file"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:579 apt-pkg/cdrom.cc:576
-msgid "Unmounting CD-ROM\n"
+#: apt-pkg/pkgcache.cc:126
+msgid "Empty package cache"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:583 apt-pkg/cdrom.cc:580
-msgid "Waiting for disc...\n"
+#: apt-pkg/pkgcache.cc:132
+msgid "The package cache file is corrupted"
 msgstr ""
 
-#. Mount the new CDROM
-#: apt-pkg/cdrom.cc:591 apt-pkg/cdrom.cc:588
-msgid "Mounting CD-ROM...\n"
+#: apt-pkg/pkgcache.cc:137
+msgid "The package cache file is an incompatible version"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:609 apt-pkg/cdrom.cc:606
-msgid "Scanning disc for index files..\n"
+#: apt-pkg/pkgcache.cc:142
+#, c-format
+msgid "This APT does not support the versioning system '%s'"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:647 apt-pkg/cdrom.cc:644
-#, c-format
-msgid "Found %i package indexes, %i source indexes and %i signatures\n"
+#: apt-pkg/pkgcache.cc:147
+msgid "The package cache was built for a different architecture"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:704 apt-pkg/cdrom.cc:701
-msgid "That is not a valid name, try again.\n"
+#: apt-pkg/pkgcache.cc:218
+msgid "Depends"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:720 apt-pkg/cdrom.cc:717
-#, c-format
-msgid ""
-"This disc is called: \n"
-"'%s'\n"
+#: apt-pkg/pkgcache.cc:218
+msgid "PreDepends"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:724 apt-pkg/cdrom.cc:721
-msgid "Copying package lists..."
+#: apt-pkg/pkgcache.cc:218
+msgid "Suggests"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:748 apt-pkg/cdrom.cc:745
-msgid "Writing new source list\n"
+#: apt-pkg/pkgcache.cc:219
+msgid "Recommends"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:757 apt-pkg/cdrom.cc:754
-msgid "Source list entries for this disc are:\n"
+#: apt-pkg/pkgcache.cc:219
+msgid "Conflicts"
 msgstr ""
 
-#: apt-pkg/cdrom.cc:791 apt-pkg/cdrom.cc:788
-msgid "Unmounting CD-ROM..."
+#: apt-pkg/pkgcache.cc:219
+msgid "Replaces"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:261
-#, c-format
-msgid "Wrote %i records.\n"
+#: apt-pkg/pkgcache.cc:220
+msgid "Obsoletes"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:263
-#, c-format
-msgid "Wrote %i records with %i missing files.\n"
+#: apt-pkg/pkgcache.cc:231
+msgid "important"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:266
-#, c-format
-msgid "Wrote %i records with %i mismatched files\n"
+#: apt-pkg/pkgcache.cc:231
+msgid "required"
 msgstr ""
 
-#: apt-pkg/indexcopy.cc:269
-#, c-format
-msgid "Wrote %i records with %i missing files and %i mismatched files\n"
+#: apt-pkg/pkgcache.cc:231
+msgid "standard"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:358
-#, c-format
-msgid "Preparing %s"
+#: apt-pkg/pkgcache.cc:232
+msgid "optional"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:359
-#, c-format
-msgid "Unpacking %s"
+#: apt-pkg/pkgcache.cc:232
+msgid "extra"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:364
-#, c-format
-msgid "Preparing to configure %s"
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
+msgid "Building dependency tree"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:365
-#, c-format
-msgid "Configuring %s"
+#: apt-pkg/depcache.cc:62
+msgid "Candidate versions"
+msgstr ""
+
+#: apt-pkg/depcache.cc:91
+msgid "Dependency generation"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:366
+#: apt-pkg/tagfile.cc:72
 #, c-format
-msgid "Installed %s"
+msgid "Unable to parse package file %s (1)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:371
+#: apt-pkg/tagfile.cc:102
 #, c-format
-msgid "Preparing for removal of %s"
+msgid "Unable to parse package file %s (2)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:372
+#: apt-pkg/sourcelist.cc:94
 #, c-format
-msgid "Removing %s"
+msgid "Malformed line %lu in source list %s (URI)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:373
+#: apt-pkg/sourcelist.cc:96
 #, c-format
-msgid "Removed %s"
+msgid "Malformed line %lu in source list %s (dist)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:378
+#: apt-pkg/sourcelist.cc:99
 #, c-format
-msgid "Preparing for remove with config %s"
+msgid "Malformed line %lu in source list %s (URI parse)"
 msgstr ""
 
-#: apt-pkg/deb/dpkgpm.cc:379
+#: apt-pkg/sourcelist.cc:105
 #, c-format
-msgid "Removed with config %s"
+msgid "Malformed line %lu in source list %s (absolute dist)"
 msgstr ""
 
-#: methods/cdrom.cc:113
+#: apt-pkg/sourcelist.cc:112
 #, c-format
-msgid "Unable to read the cdrom database %s"
+msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
-#: methods/cdrom.cc:122
-msgid ""
-"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
-"cannot be used to add new CD-ROMs"
+#: apt-pkg/sourcelist.cc:203
+#, c-format
+msgid "Opening %s"
 msgstr ""
 
-#: methods/cdrom.cc:130 methods/cdrom.cc:168
-msgid "Wrong CD-ROM"
+#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426
+#, c-format
+msgid "Line %u too long in source list %s."
 msgstr ""
 
-#: methods/cdrom.cc:163
+#: apt-pkg/sourcelist.cc:240
 #, c-format
-msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
+msgid "Malformed line %u in source list %s (type)"
 msgstr ""
 
-#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264
-msgid "File not found"
+#: apt-pkg/sourcelist.cc:244
+#, c-format
+msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142
-msgid "Failed to stat"
+#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255
+#, c-format
+msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
-msgid "Failed to set modification time"
+#: apt-pkg/packagemanager.cc:402
+#, c-format
+msgid ""
+"This installation run will require temporarily removing the essential "
+"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
+"you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
-#: methods/file.cc:42
-msgid "Invalid URI, local URIS must not start with //"
+#: apt-pkg/pkgrecords.cc:37
+#, c-format
+msgid "Index file type '%s' is not supported"
 msgstr ""
 
-#. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:162
-msgid "Logging in"
+#: apt-pkg/algorithms.cc:241
+#, c-format
+msgid ""
+"The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 
-#: methods/ftp.cc:168
-msgid "Unable to determine the peer name"
+#: apt-pkg/algorithms.cc:1059
+msgid ""
+"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
+"held packages."
 msgstr ""
 
-#: methods/ftp.cc:173
-msgid "Unable to determine the local name"
+#: apt-pkg/algorithms.cc:1061
+msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
-#: methods/ftp.cc:204 methods/ftp.cc:232
+#: apt-pkg/acquire.cc:62
 #, c-format
-msgid "The server refused the connection and said: %s"
+msgid "Lists directory %spartial is missing."
 msgstr ""
 
-#: methods/ftp.cc:210
+#: apt-pkg/acquire.cc:66
 #, c-format
-msgid "USER failed, server said: %s"
+msgid "Archive directory %spartial is missing."
 msgstr ""
 
-#: methods/ftp.cc:217
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
 #, c-format
-msgid "PASS failed, server said: %s"
+msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
-#: methods/ftp.cc:237
-msgid ""
-"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
-"is empty."
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
 msgstr ""
 
-#: methods/ftp.cc:265
+#: apt-pkg/acquire-worker.cc:113
 #, c-format
-msgid "Login script command '%s' failed, server said: %s"
+msgid "The method driver %s could not be found."
 msgstr ""
 
-#: methods/ftp.cc:291
+#: apt-pkg/acquire-worker.cc:162
 #, c-format
-msgid "TYPE failed, server said: %s"
+msgid "Method %s did not start correctly"
 msgstr ""
 
-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
-msgid "Connection timeout"
+#: apt-pkg/acquire-worker.cc:377
+#, c-format
+msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
-#: methods/ftp.cc:335
-msgid "Server closed the connection"
+#: apt-pkg/init.cc:120
+#, c-format
+msgid "Packaging system '%s' is not supported"
 msgstr ""
 
-#: methods/ftp.cc:345 methods/rsh.cc:197
-msgid "A response overflowed the buffer."
+#: apt-pkg/init.cc:136
+msgid "Unable to determine a suitable packaging system type"
 msgstr ""
 
-#: methods/ftp.cc:362 methods/ftp.cc:374
-msgid "Protocol corruption"
+#: apt-pkg/clean.cc:61
+#, c-format
+msgid "Unable to stat %s."
 msgstr ""
 
-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729
-msgid "Could not create a socket"
+#: apt-pkg/srcrecords.cc:48
+msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
-#: methods/ftp.cc:698
-msgid "Could not connect data socket, connection timed out"
+#: apt-pkg/cachefile.cc:75
+msgid "The package lists or status file could not be parsed or opened."
 msgstr ""
 
-#: methods/ftp.cc:704
-msgid "Could not connect passive socket."
+#: apt-pkg/cachefile.cc:79
+msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
-#: methods/ftp.cc:722
-msgid "getaddrinfo was unable to get a listening socket"
+#: apt-pkg/policy.cc:269
+msgid "Invalid record in the preferences file, no Package header"
 msgstr ""
 
-#: methods/ftp.cc:736
-msgid "Could not bind a socket"
+#: apt-pkg/policy.cc:291
+#, c-format
+msgid "Did not understand pin type %s"
 msgstr ""
 
-#: methods/ftp.cc:740
-msgid "Could not listen on the socket"
+#: apt-pkg/policy.cc:299
+msgid "No priority (or zero) specified for pin"
 msgstr ""
 
-#: methods/ftp.cc:747
-msgid "Could not determine the socket's name"
+#: apt-pkg/pkgcachegen.cc:74
+msgid "Cache has an incompatible versioning system"
 msgstr ""
 
-#: methods/ftp.cc:779
-msgid "Unable to send PORT command"
+#: apt-pkg/pkgcachegen.cc:117
+#, c-format
+msgid "Error occurred while processing %s (NewPackage)"
 msgstr ""
 
-#: methods/ftp.cc:789
+#: apt-pkg/pkgcachegen.cc:129
 #, c-format
-msgid "Unknown address family %u (AF_*)"
+msgid "Error occurred while processing %s (UsePackage1)"
 msgstr ""
 
-#: methods/ftp.cc:798
+#: apt-pkg/pkgcachegen.cc:150
 #, c-format
-msgid "EPRT failed, server said: %s"
+msgid "Error occurred while processing %s (UsePackage2)"
 msgstr ""
 
-#: methods/ftp.cc:818
-msgid "Data socket connect timed out"
+#: apt-pkg/pkgcachegen.cc:154
+#, c-format
+msgid "Error occurred while processing %s (NewFileVer1)"
 msgstr ""
 
-#: methods/ftp.cc:825
-msgid "Unable to accept connection"
+#: apt-pkg/pkgcachegen.cc:184
+#, c-format
+msgid "Error occurred while processing %s (NewVersion1)"
 msgstr ""
 
-#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303
-msgid "Problem hashing file"
+#: apt-pkg/pkgcachegen.cc:188
+#, c-format
+msgid "Error occurred while processing %s (UsePackage3)"
 msgstr ""
 
-#: methods/ftp.cc:877
+#: apt-pkg/pkgcachegen.cc:192
 #, c-format
-msgid "Unable to fetch file, server said '%s'"
+msgid "Error occurred while processing %s (NewVersion2)"
 msgstr ""
 
-#: methods/ftp.cc:892 methods/rsh.cc:322
-msgid "Data socket timed out"
+#: apt-pkg/pkgcachegen.cc:207
+msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr ""
 
-#: methods/ftp.cc:922
-#, c-format
-msgid "Data transfer failed, server said '%s'"
+#: apt-pkg/pkgcachegen.cc:210
+msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr ""
 
-#. Get the files information
-#: methods/ftp.cc:997
-msgid "Query"
+#: apt-pkg/pkgcachegen.cc:213
+msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr ""
 
-#: methods/ftp.cc:1106
-msgid "Unable to invoke "
+#: apt-pkg/pkgcachegen.cc:241
+#, c-format
+msgid "Error occurred while processing %s (FindPkg)"
 msgstr ""
 
-#: methods/connect.cc:64
+#: apt-pkg/pkgcachegen.cc:254
 #, c-format
-msgid "Connecting to %s (%s)"
+msgid "Error occurred while processing %s (CollectFileProvides)"
 msgstr ""
 
-#: methods/connect.cc:71
+#: apt-pkg/pkgcachegen.cc:260
 #, c-format
-msgid "[IP: %s %s]"
+msgid "Package %s %s was not found while processing file dependencies"
 msgstr ""
 
-#: methods/connect.cc:80
+#: apt-pkg/pkgcachegen.cc:574
 #, c-format
-msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
+msgid "Couldn't stat source package list %s"
 msgstr ""
 
-#: methods/connect.cc:86
-#, c-format
-msgid "Cannot initiate the connection to %s:%s (%s)."
+#: apt-pkg/pkgcachegen.cc:658
+msgid "Collecting File Provides"
 msgstr ""
 
-#: methods/connect.cc:92
-#, c-format
-msgid "Could not connect to %s:%s (%s), connection timed out"
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792
+msgid "IO Error saving source cache"
 msgstr ""
 
-#: methods/connect.cc:104
+#: apt-pkg/acquire-item.cc:126
 #, c-format
-msgid "Could not connect to %s:%s (%s)."
+msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#. We say this mainly because the pause here is for the
-#. ssh connection that is still going
-#: methods/connect.cc:132 methods/rsh.cc:425
-#, c-format
-msgid "Connecting to %s"
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
+msgid "MD5Sum mismatch"
 msgstr ""
 
-#: methods/connect.cc:163
-#, c-format
-msgid "Could not resolve '%s'"
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
 msgstr ""
 
-#: methods/connect.cc:167
+#: apt-pkg/acquire-item.cc:753
 #, c-format
-msgid "Temporary failure resolving '%s'"
+msgid ""
+"I wasn't able to locate a file for the %s package. This might mean you need "
+"to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: methods/connect.cc:169
+#: apt-pkg/acquire-item.cc:812
 #, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgid ""
+"I wasn't able to locate file for the %s package. This might mean you need to "
+"manually fix this package."
 msgstr ""
 
-#: methods/connect.cc:216
+#: apt-pkg/acquire-item.cc:848
 #, c-format
-msgid "Unable to connect to %s %s:"
+msgid ""
+"The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: methods/gpgv.cc:92
-msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
+#: apt-pkg/acquire-item.cc:935
+msgid "Size mismatch"
+msgstr ""
+
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
-#: methods/gpgv.cc:191
+#: apt-pkg/cdrom.cc:507
+#, c-format
 msgid ""
-"Internal error: Good signature, but could not determine key fingerprint?!"
+"Using CD-ROM mount point %s\n"
+"Mounting CD-ROM\n"
 msgstr ""
 
-#: methods/gpgv.cc:196
-msgid "At least one invalid signature was encountered."
+#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598
+msgid "Identifying.. "
 msgstr ""
 
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
+#: apt-pkg/cdrom.cc:541
+#, c-format
+msgid "Stored label: %s \n"
 msgstr ""
 
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
+#: apt-pkg/cdrom.cc:561
+#, c-format
+msgid "Using CD-ROM mount point %s\n"
 msgstr ""
 
-#: methods/gpgv.cc:206
-msgid "Unknown error executing gpgv"
+#: apt-pkg/cdrom.cc:579
+msgid "Unmounting CD-ROM\n"
 msgstr ""
 
-#: methods/gpgv.cc:237
-msgid "The following signatures were invalid:\n"
+#: apt-pkg/cdrom.cc:583
+msgid "Waiting for disc...\n"
 msgstr ""
 
-#: methods/gpgv.cc:244
-msgid ""
-"The following signatures couldn't be verified because the public key is not "
-"available:\n"
+#. Mount the new CDROM
+#: apt-pkg/cdrom.cc:591
+msgid "Mounting CD-ROM...\n"
 msgstr ""
 
-#: methods/gzip.cc:57
-#, c-format
-msgid "Couldn't open pipe for %s"
+#: apt-pkg/cdrom.cc:609
+msgid "Scanning disc for index files..\n"
 msgstr ""
 
-#: methods/gzip.cc:102
+#: apt-pkg/cdrom.cc:647
 #, c-format
-msgid "Read error from %s process"
+msgid "Found %i package indexes, %i source indexes and %i signatures\n"
 msgstr ""
 
-#: methods/http.cc:381
-msgid "Waiting for headers"
+#: apt-pkg/cdrom.cc:710
+msgid "That is not a valid name, try again.\n"
 msgstr ""
 
-#: methods/http.cc:527
+#: apt-pkg/cdrom.cc:726
 #, c-format
-msgid "Got a single header line over %u chars"
+msgid ""
+"This disc is called: \n"
+"'%s'\n"
 msgstr ""
 
-#: methods/http.cc:535
-msgid "Bad header line"
+#: apt-pkg/cdrom.cc:730
+msgid "Copying package lists..."
 msgstr ""
 
-#: methods/http.cc:554 methods/http.cc:561
-msgid "The HTTP server sent an invalid reply header"
+#: apt-pkg/cdrom.cc:754
+msgid "Writing new source list\n"
 msgstr ""
 
-#: methods/http.cc:590
-msgid "The HTTP server sent an invalid Content-Length header"
+#: apt-pkg/cdrom.cc:763
+msgid "Source list entries for this disc are:\n"
 msgstr ""
 
-#: methods/http.cc:605
-msgid "The HTTP server sent an invalid Content-Range header"
+#: apt-pkg/cdrom.cc:803
+msgid "Unmounting CD-ROM..."
 msgstr ""
 
-#: methods/http.cc:607
-msgid "This HTTP server has broken range support"
+#: apt-pkg/indexcopy.cc:261
+#, c-format
+msgid "Wrote %i records.\n"
 msgstr ""
 
-#: methods/http.cc:631
-msgid "Unknown date format"
+#: apt-pkg/indexcopy.cc:263
+#, c-format
+msgid "Wrote %i records with %i missing files.\n"
 msgstr ""
 
-#: methods/http.cc:778
-msgid "Select failed"
+#: apt-pkg/indexcopy.cc:266
+#, c-format
+msgid "Wrote %i records with %i mismatched files\n"
 msgstr ""
 
-#: methods/http.cc:783
-msgid "Connection timed out"
+#: apt-pkg/indexcopy.cc:269
+#, c-format
+msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 
-#: methods/http.cc:806
-msgid "Error writing to output file"
+#: apt-pkg/deb/dpkgpm.cc:306
+#, c-format
+msgid "Preparing %s"
 msgstr ""
 
-#: methods/http.cc:834
-msgid "Error writing to file"
+#: apt-pkg/deb/dpkgpm.cc:307
+#, c-format
+msgid "Unpacking %s"
 msgstr ""
 
-#: methods/http.cc:859
-msgid "Error writing to the file"
+#: apt-pkg/deb/dpkgpm.cc:312
+#, c-format
+msgid "Preparing to configure %s"
 msgstr ""
 
-#: methods/http.cc:873
-msgid "Error reading from server. Remote end closed connection"
+#: apt-pkg/deb/dpkgpm.cc:313
+#, c-format
+msgid "Configuring %s"
 msgstr ""
 
-#: methods/http.cc:875
-msgid "Error reading from server"
+#: apt-pkg/deb/dpkgpm.cc:314
+#, c-format
+msgid "Installed %s"
 msgstr ""
 
-#: methods/http.cc:1106
-msgid "Bad header data"
+#: apt-pkg/deb/dpkgpm.cc:319
+#, c-format
+msgid "Preparing for removal of %s"
 msgstr ""
 
-#: methods/http.cc:1123
-msgid "Connection failed"
+#: apt-pkg/deb/dpkgpm.cc:320
+#, c-format
+msgid "Removing %s"
 msgstr ""
 
-#: methods/http.cc:1214
-msgid "Internal error"
+#: apt-pkg/deb/dpkgpm.cc:321
+#, c-format
+msgid "Removed %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:326
+#, c-format
+msgid "Preparing to completely remove %s"
+msgstr ""
+
+#: apt-pkg/deb/dpkgpm.cc:327
+#, c-format
+msgid "Completely removed %s"
 msgstr ""
 
 #: methods/rsh.cc:330