summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-12-18 17:08:45 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2009-12-18 17:08:45 +0100
commitb3bc1bd74cb5ed091c6a067d09dc49b165d6f873 (patch)
treec5b161ae69814276fde03de15939cd5e607a7b21 /po/en_GB.po
parentb52da4cd38991881e0f456fb1976412886c564ee (diff)
parent8cf0b1e1a4eab0f78d86ba3dc4576b35ee46969b (diff)
* Merged from the mvo branch
* merged from the lp:~mvo/apt/history branch * Fix apt-ftparchive(1) wrt description of the "-o" option. Thanks to Dann Frazier for the patch. Closes: #273100 * po/LINGUAS. Re-disable Hebrew. Closes: #534992 * po/LINGUAS. Enable Asturian and Lithuanian * Fix typo in apt-cache.8.xml: nessasarily * Fix "with with" in apt-get.8.xml * Fix some of the typos mentioned by the german team Closes: #479997 * Polish translation update by Wiktor Wandachowicz Closes: #548571 * German translation update by Holger Wansing Closes: #551534 * Italian translation update by Milo Casagrande Closes: #555797 * Simplified Chinese translation update by Aron Xu Closes: #558737 * Slovak translation update by Ivan Masár Closes: #559277 * apt-pkg/packagemanager.cc: - add output about pre-depends configuring when debug::pkgPackageManager is used * methods/https.cc: - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972 thanks to Brian Thomason for the patch * merge lp:~mvo/apt/netrc branch, this adds support for a /etc/apt/auth.conf that can be used to store username/passwords in a "netrc" style file (with the extension that it supports "/" in a machine definition). Based on the maemo git branch (Closes: #518473) (thanks also to Jussi Hakala and Julian Andres Klode) * apt-pkg/deb/dpkgpm.cc: - add "purge" to list of known actions * apt-pkg/init.h: - add compatibility with old ABI name until the next ABI break * merge segfault fix from Mario Sanchez Prada, many thanks (closes: #561109) * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc: - typo fix (LP: #462328) * cmdline/apt-key: - Emit a warning if removed keys keyring is missing and skip associated checks (LP: #218971) * apt-pkg/packagemanager.cc: - better debug output for ImmediateAdd with depth and why - improve the message shown for failing immediate configuration * doc/guide.it.sgml: moved to doc/it/guide.it.sgml * doc/po4a.conf: activate translation of guide.sgml and offline.sgml * doc/apt.conf.5.xml: - provide a few more details about APT::Immediate-Configure - briefly document the behaviour of the new https options * doc/sources.list.5.xml: - add note about additional apt-transport-methods * doc/apt-mark.8.xml: - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440) * cmdline/apt-get.cc: - source should display his final pkg pick (Closes: #249383, #550952) - source doesn't need the complete version for match (Closes: #245250) - source ignores versions/releases if not available (Closes: #377424) - only warn if (free) space overflows (Closes: #522238) - add --debian-only as alias for --diff-only * methods/connect.cc: - display also strerror of "wicked" getaddrinfo errors - add AI_ADDRCONFIG to ai_flags as suggested by Aurelien Jarno in response to Bernhard R. Link, thanks! (Closes: #505020) * buildlib/configure.mak, buildlib/config.{sub,guess}: - remove (outdated) config.{sub,guess} and use the ones provided by the new added build-dependency autotools-dev instead * configure.in, buildlib/{xml,yodl,sgml}_manpage.mak: - remove the now obsolete manpage buildsystems * doc/{pl,pt_BR,es,it}/*.{sgml,xml}: - convert all remaining translation to the po4a system * debian/control: - drop build-dependency on docbook-utils and xmlto - add build-dependency on autotools-dev - bump policy to 3.8.3 as we have no outdated manpages anymore * debian/NEWS: - fix a typo in 0.7.24: Allready -> Already (Closes: #557674) * ftparchive/writer.{cc,h}: - add APT::FTPArchive::LongDescription to be able to disable them * apt-pkg/deb/debsrcrecords.cc: - use "diff" filetype for .debian.tar.* files (Closes: #554898) * methods/rred.cc: - rewrite to be able to handle even big patch files - adopt optional mmap+iovec patch from Morten Hustveit (Closes: #463354) which should speed up a bit. Thanks! * methods/http{,s}.cc - add config setting for User-Agent to the Acquire group, thanks Timothy J. Miller! (Closes: #355782) - add https options which default to http ones (Closes: #557085) * debian/apt.cron.daily: - check cache size even if we do nothing else otherwise, thanks Francesco Poli for patch(s) and patience! (Closes: #459344) * ftparchive/*: - fix a few typos in strings, comments and manpage, thanks Karl Goetz! (Closes: #558757) * cmdline/apt-mark: - print an error if a new state file can't be created (Closes: #521289) and - exit nicely if python-apt is not installed (Closes: #521284) * doc/de: German translation of manpages (Closes: #552606) * doc/ various manpages: - correct various errors, typos and oddities (Closes: #552535) * doc/apt-secure.8.xml: - replace literal with emphasis tags in Archive configuration * doc/apt-ftparchive.1.xml: - remove informalexample tag which hides the programlisting * doc/apt-get.8.xml: - change equivalent "for" to "to the" (purge command) - clarify --fix-broken sentence about specifying packages * apt-pkg/contib/strutl.h - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2. * build infrastructure: - Bumped libapt version, excluded eglibc from SONAME. (Closes: #448249) * doc/apt.conf.5.xml: - Deprecate unquoted values, string concatenation and explain what should not be written inside a value (quotes,backslash). - Restrict option names to alphanumerical characters and "/-:._+". - Deprecate #include, we have apt.conf.d nowadays which should be sufficient. * ftparchive/apt-ftparchive.cc: - Call setlocale() so translations are actually used. * debian/apt.conf.autoremove: - Add kfreebsd-image-* to the list (Closes: #558803)
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po364
1 files changed, 209 insertions, 155 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index 293312597..4ee752427 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: 2009-11-27 00:15+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"
@@ -151,7 +151,7 @@ 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:2653 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 +231,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 +524,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 +647,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:1718
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
@@ -791,7 +792,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 +808,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:2060 cmdline/apt-get.cc:2093
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:2141 cmdline/apt-get.cc:2394
#: 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 +841,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:2237
+#: cmdline/apt-get.cc:2240
#, 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 +871,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:2291 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:2300
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 +900,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 +951,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:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
#, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
msgstr ""
-#: cmdline/apt-get.cc:1360
+#: cmdline/apt-get.cc:1332
+#, 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:1383
msgid "The update command takes no arguments"
msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1373
+#: cmdline/apt-get.cc:1396
msgid "Unable to lock the list directory"
msgstr "Unable to lock the list directory"
-#: cmdline/apt-get.cc:1429
+#: cmdline/apt-get.cc:1452
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:1501
msgid ""
"The following packages were automatically installed and are no longer "
"required:"
@@ -1008,18 +1021,18 @@ msgstr ""
"The following packages were automatically installed and are no longer "
"required:"
-#: cmdline/apt-get.cc:1480
+#: cmdline/apt-get.cc:1503
#, 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:1504
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:1509
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
@@ -1037,43 +1050,43 @@ msgstr ""
#. "that package should be filed.") << endl;
#. }
#.
-#: cmdline/apt-get.cc:1489 cmdline/apt-get.cc:1779
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
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:1516
msgid "Internal Error, AutoRemover broke stuff"
msgstr "Internal Error, AutoRemoved broke stuff"
-#: cmdline/apt-get.cc:1512
+#: cmdline/apt-get.cc:1535
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1567
+#: cmdline/apt-get.cc:1590
#, 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:1705 cmdline/apt-get.cc:1741
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1705
+#: cmdline/apt-get.cc:1728
#, 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:1759
#, 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:1772
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:1775
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
@@ -1081,7 +1094,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:1787
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 +1106,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:1805
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1811
+#: cmdline/apt-get.cc:1834
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:1923
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1901
+#: cmdline/apt-get.cc:1924
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1930
+#: cmdline/apt-get.cc:1953
msgid "Calculating upgrade... "
msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1933 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1938
+#: cmdline/apt-get.cc:1961
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:2005 cmdline/apt-get.cc:2013
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:2113
+#: cmdline/apt-get.cc:2136
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:2166 cmdline/apt-get.cc:2412
#, 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:2215
#, 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:2250
#, 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:2256
#, 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:2259
#, 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:2265
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2269
+#: cmdline/apt-get.cc:2296
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2297
+#: cmdline/apt-get.cc:2324
#, 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:2336
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2310
+#: cmdline/apt-get.cc:2337
#, 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:2354
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2346
+#: cmdline/apt-get.cc:2373
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2362
+#: cmdline/apt-get.cc:2389
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:2417
#, 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:2437
#, 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:2489
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1211,7 +1224,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:2542
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1220,31 +1233,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:2578
#, 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:2605
#, 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:2621
#, 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:2626
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2631
+#: cmdline/apt-get.cc:2658
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2672
+#: cmdline/apt-get.cc:2699
#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
@@ -1329,7 +1342,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:2866
msgid ""
"NOTE: This is only a simulation!\n"
" apt-get needs root privileges for real execution.\n"
@@ -1416,11 +1429,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 +1481,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,7 +1588,7 @@ 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
@@ -1738,11 +1758,11 @@ msgid "File not found"
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"
-#: 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"
@@ -1870,7 +1890,7 @@ msgstr "Data socket connect timed out"
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:869 methods/http.cc:997 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
@@ -1945,13 +1965,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
@@ -2037,47 +2057,47 @@ msgstr "This HTTP server has broken range support"
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:787
+#: methods/http.cc:788
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:792
+#: methods/http.cc:793
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:815
+#: methods/http.cc:816
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:846
+#: methods/http.cc:847
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:874
+#: methods/http.cc:875
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:888
+#: methods/http.cc:889
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:891
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
msgid "Failed to truncate file"
msgstr "Failed to truncate file"
-#: methods/http.cc:1146
+#: methods/http.cc:1147
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1310
+#: methods/http.cc:1311
msgid "Internal error"
msgstr "Internal error"
@@ -2085,93 +2105,100 @@ msgstr "Internal error"
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"
-#: 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 ""
+#: 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: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 +2509,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:321 apt-pkg/packagemanager.cc:576
+#, 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:437
#, c-format
msgid ""
"This installation run will require temporarily removing the essential "
@@ -2493,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."
+#: apt-pkg/packagemanager.cc:475
+#, 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"
@@ -2701,19 +2742,19 @@ msgstr "IO Error saving source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
msgid "Hash Sum mismatch"
msgstr "Hash Sum mismatch"
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
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:1224
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2722,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)"
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2731,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."
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
#, 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:1411
msgid "Size mismatch"
msgstr "Size mismatch"
@@ -2876,12 +2917,12 @@ msgstr "Wrote %i records with %i missing files and %i mismatched files\n"
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:660
#, 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:667
#, c-format
msgid "Removing %s"
msgstr "Removing %s"
@@ -2891,56 +2932,56 @@ msgstr "Removing %s"
msgid "Running post-installation trigger %s"
msgstr "Running post-installation trigger %s"
-#: apt-pkg/deb/dpkgpm.cc:546
+#: apt-pkg/deb/dpkgpm.cc:557
#, c-format
msgid "Directory '%s' missing"
msgstr "Directory '%s' missing."
-#: apt-pkg/deb/dpkgpm.cc:635
+#: apt-pkg/deb/dpkgpm.cc:653
#, c-format
msgid "Preparing %s"
msgstr "Preparing %s"
-#: apt-pkg/deb/dpkgpm.cc:636
+#: apt-pkg/deb/dpkgpm.cc:654
#, c-format
msgid "Unpacking %s"
msgstr "Unpacking %s"
-#: apt-pkg/deb/dpkgpm.cc:641
+#: apt-pkg/deb/dpkgpm.cc:659
#, c-format
msgid "Preparing to configure %s"
msgstr "Preparing to configure %s"
-#: apt-pkg/deb/dpkgpm.cc:643
+#: apt-pkg/deb/dpkgpm.cc:661
#, c-format
msgid "Installed %s"
msgstr "Installed %s"
-#: apt-pkg/deb/dpkgpm.cc:648
+#: apt-pkg/deb/dpkgpm.cc:666
#, 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:668
#, c-format
msgid "Removed %s"
msgstr "Removed %s"
-#: apt-pkg/deb/dpkgpm.cc:655
+#: apt-pkg/deb/dpkgpm.cc:673
#, 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:674
#, c-format
msgid "Completely removed %s"
msgstr "Completely removed %s"
-#: apt-pkg/deb/dpkgpm.cc:820
+#: apt-pkg/deb/dpkgpm.cc:878
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:907
msgid "Running dpkg"
msgstr ""
@@ -2966,14 +3007,27 @@ 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"
+#~ msgid "Could not patch file"
+#~ msgstr "Could not patch file"
+
#~ msgid "%4i %s\n"
#~ msgstr "%4i %s\n"