X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/3b5a76ae9ae425db6fda4ccc041fbb1e79fffc18..daee881bf82d23197d991227fa0ab36b918b4323:/po/en_GB.po

diff --git a/po/en_GB.po b/po/en_GB.po
index 293312597..3b73e344b 100644
--- 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"
-"POT-Creation-Date: 2009-08-27 19:43+0200\n"
+"POT-Creation-Date: 2010-01-01 19:13+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"
@@ -144,14 +144,9 @@ msgstr "  Package pin: "
 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-get.cc:2626 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2665 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"
@@ -231,7 +226,8 @@ msgstr ""
 "See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
 
 #: cmdline/apt-cdrom.cc:77
-msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'"
+#, fuzzy
+msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
 msgstr "Please provide a name for this Disc, such as ‘Debian 2.1r1 Disk 1’"
 
 #: cmdline/apt-cdrom.cc:92
@@ -523,26 +519,26 @@ msgstr "*** Failed to link %s to %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink limit of %sB hit.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Archive had no package field"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, 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:457 ftparchive/writer.cc:715
 #, 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:637
 #, 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:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s has no binary override entry either\n"
@@ -646,7 +642,7 @@ msgstr "Failed to rename %s to %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1695
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex compilation error - %s"
@@ -791,7 +787,7 @@ msgstr "Install these packages without verification [y/N]? "
 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"
 
@@ -807,11 +803,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"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2037 cmdline/apt-get.cc:2070
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105
 msgid "Unable to lock the download directory"
 msgstr "Unable to lock the download directory"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2118 cmdline/apt-get.cc:2367
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "The list of sources could not be read."
@@ -840,25 +836,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"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2213
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249
+#: cmdline/apt-get.cc:2252
 #, 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."
 
-#: 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."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 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"
@@ -869,28 +866,28 @@ msgstr ""
 "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."
 
-#: 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]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2264 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389
 #, 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"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312
 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?"
@@ -898,47 +895,47 @@ msgstr ""
 "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"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 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."
 
-#: cmdline/apt-get.cc:1058
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Note, selecting %s instead of %s\n"
 
-#: cmdline/apt-get.cc:1068
+#: 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"
 
-#: cmdline/apt-get.cc:1086
+#: 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"
 
-#: cmdline/apt-get.cc:1097
+#: 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"
 
-#: cmdline/apt-get.cc:1109
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Installed]"
 
-#: cmdline/apt-get.cc:1114
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "You should explicitly select one to install."
 
-#: cmdline/apt-get.cc:1119
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -949,58 +946,69 @@ msgstr ""
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 
-#: cmdline/apt-get.cc:1138
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "However the following packages replace it:"
 
-#: cmdline/apt-get.cc:1141
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Package %s has no installation candidate"
 
-#: cmdline/apt-get.cc:1161
+#: 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"
 
-#: cmdline/apt-get.cc:1169
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s is already the newest version.\n"
 
-#: cmdline/apt-get.cc:1198
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release ‘%s’ for ‘%s’ was not found"
 
-#: cmdline/apt-get.cc:1200
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version ‘%s’ for ‘%s’ was not found"
 
-#: cmdline/apt-get.cc:1206
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Selected version %s (%s) for %s\n"
 
-#: cmdline/apt-get.cc:1323
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1360
+#: cmdline/apt-get.cc:1313
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1342
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Couldn't stat source package list %s"
+
+#: cmdline/apt-get.cc:1395
 msgid "The update command takes no arguments"
 msgstr "The update command takes no arguments"
 
-#: cmdline/apt-get.cc:1373
+#: cmdline/apt-get.cc:1408
 msgid "Unable to lock the list directory"
 msgstr "Unable to lock the list directory"
 
-#: cmdline/apt-get.cc:1429
+#: cmdline/apt-get.cc:1464
 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:1478
+#: cmdline/apt-get.cc:1513
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1008,18 +1016,18 @@ msgstr ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
-#: cmdline/apt-get.cc:1480
+#: cmdline/apt-get.cc:1515
 #, 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:1481
+#: cmdline/apt-get.cc:1516
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' to remove them."
 
-#: cmdline/apt-get.cc:1486
+#: cmdline/apt-get.cc:1521
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1037,43 +1045,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1489 cmdline/apt-get.cc:1779
+#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814
 msgid "The following information may help to resolve the situation:"
 msgstr "The following information may help to resolve the situation:"
 
