From 17c78c79f45d8dbb2a4fc5b453569ffbd4373f2e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 26 Jun 2005 10:04:00 +0000 Subject: * merged apt--main and make sure that the po files come from apt--main (because they are more recent) --- po/en_GB.po | 184 +++++++++++++++++++++++++++++------------------------------- 1 file changed, 88 insertions(+), 96 deletions(-) (limited to 'po/en_GB.po') diff --git a/po/en_GB.po b/po/en_GB.po index da3129082..e374f13d2 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-05 12:06+0100\n" +"POT-Creation-Date: 2005-03-29 07:17+0200\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Michael Piefel \n" "Language-Team: en_GB \n" @@ -27,23 +27,23 @@ msgid "Unable to locate package %s" msgstr "" #: cmdline/apt-cache.cc:232 -msgid "Total Package Names : " +msgid "Total package names : " msgstr "" #: cmdline/apt-cache.cc:272 -msgid " Normal Packages: " +msgid " Normal packages: " msgstr "" #: cmdline/apt-cache.cc:273 -msgid " Pure Virtual Packages: " +msgid " Pure virtual packages: " msgstr "" #: cmdline/apt-cache.cc:274 -msgid " Single Virtual Packages: " +msgid " Single virtual packages: " msgstr "" #: cmdline/apt-cache.cc:275 -msgid " Mixed Virtual Packages: " +msgid " Mixed virtual packages: " msgstr "" #: cmdline/apt-cache.cc:276 @@ -51,35 +51,35 @@ msgid " Missing: " msgstr "" #: cmdline/apt-cache.cc:278 -msgid "Total Distinct Versions: " +msgid "Total distinct versions: " msgstr "" #: cmdline/apt-cache.cc:280 -msgid "Total Dependencies: " +msgid "Total dependencies: " msgstr "" #: cmdline/apt-cache.cc:283 -msgid "Total Ver/File relations: " +msgid "Total ver/file relations: " msgstr "" #: cmdline/apt-cache.cc:285 -msgid "Total Provides Mappings: " +msgid "Total Provides mappings: " msgstr "" #: cmdline/apt-cache.cc:297 -msgid "Total Globbed Strings: " +msgid "Total globbed strings: " msgstr "" #: cmdline/apt-cache.cc:311 -msgid "Total Dependency Version space: " +msgid "Total dependency version space: " msgstr "" #: cmdline/apt-cache.cc:316 -msgid "Total Slack space: " +msgid "Total slack space: " msgstr "" #: cmdline/apt-cache.cc:324 -msgid "Total Space Accounted for: " +msgid "Total space accounted for: " msgstr "" #: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 @@ -96,7 +96,7 @@ msgid "No packages found" msgstr "" #: cmdline/apt-cache.cc:1462 -msgid "Package Files:" +msgid "Package files:" msgstr "" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 @@ -110,7 +110,7 @@ msgstr "" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1482 -msgid "Pinned Packages:" +msgid "Pinned packages:" msgstr "" #: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 @@ -132,12 +132,12 @@ msgid " Candidate: " msgstr "" #: cmdline/apt-cache.cc:1532 -msgid " Package Pin: " +msgid " Package pin: " msgstr "" #. Show the priority tables #: cmdline/apt-cache.cc:1541 -msgid " Version Table:" +msgid " Version table:" msgstr "" #: cmdline/apt-cache.cc:1556 @@ -248,7 +248,7 @@ msgstr "Option ‘%s’ is too long" #: ftparchive/apt-ftparchive.cc:202 ftparchive/apt-ftparchive.cc:252 #: ftparchive/apt-ftparchive.cc:266 ftparchive/apt-ftparchive.cc:288 #, c-format -msgid "Error Processing directory %s" +msgid "Error processing directory %s" msgstr "" #: ftparchive/apt-ftparchive.cc:250 @@ -262,7 +262,7 @@ msgstr "" #: ftparchive/apt-ftparchive.cc:397 #, c-format -msgid "Error Processing Contents %s" +msgid "Error processing contents %s" msgstr "" #: ftparchive/apt-ftparchive.cc:551 @@ -305,7 +305,7 @@ msgid "" " --no-delink Enable delinking debug mode\n" " --contents Control contents file generation\n" " -c=? Read this configuration file\n" -" -o=? Set an arbitary configuration option" +" -o=? Set an arbitrary configuration option" msgstr "" "Usage: apt-ftparchive [options] command\n" "Commands: packages binarypath [overridefile [pathprefix]]\n" @@ -465,7 +465,7 @@ msgstr "" #: ftparchive/contents.cc:317 #, c-format -msgid "Internal Error, could not locate member %s" +msgid "Internal error, could not locate member %s" msgstr "" #: ftparchive/contents.cc:353 ftparchive/contents.cc:384 @@ -498,8 +498,8 @@ msgid "Failed to read the override file %s" msgstr "" #: ftparchive/multicompress.cc:75 -#, c-format -msgid "Unknown Compresison Algorithm '%s'" +#, fuzzy, c-format +msgid "Unknown compression algorithm '%s'" msgstr "Unknown Compression Algorithm ‘%s’" #: ftparchive/multicompress.cc:105 @@ -520,12 +520,12 @@ msgid "Failed to fork" msgstr "" #: ftparchive/multicompress.cc:215 -msgid "Compress Child" +msgid "Compress child" msgstr "" #: ftparchive/multicompress.cc:238 #, c-format -msgid "Internal Error, Failed to create %s" +msgid "Internal error, failed to create %s" msgstr "" #: ftparchive/multicompress.cc:289 @@ -694,7 +694,7 @@ msgid "WARNING: The following packages cannot be authenticated!" msgstr "" #: cmdline/apt-get.cc:698 -msgid "Install these packages without verification? [y/N] " +msgid "Install these packages without verification [y/N]? " msgstr "" #: cmdline/apt-get.cc:700 @@ -706,7 +706,7 @@ msgid "There are problems and -y was used without --force-yes" msgstr "" #: cmdline/apt-get.cc:762 -msgid "Packages need to be removed but Remove is disabled." +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 @@ -767,7 +767,7 @@ msgid "Abort." msgstr "" #: cmdline/apt-get.cc:886 -msgid "Do you want to continue? [Y/n] " +msgid "Do you want to continue [Y/n]? " msgstr "" #: cmdline/apt-get.cc:958 cmdline/apt-get.cc:1334 cmdline/apt-get.cc:1959 @@ -798,7 +798,7 @@ msgid "Unable to correct missing packages." msgstr "" #: cmdline/apt-get.cc:993 -msgid "Aborting Install." +msgid "Aborting install." msgstr "" #: cmdline/apt-get.cc:1026 @@ -886,7 +886,7 @@ msgid "" msgstr "" #: cmdline/apt-get.cc:1372 -msgid "Internal Error, AllUpgrade broke stuff" +msgid "Internal error, AllUpgrade broke stuff" msgstr "" #: cmdline/apt-get.cc:1462 cmdline/apt-get.cc:1498 @@ -947,7 +947,7 @@ msgid "Recommended packages:" msgstr "" #: cmdline/apt-get.cc:1664 -msgid "Calculating Upgrade... " +msgid "Calculating upgrade... " msgstr "" #: cmdline/apt-get.cc:1667 methods/ftp.cc:702 methods/connect.cc:99 @@ -984,7 +984,7 @@ msgstr "" #: cmdline/apt-get.cc:1933 #, c-format -msgid "Fetch Source %s\n" +msgid "Fetch source %s\n" msgstr "" #: cmdline/apt-get.cc:1964 @@ -1058,7 +1058,7 @@ msgid "Failed to process build dependencies" msgstr "" #: cmdline/apt-get.cc:2318 -msgid "Supported Modules:" +msgid "Supported modules:" msgstr "" #: cmdline/apt-get.cc:2359 @@ -1130,9 +1130,9 @@ msgid " [Working]" msgstr "" #: cmdline/acqprogress.cc:271 -#, c-format +#, fuzzy, c-format msgid "" -"Media Change: Please insert the disc labeled\n" +"Media change: please insert the disc labeled\n" " '%s'\n" "in the drive '%s' and press enter\n" msgstr "" @@ -1185,7 +1185,7 @@ msgid "" msgstr "" #: dselect/update:30 -msgid "Merging Available information" +msgid "Merging available information" msgstr "" #: apt-inst/contrib/extracttar.cc:117 @@ -1201,7 +1201,7 @@ msgid "Corrupted archive" msgstr "" #: apt-inst/contrib/extracttar.cc:195 -msgid "Tar Checksum failed, archive corrupted" +msgid "Tar checksum failed, archive corrupted" msgstr "" #: apt-inst/contrib/extracttar.cc:298 @@ -1242,7 +1242,7 @@ msgid "Failed to allocate diversion" msgstr "" #: apt-inst/filelist.cc:468 -msgid "Internal Error in AddDiversion" +msgid "Internal error in AddDiversion" msgstr "" #: apt-inst/filelist.cc:481 @@ -1351,7 +1351,7 @@ msgstr "" #: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:643 #: apt-pkg/pkgcachegen.cc:712 apt-pkg/pkgcachegen.cc:717 #: apt-pkg/pkgcachegen.cc:840 -msgid "Reading Package Lists" +msgid "Reading package lists" msgstr "" #: apt-inst/deb/dpkgdb.cc:180 @@ -1361,11 +1361,11 @@ msgstr "" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:355 #: apt-inst/deb/dpkgdb.cc:448 -msgid "Internal Error getting a Package Name" +msgid "Internal error getting a package name" msgstr "" #: apt-inst/deb/dpkgdb.cc:205 -msgid "Reading File Listing" +msgid "Reading file listing" msgstr "" #: apt-inst/deb/dpkgdb.cc:216 @@ -1385,7 +1385,7 @@ msgid "Failed reading the list file %sinfo/%s" msgstr "" #: apt-inst/deb/dpkgdb.cc:266 -msgid "Internal Error getting a Node" +msgid "Internal error getting a node" msgstr "" #: apt-inst/deb/dpkgdb.cc:309 @@ -1404,20 +1404,20 @@ msgid "Invalid line in the diversion file: %s" msgstr "" #: apt-inst/deb/dpkgdb.cc:362 -msgid "Internal Error adding a diversion" +msgid "Internal error adding a diversion" msgstr "" #: apt-inst/deb/dpkgdb.cc:383 -msgid "The pkg cache must be initialize first" +msgid "The pkg cache must be initialized first" msgstr "" #: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading File List" +msgid "Reading file list" msgstr "" #: apt-inst/deb/dpkgdb.cc:443 #, c-format -msgid "Failed to find a Package: Header, offset %lu" +msgid "Failed to find a Package: header, offset %lu" msgstr "" #: apt-inst/deb/dpkgdb.cc:465 @@ -1446,7 +1446,7 @@ msgid "Couldn't change to %s" msgstr "" #: apt-inst/deb/debfile.cc:138 -msgid "Internal Error, could not locate member" +msgid "Internal error, could not locate member" msgstr "" #: apt-inst/deb/debfile.cc:171 @@ -1454,7 +1454,7 @@ msgid "Failed to locate a valid control file" msgstr "" #: apt-inst/deb/debfile.cc:256 -msgid "Unparsible control file" +msgid "Unparsable control file" msgstr "" #: methods/cdrom.cc:113 @@ -1464,12 +1464,12 @@ msgstr "" #: methods/cdrom.cc:122 msgid "" -"Please use apt-cdrom to make this CD recognized by APT. apt-get update " -"cannot be used to add new CDs" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" msgstr "" #: methods/cdrom.cc:130 methods/cdrom.cc:168 -msgid "Wrong CD" +msgid "Wrong CD-ROM" msgstr "" #: methods/cdrom.cc:163 @@ -1477,7 +1477,7 @@ msgstr "" msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "" -#: methods/cdrom.cc:177 methods/file.cc:77 +#: methods/cdrom.cc:177 methods/file.cc:77 methods/rsh.cc:264 msgid "File not found" msgstr "" @@ -1508,7 +1508,7 @@ msgstr "" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format -msgid "Server refused our connection and said: %s" +msgid "The server refused the connection and said: %s" msgstr "" #: methods/ftp.cc:210 @@ -1557,8 +1557,8 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:446 methods/rsh.cc:232 -msgid "Write Error" +#: methods/ftp.cc:446 methods/rsh.cc:232 apt-pkg/contrib/fileutl.cc:492 +msgid "Write error" msgstr "" #: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 @@ -1719,19 +1719,19 @@ msgid "Bad header line" msgstr "" #: methods/http.cc:517 methods/http.cc:524 -msgid "The http server sent an invalid reply header" +msgid "The HTTP server sent an invalid reply header" msgstr "" #: methods/http.cc:553 -msgid "The http server sent an invalid Content-Length header" +msgid "The HTTP server sent an invalid Content-Length header" msgstr "" #: methods/http.cc:568 -msgid "The http server sent an invalid Content-Range header" +msgid "The HTTP server sent an invalid Content-Range header" msgstr "" #: methods/http.cc:570 -msgid "This http server has broken range support" +msgid "This HTTP server has broken range support" msgstr "" #: methods/http.cc:594 @@ -1759,7 +1759,7 @@ msgid "Error writing to the file" msgstr "" #: methods/http.cc:832 -msgid "Error reading from server Remote end closed connection" +msgid "Error reading from server. Remote end closed connection" msgstr "" #: methods/http.cc:834 @@ -1767,7 +1767,7 @@ msgid "Error reading from server" msgstr "" #: methods/http.cc:1065 -msgid "Bad header Data" +msgid "Bad header data" msgstr "" #: methods/http.cc:1082 @@ -1778,10 +1778,6 @@ msgstr "" msgid "Internal error" msgstr "" -#: methods/rsh.cc:264 -msgid "File Not Found" -msgstr "" - #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "" @@ -1821,9 +1817,9 @@ msgid "Syntax error %s:%u: Block starts with no name." msgstr "" #: apt-pkg/contrib/configuration.cc:586 -#, c-format -msgid "Syntax error %s:%u: Malformed Tag" -msgstr "" +#, fuzzy, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" #: apt-pkg/contrib/configuration.cc:603 #, c-format @@ -1946,8 +1942,8 @@ msgid "Could not get lock %s" msgstr "" #: apt-pkg/contrib/fileutl.cc:359 -#, c-format -msgid "Waited, for %s but it wasn't there" +#, fuzzy, c-format +msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" #: apt-pkg/contrib/fileutl.cc:369 @@ -1975,10 +1971,6 @@ msgstr "" msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:492 -msgid "Write error" -msgstr "" - #: apt-pkg/contrib/fileutl.cc:504 #, c-format msgid "write, still have %lu to write but couldn't" @@ -2009,8 +2001,8 @@ msgid "The package cache file is an incompatible version" msgstr "" #: apt-pkg/pkgcache.cc:142 -#, c-format -msgid "This APT does not support the Versioning System '%s'" +#, fuzzy, c-format +msgid "This APT does not support the versioning system '%s'" msgstr "This APT does not support the Versioning System ‘%s’" #: apt-pkg/pkgcache.cc:147 @@ -2066,15 +2058,15 @@ msgid "extra" msgstr "" #: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 -msgid "Building Dependency Tree" +msgid "Building dependency tree" msgstr "" #: apt-pkg/depcache.cc:61 -msgid "Candidate Versions" +msgid "Candidate versions" msgstr "" #: apt-pkg/depcache.cc:90 -msgid "Dependency Generation" +msgid "Dependency generation" msgstr "" #: apt-pkg/tagfile.cc:73 @@ -2104,7 +2096,7 @@ msgstr "" #: apt-pkg/sourcelist.cc:98 #, c-format -msgid "Malformed line %lu in source list %s (Absolute dist)" +msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" #: apt-pkg/sourcelist.cc:105 @@ -2231,37 +2223,37 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:117 #, c-format -msgid "Error occured while processing %s (NewPackage)" +msgid "Error occurred while processing %s (NewPackage)" msgstr "" #: apt-pkg/pkgcachegen.cc:129 #, c-format -msgid "Error occured while processing %s (UsePackage1)" +msgid "Error occurred while processing %s (UsePackage1)" msgstr "" #: apt-pkg/pkgcachegen.cc:150 #, c-format -msgid "Error occured while processing %s (UsePackage2)" +msgid "Error occurred while processing %s (UsePackage2)" msgstr "" #: apt-pkg/pkgcachegen.cc:154 #, c-format -msgid "Error occured while processing %s (NewFileVer1)" +msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" #: apt-pkg/pkgcachegen.cc:184 #, c-format -msgid "Error occured while processing %s (NewVersion1)" +msgid "Error occurred while processing %s (NewVersion1)" msgstr "" #: apt-pkg/pkgcachegen.cc:188 #, c-format -msgid "Error occured while processing %s (UsePackage3)" +msgid "Error occurred while processing %s (UsePackage3)" msgstr "" #: apt-pkg/pkgcachegen.cc:192 #, c-format -msgid "Error occured while processing %s (NewVersion2)" +msgid "Error occurred while processing %s (NewVersion2)" msgstr "" #: apt-pkg/pkgcachegen.cc:207 @@ -2278,12 +2270,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format -msgid "Error occured while processing %s (FindPkg)" +msgid "Error occurred while processing %s (FindPkg)" msgstr "" #: apt-pkg/pkgcachegen.cc:254 #, c-format -msgid "Error occured while processing %s (CollectFileProvides)" +msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" #: apt-pkg/pkgcachegen.cc:260 @@ -2355,7 +2347,7 @@ msgstr "" #: apt-pkg/cdrom.cc:538 #, c-format -msgid "Stored Label: %s \n" +msgid "Stored label: %s \n" msgstr "" #: apt-pkg/cdrom.cc:558 @@ -2377,7 +2369,7 @@ msgid "Mounting CD-ROM...\n" msgstr "" #: apt-pkg/cdrom.cc:606 -msgid "Scanning Disc for index files..\n" +msgid "Scanning disc for index files..\n" msgstr "" #: apt-pkg/cdrom.cc:644 @@ -2392,7 +2384,7 @@ msgstr "" #: apt-pkg/cdrom.cc:717 #, c-format msgid "" -"This Disc is called: \n" +"This disc is called: \n" "'%s'\n" msgstr "" @@ -2405,7 +2397,7 @@ msgid "Writing new source list\n" msgstr "" #: apt-pkg/cdrom.cc:754 -msgid "Source List entries for this Disc are:\n" +msgid "Source list entries for this disc are:\n" msgstr "" #: apt-pkg/cdrom.cc:788 @@ -2424,12 +2416,12 @@ msgstr "" #: apt-pkg/indexcopy.cc:266 #, c-format -msgid "Wrote %i records with %i mismachted files\n" +msgid "Wrote %i records with %i mismatched files\n" msgstr "" #: apt-pkg/indexcopy.cc:269 #, c-format -msgid "Wrote %i records with %i missing files and %i mismachted files\n" +msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" -- cgit v1.2.3