merged -r 1923..1926 from lp:~donkult/apt/sid

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

diff --git a/po/apt-all.pot b/po/apt-all.pot
index f20aa22414828c1e9af6819ff59a18d4fdee0086..83c55c9d4e06a13641f1b67f97b895feda9d06bb 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: 2008-09-22 21:18+0200\n"
+"POT-Creation-Date: 2009-12-10 16:49+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"


@@ -21,7 +21,7 @@ msgid "Package %s version %s has an unmet dep:\n"
 msgstr ""
 
 #: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644
 msgstr ""
 
 #: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:644

-#: cmdline/apt-cache.cc:800 cmdline/apt-cache.cc:1022
+#: cmdline/apt-cache.cc:797 cmdline/apt-cache.cc:1021

 #: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"
 #: cmdline/apt-cache.cc:1423 cmdline/apt-cache.cc:1575
 #, c-format
 msgid "Unable to locate package %s"


@@ -91,7 +91,7 @@ msgstr ""
 msgid "Total space accounted for: "
 msgstr ""
 
 msgid "Total space accounted for: "
 msgstr ""
 

-#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1222
+#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1221

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


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

-#: cmdline/apt-cache.cc:1719 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70

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

-#: cmdline/apt-get.cc:2573 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144

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

-#: cmdline/apt-cache.cc:1726
+#: cmdline/apt-cache.cc:1725

 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"


@@ -179,8 +179,8 @@ msgid ""
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"
 "   show - Show a readable record for the package\n"
 "   depends - Show raw dependency information for a package\n"
 "   rdepends - Show reverse dependency information for a package\n"

-"   pkgnames - List the names of all packages\n"
-"   dotty - Generate package graphs for GraphVis\n"
+"   pkgnames - List the names of all packages in the system\n"
+"   dotty - Generate package graphs for GraphViz\n"

 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"
 "   xvcg - Generate package graphs for xvcg\n"
 "   policy - Show policy settings\n"
 "\n"


@@ -195,15 +195,15 @@ msgid ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:78
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+#: cmdline/apt-cdrom.cc:77
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:93
+#: cmdline/apt-cdrom.cc:92

 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 
 msgid "Please insert a Disc in the drive and press enter"
 msgstr ""
 

-#: cmdline/apt-cdrom.cc:117
+#: cmdline/apt-cdrom.cc:114

 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 
 msgid "Repeat this process for the rest of the CDs in your set."
 msgstr ""
 


@@ -246,8 +246,7 @@ msgid ""
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 msgstr ""
 

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

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


@@ -546,221 +545,221 @@ msgstr ""
 msgid "Failed to rename %s to %s"
 msgstr ""
 
 msgid "Failed to rename %s to %s"
 msgstr ""
 

-#: cmdline/apt-get.cc:124
+#: cmdline/apt-get.cc:127

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

-#: cmdline/apt-get.cc:146 cmdline/apt-get.cc:1651
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720

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

-#: cmdline/apt-get.cc:241
+#: cmdline/apt-get.cc:244

 msgid "The following packages have unmet dependencies:"
 msgstr ""
 
 msgid "The following packages have unmet dependencies:"
 msgstr ""
 

-#: cmdline/apt-get.cc:331
+#: cmdline/apt-get.cc:334

 #, c-format
 msgid "but %s is installed"
 msgstr ""
 
 #, c-format
 msgid "but %s is installed"
 msgstr ""
 

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

 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 
 #, c-format
 msgid "but %s is to be installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:340
+#: cmdline/apt-get.cc:343

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

-#: cmdline/apt-get.cc:342
+#: cmdline/apt-get.cc:345

 msgid "but it is a virtual package"
 msgstr ""
 
 msgid "but it is a virtual package"
 msgstr ""
 

-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348

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

-#: cmdline/apt-get.cc:345
+#: cmdline/apt-get.cc:348

 msgid "but it is not going to be installed"
 msgstr ""
 
 msgid "but it is not going to be installed"
 msgstr ""
 

-#: cmdline/apt-get.cc:350
+#: cmdline/apt-get.cc:353

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

-#: cmdline/apt-get.cc:379
+#: cmdline/apt-get.cc:382

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

-#: cmdline/apt-get.cc:405
+#: cmdline/apt-get.cc:408

 msgid "The following packages will be REMOVED:"
 msgstr ""
 
 msgid "The following packages will be REMOVED:"
 msgstr ""
 

-#: cmdline/apt-get.cc:427
+#: cmdline/apt-get.cc:430

 msgid "The following packages have been kept back:"
 msgstr ""
 
 msgid "The following packages have been kept back:"
 msgstr ""
 

-#: cmdline/apt-get.cc:448
+#: cmdline/apt-get.cc:451

 msgid "The following packages will be upgraded:"
 msgstr ""
 
 msgid "The following packages will be upgraded:"
 msgstr ""
 

-#: cmdline/apt-get.cc:469
+#: cmdline/apt-get.cc:472

 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 
 msgid "The following packages will be DOWNGRADED:"
 msgstr ""
 

-#: cmdline/apt-get.cc:489
+#: cmdline/apt-get.cc:492

 msgid "The following held packages will be changed:"
 msgstr ""
 
 msgid "The following held packages will be changed:"
 msgstr ""
 

-#: cmdline/apt-get.cc:542
+#: cmdline/apt-get.cc:545

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

-#: cmdline/apt-get.cc:550
+#: cmdline/apt-get.cc:553

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:589
+#: cmdline/apt-get.cc:592

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

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

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

-#: cmdline/apt-get.cc:670
+#: cmdline/apt-get.cc:672

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

-#: cmdline/apt-get.cc:673
+#: cmdline/apt-get.cc:675

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

-#: cmdline/apt-get.cc:676
+#: cmdline/apt-get.cc:678

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

-#: cmdline/apt-get.cc:678
+#: cmdline/apt-get.cc:680

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

-#: cmdline/apt-get.cc:682
+#: cmdline/apt-get.cc:684

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

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

-#: cmdline/apt-get.cc:707
+#: cmdline/apt-get.cc:712

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

-#: cmdline/apt-get.cc:711
+#: cmdline/apt-get.cc:716

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

-#: cmdline/apt-get.cc:718
+#: cmdline/apt-get.cc:723

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

-#: cmdline/apt-get.cc:720
+#: cmdline/apt-get.cc:725

 msgid "Some packages could not be authenticated"
 msgstr ""
 
 msgid "Some packages could not be authenticated"
 msgstr ""
 

-#: cmdline/apt-get.cc:729 cmdline/apt-get.cc:881
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886

 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 

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

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

-#: cmdline/apt-get.cc:782
+#: cmdline/apt-get.cc:784

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

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

-#: cmdline/apt-get.cc:809 cmdline/apt-get.cc:1990 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095

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

-#: cmdline/apt-get.cc:819 cmdline/apt-get.cc:2071 cmdline/apt-get.cc:2317
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392

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

