diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-08 21:24:06 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-08-08 21:24:06 +0000 |
| commit | 7aee90b638490036b8f4244dcb3d14ba0bc6dd8a (patch) | |
| tree | 781978e7fe32a57b45462267f673404500b2825f /po/en_GB.po | |
| parent | d3948f87051cad7ad59fd8de2af5b7794faf2c70 (diff) | |
* merged with main
Patches applied:
* andrelop@debian.org/apt--translation--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-79
* andrelop@debian.org/apt--translation--0--patch-1
Sync with Matt version.
* andrelop@debian.org/apt--translation--0--patch-2
Update pt_BR translation
* andrelop@debian.org/apt--translation--0--patch-3
Sync with bubulle's branch.
* apt@packages.debian.org/apt--main--0--patch-88
Change debian/bugscript to use #!/bin/bash (Closes: #313402)
* apt@packages.debian.org/apt--main--0--patch-89
Branch for Debian
* apt@packages.debian.org/apt--main--0--patch-90
Update version in configure
* apt@packages.debian.org/apt--main--0--patch-91
Fix French man page build
* apt@packages.debian.org/apt--main--0--patch-92
Add the current Debian archive signing key
* apt@packages.debian.org/apt--main--0--patch-93
Merge with mvo
* apt@packages.debian.org/apt--main--0--patch-94
Update changelog
* apt@packages.debian.org/apt--main--0--patch-95
Merge Christian's branch
* apt@packages.debian.org/apt--main--0--patch-96
Update changelog
* apt@packages.debian.org/apt--main--0--patch-97
Update priority of apt-utils to important, to match the override file
* apt@packages.debian.org/apt--main--0--patch-98
Install only one keyring on each branch (Closes: #316119)
* apt@packages.debian.org/apt--main--0--patch-99
Finalize 0.6.39
* apt@packages.debian.org/apt--main--0--patch-100
Use debian.org address in mainline
* apt@packages.debian.org/apt--main--0--patch-101
Update pot file
* apt@packages.debian.org/apt--main--0--patch-102
Open 0.6.40
* apt@packages.debian.org/apt--main--0--patch-103
Patch from Jordi Mallach to mark some additional strings for translation
* apt@packages.debian.org/apt--main--0--patch-104
Updated Catalan translation from Jordi Mallach
* apt@packages.debian.org/apt--main--0--patch-105
Merge from bubulle@debian.org--2005/apt--main--0
* apt@packages.debian.org/apt--main--0--patch-106
Restore lost changelog entries
* apt@packages.debian.org/apt--main--0--patch-107
Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0
* apt@packages.debian.org/apt--main--0--patch-108
Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0
* bubulle@debian.org--2005/apt--main--0--patch-82
Fix permissions
* bubulle@debian.org--2005/apt--main--0--patch-83
French translation spellchecked
* bubulle@debian.org--2005/apt--main--0--patch-84
Spell corrections in German translations
* bubulle@debian.org--2005/apt--main--0--patch-85
Correct some file permissions
* bubulle@debian.org--2005/apt--main--0--patch-86
Correct Hebrew translation
* bubulle@debian.org--2005/apt--main--0--patch-87
Sync Portuguese translation with the POT file
* bubulle@debian.org--2005/apt--main--0--patch-88
Updated Danish translation (not yet complete)
* bubulle@debian.org--2005/apt--main--0--patch-89
Sync with Andre Luis Lopes and Otavio branches
* bubulle@debian.org--2005/apt--main--0--patch-90
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-91
Updated Slovak translation
* bubulle@debian.org--2005/apt--main--0--patch-92
Add apt-key French man page
* bubulle@debian.org--2005/apt--main--0--patch-93
Update Greek translations
* bubulle@debian.org--2005/apt--main--0--patch-94
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-95
Sync PO files with the POT file/French translation update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22
* added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23
* apt-cache show <virtual-pkg> shows all virtual packages instead of nothing (thanks to otavio)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24
* changelog updated
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25
* make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27
* updated the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28
* merged with my apt--fixes--0 branch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29
* added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30
* fix a stupid bug in the depcache::Init() code
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31
* merged/removed conflicts with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32
* merged apt--main and make sure that the po files come from apt--main (because they are more recent)
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-85
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-1
* inital proof of concept code, understands what dpkg tells it already
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-2
* progress reporting works now
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-3
* added "APT::Status-Fd" variable
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-4
* do i18n now too
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-5
* define N_(x) if it is not defined already
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-6
* PackageManager::DoInstall(int status_fd) added (does not break the ABI)
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-7
* merged with apt--fixes--0 to make it build again
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-8
* added support for "error" and "conffile-prompt" messages from dpkg
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-9
merge with main
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-10
* use sizeof() for all snprintf() uses; fix a potential line break problem in the status reading code; changed the N_() to _() calls
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-11
* added APT::KeepFDs configuration list for file descriptors that apt should leave open (needed for various frontends like debconf, synaptic)
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-12
* fixed a API breakage
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-13
* doc added, should be releasable now
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-14
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-15
* more source comments, added Debug::DpkgPM debug code to inspect the dpkg<->apt communication, broke the abi (ok with matt)
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-16
* the progress reporting has it's own "Debug::pkgDPkgProgressReporting" debug variable now
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-17
* merged PackageOps and TranslatedPackageOps into a single Map with the new DpkgState struct
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-18
* clear the APT::Keep-Fds configuration when it's no longer needed
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-19
* rewrote the reading from dpkg so that it never blocks
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-20
* merged the two status arrays into one
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-21
* added support for download progress reporting too (for Kamion and base-config)
* michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-22
* ABI break; added Configuration::Clear(string List, {int,string} value) added (to remove a single Value from a list); test/conf_clear.cc added
Diffstat (limited to 'po/en_GB.po')
| -rw-r--r-- | po/en_GB.po | 132 |
1 files changed, 66 insertions, 66 deletions
diff --git a/po/en_GB.po b/po/en_GB.po index e374f13d2..574a296d3 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-03-29 07:17+0200\n" +"POT-Creation-Date: 2005-07-02 11:19-0700\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel <piefel@debian.org>\n" "Language-Team: en_GB <en@li.org>\n" @@ -147,7 +147,7 @@ msgstr "" #: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:545 -#: cmdline/apt-get.cc:2313 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2322 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "" @@ -562,7 +562,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1475 +#: cmdline/apt-get.cc:140 cmdline/apt-get.cc:1484 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -632,7 +632,7 @@ msgstr "" #: cmdline/apt-get.cc:544 msgid "" -"WARNING: The following essential packages will be removed\n" +"WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" @@ -709,11 +709,11 @@ msgstr "" msgid "Packages need to be removed but remove is disabled." msgstr "" -#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1769 cmdline/apt-get.cc:1802 +#: cmdline/apt-get.cc:788 cmdline/apt-get.cc:1778 cmdline/apt-get.cc:1811 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1850 cmdline/apt-get.cc:2061 +#: cmdline/apt-get.cc:798 cmdline/apt-get.cc:1859 cmdline/apt-get.cc:2070 #: apt-pkg/cachefile.cc:67 msgid "The list of sources could not be read." msgstr "" @@ -752,9 +752,9 @@ msgid "Yes, do as I say!" msgstr "" #: cmdline/apt-get.cc:865 -#, c-format +#, fuzzy, c-format msgid "" -"You are about to do something potentially harmful\n" +"You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" @@ -770,7 +770,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1968 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -779,7 +779,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1968 +#: cmdline/apt-get.cc:977 cmdline/apt-get.cc:1977 msgid "Download complete and in download only mode" msgstr "" @@ -875,7 +875,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1295 +#: cmdline/apt-get.cc:1295 cmdline/apt-get.cc:1389 msgid "Unable to lock the list directory" msgstr "" @@ -889,21 +889,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 +#: cmdline/apt-get.cc:1471 cmdline/apt-get.cc:1507 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1485 +#: cmdline/apt-get.cc:1494 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1524 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:1518 +#: cmdline/apt-get.cc:1527 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -911,7 +911,7 @@ msgstr "" "Unmet dependencies. Try ‘apt-get -f install’ with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1530 +#: cmdline/apt-get.cc:1539 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" @@ -919,149 +919,149 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1547 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1543 +#: cmdline/apt-get.cc:1552 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1546 +#: cmdline/apt-get.cc:1555 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1572 +#: cmdline/apt-get.cc:1581 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1643 +#: cmdline/apt-get.cc:1652 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1644 +#: cmdline/apt-get.cc:1653 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1664 +#: cmdline/apt-get.cc:1673 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 +#: cmdline/apt-get.cc:1676 methods/ftp.cc:702 methods/connect.cc:99 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1672 +#: cmdline/apt-get.cc:1681 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:1845 +#: cmdline/apt-get.cc:1854 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:1872 cmdline/apt-get.cc:2079 +#: cmdline/apt-get.cc:1881 cmdline/apt-get.cc:2088 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:1919 +#: cmdline/apt-get.cc:1928 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1924 +#: cmdline/apt-get.cc:1933 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1927 +#: cmdline/apt-get.cc:1936 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1933 +#: cmdline/apt-get.cc:1942 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:1964 +#: cmdline/apt-get.cc:1973 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:1992 +#: cmdline/apt-get.cc:2001 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2004 +#: cmdline/apt-get.cc:2013 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2021 +#: cmdline/apt-get.cc:2030 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2040 +#: cmdline/apt-get.cc:2049 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2065 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2084 +#: cmdline/apt-get.cc:2093 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2104 +#: cmdline/apt-get.cc:2113 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2156 +#: cmdline/apt-get.cc:2165 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2208 +#: cmdline/apt-get.cc:2217 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2243 +#: cmdline/apt-get.cc:2252 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2277 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2282 +#: cmdline/apt-get.cc:2291 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2286 +#: cmdline/apt-get.cc:2295 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2327 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2368 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1261,9 +1261,9 @@ msgid "Duplicate conf file %s/%s" msgstr "" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, c-format -msgid "Failed write file %s" -msgstr "" +#, fuzzy, c-format +msgid "Failed to write file %s" +msgstr "Could not resolve ‘%s’" #: apt-inst/dirstream.cc:80 apt-inst/dirstream.cc:88 #, c-format @@ -1611,7 +1611,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:916 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:920 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1738,43 +1738,43 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:737 +#: methods/http.cc:741 msgid "Select failed" msgstr "" -#: methods/http.cc:742 +#: methods/http.cc:746 msgid "Connection timed out" msgstr "" -#: methods/http.cc:765 +#: methods/http.cc:769 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:793 +#: methods/http.cc:797 msgid "Error writing to file" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:822 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:836 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:834 +#: methods/http.cc:838 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1065 +#: methods/http.cc:1069 msgid "Bad header data" msgstr "" -#: methods/http.cc:1082 +#: methods/http.cc:1086 msgid "Connection failed" msgstr "" -#: methods/http.cc:1173 +#: methods/http.cc:1177 msgid "Internal error" msgstr "" @@ -2301,31 +2301,31 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:894 +#: apt-pkg/acquire-item.cc:235 apt-pkg/acquire-item.cc:900 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:708 +#: apt-pkg/acquire-item.cc:714 #, c-format msgid "" "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)" msgstr "" -#: apt-pkg/acquire-item.cc:761 +#: apt-pkg/acquire-item.cc:767 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " "manually fix this package." msgstr "" -#: apt-pkg/acquire-item.cc:797 +#: apt-pkg/acquire-item.cc:803 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:884 +#: apt-pkg/acquire-item.cc:890 msgid "Size mismatch" msgstr "" |