Remove no_NO translation (not needed after sarge)

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index f320a542f20fd628939ad96477f15aab5d27cc9e..b9148fe16048218c3af0a273fe08e6755c164073 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: 2004-03-14 13:46-0800\n"
+"POT-Creation-Date: 2005-01-20 19:31+0100\n"

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


@@ -146,14 +146,14 @@ msgstr ""
 msgid "       %4i %s\n"
 msgstr ""
 
 msgid "       %4i %s\n"
 msgstr ""
 

-#: cmdline/apt-cache.cc:1646 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:731 cmdline/apt-config.cc:70

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

-#: cmdline/apt-get.cc:2260 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2313 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:1653
+#: cmdline/apt-cache.cc:1658

 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 +188,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 +209,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 +228,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:699
+#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710

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


@@ -303,7 +303,7 @@ 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 ""
 
 #: ftparchive/apt-ftparchive.cc:757
 msgstr ""
 
 #: ftparchive/apt-ftparchive.cc:757


@@ -315,26 +315,31 @@ msgstr ""
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 
 msgid "Some files are missing in the package file group `%s'"
 msgstr ""
 

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

 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 
 #, c-format
 msgid "DB was corrupted, file renamed to %s.old"
 msgstr ""
 

-#: ftparchive/cachedb.cc:59
+#: ftparchive/cachedb.cc:63

 #, c-format
 #, c-format

-msgid "Unable to open DB2 file %s"
+msgid "DB is old, attempting to upgrade %s"

 msgstr ""
 
 msgstr ""
 

-#: ftparchive/cachedb.cc:99
+#: ftparchive/cachedb.cc:73
+#, c-format
+msgid "Unable to open DB file %s: %s"
+msgstr ""
+
+#: ftparchive/cachedb.cc:114

 #, c-format
 msgid "File date has changed %s"
 msgstr ""
 
 #, c-format
 msgid "File date has changed %s"
 msgstr ""
 

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

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

-#: ftparchive/cachedb.cc:253 ftparchive/cachedb.cc:257
+#: ftparchive/cachedb.cc:267

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


@@ -419,7 +424,12 @@ msgstr ""
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 

-#: ftparchive/contents.cc:346 ftparchive/contents.cc:377
+#: ftparchive/contents.cc:317
+#, c-format
+msgid "Internal Error, could not locate member %s"
+msgstr ""
+
+#: ftparchive/contents.cc:353 ftparchive/contents.cc:384

 msgid "realloc - Failed to allocate memory"
 msgstr ""
 
 msgid "realloc - Failed to allocate memory"
 msgstr ""
 


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

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

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


@@ -587,110 +597,122 @@ msgid ""
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 
 "This should NOT be done unless you know exactly what you are doing!"
 msgstr ""
 

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

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

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

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

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

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

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

 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 
 #, c-format
 msgid "%lu to remove and %lu not upgraded.\n"
 msgstr ""
 

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

 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 
 #, c-format
 msgid "%lu not fully installed or removed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:646
+#: cmdline/apt-get.cc:647

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:687
+msgid "WARNING: The following packages cannot be authenticated!"
+msgstr ""
+
+#: cmdline/apt-get.cc:698
+msgid "Install these packages without verification? [y/N] "
+msgstr ""
+
+#: cmdline/apt-get.cc:700
+msgid "Some packages could not be authenticated"
+msgstr ""
+
+#: cmdline/apt-get.cc:709 cmdline/apt-get.cc:855
+msgid "There are problems and -y was used without --force-yes"
+msgstr ""
+
+#: cmdline/apt-get.cc:762

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

-#: cmdline/apt-get.cc:744 cmdline/apt-get.cc:1716 cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802

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

-#: cmdline/apt-get.cc:754 cmdline/apt-get.cc:1797 cmdline/apt-get.cc:2008
+#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061

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

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

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

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

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

 #, 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:811
-msgid "There are problems and -y was used without --force-yes"
-msgstr ""
-
-#: cmdline/apt-get.cc:817 cmdline/apt-get.cc:837
+#: cmdline/apt-get.cc:861 cmdline/apt-get.cc:881

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

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

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

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