-#: cmdline/apt-get.cc:1493
+#: cmdline/apt-get.cc:1528
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internal Error, AutoRemoved broke stuff"
 
-#: cmdline/apt-get.cc:1512
+#: cmdline/apt-get.cc:1547
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, AllUpgrade broke stuff"
 
-#: cmdline/apt-get.cc:1567
+#: cmdline/apt-get.cc:1602
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Couldn't find task %s"
 
-#: cmdline/apt-get.cc:1682 cmdline/apt-get.cc:1718
+#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Couldn't find package %s"
 
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1740
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, selecting %s for regex ‘%s’\n"
 
-#: cmdline/apt-get.cc:1736
+#: cmdline/apt-get.cc:1771
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s set to manually installed.\n"
 
-#: cmdline/apt-get.cc:1749
+#: cmdline/apt-get.cc:1784
 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:1752
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1081,7 +1089,7 @@ msgstr ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 
-#: cmdline/apt-get.cc:1764
+#: cmdline/apt-get.cc:1799
 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"
@@ -1093,116 +1101,116 @@ msgstr ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 
-#: cmdline/apt-get.cc:1782
+#: cmdline/apt-get.cc:1817
 msgid "Broken packages"
 msgstr "Broken packages"
 
-#: cmdline/apt-get.cc:1811
+#: cmdline/apt-get.cc:1846
 msgid "The following extra packages will be installed:"
 msgstr "The following extra packages will be installed:"
 
-#: cmdline/apt-get.cc:1900
+#: cmdline/apt-get.cc:1935
 msgid "Suggested packages:"
 msgstr "Suggested packages:"
 
-#: cmdline/apt-get.cc:1901
+#: cmdline/apt-get.cc:1936
 msgid "Recommended packages:"
 msgstr "Recommended packages:"
 
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1965
 msgid "Calculating upgrade... "
 msgstr "Calculating upgrade... "
 
-#: cmdline/apt-get.cc:1933 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112
 msgid "Failed"
 msgstr "Failed"
 
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1973
 msgid "Done"
 msgstr "Done"
 
-#: cmdline/apt-get.cc:2005 cmdline/apt-get.cc:2013
+#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internal error, problem resolver broke stuff"
 
-#: cmdline/apt-get.cc:2113
+#: cmdline/apt-get.cc:2148
 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:2143 cmdline/apt-get.cc:2385
+#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Unable to find a source package for %s"
 
-#: cmdline/apt-get.cc:2192
+#: cmdline/apt-get.cc:2227
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Skipping already downloaded file '%s'\n"
 
-#: cmdline/apt-get.cc:2223
+#: cmdline/apt-get.cc:2262
 #, 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:2229
+#: cmdline/apt-get.cc:2268
 #, 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:2232
+#: cmdline/apt-get.cc:2271
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Need to get %sB of source archives.\n"
 
-#: cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:2277
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fetch source %s\n"
 
-#: cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2308
 msgid "Failed to fetch some archives."
 msgstr "Failed to fetch some archives."
 
-#: cmdline/apt-get.cc:2297
+#: cmdline/apt-get.cc:2336
 #, 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:2309
+#: cmdline/apt-get.cc:2348
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Unpack command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2349
 #, 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:2327
+#: cmdline/apt-get.cc:2366
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2346
+#: cmdline/apt-get.cc:2385
 msgid "Child process failed"
 msgstr "Child process failed"
 
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2401
 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:2390
+#: cmdline/apt-get.cc:2429
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Unable to get build-dependency information for %s"
 
-#: cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2449
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s has no build depends.\n"
 
-#: cmdline/apt-get.cc:2462
+#: cmdline/apt-get.cc:2501
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1211,7 +1219,7 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 
-#: cmdline/apt-get.cc:2515
+#: cmdline/apt-get.cc:2554
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1220,31 +1228,31 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 
-#: cmdline/apt-get.cc:2551
+#: cmdline/apt-get.cc:2590
 #, 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:2578
+#: cmdline/apt-get.cc:2617
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Failed to satisfy %s dependency for %s: %s"
 
-#: cmdline/apt-get.cc:2594
+#: cmdline/apt-get.cc:2633
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Build-dependencies for %s could not be satisfied."
 