-#: cmdline/apt-get.cc:834
+#: cmdline/apt-get.cc:836

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

-#: cmdline/apt-get.cc:839
+#: cmdline/apt-get.cc:841

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

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

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

-#: cmdline/apt-get.cc:850
+#: cmdline/apt-get.cc:852

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

-#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:2166
+#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238

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

-#: cmdline/apt-get.cc:871
+#: cmdline/apt-get.cc:876

 #, 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:887 cmdline/apt-get.cc:907
+#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912

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

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

-#: cmdline/apt-get.cc:891
+#: cmdline/apt-get.cc:896

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


@@ -768,75 +767,74 @@ msgid ""
 " ?] "
 msgstr ""
 
 " ?] "
 msgstr ""
 

-#: cmdline/apt-get.cc:897 cmdline/apt-get.cc:916
+#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921

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

-#: cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:917

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

-#: cmdline/apt-get.cc:984 cmdline/apt-get.cc:2214 apt-pkg/algorithms.cc:1344
-#: apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389

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

-#: cmdline/apt-get.cc:1002
+#: cmdline/apt-get.cc:1007

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

-#: cmdline/apt-get.cc:1003 cmdline/apt-get.cc:2223
+#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298

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

-#: cmdline/apt-get.cc:1009
+#: cmdline/apt-get.cc:1014

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

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

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

-#: cmdline/apt-get.cc:1019
+#: cmdline/apt-get.cc:1024

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1144

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


@@ -844,111 +842,131 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
 "is only available from another source\n"
 msgstr ""
 

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

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

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

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

-#: cmdline/apt-get.cc:1156
+#: cmdline/apt-get.cc:1186

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

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

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

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

 #, 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:1338
+#: cmdline/apt-get.cc:1348
+#, c-format
+msgid "No source package '%s' picking '%s' instead\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1385

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

-#: cmdline/apt-get.cc:1351
+#: cmdline/apt-get.cc:1398

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

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

 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 

-#: cmdline/apt-get.cc:1435
+#: cmdline/apt-get.cc:1503

 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 

-#: cmdline/apt-get.cc:1437
+#: cmdline/apt-get.cc:1505
+#, c-format
+msgid "%lu packages were automatically installed and are no longer required.\n"
+msgstr ""
+
+#: cmdline/apt-get.cc:1506

 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 

-#: cmdline/apt-get.cc:1442
+#: cmdline/apt-get.cc:1511

 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
 msgstr ""
 

-#: cmdline/apt-get.cc:1445 cmdline/apt-get.cc:1733
+#.
+#. if (Packages == 1)
+#. {
+#. c1out << endl;
+#. c1out <<
+#. _("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.") << endl;
+#. }
+#.
+#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804

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

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

-#: cmdline/apt-get.cc:1468
+#: cmdline/apt-get.cc:1537

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

-#: cmdline/apt-get.cc:1523
+#: cmdline/apt-get.cc:1592

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

-#: cmdline/apt-get.cc:1638 cmdline/apt-get.cc:1674
+#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743

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

-#: cmdline/apt-get.cc:1661
+#: cmdline/apt-get.cc:1730

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

 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1774

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

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

 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"


@@ -956,160 +974,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
 "or been moved out of Incoming."
 msgstr ""
 

-#: cmdline/apt-get.cc:1728
-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:1736
+#: cmdline/apt-get.cc:1807

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

-#: cmdline/apt-get.cc:1765
+#: cmdline/apt-get.cc:1836

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

-#: cmdline/apt-get.cc:1854
+#: cmdline/apt-get.cc:1925

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

-#: cmdline/apt-get.cc:1855
+#: cmdline/apt-get.cc:1926

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

-#: cmdline/apt-get.cc:1883
+#: cmdline/apt-get.cc:1955

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

-#: cmdline/apt-get.cc:1886 methods/ftp.cc:702 methods/connect.cc:112
-#: methods/ftp.cc:707 methods/ftp.cc:708
+#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112

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

-#: cmdline/apt-get.cc:1891
+#: cmdline/apt-get.cc:1963

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

-#: cmdline/apt-get.cc:1958 cmdline/apt-get.cc:1966
+#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038

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

-#: cmdline/apt-get.cc:2066
+#: cmdline/apt-get.cc:2138

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

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

 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 

-#: cmdline/apt-get.cc:2173
+#: cmdline/apt-get.cc:2248

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

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

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

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

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

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

-#: cmdline/apt-get.cc:2247
+#: cmdline/apt-get.cc:2322

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

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

-#: cmdline/apt-get.cc:2260
+#: cmdline/apt-get.cc:2335

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

-#: cmdline/apt-get.cc:2277
+#: cmdline/apt-get.cc:2352

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

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

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

-#: cmdline/apt-get.cc:2312
+#: cmdline/apt-get.cc:2387

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

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

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

-#: cmdline/apt-get.cc:2412
+#: cmdline/apt-get.cc:2487

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

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

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

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

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

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

-#: cmdline/apt-get.cc:2578
+#: cmdline/apt-get.cc:2656

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

-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2697

 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"


@@ -1125,7 +1135,7 @@ msgid ""
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"
 "   install - Install new packages (pkg is libc6 not libc6.deb)\n"
 "   remove - Remove packages\n"
 "   autoremove - Remove automatically all unused packages\n"

-"   purge - Remove and purge packages\n"
+"   purge - Remove packages and config files\n"

 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"
 "   source - Download source archives\n"
 "   build-dep - Configure build-dependencies for source packages\n"
 "   dist-upgrade - Distribution upgrade, see apt-get(8)\n"


@@ -1153,6 +1163,14 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 

+#: cmdline/apt-get.cc:2864
+msgid ""
+"NOTE: This is only a simulation!\n"
+"      apt-get needs root privileges for real execution.\n"
+"      Keep also in mind that locking is deactivated,\n"
+"      so don't depend on the relevance to the real current situation!"
+msgstr ""
+

 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""
 #: cmdline/acqprogress.cc:55
 msgid "Hit "
 msgstr ""


@@ -1219,11 +1237,11 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr ""
 
 #: dselect/install:101
 msgstr ""
 
 #: dselect/install:101

-msgid "Some errors occurred while unpacking. I'm going to configure the"
+msgid "Some errors occurred while unpacking. Packages that were installed"

 msgstr ""
 
 #: dselect/install:102
 msgstr ""
 
 #: dselect/install:102

-msgid "packages that were installed. This may result in duplicate errors"
+msgid "will be configured. This may result in duplicate errors"

 msgstr ""
 
 #: dselect/install:103
 msgstr ""
 
 #: dselect/install:103


@@ -1268,7 +1286,12 @@ msgstr ""
 msgid "Error reading archive member header"
 msgstr ""
 
 msgid "Error reading archive member header"
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:90
+#, c-format
+msgid "Invalid archive member header %s"
+msgstr ""
+
+#: apt-inst/contrib/arfile.cc:102

 msgid "Invalid archive member header"
 msgstr ""
 
 msgid "Invalid archive member header"
 msgstr ""
 


