* debian/rules:

[apt.git] / po / en_GB.po

diff --git a/po/en_GB.po b/po/en_GB.po
index b2711ba218d775cf12d0afa407670b77359472c8..fa67efa0b22de7a8f51067f455eecf087f277455 100644 (file)
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2010-01-11 15:17+0100\n"

 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"
 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"


@@ -144,14 +144,9 @@ msgstr "  Package pin: "
 msgid "  Version table:"
 msgstr "  Version table:"
 
 msgid "  Version table:"
 msgstr "  Version table:"
 

-#: cmdline/apt-cache.cc:1623
-#, c-format
-msgid "       %4i %s\n"
-msgstr "       %4i %s\n"
-

 #: 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-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-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144

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


@@ -304,7 +299,7 @@ msgstr ""
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 
 "  -c=? Read this configuration file\n"
 "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
 

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

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


@@ -437,8 +432,9 @@ msgid "DB is old, attempting to upgrade %s"
 msgstr "DB is old, attempting to upgrade %s"
 
 #: ftparchive/cachedb.cc:72
 msgstr "DB is old, attempting to upgrade %s"
 
 #: ftparchive/cachedb.cc:72

+#, fuzzy

 msgid ""
 msgid ""

-"DB format is invalid. If you upgraded from a older version of apt, please "
+"DB format is invalid. If you upgraded from an older version of apt, please "

 "remove and re-create the database."
 msgstr ""
 "DB format is invalid. If you upgraded from a older version of apt, please "
 "remove and re-create the database."
 msgstr ""
 "DB format is invalid. If you upgraded from a older version of apt, please "


@@ -455,11 +451,11 @@ msgstr "Unable to open DB file %s: %s"
 msgid "Failed to stat %s"
 msgstr "Failed to stat %s"
 
 msgid "Failed to stat %s"
 msgstr "Failed to stat %s"
 

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

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

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

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


@@ -524,26 +520,26 @@ msgstr "*** Failed to link %s to %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink limit of %sB hit.\n"
 
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink limit of %sB hit.\n"
 

-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:389

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

-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:397 ftparchive/writer.cc:628

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

-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:458 ftparchive/writer.cc:716

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

-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:638

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

-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:642

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


@@ -647,7 +643,7 @@ msgstr "Failed to rename %s to %s"
 msgid "Y"
 msgstr "Y"
 
 msgid "Y"
 msgstr "Y"
 

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

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


@@ -769,7 +765,7 @@ msgid " Done"
 msgstr "Done"
 
 #: cmdline/apt-get.cc:684
 msgstr "Done"
 
 #: cmdline/apt-get.cc:684

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

 msgstr "You might want to run ‘apt-get -f install’ to correct these."
 
 #: cmdline/apt-get.cc:687
 msgstr "You might want to run ‘apt-get -f install’ to correct these."
 
 #: cmdline/apt-get.cc:687


@@ -792,7 +788,7 @@ msgstr "Install these packages without verification [y/N]? "
 msgid "Some packages could not be authenticated"
 msgstr "Some packages could not be authenticated"
 
 msgid "Some packages could not be authenticated"
 msgstr "Some packages could not be authenticated"
 

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

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


@@ -808,11 +804,11 @@ msgstr "Packages need to be removed but remove is disabled."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internal error, Ordering didn't finish"
 
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internal error, Ordering didn't finish"
 

-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115

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

-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416

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


@@ -841,25 +837,26 @@ msgstr "After this operation, %sB of additional disk space will be used.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "After this operation, %sB disk space will be freed.\n"
 
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "After this operation, %sB disk space will be freed.\n"
 

-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259
+#: cmdline/apt-get.cc:2262

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

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

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

-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916

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

-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898

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

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

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


@@ -870,28 +867,28 @@ msgstr ""
 "To continue type in the phrase ‘%s’\n"
 " ?] "
 
 "To continue type in the phrase ‘%s’\n"
 " ?] "
 

-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925

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

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

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

-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389

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

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

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

-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322

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

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

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


@@ -899,47 +896,47 @@ msgstr ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 

-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022

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

-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027

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

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

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

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

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

-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097

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

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

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

-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126

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

-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138

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

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

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

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

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


@@ -950,58 +947,69 @@ msgstr ""
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198

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

-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227

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

-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229

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

-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235

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

