summaryrefslogtreecommitdiff
path: root/po/en_GB.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/en_GB.po')
-rw-r--r--po/en_GB.po212
1 files changed, 114 insertions, 98 deletions
diff --git a/po/en_GB.po b/po/en_GB.po
index fc636658e..34d1bdecb 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.5.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-20 14:01+0100\n"
+"POT-Creation-Date: 2006-05-27 13:46+0200\n"
"PO-Revision-Date: 2002-11-10 20:56+0100\n"
"Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
"Language-Team: en_GB <en@li.org>\n"
@@ -146,14 +146,14 @@ msgstr " Version table:"
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:2369 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"
@@ -512,7 +512,7 @@ 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:260
+#: apt-inst/extract.cc:210 apt-inst/deb/dpkgdb.cc:121 methods/gpgv.cc:266
#, c-format
msgid "Failed to stat %s"
msgstr "Failed to stat %s"
@@ -630,7 +630,7 @@ msgstr "Failed to rename %s to %s"
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"
@@ -791,11 +791,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:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842
+#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833
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:1881 cmdline/apt-get.cc:2117
#: apt-pkg/cachefile.cc:67
msgid "The list of sources could not be read."
msgstr "The list of sources could not be read."
@@ -824,7 +824,7 @@ msgstr "After unpacking %sB of additional disk space will be used.\n"
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:1971
#, c-format
msgid "Couldn't determine free space in %s"
msgstr "Couldn't determine free space in %s"
@@ -861,7 +861,7 @@ msgstr "Abort."
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:2014
#, c-format
msgid "Failed to fetch %s %s\n"
msgstr "Failed to fetch %s %s\n"
@@ -870,7 +870,7 @@ 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:2023
msgid "Download complete and in download only mode"
msgstr "Download complete and in download only mode"
@@ -971,7 +971,7 @@ msgstr "Selected version %s (%s) for %s\n"
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"
@@ -987,21 +987,21 @@ msgstr ""
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)."
@@ -1009,7 +1009,7 @@ msgstr ""
"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"
@@ -1021,7 +1021,7 @@ msgstr ""
"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"
@@ -1031,119 +1031,119 @@ msgstr ""
"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:1674
msgid "Suggested packages:"
msgstr "Suggested packages:"
-#: cmdline/apt-get.cc:1684
+#: cmdline/apt-get.cc:1675
msgid "Recommended packages:"
msgstr "Recommended packages:"
-#: cmdline/apt-get.cc:1704
+#: cmdline/apt-get.cc:1695
msgid "Calculating upgrade... "
msgstr "Calculating upgrade..."
-#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101
+#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101
msgid "Failed"
msgstr "Failed"
-#: cmdline/apt-get.cc:1712
+#: cmdline/apt-get.cc:1703
msgid "Done"
msgstr "Done"
-#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785
+#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776
msgid "Internal error, problem resolver broke stuff"
msgstr "Internal error, problem resolver broke stuff"
-#: cmdline/apt-get.cc:1885
+#: cmdline/apt-get.cc:1876
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:1906 cmdline/apt-get.cc:2135
#, 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:1950
#, fuzzy, c-format
msgid "Skipping already downloaded file '%s'\n"
msgstr "Skipping unpack of already unpacked source in %s\n"
-#: cmdline/apt-get.cc:1983
+#: cmdline/apt-get.cc:1974
#, 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:1979
#, 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:1982
#, 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:1988
#, c-format
msgid "Fetch source %s\n"
msgstr "Fetch source %s\n"
-#: cmdline/apt-get.cc:2028
+#: cmdline/apt-get.cc:2019
msgid "Failed to fetch some archives."
msgstr "Failed to fetch some archives."
-#: cmdline/apt-get.cc:2056
+#: cmdline/apt-get.cc:2047
#, 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:2059
#, c-format
msgid "Unpack command '%s' failed.\n"
msgstr "Unpack command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2069
+#: cmdline/apt-get.cc:2060
#, 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:2077
#, c-format
msgid "Build command '%s' failed.\n"
msgstr "Build command ‘%s’ failed.\n"
-#: cmdline/apt-get.cc:2105
+#: cmdline/apt-get.cc:2096
msgid "Child process failed"
msgstr "Child process failed"
-#: cmdline/apt-get.cc:2121
+#: cmdline/apt-get.cc:2112
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:2140
#, 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:2160
#, 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:2212
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1152,7 +1152,7 @@ msgstr ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
-#: cmdline/apt-get.cc:2273
+#: cmdline/apt-get.cc:2264
#, c-format
msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
@@ -1161,31 +1161,31 @@ msgstr ""
"%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:2299
#, 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:2324
#, 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:2338
#, 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:2342
msgid "Failed to process build dependencies"
msgstr "Failed to process build dependencies"
-#: cmdline/apt-get.cc:2383
+#: cmdline/apt-get.cc:2374
msgid "Supported modules:"
msgstr "Supported modules:"
-#: cmdline/apt-get.cc:2424
+#: cmdline/apt-get.cc:2415
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1538,7 +1538,7 @@ msgstr "Failed to change to the admin dir %sinfo"
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"
@@ -1585,10 +1585,6 @@ msgstr "Internal error adding a diversion"
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"
-
#: apt-inst/deb/dpkgdb.cc:443
#, c-format
msgid "Failed to find a Package: header, offset %lu"
@@ -1661,12 +1657,12 @@ msgstr "Disk not found."
msgid "File not found"
msgstr "File not found"
-#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133
+#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133
#: methods/gzip.cc:142
msgid "Failed to stat"
msgstr "Failed to stat"
-#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139
+#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139
msgid "Failed to set modification time"
msgstr "Failed to set modification time"
@@ -1817,7 +1813,7 @@ msgstr "Data transfer failed, server said ‘%s’"
msgid "Query"
msgstr "Query"
-#: methods/ftp.cc:1106
+#: methods/ftp.cc:1109
msgid "Unable to invoke "
msgstr "Unable to invoke"
@@ -1846,70 +1842,71 @@ msgstr "Cannot initiate the connection to %s:%s (%s)."
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:64
+#, fuzzy, c-format
+msgid "Couldn't access keyring: '%s'"
+msgstr "Could not resolve ‘%s’"
+
+#: methods/gpgv.cc:99
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:198
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:203
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?)"
+#: methods/gpgv.cc:207
+#, fuzzy, c-format
+msgid "Could not execute '%s' to verify signature (is gnupg installed?)"
msgstr " to verify signature (is gnupg installed?)"
-#: methods/gpgv.cc:206
+#: methods/gpgv.cc:212
msgid "Unknown error executing gpgv"
msgstr "Unknown error executing gpgv"
-#: methods/gpgv.cc:237
+#: methods/gpgv.cc:243
msgid "The following signatures were invalid:\n"
msgstr "The following signatures were invalid:\n"
-#: methods/gpgv.cc:244
+#: methods/gpgv.cc:250
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
@@ -2275,24 +2272,24 @@ msgstr "optional"
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:72
#, 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:102
#, c-format
msgid "Unable to parse package file %s (2)"
msgstr "Unable to parse package file %s (2)"
@@ -2392,11 +2389,18 @@ msgstr "Lists directory %spartial is missing."
msgid "Archive directory %spartial is missing."
msgstr "Archive directory %spartial is missing."
-#: apt-pkg/acquire.cc:821
-#, c-format
-msgid "Downloading file %li of %li (%s remaining)"
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:823
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li (%s remaining)"
msgstr "Downloading file %li of %li (%s remaining)"
+#: apt-pkg/acquire.cc:825
+#, fuzzy, c-format
+msgid "Retrieving file %li of %li"
+msgstr "Reading file listing"
+
#: apt-pkg/acquire-worker.cc:113
#, c-format
msgid "The method driver %s could not be found."
@@ -2536,15 +2540,15 @@ msgstr "IO Error saving source cache"
msgid "rename failed, %s (%s -> %s)."
msgstr "rename failed, %s (%s -> %s)."
-#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950
+#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945
msgid "MD5Sum mismatch"
msgstr "MD5Sum mismatch"
-#: apt-pkg/acquire-item.cc:645
+#: apt-pkg/acquire-item.cc:640
msgid "There are no public key available for the following key IDs:\n"
msgstr ""
-#: apt-pkg/acquire-item.cc:758
+#: 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 "
@@ -2553,7 +2557,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:817
+#: 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 "
@@ -2562,14 +2566,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:853
+#: 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:940
+#: apt-pkg/acquire-item.cc:935
msgid "Size mismatch"
msgstr "Size mismatch"
@@ -2713,19 +2717,31 @@ msgid "Removed %s"
msgstr "Removed %s"
#: apt-pkg/deb/dpkgpm.cc:378
-#, c-format
-msgid "Preparing for remove with config %s"
-msgstr "Preparing for remove with config %s"
+#, fuzzy, c-format
+msgid "Preparing to completely remove %s"
+msgstr "Preparing to configure %s"
#: apt-pkg/deb/dpkgpm.cc:379
-#, c-format
-msgid "Removed with config %s"
-msgstr "Removed with config %s"
+#, fuzzy, c-format
+msgid "Completely removed %s"
+msgstr "Failed to remove %s"
#: methods/rsh.cc:330
msgid "Connection closed prematurely"
msgstr "Connection closed prematurely"
+#~ msgid "Reading file list"
+#~ msgstr "Reading file list"
+
+#~ msgid "Could not execute "
+#~ msgstr "Could not execute "
+
+#~ msgid "Preparing for remove with config %s"
+#~ msgstr "Preparing for remove with config %s"
+
+#~ msgid "Removed with config %s"
+#~ msgstr "Removed with config %s"
+
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
#~ msgstr "Unknown vendor ID ‘%s’ in line %u of source list %s"