@@ -1370,15 +1393,11 @@ msgstr ""
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.

-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:821
-#: apt-pkg/contrib/cdromutl.cc:150 apt-pkg/sourcelist.cc:320
-#: apt-pkg/acquire.cc:418 apt-pkg/clean.cc:34
-#: apt-pkg/contrib/configuration.cc:822 apt-pkg/contrib/cdromutl.cc:157
-#: apt-pkg/sourcelist.cc:166 apt-pkg/sourcelist.cc:172
-#: apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419 apt-pkg/init.cc:89
-#: apt-pkg/init.cc:97 apt-pkg/clean.cc:33 apt-pkg/policy.cc:281
-#: apt-pkg/policy.cc:287 apt-pkg/contrib/configuration.cc:843
-#: apt-pkg/init.cc:90 apt-pkg/init.cc:98
+#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
+#: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
+#: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
+#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287

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


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

-#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:748
-#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822
-#: apt-pkg/pkgcachegen.cc:945 apt-pkg/pkgcachegen.cc:763
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763

 #: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
 #: apt-pkg/pkgcachegen.cc:961
 msgid "Reading package lists"
 #: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837
 #: apt-pkg/pkgcachegen.cc:961
 msgid "Reading package lists"


@@ -1512,37 +1529,31 @@ msgstr ""
 msgid "Unparsable control file"
 msgstr ""
 
 msgid "Unparsable control file"
 msgstr ""
 

-#: apt-inst/contrib/arfile.cc:90
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr ""
-
-#: methods/cdrom.cc:114 methods/cdrom.cc:200
+#: methods/cdrom.cc:200

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

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

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

-#: methods/cdrom.cc:131 methods/cdrom.cc:219
+#: methods/cdrom.cc:219

 msgid "Wrong CD-ROM"
 msgstr ""
 
 msgid "Wrong CD-ROM"
 msgstr ""
 

-#: methods/cdrom.cc:166 methods/cdrom.cc:245
+#: methods/cdrom.cc:245

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

-#: methods/cdrom.cc:171 methods/cdrom.cc:250
+#: methods/cdrom.cc:250

 msgid "Disk not found."
 msgstr ""
 
 msgid "Disk not found."
 msgstr ""
 

-#: methods/cdrom.cc:179 methods/file.cc:79 methods/rsh.cc:264
-#: methods/cdrom.cc:258
+#: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264

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


@@ -1560,157 +1571,147 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.
 msgstr ""
 
 #. Login must be before getpeername otherwise dante won't work.

-#: methods/ftp.cc:162 methods/ftp.cc:167 methods/ftp.cc:168
+#: methods/ftp.cc:168

 msgid "Logging in"
 msgstr ""
 
 msgid "Logging in"
 msgstr ""
 

-#: methods/ftp.cc:168 methods/ftp.cc:173 methods/ftp.cc:174
+#: methods/ftp.cc:174

 msgid "Unable to determine the peer name"
 msgstr ""
 
 msgid "Unable to determine the peer name"
 msgstr ""
 

-#: methods/ftp.cc:173 methods/ftp.cc:178 methods/ftp.cc:179
+#: methods/ftp.cc:179

 msgid "Unable to determine the local name"
 msgstr ""
 
 msgid "Unable to determine the local name"
 msgstr ""
 

-#: methods/ftp.cc:204 methods/ftp.cc:232 methods/ftp.cc:209 methods/ftp.cc:237

 #: methods/ftp.cc:210 methods/ftp.cc:238
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 
 #: methods/ftp.cc:210 methods/ftp.cc:238
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr ""
 

-#: methods/ftp.cc:210 methods/ftp.cc:215 methods/ftp.cc:216
+#: methods/ftp.cc:216

 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:217 methods/ftp.cc:222 methods/ftp.cc:223
+#: methods/ftp.cc:223

 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:237 methods/ftp.cc:242 methods/ftp.cc:243
+#: methods/ftp.cc:243

 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 msgstr ""
 

-#: methods/ftp.cc:265 methods/ftp.cc:270 methods/ftp.cc:271
+#: methods/ftp.cc:271

 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:291 methods/ftp.cc:296 methods/ftp.cc:297
+#: methods/ftp.cc:297

 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/ftp.cc:335 methods/ftp.cc:446
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226

 msgid "Connection timeout"
 msgstr ""
 
 msgid "Connection timeout"
 msgstr ""
 

-#: methods/ftp.cc:335 methods/ftp.cc:340 methods/ftp.cc:341
+#: methods/ftp.cc:341

 msgid "Server closed the connection"
 msgstr ""
 
 msgid "Server closed the connection"
 msgstr ""
 

-#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:538 methods/rsh.cc:190
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:541 methods/ftp.cc:344
-#: apt-pkg/contrib/fileutl.cc:543
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190

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

-#: methods/ftp.cc:345 methods/rsh.cc:197 methods/ftp.cc:350 methods/ftp.cc:351
+#: methods/ftp.cc:351 methods/rsh.cc:197

 msgid "A response overflowed the buffer."
 msgstr ""
 
 msgid "A response overflowed the buffer."
 msgstr ""
 

-#: methods/ftp.cc:362 methods/ftp.cc:374 methods/ftp.cc:367 methods/ftp.cc:379

 #: methods/ftp.cc:368 methods/ftp.cc:380
 msgid "Protocol corruption"
 msgstr ""
 
 #: methods/ftp.cc:368 methods/ftp.cc:380
 msgid "Protocol corruption"
 msgstr ""
 

-#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:577 methods/rsh.cc:232
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:580 methods/ftp.cc:452
-#: apt-pkg/contrib/fileutl.cc:582
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232

 msgid "Write error"
 msgstr ""
 
 msgid "Write error"
 msgstr ""
 

-#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 methods/ftp.cc:692
-#: methods/ftp.cc:698 methods/ftp.cc:734 methods/ftp.cc:699 methods/ftp.cc:735
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735

 msgid "Could not create a socket"
 msgstr ""
 
 msgid "Could not create a socket"
 msgstr ""
 

-#: methods/ftp.cc:698 methods/ftp.cc:703 methods/ftp.cc:704
+#: methods/ftp.cc:704

 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 
 msgid "Could not connect data socket, connection timed out"
 msgstr ""
 

-#: methods/ftp.cc:704 methods/ftp.cc:709 methods/ftp.cc:710
+#: methods/ftp.cc:710

 msgid "Could not connect passive socket."
 msgstr ""
 
 msgid "Could not connect passive socket."
 msgstr ""
 

-#: methods/ftp.cc:722 methods/ftp.cc:727 methods/ftp.cc:728
+#: methods/ftp.cc:728

 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr ""
 