-#: cmdline/apt-get.cc:1348
+#: cmdline/apt-get.cc:1321
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1352
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Couldn't stat source package list %s"
+
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1389

 #, c-format
 #, c-format

-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable version '%s' of package '%s'"

 msgstr ""
 
 msgstr ""
 

-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1405

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

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

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

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

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

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

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


@@ -1009,18 +1017,18 @@ msgstr ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
 "The following packages were automatically installed and are no longer "
 "required:"
 

-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1525

 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "The following packages were automatically installed and are no longer "
 "required:"
 

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

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

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

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


@@ -1038,43 +1046,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
 #. "that package should be filed.") << endl;
 #. }
 #.

-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763

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

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

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

-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1781

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

-#: cmdline/apt-get.cc:1774
-msgid "You might want to run `apt-get -f install' to correct these:"
+#: cmdline/apt-get.cc:1794
+msgid "You might want to run 'apt-get -f install' to correct these:"

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

-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1797

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


@@ -1082,7 +1090,7 @@ msgstr ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 

-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1809

 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"


@@ -1094,116 +1102,116 @@ msgstr ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 

-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1827

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058

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

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

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

-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434

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

-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2237

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

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

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

-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2278

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

-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2281

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

-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2287

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

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

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

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

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

-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2358

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

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

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

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

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

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

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

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

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

-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2439

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

-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2459

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

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

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


@@ -1212,7 +1220,7 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 

-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2564

 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "


@@ -1221,31 +1229,31 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 

-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2600

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

-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2627

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

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

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

-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2648

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

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

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

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

 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"


@@ -1330,7 +1338,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 

-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2889

 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"


@@ -1576,11 +1584,10 @@ msgstr "File %s/%s overwrites the one in the package %s"
 
 #. 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: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:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
-#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
+#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157
+#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159
+#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90
+#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279

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


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

-#: 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
+#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793
+#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870
+#: apt-pkg/pkgcachegen.cc:1008

 msgid "Reading package lists"
 msgstr "Reading package lists"
 
 msgid "Reading package lists"
 msgstr "Reading package lists"
 


@@ -1746,11 +1753,11 @@ msgid "File not found"
 msgstr "File not found"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
 msgstr "File not found"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150

-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492

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

-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489

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


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

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

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

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

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

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

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

-#: 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 "The server refused the connection and said: %s"
 
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "The server refused the connection and said: %s"
 

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

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

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

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

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

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


@@ -1794,114 +1801,114 @@ msgstr ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
 

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

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

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

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

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

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

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

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

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

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

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

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

-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380

 msgid "Protocol corruption"
 msgstr "Protocol corruption"
 
 msgid "Protocol corruption"
 msgstr "Protocol corruption"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303

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

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

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

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

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

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

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

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

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

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

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


@@ -1942,59 +1949,64 @@ msgstr "Could not connect to %s:%s (%s)."
 msgid "Connecting to %s"
 msgstr "Connecting to %s"
 
 msgid "Connecting to %s"
 msgstr "Connecting to %s"
 

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

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

-#: methods/connect.cc:190
+#: methods/connect.cc:191

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

-#: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#: methods/connect.cc:194
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"

 msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
 
 msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
 

-#: methods/connect.cc:240
+#: methods/connect.cc:241

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

-#: methods/gpgv.cc:71
-#, c-format
-msgid "Couldn't access keyring: '%s'"
-msgstr "Couldn't access keyring: '%s'"
+#. TRANSLATOR: %s is the trusted keyring parts directory
+#: methods/gpgv.cc:78
+#, fuzzy, c-format
+msgid "No keyring installed in %s."
+msgstr "Aborting install."
+
+#: methods/gpgv.cc:104
+msgid "E: Too many keyrings should be passed to gpgv. Exiting."
+msgstr ""

 
 

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

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

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

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

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

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

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

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

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

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

-#: methods/gpgv.cc:271 methods/gpgv.cc:278
+#: methods/gpgv.cc:285 methods/gpgv.cc:292

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

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

 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"


@@ -2012,80 +2024,80 @@ msgstr "Couldn't open pipe for %s"
 msgid "Read error from %s process"
 msgstr "Read error from %s process"
 
 msgid "Read error from %s process"
 msgstr "Read error from %s process"
 

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

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

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

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

-#: methods/http.cc:538
+#: methods/http.cc:539

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

-#: 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 "The HTTP server sent an invalid reply header"
 
 msgid "The HTTP server sent an invalid reply header"
 msgstr "The HTTP server sent an invalid reply header"
 

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

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