@@ -698,74 +720,74 @@ msgid ""
 " ?] "
 msgstr ""
 
 " ?] "
 msgstr ""
 

-#: cmdline/apt-get.cc:827 cmdline/apt-get.cc:846
+#: cmdline/apt-get.cc:871 cmdline/apt-get.cc:890

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

-#: cmdline/apt-get.cc:842
+#: cmdline/apt-get.cc:886

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

-#: cmdline/apt-get.cc:911 cmdline/apt-get.cc:1281 cmdline/apt-get.cc:1906
+#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959

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

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

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

-#: cmdline/apt-get.cc:930 cmdline/apt-get.cc:1915
+#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968

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

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

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

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

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

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

 msgid "Aborting Install."
 msgstr ""
 
 msgid "Aborting Install."
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1409 cmdline/apt-get.cc:1445
+#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498

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

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

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

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

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

 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"


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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1611
+#: cmdline/apt-get.cc:1664

 msgid "Calculating Upgrade... "
 msgstr ""
 
 msgid "Calculating Upgrade... "
 msgstr ""
 

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

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

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

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

-#: cmdline/apt-get.cc:1792
+#: cmdline/apt-get.cc:1845

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1968
+#: cmdline/apt-get.cc:2021

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:2265
+#: cmdline/apt-get.cc:2318

 msgid "Supported Modules:"
 msgstr ""
 
 msgid "Supported Modules:"
 msgstr ""
 

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

 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"


@@ -1031,7 +1053,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"


@@ -1086,7 +1108,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


@@ -1119,23 +1141,23 @@ msgstr ""
 msgid "Merging Available information"
 msgstr ""
 
 msgid "Merging Available information"
 msgstr ""
 

-#: apt-inst/contrib/extracttar.cc:116
+#: apt-inst/contrib/extracttar.cc:117

 msgid "Failed to create pipes"
 msgstr ""
 
 msgid "Failed to create pipes"
 msgstr ""
 

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

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

-#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
+#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206

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

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

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

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

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


@@ -1248,7 +1270,7 @@ 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:705
+#: 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
 #, c-format
 msgid "Unable to read %s"
 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/acquire.cc:416 apt-pkg/clean.cc:38
 #, c-format
 msgid "Unable to read %s"


@@ -1280,8 +1302,8 @@ msgstr ""
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643
 
 #. Build the status cache
 #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643

-#: apt-pkg/pkgcachegen.cc:701 apt-pkg/pkgcachegen.cc:706
-#: apt-pkg/pkgcachegen.cc:829
+#: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717
+#: apt-pkg/pkgcachegen.cc:840

 msgid "Reading Package Lists"
 msgstr ""
 
 msgid "Reading Package Lists"
 msgstr ""
 


@@ -1358,30 +1380,30 @@ msgstr ""
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 
 msgid "Error parsing MD5. Offset %lu"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:55
+#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47

 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:72
+#: apt-inst/deb/debfile.cc:52

 #, c-format
 #, c-format

-msgid "Internal Error, could not locate member %s"
+msgid "This is not a valid DEB archive, it has no '%s' or '%s' member"

 msgstr ""
 
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:104
+#: apt-inst/deb/debfile.cc:112

 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 
 #, c-format
 msgid "Couldn't change to %s"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:125
+#: apt-inst/deb/debfile.cc:138

 msgid "Internal Error, could not locate member"
 msgstr ""
 
 msgid "Internal Error, could not locate member"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:158
+#: apt-inst/deb/debfile.cc:171

 msgid "Failed to locate a valid control file"
 msgstr ""
 
 msgid "Failed to locate a valid control file"
 msgstr ""
 

-#: apt-inst/deb/debfile.cc:243
+#: apt-inst/deb/debfile.cc:256

 msgid "Unparsible control file"
 msgstr ""
 
 msgid "Unparsible control file"
 msgstr ""
 


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

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

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


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

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

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


@@ -1562,7 +1584,7 @@ msgstr ""
 msgid "Query"
 msgstr ""
 
 msgid "Query"
 msgstr ""
 

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

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


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

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

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

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

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

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