-#: methods/ftp.cc:736 methods/ftp.cc:741 methods/ftp.cc:742
+#: methods/ftp.cc:742

 msgid "Could not bind a socket"
 msgstr ""
 
 msgid "Could not bind a socket"
 msgstr ""
 

-#: methods/ftp.cc:740 methods/ftp.cc:745 methods/ftp.cc:746
+#: methods/ftp.cc:746

 msgid "Could not listen on the socket"
 msgstr ""
 
 msgid "Could not listen on the socket"
 msgstr ""
 

-#: methods/ftp.cc:747 methods/ftp.cc:752 methods/ftp.cc:753
+#: methods/ftp.cc:753

 msgid "Could not determine the socket's name"
 msgstr ""
 
 msgid "Could not determine the socket's name"
 msgstr ""
 

-#: methods/ftp.cc:779 methods/ftp.cc:784 methods/ftp.cc:785
+#: methods/ftp.cc:785

 msgid "Unable to send PORT command"
 msgstr ""
 
 msgid "Unable to send PORT command"
 msgstr ""
 

-#: methods/ftp.cc:789 methods/ftp.cc:794 methods/ftp.cc:795
+#: methods/ftp.cc:795

 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr ""
 

-#: methods/ftp.cc:798 methods/ftp.cc:803 methods/ftp.cc:804
+#: methods/ftp.cc:804

 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr ""
 

-#: methods/ftp.cc:818 methods/ftp.cc:823 methods/ftp.cc:824
+#: methods/ftp.cc:824

 msgid "Data socket connect timed out"
 msgstr ""
 
 msgid "Data socket connect timed out"
 msgstr ""
 

-#: methods/ftp.cc:825 methods/ftp.cc:830 methods/ftp.cc:831
+#: methods/ftp.cc:831

 msgid "Unable to accept connection"
 msgstr ""
 
 msgid "Unable to accept connection"
 msgstr ""
 

-#: methods/ftp.cc:864 methods/http.cc:960 methods/rsh.cc:303
-#: methods/ftp.cc:869 methods/http.cc:996 methods/ftp.cc:870
-#: methods/http.cc:999
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303

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

-#: methods/ftp.cc:877 methods/ftp.cc:882 methods/ftp.cc:883
+#: methods/ftp.cc:883

 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr ""
 

-#: methods/ftp.cc:892 methods/rsh.cc:322 methods/ftp.cc:897 methods/ftp.cc:898
+#: methods/ftp.cc:898 methods/rsh.cc:322

 msgid "Data socket timed out"
 msgstr ""
 
 msgid "Data socket timed out"
 msgstr ""
 

-#: methods/ftp.cc:922 methods/ftp.cc:927 methods/ftp.cc:928
+#: methods/ftp.cc:928

 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr ""
 
 #. Get the files information

-#: methods/ftp.cc:997 methods/ftp.cc:1002 methods/ftp.cc:1005
+#: methods/ftp.cc:1005

 msgid "Query"
 msgstr ""
 
 msgid "Query"
 msgstr ""
 

-#: methods/ftp.cc:1109 methods/ftp.cc:1114 methods/ftp.cc:1117
+#: methods/ftp.cc:1117

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


@@ -1768,41 +1769,41 @@ msgstr ""
 
 #: methods/connect.cc:240
 #, c-format
 
 #: methods/connect.cc:240
 #, c-format

-msgid "Unable to connect to %s %s:"
+msgid "Unable to connect to %s:%s:"

 msgstr ""
 
 msgstr ""
 

-#: methods/gpgv.cc:65 methods/gpgv.cc:71
+#: methods/gpgv.cc:71

 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 
 #, c-format
 msgid "Couldn't access keyring: '%s'"
 msgstr ""
 

-#: methods/gpgv.cc:101 methods/gpgv.cc:107
+#: methods/gpgv.cc:107

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

-#: methods/gpgv.cc:205 methods/gpgv.cc:223
+#: methods/gpgv.cc:223

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

-#: methods/gpgv.cc:210 methods/gpgv.cc:228
+#: methods/gpgv.cc:228

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

-#: methods/gpgv.cc:214 methods/gpgv.cc:232
+#: methods/gpgv.cc:232

 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 
 #, c-format
 msgid "Could not execute '%s' to verify signature (is gpgv installed?)"
 msgstr ""
 

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

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

-#: methods/gpgv.cc:250 methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:271 methods/gpgv.cc:278

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

-#: methods/gpgv.cc:257 methods/gpgv.cc:285
+#: methods/gpgv.cc:285

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


@@ -1818,160 +1819,173 @@ msgstr ""
 msgid "Read error from %s process"
 msgstr ""
 
 msgid "Read error from %s process"
 msgstr ""
 

-#: methods/http.cc:377 methods/http.cc:384 methods/http.cc:385
+#: methods/http.cc:385

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

-#: methods/http.cc:523 methods/http.cc:530 methods/http.cc:531
+#: methods/http.cc:531

 #, 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:531 methods/http.cc:538 methods/http.cc:539
+#: methods/http.cc:539

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

-#: methods/http.cc:550 methods/http.cc:557 methods/http.cc:564

 #: methods/http.cc:558 methods/http.cc:565
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 
 #: methods/http.cc:558 methods/http.cc:565
 msgid "The HTTP server sent an invalid reply header"
 msgstr ""
 

-#: methods/http.cc:586 methods/http.cc:593 methods/http.cc:594
+#: methods/http.cc:594

 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:601 methods/http.cc:608 methods/http.cc:609
+#: methods/http.cc:609

 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:603 methods/http.cc:610 methods/http.cc:611
+#: methods/http.cc:611

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

-#: methods/http.cc:627 methods/http.cc:634 methods/http.cc:635
+#: methods/http.cc:635

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

-#: methods/http.cc:774 methods/http.cc:787 methods/http.cc:790
+#: methods/http.cc:790

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

-#: methods/http.cc:779 methods/http.cc:792 methods/http.cc:795
+#: methods/http.cc:795

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

-#: methods/http.cc:802 methods/http.cc:815 methods/http.cc:818
+#: methods/http.cc:818

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

-#: methods/http.cc:833 methods/http.cc:846 methods/http.cc:849
+#: methods/http.cc:849

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

-#: methods/http.cc:861 methods/http.cc:874 methods/http.cc:877
+#: methods/http.cc:877

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

-#: methods/http.cc:875 methods/http.cc:888 methods/http.cc:891
+#: methods/http.cc:891

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

-#: methods/http.cc:877 methods/http.cc:890 methods/http.cc:893
+#: methods/http.cc:893

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

-#: methods/http.cc:945 apt-pkg/contrib/mmap.cc:196 methods/http.cc:981
-#: apt-pkg/contrib/mmap.cc:215 methods/http.cc:984
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215

 msgid "Failed to truncate file"
 msgstr ""
 
 msgid "Failed to truncate file"
 msgstr ""
 