-#: methods/http.cc:608
+#: methods/http.cc:609

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

-#: methods/http.cc:610
+#: methods/http.cc:611

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

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

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

-#: methods/http.cc:787
+#: methods/http.cc:791

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

-#: methods/http.cc:792
+#: methods/http.cc:796

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

-#: methods/http.cc:815
+#: methods/http.cc:819

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

-#: methods/http.cc:846
+#: methods/http.cc:850

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

-#: methods/http.cc:874
+#: methods/http.cc:878

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

-#: methods/http.cc:888
+#: methods/http.cc:892

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

-#: methods/http.cc:890
+#: methods/http.cc:894

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

-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233

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

-#: methods/http.cc:1146
+#: methods/http.cc:1150

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

-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1167 methods/http.cc:1222

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

-#: methods/http.cc:1310
+#: methods/http.cc:1314

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


@@ -2093,18 +2105,25 @@ msgstr "Internal error"
 msgid "Can't mmap an empty file"
 msgstr "Cannot mmap an empty file"
 
 msgid "Can't mmap an empty file"
 msgstr "Cannot mmap an empty file"
 

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

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

-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252

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

+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+

 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format


@@ -2134,52 +2153,52 @@ msgstr ""
 msgid "Selection %s not found"
 msgstr "Selection %s not found"
 
 msgid "Selection %s not found"
 msgstr "Selection %s not found"
 

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

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

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

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

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

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

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

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

-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:714

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

-#: apt-pkg/contrib/configuration.cc:760
+#: apt-pkg/contrib/configuration.cc:754

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

-#: apt-pkg/contrib/configuration.cc:767
+#: apt-pkg/contrib/configuration.cc:761

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

-#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776
+#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770

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

-#: apt-pkg/contrib/configuration.cc:780
+#: apt-pkg/contrib/configuration.cc:774

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

-#: apt-pkg/contrib/configuration.cc:831
+#: apt-pkg/contrib/configuration.cc:825

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


@@ -2255,75 +2274,75 @@ msgstr "Unable to change to %s"
 msgid "Failed to stat the cdrom"
 msgstr "Failed to stat the cdrom"
 
 msgid "Failed to stat the cdrom"
 msgstr "Failed to stat the cdrom"
 

-#: apt-pkg/contrib/fileutl.cc:149
+#: apt-pkg/contrib/fileutl.cc:151

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

-#: apt-pkg/contrib/fileutl.cc:154
+#: apt-pkg/contrib/fileutl.cc:156

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

-#: apt-pkg/contrib/fileutl.cc:172
+#: apt-pkg/contrib/fileutl.cc:174

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

-#: apt-pkg/contrib/fileutl.cc:176
+#: apt-pkg/contrib/fileutl.cc:178

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

-#: apt-pkg/contrib/fileutl.cc:444
+#: apt-pkg/contrib/fileutl.cc:568

 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Waited for %s but it wasn't there"
 
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "Waited for %s but it wasn't there"
 

-#: apt-pkg/contrib/fileutl.cc:456
+#: apt-pkg/contrib/fileutl.cc:580

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

-#: apt-pkg/contrib/fileutl.cc:458
+#: apt-pkg/contrib/fileutl.cc:582

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

-#: apt-pkg/contrib/fileutl.cc:462
+#: apt-pkg/contrib/fileutl.cc:586

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

-#: apt-pkg/contrib/fileutl.cc:464
+#: apt-pkg/contrib/fileutl.cc:588

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

-#: apt-pkg/contrib/fileutl.cc:508
+#: apt-pkg/contrib/fileutl.cc:632

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

-#: apt-pkg/contrib/fileutl.cc:564
+#: apt-pkg/contrib/fileutl.cc:688

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

-#: apt-pkg/contrib/fileutl.cc:594
+#: apt-pkg/contrib/fileutl.cc:718

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

-#: apt-pkg/contrib/fileutl.cc:669
+#: apt-pkg/contrib/fileutl.cc:793

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

-#: apt-pkg/contrib/fileutl.cc:675
+#: apt-pkg/contrib/fileutl.cc:799

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

-#: apt-pkg/contrib/fileutl.cc:686
+#: apt-pkg/contrib/fileutl.cc:810

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