-#: methods/http.cc:513 methods/http.cc:520
+#: methods/http.cc:517 methods/http.cc:524

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

-#: methods/http.cc:549
+#: methods/http.cc:553

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

-#: methods/http.cc:564
+#: methods/http.cc:568

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

-#: methods/http.cc:566
+#: methods/http.cc:570

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: methods/http.cc:828
+#: methods/http.cc:832

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

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

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

-#: methods/http.cc:1061
+#: methods/http.cc:1065

 msgid "Bad header Data"
 msgstr ""
 
 msgid "Bad header Data"
 msgstr ""
 

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

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

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

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


@@ -1730,42 +1760,47 @@ msgstr ""
 msgid "Opening configuration file %s"
 msgstr ""
 
 msgid "Opening configuration file %s"
 msgstr ""
 

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

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

 #, c-format
 msgid "Syntax error %s:%u: Malformed Tag"
 msgstr ""
 
 #, c-format
 msgid "Syntax error %s:%u: Malformed Tag"
 msgstr ""
 

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

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

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

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

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

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

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


@@ -1992,76 +2027,66 @@ msgstr ""
 msgid "Dependency Generation"
 msgstr ""
 
 msgid "Dependency Generation"
 msgstr ""
 

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

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

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

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

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

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

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

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

-#: apt-pkg/sourcelist.cc:93
+#: apt-pkg/sourcelist.cc:92

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

-#: apt-pkg/sourcelist.cc:99
+#: apt-pkg/sourcelist.cc:98

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

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

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

-#: apt-pkg/sourcelist.cc:183 apt-pkg/sourcelist.cc:207
-#, c-format
-msgid "Vendor block %s is invalid"
-msgstr ""
-
-#: apt-pkg/sourcelist.cc:235
+#: apt-pkg/sourcelist.cc:156

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

-#: apt-pkg/sourcelist.cc:249
+#: apt-pkg/sourcelist.cc:170

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

-#: apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:187

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

-#: apt-pkg/sourcelist.cc:270
+#: apt-pkg/sourcelist.cc:191

 #, c-format
 #, c-format

-msgid "Type '%s' is not known in on line %u in source list %s"
+msgid "Type '%s' is not known on line %u in source list %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:279 apt-pkg/sourcelist.cc:282
+#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:202

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

-#: apt-pkg/sourcelist.cc:296
-#, c-format
-msgid "Unknown vendor ID '%s' in line %u of source list %s"
-msgstr ""
-

 #: apt-pkg/packagemanager.cc:402
 #, c-format
 msgid ""
 #: apt-pkg/packagemanager.cc:402
 #, c-format
 msgid ""


@@ -2075,19 +2100,19 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/algorithms.cc:238
+#: 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 ""
 
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1056
+#: apt-pkg/algorithms.cc:1059

 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr ""
 

-#: apt-pkg/algorithms.cc:1058
+#: apt-pkg/algorithms.cc:1061

 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 
 msgid "Unable to correct problems, you have held broken packages."
 msgstr ""
 


@@ -2125,7 +2150,7 @@ msgstr ""
 msgid "Unable to stat %s."
 msgstr ""
 
 msgid "Unable to stat %s."
 msgstr ""
 

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

 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr ""
 


@@ -2225,47 +2250,44 @@ msgstr ""
 msgid "Collecting File Provides"
 msgstr ""
 
 msgid "Collecting File Provides"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:774 apt-pkg/pkgcachegen.cc:781
+#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792

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

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

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

-#: apt-pkg/acquire-item.cc:353
+#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:904
+msgid "MD5Sum mismatch"
+msgstr ""
+
+#: apt-pkg/acquire-item.cc:718

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

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

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

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

-#: apt-pkg/acquire-item.cc:511
-msgid "MD5Sum mismatch"
-msgstr ""
-
-#: methods/rsh.cc:264
-msgid "File Not Found"
-msgstr ""
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
+#: apt-pkg/vendorlist.cc:66
+#, c-format
+msgid "Vendor block %s contains no fingerprint"

 msgstr ""
 msgstr ""