-#: methods/http.cc:1105 methods/http.cc:1146 methods/http.cc:1149
+#: methods/http.cc:1149

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

-#: methods/http.cc:1122 methods/http.cc:1177 methods/http.cc:1163
-#: methods/http.cc:1218 methods/http.cc:1166 methods/http.cc:1221
+#: methods/http.cc:1166 methods/http.cc:1221

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

-#: methods/http.cc:1229 methods/http.cc:1310 methods/http.cc:1313
+#: methods/http.cc:1313

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

-#: apt-pkg/contrib/mmap.cc:80 apt-pkg/contrib/mmap.cc:76
+#: apt-pkg/contrib/mmap.cc:76

 msgid "Can't mmap an empty file"
 msgstr ""
 
 msgid "Can't mmap an empty file"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:85 apt-pkg/contrib/mmap.cc:81
-#: apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187

 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 

-#: apt-pkg/contrib/mmap.cc:213
-msgid "Dynamic MMap ran out of room"
+#: apt-pkg/contrib/mmap.cc:234
+#, c-format
+msgid ""
+"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
+"Current value: %lu. (man 5 apt.conf)"
+msgstr ""
+
+#. d means days, h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:346
+#, c-format
+msgid "%lid %lih %limin %lis"
+msgstr ""
+
+#. h means hours, min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:353
+#, c-format
+msgid "%lih %limin %lis"
+msgstr ""
+
+#. min means minutes, s means seconds
+#: apt-pkg/contrib/strutl.cc:360
+#, c-format
+msgid "%limin %lis"
+msgstr ""
+
+#. s means seconds
+#: apt-pkg/contrib/strutl.cc:365
+#, c-format
+msgid "%lis"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/strutl.cc:1014 apt-pkg/contrib/strutl.cc:1029

 #: apt-pkg/contrib/strutl.cc:1040
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 
 #: apt-pkg/contrib/strutl.cc:1040
 #, c-format
 msgid "Selection %s not found"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:439 apt-pkg/contrib/configuration.cc:458
+#: apt-pkg/contrib/configuration.cc:458

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

-#: apt-pkg/contrib/configuration.cc:497 apt-pkg/contrib/configuration.cc:516
+#: apt-pkg/contrib/configuration.cc:516

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

-#: apt-pkg/contrib/configuration.cc:662 apt-pkg/contrib/configuration.cc:663

 #: apt-pkg/contrib/configuration.cc:684
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:684
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:681 apt-pkg/contrib/configuration.cc:682

 #: apt-pkg/contrib/configuration.cc:703
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:703
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:698 apt-pkg/contrib/configuration.cc:699

 #: apt-pkg/contrib/configuration.cc:720
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:720
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:738 apt-pkg/contrib/configuration.cc:739

 #: apt-pkg/contrib/configuration.cc:760
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:760
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:745 apt-pkg/contrib/configuration.cc:746

 #: apt-pkg/contrib/configuration.cc:767
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:767
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:749 apt-pkg/contrib/configuration.cc:754
-#: apt-pkg/contrib/configuration.cc:750 apt-pkg/contrib/configuration.cc:755

 #: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:758 apt-pkg/contrib/configuration.cc:759

 #: apt-pkg/contrib/configuration.cc:780
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 
 #: apt-pkg/contrib/configuration.cc:780
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr ""
 

-#: apt-pkg/contrib/configuration.cc:809 apt-pkg/contrib/configuration.cc:810

 #: apt-pkg/contrib/configuration.cc:831
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 #: apt-pkg/contrib/configuration.cc:831
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"


@@ -2038,15 +2052,13 @@ msgstr ""
 msgid "Unable to stat the mount point %s"
 msgstr ""
 
 msgid "Unable to stat the mount point %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:146 apt-pkg/contrib/cdromutl.cc:180
-#: apt-pkg/acquire.cc:424 apt-pkg/acquire.cc:449 apt-pkg/clean.cc:40

 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
 #: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 
 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187
 #: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39
 #, c-format
 msgid "Unable to change to %s"
 msgstr ""
 

-#: apt-pkg/contrib/cdromutl.cc:188 apt-pkg/contrib/cdromutl.cc:195
+#: apt-pkg/contrib/cdromutl.cc:195

 msgid "Failed to stat the cdrom"
 msgstr ""
 
 msgid "Failed to stat the cdrom"
 msgstr ""
 


@@ -2075,154 +2087,152 @@ msgstr ""
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 
 msgid "Waited for %s but it wasn't there"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:454 apt-pkg/contrib/fileutl.cc:455

 #: apt-pkg/contrib/fileutl.cc:456
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:456
 #, c-format
 msgid "Sub-process %s received a segmentation fault."
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:457 apt-pkg/contrib/fileutl.cc:460
+#: apt-pkg/contrib/fileutl.cc:458
+#, c-format
+msgid "Sub-process %s received signal %u."
+msgstr ""
+

 #: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:462
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:459 apt-pkg/contrib/fileutl.cc:462

 #: apt-pkg/contrib/fileutl.cc:464
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:464
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:503 apt-pkg/contrib/fileutl.cc:506

 #: apt-pkg/contrib/fileutl.cc:508
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:508
 #, c-format
 msgid "Could not open file %s"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:559 apt-pkg/contrib/fileutl.cc:562

 #: apt-pkg/contrib/fileutl.cc:564
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:564
 #, c-format
 msgid "read, still have %lu to read but none left"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:589 apt-pkg/contrib/fileutl.cc:592

 #: apt-pkg/contrib/fileutl.cc:594
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:594
 #, c-format
 msgid "write, still have %lu to write but couldn't"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:664 apt-pkg/contrib/fileutl.cc:667

 #: apt-pkg/contrib/fileutl.cc:669
 msgid "Problem closing the file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:669
 msgid "Problem closing the file"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:670 apt-pkg/contrib/fileutl.cc:673

 #: apt-pkg/contrib/fileutl.cc:675
 msgid "Problem unlinking the file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:675
 msgid "Problem unlinking the file"
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:681 apt-pkg/contrib/fileutl.cc:684

 #: apt-pkg/contrib/fileutl.cc:686
 msgid "Problem syncing the file"
 msgstr ""
 
 #: apt-pkg/contrib/fileutl.cc:686
 msgid "Problem syncing the file"
 msgstr ""
 

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

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

-#: apt-pkg/pkgcache.cc:138 apt-pkg/pkgcache.cc:139
+#: apt-pkg/pkgcache.cc:139

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

-#: apt-pkg/pkgcache.cc:143 apt-pkg/pkgcache.cc:144
+#: apt-pkg/pkgcache.cc:144

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

-#: apt-pkg/pkgcache.cc:148 apt-pkg/pkgcache.cc:149
+#: apt-pkg/pkgcache.cc:149

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

-#: apt-pkg/pkgcache.cc:153 apt-pkg/pkgcache.cc:154
+#: apt-pkg/pkgcache.cc:154

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