-#: cmdline/apt-get.cc:2599
+#: cmdline/apt-get.cc:2638
 msgid "Failed to process build dependencies"
 msgstr "Failed to process build dependencies"
 
-#: cmdline/apt-get.cc:2631
+#: cmdline/apt-get.cc:2670
 msgid "Supported modules:"
 msgstr "Supported modules:"
 
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2711
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1329,7 +1337,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2839
+#: cmdline/apt-get.cc:2879
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1416,11 +1424,13 @@ msgid "Do you want to erase any previously downloaded .deb files?"
 msgstr "Do you want to erase any previously downloaded .deb files?"
 
 #: dselect/install:101
-msgid "Some errors occurred while unpacking. I'm going to configure the"
+#, fuzzy
+msgid "Some errors occurred while unpacking. Packages that were installed"
 msgstr "Some errors occurred while unpacking. I'm going to configure the"
 
 #: dselect/install:102
-msgid "packages that were installed. This may result in duplicate errors"
+#, fuzzy
+msgid "will be configured. This may result in duplicate errors"
 msgstr "packages that were installed. This may result in duplicate errors"
 
 #: dselect/install:103
@@ -1466,7 +1476,12 @@ msgstr "Invalid archive signature"
 msgid "Error reading archive member header"
 msgstr "Error reading archive member header"
 
-#: apt-inst/contrib/arfile.cc:90 apt-inst/contrib/arfile.cc:102
+#: apt-inst/contrib/arfile.cc:90
+#, fuzzy, c-format
+msgid "Invalid archive member header %s"
+msgstr "Invalid archive member header"
+
+#: apt-inst/contrib/arfile.cc:102
 msgid "Invalid archive member header"
 msgstr "Invalid archive member header"
 
@@ -1568,10 +1583,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.
-#: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:822
+#: 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/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"
@@ -1751,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.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
 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"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
 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"
 
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
 #, 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"
 
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1786,114 +1801,114 @@ msgstr ""
 "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"
 
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
 #, 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"
 
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
 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:543 methods/rsh.cc:190
 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."
 
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
 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:582 methods/rsh.cc:232
 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"
 
-#: 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"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
 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"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
 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"
 
-#: 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"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
 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_*)"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
 #, 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"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
 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:999 methods/rsh.cc:303
 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’"
 
-#: 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"
 
-#: 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
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
 msgid "Query"
 msgstr "Query"
 
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
 msgid "Unable to invoke "
 msgstr "Unable to invoke"
 
@@ -1945,13 +1960,13 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Temporary failure resolving ‘%s’"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
 
 #: methods/connect.cc:240
-#, c-format
-msgid "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
@@ -2004,80 +2019,80 @@ msgstr "Couldn't open pipe for %s"
 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"
 
-#: 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"
 
-#: methods/http.cc:538
+#: methods/http.cc:539
 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"
 
-#: 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"
 
-#: 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"
 
-#: methods/http.cc:610
+#: methods/http.cc:611
 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"
 
-#: methods/http.cc:787
+#: methods/http.cc:790
 msgid "Select failed"
 msgstr "Select failed"
 
-#: methods/http.cc:792
+#: methods/http.cc:795
 msgid "Connection timed out"
 msgstr "Connection timed out"
 
-#: methods/http.cc:815
+#: methods/http.cc:818
 msgid "Error writing to output file"
 msgstr "Error writing to output file"
 
-#: methods/http.cc:846
+#: methods/http.cc:849
 msgid "Error writing to file"
 msgstr "Error writing to file"
 
-#: methods/http.cc:874
+#: methods/http.cc:877
 msgid "Error writing to the file"
 msgstr "Error writing to the file"
 
-#: methods/http.cc:888
+#: methods/http.cc:891
 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:893
 msgid "Error reading from server"
 msgstr "Error reading from server"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
 msgid "Failed to truncate file"
 msgstr "Failed to truncate file"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1149
 msgid "Bad header data"
 msgstr "Bad header data"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1166 methods/http.cc:1221
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1313
 msgid "Internal error"
 msgstr "Internal error"
 
@@ -2098,80 +2113,80 @@ msgid ""
 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
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr ""
 
 #. h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:342
+#: apt-pkg/contrib/strutl.cc:353
 #, c-format
 msgid "%lih %limin %lis"
 msgstr ""
 
 #. min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:349
+#: apt-pkg/contrib/strutl.cc:360
 #, c-format
 msgid "%limin %lis"
 msgstr ""
 
 #. s means seconds
