# English messages for the apt suite.
# Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others.
# Michael Piefel <piefel@informatik.hu-berlin.de>, 2002.
-#
-#
+#
+#
msgid ""
msgstr ""
-"Project-Id-Version: apt 0.5.5\n"
+"Project-Id-Version: apt 0.6.46.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 18:51+0100\n"
-"PO-Revision-Date: 2002-11-10 20:56+0100\n"
+"POT-Creation-Date: 2006-10-11 20:34+0200\n"
+"PO-Revision-Date: 2006-10-12 11:07+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
-"Language-Team: en_GB <en@li.org>\n"
+"Language-Team: en_GB <en_gb@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
msgid " %4i %s\n"
msgstr " %4i %s\n"
-#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
+#: cmdline/apt-cache.cc:1652 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550
-#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2387 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s %s compiled on %s %s\n"
msgstr "%s %s for %s %s compiled on %s %s\n"
-#: cmdline/apt-cache.cc:1658
+#: cmdline/apt-cache.cc:1659
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
msgid "Some files are missing in the package file group `%s'"
msgstr "Some files are missing in the package file group ‘%s’"
-#: ftparchive/cachedb.cc:45
+#: ftparchive/cachedb.cc:47
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
msgstr "DB was corrupted, file renamed to %s.old"
-#: ftparchive/cachedb.cc:63
+#: ftparchive/cachedb.cc:65
#, c-format
msgid "DB is old, attempting to upgrade %s"
msgstr "DB is old, attempting to upgrade %s"
-#: ftparchive/cachedb.cc:73
+#: ftparchive/cachedb.cc:76
+msgid ""
+"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 "
+"remove and re-create the database."
+
+#: ftparchive/cachedb.cc:81
#, c-format
msgid "Unable to open DB file %s: %s"
msgstr "Unable to open DB file %s: %s"
-#: ftparchive/cachedb.cc:114
+#: ftparchive/cachedb.cc:127 apt-inst/extract.cc:181 apt-inst/extract.cc:193
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:272
#, c-format
-msgid "File date has changed %s"
-msgstr "File date has changed %s"
+msgid "Failed to stat %s"
+msgstr "Failed to stat %s"
-#: ftparchive/cachedb.cc:155
+#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
msgstr "Archive has no control record"
-#: ftparchive/cachedb.cc:267
+#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
msgstr "Unable to get a cursor"
-#: ftparchive/writer.cc:78
+#: ftparchive/writer.cc:79
#, c-format
msgid "W: Unable to read directory %s\n"
msgstr "W: Unable to read directory %s\n"
-#: ftparchive/writer.cc:83
+#: ftparchive/writer.cc:84
#, c-format
msgid "W: Unable to stat %s\n"
msgstr "W: Unable to stat %s\n"
-#: ftparchive/writer.cc:125
+#: ftparchive/writer.cc:135
msgid "E: "
-msgstr "E:"
+msgstr "E: "
-#: ftparchive/writer.cc:127
+#: ftparchive/writer.cc:137
msgid "W: "
-msgstr "W:"
+msgstr "W: "
-#: ftparchive/writer.cc:134
+#: ftparchive/writer.cc:144
msgid "E: Errors apply to file "
msgstr "E: Errors apply to file "
-#: ftparchive/writer.cc:151 ftparchive/writer.cc:181
+#: ftparchive/writer.cc:161 ftparchive/writer.cc:191
#, c-format
msgid "Failed to resolve %s"
msgstr "Could not resolve ‘%s’"
-#: ftparchive/writer.cc:163
+#: ftparchive/writer.cc:173
msgid "Tree walking failed"
msgstr "Tree walking failed"
-#: ftparchive/writer.cc:188
+#: ftparchive/writer.cc:198
#, c-format
msgid "Failed to open %s"
msgstr "Failed to open %s"
-#: ftparchive/writer.cc:245
+#: ftparchive/writer.cc:257
#, c-format
msgid " DeLink %s [%s]\n"
msgstr " DeLink %s [%s]\n"
-#: ftparchive/writer.cc:253
+#: ftparchive/writer.cc:265
#, c-format
msgid "Failed to readlink %s"
msgstr "Failed to readlink %s"
-#: ftparchive/writer.cc:257
+#: ftparchive/writer.cc:269
#, c-format
msgid "Failed to unlink %s"
msgstr "Failed to unlink %s"
-#: ftparchive/writer.cc:264
+#: ftparchive/writer.cc:276
#, c-format
msgid "*** Failed to link %s to %s"
msgstr "*** Failed to link %s to %s"
-#: ftparchive/writer.cc:274
+#: ftparchive/writer.cc:286
#, c-format
msgid " DeLink limit of %sB hit.\n"
msgstr " DeLink limit of %sB hit.\n"
-#: ftparchive/writer.cc:358 apt-inst/extract.cc:181 apt-inst/extract.cc:193
-#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:256
-#, c-format
-msgid "Failed to stat %s"
-msgstr "Failed to stat %s"
-
-#: ftparchive/writer.cc:386
+#: ftparchive/writer.cc:390
msgid "Archive had no package field"
msgstr "Archive had no package field"
-#: ftparchive/writer.cc:394 ftparchive/writer.cc:603
+#: ftparchive/writer.cc:398 ftparchive/writer.cc:613
#, c-format
msgid " %s has no override entry\n"
msgstr " %s has no override entry\n"
-#: ftparchive/writer.cc:437 ftparchive/writer.cc:689
+#: ftparchive/writer.cc:443 ftparchive/writer.cc:701
#, c-format
msgid " %s maintainer is %s not %s\n"
msgstr " %s maintainer is %s not %s\n"
+#: ftparchive/writer.cc:623
+#, c-format
+msgid " %s has no source override entry\n"
+msgstr " %s has no source override entry\n"
+
+#: ftparchive/writer.cc:627
+#, c-format
+msgid " %s has no binary override entry either\n"
+msgstr " %s has no binary override entry either\n"
+
#: ftparchive/contents.cc:317
#, c-format
msgid "Internal error, could not locate member %s"
#: ftparchive/multicompress.cc:324
msgid "Failed to exec compressor "
-msgstr "Failed to exec compressor"
+msgstr "Failed to exec compressor "
#: ftparchive/multicompress.cc:363
msgid "decompressor"
msgid "Y"
msgstr "Y"
-#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515
+#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506
#, c-format
msgid "Regex compilation error - %s"
msgstr "Regex compilation error - %s"
#: cmdline/apt-get.cc:346
msgid " or"
-msgstr "or"
+msgstr " or"
#: cmdline/apt-get.cc:375
msgid "The following NEW packages will be installed:"
#: cmdline/apt-get.cc:423
msgid "The following packages have been kept back:"
-msgstr "The following packages have been kept back"
+msgstr "The following packages have been kept back:"
#: cmdline/apt-get.cc:444
msgid "The following packages will be upgraded:"
#: cmdline/apt-get.cc:658
msgid "Unable to minimize the upgrade set"
-msgstr "Unable to minimize the upgrade set"
+msgstr "Unable to minimise the upgrade set"
#: cmdline/apt-get.cc:660
msgid " Done"
msgid "Internal error, Ordering didn't finish"
msgstr "Internal error, Ordering didn't finish"
-#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1818 cmdline/apt-get.cc:1851
msgid "Unable to lock the download directory"
msgstr "Unable to lock the download directory"
-#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126
+#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1899 cmdline/apt-get.cc:2135
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
msgid "After unpacking %sB disk space will be freed.\n"
msgstr "After unpacking %sB disk space will be freed.\n"
-#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980
+#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1989
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893
msgid "Abort."
-msgstr "Abort"
+msgstr "Abort."
#: cmdline/apt-get.cc:889
msgid "Do you want to continue [Y/n]? "
msgstr "Do you want to continue [Y/n]? "
-#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023
+#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2032
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
msgid "Some files failed to download"
msgstr "Some files failed to download"
-#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032
+#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2041
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
msgid "The update command takes no arguments"
msgstr "The update command takes no arguments"
-#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420
+#: cmdline/apt-get.cc:1326
msgid "Unable to lock the list directory"
msgstr "Unable to lock the list directory"
msgid "Internal error, AllUpgrade broke stuff"
msgstr "Internal error, AllUpgrade broke stuff"
-#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538
+#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529
#, c-format
msgid "Couldn't find package %s"
msgstr "Couldn't find package %s"
-#: cmdline/apt-get.cc:1525
+#: cmdline/apt-get.cc:1516
#, c-format
msgid "Note, selecting %s for regex '%s'\n"
msgstr "Note, selecting %s for regex ‘%s’\n"
-#: cmdline/apt-get.cc:1555
+#: cmdline/apt-get.cc:1546
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:1558
+#: cmdline/apt-get.cc:1549
msgid ""
"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:1570
+#: cmdline/apt-get.cc:1561
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"
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
-#: cmdline/apt-get.cc:1578
+#: cmdline/apt-get.cc:1569
msgid ""
"Since you only requested a single operation it is extremely likely that\n"
"the package is simply not installable and a bug report against\n"
"the package is simply not installable and a bug report against\n"
"that package should be filed."
-#: cmdline/apt-get.cc:1583
+#: cmdline/apt-get.cc:1574
msgid "The following information may help to resolve the situation:"
msgstr "The following information may help to resolve the situation:"
-#: cmdline/apt-get.cc:1586
+#: cmdline/apt-get.cc:1577
msgid "Broken packages"
msgstr "Broken packages"
-#: cmdline/apt-get.cc:1612
+#: cmdline/apt-get.cc:1603
msgid "The following extra packages will be installed:"
msgstr "The following extra packages will be installed:"
-#: cmdline/apt-get.cc:1683
+#: cmdline/apt-get.cc:1692
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1684
+#: cmdline/apt-get.cc:1693
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1704
+#: cmdline/apt-get.cc:1713
msgid "Calculating upgrade... "
-msgstr "Calculating upgrade..."
+msgstr "Calculating upgrade... "
-#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1716 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1721
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1786 cmdline/apt-get.cc:1794
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1894
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:1915 cmdline/apt-get.cc:2144
+#: cmdline/apt-get.cc:1924 cmdline/apt-get.cc:2153
#, c-format
msgid "Unable to find a source package for %s"
msgstr "Unable to find a source package for %s"
-#: cmdline/apt-get.cc:1959
+#: cmdline/apt-get.cc:1968
#, c-format
-msgid "Skiping already downloaded file '%s'\n"
-msgstr ""
+msgid "Skipping already downloaded file '%s'\n"
+msgstr "Skipping already downloaded file '%s'\n"
-#: cmdline/apt-get.cc:1983
+#: cmdline/apt-get.cc:1992
#, 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:1988
+#: cmdline/apt-get.cc:1997
#, 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:1991
+#: cmdline/apt-get.cc:2000
#, c-format
msgid "Need to get %sB of source archives.\n"
msgstr "Need to get %sB of source archives.\n"
-#: cmdline/apt-get.cc:1997
+#: cmdline/apt-get.cc:2006
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2028
+#: cmdline/apt-get.cc:2037
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2065
#, 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:2068
+#: cmdline/apt-get.cc:2077
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2069
+#: cmdline/apt-get.cc:2078
#, 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:2086
+#: cmdline/apt-get.cc:2095
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2114
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2121
+#: cmdline/apt-get.cc:2130
msgid "Must specify at least one package to check builddeps for"
msgstr "Must specify at least one package to check builddeps for"
-#: cmdline/apt-get.cc:2149
+#: cmdline/apt-get.cc:2158
#, c-format
msgid "Unable to get build-dependency information for %s"
msgstr "Unable to get build-dependency information for %s"
-#: cmdline/apt-get.cc:2169
+#: cmdline/apt-get.cc:2178
#, c-format
msgid "%s has no build depends.\n"
msgstr "%s has no build depends.\n"
-#: cmdline/apt-get.cc:2221
+#: cmdline/apt-get.cc:2230
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2282
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
-#: cmdline/apt-get.cc:2308
+#: cmdline/apt-get.cc:2317
#, 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:2333
+#: cmdline/apt-get.cc:2342
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
msgstr "Failed to satisfy %s dependency for %s: %s"
-#: cmdline/apt-get.cc:2347
+#: cmdline/apt-get.cc:2356
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
msgstr "Build-dependencies for %s could not be satisfied."
-#: cmdline/apt-get.cc:2351
+#: cmdline/apt-get.cc:2360
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2383
+#: cmdline/apt-get.cc:2392
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2433
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
#: cmdline/acqprogress.cc:114
msgid "Err "
-msgstr "Err"
+msgstr "Err "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Failed to create pipes"
msgstr "Failed to create pipes"
-#: apt-inst/contrib/extracttar.cc:143
+#: apt-inst/contrib/extracttar.cc:144
msgid "Failed to exec gzip "
msgstr "Failed to exec gzip "
-#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206
+#: apt-inst/contrib/extracttar.cc:181 apt-inst/contrib/extracttar.cc:207
msgid "Corrupted archive"
msgstr "Corrupted archive"
-#: apt-inst/contrib/extracttar.cc:195
+#: apt-inst/contrib/extracttar.cc:196
msgid "Tar checksum failed, archive corrupted"
msgstr "Tar checksum failed, archive corrupted"
-#: apt-inst/contrib/extracttar.cc:298
+#: apt-inst/contrib/extracttar.cc:299
#, c-format
msgid "Unknown TAR header type %u, member %s"
msgstr "Unknown TAR header type %u, member %s"
msgid "Internal error getting a package name"
msgstr "Internal error getting a package name"
-#: apt-inst/deb/dpkgdb.cc:205
+#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386
msgid "Reading file listing"
msgstr "Reading file listing"
#: apt-inst/deb/dpkgdb.cc:383
msgid "The pkg cache must be initialized first"
-msgstr "The pkg cache must be initialized first"
-
-#: apt-inst/deb/dpkgdb.cc:386
-msgid "Reading file list"
-msgstr "Reading file list"
+msgstr "The pkg cache must be initialised first"
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "File not found"
msgstr "File not found"
-#: methods/copy.cc:42 methods/gpgv.cc:265 methods/gzip.cc:133
-#: methods/gzip.cc:142
+#: methods/copy.cc:42 methods/gpgv.cc:281 methods/gzip.cc:141
+#: methods/gzip.cc:150
msgid "Failed to stat"
msgstr "Failed to stat"
-#: methods/copy.cc:79 methods/gpgv.cc:262 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:278 methods/gzip.cc:147
msgid "Failed to set modification time"
msgstr "Failed to set modification time"
msgid "Unable to accept connection"
msgstr "Unable to accept connection"
-#: methods/ftp.cc:864 methods/http.cc:963 methods/rsh.cc:303
+#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303
msgid "Problem hashing file"
msgstr "Problem hashing file"
msgid "Query"
msgstr "Query"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Unable to invoke"
msgid "Could not connect to %s:%s (%s), connection timed out"
msgstr "Could not connect to %s:%s (%s), connection timed out"
-#: methods/connect.cc:106
+#: methods/connect.cc:108
#, c-format
msgid "Could not connect to %s:%s (%s)."
msgstr "Could not connect to %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
-#: methods/connect.cc:134 methods/rsh.cc:425
+#: methods/connect.cc:136 methods/rsh.cc:425
#, c-format
msgid "Connecting to %s"
msgstr "Connecting to %s"
-#: methods/connect.cc:165
+#: methods/connect.cc:167
#, c-format
msgid "Could not resolve '%s'"
msgstr "Could not resolve ‘%s’"
-#: methods/connect.cc:171
+#: methods/connect.cc:173
#, c-format
msgid "Temporary failure resolving '%s'"
msgstr "Temporary failure resolving ‘%s’"
-#: methods/connect.cc:174
+#: methods/connect.cc:176
#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i)"
msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
-#: methods/connect.cc:221
+#: methods/connect.cc:223
#, c-format
msgid "Unable to connect to %s %s:"
msgstr "Unable to connect to %s %s:"
-#: methods/gpgv.cc:92
+#: methods/gpgv.cc:65
+#, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Couldn't access keyring: '%s'"
+
+#: methods/gpgv.cc:100
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:191
+#: methods/gpgv.cc:204
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:196
+#: methods/gpgv.cc:209
msgid "At least one invalid signature was encountered."
msgstr "At least one invalid signature was encountered."
-#. FIXME String concatenation considered harmful.
-#: methods/gpgv.cc:201
-msgid "Could not execute "
-msgstr "Could not execute "
-
-#: methods/gpgv.cc:202
-msgid " to verify signature (is gnupg installed?)"
-msgstr " to verify signature (is gnupg installed?)"
+#: methods/gpgv.cc:213
+#, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
+msgstr "Could not execute '%s' to verify signature (is gnupg installed?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:218
msgid "Unknown error executing gpgv"
msgstr "Unknown error executing gpgv"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:249
msgid "The following signatures were invalid:\n"
msgstr "The following signatures were invalid:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:256
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
"The following signatures couldn't be verified because the public key is not "
"available:\n"
-#: methods/gzip.cc:57
+#: methods/gzip.cc:64
#, c-format
msgid "Couldn't open pipe for %s"
msgstr "Couldn't open pipe for %s"
-#: methods/gzip.cc:102
+#: methods/gzip.cc:109
#, c-format
msgid "Read error from %s process"
msgstr "Read error from %s process"
-#: methods/http.cc:381
+#: methods/http.cc:376
msgid "Waiting for headers"
msgstr "Waiting for headers"
-#: methods/http.cc:527
+#: methods/http.cc:522
#, c-format
msgid "Got a single header line over %u chars"
msgstr "Got a single header line over %u chars"
-#: methods/http.cc:535
+#: methods/http.cc:530
msgid "Bad header line"
msgstr "Bad header line"
-#: methods/http.cc:554 methods/http.cc:561
+#: methods/http.cc:549 methods/http.cc:556
msgid "The HTTP server sent an invalid reply header"
msgstr "The HTTP server sent an invalid reply header"
-#: methods/http.cc:590
+#: methods/http.cc:585
msgid "The HTTP server sent an invalid Content-Length header"
msgstr "The HTTP server sent an invalid Content-Length header"
-#: methods/http.cc:605
+#: methods/http.cc:600
msgid "The HTTP server sent an invalid Content-Range header"
msgstr "The HTTP server sent an invalid Content-Range header"
-#: methods/http.cc:607
+#: methods/http.cc:602
msgid "This HTTP server has broken range support"
msgstr "This HTTP server has broken range support"
-#: methods/http.cc:631
+#: methods/http.cc:626
msgid "Unknown date format"
msgstr "Unknown date format"
-#: methods/http.cc:778
+#: methods/http.cc:773
msgid "Select failed"
msgstr "Select failed"
-#: methods/http.cc:783
+#: methods/http.cc:778
msgid "Connection timed out"
msgstr "Connection timed out"
-#: methods/http.cc:806
+#: methods/http.cc:801
msgid "Error writing to output file"
msgstr "Error writing to output file"
-#: methods/http.cc:837
+#: methods/http.cc:832
msgid "Error writing to file"
msgstr "Error writing to file"
-#: methods/http.cc:865
+#: methods/http.cc:860
msgid "Error writing to the file"
msgstr "Error writing to the file"
-#: methods/http.cc:879
+#: methods/http.cc:874
msgid "Error reading from server. Remote end closed connection"
msgstr "Error reading from server. Remote end closed connection"
-#: methods/http.cc:881
+#: methods/http.cc:876
msgid "Error reading from server"
msgstr "Error reading from server"
-#: methods/http.cc:1112
+#: methods/http.cc:1107
msgid "Bad header data"
msgstr "Bad header data"
-#: methods/http.cc:1129
+#: methods/http.cc:1124
msgid "Connection failed"
msgstr "Connection failed"
-#: methods/http.cc:1220
+#: methods/http.cc:1215
msgid "Internal error"
msgstr "Internal error"
msgid "extra"
msgstr "extra"
-#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89
+#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90
msgid "Building dependency tree"
msgstr "Building dependency tree"
-#: apt-pkg/depcache.cc:61
+#: apt-pkg/depcache.cc:62
msgid "Candidate versions"
msgstr "Candidate versions"
-#: apt-pkg/depcache.cc:90
+#: apt-pkg/depcache.cc:91
msgid "Dependency generation"
msgstr "Dependency generation"
-#: apt-pkg/tagfile.cc:73
+#: apt-pkg/tagfile.cc:106
#, c-format
msgid "Unable to parse package file %s (1)"
msgstr "Unable to parse package file %s (1)"
-#: apt-pkg/tagfile.cc:160
+#: apt-pkg/tagfile.cc:193
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Unable to parse package file %s (2)"
msgid "Archive directory %spartial is missing."
msgstr "Archive directory %spartial is missing."
-#: apt-pkg/acquire.cc:821
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
-msgstr "Downloading file %li of %li (%s remaining)"
+msgid "Retrieving file %li of %li (%s remaining)"
+msgstr "Retrieving file %li of %li (%s remaining)"
+
+#: apt-pkg/acquire.cc:825
+#, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Retrieving file %li of %li"
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:911
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:719
+#: apt-pkg/acquire-item.cc:640
+msgid "There are no public key available for the following key IDs:\n"
+msgstr "There are no public key available for the following key IDs:\n"
+
+#: apt-pkg/acquire-item.cc:753
#, c-format
msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"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:778
+#: apt-pkg/acquire-item.cc:812
#, c-format
msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"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:814
+#: apt-pkg/acquire-item.cc:848
#, 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:901
+#: apt-pkg/acquire-item.cc:935
msgid "Size mismatch"
msgstr "Size mismatch"
#: apt-pkg/deb/dpkgpm.cc:378
#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Preparing for remove with config %s"
+msgid "Preparing to completely remove %s"
+msgstr "Preparing to completely remove %s"
#: apt-pkg/deb/dpkgpm.cc:379
#, c-format
-msgid "Removed with config %s"
-msgstr "Removed with config %s"
+msgid "Completely removed %s"
+msgstr "Completely removed %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connection closed prematurely"
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s"
-
-#~ msgid ""
-#~ "Some broken packages were found while trying to process build-"
-#~ "dependencies.\n"
-#~ "You might want to run `apt-get -f install' to correct these."
-#~ msgstr ""
-#~ "Some broken packages were found while trying to process build-"
-#~ "dependencies.\n"
-#~ "You might want to run ‘apt-get -f install’ to correct these."
-
-#~ msgid "<- '"
-#~ msgstr "<- ‘"
-
-#~ msgid "'"
-#~ msgstr "‘"
-
-#~ msgid "-> '"
-#~ msgstr "-> ‘"
-
-#~ msgid " '"
-#~ msgstr " ‘"
-
-#~ msgid "....\"Have you mooed today?\"..."
-#~ msgstr "....‘Have you mooed today?’..."
+#~ msgid "Could not patch file"
+#~ msgstr "Could not patch file"
projects / apt.git / blobdiff