-#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:225

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

-#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:225

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

-#: apt-pkg/pkgcache.cc:224 apt-pkg/pkgcache.cc:225
+#: apt-pkg/pkgcache.cc:225

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

-#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:226

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

-#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:226

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

-#: apt-pkg/pkgcache.cc:225 apt-pkg/pkgcache.cc:226
+#: apt-pkg/pkgcache.cc:226

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

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

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

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

 msgid "Breaks"
 msgstr ""
 
 msgid "Breaks"
 msgstr ""
 

-#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:227
+msgid "Enhances"
+msgstr ""
+
+#: apt-pkg/pkgcache.cc:238

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

-#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:238

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

-#: apt-pkg/pkgcache.cc:237 apt-pkg/pkgcache.cc:238
+#: apt-pkg/pkgcache.cc:238

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

-#: apt-pkg/pkgcache.cc:238 apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:239

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

-#: apt-pkg/pkgcache.cc:238 apt-pkg/pkgcache.cc:239
+#: apt-pkg/pkgcache.cc:239

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

-#: apt-pkg/depcache.cc:121 apt-pkg/depcache.cc:150 apt-pkg/depcache.cc:123
-#: apt-pkg/depcache.cc:152
+#: apt-pkg/depcache.cc:123 apt-pkg/depcache.cc:152

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

-#: apt-pkg/depcache.cc:122 apt-pkg/depcache.cc:124
+#: apt-pkg/depcache.cc:124

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

-#: apt-pkg/depcache.cc:151 apt-pkg/depcache.cc:153
+#: apt-pkg/depcache.cc:153

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

-#: apt-pkg/depcache.cc:172 apt-pkg/depcache.cc:191 apt-pkg/depcache.cc:195

 #: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr ""
 
 #: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197
 msgid "Reading state information"
 msgstr ""
 

-#: apt-pkg/depcache.cc:219 apt-pkg/depcache.cc:223
+#: apt-pkg/depcache.cc:223

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

-#: apt-pkg/depcache.cc:225 apt-pkg/depcache.cc:229
+#: apt-pkg/depcache.cc:229

 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr ""


@@ -2262,35 +2272,32 @@ msgstr ""
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 
 msgid "Malformed line %lu in source list %s (dist parse)"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:199 apt-pkg/sourcelist.cc:206
+#: apt-pkg/sourcelist.cc:206

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

-#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:448 apt-pkg/sourcelist.cc:223
-#: apt-pkg/cdrom.cc:445
+#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445

 #, 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:236 apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:243

 #, 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:240 apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:247

 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr ""
 

-#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251

 #: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 
 #: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
 #, c-format
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 

-#: apt-pkg/packagemanager.cc:428 apt-pkg/packagemanager.cc:436
-#: apt-pkg/packagemanager.cc:440
+#: apt-pkg/packagemanager.cc:439

 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "


@@ -2303,47 +2310,46 @@ msgstr ""
 msgid "Index file type '%s' is not supported"
 msgstr ""
 
 msgid "Index file type '%s' is not supported"
 msgstr ""
 

-#: apt-pkg/algorithms.cc:247 apt-pkg/algorithms.cc:248
+#: apt-pkg/algorithms.cc:248

 #, 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:1106 apt-pkg/algorithms.cc:1138
+#: apt-pkg/algorithms.cc:1138

 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:1108 apt-pkg/algorithms.cc:1140
+#: apt-pkg/algorithms.cc:1140

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

-#: apt-pkg/algorithms.cc:1370 apt-pkg/algorithms.cc:1372

 #: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 
 #: apt-pkg/algorithms.cc:1415 apt-pkg/algorithms.cc:1417
 msgid ""
 "Some index files failed to download, they have been ignored, or old ones "
 "used instead."
 msgstr ""
 

-#: apt-pkg/acquire.cc:59 apt-pkg/acquire.cc:60
+#: apt-pkg/acquire.cc:60

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

-#: apt-pkg/acquire.cc:63 apt-pkg/acquire.cc:64
+#: apt-pkg/acquire.cc:64

 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days
 #, c-format
 msgid "Archive directory %spartial is missing."
 msgstr ""
 
 #. only show the ETA if it makes sense
 #. two days

-#: apt-pkg/acquire.cc:828 apt-pkg/acquire.cc:826
+#: apt-pkg/acquire.cc:826

 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr ""
 

-#: apt-pkg/acquire.cc:830 apt-pkg/acquire.cc:828
+#: apt-pkg/acquire.cc:828

 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr ""


@@ -2358,21 +2364,21 @@ msgstr ""
 msgid "Method %s did not start correctly"
 msgstr ""
 
 msgid "Method %s did not start correctly"
 msgstr ""
 

-#: apt-pkg/acquire-worker.cc:399 apt-pkg/acquire-worker.cc:413
+#: apt-pkg/acquire-worker.cc:413

 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 
 #, c-format
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr ""
 

-#: apt-pkg/init.cc:124 apt-pkg/init.cc:132 apt-pkg/init.cc:133
+#: apt-pkg/init.cc:133

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

-#: apt-pkg/init.cc:140 apt-pkg/init.cc:148 apt-pkg/init.cc:149
+#: apt-pkg/init.cc:149

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

-#: apt-pkg/clean.cc:57 apt-pkg/clean.cc:56
+#: apt-pkg/clean.cc:56

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


@@ -2389,135 +2395,130 @@ msgstr ""
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr ""
 

-#: apt-pkg/policy.cc:267
-msgid "Invalid record in the preferences file, no Package header"
+#: apt-pkg/policy.cc:347
+#, c-format
+msgid "Invalid record in the preferences file %s, no Package header"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:289 apt-pkg/policy.cc:369
+#: apt-pkg/policy.cc:369

 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr ""
 

-#: apt-pkg/policy.cc:297 apt-pkg/policy.cc:377
+#: apt-pkg/policy.cc:377

 msgid "No priority (or zero) specified for pin"
 msgstr ""
 
 msgid "No priority (or zero) specified for pin"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:72 apt-pkg/pkgcachegen.cc:74
+#: apt-pkg/pkgcachegen.cc:74

 msgid "Cache has an incompatible versioning system"
 msgstr ""
 
 msgid "Cache has an incompatible versioning system"
 msgstr ""
 

-#: apt-pkg/pkgcachegen.cc:115 apt-pkg/pkgcachegen.cc:117
+#: apt-pkg/pkgcachegen.cc:117

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

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

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

-#: apt-pkg/pkgcachegen.cc:153 apt-pkg/pkgcachegen.cc:166
+#: apt-pkg/pkgcachegen.cc:166

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

-#: apt-pkg/pkgcachegen.cc:178 apt-pkg/pkgcachegen.cc:191
+#: apt-pkg/pkgcachegen.cc:191

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