@@ -2440,57 +2459,64 @@ msgstr "Unable to parse package file %s (1)"
 msgid "Unable to parse package file %s (2)"
 msgstr "Unable to parse package file %s (2)"
 
 msgid "Unable to parse package file %s (2)"
 msgstr "Unable to parse package file %s (2)"
 

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

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

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

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

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

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

-#: apt-pkg/sourcelist.cc:101
+#: apt-pkg/sourcelist.cc:94

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

-#: apt-pkg/sourcelist.cc:108
+#: apt-pkg/sourcelist.cc:101

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

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

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

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

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

-#: apt-pkg/sourcelist.cc:243
+#: apt-pkg/sourcelist.cc:236

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

-#: apt-pkg/sourcelist.cc:247
+#: apt-pkg/sourcelist.cc:240

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

-#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258
+#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251

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

-#: apt-pkg/packagemanager.cc:436
+#: 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:440

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


@@ -2501,6 +2527,13 @@ msgstr ""
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 
 "package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
 "you really want to do it, activate the APT::Force-LoopBreak option."
 

+#: 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/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"


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

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

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

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

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


@@ -2597,17 +2630,17 @@ msgstr "The package lists or status file could not be parsed or opened."
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "You may want to run apt-get update to correct these problems"
 
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "You may want to run apt-get update to correct these problems"
 

-#: apt-pkg/policy.cc:347
+#: apt-pkg/policy.cc:316

 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Invalid record in the preferences file, no Package header"
 
 #, fuzzy, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "Invalid record in the preferences file, no Package header"
 

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

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

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

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


@@ -2691,16 +2724,16 @@ msgstr "Error occurred while processing %s (CollectFileProvides)"
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Package %s %s was not found while processing file dependencies"
 
 msgid "Package %s %s was not found while processing file dependencies"
 msgstr "Package %s %s was not found while processing file dependencies"
 

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

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

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

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

-#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914
+#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959

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


@@ -2709,19 +2742,19 @@ msgstr "IO Error saving source cache"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename failed, %s (%s -> %s)."
 
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename failed, %s (%s -> %s)."
 

-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:432

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

-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455

 msgid "Hash Sum mismatch"
 msgstr "Hash Sum mismatch"
 
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum mismatch"
 

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

 msgid "There is no public key available for the following key IDs:\n"
 msgstr "There is no public key available for the following key IDs:\n"
 
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "There is no public key available for the following key IDs:\n"
 

-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1260

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


@@ -2730,7 +2763,7 @@ msgstr ""
 "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)"
 
 "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)"
 

-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1319

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


@@ -2739,14 +2772,14 @@ msgstr ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 

-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1360

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

-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1447

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


@@ -2879,76 +2912,96 @@ msgstr "Wrote %i records with %i mismatched files\n"
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
 
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
 

+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Opening configuration file %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Hash Sum mismatch"
+

 #: apt-pkg/deb/dpkgpm.cc:49
 #, c-format
 msgid "Installing %s"
 msgstr "Installing %s"
 
 #: apt-pkg/deb/dpkgpm.cc:49
 #, c-format
 msgid "Installing %s"
 msgstr "Installing %s"
 

-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661

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

-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668

 #, c-format
 msgid "Removing %s"
 msgstr "Removing %s"
 
 #: apt-pkg/deb/dpkgpm.cc:52
 #, c-format
 msgid "Removing %s"
 msgstr "Removing %s"
 
 #: apt-pkg/deb/dpkgpm.cc:52

+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Completely removed %s"
+
+#: apt-pkg/deb/dpkgpm.cc:53

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

-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558

 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory '%s' missing."
 
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory '%s' missing."
 

-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654

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

-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655

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

-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660

 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparing to configure %s"
 
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparing to configure %s"
 

-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662

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

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

 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparing for removal of %s"
 
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparing for removal of %s"
 

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

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

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

 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparing to completely remove %s"
 
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparing to completely remove %s"
 

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

 #, c-format
 msgid "Completely removed %s"
 msgstr "Completely removed %s"
 
 #, c-format
 msgid "Completely removed %s"
 msgstr "Completely removed %s"
 

-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879

 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 

-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:909

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


@@ -2974,14 +3027,33 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
 msgid "Not locked"
 msgstr ""
 

-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Could not patch file"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""

 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connection closed prematurely"
 
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connection closed prematurely"
 

+#~ msgid "Couldn't access keyring: '%s'"
+#~ msgstr "Couldn't access keyring: '%s'"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Could not patch file"
+
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+

 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"