-#: apt-pkg/contrib/strutl.cc:354
+#: apt-pkg/contrib/strutl.cc:365
 #, c-format
 msgid "%lis"
 msgstr ""
 
-#: apt-pkg/contrib/strutl.cc:1029
+#: apt-pkg/contrib/strutl.cc:1040
 #, c-format
 msgid "Selection %s not found"
 msgstr "Selection %s not found"
 
-#: apt-pkg/contrib/configuration.cc:439
+#: apt-pkg/contrib/configuration.cc:458
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "Unrecognized type abbreviation: ‘%c’"
 
-#: apt-pkg/contrib/configuration.cc:497
+#: apt-pkg/contrib/configuration.cc:516
 #, c-format
 msgid "Opening configuration file %s"
 msgstr "Opening configuration file %s"
 
-#: 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 "Syntax error %s:%u: Block starts with no name."
 
-#: apt-pkg/contrib/configuration.cc:682
+#: apt-pkg/contrib/configuration.cc:703
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "Syntax error %s:%u: Malformed tag"
 
-#: apt-pkg/contrib/configuration.cc:699
+#: apt-pkg/contrib/configuration.cc:720
 #, 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:739
+#: apt-pkg/contrib/configuration.cc:760
 #, 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:746
+#: apt-pkg/contrib/configuration.cc:767
 #, 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: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 "Syntax error %s:%u: Included from here"
 
-#: apt-pkg/contrib/configuration.cc:759
+#: apt-pkg/contrib/configuration.cc:780
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "Syntax error %s:%u: Unsupported directive ‘%s’"
 
-#: 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"
 msgstr "Syntax error %s:%u: Extra junk at end of file"
@@ -2482,7 +2497,14 @@ msgstr "Type ‘%s’ is not known on line %u in source list %s"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Malformed line %u in source list %s (vendor id)"
 
-#: apt-pkg/packagemanager.cc:426
+#: 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 "
@@ -2493,6 +2515,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."
 
+#: 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"
@@ -2563,12 +2592,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."
 
-#: 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"
 
-#: 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"
 
@@ -2871,76 +2900,99 @@ 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"
 
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+#| msgid "Opening configuration file %s"
+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 Sum mismatch"
+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:50 apt-pkg/deb/dpkgpm.cc:642
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
 #, c-format
 msgid "Configuring %s"
 msgstr "Configuring %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:649
+#: 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
+#, fuzzy, c-format
+#| msgid "Completely removed %s"
+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"
 
-#: apt-pkg/deb/dpkgpm.cc:546
+#: apt-pkg/deb/dpkgpm.cc:558
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory '%s' missing."
 
-#: apt-pkg/deb/dpkgpm.cc:635
+#: apt-pkg/deb/dpkgpm.cc:654
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparing %s"
 
-#: apt-pkg/deb/dpkgpm.cc:636
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Unpacking %s"
 msgstr "Unpacking %s"
 
-#: apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/deb/dpkgpm.cc:660
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparing to configure %s"
 
-#: apt-pkg/deb/dpkgpm.cc:643
+#: apt-pkg/deb/dpkgpm.cc:662
 #, c-format
 msgid "Installed %s"
 msgstr "Installed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:648
+#: apt-pkg/deb/dpkgpm.cc:667
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparing for removal of %s"
 
-#: apt-pkg/deb/dpkgpm.cc:650
+#: apt-pkg/deb/dpkgpm.cc:669
 #, c-format
 msgid "Removed %s"
 msgstr "Removed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:674
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparing to completely remove %s"
 
-#: apt-pkg/deb/dpkgpm.cc:656
+#: apt-pkg/deb/dpkgpm.cc:675
 #, c-format
 msgid "Completely removed %s"
 msgstr "Completely removed %s"
 
-#: apt-pkg/deb/dpkgpm.cc:820
+#: 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"
 
-#: apt-pkg/deb/dpkgpm.cc:848
+#: apt-pkg/deb/dpkgpm.cc:909
 msgid "Running dpkg"
 msgstr ""
 
@@ -2974,6 +3026,9 @@ msgstr "Could not patch file"
 msgid "Connection closed prematurely"
 msgstr "Connection closed prematurely"
 
+#~ msgid "       %4i %s\n"
+#~ msgstr "       %4i %s\n"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"