-#: apt-pkg/pkgcachegen.cc:182 apt-pkg/pkgcachegen.cc:195
+#: apt-pkg/pkgcachegen.cc:195

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

-#: apt-pkg/pkgcachegen.cc:213 apt-pkg/pkgcachegen.cc:226
+#: apt-pkg/pkgcachegen.cc:226

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

-#: apt-pkg/pkgcachegen.cc:217 apt-pkg/pkgcachegen.cc:230
+#: apt-pkg/pkgcachegen.cc:230

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

-#: apt-pkg/pkgcachegen.cc:221 apt-pkg/pkgcachegen.cc:234
+#: apt-pkg/pkgcachegen.cc:234

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

-#: apt-pkg/pkgcachegen.cc:245 apt-pkg/pkgcachegen.cc:258
+#: apt-pkg/pkgcachegen.cc:258

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

-#: apt-pkg/pkgcachegen.cc:251 apt-pkg/pkgcachegen.cc:264
+#: apt-pkg/pkgcachegen.cc:264

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

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

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

-#: apt-pkg/pkgcachegen.cc:257 apt-pkg/pkgcachegen.cc:270
+#: apt-pkg/pkgcachegen.cc:270

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

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

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

-#: apt-pkg/pkgcachegen.cc:288 apt-pkg/pkgcachegen.cc:301
+#: apt-pkg/pkgcachegen.cc:301

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

-#: apt-pkg/pkgcachegen.cc:301 apt-pkg/pkgcachegen.cc:314
+#: apt-pkg/pkgcachegen.cc:314

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

-#: apt-pkg/pkgcachegen.cc:307 apt-pkg/pkgcachegen.cc:320
+#: apt-pkg/pkgcachegen.cc:320

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

-#: apt-pkg/pkgcachegen.cc:678 apt-pkg/pkgcachegen.cc:693
+#: apt-pkg/pkgcachegen.cc:693

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

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

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

-#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897

 #: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
 msgid "IO Error saving source cache"
 msgstr ""
 
 #: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
 msgid "IO Error saving source cache"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:127 apt-pkg/acquire-item.cc:128
+#: apt-pkg/acquire-item.cc:128

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

-#: apt-pkg/acquire-item.cc:401 apt-pkg/acquire-item.cc:394

 #: apt-pkg/acquire-item.cc:395
 msgid "MD5Sum mismatch"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:395
 msgid "MD5Sum mismatch"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:647 apt-pkg/acquire-item.cc:1408
-#: apt-pkg/acquire-item.cc:644 apt-pkg/acquire-item.cc:1406

 #: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
 msgid "Hash Sum mismatch"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
 msgid "Hash Sum mismatch"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1100 apt-pkg/acquire-item.cc:1101

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

-#: apt-pkg/acquire-item.cc:1213 apt-pkg/acquire-item.cc:1211

 #: apt-pkg/acquire-item.cc:1216
 #, c-format
 msgid ""
 #: apt-pkg/acquire-item.cc:1216
 #, c-format
 msgid ""


@@ -2525,7 +2526,6 @@ msgid ""
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1272 apt-pkg/acquire-item.cc:1270

 #: apt-pkg/acquire-item.cc:1275
 #, c-format
 msgid ""
 #: apt-pkg/acquire-item.cc:1275
 #, c-format
 msgid ""


@@ -2533,287 +2533,229 @@ msgid ""
 "manually fix this package."
 msgstr ""
 
 "manually fix this package."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1313 apt-pkg/acquire-item.cc:1311

 #: apt-pkg/acquire-item.cc:1316
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1316
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 

-#: apt-pkg/acquire-item.cc:1400 apt-pkg/acquire-item.cc:1398

 #: apt-pkg/acquire-item.cc:1403
 msgid "Size mismatch"
 msgstr ""
 
 #: apt-pkg/acquire-item.cc:1403
 msgid "Size mismatch"
 msgstr ""
 

+#: apt-pkg/indexrecords.cc:40
+#, c-format
+msgid "Unable to parse Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:47
+#, c-format
+msgid "No sections in Release file %s"
+msgstr ""
+
+#: apt-pkg/indexrecords.cc:81
+#, c-format
+msgid "No Hash entry in Release file %s"
+msgstr ""
+

 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 
 #: apt-pkg/vendorlist.cc:66
 #, c-format
 msgid "Vendor block %s contains no fingerprint"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:529 apt-pkg/cdrom.cc:525
+#: apt-pkg/cdrom.cc:525

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

-#: apt-pkg/cdrom.cc:538 apt-pkg/cdrom.cc:627 apt-pkg/cdrom.cc:534
-#: apt-pkg/cdrom.cc:622
+#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622

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

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

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

-#: apt-pkg/cdrom.cc:570 apt-pkg/cdrom.cc:841 apt-pkg/cdrom.cc:566
-#: apt-pkg/cdrom.cc:836
+#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836

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

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

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

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

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

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

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

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

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

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

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

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

 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
 "zu signatures\n"
 msgstr ""
 
 #, c-format
 msgid ""
 "Found %zu package indexes, %zu source indexes, %zu translation indexes and %"
 "zu signatures\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:715 apt-pkg/cdrom.cc:710
+#: apt-pkg/cdrom.cc:684
+msgid ""
+"Unable to locate any package files, perhaps this is not a Debian Disc or the "
+"wrong architecture?"
+msgstr ""
+
+#: apt-pkg/cdrom.cc:710

 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 
 #, c-format
 msgid "Found label '%s'\n"
 msgstr ""
 

-#: apt-pkg/cdrom.cc:744 apt-pkg/cdrom.cc:739
+#: apt-pkg/cdrom.cc:739

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

-#: apt-pkg/cdrom.cc:760 apt-pkg/cdrom.cc:755
+#: apt-pkg/cdrom.cc:755

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

-#: apt-pkg/cdrom.cc:764 apt-pkg/cdrom.cc:759
+#: apt-pkg/cdrom.cc:759

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

-#: apt-pkg/cdrom.cc:790 apt-pkg/cdrom.cc:785
+#: apt-pkg/cdrom.cc:785

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

-#: apt-pkg/cdrom.cc:799 apt-pkg/cdrom.cc:794
+#: apt-pkg/cdrom.cc:794

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

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

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

-#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:834 apt-pkg/indexcopy.cc:837
+#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:837

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

-#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:837 apt-pkg/indexcopy.cc:840
+#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:840

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

-#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:840 apt-pkg/indexcopy.cc:843
+#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:843

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

-#: apt-pkg/deb/dpkgpm.cc:486 apt-pkg/deb/dpkgpm.cc:546
-#: apt-pkg/deb/dpkgpm.cc:558
+#: apt-pkg/indexcopy.cc:530

 #, c-format
 #, c-format

-msgid "Directory '%s' missing"
+msgid "Skipping nonexistent file %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:570 apt-pkg/deb/dpkgpm.cc:635
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/indexcopy.cc:536

 #, c-format
 #, c-format

-msgid "Preparing %s"
+msgid "Can't find authentication record for: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:571 apt-pkg/deb/dpkgpm.cc:636
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/indexcopy.cc:542

 #, c-format
 #, c-format

-msgid "Unpacking %s"
+msgid "Hash mismatch for: %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:576 apt-pkg/deb/dpkgpm.cc:641
-#: apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:49

 #, c-format
 #, c-format

-msgid "Preparing to configure %s"
+msgid "Installing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:577 apt-pkg/deb/dpkgpm.cc:606
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:642
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661

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

-#: apt-pkg/deb/dpkgpm.cc:579 apt-pkg/deb/dpkgpm.cc:580
-#, c-format
-msgid "Processing triggers for %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:582 apt-pkg/deb/dpkgpm.cc:643
-#: apt-pkg/deb/dpkgpm.cc:662
-#, c-format
-msgid "Installed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:587 apt-pkg/deb/dpkgpm.cc:589
-#: apt-pkg/deb/dpkgpm.cc:590 apt-pkg/deb/dpkgpm.cc:648
-#: apt-pkg/deb/dpkgpm.cc:667
-#, c-format
-msgid "Preparing for removal of %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:592 apt-pkg/deb/dpkgpm.cc:607
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668

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

-#: apt-pkg/deb/dpkgpm.cc:593 apt-pkg/deb/dpkgpm.cc:650
-#: apt-pkg/deb/dpkgpm.cc:669
-#, c-format
-msgid "Removed %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:598 apt-pkg/deb/dpkgpm.cc:655
-#: apt-pkg/deb/dpkgpm.cc:674
-#, c-format
-msgid "Preparing to completely remove %s"
-msgstr ""
-
-#: apt-pkg/deb/dpkgpm.cc:599 apt-pkg/deb/dpkgpm.cc:656
-#: apt-pkg/deb/dpkgpm.cc:675
-#, c-format
-msgid "Completely removed %s"
-msgstr ""
-
-#. populate the "processing" map
-#: apt-pkg/deb/dpkgpm.cc:605 apt-pkg/deb/dpkgpm.cc:49
+#: apt-pkg/deb/dpkgpm.cc:52

 #, c-format
 #, c-format

-msgid "Installing %s"
+msgid "Completely removing %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:608 apt-pkg/deb/dpkgpm.cc:52 apt-pkg/deb/dpkgpm.cc:53
+#: apt-pkg/deb/dpkgpm.cc:53

 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:759 apt-pkg/deb/dpkgpm.cc:822
-#: apt-pkg/deb/dpkgpm.cc:879
-msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
-
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr ""
-
-#: methods/rsh.cc:330
-msgid "Connection closed prematurely"
-msgstr ""
-
-#: apt-pkg/contrib/mmap.cc:234
-#, c-format
-msgid ""
-"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
-"Current value: %lu. (man 5 apt.conf)"
-msgstr ""
-
-#. d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:335 apt-pkg/contrib/strutl.cc:346
+#: apt-pkg/deb/dpkgpm.cc:558

 #, c-format
 #, c-format

-msgid "%lid %lih %limin %lis"
+msgid "Directory '%s' missing"

 msgstr ""
 
 msgstr ""
 

-#. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:342 apt-pkg/contrib/strutl.cc:353
+#: apt-pkg/deb/dpkgpm.cc:654

 #, c-format
 #, c-format

-msgid "%lih %limin %lis"
+msgid "Preparing %s"

 msgstr ""
 
 msgstr ""
 

-#. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:349 apt-pkg/contrib/strutl.cc:360
+#: apt-pkg/deb/dpkgpm.cc:655

 #, c-format
 #, c-format

-msgid "%limin %lis"
+msgid "Unpacking %s"

 msgstr ""
 
 msgstr ""
 

-#. s means seconds
-#: apt-pkg/contrib/strutl.cc:354 apt-pkg/contrib/strutl.cc:365
+#: apt-pkg/deb/dpkgpm.cc:660

 #, c-format
 #, c-format

-msgid "%lis"
+msgid "Preparing to configure %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/contrib/fileutl.cc:457 apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/deb/dpkgpm.cc:662

 #, c-format
 #, c-format

-msgid "Sub-process %s received signal %u."
-msgstr ""
-
-#: apt-pkg/pkgcache.cc:227
-msgid "Enhances"
+msgid "Installed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/policy.cc:347
+#: apt-pkg/deb/dpkgpm.cc:667

 #, c-format
 #, c-format

-msgid "Invalid record in the preferences file %s, no Package header"
+msgid "Preparing for removal of %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:40
+#: apt-pkg/deb/dpkgpm.cc:669

 #, c-format
 #, c-format

-msgid "Unable to parse Release file %s"
+msgid "Removed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:47
+#: apt-pkg/deb/dpkgpm.cc:674

 #, c-format
 #, c-format

-msgid "No sections in Release file %s"
+msgid "Preparing to completely remove %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/indexrecords.cc:81
+#: apt-pkg/deb/dpkgpm.cc:675

 #, c-format
 #, c-format

-msgid "No Hash entry in Release file %s"
+msgid "Completely removed %s"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/cdrom.cc:684
-msgid ""
-"Unable to locate any package files, perhaps this is not a Debian Disc or the "
-"wrong architecture?"
+#: apt-pkg/deb/dpkgpm.cc:879
+msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:851 apt-pkg/deb/dpkgpm.cc:908
+#: apt-pkg/deb/dpkgpm.cc:908

 msgid "Running dpkg"
 msgstr ""
 
 msgid "Running dpkg"
 msgstr ""
 


@@ -2839,46 +2781,10 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
 msgid "Not locked"
 msgstr ""
 

-#: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr ""
-
-#: methods/connect.cc:240
-#, c-format
-msgid "Unable to connect to %s:%s:"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:324 apt-pkg/packagemanager.cc:586
-#, c-format
-msgid ""
-"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
-"under APT::Immediate-Configure for details. (%d)"
-msgstr ""
-
-#: apt-pkg/packagemanager.cc:478
-#, c-format
-msgid ""
-"Could not perform immediate configuration on already unpacked '%s'.Please "
-"see man 5 apt.conf under APT::Immediate-Configure for details."
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:530
-#, c-format
-msgid "Skipping nonexistent file %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:536
-#, c-format
-msgid "Can't find authentication record for: %s"
-msgstr ""
-
-#: apt-pkg/indexcopy.cc:542
-#, c-format
-msgid "Hash mismatch for: %s"
+#: methods/rred.cc:219
+msgid "Could not patch file"

 msgstr ""
 
 msgstr ""
 

-#: apt-pkg/deb/dpkgpm.cc:52
-#, c-format
-msgid "Completely removing %s"
+#: methods/rsh.cc:330
+msgid "Connection closed prematurely"

 msgstr ""
 msgstr ""