diff options
45 files changed, 4844 insertions, 1190 deletions
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc index c6a0e80e6..718e1ab98 100644 --- a/apt-inst/deb/dpkgdb.cc +++ b/apt-inst/deb/dpkgdb.cc @@ -383,7 +383,7 @@ bool debDpkgDB::ReadyFileList(OpProgress &Progress) return _error->Error(_("The pkg cache must be initialized first")); if (FList != 0) { - Progress.OverallProgress(1,1,1,_("Reading file list")); + Progress.OverallProgress(1,1,1,_("Reading file listing")); return true; } diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 52c516090..966126255 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -103,7 +103,8 @@ void pkgAcquire::Item::Done(string Message,unsigned long Size,string, { // We just downloaded something.. string FileName = LookupTag(Message,"Filename"); - if (Complete == false && FileName == DestFile) + // we only inform the Log class if it was actually not a local thing + if (Complete == false && !Local && FileName == DestFile) { if (Owner->Log != 0) Owner->Log->Fetched(Size,atoi(LookupTag(Message,"Resume-Point","0").c_str())); @@ -134,7 +135,6 @@ void pkgAcquire::Item::Rename(string From,string To) } /*}}}*/ - // AcqDiffIndex::AcqDiffIndex - Constructor // --------------------------------------------------------------------- /* Get the DiffIndex file first and see if there are patches availabe @@ -169,8 +169,8 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, // from local sources. this is really silly, and // should be fixed cleanly as soon as possible if(!FileExists(CurrentPackagesFile) || - Desc.URI.substr(0,strlen("file:/")) == "file:/" || - !_config->FindB("Acquire::Diffs",true)) { + Desc.URI.substr(0,strlen("file:/")) == "file:/") + { // we don't have a pkg file or we don't want to queue if(Debug) std::clog << "No index file, local or canceld by user" << std::endl; @@ -178,11 +178,10 @@ pkgAcqDiffIndex::pkgAcqDiffIndex(pkgAcquire *Owner, return; } - if(Debug) { + if(Debug) std::clog << "pkgAcqIndexDiffs::pkgAcqIndexDiffs(): " << CurrentPackagesFile << std::endl; - } - + QueueURI(Desc); } @@ -237,26 +236,32 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) SHA1.AddFD(fd.Fd(), fd.Size()); local_sha1 = string(SHA1.Result()); - if(local_sha1 == ServerSha1) { + if(local_sha1 == ServerSha1) + { + // we have the same sha1 as the server if(Debug) std::clog << "Package file is up-to-date" << std::endl; // set found to true, this will queue a pkgAcqIndexDiffs with // a empty availabe_patches found = true; - } else { + } + else + { if(Debug) std::clog << "SHA1-Current: " << ServerSha1 << std::endl; // check the historie and see what patches we need string history = Tags.FindS("SHA1-History"); std::stringstream hist(history); - while(hist >> d.sha1 >> size >> d.file) { + while(hist >> d.sha1 >> size >> d.file) + { d.size = atoi(size.c_str()); // read until the first match is found if(d.sha1 == local_sha1) found=true; // from that point on, we probably need all diffs - if(found) { + if(found) + { if(Debug) std::clog << "Need to get diff: " << d.file << std::endl; available_patches.push_back(d); @@ -265,12 +270,15 @@ bool pkgAcqDiffIndex::ParseDiffIndex(string IndexDiffFile) } // no information how to get the patches, bail out - if(!found) { + if(!found) + { if(Debug) std::clog << "Can't find a patch in the index file" << std::endl; // Failed will queue a big package file Failed("", NULL); - } else { + } + else + { // queue the diffs new pkgAcqIndexDiffs(Owner, RealURI, Description, Desc.ShortDesc, ExpectedMD5, available_patches); @@ -351,10 +359,13 @@ pkgAcqIndexDiffs::pkgAcqIndexDiffs(pkgAcquire *Owner, Desc.Owner = this; Desc.ShortDesc = ShortDesc; - if(available_patches.size() == 0) { + if(available_patches.size() == 0) + { // we are done (yeah!) Finish(true); - } else { + } + else + { // get the next diff State = StateFetchDiff; QueueNextDiff(); @@ -366,7 +377,7 @@ void pkgAcqIndexDiffs::Failed(string Message,pkgAcquire::MethodConfig *Cnf) { if(Debug) std::clog << "pkgAcqIndexDiffs failed: " << Desc.URI << std::endl - << "Falling back to normal index file acquire" << std::endl; + << "Falling back to normal index file aquire" << std::endl; new pkgAcqIndex(Owner, RealURI, Description,Desc.ShortDesc, ExpectedMD5); Finish(); @@ -378,7 +389,8 @@ void pkgAcqIndexDiffs::Finish(bool allDone) { // we restore the original name, this is required, otherwise // the file will be cleaned - if(allDone) { + if(allDone) + { DestFile = _config->FindDir("Dir::State::lists"); DestFile += URItoFileName(RealURI); @@ -435,14 +447,17 @@ bool pkgAcqIndexDiffs::QueueNextDiff() // remove all patches until the next matching patch is found // this requires the Index file to be ordered for(vector<DiffInfo>::iterator I=available_patches.begin(); - available_patches.size() > 0 && I != available_patches.end() - && (*I).sha1 != local_sha1; - I++) { + available_patches.size() > 0 && + I != available_patches.end() && + (*I).sha1 != local_sha1; + I++) + { available_patches.erase(I); } // error checking and falling back if no patch was found - if(available_patches.size() == 0) { + if(available_patches.size() == 0) + { Failed("", NULL); return false; } @@ -484,6 +499,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, string FileName = LookupTag(Message,"Filename"); State = StateUnzipDiff; + Local = true; Desc.URI = "gzip:" + FileName; DestFile += ".decomp"; QueueURI(Desc); @@ -502,6 +518,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash, std::clog << "Sending to rred method: " << FinalFile << std::endl; State = StateApplyDiff; + Local = true; Desc.URI = "rred:" + FinalFile; QueueURI(Desc); Mode = "rred"; @@ -1033,9 +1050,14 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify) } } - // Queue Packages file - new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, - (*Target)->ShortDesc, ExpectedIndexMD5); + // Queue Packages file (either diff or full packages files, depending + // on the users option) + if(_config->FindB("Acquire::PDiffs",true) == true) + new pkgAcqDiffIndex(Owner, (*Target)->URI, (*Target)->Description, + (*Target)->ShortDesc, ExpectedIndexMD5); + else + new pkgAcqIndex(Owner, (*Target)->URI, (*Target)->Description, + (*Target)->ShortDesc, ExpectedIndexMD5); } } diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 57cf60bfe..fff1b2b6a 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -818,7 +818,13 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) unsigned long ETA = (unsigned long)((TotalBytes - CurrentBytes) / CurrentCPS); - snprintf(msg,sizeof(msg), _("Downloading file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + // only show the ETA if it makes sense + if (ETA > 0 && ETA < 172800 /* two days */ ) + snprintf(msg,sizeof(msg), _("Retrieving file %li of %li (%s remaining)"), i, TotalItems, TimeToStr(ETA).c_str()); + else + snprintf(msg,sizeof(msg), _("Retrieving file %li of %li"), i, TotalItems); + + // build the status str status << "dlstatus:" << i diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc index b17b94319..9b22a90d3 100644 --- a/apt-pkg/contrib/hashes.cc +++ b/apt-pkg/contrib/hashes.cc @@ -36,6 +36,7 @@ bool Hashes::AddFD(int Fd,unsigned long Size) Size -= Res; MD5.Add(Buf,Res); SHA1.Add(Buf,Res); + SHA256.Add(Buf,Res); } return true; } diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 40bbe00a0..eefa7bf41 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -19,6 +19,7 @@ #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> +#include <apt-pkg/sha256.h> #include <algorithm> @@ -30,10 +31,11 @@ class Hashes MD5Summation MD5; SHA1Summation SHA1; + SHA256Summation SHA256; inline bool Add(const unsigned char *Data,unsigned long Size) { - return MD5.Add(Data,Size) && SHA1.Add(Data,Size); + return MD5.Add(Data,Size) && SHA1.Add(Data,Size) && SHA256.Add(Data,Size); }; inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));}; bool AddFD(int Fd,unsigned long Size); diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc new file mode 100644 index 000000000..ad2ddb2d3 --- /dev/null +++ b/apt-pkg/contrib/sha256.cc @@ -0,0 +1,424 @@ +/* + * Cryptographic API. + * + * SHA-256, as specified in + * http://csrc.nist.gov/cryptval/shs/sha256-384-512.pdf + * + * SHA-256 code by Jean-Luc Cooke <jlcooke@certainkey.com>. + * + * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com> + * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk> + * Copyright (c) 2002 James Morris <jmorris@intercode.com.au> + * + * Ported from the Linux kernel to Apt by Anthony Towns <ajt@debian.org> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + */ +#define SHA256_DIGEST_SIZE 32 +#define SHA256_HMAC_BLOCK_SIZE 64 + +#define ror32(value,bits) (((value) >> (bits)) | ((value) << (32 - (bits)))) + +#include <apt-pkg/sha256.h> +#include <apt-pkg/strutl.h> +#include <string.h> +#include <unistd.h> +#include <stdint.h> +#include <stdlib.h> +#include <stdio.h> +#include <arpa/inet.h> + +typedef uint32_t u32; +typedef uint8_t u8; + +static inline u32 Ch(u32 x, u32 y, u32 z) +{ + return z ^ (x & (y ^ z)); +} + +static inline u32 Maj(u32 x, u32 y, u32 z) +{ + return (x & y) | (z & (x | y)); +} + +#define e0(x) (ror32(x, 2) ^ ror32(x,13) ^ ror32(x,22)) +#define e1(x) (ror32(x, 6) ^ ror32(x,11) ^ ror32(x,25)) +#define s0(x) (ror32(x, 7) ^ ror32(x,18) ^ (x >> 3)) +#define s1(x) (ror32(x,17) ^ ror32(x,19) ^ (x >> 10)) + +#define H0 0x6a09e667 +#define H1 0xbb67ae85 +#define H2 0x3c6ef372 +#define H3 0xa54ff53a +#define H4 0x510e527f +#define H5 0x9b05688c +#define H6 0x1f83d9ab +#define H7 0x5be0cd19 + +static inline void LOAD_OP(int I, u32 *W, const u8 *input) +{ + W[I] = ( ((u32) input[I + 0] << 24) + | ((u32) input[I + 1] << 16) + | ((u32) input[I + 2] << 8) + | ((u32) input[I + 3])); +} + +static inline void BLEND_OP(int I, u32 *W) +{ + W[I] = s1(W[I-2]) + W[I-7] + s0(W[I-15]) + W[I-16]; +} + +static void sha256_transform(u32 *state, const u8 *input) +{ + u32 a, b, c, d, e, f, g, h, t1, t2; + u32 W[64]; + int i; + + /* load the input */ + for (i = 0; i < 16; i++) + LOAD_OP(i, W, input); + + /* now blend */ + for (i = 16; i < 64; i++) + BLEND_OP(i, W); + + /* load the state into our registers */ + a=state[0]; b=state[1]; c=state[2]; d=state[3]; + e=state[4]; f=state[5]; g=state[6]; h=state[7]; + + /* now iterate */ + t1 = h + e1(e) + Ch(e,f,g) + 0x428a2f98 + W[ 0]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x71374491 + W[ 1]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0xb5c0fbcf + W[ 2]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0xe9b5dba5 + W[ 3]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x3956c25b + W[ 4]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x59f111f1 + W[ 5]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x923f82a4 + W[ 6]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0xab1c5ed5 + W[ 7]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0xd807aa98 + W[ 8]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x12835b01 + W[ 9]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x243185be + W[10]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x550c7dc3 + W[11]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x72be5d74 + W[12]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x80deb1fe + W[13]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x9bdc06a7 + W[14]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0xc19bf174 + W[15]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0xe49b69c1 + W[16]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0xefbe4786 + W[17]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x0fc19dc6 + W[18]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x240ca1cc + W[19]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x2de92c6f + W[20]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x4a7484aa + W[21]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x5cb0a9dc + W[22]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x76f988da + W[23]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0x983e5152 + W[24]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0xa831c66d + W[25]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0xb00327c8 + W[26]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0xbf597fc7 + W[27]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0xc6e00bf3 + W[28]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0xd5a79147 + W[29]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x06ca6351 + W[30]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x14292967 + W[31]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0x27b70a85 + W[32]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x2e1b2138 + W[33]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x4d2c6dfc + W[34]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x53380d13 + W[35]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x650a7354 + W[36]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x766a0abb + W[37]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x81c2c92e + W[38]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x92722c85 + W[39]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0xa2bfe8a1 + W[40]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0xa81a664b + W[41]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0xc24b8b70 + W[42]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0xc76c51a3 + W[43]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0xd192e819 + W[44]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0xd6990624 + W[45]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0xf40e3585 + W[46]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x106aa070 + W[47]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0x19a4c116 + W[48]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x1e376c08 + W[49]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x2748774c + W[50]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x34b0bcb5 + W[51]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x391c0cb3 + W[52]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0x4ed8aa4a + W[53]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0x5b9cca4f + W[54]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0x682e6ff3 + W[55]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + t1 = h + e1(e) + Ch(e,f,g) + 0x748f82ee + W[56]; + t2 = e0(a) + Maj(a,b,c); d+=t1; h=t1+t2; + t1 = g + e1(d) + Ch(d,e,f) + 0x78a5636f + W[57]; + t2 = e0(h) + Maj(h,a,b); c+=t1; g=t1+t2; + t1 = f + e1(c) + Ch(c,d,e) + 0x84c87814 + W[58]; + t2 = e0(g) + Maj(g,h,a); b+=t1; f=t1+t2; + t1 = e + e1(b) + Ch(b,c,d) + 0x8cc70208 + W[59]; + t2 = e0(f) + Maj(f,g,h); a+=t1; e=t1+t2; + t1 = d + e1(a) + Ch(a,b,c) + 0x90befffa + W[60]; + t2 = e0(e) + Maj(e,f,g); h+=t1; d=t1+t2; + t1 = c + e1(h) + Ch(h,a,b) + 0xa4506ceb + W[61]; + t2 = e0(d) + Maj(d,e,f); g+=t1; c=t1+t2; + t1 = b + e1(g) + Ch(g,h,a) + 0xbef9a3f7 + W[62]; + t2 = e0(c) + Maj(c,d,e); f+=t1; b=t1+t2; + t1 = a + e1(f) + Ch(f,g,h) + 0xc67178f2 + W[63]; + t2 = e0(b) + Maj(b,c,d); e+=t1; a=t1+t2; + + state[0] += a; state[1] += b; state[2] += c; state[3] += d; + state[4] += e; state[5] += f; state[6] += g; state[7] += h; + + /* clear any sensitive info... */ + a = b = c = d = e = f = g = h = t1 = t2 = 0; + memset(W, 0, 64 * sizeof(u32)); +} + +SHA256Summation::SHA256Summation() +{ + Sum.state[0] = H0; + Sum.state[1] = H1; + Sum.state[2] = H2; + Sum.state[3] = H3; + Sum.state[4] = H4; + Sum.state[5] = H5; + Sum.state[6] = H6; + Sum.state[7] = H7; + Sum.count[0] = Sum.count[1] = 0; + memset(Sum.buf, 0, sizeof(Sum.buf)); + Done = false; +} + +bool SHA256Summation::Add(const u8 *data, unsigned long len) +{ + struct sha256_ctx *sctx = ∑ + unsigned int i, index, part_len; + + if (Done) return false; + + /* Compute number of bytes mod 128 */ + index = (unsigned int)((sctx->count[0] >> 3) & 0x3f); + + /* Update number of bits */ + if ((sctx->count[0] += (len << 3)) < (len << 3)) { + sctx->count[1]++; + sctx->count[1] += (len >> 29); + } + + part_len = 64 - index; + + /* Transform as many times as possible. */ + if (len >= part_len) { + memcpy(&sctx->buf[index], data, part_len); + sha256_transform(sctx->state, sctx->buf); + + for (i = part_len; i + 63 < len; i += 64) + sha256_transform(sctx->state, &data[i]); + index = 0; + } else { + i = 0; + } + + /* Buffer remaining input */ + memcpy(&sctx->buf[index], &data[i], len-i); + + return true; +} + +SHA256SumValue SHA256Summation::Result() +{ + struct sha256_ctx *sctx = ∑ + if (!Done) { + u8 bits[8]; + unsigned int index, pad_len, t; + static const u8 padding[64] = { 0x80, }; + + /* Save number of bits */ + t = sctx->count[0]; + bits[7] = t; t >>= 8; + bits[6] = t; t >>= 8; + bits[5] = t; t >>= 8; + bits[4] = t; + t = sctx->count[1]; + bits[3] = t; t >>= 8; + bits[2] = t; t >>= 8; + bits[1] = t; t >>= 8; + bits[0] = t; + + /* Pad out to 56 mod 64. */ + index = (sctx->count[0] >> 3) & 0x3f; + pad_len = (index < 56) ? (56 - index) : ((64+56) - index); + Add(padding, pad_len); + + /* Append length (before padding) */ + Add(bits, 8); + } + + Done = true; + + /* Store state in digest */ + + SHA256SumValue res; + u8 *out = res.Sum; + + int i, j; + unsigned int t; + for (i = j = 0; i < 8; i++, j += 4) { + t = sctx->state[i]; + out[j+3] = t; t >>= 8; + out[j+2] = t; t >>= 8; + out[j+1] = t; t >>= 8; + out[j ] = t; + } + + return res; +} + +// SHA256SumValue::SHA256SumValue - Constructs the sum from a string /*{{{*/ +// --------------------------------------------------------------------- +/* The string form of a SHA256 is a 64 character hex number */ +SHA256SumValue::SHA256SumValue(string Str) +{ + memset(Sum,0,sizeof(Sum)); + Set(Str); +} + + /*}}}*/ +// SHA256SumValue::SHA256SumValue - Default constructor /*{{{*/ +// --------------------------------------------------------------------- +/* Sets the value to 0 */ +SHA256SumValue::SHA256SumValue() +{ + memset(Sum,0,sizeof(Sum)); +} + + /*}}}*/ +// SHA256SumValue::Set - Set the sum from a string /*{{{*/ +// --------------------------------------------------------------------- +/* Converts the hex string into a set of chars */ +bool SHA256SumValue::Set(string Str) +{ + return Hex2Num(Str,Sum,sizeof(Sum)); +} + /*}}}*/ +// SHA256SumValue::Value - Convert the number into a string /*{{{*/ +// --------------------------------------------------------------------- +/* Converts the set of chars into a hex string in lower case */ +string SHA256SumValue::Value() const +{ + char Conv[16] = + { '0','1','2','3','4','5','6','7','8','9','a','b', + 'c','d','e','f' + }; + char Result[65]; + Result[64] = 0; + + // Convert each char into two letters + int J = 0; + int I = 0; + for (; I != 64; J++,I += 2) + { + Result[I] = Conv[Sum[J] >> 4]; + Result[I + 1] = Conv[Sum[J] & 0xF]; + } + + return string(Result); +} + + + +// SHA256SumValue::operator == - Comparator /*{{{*/ +// --------------------------------------------------------------------- +/* Call memcmp on the buffer */ +bool SHA256SumValue::operator == (const SHA256SumValue & rhs) const +{ + return memcmp(Sum,rhs.Sum,sizeof(Sum)) == 0; +} + /*}}}*/ + + +// SHA256Summation::AddFD - Add content of file into the checksum /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool SHA256Summation::AddFD(int Fd,unsigned long Size) +{ + unsigned char Buf[64 * 64]; + int Res = 0; + int ToEOF = (Size == 0); + while (Size != 0 || ToEOF) + { + unsigned n = sizeof(Buf); + if (!ToEOF) n = min(Size,(unsigned long)n); + Res = read(Fd,Buf,n); + if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read + return false; + if (ToEOF && Res == 0) // EOF + break; + Size -= Res; + Add(Buf,Res); + } + return true; +} + /*}}}*/ + diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h new file mode 100644 index 000000000..9e88f5ece --- /dev/null +++ b/apt-pkg/contrib/sha256.h @@ -0,0 +1,75 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +// $Id: sha1.h,v 1.3 2001/05/07 05:05:47 jgg Exp $ +/* ###################################################################### + + SHA256SumValue - Storage for a SHA-256 hash. + SHA256Summation - SHA-256 Secure Hash Algorithm. + + This is a C++ interface to a set of SHA256Sum functions, that mirrors + the equivalent MD5 & SHA1 classes. + + ##################################################################### */ + /*}}}*/ +#ifndef APTPKG_SHA256_H +#define APTPKG_SHA256_H + +#ifdef __GNUG__ +#pragma interface "apt-pkg/sha256.h" +#endif + +#include <string> +#include <algorithm> +#include <stdint.h> + +using std::string; +using std::min; + +class SHA256Summation; + +class SHA256SumValue +{ + friend class SHA256Summation; + unsigned char Sum[32]; + + public: + + // Accessors + bool operator ==(const SHA256SumValue &rhs) const; + string Value() const; + inline void Value(unsigned char S[32]) + {for (int I = 0; I != sizeof(Sum); I++) S[I] = Sum[I];}; + inline operator string() const {return Value();}; + bool Set(string Str); + inline void Set(unsigned char S[32]) + {for (int I = 0; I != sizeof(Sum); I++) Sum[I] = S[I];}; + + SHA256SumValue(string Str); + SHA256SumValue(); +}; + +struct sha256_ctx { + uint32_t count[2]; + uint32_t state[8]; + uint8_t buf[128]; +}; + +class SHA256Summation +{ + struct sha256_ctx Sum; + + bool Done; + + public: + + bool Add(const unsigned char *inbuf,unsigned long inlen); + inline bool Add(const char *Data) {return Add((unsigned char *)Data,strlen(Data));}; + bool AddFD(int Fd,unsigned long Size); + inline bool Add(const unsigned char *Beg,const unsigned char *End) + {return Add(Beg,End-Beg);}; + SHA256SumValue Result(); + + SHA256Summation(); +}; + +#endif diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index aeee61929..064d8fa5b 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -59,7 +59,7 @@ int debVersioningSystem::CmpFragment(const char *A,const char *AEnd, } /* Iterate over the whole string - What this does is to spilt the whole string into groups of + What this does is to split the whole string into groups of numeric and non numeric portions. For instance: a67bhgs89 Has 4 portions 'a', '67', 'bhgs', '89'. A more normal: @@ -140,6 +140,27 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd, if (rhs == BEnd) rhs = B; + // Special case: a zero epoch is the same as no epoch, + // so remove it. + if (lhs != A) + { + for (; *A == '0'; ++A); + if (A == lhs) + { + ++A; + ++lhs; + } + } + if (rhs != B) + { + for (; *B == '0'; ++B); + if (B == rhs) + { + ++B; + ++rhs; + } + } + // Compare the epoch int Res = CmpFragment(A,lhs,B,rhs); if (Res != 0) diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index fe8fbca74..667db8ff2 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -375,8 +375,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) }, // Purge operation { - {"config-files", _("Preparing for remove with config %s")}, - {"not-installed", _("Removed with config %s")}, + {"config-files", _("Preparing to completely remove %s")}, + {"not-installed", _("Completely removed %s")}, {NULL, NULL} }, }; @@ -623,8 +623,8 @@ bool pkgDPkgPM::Go(int OutStatusFd) 'status: conffile-prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited */ - char* list[4]; - TokSplitString(':', line, list, 5); + char* list[5]; + TokSplitString(':', line, list, sizeof(list)/sizeof(list[0])); char *pkg = list[1]; char *action = _strstrip(list[2]); diff --git a/apt-pkg/makefile b/apt-pkg/makefile index fa0efe5b2..7887fce92 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -21,11 +21,11 @@ APT_DOMAIN:=libapt-pkg$(MAJOR) # Source code for the contributed non-core things SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \ contrib/configuration.cc contrib/progress.cc contrib/cmndline.cc \ - contrib/md5.cc contrib/sha1.cc contrib/hashes.cc \ + contrib/md5.cc contrib/sha1.cc contrib/sha256.cc contrib/hashes.cc \ contrib/cdromutl.cc contrib/crc-16.cc \ contrib/fileutl.cc HEADERS = mmap.h error.h configuration.h fileutl.h cmndline.h \ - md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h hashes.h + md5.h crc-16.h cdromutl.h strutl.h sptr.h sha1.h sha256.h hashes.h # Source code for the core main library SOURCE+= pkgcache.cc version.cc depcache.cc \ diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index cae0fa819..2eb269418 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -35,20 +35,20 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : Fd(*pFd), Size(Size) { - if (Fd.IsOpen() == false) + if (Fd.IsOpen() == false || Fd.Size()) { Buffer = 0; Start = End = Buffer = 0; - Done = true; iOffset = 0; + Map = NULL; return; } - Buffer = new char[Size]; - Start = End = Buffer; - Done = false; + Map = new MMap (Fd, MMap::Public | MMap::ReadOnly); + Buffer = (char *) Map->Data (); + Start = Buffer; + End = Buffer + Map->Size (); iOffset = 0; - Fill(); } /*}}}*/ // TagFile::~pkgTagFile - Destructor /*{{{*/ @@ -56,7 +56,7 @@ pkgTagFile::pkgTagFile(FileFd *pFd,unsigned long Size) : /* */ pkgTagFile::~pkgTagFile() { - delete [] Buffer; + delete Map; } /*}}}*/ // TagFile::Step - Advance to the next section /*{{{*/ @@ -64,14 +64,13 @@ pkgTagFile::~pkgTagFile() /* If the Section Scanner fails we refill the buffer and try again. */ bool pkgTagFile::Step(pkgTagSection &Tag) { + if (Start == End) + return false; + if (Tag.Scan(Start,End - Start) == false) { - if (Fill() == false) - return false; - - if (Tag.Scan(Start,End - Start) == false) - return _error->Error(_("Unable to parse package file %s (1)"), - Fd.Name().c_str()); + return _error->Error(_("Unable to parse package file %s (1)"), + Fd.Name().c_str()); } Start += Tag.size(); iOffset += Tag.size(); @@ -80,50 +79,6 @@ bool pkgTagFile::Step(pkgTagSection &Tag) return true; } /*}}}*/ -// TagFile::Fill - Top up the buffer /*{{{*/ -// --------------------------------------------------------------------- -/* This takes the bit at the end of the buffer and puts it at the start - then fills the rest from the file */ -bool pkgTagFile::Fill() -{ - unsigned long EndSize = End - Start; - unsigned long Actual = 0; - - memmove(Buffer,Start,EndSize); - Start = Buffer; - End = Buffer + EndSize; - - if (Done == false) - { - // See if only a bit of the file is left - if (Fd.Read(End,Size - (End - Buffer),&Actual) == false) - return false; - if (Actual != Size - (End - Buffer)) - Done = true; - End += Actual; - } - - if (Done == true) - { - if (EndSize <= 3 && Actual == 0) - return false; - if (Size - (End - Buffer) < 4) - return true; - - // Append a double new line if one does not exist - unsigned int LineCount = 0; - for (const char *E = End - 1; E - End < 6 && (*E == '\n' || *E == '\r'); E--) - if (*E == '\n') - LineCount++; - for (; LineCount < 2; LineCount++) - *End++ = '\n'; - - return true; - } - - return true; -} - /*}}}*/ // TagFile::Jump - Jump to a pre-recorded location in the file /*{{{*/ // --------------------------------------------------------------------- /* This jumps to a pre-recorded file location and reads the record @@ -141,20 +96,7 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset) // Reposition and reload.. iOffset = Offset; - Done = false; - if (Fd.Seek(Offset) == false) - return false; - End = Start = Buffer; - - if (Fill() == false) - return false; - - if (Tag.Scan(Start,End - Start) == true) - return true; - - // This appends a double new line (for the real eof handling) - if (Fill() == false) - return false; + Start = Buffer + iOffset; if (Tag.Scan(Start,End - Start) == false) return _error->Error(_("Unable to parse package file %s (2)"),Fd.Name().c_str()); @@ -181,7 +123,7 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) Stop = Section = Start; memset(AlphaIndexes,0,sizeof(AlphaIndexes)); - if (Stop == 0) + if (Stop == 0 || MaxLength == 0) return false; TagCount = 0; @@ -212,6 +154,12 @@ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) Stop++; } + if ((Stop+1 >= End) && (End[-1] == '\n' || End[-1] == '\r')) + { + Indexes[TagCount] = (End - 1) - Section; + return true; + } + return false; } /*}}}*/ @@ -394,7 +342,8 @@ static const char *iTFRewritePackageOrder[] = { "Filename", "Size", "MD5Sum", - "SHA1Sum", + "SHA1", + "SHA256", "MSDOS-Filename", // Obsolete "Description", 0}; diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 8c948754d..5cff2681c 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -25,6 +25,7 @@ #endif #include <apt-pkg/fileutl.h> +#include <apt-pkg/mmap.h> #include <stdio.h> class pkgTagSection @@ -69,15 +70,13 @@ class pkgTagSection class pkgTagFile { FileFd &Fd; + MMap *Map; char *Buffer; char *Start; char *End; - bool Done; unsigned long iOffset; unsigned long Size; - bool Fill(); - public: bool Step(pkgTagSection &Section); diff --git a/buildlib/defaults.mak b/buildlib/defaults.mak index c3d08d9d4..a171522d5 100644 --- a/buildlib/defaults.mak +++ b/buildlib/defaults.mak @@ -174,11 +174,12 @@ ifeq ($(NUM_PROCS),1) PARALLEL_RUN=no endif -ifndef PARALLEL_RUN - PARALLEL_RUN=yes - .EXPORT: PARALLEL_RUN - # handle recursion - ifneq ($(NUM_PROCS),) - MAKEFLAGS += -j $(NUM_PROCS) - endif -endif +# mvo: commented out, lead to build failures in the arch-build target +#ifndef PARALLEL_RUN +# PARALLEL_RUN=yes +# .EXPORT: PARALLEL_RUN +# # handle recursion +# ifneq ($(NUM_PROCS),) +# MAKEFLAGS += -j $(NUM_PROCS) +# endif +#endif diff --git a/configure.in b/configure.in index 41609c39d..a8e565848 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.6.43.3") +AC_DEFINE_UNQUOTED(VERSION,"0.6.44.1exp1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) @@ -201,7 +201,7 @@ ah_GCC3DEP dnl It used to be that the user could select translations and that could get dnl passed to the makefiles, but now that can only work if you use special dnl gettext approved makefiles, so this feature is unsupported by this. -ALL_LINGUAS="da de en_GB es fr hu it nl no_NO pl pt_BR ru sv zh_TW" +ALL_LINGUAS="bg bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW" AM_GNU_GETTEXT(external) if test x"$USE_NLS" = "xyes"; then AC_DEFINE(USE_NLS) diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index db04b1e91..f44d1966b 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,11 @@ +apt (0.6.44) unstable; urgency=low + + * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. + If you use a database created by an older version of apt, delete + it and allow it to be recreated the next time. + + -- Michael Vogt <mvo@debian.org> Wed, 26 Apr 2006 12:57:53 +0200 + apt (0.5.25) unstable; urgency=low * apt-ftparchive --db now uses Berkeley DB version 4.2. If used with a diff --git a/debian/changelog b/debian/changelog index d2e780235..2f7e5f872 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,63 @@ -apt (0.6.43.3exp1) experimental; urgency=low +apt (0.6.44.1exp1) experimental; urgency=low - * added support for package index diffs * added support for i18n of the package descriptions - * synced with the apt--debian-sid--0 branch - * build from mvo@debian.org--2005/apt--debian-experimental--0 - (from http://people.debian.org/~mvo/arch) - + * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch + * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental + -- Michael Vogt <mvo@debian.org> Wed, 1 Mar 2006 13:34:15 +0100 +apt (0.6.44.1) unstable; urgency=low + + * apt-pkg/acquire-item.cc: + - fix reversed logic of the "Acquire::PDiffs" option + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + - po/LINGUAS: added "bg" Closes: #360262 + - po/gl.po: Galician translation update. Closes: #366849 + - po/hu.po: Hungarian translation update. Closes: #365448 + - po/cs.po: Czech translation updated. Closes: #367244 + * apt-pkg/contrib/sha256.cc: + - applied patch to fix unaligned access problem. Closes: #367417 + (thanks to David Mosberger) + + -- Michael Vogt <mvo@debian.org> Tue, 16 May 2006 21:51:16 +0200 + +apt (0.6.44) unstable; urgency=low + + * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large + * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 + (thanks to Anthony Towns) + * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations + (thanks to Anthony Towns) + * apt pdiff support from experimental merged + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + * apt-pkg/deb/dpkgpm.cc: + - wording fixes (thanks to Matt Zimmerman) + - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp) + * apt-pkg/tagfile.{cc,h}: + - use MMap to read the entries (thanks to Zephaniah E. Hull for the + patch) Closes: #350025 + * Merge from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * bg.po: Added, complete to 512t. Closes: #360262 + * doc/apt-ftparchive.1.xml: + - fix documentation for "SrcPackages" -> "Sources" + (thanks to Bart Martens for the patch, closes: #307756) + * debian/libapt-pkg-doc.doc-base.cache: + - remove broken charackter from description (closes: #361129) + * apt-inst/deb/dpkgdb.cc, methods/gpgv.cc: + - i18n fixes (closes: #349298) + * debian/postinst: dont fail on not available + /usr/share/doc/apt/examples/sources.list (closes: #361130) + * methods/ftp.cc: + - unlink empty file in partial if the download failed because + the file is missing on the server (closes: #316337) + * apt-pkg/deb/debversion.cc: + - treats a version string with explicit zero epoch equal + than the same without epoch (Policy 5.6.12, closes: #363358) + Thanks to Lionel Elie Mamane for the patch + + -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200 + apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: diff --git a/debian/compat b/debian/compat index 00750edc0..7ed6ff82d 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -3 +5 diff --git a/debian/control b/debian/control index 3b8883f88..53ce851f6 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: admin Priority: important Maintainer: APT Development Team <deity@lists.debian.org> Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org> -Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 4.1.62), libdb4.3-dev, gettext (>= 0.12) +Standards-Version: 3.6.2.2 +Build-Depends: debhelper (>= 5.0), libdb4.3-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt diff --git a/debian/libapt-pkg-doc.doc-base.cache b/debian/libapt-pkg-doc.doc-base.cache index b58b79bd1..59558dee8 100644 --- a/debian/libapt-pkg-doc.doc-base.cache +++ b/debian/libapt-pkg-doc.doc-base.cache @@ -4,7 +4,7 @@ Author: Jason Gunthorpe Abstract: The APT Cache Specification describes the complete implementation and format of the APT Cache file. The APT Cache file is a way for APT to parse and store a large number of package files for display in the UI. - It's primarydesign goal is to make display of a single package in the + It's primary design goal is to make display of a single package in the tree very fast by pre-linking important things like dependencies and provides. The specification doubles as documentation for one of the in-memory structures used by the package library and the APT GUI. diff --git a/debian/postinst b/debian/postinst index 891792111..1588f5241 100755 --- a/debian/postinst +++ b/debian/postinst @@ -12,7 +12,10 @@ set -e create_apt_conf () { - cp /usr/share/doc/apt/examples/sources.list /etc/apt/sources.list + EXAMPLE_SOURCE=/usr/share/doc/apt/examples/sources.list + if [ -f $EXAMPLE_SOURCE ]; then + cp $EXAMPLE_SOURCE /etc/apt/sources.list + fi } check_apt_conf () diff --git a/debian/rules b/debian/rules index cd026b4a4..a8bf88762 100755 --- a/debian/rules +++ b/debian/rules @@ -36,6 +36,7 @@ endif # Default rule build: +PKG=apt DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS) APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p') APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in) @@ -335,6 +336,6 @@ cvs-mkul: arch-build: rm -rf debian/arch-build mkdir -p debian/arch-build/apt-$(APT_DEBVER) - baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER) + tar -c --exclude=arch-build --no-recursion -f - `bzr inventory` | (cd debian/arch-build/$(PKG)-$(APT_DEBVER);tar xf -) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) diff --git a/doc/apt-ftparchive.1.xml b/doc/apt-ftparchive.1.xml index 7c1ae9432..8cfbc72e9 100644 --- a/doc/apt-ftparchive.1.xml +++ b/doc/apt-ftparchive.1.xml @@ -407,10 +407,10 @@ for i in Sections do Sets the Packages file output.</para></listitem> </varlistentry> - <varlistentry><term>SrcPackages</term> + <varlistentry><term>Sources</term> <listitem><para> Sets the Sources file output. At least one of - <literal>Packages</literal> or <literal>SrcPackages</literal> is required.</para></listitem> + <literal>Packages</literal> or <literal>Sources</literal> is required.</para></listitem> </varlistentry> <varlistentry><term>Contents</term> diff --git a/doc/examples/apt-ftparchive.conf b/doc/examples/apt-ftparchive.conf index 657ec5440..c9d352ab6 100644 --- a/doc/examples/apt-ftparchive.conf +++ b/doc/examples/apt-ftparchive.conf @@ -20,21 +20,21 @@ Default { // Contents file for these in the main section of the sid release BinDirectory "pool/main" { Packages "dists/sid/main/binary-i386/Packages"; - SrcPackages "dists/sid/main/source/Sources"; + Sources "dists/sid/main/source/Sources"; Contents "dists/sid/Contents-i386"; } // This is the same for the contrib section BinDirectory "pool/contrib" { Packages "dists/sid/contrib/binary-i386/Packages"; - SrcPackages "dists/sid/contrib/source/Sources"; + Sources "dists/sid/contrib/source/Sources"; Contents "dists/sid/Contents-i386"; } // This is the same for the non-free section BinDirectory "pool/non-free" { Packages "dists/sid/non-free/binary-i386/Packages"; - SrcPackages "dists/sid/non-free/source/Sources"; + Sources "dists/sid/non-free/source/Sources"; Contents "dists/sid/Contents-i386"; }; diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 9e851d753..7346ba9bb 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -104,6 +104,8 @@ Acquire Queue-Mode "host"; // host|access Retries "0"; Source-Symlinks "true"; + + PDiffs "true"; // try to get the IndexFile diffs // HTTP method configuration http diff --git a/doc/fr/apt-ftparchive.fr.1.xml b/doc/fr/apt-ftparchive.fr.1.xml index 61cdfa2ec..9ae6506fc 100644 --- a/doc/fr/apt-ftparchive.fr.1.xml +++ b/doc/fr/apt-ftparchive.fr.1.xml @@ -451,10 +451,10 @@ Indique le fichier Packages cr. </para></listitem> </varlistentry> -<varlistentry><term>SrcPackages</term> +<varlistentry><term>Sources</term> <listitem><para> Indique le fichier Sources cr. L'un des deux fichiers, -<literal>Packages</literal> ou <literal>SrcPackages</literal> est ncessaire. +<literal>Packages</literal> ou <literal>Sources</literal> est ncessaire. </para></listitem> </varlistentry> @@ -628,4 +628,4 @@ dcimal 100 en cas d'erreur. &manbugs; &traducteur; -</refentry>
\ No newline at end of file +</refentry> diff --git a/doc/ja/apt-ftparchive.ja.1.xml b/doc/ja/apt-ftparchive.ja.1.xml index 82bd9c023..be6bbd767 100644 --- a/doc/ja/apt-ftparchive.ja.1.xml +++ b/doc/ja/apt-ftparchive.ja.1.xml @@ -90,7 +90,8 @@ <para>本質的に <command>apt-ftparchive</command> は、 .deb ファイルの内容をキャッシュするのにバイナリデータベースを使用できます。 また、&gzip; 以外のいかなる外部プログラムにも依存しません。 - すべて生成する際、</para> + すべて生成する際には、 + ファイル変更点の検出と希望した圧縮出力ファイルの作成を自動的に実行します。</para> <!-- <para>Unless the <option>-h</option>, or <option>-\-help</option> option is given one of the @@ -140,7 +141,7 @@ looked for with an extension of .src. The -\-source-override option can be used to change the source override file that will be used.</para></listitem> --> - override ファイルを指定した場合、. + override ファイルを指定した場合、 src 拡張子がついたソースオーバーライドファイルを探します。 使用するソースオーバーライドファイルを変更するのには、 --source-override オプションを使用します。</para></listitem> @@ -833,7 +834,7 @@ for i in Sections do という形式か、単純に <literallayout>new</literallayout> となります。 - 最初の形式は、// で区切られた古いemail アドレスのリストを許可します。 + 最初の形式は、// で区切られた古い email アドレスのリストを許可します。 この形式がある場合は、メンテナフィールドになるよう new に置換してください。 2 番目の形式は無条件にメンテナフィールドに置換します。</para> </refsect1> diff --git a/doc/ja/apt-secure.ja.8.xml b/doc/ja/apt-secure.ja.8.xml index 33a829076..5b9612a7f 100644 --- a/doc/ja/apt-secure.ja.8.xml +++ b/doc/ja/apt-secure.ja.8.xml @@ -100,7 +100,7 @@ responsibility to ensure that the archive integrity is correct. --> apt アーカイブからエンドユーザまでの信頼の輪は、 - いくつかのステップでo区政されています。 + いくつかのステップで構成されています。 <command>apt-secure</command> は、この輪の最後のステップで、 アーカイブを信頼することは、 パッケージに悪意のあるコードが含まれていないと信頼するわけではありませんが、 @@ -182,7 +182,7 @@ per package basis. It is designed to prevent two possible attacks: --> <para>以上は、パッケージごとの署名チェックとは違うことに注意してください。 - 以下の用に考えられる 2 種類の攻撃を防ぐよう設計されています。 + 以下のように考えられる 2 種類の攻撃を防ぐよう設計されています。 </para> <itemizedlist> @@ -243,7 +243,7 @@ <command>apt-key</command> は、 apt が使用するキーリストを管理するプログラムです。 このリリースのインストールでは、Debian パッケージリポジトリで使用する、 - キーで署名する デフォルトの Debian アーカイブを提供しますが、 + キーで署名するデフォルトの Debian アーカイブを提供しますが、 <command>apt-key</command> でキーの追加・削除が行えます。 </para> <para> diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 9e93dff05..0e6078642 100644 --- a/ftparchive/cachedb.cc +++ b/ftparchive/cachedb.cc @@ -19,6 +19,8 @@ #include <apti18n.h> #include <apt-pkg/error.h> #include <apt-pkg/md5.h> +#include <apt-pkg/sha1.h> +#include <apt-pkg/sha256.h> #include <apt-pkg/strutl.h> #include <apt-pkg/configuration.h> @@ -54,7 +56,7 @@ bool CacheDB::ReadyDB(string DB) return true; db_create(&Dbp, NULL, 0); - if ((err = Dbp->open(Dbp, NULL, DB.c_str(), NULL, DB_HASH, + if ((err = Dbp->open(Dbp, NULL, DB.c_str(), NULL, DB_BTREE, (ReadOnly?DB_RDONLY:DB_CREATE), 0644)) != 0) { @@ -67,6 +69,12 @@ bool CacheDB::ReadyDB(string DB) (ReadOnly?DB_RDONLY:DB_CREATE), 0644); } + // the database format has changed from DB_HASH to DB_BTREE in + // apt 0.6.44 + if (err == EINVAL) + { + _error->Error(_("DB format is invalid. If you upgraded from a older version of apt, please remove and re-create the database.")); + } if (err) { Dbp = 0; @@ -79,48 +87,123 @@ bool CacheDB::ReadyDB(string DB) return true; } /*}}}*/ -// CacheDB::SetFile - Select a file to be working with /*{{{*/ +// CacheDB::OpenFile - Open the filei /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool CacheDB::OpenFile() +{ + Fd = new FileFd(FileName,FileFd::ReadOnly); + if (_error->PendingError() == true) + { + delete Fd; + Fd = NULL; + return false; + } + return true; +} + /*}}}*/ +// CacheDB::GetFileStat - Get stats from the file /*{{{*/ +// --------------------------------------------------------------------- +/* This gets the size from the database if it's there. If we need + * to look at the file, also get the mtime from the file. */ +bool CacheDB::GetFileStat() +{ + if ((CurStat.Flags & FlSize) == FlSize) + { + /* Already worked out the file size */ + } + else + { + /* Get it from the file. */ + if (Fd == NULL && OpenFile() == false) + { + return false; + } + // Stat the file + struct stat St; + if (fstat(Fd->Fd(),&St) != 0) + { + return _error->Errno("fstat", + _("Failed to stat %s"),FileName.c_str()); + } + CurStat.FileSize = St.st_size; + CurStat.mtime = htonl(St.st_mtime); + CurStat.Flags |= FlSize; + } + return true; +} + /*}}}*/ +// CacheDB::GetCurStat - Set the CurStat variable. /*{{{*/ // --------------------------------------------------------------------- -/* All future actions will be performed against this file */ -bool CacheDB::SetFile(string FileName,struct stat St,FileFd *Fd) +/* Sets the CurStat variable. Either to 0 if no database is used + * or to the value in the database if one is used */ +bool CacheDB::GetCurStat() { - delete DebFile; - DebFile = 0; - this->FileName = FileName; - this->Fd = Fd; - this->FileStat = St; - FileStat = St; memset(&CurStat,0,sizeof(CurStat)); - Stats.Bytes += St.st_size; - Stats.Packages++; - - if (DBLoaded == false) - return true; + if (DBLoaded) + { + /* First see if thre is anything about it + in the database */ + /* Get the flags (and mtime) */ InitQuery("st"); - // Ensure alignment of the returned structure Data.data = &CurStat; Data.ulen = sizeof(CurStat); Data.flags = DB_DBT_USERMEM; - // Lookup the stat info and confirm the file is unchanged - if (Get() == true) - { - if (CurStat.mtime != htonl(St.st_mtime)) + if (Get() == false) { - CurStat.mtime = htonl(St.st_mtime); CurStat.Flags = 0; - _error->Warning(_("File date has changed %s"),FileName.c_str()); } + CurStat.Flags = ntohl(CurStat.Flags); + CurStat.FileSize = ntohl(CurStat.FileSize); } - else + return true; +} + /*}}}*/ +// CacheDB::GetFileInfo - Get all the info about the file /*{{{*/ +// --------------------------------------------------------------------- +bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents, + bool GenContentsOnly, + bool DoMD5, bool DoSHA1, bool DoSHA256) +{ + this->FileName = FileName; + + if (GetCurStat() == false) { - CurStat.mtime = htonl(St.st_mtime); - CurStat.Flags = 0; + return false; } - CurStat.Flags = ntohl(CurStat.Flags); OldStat = CurStat; + + if (GetFileStat() == false) + { + delete Fd; + Fd = NULL; + return false; + } + + Stats.Bytes += CurStat.FileSize; + Stats.Packages++; + + if (DoControl && LoadControl() == false + || DoContents && LoadContents(GenContentsOnly) == false + || DoMD5 && GetMD5(false) == false + || DoSHA1 && GetSHA1(false) == false + || DoSHA256 && GetSHA256(false) == false) + { + delete Fd; + Fd = NULL; + delete DebFile; + DebFile = NULL; + return false; + } + + delete Fd; + Fd = NULL; + delete DebFile; + DebFile = NULL; + return true; } /*}}}*/ @@ -139,6 +222,10 @@ bool CacheDB::LoadControl() CurStat.Flags &= ~FlControl; } + if (Fd == NULL && OpenFile() == false) + { + return false; + } // Create a deb instance to read the archive if (DebFile == 0) { @@ -183,6 +270,10 @@ bool CacheDB::LoadContents(bool GenOnly) CurStat.Flags &= ~FlContents; } + if (Fd == NULL && OpenFile() == false) + { + return false; + } // Create a deb instance to read the archive if (DebFile == 0) { @@ -201,10 +292,37 @@ bool CacheDB::LoadContents(bool GenOnly) return true; } /*}}}*/ + +static string bytes2hex(uint8_t *bytes, size_t length) { + char space[65]; + if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2; + for (size_t i = 0; i < length; i++) + snprintf(&space[i*2], 3, "%02x", bytes[i]); + return string(space); +} + +static inline unsigned char xdig2num(char dig) { + if (isdigit(dig)) return dig - '0'; + if ('a' <= dig && dig <= 'f') return dig - 'a' + 10; + if ('A' <= dig && dig <= 'F') return dig - 'A' + 10; + return 0; +} + +static void hex2bytes(uint8_t *bytes, const char *hex, int length) { + while (length-- > 0) { + *bytes = 0; + if (isxdigit(hex[0]) && isxdigit(hex[1])) { + *bytes = xdig2num(hex[0]) * 16 + xdig2num(hex[1]); + hex += 2; + } + bytes++; + } +} + // CacheDB::GetMD5 - Get the MD5 hash /*{{{*/ // --------------------------------------------------------------------- /* */ -bool CacheDB::GetMD5(string &MD5Res,bool GenOnly) +bool CacheDB::GetMD5(bool GenOnly) { // Try to read the control information out of the DB. if ((CurStat.Flags & FlMD5) == FlMD5) @@ -212,28 +330,88 @@ bool CacheDB::GetMD5(string &MD5Res,bool GenOnly) if (GenOnly == true) return true; - InitQuery("m5"); - if (Get() == true) - { - MD5Res = string((char *)Data.data,Data.size); + MD5Res = bytes2hex(CurStat.MD5, sizeof(CurStat.MD5)); return true; } - CurStat.Flags &= ~FlMD5; - } - Stats.MD5Bytes += FileStat.st_size; + Stats.MD5Bytes += CurStat.FileSize; + if (Fd == NULL && OpenFile() == false) + { + return false; + } MD5Summation MD5; - if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),FileStat.st_size) == false) + if (Fd->Seek(0) == false || MD5.AddFD(Fd->Fd(),CurStat.FileSize) == false) return false; MD5Res = MD5.Result(); - InitQuery("m5"); - if (Put(MD5Res.c_str(),MD5Res.length()) == true) + hex2bytes(CurStat.MD5, MD5Res.data(), sizeof(CurStat.MD5)); CurStat.Flags |= FlMD5; return true; } /*}}}*/ +// CacheDB::GetSHA1 - Get the SHA1 hash /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool CacheDB::GetSHA1(bool GenOnly) +{ + // Try to read the control information out of the DB. + if ((CurStat.Flags & FlSHA1) == FlSHA1) + { + if (GenOnly == true) + return true; + + SHA1Res = bytes2hex(CurStat.SHA1, sizeof(CurStat.SHA1)); + return true; + } + + Stats.SHA1Bytes += CurStat.FileSize; + + if (Fd == NULL && OpenFile() == false) + { + return false; + } + SHA1Summation SHA1; + if (Fd->Seek(0) == false || SHA1.AddFD(Fd->Fd(),CurStat.FileSize) == false) + return false; + + SHA1Res = SHA1.Result(); + hex2bytes(CurStat.SHA1, SHA1Res.data(), sizeof(CurStat.SHA1)); + CurStat.Flags |= FlSHA1; + return true; +} + /*}}}*/ +// CacheDB::GetSHA256 - Get the SHA256 hash /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool CacheDB::GetSHA256(bool GenOnly) +{ + // Try to read the control information out of the DB. + if ((CurStat.Flags & FlSHA256) == FlSHA256) + { + if (GenOnly == true) + return true; + + SHA256Res = bytes2hex(CurStat.SHA256, sizeof(CurStat.SHA256)); + return true; + } + + Stats.SHA256Bytes += CurStat.FileSize; + + if (Fd == NULL && OpenFile() == false) + { + return false; + } + SHA256Summation SHA256; + if (Fd->Seek(0) == false || SHA256.AddFD(Fd->Fd(),CurStat.FileSize) == false) + return false; + + SHA256Res = SHA256.Result(); + hex2bytes(CurStat.SHA256, SHA256Res.data(), sizeof(CurStat.SHA256)); + CurStat.Flags |= FlSHA256; + return true; +} + /*}}}*/ // CacheDB::Finish - Write back the cache structure /*{{{*/ // --------------------------------------------------------------------- /* */ @@ -246,9 +424,12 @@ bool CacheDB::Finish() // Write the stat information CurStat.Flags = htonl(CurStat.Flags); + CurStat.FileSize = htonl(CurStat.FileSize); InitQuery("st"); Put(&CurStat,sizeof(CurStat)); CurStat.Flags = ntohl(CurStat.Flags); + CurStat.FileSize = ntohl(CurStat.FileSize); + return true; } /*}}}*/ @@ -278,7 +459,6 @@ bool CacheDB::Clean() { if (stringcmp((char *)Key.data,Colon,"st") == 0 || stringcmp((char *)Key.data,Colon,"cn") == 0 || - stringcmp((char *)Key.data,Colon,"m5") == 0 || stringcmp((char *)Key.data,Colon,"cl") == 0) { if (FileExists(string(Colon+1,(const char *)Key.data+Key.size)) == true) diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h index 1b043e1aa..afa22213a 100644 --- a/ftparchive/cachedb.h +++ b/ftparchive/cachedb.h @@ -44,7 +44,7 @@ class CacheDB memset(&Key,0,sizeof(Key)); memset(&Data,0,sizeof(Data)); Key.data = TmpKey; - Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",Type,FileName.c_str()); + Key.size = snprintf(TmpKey,sizeof(TmpKey),"%s:%s",FileName.c_str(), Type); } inline bool Get() @@ -64,19 +64,31 @@ class CacheDB } return true; } + bool OpenFile(); + bool GetFileStat(); + bool GetCurStat(); + bool LoadControl(); + bool LoadContents(bool GenOnly); + bool GetMD5(bool GenOnly); + bool GetSHA1(bool GenOnly); + bool GetSHA256(bool GenOnly); // Stat info stored in the DB, Fixed types since it is written to disk. - enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2)}; + enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2), + FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5)}; struct StatStore { - time_t mtime; uint32_t Flags; + uint32_t mtime; + uint32_t FileSize; + uint8_t MD5[16]; + uint8_t SHA1[20]; + uint8_t SHA256[32]; } CurStat; struct StatStore OldStat; // 'set' state string FileName; - struct stat FileStat; FileFd *Fd; debDebFile *DebFile; @@ -85,34 +97,42 @@ class CacheDB // Data collection helpers debDebFile::MemControlExtract Control; ContentsExtract Contents; + string MD5Res; + string SHA1Res; + string SHA256Res; // Runtime statistics struct Stats { double Bytes; double MD5Bytes; + double SHA1Bytes; + double SHA256Bytes; unsigned long Packages; unsigned long Misses; unsigned long DeLinkBytes; - inline void Add(const Stats &S) {Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; + inline void Add(const Stats &S) { + Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; SHA1Bytes += S.SHA1Bytes; + SHA256Bytes += S.SHA256Bytes; Packages += S.Packages; Misses += S.Misses; DeLinkBytes += S.DeLinkBytes;}; - Stats() : Bytes(0), MD5Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {}; + Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {}; } Stats; bool ReadyDB(string DB); inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;}; inline bool Loaded() {return DBLoaded == true;}; + inline off_t GetFileSize(void) {return CurStat.FileSize;} + bool SetFile(string FileName,struct stat St,FileFd *Fd); - bool LoadControl(); - bool LoadContents(bool GenOnly); - bool GetMD5(string &MD5Res,bool GenOnly); + bool GetFileInfo(string FileName, bool DoControl, bool DoContents, + bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256); bool Finish(); bool Clean(); - CacheDB(string DB) : Dbp(0), DebFile(0) {ReadyDB(DB);}; + CacheDB(string DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);}; ~CacheDB() {ReadyDB(string()); delete DebFile;}; }; diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc index fc9ea27d7..ea242d6af 100644 --- a/ftparchive/writer.cc +++ b/ftparchive/writer.cc @@ -23,6 +23,7 @@ #include <apt-pkg/configuration.h> #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> +#include <apt-pkg/sha256.h> #include <apt-pkg/deblistparser.h> #include <sys/types.h> @@ -70,7 +71,7 @@ FTWScanner::FTWScanner() // --------------------------------------------------------------------- /* This is the FTW scanner, it processes each directory element in the directory tree. */ -int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag) +int FTWScanner::ScannerFTW(const char *File,const struct stat *sb,int Flag) { if (Flag == FTW_DNR) { @@ -85,6 +86,14 @@ int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag) if (Flag != FTW_F) return 0; + return ScannerFile(File, true); +} + /*}}}*/ +// FTWScanner::ScannerFile - File Scanner /*{{{*/ +// --------------------------------------------------------------------- +/* */ +int FTWScanner::ScannerFile(const char *File, bool ReadLink) +{ const char *LastComponent = strrchr(File, '/'); if (LastComponent == NULL) LastComponent = File; @@ -105,7 +114,8 @@ int FTWScanner::Scanner(const char *File,const struct stat *sb,int Flag) given are not links themselves. */ char Jnk[2]; Owner->OriginalPath = File; - if (Owner->RealPath != 0 && readlink(File,Jnk,sizeof(Jnk)) != -1 && + if (ReadLink && Owner->RealPath != 0 && + readlink(File,Jnk,sizeof(Jnk)) != -1 && realpath(File,Owner->RealPath) != 0) Owner->DoPackage(Owner->RealPath); else @@ -154,7 +164,7 @@ bool FTWScanner::RecursiveScan(string Dir) // Do recursive directory searching Owner = this; - int Res = ftw(Dir.c_str(),Scanner,30); + int Res = ftw(Dir.c_str(),ScannerFTW,30); // Error treewalking? if (Res != 0) @@ -209,12 +219,14 @@ bool FTWScanner::LoadFileList(string Dir,string File) FileName = Line; } +#if 0 struct stat St; int Flag = FTW_F; if (stat(FileName,&St) != 0) Flag = FTW_NS; +#endif - if (Scanner(FileName,&St,Flag) != 0) + if (ScannerFile(FileName, false) != 0) break; } @@ -227,7 +239,7 @@ bool FTWScanner::LoadFileList(string Dir,string File) /* */ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, unsigned long &DeLinkBytes, - struct stat &St) + off_t FileSize) { // See if this isn't an internaly prefix'd file name. if (InternalPrefix.empty() == false && @@ -243,7 +255,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, NewLine(1); ioprintf(c1out, _(" DeLink %s [%s]\n"), (OriginalPath + InternalPrefix.length()), - SizeToStr(St.st_size).c_str()); + SizeToStr(FileSize).c_str()); c1out << flush; if (NoLinkAct == false) @@ -269,7 +281,7 @@ bool FTWScanner::Delink(string &FileName,const char *OriginalPath, } } - DeLinkBytes += St.st_size; + DeLinkBytes += FileSize; if (DeLinkBytes/1024 >= DeLinkLimit) ioprintf(c1out, _(" DeLink limit of %sB hit.\n"), SizeToStr(DeLinkBytes).c_str()); } @@ -295,6 +307,8 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides, // Process the command line options DoMD5 = _config->FindB("APT::FTPArchive::MD5",true); + DoSHA1 = _config->FindB("APT::FTPArchive::SHA1",true); + DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true); DoContents = _config->FindB("APT::FTPArchive::Contents",true); NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false); @@ -343,29 +357,19 @@ bool FTWScanner::SetExts(string Vals) // PackagesWriter::DoPackage - Process a single package /*{{{*/ // --------------------------------------------------------------------- /* This method takes a package and gets its control information and - MD5 then writes out a control record with the proper fields rewritten - and the path/size/hash appended. */ + MD5, SHA1 and SHA256 then writes out a control record with the proper fields + rewritten and the path/size/hash appended. */ bool PackagesWriter::DoPackage(string FileName) { - // Open the archive - FileFd F(FileName,FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - - // Stat the file for later - struct stat St; - if (fstat(F.Fd(),&St) != 0) - return _error->Errno("fstat",_("Failed to stat %s"),FileName.c_str()); - // Pull all the data we need form the DB - string MD5Res; - if (Db.SetFile(FileName,St,&F) == false || - Db.LoadControl() == false || - (DoContents == true && Db.LoadContents(true) == false) || - (DoMD5 == true && Db.GetMD5(MD5Res,false) == false)) + if (Db.GetFileInfo(FileName, true, DoContents, true, DoMD5, DoSHA1, DoSHA256) + == false) + { return false; + } - if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,St) == false) + off_t FileSize = Db.GetFileSize(); + if (Delink(FileName,OriginalPath,Stats.DeLinkBytes,FileSize) == false) return false; // Lookup the overide information @@ -400,7 +404,7 @@ bool PackagesWriter::DoPackage(string FileName) } char Size[40]; - sprintf(Size,"%lu",St.st_size); + sprintf(Size,"%lu", (unsigned long) FileSize); // Strip the DirStrip prefix from the FileName and add the PathPrefix string NewFileName; @@ -420,7 +424,9 @@ bool PackagesWriter::DoPackage(string FileName) unsigned int End = 0; SetTFRewriteData(Changes[End++], "Size", Size); - SetTFRewriteData(Changes[End++], "MD5sum", MD5Res.c_str()); + SetTFRewriteData(Changes[End++], "MD5sum", Db.MD5Res.c_str()); + SetTFRewriteData(Changes[End++], "SHA1", Db.SHA1Res.c_str()); + SetTFRewriteData(Changes[End++], "SHA256", Db.SHA256Res.c_str()); SetTFRewriteData(Changes[End++], "Filename", NewFileName.c_str()); SetTFRewriteData(Changes[End++], "Priority", OverItem->Priority.c_str()); SetTFRewriteData(Changes[End++], "Status", 0); @@ -491,6 +497,10 @@ SourcesWriter::SourcesWriter(string BOverrides,string SOverrides, else NoOverride = true; + // WTF?? The logic above: if we can't read binary overrides, don't even try + // reading source overrides. if we can read binary overrides, then say there + // are no overrides. THIS MAKES NO SENSE! -- ajt@d.o, 2006/02/28 + if (ExtOverrides.empty() == false) SOver.ReadExtraOverride(ExtOverrides); @@ -607,12 +617,14 @@ bool SourcesWriter::DoPackage(string FileName) } auto_ptr<Override::Item> SOverItem(SOver.GetItem(Tags.FindS("Source"))); - const auto_ptr<Override::Item> autoSOverItem(SOverItem); + // const auto_ptr<Override::Item> autoSOverItem(SOverItem); if (SOverItem.get() == 0) { + ioprintf(c1out, _(" %s has no source override entry\n"), Tags.FindS("Source").c_str()); SOverItem = auto_ptr<Override::Item>(BOver.GetItem(Tags.FindS("Source"))); if (SOverItem.get() == 0) { + ioprintf(c1out, _(" %s has no binary override entry either\n"), Tags.FindS("Source").c_str()); SOverItem = auto_ptr<Override::Item>(new Override::Item); *SOverItem = *OverItem; } @@ -657,7 +669,7 @@ bool SourcesWriter::DoPackage(string FileName) realpath(OriginalPath.c_str(),RealPath) != 0) { string RP = RealPath; - if (Delink(RP,OriginalPath.c_str(),Stats.DeLinkBytes,St) == false) + if (Delink(RP,OriginalPath.c_str(),Stats.DeLinkBytes,St.st_size) == false) return false; } } @@ -727,26 +739,14 @@ ContentsWriter::ContentsWriter(string DB) : determine what the package name is. */ bool ContentsWriter::DoPackage(string FileName,string Package) { - // Open the archive - FileFd F(FileName,FileFd::ReadOnly); - if (_error->PendingError() == true) - return false; - - // Stat the file for later - struct stat St; - if (fstat(F.Fd(),&St) != 0) - return _error->Errno("fstat","Failed too stat %s",FileName.c_str()); - - // Ready the DB - if (Db.SetFile(FileName,St,&F) == false || - Db.LoadContents(false) == false) + if (!Db.GetFileInfo(FileName, Package.empty(), true, false, false, false, false)) + { return false; + } // Parse the package name if (Package.empty() == true) { - if (Db.LoadControl() == false) - return false; Package = Db.Control.Section.FindS("Package"); } @@ -896,6 +896,11 @@ bool ReleaseWriter::DoPackage(string FileName) SHA1.AddFD(fd.Fd(), fd.Size()); CheckSums[NewFileName].SHA1 = SHA1.Result(); + fd.Seek(0); + SHA256Summation SHA256; + SHA256.AddFD(fd.Fd(), fd.Size()); + CheckSums[NewFileName].SHA256 = SHA256.Result(); + fd.Close(); return true; @@ -927,5 +932,16 @@ void ReleaseWriter::Finish() (*I).second.size, (*I).first.c_str()); } + + fprintf(Output, "SHA256:\n"); + for(map<string,struct CheckSum>::iterator I = CheckSums.begin(); + I != CheckSums.end(); + ++I) + { + fprintf(Output, " %s %16ld %s\n", + (*I).second.SHA256.c_str(), + (*I).second.size, + (*I).first.c_str()); + } } diff --git a/ftparchive/writer.h b/ftparchive/writer.h index 16d014ef8..1d47d57ec 100644 --- a/ftparchive/writer.h +++ b/ftparchive/writer.h @@ -45,10 +45,11 @@ class FTWScanner bool NoLinkAct; static FTWScanner *Owner; - static int Scanner(const char *File,const struct stat *sb,int Flag); + static int ScannerFTW(const char *File,const struct stat *sb,int Flag); + static int ScannerFile(const char *File, bool ReadLink); bool Delink(string &FileName,const char *OriginalPath, - unsigned long &Bytes,struct stat &St); + unsigned long &Bytes,off_t FileSize); inline void NewLine(unsigned Priority) { @@ -84,6 +85,8 @@ class PackagesWriter : public FTWScanner // Some flags bool DoMD5; + bool DoSHA1; + bool DoSHA256; bool NoOverride; bool DoContents; @@ -170,6 +173,7 @@ protected: { string MD5; string SHA1; + string SHA256; // Limited by FileFd::Size() unsigned long size; ~CheckSum() {}; diff --git a/methods/ftp.cc b/methods/ftp.cc index f595e0ca4..0c2aa00a7 100644 --- a/methods/ftp.cc +++ b/methods/ftp.cc @@ -1055,9 +1055,12 @@ bool FtpMethod::Fetch(FetchItem *Itm) UBuf.modtime = FailTime; utime(FailFile.c_str(),&UBuf); - // If the file is missing we hard fail otherwise transient fail - if (Missing == true) + // If the file is missing we hard fail and delete the destfile + // otherwise transient fail + if (Missing == true) { + unlink(FailFile.c_str()); return false; + } Fail(true); return true; } diff --git a/methods/gpgv.cc b/methods/gpgv.cc index a114ad797..ba7389cba 100644 --- a/methods/gpgv.cc +++ b/methods/gpgv.cc @@ -11,6 +11,7 @@ #include <errno.h> #include <sys/wait.h> #include <iostream> +#include <sstream> #define GNUPGPREFIX "[GNUPG:]" #define GNUPGBADSIG "[GNUPG:] BADSIG" @@ -20,7 +21,7 @@ class GPGVMethod : public pkgAcqMethod { private: - const char *VerifyGetSigners(const char *file, const char *outfile, + string VerifyGetSigners(const char *file, const char *outfile, vector<string> &GoodSigners, vector<string> &BadSigners, vector<string> &NoPubKeySigners); @@ -32,11 +33,15 @@ class GPGVMethod : public pkgAcqMethod GPGVMethod() : pkgAcqMethod("1.0",SingleInstance | SendConfig) {}; }; -const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, +string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, vector<string> &GoodSigners, vector<string> &BadSigners, vector<string> &NoPubKeySigners) { + // setup a (empty) stringstream for formating the return value + std::stringstream ret; + ret.str(""); + if (_config->FindB("Debug::Acquire::gpgv", false)) { std::cerr << "inside VerifyGetSigners" << std::endl; @@ -54,9 +59,11 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, std::cerr << "Keyring path: " << pubringpath << std::endl; } - if (stat(pubringpath.c_str(), &buff) != 0) - return (string("Couldn't access keyring: ") + strerror(errno)).c_str(); - + if (stat(pubringpath.c_str(), &buff) != 0) + { + ioprintf(ret, _("Couldn't access keyring: '%s'"), strerror(errno)); + return ret.str(); + } if (pipe(fd) < 0) { return "Couldn't create pipe"; @@ -65,7 +72,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, pid = fork(); if (pid < 0) { - return (string("Couldn't spawn new process") + strerror(errno)).c_str(); + return string("Couldn't spawn new process") + strerror(errno); } else if (pid == 0) { @@ -189,7 +196,7 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, { if (GoodSigners.empty()) return _("Internal error: Good signature, but could not determine key fingerprint?!"); - return NULL; + return ""; } else if (WEXITSTATUS(status) == 1) { @@ -197,9 +204,8 @@ const char *GPGVMethod::VerifyGetSigners(const char *file, const char *outfile, } else if (WEXITSTATUS(status) == 111) { - // FIXME String concatenation considered harmful. - return (string(_("Could not execute ")) + gpgvpath + - string(_(" to verify signature (is gnupg installed?)"))).c_str(); + ioprintf(ret, _("Could not execute '%s' to verify signature (is gnupg installed?)"), gpgvpath.c_str()); + return ret.str(); } else { @@ -221,8 +227,8 @@ bool GPGVMethod::Fetch(FetchItem *Itm) URIStart(Res); // Run gpgv on file, extract contents and get the key ID of the signer - const char *msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), - GoodSigners, BadSigners, NoPubKeySigners); + string msg = VerifyGetSigners(Path.c_str(), Itm->DestFile.c_str(), + GoodSigners, BadSigners, NoPubKeySigners); if (GoodSigners.empty() || !BadSigners.empty() || !NoPubKeySigners.empty()) { string errmsg; diff --git a/po/ChangeLog b/po/ChangeLog index 0767deb75..d01a105cf 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,19 @@ +2006-04-01 Yavor Doganov <yavor@doganov.org> + + * bg.po: Added, complete to 512t. Closes: #360262 + +2006-03-16 eric pareja <xenos@upm.edu.ph> + + * tl.po: Completed to 512t. Closes: #357215 + +2006-03-13 Sorin Batariuc <sorin@bonbon.net> + + * ro.po: Completed to 512t. Closes: #355897 + +2006-03-12 Miguel Figueiredo <elmig@debianpt.org> + + * pt.po: Completed to 512t. Closes: #355798 + 2006-02-14 Carlos Z.F. Liu <carlosliu@users.sourceforge.net> * zh_CN.po: Completed to 512t. Closes: #353936 diff --git a/po/LINGUAS b/po/LINGUAS index 4e753926a..aec84e943 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW +bg bs ca cs cy da de el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt pt_BR ro ru sk sl sv tl vi zh_CN zh_TW diff --git a/po/apt-all.pot b/po/apt-all.pot index 23de34b5c..262200f44 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 14:06+0100\n" +"POT-Creation-Date: 2006-05-17 17:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -15,145 +15,153 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: cmdline/apt-cache.cc:135 +#: cmdline/apt-cache.cc:141 #, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "" -#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 -#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 -#: cmdline/apt-cache.cc:1508 +#: cmdline/apt-cache.cc:181 cmdline/apt-cache.cc:550 cmdline/apt-cache.cc:638 +#: cmdline/apt-cache.cc:794 cmdline/apt-cache.cc:1012 +#: cmdline/apt-cache.cc:1413 cmdline/apt-cache.cc:1564 #, c-format msgid "Unable to locate package %s" msgstr "" -#: cmdline/apt-cache.cc:232 +#: cmdline/apt-cache.cc:245 msgid "Total package names : " msgstr "" -#: cmdline/apt-cache.cc:272 +#: cmdline/apt-cache.cc:285 msgid " Normal packages: " msgstr "" -#: cmdline/apt-cache.cc:273 +#: cmdline/apt-cache.cc:286 msgid " Pure virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:274 +#: cmdline/apt-cache.cc:287 msgid " Single virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:275 +#: cmdline/apt-cache.cc:288 msgid " Mixed virtual packages: " msgstr "" -#: cmdline/apt-cache.cc:276 +#: cmdline/apt-cache.cc:289 msgid " Missing: " msgstr "" -#: cmdline/apt-cache.cc:278 +#: cmdline/apt-cache.cc:291 msgid "Total distinct versions: " msgstr "" -#: cmdline/apt-cache.cc:280 +#: cmdline/apt-cache.cc:293 +msgid "Total Distinct Descriptions: " +msgstr "" + +#: cmdline/apt-cache.cc:295 msgid "Total dependencies: " msgstr "" -#: cmdline/apt-cache.cc:283 +#: cmdline/apt-cache.cc:298 msgid "Total ver/file relations: " msgstr "" -#: cmdline/apt-cache.cc:285 +#: cmdline/apt-cache.cc:300 +msgid "Total Desc/File relations: " +msgstr "" + +#: cmdline/apt-cache.cc:302 msgid "Total Provides mappings: " msgstr "" -#: cmdline/apt-cache.cc:297 +#: cmdline/apt-cache.cc:314 msgid "Total globbed strings: " msgstr "" -#: cmdline/apt-cache.cc:311 +#: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " msgstr "" -#: cmdline/apt-cache.cc:316 +#: cmdline/apt-cache.cc:333 msgid "Total slack space: " msgstr "" -#: cmdline/apt-cache.cc:324 +#: cmdline/apt-cache.cc:341 msgid "Total space accounted for: " msgstr "" -#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:469 cmdline/apt-cache.cc:1212 #, c-format msgid "Package file %s is out of sync." msgstr "" -#: cmdline/apt-cache.cc:1231 +#: cmdline/apt-cache.cc:1287 msgid "You must give exactly one pattern" msgstr "" -#: cmdline/apt-cache.cc:1385 +#: cmdline/apt-cache.cc:1441 msgid "No packages found" msgstr "" -#: cmdline/apt-cache.cc:1462 +#: cmdline/apt-cache.cc:1518 msgid "Package files:" msgstr "" -#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1525 cmdline/apt-cache.cc:1611 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -#: cmdline/apt-cache.cc:1470 +#: cmdline/apt-cache.cc:1526 #, c-format msgid "%4i %s\n" msgstr "" #. Show any packages have explicit pins -#: cmdline/apt-cache.cc:1482 +#: cmdline/apt-cache.cc:1538 msgid "Pinned packages:" msgstr "" -#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1550 cmdline/apt-cache.cc:1591 msgid "(not found)" msgstr "" #. Installed version -#: cmdline/apt-cache.cc:1515 +#: cmdline/apt-cache.cc:1571 msgid " Installed: " msgstr "" -#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1573 cmdline/apt-cache.cc:1581 msgid "(none)" msgstr "" #. Candidate Version -#: cmdline/apt-cache.cc:1522 +#: cmdline/apt-cache.cc:1578 msgid " Candidate: " msgstr "" -#: cmdline/apt-cache.cc:1532 +#: cmdline/apt-cache.cc:1588 msgid " Package pin: " msgstr "" #. Show the priority tables -#: cmdline/apt-cache.cc:1541 +#: cmdline/apt-cache.cc:1597 msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1556 +#: cmdline/apt-cache.cc:1612 #, c-format msgid " %4i %s\n" msgstr "" -#: cmdline/apt-cache.cc:1651 cmdline/apt-cdrom.cc:138 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1708 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 "" -#: cmdline/apt-cache.cc:1658 +#: cmdline/apt-cache.cc:1715 msgid "" "Usage: apt-cache [options] command\n" " apt-cache [options] add file1 [file2 ...]\n" @@ -243,7 +251,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:815 #, c-format msgid "Unable to write to %s" msgstr "" @@ -327,115 +335,126 @@ msgstr "" msgid "Some files are missing in the package file group `%s'" msgstr "" -#: ftparchive/cachedb.cc:45 +#: ftparchive/cachedb.cc:47 #, c-format msgid "DB was corrupted, file renamed to %s.old" msgstr "" -#: ftparchive/cachedb.cc:63 +#: ftparchive/cachedb.cc:65 #, c-format msgid "DB is old, attempting to upgrade %s" msgstr "" -#: 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 "" + +#: ftparchive/cachedb.cc:81 #, c-format msgid "Unable to open DB file %s: %s" msgstr "" -#: 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:266 #, c-format -msgid "File date has changed %s" +msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:155 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:267 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:78 +#: ftparchive/writer.cc:79 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:83 +#: ftparchive/writer.cc:84 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:125 +#: ftparchive/writer.cc:135 msgid "E: " msgstr "" -#: ftparchive/writer.cc:127 +#: ftparchive/writer.cc:137 msgid "W: " msgstr "" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:144 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#: ftparchive/writer.cc:161 ftparchive/writer.cc:191 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:163 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:188 +#: ftparchive/writer.cc:198 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:245 +#: ftparchive/writer.cc:257 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:253 +#: ftparchive/writer.cc:265 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:257 +#: ftparchive/writer.cc:269 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:264 +#: ftparchive/writer.cc:276 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:274 +#: ftparchive/writer.cc:286 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: 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 -#, c-format -msgid "Failed to stat %s" -msgstr "" - -#: ftparchive/writer.cc:386 +#: ftparchive/writer.cc:390 msgid "Archive had no package field" msgstr "" -#: 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 "" -#: 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 "" +#: ftparchive/writer.cc:623 +#, c-format +msgid " %s has no source override entry\n" +msgstr "" + +#: ftparchive/writer.cc:627 +#, c-format +msgid " %s has no binary override entry either\n" +msgstr "" + #: ftparchive/contents.cc:317 #, c-format msgid "Internal error, could not locate member %s" @@ -535,7 +554,7 @@ msgstr "" msgid "Y" msgstr "" -#: 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 "" @@ -694,11 +713,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: 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 "" -#: 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 "" @@ -727,7 +746,7 @@ msgstr "" msgid "After unpacking %sB disk space will be freed.\n" msgstr "" -#: 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 "" @@ -761,7 +780,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: 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 "" @@ -770,7 +789,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: 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 "" @@ -866,7 +885,7 @@ msgstr "" msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "" @@ -880,27 +899,27 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1555 +#: cmdline/apt-get.cc:1546 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: 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)." msgstr "" -#: 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" @@ -908,163 +927,163 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: 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" "that package should be filed." msgstr "" -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1950 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: 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 " "found" msgstr "" -#: 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 " "package %s can satisfy version requirements" msgstr "" -#: 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 "" -#: cmdline/apt-get.cc:2333 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "" -#: 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" @@ -1349,9 +1368,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: 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 +#: apt-inst/deb/dpkgdb.cc:139 apt-pkg/pkgcachegen.cc:748 +#: apt-pkg/pkgcachegen.cc:817 apt-pkg/pkgcachegen.cc:822 +#: apt-pkg/pkgcachegen.cc:945 msgid "Reading package lists" msgstr "" @@ -1365,7 +1384,7 @@ msgstr "" msgid "Internal error getting a package name" msgstr "" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "" @@ -1409,10 +1428,6 @@ msgstr "" msgid "The pkg cache must be initialized first" msgstr "" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1483,12 +1498,13 @@ msgstr "" msgid "File not found" msgstr "" -#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133 -#: methods/gzip.cc:142 +#: methods/copy.cc:42 methods/gpgv.cc:275 methods/gzip.cc:133 +#: methods/gzip.cc:142 methods/rred.cc:234 methods/rred.cc:243 msgid "Failed to stat" msgstr "" -#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 +#: methods/rred.cc:240 msgid "Failed to set modification time" msgstr "" @@ -1614,7 +1630,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:957 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1637,7 +1653,7 @@ msgstr "" msgid "Query" msgstr "" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "" @@ -1666,69 +1682,70 @@ msgstr "" msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "" #. 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 "" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "" -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "" - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" msgstr "" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:244 +#: methods/gpgv.cc:250 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1744,76 +1761,76 @@ msgstr "" msgid "Read error from %s process" msgstr "" -#: methods/http.cc:376 +#: methods/http.cc:375 msgid "Waiting for headers" msgstr "" -#: methods/http.cc:522 +#: methods/http.cc:521 #, c-format msgid "Got a single header line over %u chars" msgstr "" -#: methods/http.cc:530 +#: methods/http.cc:529 msgid "Bad header line" msgstr "" -#: methods/http.cc:549 methods/http.cc:556 +#: methods/http.cc:548 methods/http.cc:555 msgid "The HTTP server sent an invalid reply header" msgstr "" -#: methods/http.cc:585 +#: methods/http.cc:584 msgid "The HTTP server sent an invalid Content-Length header" msgstr "" -#: methods/http.cc:600 +#: methods/http.cc:599 msgid "The HTTP server sent an invalid Content-Range header" msgstr "" -#: methods/http.cc:602 +#: methods/http.cc:601 msgid "This HTTP server has broken range support" msgstr "" -#: methods/http.cc:626 +#: methods/http.cc:625 msgid "Unknown date format" msgstr "" -#: methods/http.cc:773 +#: methods/http.cc:772 msgid "Select failed" msgstr "" -#: methods/http.cc:778 +#: methods/http.cc:777 msgid "Connection timed out" msgstr "" -#: methods/http.cc:801 +#: methods/http.cc:800 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:832 +#: methods/http.cc:831 msgid "Error writing to file" msgstr "" -#: methods/http.cc:860 +#: methods/http.cc:859 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:874 +#: methods/http.cc:873 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:876 +#: methods/http.cc:875 msgid "Error reading from server" msgstr "" -#: methods/http.cc:1107 +#: methods/http.cc:1106 msgid "Bad header data" msgstr "" -#: methods/http.cc:1124 +#: methods/http.cc:1123 msgid "Connection failed" msgstr "" -#: methods/http.cc:1215 +#: methods/http.cc:1214 msgid "Internal error" msgstr "" @@ -1826,7 +1843,7 @@ msgstr "" msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/strutl.cc:938 +#: apt-pkg/contrib/strutl.cc:981 #, c-format msgid "Selection %s not found" msgstr "" @@ -2023,72 +2040,72 @@ msgstr "" msgid "Problem syncing the file" msgstr "" -#: apt-pkg/pkgcache.cc:126 +#: apt-pkg/pkgcache.cc:137 msgid "Empty package cache" msgstr "" -#: apt-pkg/pkgcache.cc:132 +#: apt-pkg/pkgcache.cc:143 msgid "The package cache file is corrupted" msgstr "" -#: apt-pkg/pkgcache.cc:137 +#: apt-pkg/pkgcache.cc:148 msgid "The package cache file is an incompatible version" msgstr "" -#: apt-pkg/pkgcache.cc:142 +#: apt-pkg/pkgcache.cc:153 #, c-format msgid "This APT does not support the versioning system '%s'" msgstr "" -#: apt-pkg/pkgcache.cc:147 +#: apt-pkg/pkgcache.cc:158 msgid "The package cache was built for a different architecture" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "Depends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "PreDepends" msgstr "" -#: apt-pkg/pkgcache.cc:218 +#: apt-pkg/pkgcache.cc:229 msgid "Suggests" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Recommends" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Conflicts" msgstr "" -#: apt-pkg/pkgcache.cc:219 +#: apt-pkg/pkgcache.cc:230 msgid "Replaces" msgstr "" -#: apt-pkg/pkgcache.cc:220 +#: apt-pkg/pkgcache.cc:231 msgid "Obsoletes" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "important" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "required" msgstr "" -#: apt-pkg/pkgcache.cc:231 +#: apt-pkg/pkgcache.cc:242 msgid "standard" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 msgid "optional" msgstr "" -#: apt-pkg/pkgcache.cc:232 +#: apt-pkg/pkgcache.cc:243 msgid "extra" msgstr "" @@ -2104,12 +2121,12 @@ msgstr "" msgid "Dependency generation" msgstr "" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "" @@ -2144,7 +2161,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:450 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2203,9 +2220,16 @@ msgstr "" msgid "Archive directory %spartial is missing." msgstr "" -#: apt-pkg/acquire.cc:821 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "" + +#: apt-pkg/acquire.cc:825 #, c-format -msgid "Downloading file %li of %li (%s remaining)" +msgid "Retrieving file %li of %li" msgstr "" #: apt-pkg/acquire-worker.cc:113 @@ -2223,12 +2247,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:120 +#: apt-pkg/init.cc:123 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:136 +#: apt-pkg/init.cc:139 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2271,110 +2295,125 @@ msgstr "" msgid "Error occurred while processing %s (NewPackage)" msgstr "" -#: apt-pkg/pkgcachegen.cc:129 +#: apt-pkg/pkgcachegen.cc:132 #, c-format msgid "Error occurred while processing %s (UsePackage1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:150 +#: apt-pkg/pkgcachegen.cc:155 +#, c-format +msgid "Error occured while processing %s (NewFileDesc1)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:180 #, c-format msgid "Error occurred while processing %s (UsePackage2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:154 +#: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:184 +#: apt-pkg/pkgcachegen.cc:215 #, c-format msgid "Error occurred while processing %s (NewVersion1)" msgstr "" -#: apt-pkg/pkgcachegen.cc:188 +#: apt-pkg/pkgcachegen.cc:219 #, c-format msgid "Error occurred while processing %s (UsePackage3)" msgstr "" -#: apt-pkg/pkgcachegen.cc:192 +#: apt-pkg/pkgcachegen.cc:223 #, c-format msgid "Error occurred while processing %s (NewVersion2)" msgstr "" -#: apt-pkg/pkgcachegen.cc:207 +#: apt-pkg/pkgcachegen.cc:247 +#, c-format +msgid "Error occured while processing %s (NewFileDesc2)" +msgstr "" + +#: apt-pkg/pkgcachegen.cc:253 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:210 +#: apt-pkg/pkgcachegen.cc:256 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:213 +#: apt-pkg/pkgcachegen.cc:259 +msgid "Wow, you exceeded the number of descriptions this APT is capable of." +msgstr "" + +#: apt-pkg/pkgcachegen.cc:262 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" -#: apt-pkg/pkgcachegen.cc:241 +#: apt-pkg/pkgcachegen.cc:290 #, c-format msgid "Error occurred while processing %s (FindPkg)" msgstr "" -#: apt-pkg/pkgcachegen.cc:254 +#: apt-pkg/pkgcachegen.cc:303 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" msgstr "" -#: apt-pkg/pkgcachegen.cc:260 +#: apt-pkg/pkgcachegen.cc:309 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:574 +#: apt-pkg/pkgcachegen.cc:679 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:658 +#: apt-pkg/pkgcachegen.cc:763 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:890 apt-pkg/pkgcachegen.cc:897 msgid "IO Error saving source cache" msgstr "" -#: apt-pkg/acquire-item.cc:126 +#: apt-pkg/acquire-item.cc:130 #, c-format msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950 +#: apt-pkg/acquire-item.cc:407 apt-pkg/acquire-item.cc:656 +#: apt-pkg/acquire-item.cc:1399 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:645 +#: apt-pkg/acquire-item.cc:1094 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:1207 #, 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:817 +#: apt-pkg/acquire-item.cc:1266 #, 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:853 +#: apt-pkg/acquire-item.cc:1302 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" -#: apt-pkg/acquire-item.cc:940 +#: apt-pkg/acquire-item.cc:1389 msgid "Size mismatch" msgstr "" @@ -2383,92 +2422,94 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:507 +#: apt-pkg/cdrom.cc:531 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:540 apt-pkg/cdrom.cc:622 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:541 +#: apt-pkg/cdrom.cc:565 #, c-format msgid "Stored label: %s \n" msgstr "" -#: apt-pkg/cdrom.cc:561 +#: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:579 +#: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:583 +#: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:591 +#: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:609 +#: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:647 +#: apt-pkg/cdrom.cc:673 #, c-format -msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgid "" +"Found %i package indexes, %i source indexes, %i translation indexes and %i " +"signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:737 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:726 +#: apt-pkg/cdrom.cc:753 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:730 +#: apt-pkg/cdrom.cc:757 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:754 +#: apt-pkg/cdrom.cc:783 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:763 +#: apt-pkg/cdrom.cc:792 msgid "Source list entries for this disc are:\n" msgstr "" -#: apt-pkg/cdrom.cc:803 +#: apt-pkg/cdrom.cc:832 msgid "Unmounting CD-ROM..." msgstr "" -#: apt-pkg/indexcopy.cc:261 +#: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:830 #, c-format msgid "Wrote %i records.\n" msgstr "" -#: apt-pkg/indexcopy.cc:263 +#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:832 #, c-format msgid "Wrote %i records with %i missing files.\n" msgstr "" -#: apt-pkg/indexcopy.cc:266 +#: apt-pkg/indexcopy.cc:268 apt-pkg/indexcopy.cc:835 #, c-format msgid "Wrote %i records with %i mismatched files\n" msgstr "" -#: apt-pkg/indexcopy.cc:269 +#: apt-pkg/indexcopy.cc:271 apt-pkg/indexcopy.cc:838 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "" @@ -2515,12 +2556,16 @@ msgstr "" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" +msgid "Preparing to completely remove %s" msgstr "" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" +msgid "Completely removed %s" +msgstr "" + +#: methods/rred.cc:219 +msgid "Could not patch file" msgstr "" #: methods/rsh.cc:330 diff --git a/po/bg.po b/po/bg.po new file mode 100644 index 000000000..a0750b74a --- /dev/null +++ b/po/bg.po @@ -0,0 +1,2776 @@ +# Bulgarian translation of apt. +# Copyright (C) 2006 Free Software Foundation, Inc. +# This file is distributed under the same license as the apt package. +# Yavor Doganov <yavor@doganov.org>, 2006. +# +msgid "" +msgstr "" +"Project-Id-Version: apt 0.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2006-01-19 00:08+0100\n" +"PO-Revision-Date: 2006-03-31 22:05+0300\n" +"Last-Translator: Yavor Doganov <yavor@doganov.org>\n" +"Language-Team: Bulgarian <dict@fsa-bg.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" + +#: cmdline/apt-cache.cc:135 +#, c-format +msgid "Package %s version %s has an unmet dep:\n" +msgstr "Пакет %s версия %s има неудовлетворена зависимост:\n" + +#: cmdline/apt-cache.cc:175 cmdline/apt-cache.cc:527 cmdline/apt-cache.cc:615 +#: cmdline/apt-cache.cc:771 cmdline/apt-cache.cc:989 cmdline/apt-cache.cc:1357 +#: cmdline/apt-cache.cc:1508 +#, c-format +msgid "Unable to locate package %s" +msgstr "Пакетът %s не може да бъде намерен" + +#: cmdline/apt-cache.cc:232 +msgid "Total package names : " +msgstr "Общо имена на пакети : " + +#: cmdline/apt-cache.cc:272 +msgid " Normal packages: " +msgstr " Нормални пакети: " + +#: cmdline/apt-cache.cc:273 +msgid " Pure virtual packages: " +msgstr " Чисти виртуални пакети: " + +#: cmdline/apt-cache.cc:274 +msgid " Single virtual packages: " +msgstr " Единични виртуални пакети: " + +#: cmdline/apt-cache.cc:275 +msgid " Mixed virtual packages: " +msgstr " Смесени виртуални пакети: " + +#: cmdline/apt-cache.cc:276 +msgid " Missing: " +msgstr " Липсващи: " + +#: cmdline/apt-cache.cc:278 +msgid "Total distinct versions: " +msgstr "Общо уникални версии: " + +#: cmdline/apt-cache.cc:280 +msgid "Total dependencies: " +msgstr "Общо зависимости: " + +#: cmdline/apt-cache.cc:283 +msgid "Total ver/file relations: " +msgstr "Общо отношения версия/файл: " + +#: cmdline/apt-cache.cc:285 +msgid "Total Provides mappings: " +msgstr "Общо отношения „Осигурява“: " + +#: cmdline/apt-cache.cc:297 +msgid "Total globbed strings: " +msgstr "Общо разгърнати низове: " + +#: cmdline/apt-cache.cc:311 +msgid "Total dependency version space: " +msgstr "Общо пространство за зависимости по версии: " + +#: cmdline/apt-cache.cc:316 +msgid "Total slack space: " +msgstr "Общо празно пространство: " + +#: cmdline/apt-cache.cc:324 +msgid "Total space accounted for: " +msgstr "Общо отчетено пространство: " + +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 +#, c-format +msgid "Package file %s is out of sync." +msgstr "Пакетният файл %s не е синхронизиран." + +#: cmdline/apt-cache.cc:1231 +msgid "You must give exactly one pattern" +msgstr "Трябва да въведете само един израз" + +#: cmdline/apt-cache.cc:1385 +msgid "No packages found" +msgstr "Няма намерени пакети" + +#: cmdline/apt-cache.cc:1462 +msgid "Package files:" +msgstr "Пакетни файлове:" + +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 +msgid "Cache is out of sync, can't x-ref a package file" +msgstr "" +"Кешът не е синхронизиран, не може да се изпълни „x-ref“ на пакетен файл" + +#: cmdline/apt-cache.cc:1470 +#, c-format +msgid "%4i %s\n" +msgstr "%4i %s\n" + +#. Show any packages have explicit pins +#: cmdline/apt-cache.cc:1482 +msgid "Pinned packages:" +msgstr "Отбити пакети:" + +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 +msgid "(not found)" +msgstr "(не са намерени)" + +#. Installed version +#: cmdline/apt-cache.cc:1515 +msgid " Installed: " +msgstr " Инсталирана: " + +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 +msgid "(none)" +msgstr "(няма)" + +#. Candidate Version +#: cmdline/apt-cache.cc:1522 +msgid " Candidate: " +msgstr " Кандидат: " + +#: cmdline/apt-cache.cc:1532 +msgid " Package pin: " +msgstr " Отбиване на пакета: " + +#. Show the priority tables +#: cmdline/apt-cache.cc:1541 +msgid " Version table:" +msgstr " Таблица с версиите:" + +#: cmdline/apt-cache.cc:1556 +#, c-format +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-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:550 +#: cmdline/apt-get.cc:2378 cmdline/apt-sortpkgs.cc:144 +#, c-format +msgid "%s %s for %s %s compiled on %s %s\n" +msgstr "%s %s за %s %s, компилиран на %s %s\n" + +#: cmdline/apt-cache.cc:1658 +msgid "" +"Usage: apt-cache [options] command\n" +" apt-cache [options] add file1 [file2 ...]\n" +" apt-cache [options] showpkg pkg1 [pkg2 ...]\n" +" apt-cache [options] showsrc pkg1 [pkg2 ...]\n" +"\n" +"apt-cache is a low-level tool used to manipulate APT's binary\n" +"cache files, and query information from them\n" +"\n" +"Commands:\n" +" add - Add a package file to the source cache\n" +" gencaches - Build both the package and source cache\n" +" showpkg - Show some general information for a single package\n" +" showsrc - Show source records\n" +" stats - Show some basic statistics\n" +" dump - Show the entire file in a terse form\n" +" dumpavail - Print an available file to stdout\n" +" unmet - Show unmet dependencies\n" +" search - Search the package list for a regex pattern\n" +" show - Show a readable record for the package\n" +" depends - Show raw dependency information for a package\n" +" rdepends - Show reverse dependency information for a package\n" +" pkgnames - List the names of all packages\n" +" dotty - Generate package graphs for GraphVis\n" +" xvcg - Generate package graphs for xvcg\n" +" policy - Show policy settings\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -p=? The package cache.\n" +" -s=? The source cache.\n" +" -q Disable progress indicator.\n" +" -i Show only important deps for the unmet command.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n" +msgstr "" +"Употреба: apt-cache [опции] команда\n" +" apt-cache [опции] add файл1 [файл2 ...]\n" +" apt-cache [опции] showpkg пакет1 [пакет2 ...]\n" +" apt-cache [опции] showsrc пакет1 [пакет2 ...]\n" +"\n" +"apt-cache е инструмент на ниско ниво за обработка на двоичните\n" +"кеш файлове на APT и извличане на информация от тях\n" +"\n" +"Команди:\n" +" add - Добавя пакетен файл към кеша на пакети с изходен код\n" +" gencaches - Генериране на кеша на пакети и пакети с изходен код\n" +" showpkg - Показва обща информация за даден пакет\n" +" showsrc - Показва записите на пакета с изходен код\n" +" stats - Показва някои общи статистики\n" +" dump - Показва целия файл в сбита форма\n" +" dumpavail - Разпечатва наличен файл в stdout\n" +" unmet - Показва неудовлетворени зависимости\n" +" search - Търси в списъка с пакети за регулярен израз\n" +" show - Показва запис за пакета\n" +" depends - Показва необработена информация за зависимости на пакета\n" +" rdepends - Показва информация за обратните зависимости на пакета\n" +" pkgnames - Списък с имената на всички пакети\n" +" dotty - Генериране на графики на пакети за GraphVis\n" +" xvcg - Генериране на графики на пакети за xvcg\n" +" policy - Показване на настройките на политиката\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -p=? Кешът за пакети.\n" +" -s=? Кешът за пакети с изходен код.\n" +" -q Премахване на индикатора за напредък.\n" +" -i Показване само на важни зависимости при командата „unmet“.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" +"Вижте „man“ страниците apt-cache(8) и apt.conf(5) за повече информация.\n" + +#: cmdline/apt-cdrom.cc:78 +msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" +msgstr "Задайте име за този диск, като „Debian 2.1r1 Disk1“" + +#: cmdline/apt-cdrom.cc:93 +msgid "Please insert a Disc in the drive and press enter" +msgstr "Сложете диск в устройството и натиснете „Enter“" + +#: cmdline/apt-cdrom.cc:117 +msgid "Repeat this process for the rest of the CDs in your set." +msgstr "Повторете този процес за останалите дискове от комплекта." + +#: cmdline/apt-config.cc:41 +msgid "Arguments not in pairs" +msgstr "Аргументите не са по двойки" + +#: cmdline/apt-config.cc:76 +msgid "" +"Usage: apt-config [options] command\n" +"\n" +"apt-config is a simple tool to read the APT config file\n" +"\n" +"Commands:\n" +" shell - Shell mode\n" +" dump - Show the configuration\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Употреба: apt-config [опции] команда\n" +"\n" +"apt-config е опростен инструмент за четене на конфигурационния файл на APT\n" +"\n" +"Команди:\n" +" shell - Режим с обвивка\n" +" dump - Показва конфигурацията\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-extracttemplates.cc:98 +#, c-format +msgid "%s not a valid DEB package." +msgstr "%s не е валиден DEB пакет." + +#: cmdline/apt-extracttemplates.cc:232 +msgid "" +"Usage: apt-extracttemplates file1 [file2 ...]\n" +"\n" +"apt-extracttemplates is a tool to extract config and template info\n" +"from debian packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" -t Set the temp dir\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Употреба: apt-extracttemplates файл1 [файл2 ...]\n" +"\n" +"apt-extracttemplates е инструмент за извличане на конфигурационна " +"информация\n" +"и шаблони от дебиански пакети\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -t Настройване на временна директория\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" + +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 +#, c-format +msgid "Unable to write to %s" +msgstr "Неуспех при записа на %s" + +#: cmdline/apt-extracttemplates.cc:310 +msgid "Cannot get debconf version. Is debconf installed?" +msgstr "Не може да се извлече версията на debconf. Debconf инсталиран ли е?" + +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 +msgid "Package extension list is too long" +msgstr "Списъкът с разширения на пакети и твърде дълъг" + +#: ftparchive/apt-ftparchive.cc:169 ftparchive/apt-ftparchive.cc:183 +#: ftparchive/apt-ftparchive.cc:206 ftparchive/apt-ftparchive.cc:256 +#: ftparchive/apt-ftparchive.cc:270 ftparchive/apt-ftparchive.cc:292 +#, c-format +msgid "Error processing directory %s" +msgstr "Грешка при обработката на директория %s" + +#: ftparchive/apt-ftparchive.cc:254 +msgid "Source extension list is too long" +msgstr "Списъкът с разширения на източници е твърде дълъг" + +#: ftparchive/apt-ftparchive.cc:371 +msgid "Error writing header to contents file" +msgstr "Грешка при запазването на заглавната част във файла със съдържание" + +#: ftparchive/apt-ftparchive.cc:401 +#, c-format +msgid "Error processing contents %s" +msgstr "Грешка при обработката на съдържание %s" + +#: ftparchive/apt-ftparchive.cc:556 +msgid "" +"Usage: apt-ftparchive [options] command\n" +"Commands: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents path\n" +" release path\n" +" generate config [groups]\n" +" clean config\n" +"\n" +"apt-ftparchive generates index files for Debian archives. It supports\n" +"many styles of generation from fully automated to functional replacements\n" +"for dpkg-scanpackages and dpkg-scansources\n" +"\n" +"apt-ftparchive generates Package files from a tree of .debs. The\n" +"Package file contains the contents of all the control fields from\n" +"each package as well as the MD5 hash and filesize. An override file\n" +"is supported to force the value of Priority and Section.\n" +"\n" +"Similarly apt-ftparchive generates Sources files from a tree of .dscs.\n" +"The --source-override option can be used to specify a src override file\n" +"\n" +"The 'packages' and 'sources' command should be run in the root of the\n" +"tree. BinaryPath should point to the base of the recursive search and \n" +"override file should contain the override flags. Pathprefix is\n" +"appended to the filename fields if present. Example usage from the \n" +"Debian archive:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Options:\n" +" -h This help text\n" +" --md5 Control MD5 generation\n" +" -s=? Source override file\n" +" -q Quiet\n" +" -d=? Select the optional caching database\n" +" --no-delink Enable delinking debug mode\n" +" --contents Control contents file generation\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option" +msgstr "" +"Употреба: apt-ftparchive [опции] команда\n" +"Команди: packages binarypath [overridefile [pathprefix]]\n" +" sources srcpath [overridefile [pathprefix]]\n" +" contents път\n" +" release път\n" +" generate config [групи]\n" +" clean config\n" +"\n" +"apt-ftparchive генерира индексни файлове за архиви на Debian. Поддържа\n" +"много стилове на генериране от напълно автоматично до функционални\n" +"замени на dpkg-scanpackages и dpkg-scansources.\n" +"\n" +"apt-ftparchive генерира „Package“ файлове от дърво с .deb файлове. Файлът\n" +"„Package“ представлява съдържанието на всички контролни полета на всеки\n" +"пакет, както и MD5 хеш и размер на файла. Стойностите на полетата \n" +"„Priority“ и „Section“ могат да бъдат изменени с файл „override“.\n" +"\n" +"По подобен начин apt-ftparchive генерира „Sources“ файлове от дърво с .dsc \n" +"файлове. Опцията --source-override може да се използва за указване на файл\n" +"„override“ за пакети с изходен код.\n" +"\n" +"Командите „packages“ и „sources“ трябва да се изпълняват в корена на " +"дървото.\n" +"BinaryPath трябва да сочи към основата, където започва рекурсивното търсене " +"и\n" +"файла „override“ трябва да съдържа всички флагове за преназначаване. " +"Pathprefix\n" +"се прибавя към полетата на файловите имена, ако съществува. Пример за " +"употреба\n" +"от архива на Debian:\n" +" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" +" dists/potato/main/binary-i386/Packages\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" --md5 Управление на генерирането на MD5.\n" +" -s=? Файл „override“ за пакети с изходен код.\n" +" -q Без показване на съобщения.\n" +" -d=? Избор на допълнителна база от данни за кеширане.\n" +" --no-delink Включване на режим за премахване на връзки.\n" +" --contents Управление на генерирането на файлове със съдържание.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция" + +#: ftparchive/apt-ftparchive.cc:762 +msgid "No selections matched" +msgstr "Няма съвпадения на избора" + +#: ftparchive/apt-ftparchive.cc:835 +#, c-format +msgid "Some files are missing in the package file group `%s'" +msgstr "Липсват някои файлове от групата с файлови пакети „%s“" + +#: ftparchive/cachedb.cc:45 +#, c-format +msgid "DB was corrupted, file renamed to %s.old" +msgstr "БД е повредена, файлът е преименуван на %s.old" + +#: ftparchive/cachedb.cc:63 +#, c-format +msgid "DB is old, attempting to upgrade %s" +msgstr "БД е стара, опит за актуализиране на %s" + +#: ftparchive/cachedb.cc:73 +#, c-format +msgid "Unable to open DB file %s: %s" +msgstr "Неуспех при отварянето на файл %s от БД: %s" + +#: ftparchive/cachedb.cc:114 +#, c-format +msgid "File date has changed %s" +msgstr "Датата на файла %s е променена" + +#: ftparchive/cachedb.cc:155 +msgid "Archive has no control record" +msgstr "В архива няма поле „control“" + +#: ftparchive/cachedb.cc:267 +msgid "Unable to get a cursor" +msgstr "Неуспех при получаването на курсор" + +#: ftparchive/writer.cc:78 +#, c-format +msgid "W: Unable to read directory %s\n" +msgstr "W: Неуспех при четенето на директория %s\n" + +#: ftparchive/writer.cc:83 +#, c-format +msgid "W: Unable to stat %s\n" +msgstr "W: Неуспех при четенето на %s\n" + +#: ftparchive/writer.cc:125 +msgid "E: " +msgstr "E: " + +#: ftparchive/writer.cc:127 +msgid "W: " +msgstr "W: " + +#: ftparchive/writer.cc:134 +msgid "E: Errors apply to file " +msgstr "E: Грешките се отнасят за файла " + +#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 +#, c-format +msgid "Failed to resolve %s" +msgstr "Неуспех при превръщането на %s" + +#: ftparchive/writer.cc:163 +msgid "Tree walking failed" +msgstr "Неуспех при обхода на дървото" + +#: ftparchive/writer.cc:188 +#, c-format +msgid "Failed to open %s" +msgstr "Неуспех при отварянето на %s" + +#: ftparchive/writer.cc:245 +#, c-format +msgid " DeLink %s [%s]\n" +msgstr "DeLink %s [%s]\n" + +#: ftparchive/writer.cc:253 +#, c-format +msgid "Failed to readlink %s" +msgstr "Неуспех при прочитането на връзка %s" + +#: ftparchive/writer.cc:257 +#, c-format +msgid "Failed to unlink %s" +msgstr "Неуспех при премахването на връзка %s" + +#: ftparchive/writer.cc:264 +#, c-format +msgid "*** Failed to link %s to %s" +msgstr "*** Неуспех при създаването на връзка %s към %s" + +#: ftparchive/writer.cc:274 +#, c-format +msgid " DeLink limit of %sB hit.\n" +msgstr "Превишен лимит на DeLink от %sB.\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 +#, c-format +msgid "Failed to stat %s" +msgstr "Грешка при получаването на атрибути за %s" + +#: ftparchive/writer.cc:386 +msgid "Archive had no package field" +msgstr "Архивът няма поле „package“" + +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 +#, c-format +msgid " %s has no override entry\n" +msgstr " %s няма запис „override“\n" + +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 +#, c-format +msgid " %s maintainer is %s not %s\n" +msgstr " поддържащия пакета %s е %s, а не %s\n" + +#: ftparchive/contents.cc:317 +#, c-format +msgid "Internal error, could not locate member %s" +msgstr "Вътрешна грешка, неуспех при намирането на съставна част %s" + +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 +msgid "realloc - Failed to allocate memory" +msgstr "realloc - Неуспех при заделянето на памет" + +#: ftparchive/override.cc:38 ftparchive/override.cc:146 +#, c-format +msgid "Unable to open %s" +msgstr "Неуспех при отварянето на %s" + +#: ftparchive/override.cc:64 ftparchive/override.cc:170 +#, c-format +msgid "Malformed override %s line %lu #1" +msgstr "Неправилно форматиран override %s, ред %lu #1" + +#: ftparchive/override.cc:78 ftparchive/override.cc:182 +#, c-format +msgid "Malformed override %s line %lu #2" +msgstr "Неправилно форматиран override %s, ред %lu #2" + +#: ftparchive/override.cc:92 ftparchive/override.cc:195 +#, c-format +msgid "Malformed override %s line %lu #3" +msgstr "Неправилно форматиран override %s, ред %lu #3" + +#: ftparchive/override.cc:131 ftparchive/override.cc:205 +#, c-format +msgid "Failed to read the override file %s" +msgstr "Неуспех при четенето на override файл %s" + +#: ftparchive/multicompress.cc:75 +#, c-format +msgid "Unknown compression algorithm '%s'" +msgstr "Непознат алгоритъм за компресия „%s“" + +#: ftparchive/multicompress.cc:105 +#, c-format +msgid "Compressed output %s needs a compression set" +msgstr "Компресираният изход %s изисква настройка за компресирането" + +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 +msgid "Failed to create IPC pipe to subprocess" +msgstr "Неуспех при създаването на IPC pipe към подпроцеса" + +#: ftparchive/multicompress.cc:198 +msgid "Failed to create FILE*" +msgstr "Неуспех при създаването на FILE*" + +#: ftparchive/multicompress.cc:201 +msgid "Failed to fork" +msgstr "Неуспех при пускането на подпроцес" + +#: ftparchive/multicompress.cc:215 +msgid "Compress child" +msgstr "Процес-потомък за компресиране" + +#: ftparchive/multicompress.cc:238 +#, c-format +msgid "Internal error, failed to create %s" +msgstr "Вътрешна грешка, неуспех при създаването на %s" + +#: ftparchive/multicompress.cc:289 +msgid "Failed to create subprocess IPC" +msgstr "Неуспех при създаването на подпроцес IPC" + +#: ftparchive/multicompress.cc:324 +msgid "Failed to exec compressor " +msgstr "Неуспех при изпълнението на компресиращата програма " + +#: ftparchive/multicompress.cc:363 +msgid "decompressor" +msgstr "декомпресираща програма" + +#: ftparchive/multicompress.cc:406 +msgid "IO to subprocess/file failed" +msgstr "В/И към подпроцеса/файла пропадна" + +#: ftparchive/multicompress.cc:458 +msgid "Failed to read while computing MD5" +msgstr "Неуспех при четене докато се изчислява MD5" + +#: ftparchive/multicompress.cc:475 +#, c-format +msgid "Problem unlinking %s" +msgstr "Неуспех при премахването на връзка на %s" + +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 +#, c-format +msgid "Failed to rename %s to %s" +msgstr "Неуспех при преименуването на %s на %s" + +#: cmdline/apt-get.cc:120 +msgid "Y" +msgstr "Y" + +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1515 +#, c-format +msgid "Regex compilation error - %s" +msgstr "Грешка при компилирането на регулярния израз - %s" + +#: cmdline/apt-get.cc:237 +msgid "The following packages have unmet dependencies:" +msgstr "Следните пакети имат неудовлетворени зависимости:" + +#: cmdline/apt-get.cc:327 +#, c-format +msgid "but %s is installed" +msgstr "но е инсталиран %s" + +#: cmdline/apt-get.cc:329 +#, c-format +msgid "but %s is to be installed" +msgstr "но ще бъде инсталиран %s" + +#: cmdline/apt-get.cc:336 +msgid "but it is not installable" +msgstr "но той не може да бъде инсталиран" + +#: cmdline/apt-get.cc:338 +msgid "but it is a virtual package" +msgstr "но той е виртуален пакет" + +#: cmdline/apt-get.cc:341 +msgid "but it is not installed" +msgstr "но той не е инсталиран" + +#: cmdline/apt-get.cc:341 +msgid "but it is not going to be installed" +msgstr "но той няма да бъде инсталиран" + +#: cmdline/apt-get.cc:346 +msgid " or" +msgstr " или" + +#: cmdline/apt-get.cc:375 +msgid "The following NEW packages will be installed:" +msgstr "Следните НОВИ пакети ще бъдат инсталирани:" + +#: cmdline/apt-get.cc:401 +msgid "The following packages will be REMOVED:" +msgstr "Следните пакети ще бъдат ПРЕМАХНАТИ:" + +#: cmdline/apt-get.cc:423 +msgid "The following packages have been kept back:" +msgstr "Следните пакети няма да бъдат променени:" + +#: cmdline/apt-get.cc:444 +msgid "The following packages will be upgraded:" +msgstr "Следните пакети ще бъдат актуализирани:" + +#: cmdline/apt-get.cc:465 +msgid "The following packages will be DOWNGRADED:" +msgstr "Следните пакети ще бъдат ВЪРНАТИ КЪМ ПО-СТАРА ВЕРСИЯ:" + +#: cmdline/apt-get.cc:485 +msgid "The following held packages will be changed:" +msgstr "Следните задържани пакети ще бъдат променени:" + +#: cmdline/apt-get.cc:538 +#, c-format +msgid "%s (due to %s) " +msgstr "%s (поради %s) " + +#: cmdline/apt-get.cc:546 +msgid "" +"WARNING: The following essential packages will be removed.\n" +"This should NOT be done unless you know exactly what you are doing!" +msgstr "" +"ПРЕДУПРЕЖДЕНИЕ: Следните необходими пакети ще бъдат премахнати.\n" +"Това НЕ би трябвало да става освен ако знаете точно какво правите!" + +#: cmdline/apt-get.cc:577 +#, c-format +msgid "%lu upgraded, %lu newly installed, " +msgstr "%lu актуализирани, %lu нови инсталирани, " + +#: cmdline/apt-get.cc:581 +#, c-format +msgid "%lu reinstalled, " +msgstr "%lu преинсталирани, " + +#: cmdline/apt-get.cc:583 +#, c-format +msgid "%lu downgraded, " +msgstr "%lu върнати към по-стара версия, " + +#: cmdline/apt-get.cc:585 +#, c-format +msgid "%lu to remove and %lu not upgraded.\n" +msgstr "%lu за премахване и %lu без промяна.\n" + +#: cmdline/apt-get.cc:589 +#, c-format +msgid "%lu not fully installed or removed.\n" +msgstr "%lu не са напълно инсталирани или премахнати.\n" + +#: cmdline/apt-get.cc:649 +msgid "Correcting dependencies..." +msgstr "Коригиране на зависимостите..." + +#: cmdline/apt-get.cc:652 +msgid " failed." +msgstr " пропадна." + +#: cmdline/apt-get.cc:655 +msgid "Unable to correct dependencies" +msgstr "Неуспех при коригирането на зависимостите" + +#: cmdline/apt-get.cc:658 +msgid "Unable to minimize the upgrade set" +msgstr "Неуспех при минимизирането на набора актуализации" + +#: cmdline/apt-get.cc:660 +msgid " Done" +msgstr " Готово" + +#: cmdline/apt-get.cc:664 +msgid "You might want to run `apt-get -f install' to correct these." +msgstr "" +"Възможно е да изпълните „apt-get -f install“, за да коригирате тези " +"неизправности." + +#: cmdline/apt-get.cc:667 +msgid "Unmet dependencies. Try using -f." +msgstr "Неудовлетворени зависимости. Опитайте с „-f“." + +#: cmdline/apt-get.cc:689 +msgid "WARNING: The following packages cannot be authenticated!" +msgstr "ПРЕДУПРЕЖДЕНИЕ: Следните пакети не могат да бъдат удостоверени!" + +#: cmdline/apt-get.cc:693 +msgid "Authentication warning overridden.\n" +msgstr "Предупреждението за удостоверяването е пренебрегнато.\n" + +#: cmdline/apt-get.cc:700 +msgid "Install these packages without verification [y/N]? " +msgstr "Инсталиране на тези пакети без проверка [y/N]?" + +#: cmdline/apt-get.cc:702 +msgid "Some packages could not be authenticated" +msgstr "Някои пакети не можаха да бъдат удостоверени" + +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 +msgid "There are problems and -y was used without --force-yes" +msgstr "Има проблеми и „-y“ е използвано без „--force-yes“" + +#: cmdline/apt-get.cc:755 +msgid "Internal error, InstallPackages was called with broken packages!" +msgstr "Вътрешна грешка, „InstallPackages“ е предизвикано при счупени пакети!" + +#: cmdline/apt-get.cc:764 +msgid "Packages need to be removed but remove is disabled." +msgstr "Трябва да бъдат премахнати пакети, но премахването е изключено." + +#: cmdline/apt-get.cc:775 +msgid "Internal error, Ordering didn't finish" +msgstr "Вътрешна грешка, „Ordering“ не завърши" + +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 +msgid "Unable to lock the download directory" +msgstr "Неуспех при заключването на директорията за изтегляне" + +#: cmdline/apt-get.cc:801 cmdline/apt-get.cc:1890 cmdline/apt-get.cc:2126 +#: apt-pkg/cachefile.cc:67 +msgid "The list of sources could not be read." +msgstr "Списъкът с източници не можа да бъде прочетен." + +#: cmdline/apt-get.cc:816 +msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" +msgstr "" +"Странно.. Размерите не съвпадат, изпратете е-поща на apt@packages.debian.org" + +#: cmdline/apt-get.cc:821 +#, c-format +msgid "Need to get %sB/%sB of archives.\n" +msgstr "Необходимо е да се изтеглят %sB/%sB архиви.\n" + +#: cmdline/apt-get.cc:824 +#, c-format +msgid "Need to get %sB of archives.\n" +msgstr "Необходимо е да се изтеглят %sB архиви.\n" + +#: cmdline/apt-get.cc:829 +#, c-format +msgid "After unpacking %sB of additional disk space will be used.\n" +msgstr "След разпакетирането ще бъде използвано %sB дисково пространство.\n" + +#: cmdline/apt-get.cc:832 +#, c-format +msgid "After unpacking %sB disk space will be freed.\n" +msgstr "След разпакетирането ще бъде освободено %sB дисково пространство.\n" + +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 +#, c-format +msgid "Couldn't determine free space in %s" +msgstr "Неуспех при определянето на свободното пространство в %s" + +#: cmdline/apt-get.cc:849 +#, c-format +msgid "You don't have enough free space in %s." +msgstr "Нямате достатъчно свободно пространство в %s." + +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 +msgid "Trivial Only specified but this is not a trivial operation." +msgstr "Указано е „Trivial Only“, но това не е тривиална операция." + +#: cmdline/apt-get.cc:866 +msgid "Yes, do as I say!" +msgstr "Да, прави каквото казвам!" + +#: cmdline/apt-get.cc:868 +#, c-format +msgid "" +"You are about to do something potentially harmful.\n" +"To continue type in the phrase '%s'\n" +" ?] " +msgstr "" +"На път сте да направите нещо потенциално опасно.\n" +"За да продължите, въведете фразата „%s“\n" +" ?] " + +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 +msgid "Abort." +msgstr "Прекъсване." + +#: cmdline/apt-get.cc:889 +msgid "Do you want to continue [Y/n]? " +msgstr "Искате ли да продължите [Y/n]? " + +#: cmdline/apt-get.cc:961 cmdline/apt-get.cc:1365 cmdline/apt-get.cc:2023 +#, c-format +msgid "Failed to fetch %s %s\n" +msgstr "Неуспех при изтеглянето на %s %s\n" + +#: cmdline/apt-get.cc:979 +msgid "Some files failed to download" +msgstr "Някои файлове не можаха да бъдат изтеглени" + +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2032 +msgid "Download complete and in download only mode" +msgstr "Изтеглянето завърши в режим само на изтегляне" + +#: cmdline/apt-get.cc:986 +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ " +"или да опитате с „--fix-missing“?" + +#: cmdline/apt-get.cc:990 +msgid "--fix-missing and media swapping is not currently supported" +msgstr "„--fix-missing“ и превключване на носители не се поддържа все още" + +#: cmdline/apt-get.cc:995 +msgid "Unable to correct missing packages." +msgstr "Неуспех при коригирането на липсващите пакети." + +#: cmdline/apt-get.cc:996 +msgid "Aborting install." +msgstr "Прекъсване на инсталирането." + +#: cmdline/apt-get.cc:1030 +#, c-format +msgid "Note, selecting %s instead of %s\n" +msgstr "Забележете, избиране на %s вместо %s\n" + +#: cmdline/apt-get.cc:1040 +#, c-format +msgid "Skipping %s, it is already installed and upgrade is not set.\n" +msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n" + +#: cmdline/apt-get.cc:1058 +#, c-format +msgid "Package %s is not installed, so not removed\n" +msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n" + +#: cmdline/apt-get.cc:1069 +#, c-format +msgid "Package %s is a virtual package provided by:\n" +msgstr "Пакетът %s е виртуален пакет, осигурен от:\n" + +#: cmdline/apt-get.cc:1081 +msgid " [Installed]" +msgstr " [Инсталиран]" + +#: cmdline/apt-get.cc:1086 +msgid "You should explicitly select one to install." +msgstr "Трябва изрично да изберете един за инсталиране." + +#: cmdline/apt-get.cc:1091 +#, c-format +msgid "" +"Package %s is not available, but is referred to by another package.\n" +"This may mean that the package is missing, has been obsoleted, or\n" +"is only available from another source\n" +msgstr "" +"Пакетът %s не е наличен, но е в списъка със зависимости на друг пакет.\n" +"Това може да означава, че пакета липсва, остарял е, или е достъпен\n" +"само от друг източник\n" + +#: cmdline/apt-get.cc:1110 +msgid "However the following packages replace it:" +msgstr "Обаче следните пакети го заместват:" + +#: cmdline/apt-get.cc:1113 +#, c-format +msgid "Package %s has no installation candidate" +msgstr "Пакетът %s няма кандидат за инсталиране" + +#: cmdline/apt-get.cc:1133 +#, c-format +msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" +msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n" + +#: cmdline/apt-get.cc:1141 +#, c-format +msgid "%s is already the newest version.\n" +msgstr "%s вече е най-новата версия.\n" + +#: cmdline/apt-get.cc:1168 +#, c-format +msgid "Release '%s' for '%s' was not found" +msgstr "Не е намерено издание „%s“ на „%s“" + +#: cmdline/apt-get.cc:1170 +#, c-format +msgid "Version '%s' for '%s' was not found" +msgstr "Не е намерена версия „%s“ на „%s“" + +#: cmdline/apt-get.cc:1176 +#, c-format +msgid "Selected version %s (%s) for %s\n" +msgstr "Избрана е версия %s (%s) за %s\n" + +#: cmdline/apt-get.cc:1313 +msgid "The update command takes no arguments" +msgstr "Командата „update“ не възприема аргументи" + +#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +msgid "Unable to lock the list directory" +msgstr "Неуспех при заключването на директорията със списъка на пакетите" + +#: cmdline/apt-get.cc:1384 +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Някои индексни файлове не можаха да бъдат изтеглени, те са пренебрегнати или " +"са използвани по-стари." + +#: cmdline/apt-get.cc:1403 +msgid "Internal error, AllUpgrade broke stuff" +msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" + +#: cmdline/apt-get.cc:1502 cmdline/apt-get.cc:1538 +#, c-format +msgid "Couldn't find package %s" +msgstr "Неуспех при намирането на пакет %s" + +#: cmdline/apt-get.cc:1525 +#, c-format +msgid "Note, selecting %s for regex '%s'\n" +msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" + +#: cmdline/apt-get.cc:1555 +msgid "You might want to run `apt-get -f install' to correct these:" +msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" + +#: cmdline/apt-get.cc:1558 +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " +"укажете разрешение)." + +#: cmdline/apt-get.cc:1570 +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." +msgstr "" +"Някои пакети не можаха да бъдат инсталирани. Това може да означава,\n" +"че сте изискали невъзможна ситуация или ако използвате нестабилната\n" +"дистрибуция, че някои необходими пакети още не са създадени или пък\n" +"са били преместени от Incoming." + +#: cmdline/apt-get.cc:1578 +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 "" +"Тъй като сте указали единична операция, твърде е възможно пакета просто\n" +"да не може да бъде инсталиран; в такъв случай би трябвало да се подаде\n" +"доклад за грешка за този пакет." + +#: cmdline/apt-get.cc:1583 +msgid "The following information may help to resolve the situation:" +msgstr "" +"Следната информация може да помогне за намиране на изход от ситуацията:" + +#: cmdline/apt-get.cc:1586 +msgid "Broken packages" +msgstr "Счупени пакети" + +#: cmdline/apt-get.cc:1612 +msgid "The following extra packages will be installed:" +msgstr "Следните допълнителни пакети ще бъдат инсталирани:" + +#: cmdline/apt-get.cc:1683 +msgid "Suggested packages:" +msgstr "Предложени пакети:" + +#: cmdline/apt-get.cc:1684 +msgid "Recommended packages:" +msgstr "Препоръчвани пакети:" + +#: cmdline/apt-get.cc:1704 +msgid "Calculating upgrade... " +msgstr "Изчисляване на актуализацията..." + +#: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 +msgid "Failed" +msgstr "Неуспех" + +#: cmdline/apt-get.cc:1712 +msgid "Done" +msgstr "Готово" + +#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 +msgid "Internal error, problem resolver broke stuff" +msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" + +#: cmdline/apt-get.cc:1885 +msgid "Must specify at least one package to fetch source for" +msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" + +#: cmdline/apt-get.cc:1915 cmdline/apt-get.cc:2144 +#, c-format +msgid "Unable to find a source package for %s" +msgstr "Неуспех при намирането на изходен код на пакет %s" + +#: cmdline/apt-get.cc:1959 +#, c-format +msgid "Skipping already downloaded file '%s'\n" +msgstr "Пропускане на вече изтегления файл „%s“\n" + +#: cmdline/apt-get.cc:1983 +#, c-format +msgid "You don't have enough free space in %s" +msgstr "Нямате достатъчно свободно пространство в %s" + +#: cmdline/apt-get.cc:1988 +#, c-format +msgid "Need to get %sB/%sB of source archives.\n" +msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" + +#: cmdline/apt-get.cc:1991 +#, c-format +msgid "Need to get %sB of source archives.\n" +msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" + +#: cmdline/apt-get.cc:1997 +#, c-format +msgid "Fetch source %s\n" +msgstr "Изтегляне на изходен код %s\n" + +#: cmdline/apt-get.cc:2028 +msgid "Failed to fetch some archives." +msgstr "Неуспех при изтеглянето на някои архиви." + +#: cmdline/apt-get.cc:2056 +#, c-format +msgid "Skipping unpack of already unpacked source in %s\n" +msgstr "" +"Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" + +#: cmdline/apt-get.cc:2068 +#, c-format +msgid "Unpack command '%s' failed.\n" +msgstr "Командата за разпакетиране „%s“ пропадна.\n" + +#: cmdline/apt-get.cc:2069 +#, c-format +msgid "Check if the 'dpkg-dev' package is installed.\n" +msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" + +#: cmdline/apt-get.cc:2086 +#, c-format +msgid "Build command '%s' failed.\n" +msgstr "Командата за компилиране „%s“ пропадна.\n" + +#: cmdline/apt-get.cc:2105 +msgid "Child process failed" +msgstr "Процесът-потомък пропадна" + +#: cmdline/apt-get.cc:2121 +msgid "Must specify at least one package to check builddeps for" +msgstr "" +"Трябва да укажете поне един пакет за проверка на зависимости за компилиране" + +#: cmdline/apt-get.cc:2149 +#, c-format +msgid "Unable to get build-dependency information for %s" +msgstr "" +"Неуспех при получаването на информация за зависимостите за компилиране на %s" + +#: cmdline/apt-get.cc:2169 +#, c-format +msgid "%s has no build depends.\n" +msgstr "%s няма зависимости за компилиране.\n" + +#: cmdline/apt-get.cc:2221 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " +"не може да бъде намерен" + +#: cmdline/apt-get.cc:2273 +#, c-format +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"Зависимост %s за пакета %s не може да бъде удовлетворена, понеже няма " +"налични версии на пакета %s, които могат да удовлетворят изискването за " +"версия" + +#: cmdline/apt-get.cc:2308 +#, c-format +msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" +msgstr "" +"Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " +"пакет %s е твърде нов" + +#: cmdline/apt-get.cc:2333 +#, c-format +msgid "Failed to satisfy %s dependency for %s: %s" +msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" + +#: cmdline/apt-get.cc:2347 +#, c-format +msgid "Build-dependencies for %s could not be satisfied." +msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." + +#: cmdline/apt-get.cc:2351 +msgid "Failed to process build dependencies" +msgstr "Неуспех при обработката на зависимостите за компилиране" + +#: cmdline/apt-get.cc:2383 +msgid "Supported modules:" +msgstr "Поддържани модули:" + +#: cmdline/apt-get.cc:2424 +msgid "" +"Usage: apt-get [options] command\n" +" apt-get [options] install|remove pkg1 [pkg2 ...]\n" +" apt-get [options] source pkg1 [pkg2 ...]\n" +"\n" +"apt-get is a simple command line interface for downloading and\n" +"installing packages. The most frequently used commands are update\n" +"and install.\n" +"\n" +"Commands:\n" +" update - Retrieve new lists of packages\n" +" upgrade - Perform an upgrade\n" +" install - Install new packages (pkg is libc6 not libc6.deb)\n" +" remove - Remove packages\n" +" source - Download source archives\n" +" build-dep - Configure build-dependencies for source packages\n" +" dist-upgrade - Distribution upgrade, see apt-get(8)\n" +" dselect-upgrade - Follow dselect selections\n" +" clean - Erase downloaded archive files\n" +" autoclean - Erase old downloaded archive files\n" +" check - Verify that there are no broken dependencies\n" +"\n" +"Options:\n" +" -h This help text.\n" +" -q Loggable output - no progress indicator\n" +" -qq No output except for errors\n" +" -d Download only - do NOT install or unpack archives\n" +" -s No-act. Perform ordering simulation\n" +" -y Assume Yes to all queries and do not prompt\n" +" -f Attempt to continue if the integrity check fails\n" +" -m Attempt to continue if archives are unlocatable\n" +" -u Show a list of upgraded packages as well\n" +" -b Build the source package after fetching it\n" +" -V Show verbose version numbers\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +"See the apt-get(8), sources.list(5) and apt.conf(5) manual\n" +"pages for more information and options.\n" +" This APT has Super Cow Powers.\n" +msgstr "" +"Употреба: apt-get [опции] команда\n" +" apt-get [опции] install|remove пакет1 [пакет2 ...]\n" +" apt-get [опции] source пакет1 [пакет2 ...]\n" +"\n" +"apt-get е опростен интерфейс за командния ред за изтегляне и\n" +"инсталиране на пакети. Най-често използваните команди са „update“\n" +"и „install“.\n" +"\n" +"Команди:\n" +" update - Зареждане на нови списъци с пакети\n" +" upgrade - Извършване на актуализиране\n" +" install - Инсталиране на нови пакети (пакет е libc6, а не libc6.deb)\n" +" remove - Премахване на пакети\n" +" source - Изтегляне на изходен код на пакети\n" +" build-dep - Конфигуриране на зависимостите за компилиране за изходен код " +"на пакети\n" +" dist-upgrade - Актуализиране на дистрибуцията, вижте apt-get(8)\n" +" dselect-upgrade - Следване на избора на dselect\n" +" clean - Изтриване на изтеглените файлове\n" +" autoclean - Изтриване на стари изтеглени файлове\n" +" check - Проверка за счупени зависимости\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -q Изход на съобщения, подходящи за журнал - без индикатор на напредъка\n" +" -qq Без изход на съобщения освен при грешки\n" +" -d Само изтегляне - да НЕ се инсталират или разпакетират архивите\n" +" -s Без действие. Предизвикване на симулация.\n" +" -y Отговаряне с „Да“ на всички въпроси, без питане\n" +" -f Опит за продължаване дори и при неуспех на проверката за цялост\n" +" -m Опит за продължаване дори и ако архивите са неоткриваеми\n" +" -u Показване на списък с пакетите са актуализиране\n" +" -b Компилиране на изходния код на пакета след изтеглянето му\n" +" -V Показване на подробни версии\n" +" -c=? Четене на този конфигурационен файл\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" +"Вижте страниците на apt-get(8), sources.list(5) и apt.conf(5) за повече\n" +"информация и опции.\n" +" Това APT има Върховни Сили.\n" + +#: cmdline/acqprogress.cc:55 +msgid "Hit " +msgstr "Поп " + +#: cmdline/acqprogress.cc:79 +msgid "Get:" +msgstr "Изт:" + +#: cmdline/acqprogress.cc:110 +msgid "Ign " +msgstr "Игн " + +#: cmdline/acqprogress.cc:114 +msgid "Err " +msgstr "Грш " + +#: cmdline/acqprogress.cc:135 +#, c-format +msgid "Fetched %sB in %s (%sB/s)\n" +msgstr "Изтеглени %sB за %s (%sB/сек)\n" + +#: cmdline/acqprogress.cc:225 +#, c-format +msgid " [Working]" +msgstr " [В процес на работа]" + +#: cmdline/acqprogress.cc:271 +#, c-format +msgid "" +"Media change: please insert the disc labeled\n" +" '%s'\n" +"in the drive '%s' and press enter\n" +msgstr "" +"Смяна на носител: сложете диска с етикет\n" +" „%s“\n" +"в устройството „%s“ и натиснете „Enter“\n" + +#: cmdline/apt-sortpkgs.cc:86 +msgid "Unknown package record!" +msgstr "Непознат запис за пакет!" + +#: cmdline/apt-sortpkgs.cc:150 +msgid "" +"Usage: apt-sortpkgs [options] file1 [file2 ...]\n" +"\n" +"apt-sortpkgs is a simple tool to sort package files. The -s option is used\n" +"to indicate what kind of file it is.\n" +"\n" +"Options:\n" +" -h This help text\n" +" -s Use source file sorting\n" +" -c=? Read this configuration file\n" +" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" +msgstr "" +"Употреба: apt-sortpkgs [опции] файл1 [файл2 ...]\n" +"\n" +"apt-sortpkgs е опростен инструмент за сортиране на пакетни файлове. Опцията\n" +"„-s“ се използва, за да покаже типа на файла.\n" +"\n" +"Опции:\n" +" -h Този помощен текст.\n" +" -s Използване на сортиране по изходен код.\n" +" -c=? Четене на този конфигурационен файл.\n" +" -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" +"tmp\n" + +#: dselect/install:32 +msgid "Bad default setting!" +msgstr "Лоша стандартна настройка!" + +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 +msgid "Press enter to continue." +msgstr "Натиснете „Enter“, за да продължите." + +#: dselect/install:100 +msgid "Some errors occurred while unpacking. I'm going to configure the" +msgstr "Възникнаха някои грешки при разпакетирането. Ще се конфигурират" + +#: dselect/install:101 +msgid "packages that were installed. This may result in duplicate errors" +msgstr "инсталираните пакети. Това може да доведе до дублирани грешки или" + +#: dselect/install:102 +msgid "or errors caused by missing dependencies. This is OK, only the errors" +msgstr "грешки, причинени от липсващи зависимости. Това е наред, само грешките" + +#: dselect/install:103 +msgid "" +"above this message are important. Please fix them and run [I]nstall again" +msgstr "" +"над това съобщение за важни. Коригирайте ги и изпълнете [I]nstall наново" + +#: dselect/update:30 +msgid "Merging available information" +msgstr "Смесване на наличната информация" + +#: apt-inst/contrib/extracttar.cc:117 +msgid "Failed to create pipes" +msgstr "Неуспех при създаването на програмни канали" + +#: apt-inst/contrib/extracttar.cc:143 +msgid "Failed to exec gzip " +msgstr "Неуспех при изпълнението на gzip" + +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 +msgid "Corrupted archive" +msgstr "Развален архив" + +#: apt-inst/contrib/extracttar.cc:195 +msgid "Tar checksum failed, archive corrupted" +msgstr "Невярна контролна сума на tar, развален архив" + +#: apt-inst/contrib/extracttar.cc:298 +#, c-format +msgid "Unknown TAR header type %u, member %s" +msgstr "Непозната заглавна част на TAR тип %u, елемент %s" + +#: apt-inst/contrib/arfile.cc:73 +msgid "Invalid archive signature" +msgstr "Невалиден подпис на архива" + +#: apt-inst/contrib/arfile.cc:81 +msgid "Error reading archive member header" +msgstr "Грешка при четене на заглавната част на елемента на архива" + +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 +msgid "Invalid archive member header" +msgstr "Невалидна заглавна част на елемента на архива" + +#: apt-inst/contrib/arfile.cc:131 +msgid "Archive is too short" +msgstr "Архивът е твърде кратък" + +#: apt-inst/contrib/arfile.cc:135 +msgid "Failed to read the archive headers" +msgstr "Неуспех при четенето на заглавните части на архива" + +#: apt-inst/filelist.cc:384 +msgid "DropNode called on still linked node" +msgstr "Извикан е DropNode за все още използван възел" + +#: apt-inst/filelist.cc:416 +msgid "Failed to locate the hash element!" +msgstr "Грешка при намирането на хеш-елемента!" + +#: apt-inst/filelist.cc:463 +msgid "Failed to allocate diversion" +msgstr "Неуспех при установяване на отклонението" + +#: apt-inst/filelist.cc:468 +msgid "Internal error in AddDiversion" +msgstr "Вътрешна грешка в AddDiversion" + +#: apt-inst/filelist.cc:481 +#, c-format +msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" +msgstr "Опит за изменение на отклонение, %s -> %s и %s/%s" + +#: apt-inst/filelist.cc:510 +#, c-format +msgid "Double add of diversion %s -> %s" +msgstr "Двойно добавяне на отклонение %s -> %s" + +#: apt-inst/filelist.cc:553 +#, c-format +msgid "Duplicate conf file %s/%s" +msgstr "Дублиран конфигурационен файл %s/%s" + +#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 +#, c-format +msgid "Failed to write file %s" +msgstr "Неуспех при запис на файл %s" + +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 +#, c-format +msgid "Failed to close file %s" +msgstr "Неуспех при затварянето на файл %s" + +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 +#, c-format +msgid "The path %s is too long" +msgstr "Пътят %s е твърде дълъг" + +#: apt-inst/extract.cc:127 +#, c-format +msgid "Unpacking %s more than once" +msgstr "Разпакетиране на %s повече от веднъж" + +#: apt-inst/extract.cc:137 +#, c-format +msgid "The directory %s is diverted" +msgstr "Директорията %s е отклонена" + +#: apt-inst/extract.cc:147 +#, c-format +msgid "The package is trying to write to the diversion target %s/%s" +msgstr "Пакетът се опитва да пише в целта за отклонение %s/%s" + +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 +msgid "The diversion path is too long" +msgstr "Пътят за отклонение е твърде дълъг" + +#: apt-inst/extract.cc:243 +#, c-format +msgid "The directory %s is being replaced by a non-directory" +msgstr "Директорията %s се заменя с не-директория" + +#: apt-inst/extract.cc:283 +msgid "Failed to locate node in its hash bucket" +msgstr "Неуспех при намирането на възел в неговия хеш" + +#: apt-inst/extract.cc:287 +msgid "The path is too long" +msgstr "Пътят е твърде дълъг" + +#: apt-inst/extract.cc:417 +#, c-format +msgid "Overwrite package match with no version for %s" +msgstr "Файловете се заменят със съдържанието на пакета %s без версия" + +#: apt-inst/extract.cc:434 +#, c-format +msgid "File %s/%s overwrites the one in the package %s" +msgstr "Файл %s/%s заменя този в пакет %s" + +#: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 +#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 +#: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 +#, c-format +msgid "Unable to read %s" +msgstr "Неуспех при четенето на %s" + +#: apt-inst/extract.cc:494 +#, c-format +msgid "Unable to stat %s" +msgstr "Неуспех при получаването на атрибути за %s" + +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 +#, c-format +msgid "Failed to remove %s" +msgstr "Неуспех при премахването на %s" + +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 +#, c-format +msgid "Unable to create %s" +msgstr "Неуспех при създаването на %s" + +#: apt-inst/deb/dpkgdb.cc:118 +#, c-format +msgid "Failed to stat %sinfo" +msgstr "Неуспех при получаването на атрибути %sinfo" + +#: apt-inst/deb/dpkgdb.cc:123 +msgid "The info and temp directories need to be on the same filesystem" +msgstr "" +"Директориите info и temp трябва да бъдат на една и съща файлова система" + +#. Build the status cache +#: 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" +msgstr "Четене на списъците с пакети" + +#: apt-inst/deb/dpkgdb.cc:180 +#, c-format +msgid "Failed to change to the admin dir %sinfo" +msgstr "Неуспех при преминаването в администраторската директория %sinfo" + +#: 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" +msgstr "Вътрешна грешка при получаването на името на пакета" + +#: apt-inst/deb/dpkgdb.cc:205 +msgid "Reading file listing" +msgstr "Четене на списъка на файловете" + +#: apt-inst/deb/dpkgdb.cc:216 +#, c-format +msgid "" +"Failed to open the list file '%sinfo/%s'. If you cannot restore this file " +"then make it empty and immediately re-install the same version of the " +"package!" +msgstr "" +"Неуспех при отварянето на списъка с файлове „%sinfo/%s“. Ако не може да " +"възстановите този файл, запишете го като празен и веднага преинсталирайте " +"същата версия на пакета!" + +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 +#, c-format +msgid "Failed reading the list file %sinfo/%s" +msgstr "Неуспех при четенето на списъка с файлове %sinfo/%s" + +#: apt-inst/deb/dpkgdb.cc:266 +msgid "Internal error getting a node" +msgstr "Вътрешна грешка при получаването на възел" + +#: apt-inst/deb/dpkgdb.cc:309 +#, c-format +msgid "Failed to open the diversions file %sdiversions" +msgstr "Неуспех при отварянето на файл с отклонения %sdiversions" + +#: apt-inst/deb/dpkgdb.cc:324 +msgid "The diversion file is corrupted" +msgstr "Файлът с отклонения е повреден" + +#: apt-inst/deb/dpkgdb.cc:331 apt-inst/deb/dpkgdb.cc:336 +#: apt-inst/deb/dpkgdb.cc:341 +#, c-format +msgid "Invalid line in the diversion file: %s" +msgstr "Неправилен ред във файла с отклонения: %s" + +#: apt-inst/deb/dpkgdb.cc:362 +msgid "Internal error adding a diversion" +msgstr "Вътрешна грешка при добавянето на отклонение" + +#: apt-inst/deb/dpkgdb.cc:383 +msgid "The pkg cache must be initialized first" +msgstr "Първо трябва да се инициализира кеша с пакети" + +#: apt-inst/deb/dpkgdb.cc:386 +msgid "Reading file list" +msgstr "Четене на списъка с файлове" + +#: apt-inst/deb/dpkgdb.cc:443 +#, c-format +msgid "Failed to find a Package: header, offset %lu" +msgstr "Неуспех при намирането на заглавна част „Package:“, изместване %lu" + +#: apt-inst/deb/dpkgdb.cc:465 +#, c-format +msgid "Bad ConfFile section in the status file. Offset %lu" +msgstr "Неправилна секция „ConfFile“ във файла за състояние. Изместване %lu" + +#: apt-inst/deb/dpkgdb.cc:470 +#, c-format +msgid "Error parsing MD5. Offset %lu" +msgstr "Грешка при анализирането на MD5. Изместване %lu" + +#: apt-inst/deb/debfile.cc:42 apt-inst/deb/debfile.cc:47 +#, c-format +msgid "This is not a valid DEB archive, missing '%s' member" +msgstr "Това не е валиден DEB архив, липсва елемент „%s“" + +#: apt-inst/deb/debfile.cc:52 +#, c-format +msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" +msgstr "Това не е валиден DEB архив, няма елемент „%s“ или „%s“" + +#: apt-inst/deb/debfile.cc:112 +#, c-format +msgid "Couldn't change to %s" +msgstr "Неуспех при преминаването в %s" + +#: apt-inst/deb/debfile.cc:138 +msgid "Internal error, could not locate member" +msgstr "Вътрешна грешка, не може да се открие елемент" + +#: apt-inst/deb/debfile.cc:171 +msgid "Failed to locate a valid control file" +msgstr "Неуспех при намирането на валиден контролен файл" + +#: apt-inst/deb/debfile.cc:256 +msgid "Unparsable control file" +msgstr "Контролен файл, невъзможен за анализ" + +#: methods/cdrom.cc:114 +#, c-format +msgid "Unable to read the cdrom database %s" +msgstr "Неуспех при четенето на базата %s със CD-ROM" + +#: methods/cdrom.cc:123 +msgid "" +"Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " +"cannot be used to add new CD-ROMs" +msgstr "" +"Използвайте „apt-cdrom“, за да може този CD-ROM да се разпознава от APT. " +"„apt-get update“ не може да се използва за добавяне на нови дискове" + +#: methods/cdrom.cc:131 +msgid "Wrong CD-ROM" +msgstr "Грешен CD-ROM" + +#: methods/cdrom.cc:164 +#, c-format +msgid "Unable to unmount the CD-ROM in %s, it may still be in use." +msgstr "Неуспех при демонтирането на CD-ROM в %s, може все още да се използва." + +#: methods/cdrom.cc:169 +msgid "Disk not found." +msgstr "Дискът не е намерен." + +#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 +msgid "File not found" +msgstr "Файлът не е намерен" + +#: methods/copy.cc:42 methods/gpgv.cc:269 methods/gzip.cc:133 +#: methods/gzip.cc:142 +msgid "Failed to stat" +msgstr "Неуспех при получаването на атрибути" + +#: methods/copy.cc:79 methods/gpgv.cc:266 methods/gzip.cc:139 +msgid "Failed to set modification time" +msgstr "Неуспех при задаването на време на промяна" + +#: methods/file.cc:44 +msgid "Invalid URI, local URIS must not start with //" +msgstr "Невалиден адрес-URI, локалните адреси-URI не трябва да започват с „//“" + +#. Login must be before getpeername otherwise dante won't work. +#: methods/ftp.cc:162 +msgid "Logging in" +msgstr "Влизане" + +#: methods/ftp.cc:168 +msgid "Unable to determine the peer name" +msgstr "Неуспех при установяването на името на отдалечения сървър" + +#: methods/ftp.cc:173 +msgid "Unable to determine the local name" +msgstr "Неуспех при установяването на локалното име" + +#: methods/ftp.cc:204 methods/ftp.cc:232 +#, c-format +msgid "The server refused the connection and said: %s" +msgstr "Сървърът отказа свързване и съобщи: %s" + +#: methods/ftp.cc:210 +#, c-format +msgid "USER failed, server said: %s" +msgstr "USER се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:217 +#, c-format +msgid "PASS failed, server said: %s" +msgstr "PASS се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:237 +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Беше указан сървър-посредник, но няма скрипт за влизане, Acquire::ftp::" +"ProxyLogin е празен." + +#: methods/ftp.cc:265 +#, c-format +msgid "Login script command '%s' failed, server said: %s" +msgstr "Командата „%s“ на скрипта за влизане се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:291 +#, c-format +msgid "TYPE failed, server said: %s" +msgstr "TYPE се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 +msgid "Connection timeout" +msgstr "Допустимото време за свързването изтече" + +#: methods/ftp.cc:335 +msgid "Server closed the connection" +msgstr "Сървърът разпадна връзката" + +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 +msgid "Read error" +msgstr "Грешка при четене" + +#: methods/ftp.cc:345 methods/rsh.cc:197 +msgid "A response overflowed the buffer." +msgstr "Отговорът препълни буфера." + +#: methods/ftp.cc:362 methods/ftp.cc:374 +msgid "Protocol corruption" +msgstr "Развален протокол" + +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 +msgid "Write error" +msgstr "Грешка при запис" + +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 +msgid "Could not create a socket" +msgstr "Неуспех при създаването на гнездо" + +#: methods/ftp.cc:698 +msgid "Could not connect data socket, connection timed out" +msgstr "" +"Неуспех при свързването на гнездо за данни, допустимото време за свъзрзване " +"изтече" + +#: methods/ftp.cc:704 +msgid "Could not connect passive socket." +msgstr "Неуспех при свързването на пасивно гнездо." + +#: methods/ftp.cc:722 +msgid "getaddrinfo was unable to get a listening socket" +msgstr "getaddrinfo не успя да се добере до слушащо гнездо" + +#: methods/ftp.cc:736 +msgid "Could not bind a socket" +msgstr "Неуспех при свързването на гнездо" + +#: methods/ftp.cc:740 +msgid "Could not listen on the socket" +msgstr "Неуспех при слушането на гнездото" + +#: methods/ftp.cc:747 +msgid "Could not determine the socket's name" +msgstr "Неуспех при определянето на името на гнездото" + +#: methods/ftp.cc:779 +msgid "Unable to send PORT command" +msgstr "Неуспех при изпращането на командата PORT" + +#: methods/ftp.cc:789 +#, c-format +msgid "Unknown address family %u (AF_*)" +msgstr "Неизвестно семейство адреси %u (AF_*)" + +#: methods/ftp.cc:798 +#, c-format +msgid "EPRT failed, server said: %s" +msgstr "EPRT се провали, сървърът съобщи: %s" + +#: methods/ftp.cc:818 +msgid "Data socket connect timed out" +msgstr "Времето за установяване на връзка с гнездо за данни изтече" + +#: methods/ftp.cc:825 +msgid "Unable to accept connection" +msgstr "Невъзможно е да се приеме свързването" + +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 +msgid "Problem hashing file" +msgstr "Проблем при хеширане на файла" + +#: methods/ftp.cc:877 +#, c-format +msgid "Unable to fetch file, server said '%s'" +msgstr "Неуспех при изтеглянето на файла, сървърът съобщи „%s“" + +#: methods/ftp.cc:892 methods/rsh.cc:322 +msgid "Data socket timed out" +msgstr "Времето за връзка с гнездо за данни изтече" + +#: methods/ftp.cc:922 +#, c-format +msgid "Data transfer failed, server said '%s'" +msgstr "Неуспех при прехвърлянето на данни, сървърът съобщи: „%s“" + +#. Get the files information +#: methods/ftp.cc:997 +msgid "Query" +msgstr "Запитване" + +#: methods/ftp.cc:1106 +msgid "Unable to invoke " +msgstr "Неуспех при извикването на " + +#: methods/connect.cc:64 +#, c-format +msgid "Connecting to %s (%s)" +msgstr "Свързване с %s (%s)" + +#: methods/connect.cc:71 +#, c-format +msgid "[IP: %s %s]" +msgstr "[IP: %s %s]" + +#: methods/connect.cc:80 +#, c-format +msgid "Could not create a socket for %s (f=%u t=%u p=%u)" +msgstr "Неуспех при създаването на гнездо за %s (f=%u t=%u p=%u)" + +#: methods/connect.cc:86 +#, c-format +msgid "Cannot initiate the connection to %s:%s (%s)." +msgstr "Не може да се започне свързване с %s:%s (%s)." + +#: methods/connect.cc:93 +#, c-format +msgid "Could not connect to %s:%s (%s), connection timed out" +msgstr "Неуспех при свързване с %s:%s (%s), допустимото време изтече" + +#: methods/connect.cc:106 +#, c-format +msgid "Could not connect to %s:%s (%s)." +msgstr "Неуспех при свързване с %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 +#, c-format +msgid "Connecting to %s" +msgstr "Свързване с %s" + +#: methods/connect.cc:165 +#, c-format +msgid "Could not resolve '%s'" +msgstr "Неуспех при намирането на IP адреса на „%s“" + +#: methods/connect.cc:171 +#, c-format +msgid "Temporary failure resolving '%s'" +msgstr "Временен неуспех при намирането на IP адреса на „%s“" + +#: methods/connect.cc:174 +#, c-format +msgid "Something wicked happened resolving '%s:%s' (%i)" +msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)" + +#: methods/connect.cc:221 +#, c-format +msgid "Unable to connect to %s %s:" +msgstr "Неуспех при свързването с %s %s:" + +#: methods/gpgv.cc:92 +msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." +msgstr "" +"E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване " +"на работа." + +#: methods/gpgv.cc:191 +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" +"Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " +"ключа?!" + +#: methods/gpgv.cc:196 +msgid "At least one invalid signature was encountered." +msgstr "Намерен е поне един невалиден подпис." + +#. FIXME String concatenation considered harmful. +#: methods/gpgv.cc:201 +msgid "Could not execute " +msgstr "Неуспех при изпълнението на " + +#: methods/gpgv.cc:202 +msgid " to verify signature (is gnupg installed?)" +msgstr " за проверка на подписа (инсталиран ли е gnupg?)" + +#: methods/gpgv.cc:206 +msgid "Unknown error executing gpgv" +msgstr "Неизвестна грешка при изпълнението на gpgv" + +#: methods/gpgv.cc:237 +msgid "The following signatures were invalid:\n" +msgstr "Следните подписи са невалидни:\n" + +#: methods/gpgv.cc:244 +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" +"Следните подписи не можаха да бъдат проверени, защото публичния ключ не е " +"наличен:\n" + +#: methods/gzip.cc:57 +#, c-format +msgid "Couldn't open pipe for %s" +msgstr "Неуспех при отварянето на програмен канал за %s" + +#: methods/gzip.cc:102 +#, c-format +msgid "Read error from %s process" +msgstr "Грешка при четене от процес %s" + +#: methods/http.cc:376 +msgid "Waiting for headers" +msgstr "Чакане на заглавни части" + +#: methods/http.cc:522 +#, c-format +msgid "Got a single header line over %u chars" +msgstr "Получен е един ред на заглавна част с над %u символа" + +#: methods/http.cc:530 +msgid "Bad header line" +msgstr "Невалиден ред на заглавна част" + +#: methods/http.cc:549 methods/http.cc:556 +msgid "The HTTP server sent an invalid reply header" +msgstr "HTTP сървърът изпрати невалидна заглавна част като отговор" + +#: methods/http.cc:585 +msgid "The HTTP server sent an invalid Content-Length header" +msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Length“" + +#: methods/http.cc:600 +msgid "The HTTP server sent an invalid Content-Range header" +msgstr "HTTP сървърът изпрати невалидна заглавна част „Content-Range“" + +#: methods/http.cc:602 +msgid "This HTTP server has broken range support" +msgstr "HTTP сървърът няма поддръжка за прехвърляне на фрагменти на файлове" + +#: methods/http.cc:626 +msgid "Unknown date format" +msgstr "Неизвестен формат на дата" + +#: methods/http.cc:773 +msgid "Select failed" +msgstr "Неуспех на избора" + +#: methods/http.cc:778 +msgid "Connection timed out" +msgstr "Допустимото време за свързване изтече" + +#: methods/http.cc:801 +msgid "Error writing to output file" +msgstr "Грешка при записа на изходен файл" + +#: methods/http.cc:832 +msgid "Error writing to file" +msgstr "Грешка при записа на файл" + +#: methods/http.cc:860 +msgid "Error writing to the file" +msgstr "Грешка при записа на файла" + +#: methods/http.cc:874 +msgid "Error reading from server. Remote end closed connection" +msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" + +#: methods/http.cc:876 +msgid "Error reading from server" +msgstr "Грешка при четене от сървъра" + +#: methods/http.cc:1107 +msgid "Bad header data" +msgstr "Невалидни данни на заглавната част" + +#: methods/http.cc:1124 +msgid "Connection failed" +msgstr "Неуспех при свързването" + +#: methods/http.cc:1215 +msgid "Internal error" +msgstr "Вътрешна грешка" + +#: apt-pkg/contrib/mmap.cc:82 +msgid "Can't mmap an empty file" +msgstr "Невъзможно е да се прехвърли в паметта празен файл" + +#: apt-pkg/contrib/mmap.cc:87 +#, c-format +msgid "Couldn't make mmap of %lu bytes" +msgstr "Неуспех при прехвърлянето в паметта на %lu байта" + +#: apt-pkg/contrib/strutl.cc:938 +#, c-format +msgid "Selection %s not found" +msgstr "Изборът %s не е намерен" + +#: apt-pkg/contrib/configuration.cc:436 +#, c-format +msgid "Unrecognized type abbreviation: '%c'" +msgstr "Неизвестен тип на абревиатура: „%c“" + +#: apt-pkg/contrib/configuration.cc:494 +#, c-format +msgid "Opening configuration file %s" +msgstr "Отваряне на конфигурационен файл %s" + +#: apt-pkg/contrib/configuration.cc:512 +#, c-format +msgid "Line %d too long (max %d)" +msgstr "Ред %d е твърде дълъг (максимум %d)" + +#: apt-pkg/contrib/configuration.cc:608 +#, c-format +msgid "Syntax error %s:%u: Block starts with no name." +msgstr "Синтактична грешка %s:%u: В началото на блока няма име." + +#: apt-pkg/contrib/configuration.cc:627 +#, c-format +msgid "Syntax error %s:%u: Malformed tag" +msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" + +#: apt-pkg/contrib/configuration.cc:644 +#, c-format +msgid "Syntax error %s:%u: Extra junk after value" +msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" + +#: apt-pkg/contrib/configuration.cc:684 +#, c-format +msgid "Syntax error %s:%u: Directives can only be done at the top level" +msgstr "" +"Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " +"ниво" + +#: apt-pkg/contrib/configuration.cc:691 +#, c-format +msgid "Syntax error %s:%u: Too many nested includes" +msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" + +#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 +#, c-format +msgid "Syntax error %s:%u: Included from here" +msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" + +#: apt-pkg/contrib/configuration.cc:704 +#, c-format +msgid "Syntax error %s:%u: Unsupported directive '%s'" +msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" + +#: apt-pkg/contrib/configuration.cc:738 +#, c-format +msgid "Syntax error %s:%u: Extra junk at end of file" +msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" + +#: apt-pkg/contrib/progress.cc:154 +#, c-format +msgid "%c%s... Error!" +msgstr "%c%s... Грешка!" + +#: apt-pkg/contrib/progress.cc:156 +#, c-format +msgid "%c%s... Done" +msgstr "%c%s... Готово" + +#: apt-pkg/contrib/cmndline.cc:80 +#, c-format +msgid "Command line option '%c' [from %s] is not known." +msgstr "Неизвестна опция за команден ред „%c“ [от %s]." + +#: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 +#: apt-pkg/contrib/cmndline.cc:122 +#, c-format +msgid "Command line option %s is not understood" +msgstr "Опцията за команден ред %s не е разпозната" + +#: apt-pkg/contrib/cmndline.cc:127 +#, c-format +msgid "Command line option %s is not boolean" +msgstr "Опцията за команден ред %s не е булева" + +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 +#, c-format +msgid "Option %s requires an argument." +msgstr "Опция %s изисква аргумент." + +#: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 +#, c-format +msgid "Option %s: Configuration item specification must have an =<val>." +msgstr "Опция %s: Значението трябва да има =<val>." + +#: apt-pkg/contrib/cmndline.cc:237 +#, c-format +msgid "Option %s requires an integer argument, not '%s'" +msgstr "Опция %s изисква аргумент цяло число, не „%s“" + +#: apt-pkg/contrib/cmndline.cc:268 +#, c-format +msgid "Option '%s' is too long" +msgstr "Опция „%s“ е твърде дълга" + +#: apt-pkg/contrib/cmndline.cc:301 +#, c-format +msgid "Sense %s is not understood, try true or false." +msgstr "Смисълът %s не е ясен, опитайте true или false." + +#: apt-pkg/contrib/cmndline.cc:351 +#, c-format +msgid "Invalid operation %s" +msgstr "Невалидна операция %s" + +#: apt-pkg/contrib/cdromutl.cc:55 +#, c-format +msgid "Unable to stat the mount point %s" +msgstr "Неуспех при намирането на атрибутите на точка за монтиране %s" + +#: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 +#, c-format +msgid "Unable to change to %s" +msgstr "Неуспех при преминаването в %s" + +#: apt-pkg/contrib/cdromutl.cc:190 +msgid "Failed to stat the cdrom" +msgstr "Неуспех при намирането на атрибутите на cdrom" + +#: apt-pkg/contrib/fileutl.cc:82 +#, c-format +msgid "Not using locking for read only lock file %s" +msgstr "" +"Не се използва заключване за файл за заключване %s, който е само за четене" + +#: apt-pkg/contrib/fileutl.cc:87 +#, c-format +msgid "Could not open lock file %s" +msgstr "Неуспех при отварянето на файл за заключване %s" + +#: apt-pkg/contrib/fileutl.cc:105 +#, c-format +msgid "Not using locking for nfs mounted lock file %s" +msgstr "" +"Не се използва заключване за файл за заключване %s, който е монтиран по NFS" + +#: apt-pkg/contrib/fileutl.cc:109 +#, c-format +msgid "Could not get lock %s" +msgstr "Неуспех при достъпа до заключване %s" + +#: apt-pkg/contrib/fileutl.cc:377 +#, c-format +msgid "Waited for %s but it wasn't there" +msgstr "Изчака се завършването на %s, но той не беше пуснат" + +#: apt-pkg/contrib/fileutl.cc:387 +#, c-format +msgid "Sub-process %s received a segmentation fault." +msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." + +#: apt-pkg/contrib/fileutl.cc:390 +#, c-format +msgid "Sub-process %s returned an error code (%u)" +msgstr "Подпроцесът %s върна код за грешка (%u)" + +#: apt-pkg/contrib/fileutl.cc:392 +#, c-format +msgid "Sub-process %s exited unexpectedly" +msgstr "Подпроцесът %s завърши неочаквано" + +#: apt-pkg/contrib/fileutl.cc:436 +#, c-format +msgid "Could not open file %s" +msgstr "Неуспех при отварянето на файла %s" + +#: apt-pkg/contrib/fileutl.cc:492 +#, c-format +msgid "read, still have %lu to read but none left" +msgstr "" +"грешка при четене, все още има %lu за четене, но няма нито един останал" + +#: apt-pkg/contrib/fileutl.cc:522 +#, c-format +msgid "write, still have %lu to write but couldn't" +msgstr "грешка при запис, все още име %lu за запис, но не успя" + +#: apt-pkg/contrib/fileutl.cc:597 +msgid "Problem closing the file" +msgstr "Проблем при затварянето на файла" + +#: apt-pkg/contrib/fileutl.cc:603 +msgid "Problem unlinking the file" +msgstr "Проблем при премахването на връзка към файла" + +#: apt-pkg/contrib/fileutl.cc:614 +msgid "Problem syncing the file" +msgstr "Проблем при синхронизиране на файла" + +#: apt-pkg/pkgcache.cc:126 +msgid "Empty package cache" +msgstr "Празен кеш на пакети" + +#: apt-pkg/pkgcache.cc:132 +msgid "The package cache file is corrupted" +msgstr "Файлът за кеш на пакети е повреден" + +#: apt-pkg/pkgcache.cc:137 +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'" +msgstr "Тази версия на APT не поддържа система за версии „%s“" + +#: apt-pkg/pkgcache.cc:147 +msgid "The package cache was built for a different architecture" +msgstr "Кешът на пакети е бил направен за различна архитектура" + +#: apt-pkg/pkgcache.cc:218 +msgid "Depends" +msgstr "Зависи от" + +#: apt-pkg/pkgcache.cc:218 +msgid "PreDepends" +msgstr "Предварително зависи от" + +#: apt-pkg/pkgcache.cc:218 +msgid "Suggests" +msgstr "Предлага се" + +#: apt-pkg/pkgcache.cc:219 +msgid "Recommends" +msgstr "Препоръчва се" + +#: apt-pkg/pkgcache.cc:219 +msgid "Conflicts" +msgstr "Конфликтира с" + +#: apt-pkg/pkgcache.cc:219 +msgid "Replaces" +msgstr "Заменя" + +#: apt-pkg/pkgcache.cc:220 +msgid "Obsoletes" +msgstr "Изважда от употреба" + +#: apt-pkg/pkgcache.cc:231 +msgid "important" +msgstr "важен" + +#: apt-pkg/pkgcache.cc:231 +msgid "required" +msgstr "изискван" + +#: apt-pkg/pkgcache.cc:231 +msgid "standard" +msgstr "стандартен" + +#: apt-pkg/pkgcache.cc:232 +msgid "optional" +msgstr "незадължителен" + +#: apt-pkg/pkgcache.cc:232 +msgid "extra" +msgstr "допълнителен" + +#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +msgid "Building dependency tree" +msgstr "Изграждане на дървото със зависимости" + +#: apt-pkg/depcache.cc:61 +msgid "Candidate versions" +msgstr "Версии кандидати" + +#: apt-pkg/depcache.cc:90 +msgid "Dependency generation" +msgstr "Генериране на зависимости" + +#: apt-pkg/tagfile.cc:73 +#, c-format +msgid "Unable to parse package file %s (1)" +msgstr "Неуспех при анализирането на пакетен файл %s (1)" + +#: apt-pkg/tagfile.cc:160 +#, c-format +msgid "Unable to parse package file %s (2)" +msgstr "Неуспех при анализирането на пакетен файл %s (2)" + +#: apt-pkg/sourcelist.cc:94 +#, c-format +msgid "Malformed line %lu in source list %s (URI)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" + +#: apt-pkg/sourcelist.cc:96 +#, c-format +msgid "Malformed line %lu in source list %s (dist)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" + +#: apt-pkg/sourcelist.cc:99 +#, c-format +msgid "Malformed line %lu in source list %s (URI parse)" +msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" + +#: apt-pkg/sourcelist.cc:105 +#, c-format +msgid "Malformed line %lu in source list %s (absolute dist)" +msgstr "" +"Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" + +#: apt-pkg/sourcelist.cc:112 +#, c-format +msgid "Malformed line %lu in source list %s (dist parse)" +msgstr "" +"Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" + +#: apt-pkg/sourcelist.cc:203 +#, c-format +msgid "Opening %s" +msgstr "Отваряне на %s" + +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 +#, c-format +msgid "Line %u too long in source list %s." +msgstr "Ред %u в списъка с източници %s е твърде дълъг." + +#: apt-pkg/sourcelist.cc:240 +#, c-format +msgid "Malformed line %u in source list %s (type)" +msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" + +#: apt-pkg/sourcelist.cc:244 +#, c-format +msgid "Type '%s' is not known on line %u in source list %s" +msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." + +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 +#, c-format +msgid "Malformed line %u in source list %s (vendor id)" +msgstr "" +"Лошо форматиран ред %u в списъка с източници %s (идентификатор на " +"производител)" + +#: apt-pkg/packagemanager.cc:402 +#, c-format +msgid "" +"This installation run will require temporarily removing the essential " +"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." +msgstr "" +"В следствие на циклични зависимости от типа „Конфликтира/Предварително " +"зависи от“, за да се продължи инсталацията трябва да се премахне необходимия " +"пакет %s. Това често е лошо, но ако наистина искате да го направите, " +"активирайте опцията APT::Force-LoopBreak." + +#: apt-pkg/pkgrecords.cc:37 +#, c-format +msgid "Index file type '%s' is not supported" +msgstr "Не се поддържа индексен файл от типа „%s“" + +#: apt-pkg/algorithms.cc:241 +#, c-format +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Пакетът %s трябва да бъде преинсталиран, но не може да се намери архив за " +"него." + +#: apt-pkg/algorithms.cc:1059 +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Грешка, pkgProblemResolver::Resolve генерира повреди, това може да е " +"причинено от задържани пакети." + +#: apt-pkg/algorithms.cc:1061 +msgid "Unable to correct problems, you have held broken packages." +msgstr "" +"Неуспех при коригирането на проблемите, имате задържани счупени пакети." + +#: apt-pkg/acquire.cc:62 +#, c-format +msgid "Lists directory %spartial is missing." +msgstr "Директорията със списъци %spartial липсва." + +#: apt-pkg/acquire.cc:66 +#, c-format +msgid "Archive directory %spartial is missing." +msgstr "Директорията за архиви %spartial липсва." + +#: apt-pkg/acquire.cc:821 +#, c-format +msgid "Downloading file %li of %li (%s remaining)" +msgstr "Изтегляне на файл %li от %li (остават %s)" + +#: apt-pkg/acquire-worker.cc:113 +#, c-format +msgid "The method driver %s could not be found." +msgstr "Неуспех при намирането на драйвер за метод %s." + +#: apt-pkg/acquire-worker.cc:162 +#, c-format +msgid "Method %s did not start correctly" +msgstr "Методът %s не стартира правилно" + +#: apt-pkg/acquire-worker.cc:377 +#, c-format +msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." +msgstr "Сложете диска, озаглавен „%s“ в устройство „%s“ и натиснете „Enter“." + +#: apt-pkg/init.cc:120 +#, c-format +msgid "Packaging system '%s' is not supported" +msgstr "Пакетната система „%s“ не е поддържана" + +#: apt-pkg/init.cc:136 +msgid "Unable to determine a suitable packaging system type" +msgstr "Неуспех при определянето на подходяща пакетна система" + +#: apt-pkg/clean.cc:61 +#, c-format +msgid "Unable to stat %s." +msgstr "Неуспех при получаването на атрибути на %s." + +#: apt-pkg/srcrecords.cc:48 +msgid "You must put some 'source' URIs in your sources.list" +msgstr "Трябва да добавите адреси-URI от тип „source“ в sources.list" + +#: apt-pkg/cachefile.cc:73 +msgid "The package lists or status file could not be parsed or opened." +msgstr "" +"Списъците с пакети или файлът за състояние не можаха да бъдат анализирани " +"или отворени." + +#: apt-pkg/cachefile.cc:77 +msgid "You may want to run apt-get update to correct these problems" +msgstr "" +"Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" + +#: apt-pkg/policy.cc:269 +msgid "Invalid record in the preferences file, no Package header" +msgstr "Невалиден запис във файла с настройки, няма заглавна част Package" + +#: apt-pkg/policy.cc:291 +#, c-format +msgid "Did not understand pin type %s" +msgstr "Неизвестен тип за отбиване %s" + +#: apt-pkg/policy.cc:299 +msgid "No priority (or zero) specified for pin" +msgstr "Няма указан приоритет (или е нула) на отбиването" + +#: apt-pkg/pkgcachegen.cc:74 +msgid "Cache has an incompatible versioning system" +msgstr "Кешът има несъвместима система за версии" + +#: apt-pkg/pkgcachegen.cc:117 +#, c-format +msgid "Error occurred while processing %s (NewPackage)" +msgstr "Възникна грешка при обработката на %s (NewPackage)" + +#: apt-pkg/pkgcachegen.cc:129 +#, c-format +msgid "Error occurred while processing %s (UsePackage1)" +msgstr "Възникна грешка при обработката на %s (UsePackage1)" + +#: apt-pkg/pkgcachegen.cc:150 +#, c-format +msgid "Error occurred while processing %s (UsePackage2)" +msgstr "Възникна грешка при обработката на %s (UsePackage2)" + +#: apt-pkg/pkgcachegen.cc:154 +#, c-format +msgid "Error occurred while processing %s (NewFileVer1)" +msgstr "Възникна грешка при обработката на %s (NewFileVer1)" + +#: apt-pkg/pkgcachegen.cc:184 +#, c-format +msgid "Error occurred while processing %s (NewVersion1)" +msgstr "Възникна грешка при обработката на %s (NewVersion1)" + +#: apt-pkg/pkgcachegen.cc:188 +#, c-format +msgid "Error occurred while processing %s (UsePackage3)" +msgstr "Възникна грешка при обработката на %s (UsePackage3)" + +#: apt-pkg/pkgcachegen.cc:192 +#, c-format +msgid "Error occurred while processing %s (NewVersion2)" +msgstr "Възникна грешка при обработката на %s (NewVersion2)" + +#: apt-pkg/pkgcachegen.cc:207 +msgid "Wow, you exceeded the number of package names this APT is capable of." +msgstr "" +"Еха, надхвърлихте броя имена на пакети, на който е способна тази версия на " +"APT." + +#: apt-pkg/pkgcachegen.cc:210 +msgid "Wow, you exceeded the number of versions this APT is capable of." +msgstr "Еха, надхвърлихте броя версии, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:213 +msgid "Wow, you exceeded the number of dependencies this APT is capable of." +msgstr "" +"Еха, надхвърлихте броя зависимости, на който е способна тази версия на APT." + +#: apt-pkg/pkgcachegen.cc:241 +#, c-format +msgid "Error occurred while processing %s (FindPkg)" +msgstr "Възникна грешка при обработката на %s (FindPkg)" + +#: apt-pkg/pkgcachegen.cc:254 +#, c-format +msgid "Error occurred while processing %s (CollectFileProvides)" +msgstr "Възникна грешка при обработката на %s (CollectFileProvides)" + +#: apt-pkg/pkgcachegen.cc:260 +#, c-format +msgid "Package %s %s was not found while processing file dependencies" +msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" + +#: apt-pkg/pkgcachegen.cc:574 +#, c-format +msgid "Couldn't stat source package list %s" +msgstr "" +"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" + +#: apt-pkg/pkgcachegen.cc:658 +msgid "Collecting File Provides" +msgstr "Събиране на информация за „Осигурява“" + +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 +msgid "IO Error saving source cache" +msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" + +#: apt-pkg/acquire-item.cc:126 +#, c-format +msgid "rename failed, %s (%s -> %s)." +msgstr "преименуването се провали, %s (%s -> %s)." + +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:950 +msgid "MD5Sum mismatch" +msgstr "Несъответствие на контролна сума MD5" + +#: apt-pkg/acquire-item.cc:645 +msgid "There are no public key available for the following key IDs:\n" +msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n" + +#: apt-pkg/acquire-item.cc:758 +#, 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 "" +"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " +"ръчно да оправите този пакет (поради пропусната архитектура)." + +#: apt-pkg/acquire-item.cc:817 +#, 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 "" +"Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " +"ръчно да оправите този пакет." + +#: apt-pkg/acquire-item.cc:853 +#, c-format +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s." + +#: apt-pkg/acquire-item.cc:940 +msgid "Size mismatch" +msgstr "Несъответствие на размера" + +#: apt-pkg/vendorlist.cc:66 +#, c-format +msgid "Vendor block %s contains no fingerprint" +msgstr "Блокът на производителя %s не съдържа отпечатък" + +#: apt-pkg/cdrom.cc:507 +#, c-format +msgid "" +"Using CD-ROM mount point %s\n" +"Mounting CD-ROM\n" +msgstr "" +"Използване на точка за монтиране на CD-ROM %s\n" +"Монтиране на CD-ROM\n" + +#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 +msgid "Identifying.. " +msgstr "Идентифициране..." + +#: apt-pkg/cdrom.cc:541 +#, c-format +msgid "Stored label: %s \n" +msgstr "Запазен етикет: %s \n" + +#: apt-pkg/cdrom.cc:561 +#, c-format +msgid "Using CD-ROM mount point %s\n" +msgstr "Използване на точка за монтиране на CD-ROM %s\n" + +#: apt-pkg/cdrom.cc:579 +msgid "Unmounting CD-ROM\n" +msgstr "Демонтиране на CD-ROM\n" + +#: apt-pkg/cdrom.cc:583 +msgid "Waiting for disc...\n" +msgstr "Чакане за диск...\n" + +#. Mount the new CDROM +#: apt-pkg/cdrom.cc:591 +msgid "Mounting CD-ROM...\n" +msgstr "Монтиране на CD-ROM...\n" + +#: apt-pkg/cdrom.cc:609 +msgid "Scanning disc for index files..\n" +msgstr "Сканиране на диска за индексни файлове...\n" + +#: apt-pkg/cdrom.cc:647 +#, c-format +msgid "Found %i package indexes, %i source indexes and %i signatures\n" +msgstr "" +"Намерени са %i индекса на пакети, %i индекса на пакети с изходен код и %i " +"подписа.\n" + +#: apt-pkg/cdrom.cc:710 +msgid "That is not a valid name, try again.\n" +msgstr "Това не е валидно име, опитайте отново.\n" + +#: apt-pkg/cdrom.cc:726 +#, c-format +msgid "" +"This disc is called: \n" +"'%s'\n" +msgstr "" +"Наименование на този диск: \n" +"„%s“\n" + +#: apt-pkg/cdrom.cc:730 +msgid "Copying package lists..." +msgstr "Копиране на списъците с пакети..." + +#: apt-pkg/cdrom.cc:754 +msgid "Writing new source list\n" +msgstr "Запазване на новия списък с източници\n" + +#: apt-pkg/cdrom.cc:763 +msgid "Source list entries for this disc are:\n" +msgstr "Записите в списъка с източници за този диск са:\n" + +#: apt-pkg/cdrom.cc:803 +msgid "Unmounting CD-ROM..." +msgstr "Демонтиране на CD-ROM..." + +#: apt-pkg/indexcopy.cc:261 +#, c-format +msgid "Wrote %i records.\n" +msgstr "Записани са %i записа.\n" + +#: apt-pkg/indexcopy.cc:263 +#, c-format +msgid "Wrote %i records with %i missing files.\n" +msgstr "Записани са %i записа с %i липсващи файла.\n" + +#: apt-pkg/indexcopy.cc:266 +#, c-format +msgid "Wrote %i records with %i mismatched files\n" +msgstr "Записани са %i записа с %i несъответстващи файла\n" + +#: apt-pkg/indexcopy.cc:269 +#, c-format +msgid "Wrote %i records with %i missing files and %i mismatched files\n" +msgstr "Записани са %i записа с %i липсващи и %i несъответстващи файла\n" + +#: apt-pkg/deb/dpkgpm.cc:358 +#, c-format +msgid "Preparing %s" +msgstr "Подготвяне на %s" + +#: apt-pkg/deb/dpkgpm.cc:359 +#, c-format +msgid "Unpacking %s" +msgstr "Разпакетиране на %s" + +#: apt-pkg/deb/dpkgpm.cc:364 +#, c-format +msgid "Preparing to configure %s" +msgstr "Подготвяне на %s за конфигуриране" + +#: apt-pkg/deb/dpkgpm.cc:365 +#, c-format +msgid "Configuring %s" +msgstr "Конфигуриране на %s" + +#: apt-pkg/deb/dpkgpm.cc:366 +#, c-format +msgid "Installed %s" +msgstr "%s е инсталиран" + +#: apt-pkg/deb/dpkgpm.cc:371 +#, c-format +msgid "Preparing for removal of %s" +msgstr "Подготвяне за премахване на %s" + +#: apt-pkg/deb/dpkgpm.cc:372 +#, c-format +msgid "Removing %s" +msgstr "Премахване на %s" + +#: apt-pkg/deb/dpkgpm.cc:373 +#, c-format +msgid "Removed %s" +msgstr "%s е премахнат" + +#: apt-pkg/deb/dpkgpm.cc:378 +#, c-format +msgid "Preparing for remove with config %s" +msgstr "Подготвяне на %s за премахване с конфигурационните файлове" + +#: apt-pkg/deb/dpkgpm.cc:379 +#, c-format +msgid "Removed with config %s" +msgstr "%s е премахнат с конфигурационните файлове" + +#: methods/rsh.cc:330 +msgid "Connection closed prematurely" +msgstr "Връзката прекъсна преждевременно" @@ -1,13 +1,13 @@ # Czech translation of APT # This file is put in the public domain. -# Miroslav Kure <kurem@debian.cz>, 2004-2005. +# Miroslav Kure <kurem@debian.cz>, 2004-2006. # msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 14:01+0100\n" -"PO-Revision-Date: 2005-12-30 15:44+0100\n" +"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"PO-Revision-Date: 2006-05-14 18:36+0200\n" "Last-Translator: Miroslav Kure <kurem@debian.cz>\n" "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -145,14 +145,14 @@ msgstr " Tabulka verzí:" 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 pro %s %s zkompilován na %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" @@ -510,7 +510,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Odlinkovací limit %sB dosažen.\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 "Nemohu vyhodnotit %s" @@ -628,7 +628,7 @@ msgstr "Selhalo přejmenování %s na %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 "Chyba při kompilaci regulárního výrazu - %s" @@ -789,11 +789,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta." msgid "Internal error, Ordering didn't finish" msgstr "Vnitřní chyba, třídění nedoběhlo do konce" -#: 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 "Nemohu zamknout adresář pro stahování" -#: 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 "Nelze přečíst seznam zdrojů." @@ -823,7 +823,7 @@ msgstr "Po rozbalení bude na disku použito dalších %sB.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Po rozbalení bude na disku uvolněno %sB.\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 "Nemohu určit volné místo v %s" @@ -860,7 +860,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [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 "Selhalo stažení %s %s\n" @@ -869,7 +869,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: 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 "Stahování dokončeno v režimu pouze stáhnout" @@ -970,7 +970,7 @@ msgstr "Vybraná verze %s (%s) pro %s\n" msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" @@ -986,21 +986,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: 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 "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pozn: vybírám %s pro regulární výraz '%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 "Pro opravení následujících můžete spustit `apt-get -f install':" -#: 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)." @@ -1008,7 +1008,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit 'apt-get -f install' bez balíků (nebo " "navrhněte řešení)." -#: 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" @@ -1019,7 +1019,7 @@ msgstr "" "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n" "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty." -#: 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" @@ -1029,128 +1029,128 @@ msgstr "" "balík není instalovatelný a měl byste o tom zaslat hlášení o chybě\n" "(bug report)." -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: 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 "Selhalo" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Hotovo" -#: 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 "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty" -#: 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 "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:1959 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1950 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" +msgstr "Přeskakuji dříve stažený soubor '%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 "Na %s nemáte dostatek volného místa" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení '%s' selhal.\n" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Zkontrolujte, zda je nainstalován balíček 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení '%s' selhal.\n" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti " "pro sestavení" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\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 " "found" msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen" -#: 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 " @@ -1159,31 +1159,31 @@ msgstr "" "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku " "%s, která odpovídá požadavku na verzi" -#: 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 "" "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový" -#: cmdline/apt-get.cc:2333 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Selhalo splnění %s závislosti pro %s: %s" -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Závislosti pro sestavení %s nemohly být splněny." -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Podporované moduly:" -#: 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" @@ -1452,7 +1452,7 @@ msgstr "Rozbaluji %s vícekrát" #: apt-inst/extract.cc:137 #, c-format msgid "The directory %s is diverted" -msgstr "Adresář %s je divertován" +msgstr "Adresář %s je odkloněn" #: apt-inst/extract.cc:147 #, c-format @@ -1534,7 +1534,7 @@ msgstr "Nepodařilo se změnit na admin adresář %sinfo" msgid "Internal error getting a package name" msgstr "Vnitřní chyba při získávání jména balíku" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Čtu výpis souborů" @@ -1581,10 +1581,6 @@ msgstr "Vnitřní chyba při přidávání diverze" msgid "The pkg cache must be initialized first" msgstr "Cache balíků se musí nejprve inicializovat" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Čtu seznam souborů" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1657,12 +1653,12 @@ msgstr "Disk nebyl nalezen." msgid "File not found" msgstr "Soubor nebyl nalezen" -#: 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 "Selhalo vyhodnocení" -#: 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 "Nelze nastavit čas modifikace" @@ -1813,7 +1809,7 @@ msgstr "Přenos dat selhal, server řekl '%s'" msgid "Query" msgstr "Dotaz" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Nemohu vyvolat " @@ -1842,69 +1838,71 @@ msgstr "Nemohu navázat spojení na %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Nemohu se připojit k %s:%s (%s), čas spojení vypršel" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Nemohu se připojit k %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 "Připojuji se k %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nemohu zjistit '%s'" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné selhání při zjišťování '%s'" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Něco hodně ošklivého se přihodilo při zjišťování '%s:%s' (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Nemohu se připojit k %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nemohu přistoupit ke klíčence: '%s'" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "Nemohu spustit " - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr " pro ověření podpisu (je gnupg nainstalováno?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "" +"Nepodařilo se spustit '%s' pro ověření podpisu (je gnupg nainstalováno?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\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" @@ -2283,12 +2281,12 @@ msgstr "Kandidátské verze" msgid "Dependency generation" msgstr "Generování závislostí" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nelze zpracovat soubor %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" @@ -2387,11 +2385,18 @@ msgstr "Adresář seznamů %spartial chybí." msgid "Archive directory %spartial is missing." msgstr "Archivní adresář %spartial chybí." -#: 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)" +msgid "Retrieving file %li of %li (%s remaining)" msgstr "Stahuji soubor %li z %li (%s zbývá)" +#: apt-pkg/acquire.cc:825 +#, c-format +msgid "Retrieving file %li of %li" +msgstr "Stahuji soubor %li z %li" + #: apt-pkg/acquire-worker.cc:113 #, c-format msgid "The method driver %s could not be found." @@ -2533,15 +2538,15 @@ msgstr "Chyba IO při ukládání zdrojové cache" msgid "rename failed, %s (%s -> %s)." msgstr "přejmenování selhalo, %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 "Neshoda MD5 součtů" -#: 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 "" +msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n" -#: 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 " @@ -2550,7 +2555,7 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že " "tento balík je třeba opravit ručně (kvůli chybějící architektuře)" -#: 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 " @@ -2559,14 +2564,14 @@ msgstr "" "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík " "opravit ručně." -#: 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 "" "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s." -#: apt-pkg/acquire-item.cc:940 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2712,14 +2717,26 @@ msgstr "Odstraněn %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "Připravuji odstranění %s včetně konfiguračních souborů" +msgid "Preparing to completely remove %s" +msgstr "Připravuji úplné odstranění %s" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "Odstraněn %s včetně konfiguračního souboru" +msgid "Completely removed %s" +msgstr "Kompletně odstraněn %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojení bylo předčasně ukončeno" + +#~ msgid "Reading file list" +#~ msgstr "Čtu seznam souborů" + +#~ msgid "Could not execute " +#~ msgstr "Nemohu spustit " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Připravuji odstranění %s včetně konfiguračních souborů" + +#~ msgid "Removed with config %s" +#~ msgstr "Odstraněn %s včetně konfiguračního souboru" @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 14:06+0100\n" -"PO-Revision-Date: 2006-01-21 13:33+0100\n" +"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"PO-Revision-Date: 2006-05-11 18:09+0200\n" "Last-Translator: Jacobo Tarrío <jtarrio@debian.org>\n" "Language-Team: Galician <trasno@ceu.fi.udc.es>\n" "MIME-Version: 1.0\n" @@ -147,14 +147,14 @@ msgstr " Táboa de versións:" 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 para %s %s compilado en %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" @@ -523,7 +523,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzouse o límite de desligado de %sB.\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 "Non se atopou %s" @@ -641,7 +641,7 @@ msgstr "Non se puido cambiar o nome de %s a %s" msgid "Y" msgstr "S" -#: 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 "Erro na compilación da expresión regular - %s" @@ -802,11 +802,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, a ordeación non rematou" -#: 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 "Non se puido bloquear o directorio de descargas" -#: 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 "Non se puido ler a lista de orixes." @@ -836,7 +836,7 @@ msgstr "Despois de desempaquetar hanse ocupar %sB de disco adicionais.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Despois de desempaquetar hanse liberar %sB de disco.\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 "Non se puido determinar o espazo libre en %s" @@ -873,7 +873,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/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 "Non se puido obter %s %s\n" @@ -882,7 +882,7 @@ msgstr "Non se puido obter %s %s\n" msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: 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 "Completouse a descarga no modo de só descargas" @@ -985,7 +985,7 @@ msgstr "Escolleuse a versión %s (%s) de %s\n" msgid "The update command takes no arguments" msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" @@ -1001,21 +1001,21 @@ msgstr "" msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" -#: 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 "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escóllese %s para a expresión regular \"%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 "Pode querer executar \"apt-get -f install\" corrixir isto:" -#: 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)." @@ -1023,7 +1023,7 @@ msgstr "" "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." -#: 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" @@ -1034,7 +1034,7 @@ msgstr "" "unha situación imposible ou, se emprega a distribución inestable, que\n" "algúns paquetes solicitados aínda non se crearon ou moveron de 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" @@ -1043,122 +1043,122 @@ msgstr "" "Xa que só solicitou unha soa operación, é bastante probable que o\n" "paquete non sea instalable e que se deba informar dun erro no paquete." -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" msgstr "A seguinte información pode axudar a resolver a situación:" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: 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 "Fallou" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Rematado" -#: 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 "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Ten que especificar alomenos un paquete para lle descargar o código fonte" -#: 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 "Non se puido atopar un paquete fonte para %s" -#: cmdline/apt-get.cc:1959 +#: cmdline/apt-get.cc:1950 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%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 "Non hai espazo libre de abondo en %s" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai que recibir %sB de arquivos de fonte.\n" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Ten que especificar alomenos un paquete para lle comprobar as dependencias " "de compilación" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Non se puido obter a información de dependencias de compilación de %s" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\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 " @@ -1167,7 +1167,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: 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 " @@ -1176,32 +1176,32 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión " "dispoñible do paquete %s satisfai os requirimentos de versión" -#: 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 "" "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é " "novo de máis" -#: cmdline/apt-get.cc:2333 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s" -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Non se puideron satisfacer as dependencias de compilación de %s." -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Módulos soportados:" -#: 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" @@ -1558,7 +1558,7 @@ msgstr "Non se puido cambiar ao directorio de administración %sinfo" msgid "Internal error getting a package name" msgstr "Erro interno ao obter un nome de paquete" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "A ler a lista de ficheiros" @@ -1604,10 +1604,6 @@ msgstr "Erro interno ao engadir un desvío" msgid "The pkg cache must be initialized first" msgstr "Ten que se inicializar a caché de paquetes primeiro" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "A ler a lista de paquetes" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" @@ -1680,12 +1676,12 @@ msgstr "Non se atopou o disco" msgid "File not found" msgstr "Non se atopou o ficheiro" -#: 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 "Non se atopou" -#: 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 "Non se puido estabrecer a hora de modificación" @@ -1837,7 +1833,7 @@ msgstr "A transferencia de datos fallou, o servidor dixo \"%s\"" msgid "Query" msgstr "Petición" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Non se puido chamar a " @@ -1866,72 +1862,75 @@ msgstr "Non se pode iniciar a conexión a %s:%s (%s)." msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Non se puido conectar a %s:%s (%s), a conexión esgotou o tempo" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." msgstr "Non se puido conectar a %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 "A conectar a %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Non se puido resolver \"%s\"" -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal ao resolver \"%s\"" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" msgstr "Non se pode conectar a %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Non se puido acceder ao chaveiro: \"%s\"" + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non se puido determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." msgstr "Atopouse alomenos unha sinatura non válida." -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -msgid "Could not execute " -msgstr "Non se puido executar " - -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr " para verificar a sinatura (¿está gnupg instalado?)" +#: methods/gpgv.cc:207 +#, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr "" +"Non se puido executar \"%s\" para verificar a sinatura (¿está gnupg " +"instalado?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" msgstr "Erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran válidas:\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" @@ -2310,12 +2309,12 @@ msgstr "Versións candidatas" msgid "Dependency generation" msgstr "Xeración de dependencias" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Non se pode analizar o ficheiro de paquetes %s (2)" @@ -2415,10 +2414,17 @@ msgstr "O directorio de listas %spartial falla." msgid "Archive directory %spartial is missing." msgstr "O directorio de arquivos %spartial falla." -#: apt-pkg/acquire.cc:821 +#. only show the ETA if it makes sense +#. two days +#: apt-pkg/acquire.cc:823 +#, c-format +msgid "Retrieving file %li of %li (%s remaining)" +msgstr "A obter o ficheiro %li de %li (fallan %s)" + +#: apt-pkg/acquire.cc:825 #, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "A descargar o ficheiro %li de %li (fallan %s)" +msgid "Retrieving file %li of %li" +msgstr "A obter o ficheiro %li de %li" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2562,16 +2568,16 @@ msgstr "Erro de E/S ao gravar a caché de fontes" msgid "rename failed, %s (%s -> %s)." msgstr "fallou o cambio de nome, %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 "Os MD5Sum non coinciden" -#: 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 "" "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n" -#: 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 " @@ -2580,7 +2586,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man. (Falla a arquitectura)" -#: 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 " @@ -2589,7 +2595,7 @@ msgstr "" "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que " "ten que arranxar este paquete a man." -#: 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." @@ -2597,7 +2603,7 @@ msgstr "" "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo " "Filename: para o paquete %s." -#: apt-pkg/acquire-item.cc:940 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -2745,15 +2751,26 @@ msgstr "Eliminouse %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format -msgid "Preparing for remove with config %s" -msgstr "A se preparar para a eliminación con config %s" +msgid "Preparing to completely remove %s" +msgstr "A se preparar para eliminar %s completamente" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format -msgid "Removed with config %s" -msgstr "Eliminouse con config %s" +msgid "Completely removed %s" +msgstr "Eliminouse %s completamente" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "A conexión pechouse prematuramente" +#~ msgid "Reading file list" +#~ msgstr "A ler a lista de paquetes" + +#~ msgid "Could not execute " +#~ msgstr "Non se puido executar " + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "A se preparar para a eliminación con config %s" + +#~ msgid "Removed with config %s" +#~ msgstr "Eliminouse con config %s" @@ -1,21 +1,21 @@ -# Advanced Package Transfer - APT message translation catalog -# Hungarian messages -# PASZTOR Gyorgy <pasztor@linux.gyakg.u-szeged.hu>, 2002. -# Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005. -# +# Advanced Package Transfer - APT message translation catalog
+# Hungarian messages
+# PASZTOR Gyorgy <pasztor@linux.gyakg.u-szeged.hu>, 2002.
+# Gabor Kelemen <kelemeng@gnome.hu>, 2004, 2005.
+#
msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 14:01+0100\n" -"PO-Revision-Date: 2005-02-15 18:03+0100\n" -"Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" +"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"PO-Revision-Date: 2006-04-30 06:14+0100\n" +"Last-Translator: SZERVÑC Attila <sas@321.hu>\n" "Language-Team: Hungarian <gnome@gnome.hu>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.3.1\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=1; plural=0;\n" #: cmdline/apt-cache.cc:135 #, c-format @@ -27,7 +27,7 @@ msgstr "%s csomag %s verziójának teljesítetlen függősége van:\n" #: cmdline/apt-cache.cc:1508 #, c-format msgid "Unable to locate package %s" -msgstr "%s csomag nem található" +msgstr "Az alábbi csomag nem található: %s" #: cmdline/apt-cache.cc:232 msgid "Total package names : " @@ -149,14 +149,14 @@ msgstr " Verziótáblázat:" 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 ehhez: %s %s fordítás ideje: %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" @@ -232,19 +232,15 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Adj egy nevet e lemezhez, mint például 'Debian 2.1r1 Disk 1'" #: cmdline/apt-cdrom.cc:93 -#, fuzzy msgid "Please insert a Disc in the drive and press enter" -msgstr "" -"Kérlek tedd be a(z)\n" -" %s\n" -"címkéjű lemezt a(z) %s meghajtóba és üss entert\n" +msgstr "Tégy be egy lemezt a meghajtóba és üss enter-t" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "Ismételd meg e folyamatot készleted többi CD-jével is." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -485,7 +481,7 @@ msgstr "H: Hibás a fájl " #: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" -msgstr "Nem sikerült feloldani a következőt: %s" +msgstr "Nem sikerült feloldani ezt: %s" #: ftparchive/writer.cc:163 msgid "Tree walking failed" @@ -522,7 +518,7 @@ msgid " DeLink limit of %sB hit.\n" msgstr " DeLink elérte %sB korlátját.\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 "%s elérése sikertelen" @@ -629,25 +625,25 @@ msgstr "Olvasási hiba az MD5 kiszámításakor" #: ftparchive/multicompress.cc:475 #, c-format msgid "Problem unlinking %s" -msgstr "Probléma %s unlinkelésekor" +msgstr "Hiba %s elláncolásakor" #: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" -msgstr "Nem sikerült átnevezni a következőt: %s erre: %s" +msgstr "Nem sikerült átnevezni %s-t erre: %s" #: cmdline/apt-get.cc:120 msgid "Y" msgstr "I" -#: 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 fordítási hiba - %s" #: cmdline/apt-get.cc:237 msgid "The following packages have unmet dependencies:" -msgstr "A következő csomagoknak teljesítetlen függőségei vannak:" +msgstr "Az alábbi csomagoknak teljesítetlen függőségei vannak:" #: cmdline/apt-get.cc:327 #, c-format @@ -681,27 +677,27 @@ msgstr " vagy" #: cmdline/apt-get.cc:375 msgid "The following NEW packages will be installed:" -msgstr "A következő ÚJ csomagok lesznek telepítve:" +msgstr "Az alábbi ÚJ csomagok lesznek telepítve:" #: cmdline/apt-get.cc:401 msgid "The following packages will be REMOVED:" -msgstr "A következő csomagok el lesznek TÁVOLÍTVA:" +msgstr "Az alábbi csomagok el lesznek TÁVOLÍTVA:" #: cmdline/apt-get.cc:423 msgid "The following packages have been kept back:" -msgstr "A következő csomagok vissza lesznek tartva:" +msgstr "Az alábbi csomagok vissza lesznek tartva:" #: cmdline/apt-get.cc:444 msgid "The following packages will be upgraded:" -msgstr "A következő csomagok frissítve lesznek:" +msgstr "Az alábbi csomagok frissítve lesznek:" #: cmdline/apt-get.cc:465 msgid "The following packages will be DOWNGRADED:" -msgstr "A következő csomagok VISSZA lesznek fejlesztve:" +msgstr "Az alábbi csomagok ÖREGBÍTÉSRE kerülnek:" #: cmdline/apt-get.cc:485 msgid "The following held packages will be changed:" -msgstr "A következő visszatartott csomagok fel lesznek váltva:" +msgstr "Az alábbi visszafogott csomagokat cserélem:" #: cmdline/apt-get.cc:538 #, c-format @@ -709,38 +705,37 @@ msgid "%s (due to %s) " msgstr "%s (%s miatt) " #: cmdline/apt-get.cc:546 -#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"FIGYELEM: A következő alapvető csomagok kerülnek eltávolításra\n" -"Ezt nem kellene megtenni, kivéve ha pontosan tudod mit csinálsz!" +"FIGYELEM: Az alábbi alapvető csomagok lesznek eltávolítva\n" +"NE tedd ezt, míg nem tudod pontosan, mit csinálsz!" #: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu csomag frissítve lesz, %lu új csomag lesz telepítve, " +msgstr "%lu frissített, %lu újonnan telepített, " #: cmdline/apt-get.cc:581 #, c-format msgid "%lu reinstalled, " -msgstr "%lu újra lesz telepítve, " +msgstr "%lu újratelepítendő, " #: cmdline/apt-get.cc:583 #, c-format msgid "%lu downgraded, " -msgstr "%lu vissza lesz fejlesztve, " +msgstr "%lu kerül öregbítésre, " #: cmdline/apt-get.cc:585 #, c-format msgid "%lu to remove and %lu not upgraded.\n" -msgstr "%lu el lesz távolítva és %lu nem lesz frissítve.\n" +msgstr "%lu eltávolítandó és %lu nem frissített.\n" #: cmdline/apt-get.cc:589 #, c-format msgid "%lu not fully installed or removed.\n" -msgstr "%lu csomag nincs teljesen telepítve vagy eltávolítva.\n" +msgstr "%lu nincs teljesen telepítve/eltávolítva.\n" #: cmdline/apt-get.cc:649 msgid "Correcting dependencies..." @@ -772,15 +767,15 @@ msgstr "Teljesítetlen függőségek. Próbáld a -f használatával." #: cmdline/apt-get.cc:689 msgid "WARNING: The following packages cannot be authenticated!" -msgstr "FIGYELMEZTETÉS: A következő csomagok nem hitelesíthetőek!" +msgstr "FIGYELEM: Az alábbi csomagok nem hitelesíthetők!" #: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "A hitelesítési figyelmeztetést átléptem.\n" #: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " -msgstr "Telepíti ezeket a csomagokat ellnőrzés nélkül (y/N)? " +msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (y/N)? " #: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" @@ -792,59 +787,58 @@ msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" #: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Belső hiba, az InstallPackages törött csomagokkal lett meghívva!" #: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyezett." #: cmdline/apt-get.cc:775 -#, fuzzy msgid "Internal error, Ordering didn't finish" -msgstr "Belső hiba egy eltérítés hozzáadásakor" +msgstr "Belső hiba, a rendezés nem zárult" -#: 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 "Nem tudom zárolni a letöltési könyvtárat" -#: 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 "A források listája olvashatatlan." #: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "Ez durva... A méretek nem egyeznek, írj ide:apt@packages.debian.org" #: cmdline/apt-get.cc:821 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Az archívumokból %sB/%sB-t kell letölteni.\n" +msgstr "Letöltendő az archívumokból: %sB/%sB\n" #: cmdline/apt-get.cc:824 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "%sB-t kell letölteni az archívumokból.\n" +msgstr "Letöltés az archívumokból: %sB\n" #: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Kicsomagolás után %sB lemezterület lesz felhasználva.\n" +msgstr "Kicsomagolás után %sB lemezterületet használok fel\n" #: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Kicsomagolás után %sB lemezterület kerül felszabadításra.\n" +msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 -#, fuzzy, c-format +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Nincs elég szabad hely itt: %s" +msgstr "Nem határozható meg a szabad hely itt: %s" #: cmdline/apt-get.cc:849 #, c-format msgid "You don't have enough free space in %s." -msgstr "Nincs elég szabad hely itt: %s." +msgstr "Nincs elég szabad hely itt: %s." #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." @@ -855,14 +849,14 @@ msgid "Yes, do as I say!" msgstr "Igen, tedd amit mondok!" #: cmdline/apt-get.cc:868 -#, fuzzy, c-format +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Ártalmasnak tűnő műveletet készülsz végrehajtani\n" -"A folytatáshoz írd be a következő kifejezést '%s'\n" +"Ártalmasnak tűnő műveletet készülsz végrehajtani.\n" +"A folytatáshoz írd be ezt: '%s'\n" " ?] " #: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 @@ -873,16 +867,16 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [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 "Nem sikerült letölteni a következőt: %s %s\n" +msgstr "Sikertelen letöltés: %s %s\n" #: cmdline/apt-get.cc:979 msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: 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 "A letöltés befejeződött a 'csak letöltés' módban" @@ -891,12 +885,12 @@ msgid "" "Unable to fetch some archives, maybe run apt-get update or try with --fix-" "missing?" msgstr "" -"Nem lehet letölteni néhány archívot, talán próbáld az apt-get update -et " -"vagy a --fix-missing -et." +"Nem lehet letölteni néhány archívumot.\n" +" Próbáld ki az apt-get update -et vagy a --fix-missing -et." #: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" -msgstr "--fix-missing és a média csere még nem támogatott" +msgstr "--fix-missing és média csere jelenleg nem támogatott" #: cmdline/apt-get.cc:995 msgid "Unable to correct missing packages." @@ -919,12 +913,12 @@ msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítv #: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "A(z) %s csomag nincs telepítve, így nem távolítható el\n" +msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n" #: cmdline/apt-get.cc:1069 #, c-format msgid "Package %s is a virtual package provided by:\n" -msgstr "A(z) %s egy virtuális csomag, amit a következő szolgáltat:\n" +msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n" #: cmdline/apt-get.cc:1081 msgid " [Installed]" @@ -932,7 +926,7 @@ msgstr " [Telepítve]" #: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "Egyet határozottan ki kell választanod telepítésre." +msgstr "Egyet név szerint ki kell jelölnöd a telepítésre." #: cmdline/apt-get.cc:1091 #, c-format @@ -941,18 +935,17 @@ msgid "" "This may mean that the package is missing, has been obsoleted, or\n" "is only available from another source\n" msgstr "" -"A(z) %s csomagnak nincs elérhető verziója, de egy másik csomag\n" -"hivatkozik rá. Ez azt jelentheti, hogy a csomag hiányzik, elavult,\n" -"vagy csak más forrásból érhető el\n" +"%s csomag nem elérhető, de egy másikhivatkozik rá\n" +".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n" #: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" -msgstr "Azonban a következő csomagok felváltják:" +msgstr "De az alábbi csomagok felváltják:" #: cmdline/apt-get.cc:1113 #, c-format msgid "Package %s has no installation candidate" -msgstr "A(z) %s csomagnak nincs jelöltje a telepítéshez" +msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata" #: cmdline/apt-get.cc:1133 #, c-format @@ -983,7 +976,7 @@ msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1326 cmdline/apt-get.cc:1420 +#: cmdline/apt-get.cc:1326 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" @@ -992,29 +985,28 @@ msgid "" "Some index files failed to download, they have been ignored, or old ones " "used instead." msgstr "" -"Néhány index fájlt nem sikerült letölteni, ezek mellőzve lesznek, vagy a " -"régi változatuk lesz használva." +"Néhány index fájl letöltése meghiúsult, ezeket mellőzöm vagy régi " +"változatukat használom." #: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: 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 "Nem található a(z) %s csomag" +msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1516 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\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 "" -"A következők kijavításához próbáld futtatni az 'apt-get -f install'-t :" +msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:" -#: 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)." @@ -1022,7 +1014,7 @@ msgstr "" "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül " "(vagy telepítsd a függőségeket is!)." -#: 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" @@ -1034,7 +1026,7 @@ msgstr "" "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n" "lett mozdítva az Incoming-ból." -#: 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" @@ -1044,123 +1036,122 @@ msgstr "" "hogy a csomag egyszerűen nem telepíthető és egy hibajelentést kellene\n" "kitölteni a csomaghoz." -#: cmdline/apt-get.cc:1583 +#: cmdline/apt-get.cc:1574 msgid "The following information may help to resolve the situation:" -msgstr "A következő információ talán segít megoldani a helyzetet:" +msgstr "Az alábbi információ segíthet megoldani a helyzetet:" -#: cmdline/apt-get.cc:1586 +#: cmdline/apt-get.cc:1577 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1603 msgid "The following extra packages will be installed:" -msgstr "A következő extra csomagok kerülnek telepítésre:" +msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1683 +#: cmdline/apt-get.cc:1674 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1684 +#: cmdline/apt-get.cc:1675 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1704 +#: cmdline/apt-get.cc:1695 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: 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 "Sikertelen" -#: cmdline/apt-get.cc:1712 +#: cmdline/apt-get.cc:1703 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 -#, fuzzy +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Belső hiba, AllUpgrade megsértett valamit" +msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:1885 +#: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" msgstr "" "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: 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 "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:1959 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1950 +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" +msgstr "A már letöltött '%s' fájl kihagyása\n" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:1974 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:1988 +#: cmdline/apt-get.cc:1979 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB/%sB forrásarchívot kell letölteni.\n" -#: cmdline/apt-get.cc:1991 +#: cmdline/apt-get.cc:1982 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB forrásarchívumot kell letölteni.\n" -#: cmdline/apt-get.cc:1997 +#: cmdline/apt-get.cc:1988 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2028 +#: cmdline/apt-get.cc:2019 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2056 +#: cmdline/apt-get.cc:2047 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n" -#: cmdline/apt-get.cc:2068 +#: cmdline/apt-get.cc:2059 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2069 +#: cmdline/apt-get.cc:2060 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n" -#: cmdline/apt-get.cc:2086 +#: cmdline/apt-get.cc:2077 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:2096 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2121 +#: cmdline/apt-get.cc:2112 msgid "Must specify at least one package to check builddeps for" msgstr "" "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni " "kell" -#: cmdline/apt-get.cc:2149 +#: cmdline/apt-get.cc:2140 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nem lehet %s fordítási-függőség információját beszerezni" -#: cmdline/apt-get.cc:2169 +#: cmdline/apt-get.cc:2160 #, c-format msgid "%s has no build depends.\n" msgstr "Nincs fordítási függősége a következőnek: %s.\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 " @@ -1169,7 +1160,7 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem " "található" -#: 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 " @@ -1178,32 +1169,32 @@ msgstr "" "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a " "verziókövetelményt kielégítő elérhető verziója." -#: 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 "" "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl " "friss." -#: cmdline/apt-get.cc:2333 +#: cmdline/apt-get.cc:2324 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s " -#: cmdline/apt-get.cc:2347 +#: cmdline/apt-get.cc:2338 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s építési függőségei nem elégíthetőek ki." -#: cmdline/apt-get.cc:2351 +#: cmdline/apt-get.cc:2342 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2383 +#: cmdline/apt-get.cc:2374 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: 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" @@ -1371,8 +1362,7 @@ msgstr "vagy hiányzó függőségek miatti hibákat. Ez így OK, csak az ezen #: dselect/install:103 msgid "" "above this message are important. Please fix them and run [I]nstall again" -msgstr "" -"előtti hibák fontosak. Kérem javítsa azokat és futtassa az [I]nstallt újra" +msgstr "előtti hibák fontosak. Javítsd azokat és futtasd az [I]nstallt újra" #: dselect/update:30 msgid "Merging available information" @@ -1405,11 +1395,11 @@ msgstr "Érvénytelen archívum-aláírás" #: apt-inst/contrib/arfile.cc:81 msgid "Error reading archive member header" -msgstr "Hiba az archívtag-fejléc olvasásakor" +msgstr "Hiba az archívum tag fejléc olvasásakor" #: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" -msgstr "Érvénytelen archívtag-fejléc" +msgstr "Érvénytelen archívum tag fejléc" #: apt-inst/contrib/arfile.cc:131 msgid "Archive is too short" @@ -1421,7 +1411,7 @@ msgstr "Nem sikerült olvasni az archívum fejléceket" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" -msgstr "DropNode hívása egy még mindig kapcsolódó node-ra történt" +msgstr "DropNode hívása egy még mindig láncolt node-ra történt" #: apt-inst/filelist.cc:416 msgid "Failed to locate the hash element!" @@ -1451,9 +1441,9 @@ msgid "Duplicate conf file %s/%s" msgstr "Dupla %s/%s konfigurációs fájl" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Nem sikerült a(z) %s fájlba írni" +msgstr "%s fájl írása sikertelen" #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format @@ -1512,7 +1502,7 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" #: apt-pkg/acquire.cc:421 apt-pkg/clean.cc:38 #, c-format msgid "Unable to read %s" -msgstr "A(z) %s nem olvasható" +msgstr "%s nem olvasható" #: apt-inst/extract.cc:494 #, c-format @@ -1555,7 +1545,7 @@ msgstr "Nem sikerült a(z) %sinfo admin könyvtárba váltani" msgid "Internal error getting a package name" msgstr "Belső hiba a csomagnév elhozásakor" -#: apt-inst/deb/dpkgdb.cc:205 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Fájllista olvasása" @@ -1602,19 +1592,15 @@ msgstr "Belső hiba egy eltérítés hozzáadásakor" msgid "The pkg cache must be initialized first" msgstr "A csomag gyorsítótárnak előbb kell inicializálva lennie" -#: apt-inst/deb/dpkgdb.cc:386 -msgid "Reading file list" -msgstr "Fájllista olvasása" - #: apt-inst/deb/dpkgdb.cc:443 #, c-format msgid "Failed to find a Package: header, offset %lu" -msgstr "Nem sikerült megtalálni a csomag-fejlécet, offszet %lu" +msgstr "Nem találom a csomag-fejlécet, offszet %lu" #: apt-inst/deb/dpkgdb.cc:465 #, c-format msgid "Bad ConfFile section in the status file. Offset %lu" -msgstr "Hibás ConfFile szekció a státusz fájlban. Offszet %lu" +msgstr "Hibás ConfFile szakasz a státusz fájlban. Offszet %lu" #: apt-inst/deb/dpkgdb.cc:470 #, c-format @@ -1629,8 +1615,7 @@ msgstr "Ez nem egy érvényes DEB archív, hiányzik a '%s' tag" #: apt-inst/deb/debfile.cc:52 #, c-format msgid "This is not a valid DEB archive, it has no '%s' or '%s' member" -msgstr "" -"Ez nem egy érvényes DEB archív, hiányzik a(z) \"%s\" vagy a(z) \"%s\" tag" +msgstr "Ez nem egy érvényes DEB archív, nincs \"%s\" vagy \"%s\" tagja" #: apt-inst/deb/debfile.cc:112 #, c-format @@ -1669,27 +1654,24 @@ msgstr "Hibás CD" #: methods/cdrom.cc:164 #, c-format msgid "Unable to unmount the CD-ROM in %s, it may still be in use." -msgstr "" -"Nem lehet leválasztani a(z) %s meghajtóban levő CD-ROM-ot, talán még " -"használod." +msgstr "Nem lehet lecsatolni az itt lévő CD-ROM-ot: %s, talán még használod." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Nem találom a fájlt" +msgstr "Nem találom a lemezt" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Nem találom a fájlt" -#: 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 "Nem érhető el" -#: 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 "Nem sikerült beállítani a módosítási időt" +msgstr "A módosítási időt beállítása sikertelen" #: methods/file.cc:44 msgid "Invalid URI, local URIS must not start with //" @@ -1698,7 +1680,7 @@ msgstr "Érvénytelen URI, helyi URIk nem kezdődhetnek //-el" #. Login must be before getpeername otherwise dante won't work. #: methods/ftp.cc:162 msgid "Logging in" -msgstr "Belépés" +msgstr "Bejelentkezés a kiszolgálóra:" #: methods/ftp.cc:168 msgid "Unable to determine the peer name" @@ -1711,17 +1693,17 @@ msgstr "Nem lehet a helyi nevet megállapítani" #: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" -msgstr "A kiszolgáló visszautasította a kapcsolatot, és azt mondta: %s" +msgstr "A kiszolgáló megtagadta a kapcsolatot: %s" #: methods/ftp.cc:210 #, c-format msgid "USER failed, server said: %s" -msgstr "Hibás USER, a kiszolgáló azt mondta: %s" +msgstr "Hibás USER, a kiszolgáló üzenete: %s" #: methods/ftp.cc:217 #, c-format msgid "PASS failed, server said: %s" -msgstr "Hibás PASS, a kiszolgáló azt mondta: %s" +msgstr "Hibás PASS, a kiszolgáló üzenete: %s" #: methods/ftp.cc:237 msgid "" @@ -1734,12 +1716,12 @@ msgstr "" #: methods/ftp.cc:265 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló azt mondta: %s" +msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló üzenete: %s" #: methods/ftp.cc:291 #, c-format msgid "TYPE failed, server said: %s" -msgstr "Hibás TYPE, a kiszolgáló azt mondta: %s" +msgstr "Hibás TYPE, a kiszolgáló üzenete: %s" #: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" @@ -1771,8 +1753,7 @@ msgstr "Nem lehet létrehozni a socket-et" #: methods/ftp.cc:698 msgid "Could not connect data socket, connection timed out" -msgstr "" -"Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időkeretet" +msgstr "Nem lehet kapcsolódni az adat sockethez, a kapcsolat túllépte az időt" #: methods/ftp.cc:704 msgid "Could not connect passive socket." @@ -1806,11 +1787,11 @@ msgstr "Ismeretlen a(z) %u címcsalád (AF_*)" #: methods/ftp.cc:798 #, c-format msgid "EPRT failed, server said: %s" -msgstr "Hibás EPRT, a kiszolgáló azt mondta: %s" +msgstr "Hibás EPRT, a kiszolgáló üzenete: %s" #: methods/ftp.cc:818 msgid "Data socket connect timed out" -msgstr "Az adat sockethez kapcsolódás túllépte az időkeretet" +msgstr "Az adat sockethez kapcsolódás túllépte az időt" #: methods/ftp.cc:825 msgid "Unable to accept connection" @@ -1823,7 +1804,7 @@ msgstr "Probléma a fájl hash értékének meghatározásakor" #: methods/ftp.cc:877 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Nem lehet letölteni a fájlt, a kiszolgáló azt mondta '%s'" +msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: '%s'" #: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" @@ -1832,21 +1813,21 @@ msgstr "Az adat socket túllépte az időt" #: methods/ftp.cc:922 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Adatátvitel sikertelen, a kiszolgáló azt mondta '%s'" +msgstr "Adatátvitel sikertelen, a kiszolgáló üzenete: '%s'" #. Get the files information #: methods/ftp.cc:997 msgid "Query" msgstr "Lekérdezés" -#: methods/ftp.cc:1106 +#: methods/ftp.cc:1109 msgid "Unable to invoke " msgstr "Nem lehet meghívni " #: methods/connect.cc:64 #, c-format msgid "Connecting to %s (%s)" -msgstr "Csatlakozás a következőhöz: %s (%s)" +msgstr "Csatlakozás: %s (%s)" #: methods/connect.cc:71 #, c-format @@ -1856,87 +1837,87 @@ msgstr "[IP: %s %s]" #: methods/connect.cc:80 #, c-format msgid "Could not create a socket for %s (f=%u t=%u p=%u)" -msgstr "socket létrehozása sikertelen a következőhöz: %s (f=%u t=%u p=%u)" +msgstr "socket létrehozása sikertelen ehhez: %s (f=%u t=%u p=%u)" #: methods/connect.cc:86 #, c-format msgid "Cannot initiate the connection to %s:%s (%s)." -msgstr "Kapcsolat létrehozása sikertelen a következőhöz: %s: %s (%s)." +msgstr "Kapcsolat létrehozása sikertelen ehhez: %s: %s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" msgstr "Időtúllépés miatt nem lehet kapcsolódni a következőhöz: %s: %s (%s)" -#: methods/connect.cc:106 +#: methods/connect.cc:108 #, c-format msgid "Could not connect to %s:%s (%s)." -msgstr "Nem lehet kapcsolódni a következőhöz: %s: %s (%s)." +msgstr "Nem lehet ehhez: %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 "Kapcsolódás a következőhöz: %s" +msgstr "Kapcsolódás: %s" -#: methods/connect.cc:165 +#: methods/connect.cc:167 #, c-format msgid "Could not resolve '%s'" msgstr "Nem lehet feloldani a következőt: '%s' " -#: methods/connect.cc:171 +#: methods/connect.cc:173 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Átmeneti hiba '%s' feloldása közben" -#: methods/connect.cc:174 +#: methods/connect.cc:176 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i)" msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)" -#: methods/connect.cc:221 +#: methods/connect.cc:223 #, c-format msgid "Unable to connect to %s %s:" -msgstr "Nem lehet kapcsolódni következőhöz: %s %s:" +msgstr "Sikertelen kapcsolódás ide: %s %s:" -#: methods/gpgv.cc:92 +#: methods/gpgv.cc:64 +#, fuzzy, c-format +msgid "Couldn't access keyring: '%s'" +msgstr "Nem lehet feloldani a következőt: '%s' " + +#: methods/gpgv.cc:99 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek." -#: methods/gpgv.cc:191 +#: methods/gpgv.cc:198 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:196 +#: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." -msgstr "" - -#. FIXME String concatenation considered harmful. -#: methods/gpgv.cc:201 -#, fuzzy -msgid "Could not execute " -msgstr "Nem sikerült zárolni: %s" +msgstr "1 vagy több érvénytelen aláírást találtam." -#: methods/gpgv.cc:202 -msgid " to verify signature (is gnupg installed?)" -msgstr "" +#: methods/gpgv.cc:207 +#, fuzzy, c-format +msgid "Could not execute '%s' to verify signature (is gnupg installed?)" +msgstr " az aláírás igazolásához (a gnupg telepítve van?)" -#: methods/gpgv.cc:206 +#: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:237 -#, fuzzy +#: methods/gpgv.cc:243 msgid "The following signatures were invalid:\n" -msgstr "A következő extra csomagok kerülnek telepítésre:" +msgstr "Az alábbi aláírások érvénytelenek voltak:\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" msgstr "" +"Az alábbi aláírások nem igazolhatók, mert a nyilvános kulcs nem elérhető:\n" #: methods/gzip.cc:57 #, c-format @@ -2015,13 +1996,13 @@ msgstr "Rossz fejlécadat" #: methods/http.cc:1124 msgid "Connection failed" -msgstr "Kapcsolódás sikertelen" +msgstr "Sikertelen kapcsolódás" #: methods/http.cc:1215 msgid "Internal error" msgstr "Belső hiba" -# FIXME +# FIXME
#: apt-pkg/contrib/mmap.cc:82 msgid "Can't mmap an empty file" msgstr "Nem lehet mmap-olni egy üres fájlt" @@ -2136,7 +2117,7 @@ msgstr "%s opció egész és nem %s típusú argumentumot követel meg" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "A(z) %s opció túl hosszú" +msgstr "Túl hosszú %s opció" #: apt-pkg/contrib/cmndline.cc:301 #, c-format @@ -2151,12 +2132,12 @@ msgstr "%s érvénytelen művelet" #: apt-pkg/contrib/cdromutl.cc:55 #, c-format msgid "Unable to stat the mount point %s" -msgstr "%s csatlakoztatási pont nem érhető el" +msgstr "%s csatolási pont nem érhető el" #: apt-pkg/contrib/cdromutl.cc:149 apt-pkg/acquire.cc:427 apt-pkg/clean.cc:44 #, c-format msgid "Unable to change to %s" -msgstr "Nem sikerült a következőre váltani: %s" +msgstr "Nem sikerült ide váltani: %s" #: apt-pkg/contrib/cdromutl.cc:190 msgid "Failed to stat the cdrom" @@ -2219,15 +2200,15 @@ msgstr "írás, még kiírandó %lu de ez nem lehetséges" #: apt-pkg/contrib/fileutl.cc:597 msgid "Problem closing the file" -msgstr "Probléma a fájl bezárásakor" +msgstr "Hiba a fájl bezárásakor" #: apt-pkg/contrib/fileutl.cc:603 msgid "Problem unlinking the file" -msgstr "Probléma a fájl unlinkelésével" +msgstr "Hiba a fájl leválasztásával" #: apt-pkg/contrib/fileutl.cc:614 msgid "Problem syncing the file" -msgstr "Probléma a fájl szinkronizálásakor" +msgstr "Hiba a fájl szinkronizálásakor" #: apt-pkg/pkgcache.cc:126 msgid "Empty package cache" @@ -2308,14 +2289,14 @@ msgstr "Lehetséges verziók" #: apt-pkg/depcache.cc:90 msgid "Dependency generation" -msgstr "Függőséggenerálás" +msgstr "Függőség-generálás" -#: apt-pkg/tagfile.cc:73 +#: apt-pkg/tagfile.cc:72 #, c-format msgid "Unable to parse package file %s (1)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" -#: apt-pkg/tagfile.cc:160 +#: apt-pkg/tagfile.cc:102 #, c-format msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" @@ -2361,9 +2342,9 @@ msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" #: apt-pkg/sourcelist.cc:244 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "A(z) '%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" +msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" #: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format @@ -2390,21 +2371,21 @@ msgstr "A(z) '%s' indexfájltípus nem támogatott" #, c-format msgid "" "The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "A(z) %s csomagot újra kell telepíteni, de nem találok hozzá archívot." +msgstr "" +"A(z) %s csomagot újra kell telepíteni, de nem találok archívumot hozzá." #: apt-pkg/algorithms.cc:1059 msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Hiba, pkgProblemResolver::Resolve sérüléseket generált, ezt visszatartott " +"Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott " "csomagok okozhatják." #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." msgstr "" -"A problémák nem javíthatók, sérült visszatartott csomagok vannak a " -"rendszeren." +"A problémák nem javíthatók, sérült visszafogott csomagok vannak a rendszeren." #: apt-pkg/acquire.cc:62 #, c-format @@ -2416,10 +2397,17 @@ msgstr "%spartial listakönyvtár hiányzik." msgid "Archive directory %spartial is missing." msgstr "%spartial archívumkönyvtár hiányzik." -#: apt-pkg/acquire.cc:821 -#, c-format -msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +#. 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 "Fájlletöltés: %li/%li (%s van hátra)" + +#: apt-pkg/acquire.cc:825 +#, fuzzy, c-format +msgid "Retrieving file %li of %li" +msgstr "Fájllista olvasása" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2432,12 +2420,9 @@ msgid "Method %s did not start correctly" msgstr "A(z) %s metódus nem indult el helyesen" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Kérlek tedd be a(z)\n" -" %s\n" -"címkéjű lemezt a(z) %s meghajtóba és üss entert\n" +msgstr "Tedd be a(z) %s címkéjű lemezt a(z) %s meghajtóba és üss entert" #: apt-pkg/init.cc:120 #, c-format @@ -2446,7 +2431,7 @@ msgstr "A(z) '%s' csomagrendszer nem támogatott" #: apt-pkg/init.cc:136 msgid "Unable to determine a suitable packaging system type" -msgstr "A megfelelő csomagrendszer típusa nem határozható meg" +msgstr "A megfelelő csomagrendszer típus nem határozható meg" #: apt-pkg/clean.cc:61 #, c-format @@ -2455,7 +2440,7 @@ msgstr "%s nem érhető el." #: apt-pkg/srcrecords.cc:48 msgid "You must put some 'source' URIs in your sources.list" -msgstr "Néhány 'source' URI-t bele kell tenned a sources.list fájlodba" +msgstr "Néhány 'source' URI-t be kell tenned a sources.list fájlba" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." @@ -2464,8 +2449,7 @@ msgstr "" #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Próbáld futtatni az apt-get update -et, hogy javítsd ezeket a problémákat" +msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat" #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" @@ -2487,37 +2471,37 @@ msgstr "A gyorsítótárnak inkompatibilis verziórendszere van" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (NewPackage)" +msgstr "Hiba történt %s feldolgozásakor (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage1)" +msgstr "Hiba történt %s feldolgozásakor (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage2)" +msgstr "Hiba történt %s feldolgozásakor (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (NewFileVer1)" +msgstr "Hiba történt %s feldolgozásakor (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion1)" +msgstr "Hiba történt %s feldolgozásakor (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (UsePackage3)" +msgstr "Hiba történt %s feldolgozásakor (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (NewVersion2)" +msgstr "Hiba történt %s feldolgozásakor (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2537,12 +2521,12 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:241 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (FindPkg)" +msgstr "Hiba történt %s feldolgozásakor (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Hiba adódott a(z) %s feldolgozásakor (CollectFileProvides)" +msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format @@ -2555,7 +2539,7 @@ msgstr "" msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" -# FIXME +# FIXME
#: apt-pkg/pkgcachegen.cc:658 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" @@ -2569,40 +2553,40 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor" msgid "rename failed, %s (%s -> %s)." msgstr "sikertelen átnevezés, %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 "Az MD5Sum nem megfelelő" -#: 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 "" +msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n" -#: 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 " "to manually fix this package. (due to missing arch)" msgstr "" -"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " +"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot. (hiányzó arch. miatt)" -#: 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 " "manually fix this package." msgstr "" -"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézileg " +"Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel " "kell kijavítani a csomagot." -#: 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 "" "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz." -#: apt-pkg/acquire-item.cc:940 +#: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2617,8 +2601,8 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"%s CD-ROM csatlakoztatási pont használata\n" -"CD-ROM csatlakoztatása\n" +"%s CD-ROM csatolási pont használata\n" +"CD-ROM csatolása\n" #: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " @@ -2632,7 +2616,7 @@ msgstr "Tárolt címke: %s \n" #: apt-pkg/cdrom.cc:561 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "%s CD-ROM csatlakoztatási pont használata\n" +msgstr "%s CD-ROM csatolási pont használata\n" #: apt-pkg/cdrom.cc:579 msgid "Unmounting CD-ROM\n" @@ -2645,20 +2629,22 @@ msgstr "Várakozás a lemezre...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:591 msgid "Mounting CD-ROM...\n" -msgstr "CD-ROM csatlakoztatása...\n" +msgstr "CD-ROM felcsatolása...\n" #: apt-pkg/cdrom.cc:609 msgid "Scanning disc for index files..\n" msgstr "Indexfájlok keresése a lemezen...\n" #: apt-pkg/cdrom.cc:647 -#, c-format +#, fuzzy, c-format msgid "Found %i package indexes, %i source indexes and %i signatures\n" -msgstr "%i csomagindexet, %i forrásindexet és %i aláírást találtam\n" +msgstr "" +"%i csomagindexet, %i forrásindexet, %i fordításindexet és %i aláírást " +"találtam\n" #: apt-pkg/cdrom.cc:710 msgid "That is not a valid name, try again.\n" -msgstr "Ez a név érvénytelen, próbálja újra.\n" +msgstr "E név érvénytelen, próbáld újra.\n" #: apt-pkg/cdrom.cc:726 #, c-format @@ -2666,7 +2652,7 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Ezen lemez neve: \n" +"E lemez neve: \n" "%s\n" #: apt-pkg/cdrom.cc:730 @@ -2679,7 +2665,7 @@ msgstr "Új forráslista írása\n" #: apt-pkg/cdrom.cc:763 msgid "Source list entries for this disc are:\n" -msgstr "Ezen lemezhez tartozó forráslista-bejegyzések a következők:\n" +msgstr "E lemezhez tartozó forráslista-bejegyzések a következők:\n" #: apt-pkg/cdrom.cc:803 msgid "Unmounting CD-ROM..." @@ -2706,55 +2692,87 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n" msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "%s megnyitása" +msgstr "%s előkészítése" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "%s megnyitása" +msgstr "%s kicsomagolása" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "%s konfigurációs fájl megnyitása" +msgstr "%s konfigurálásának előkészítése" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Kapcsolódás a következőhöz: %s" +msgstr "%s konfigurálása" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Telepítve: " +msgstr "Telepített %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "%s eltávolításának előkészítése" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "%s megnyitása" +msgstr "%s eltávolítása" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Ajánlja" +msgstr "Eltávolított %s" #: apt-pkg/deb/dpkgpm.cc:378 -#, c-format -msgid "Preparing for remove with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Preparing to completely remove %s" +msgstr "%s konfigurálásának előkészítése" #: apt-pkg/deb/dpkgpm.cc:379 -#, c-format -msgid "Removed with config %s" -msgstr "" +#, fuzzy, c-format +msgid "Completely removed %s" +msgstr "%s eltávolítása sikertelen" #: methods/rsh.cc:330 msgid "Connection closed prematurely" -msgstr "A kapcsolat idő előtt befejeződött" +msgstr "A kapcsolat idő előtt lezárult" + +#~ msgid "Total Distinct Descriptions: " +#~ msgstr "Összes külső leírás: " + +#~ msgid "Total Desc/File relations: " +#~ msgstr "Összes Leírás/Fájl kapcsolat: " + +#~ msgid "Reading file list" +#~ msgstr "Fájllista olvasása" + +#~ msgid "Could not execute " +#~ msgstr "Nem futtatható" + +#~ msgid "Error occured while processing %s (NewFileDesc1)" +#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc1)" + +#~ msgid "Error occured while processing %s (NewFileDesc2)" +#~ msgstr "Hiba történt %s feldolgozásakor (NewFileDesc2)" + +#~ msgid "Wow, you exceeded the number of descriptions this APT is capable of." +#~ msgstr "" +#~ "Ez nem semmi, túllépted a csomagleírások számát, amit ez az APT kezelni " +#~ "tud!" + +#~ msgid "Preparing for remove with config %s" +#~ msgstr "Előkészítés eltávolításhoz %s konfigurálásával" + +#~ msgid "Removed with config %s" +#~ msgstr "%s konfigurálásával eltávolítva" + +#~ msgid "Could not patch file" +#~ msgstr "%s fájl foltozása sikertelen" @@ -1,14 +1,13 @@ # Debian-PT translation for apt. # Copyright (C) 2004 Free Software Foundation, Inc. -# Miguel Figueiredo <elmig@debianpt.org>, 2003. -# 2005-03-07 - Miguel Figueiredo <elmig@debianpt.org> - Fxed 1 new fuzzy. +# Miguel Figueiredo <elmig@debianpt.org>, 2005, 2006. msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-01-20 14:01+0100\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" -"Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" +"Last-Translator: Rui Az. <astronomy@mail.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -102,7 +101,7 @@ msgstr "Ficheiros de Pacotes :" #: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "" -"a cache está dessíncronizada, não pode x-referênciar um ficheiro de pacote" +"A cache está dessincronizada, não pode x-referenciar um ficheiro de pacote" #: cmdline/apt-cache.cc:1470 #, c-format @@ -230,17 +229,15 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" msgstr "" +"Por favor forneça um nome para este Disco, tal como 'Debian 2.1r1 Disco 1'" #: cmdline/apt-cdrom.cc:93 -#, fuzzy msgid "Please insert a Disc in the drive and press enter" -msgstr "" -"Troca de mídia: Por favor insira o disco nomeado '%s' no drive '%s' e " -"pressione enter\n" +msgstr "Por favor insira um Disco no leitor e pressione enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "Repita este processo para o resto dos CDs no seu conjunto." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -399,7 +396,7 @@ msgstr "" "árvore de .dscs. A opção --source-override pode ser utilizada para \n" "especificar um ficheiro override de fontes\n" "\n" -"Os comandos 'packages' e 'sources' devem ser executados na raíz da \n" +"Os comandos 'packages' e 'sources' devem ser executados na raiz da \n" "árvore. CaminhoBinário deve apontar para a base de procura recursiva \n" "e o ficheiro override deve conter as flags override. CaminhoPrefixo é \n" "incluído aos campos filename caso esteja presente. Exemplo de uso do \n" @@ -704,14 +701,12 @@ msgid "%s (due to %s) " msgstr "%s (devido a %s) " #: cmdline/apt-get.cc:546 -#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AVISO: Os seguintes pacotes essenciais serão removidos\n" -"Isso NÃO deve ser feito a menos que você saiba exactamente o que está a " -"fazer!" +"AVISO: Os seguintes pacotes essenciais serão removidos.\n" +"Isso NÃO deverá ser feito a menos que saiba exactamente o que está a fazer!" #: cmdline/apt-get.cc:577 #, c-format @@ -772,7 +767,7 @@ msgstr "AVISO: Os seguintes pacotes não podem ser autenticados" #: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Aviso de autenticação ultrapassado.\n" #: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " @@ -780,7 +775,7 @@ msgstr "Instalar estes pacotes sem verificação [y/N]? " #: cmdline/apt-get.cc:702 msgid "Some packages could not be authenticated" -msgstr "Alguns pacotes não poderam ser autenticados" +msgstr "Alguns pacotes não puderam ser autenticados" #: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" @@ -788,16 +783,15 @@ msgstr "Há problemas e -y foi usado sem --force-yes" #: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Erro Interno, InstallPackages foi chamado com pacotes estragados!" #: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." #: cmdline/apt-get.cc:775 -#, fuzzy msgid "Internal error, Ordering didn't finish" -msgstr "Erro Interno ao adicionar um desvio" +msgstr "Erro Interno, Ordering não terminou" #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 msgid "Unable to lock the download directory" @@ -811,6 +805,7 @@ msgstr "A lista de fontes não pôde ser lida." #: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" +"Estranho.. Os tamanhos não coincidiram, escreva para apt@packages.debian.org" #: cmdline/apt-get.cc:821 #, c-format @@ -826,7 +821,7 @@ msgstr "É necessário fazer o download de %sB de arquivos.\n" #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" msgstr "" -"Depois descompactar, %sB adicionais de espaço em disco serão utilizados.\n" +"Depois de descompactar, %sB adicionais de espaço em disco serão utilizados.\n" #: cmdline/apt-get.cc:832 #, c-format @@ -834,9 +829,9 @@ msgid "After unpacking %sB disk space will be freed.\n" msgstr "Depois de descompactar, %sB de espaço em disco serão libertados.\n" #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 -#, fuzzy, c-format +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Desculpe, você não tem espaço suficiente em %s" +msgstr "Impossível de determinar espaço livre em %s" #: cmdline/apt-get.cc:849 #, c-format @@ -852,13 +847,13 @@ msgid "Yes, do as I say!" msgstr "Sim, faça como eu digo!" #: cmdline/apt-get.cc:868 -#, fuzzy, c-format +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Você está prestes a fazer algo potencialmente prejudicial\n" +"Você está prestes a fazer algo potencialmente nocivo.\n" "Para continuar escreva a frase '%s'\n" " ?] " @@ -929,7 +924,7 @@ msgstr " [Instalado]" #: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "Você deve selecionar explicitamente um para instalar." +msgstr "Você deve seleccionar explicitamente um para instalar." #: cmdline/apt-get.cc:1091 #, c-format @@ -944,7 +939,7 @@ msgstr "" #: cmdline/apt-get.cc:1110 msgid "However the following packages replace it:" -msgstr "No entanto, os seguintes pacotes substituem-o:" +msgstr "No entanto, os seguintes pacotes substituem-no:" #: cmdline/apt-get.cc:1113 #, c-format @@ -1029,7 +1024,7 @@ msgid "" msgstr "" "Alguns pacotes não puderam ser instalados. Isso pode significar que\n" "você solicitou uma situação impossível ou se você está a usar a\n" -"distribuição instável, que alguns pacotes requesitados ainda não foram \n" +"distribuição instável, que alguns pacotes requisitados ainda não foram \n" "criados ou foram tirados do Incoming." #: cmdline/apt-get.cc:1578 @@ -1038,7 +1033,7 @@ msgid "" "the package is simply not installable and a bug report against\n" "that package should be filed." msgstr "" -"Já que você requisitou uma única operação é extremamanete provável que o \n" +"Já que você requisitou uma única operação é extremamente provável que o \n" "pacote esteja simplesmente não instalável e deve ser enviado um relatório " "de\n" "bug sobre esse pacote." @@ -1076,9 +1071,8 @@ msgid "Done" msgstr "Pronto" #: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 -#, fuzzy msgid "Internal error, problem resolver broke stuff" -msgstr "Erro Interno, AllUpgrade quebrou as coisas" +msgstr "Erro Interno, o solucionador de problemas estragou coisas" #: cmdline/apt-get.cc:1885 msgid "Must specify at least one package to fetch source for" @@ -1091,10 +1085,9 @@ msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote de código fonte para %s" #: cmdline/apt-get.cc:1959 -#, fuzzy, c-format +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "" -"Saltando a descompactação de pacote código fonte já descompactado em %s\n" +msgstr "Saltando ficheiro do qual já havia sido feito download '%s'\n" #: cmdline/apt-get.cc:1983 #, c-format @@ -1134,7 +1127,7 @@ msgstr "O comando de descompactação '%s' falhou.\n" #: cmdline/apt-get.cc:2069 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" #: cmdline/apt-get.cc:2086 #, c-format @@ -1167,7 +1160,7 @@ msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " +"a dependência de %s por %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" #: cmdline/apt-get.cc:2273 @@ -1177,7 +1170,7 @@ msgid "" "package %s can satisfy version requirements" msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " -"disponível do pacote %s pode satisfazer os requesitos de versão" +"disponível do pacote %s pode satisfazer os requisitos de versão" #: cmdline/apt-get.cc:2308 #, c-format @@ -1424,7 +1417,7 @@ msgstr "Arquivo é demasiado pequeno" #: apt-inst/contrib/arfile.cc:135 msgid "Failed to read the archive headers" -msgstr "Falha ao ler os cabeçahos do arquivo" +msgstr "Falha ao ler os cabeçalhos do arquivo" #: apt-inst/filelist.cc:384 msgid "DropNode called on still linked node" @@ -1445,7 +1438,7 @@ msgstr "Erro Interno em AddDiversion" #: apt-inst/filelist.cc:481 #, c-format msgid "Trying to overwrite a diversion, %s -> %s and %s/%s" -msgstr "Tentando sobreescrever um desvio, %s -> %s e %s/%s" +msgstr "Tentando sobrescrever um desvio, %s -> %s e %s/%s" #: apt-inst/filelist.cc:510 #, c-format @@ -1458,7 +1451,7 @@ msgid "Duplicate conf file %s/%s" msgstr "Arquivo de configuração duplicado %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" msgstr "Falha ao escrever ficheiro %s" @@ -1494,7 +1487,7 @@ msgstr "O caminho de desvio é muito longo" #: apt-inst/extract.cc:243 #, c-format msgid "The directory %s is being replaced by a non-directory" -msgstr "O directório %s está sendo substituído por um não-diretório" +msgstr "O directório %s está sendo substituído por um não-directório" #: apt-inst/extract.cc:283 msgid "Failed to locate node in its hash bucket" @@ -1512,7 +1505,7 @@ msgstr "Sobreescrita de pacote não coincide com nenhuma versão para %s" #: apt-inst/extract.cc:434 #, c-format msgid "File %s/%s overwrites the one in the package %s" -msgstr "Ficheiro %s/%s sobreescreve o que está no pacote %s" +msgstr "Ficheiro %s/%s sobrescreve o que está no pacote %s" #: apt-inst/extract.cc:467 apt-pkg/contrib/configuration.cc:750 #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/sourcelist.cc:324 @@ -1678,9 +1671,8 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Impossível desmontar o CD-ROM em %s, o mesmo ainda pode estar em uso." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Arquivo não encontrado" +msgstr "Disco não encontrado" #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" @@ -1869,7 +1861,7 @@ msgstr "Não posso iniciar a ligação para %s:%s (%s)." #: methods/connect.cc:93 #, c-format msgid "Could not connect to %s:%s (%s), connection timed out" -msgstr "Não foi possível ligarar em %s:%s (%s), a conexão expirou" +msgstr "Não foi possível ligar a %s:%s (%s), a conexão expirou" #: methods/connect.cc:106 #, c-format @@ -1905,41 +1897,43 @@ msgstr "Impossível ligar a %s %s:" #: methods/gpgv.cc:92 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair." #: methods/gpgv.cc:191 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" +"Erro interno: Assinatura válida, mas não foi possível determinar a impressão " +"digital da chave?!" #: methods/gpgv.cc:196 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Pelo menos uma assinatura inválida foi encontrada." #. FIXME String concatenation considered harmful. #: methods/gpgv.cc:201 -#, fuzzy msgid "Could not execute " -msgstr "Não foi possível obter lock %s" +msgstr "Impossível de executar " #: methods/gpgv.cc:202 msgid " to verify signature (is gnupg installed?)" -msgstr "" +msgstr " para verificar assinatura (gnupg instalado?)" #: methods/gpgv.cc:206 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Erro desconhecido ao executar gpgv" #: methods/gpgv.cc:237 -#, fuzzy msgid "The following signatures were invalid:\n" -msgstr "Os seguintes pacotes extra serão instalados:" +msgstr "As seguintes assinaturas estavam inválidas:\n" #: methods/gpgv.cc:244 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" msgstr "" +"As seguintes assinaturas não puderam ser verificadas porque a chave pública " +"não está disponível:\n" #: methods/gzip.cc:57 #, c-format @@ -2364,7 +2358,7 @@ msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" #: apt-pkg/sourcelist.cc:244 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" @@ -2418,12 +2412,12 @@ msgstr "Falta directório de listas %spartial." #: apt-pkg/acquire.cc:66 #, c-format msgid "Archive directory %spartial is missing." -msgstr "Falta o diretório de repositório %spartial." +msgstr "Falta o directório de repositório %spartial." #: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +msgstr "A efectuar download de ficheiro %li de %li (%s restantes)" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2436,12 +2430,10 @@ msgid "Method %s did not start correctly" msgstr "Método %s não iniciou corretamente" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -"Troca de mídia: Por favor insira o disco chamado\n" -" '%s'\n" -"na drive '%s' e pressione enter\n" +"Por favor insira o disco denominado: '%s' no leitor '%s' e pressione enter." #: apt-pkg/init.cc:120 #, c-format @@ -2465,7 +2457,7 @@ msgstr "Você deve colocar alguns URIs 'source' no seu sources.list" #: apt-pkg/cachefile.cc:73 msgid "The package lists or status file could not be parsed or opened." msgstr "" -"As listas de pacotes ou o ficheiro de status não pôde ser analizado ou " +"As listas de pacotes ou o ficheiro de status não pôde ser analisado ou " "aberto." #: apt-pkg/cachefile.cc:77 @@ -2580,7 +2572,7 @@ msgstr "MD5Sum incorreto" #: apt-pkg/acquire-item.cc:645 msgid "There are no public key available for the following key IDs:\n" -msgstr "" +msgstr "Não existe qualquer chave pública disponível para as seguintes IDs de chave:\n" #: apt-pkg/acquire-item.cc:758 #, c-format @@ -2589,7 +2581,7 @@ msgid "" "to manually fix this package. (due to missing arch)" msgstr "" "Não foi possível localizar um arquivo para o pacote %s. Isto pode significar " -"que você precisa consertar manualmente este pacote. (devido a arquitetura " +"que você precisa consertar manualmente este pacote. (devido a arquitectura " "não especificada)." #: apt-pkg/acquire-item.cc:817 @@ -2611,7 +2603,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:940 msgid "Size mismatch" -msgstr "Tamanho incorreto" +msgstr "Tamanho incorrecto" #: apt-pkg/vendorlist.cc:66 #, c-format @@ -2715,54 +2707,54 @@ msgstr "" "coincidentes\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Abrindo %s" +msgstr "A preparar %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Abrindo %s" +msgstr "A desempacotar %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Abrindo ficheiro de configuração %s" +msgstr "A preparar para configurar %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Ligando a %s" +msgstr "A configurar %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instalado: " +msgstr "%s instalado" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "A preparar para remoção de %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Abrindo %s" +msgstr "A remover %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Recomenda" +msgstr "%s removido" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Preparing for remove with config %s" -msgstr "" +msgstr "A preparar para remover com a configuração %s" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format msgid "Removed with config %s" -msgstr "" +msgstr "Removido com a configuração %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" @@ -1,19 +1,19 @@ # translation of apt_ro.po to Romanian # This file is put in the public domain. -# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005. # +# Sorin Batariuc <sorin@bonbon.net>, 2004, 2005, 2006. msgid "" msgstr "" -"Project-Id-Version: apt_po_ro\n" +"Project-Id-Version: apt_nou\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-01-20 14:01+0100\n" -"PO-Revision-Date: 2005-08-25 17:43+0300\n" +"PO-Revision-Date: 2006-02-27 11:59+0200\n" "Last-Translator: Sorin Batariuc <sorin@bonbon.net>\n" "Language-Team: Romanian <debian-l10-romanian@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.9.1\n" +"X-Generator: KBabel 1.11.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: cmdline/apt-cache.cc:135 @@ -230,19 +230,15 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "" +msgstr "Vă rog furnizaţi un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'" #: cmdline/apt-cdrom.cc:93 -#, fuzzy msgid "Please insert a Disc in the drive and press enter" -msgstr "" -"Schimbare de mediu: Vă rog introduceţi discul numit\n" -" '%s'\n" -"în unitatea '%s' şi apăsaţi Enter\n" +msgstr "Vă rog introduceţi un disc în unitate şi apăsaţi Enter" #: cmdline/apt-cdrom.cc:117 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "" +msgstr "Repetaţi această procedură pentru restul CD-urilor." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -713,12 +709,11 @@ msgid "%s (due to %s) " msgstr "%s (datorită %s) " #: cmdline/apt-get.cc:546 -#, fuzzy msgid "" "WARNING: The following essential packages will be removed.\n" "This should NOT be done unless you know exactly what you are doing!" msgstr "" -"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse\n" +"AVERTISMENT: Următoarele pachete esenţiale vor fi şterse.\n" "Aceasta NU ar trebui făcută decât dacă ştiţi exact ce vreţi!" #: cmdline/apt-get.cc:577 @@ -780,7 +775,7 @@ msgstr "AVERTISMENT: Următoarele pachete nu pot fi autentificate!" #: cmdline/apt-get.cc:693 msgid "Authentication warning overridden.\n" -msgstr "" +msgstr "Avertisment de autentificare înlocuit.\n" #: cmdline/apt-get.cc:700 msgid "Install these packages without verification [y/N]? " @@ -796,16 +791,15 @@ msgstr "Sunt unele probleme şi -y a fost folosit fără --force-yes" #: cmdline/apt-get.cc:755 msgid "Internal error, InstallPackages was called with broken packages!" -msgstr "" +msgstr "Eroare internă, InstallPackages a fost apelat cu pachete deteriorate!" #: cmdline/apt-get.cc:764 msgid "Packages need to be removed but remove is disabled." msgstr "Pachete trebuiesc şterse dar ştergerea este dezactivată." #: cmdline/apt-get.cc:775 -#, fuzzy msgid "Internal error, Ordering didn't finish" -msgstr "Eroare internă în timpul adăugării unei diversiuni" +msgstr "Eroare internă, Ordering nu s-a terminat" #: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1809 cmdline/apt-get.cc:1842 msgid "Unable to lock the download directory" @@ -818,7 +812,7 @@ msgstr "Lista surselor nu poate fi citită." #: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "" +msgstr "Ce ciudat.. Dimensiunile nu se potrivesc, scrieţi la apt@packages.debian.org" #: cmdline/apt-get.cc:821 #, c-format @@ -841,9 +835,9 @@ msgid "After unpacking %sB disk space will be freed.\n" msgstr "După despachetare va fi eliberat %sB din spaţiul de pe disc.\n" #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 -#, fuzzy, c-format +#, c-format msgid "Couldn't determine free space in %s" -msgstr "Nu aveţi suficient spaţiu în %s" +msgstr "N-am putut determina spaţiul disponibil în %s" #: cmdline/apt-get.cc:849 #, c-format @@ -852,21 +846,20 @@ msgstr "Nu aveţi suficient spaţiu în %s." #: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "" -"A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă." +msgstr "A fost specificat 'doar neimportant' dar nu este o operaţiune neimportantă." #: cmdline/apt-get.cc:866 msgid "Yes, do as I say!" msgstr "Da, fă cum îţi spun!" #: cmdline/apt-get.cc:868 -#, fuzzy, c-format +#, c-format msgid "" "You are about to do something potentially harmful.\n" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Sunteţi pe cale de a face ceva cu potenţial distructiv\n" +"Sunteţi pe cale de a face ceva cu potenţial distructiv.\n" "Pentru a continua tastaţi fraza '%s'\n" " ?] " @@ -1082,9 +1075,8 @@ msgid "Done" msgstr "Terminat" #: cmdline/apt-get.cc:1777 cmdline/apt-get.cc:1785 -#, fuzzy msgid "Internal error, problem resolver broke stuff" -msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" +msgstr "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" #: cmdline/apt-get.cc:1885 msgid "Must specify at least one package to fetch source for" @@ -1096,9 +1088,9 @@ msgid "Unable to find a source package for %s" msgstr "Nu pot găsi o sursă pachet pentru %s" #: cmdline/apt-get.cc:1959 -#, fuzzy, c-format +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" +msgstr "Sar peste fişierul deja descărcat '%s'\n" #: cmdline/apt-get.cc:1983 #, c-format @@ -1137,7 +1129,7 @@ msgstr "Comanda de despachetare '%s' eşuată.\n" #: cmdline/apt-get.cc:2069 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" -msgstr "" +msgstr "Verificaţi dacă pachetul 'dpkg-dev' este instalat.\n" #: cmdline/apt-get.cc:2086 #, c-format @@ -1370,17 +1362,14 @@ msgstr "S-au produs unele erori în timpul despachetării. Voi configura" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "" -"pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate" +msgstr "pachetele care au fost instalate. Aceasta ar putea rezulta erori dublate" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "" -"sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile" +msgstr "sau erori cauzate de dependenţe lipsă. Aceasta este normal, doar erorile" #: dselect/install:103 -msgid "" -"above this message are important. Please fix them and run [I]nstall again" +msgid "above this message are important. Please fix them and run [I]nstall again" msgstr "" "de deasupra acestui mesaj sunt importante. Vă rog corectaţi-le şi porniţi " "din nou [I]nstalarea" @@ -1462,9 +1451,9 @@ msgid "Duplicate conf file %s/%s" msgstr "Fişier de configurare duplicat %s/%s" #: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 -#, fuzzy, c-format +#, c-format msgid "Failed to write file %s" -msgstr "Eşuare în a scrie fişierul %s" +msgstr "Eşuare în scrierea fişierului %s" #: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format @@ -1612,7 +1601,6 @@ msgid "Internal error adding a diversion" msgstr "Eroare internă în timpul adăugării unei diversiuni" #: apt-inst/deb/dpkgdb.cc:383 -#, fuzzy msgid "The pkg cache must be initialized first" msgstr "Cache-ul pachetului trebuie întâi iniţializat" @@ -1685,9 +1673,8 @@ msgid "Unable to unmount the CD-ROM in %s, it may still be in use." msgstr "Nu pot demonta CDROM-ul în %s, poate este încă utilizat." #: methods/cdrom.cc:169 -#, fuzzy msgid "Disk not found." -msgstr "Fişier negăsit" +msgstr "Disc negăsit." #: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" @@ -1912,41 +1899,38 @@ msgstr "Nu pot conecta la %s %s" #: methods/gpgv.cc:92 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "" +msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies." #: methods/gpgv.cc:191 -msgid "" -"Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "" +msgid "Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "Eroare internă: Semnătură corespunzătoare, dar n-am putut determina cheia amprentei digitale?!" #: methods/gpgv.cc:196 msgid "At least one invalid signature was encountered." -msgstr "" +msgstr "Cel puţin o semnătură invalidă a fost întâlnită." #. FIXME String concatenation considered harmful. #: methods/gpgv.cc:201 -#, fuzzy msgid "Could not execute " -msgstr "Nu pot determina blocajul %s" +msgstr "Nu s-a putut executa " #: methods/gpgv.cc:202 msgid " to verify signature (is gnupg installed?)" -msgstr "" +msgstr " verificarea semnăturii (este instalat gnupg?)" #: methods/gpgv.cc:206 msgid "Unknown error executing gpgv" -msgstr "" +msgstr "Eroare necunoscută în timp ce se execută gpgv" #: methods/gpgv.cc:237 -#, fuzzy msgid "The following signatures were invalid:\n" -msgstr "Următoarele extra pachete vor fi instalate:" +msgstr "Următoarele semnături au fost invalide:\n" #: methods/gpgv.cc:244 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" -msgstr "" +msgstr "Următoarele semnături n-au putut fi verificate datorită cheii publice care este indisponibilă:\n" #: methods/gzip.cc:57 #, c-format @@ -2013,8 +1997,7 @@ msgstr "Eroare la scrierea în fişierul" #: methods/http.cc:874 msgid "Error reading from server. Remote end closed connection" -msgstr "" -"Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" +msgstr "Eroare la citirea de pe server, conexiunea a fost închisă de la distanţă" #: methods/http.cc:876 msgid "Error reading from server" @@ -2079,8 +2062,7 @@ msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare" #: apt-pkg/contrib/configuration.cc:684 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" -msgstr "" -"Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior" +msgstr "Eroare de sintaxă %s:%u: directivele pot fi date doar la nivelul superior" #: apt-pkg/contrib/configuration.cc:691 #, c-format @@ -2136,8 +2118,7 @@ msgstr "Opţiunea %s necesită un argument" #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "" -"Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =<val>." +msgstr "Opţiunea %s: Specificaţia configurării articolului trebuie să aibă o =<val>." #: apt-pkg/contrib/cmndline.cc:237 #, c-format @@ -2372,7 +2353,7 @@ msgid "Malformed line %u in source list %s (type)" msgstr "Linie greşită %u în lista sursă %s (tip)" #: apt-pkg/sourcelist.cc:244 -#, fuzzy, c-format +#, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" @@ -2400,10 +2381,8 @@ msgstr "Tipul de fişier index '%s' nu este suportat" #: apt-pkg/algorithms.cc:241 #, c-format -msgid "" -"The package %s needs to be reinstalled, but I can't find an archive for it." -msgstr "" -"Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." +msgid "The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "Pachetul %s are nevoie să fie reinstalat, dar nu pot găsi o arhivă pentru el." #: apt-pkg/algorithms.cc:1059 msgid "" @@ -2430,7 +2409,7 @@ msgstr "Directorul de arhive %spartial lipseşte." #: apt-pkg/acquire.cc:821 #, c-format msgid "Downloading file %li of %li (%s remaining)" -msgstr "" +msgstr "Se descarcă fişierul %li din %li (%s rămas)" #: apt-pkg/acquire-worker.cc:113 #, c-format @@ -2443,12 +2422,9 @@ msgid "Method %s did not start correctly" msgstr "Metoda %s nu s-a lansat corect" #: apt-pkg/acquire-worker.cc:377 -#, fuzzy, c-format +#, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "" -"Schimbare de mediu: Vă rog introduceţi discul numit\n" -" '%s'\n" -"în unitatea '%s' şi apăsaţi Enter\n" +msgstr "Vă rog introduceţi discul numit: '%s' în unitatea '%s' şi apăsaţi Enter." #: apt-pkg/init.cc:120 #, c-format @@ -2476,8 +2452,7 @@ msgstr "" #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" -msgstr "" -"Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme." +msgstr "Aţi putea vrea să porniţi 'apt-get update' pentru a corecta aceste probleme." #: apt-pkg/policy.cc:269 msgid "Invalid record in the preferences file, no Package header" @@ -2497,39 +2472,39 @@ msgid "Cache has an incompatible versioning system" msgstr "Cache are un versioning system incompatibil" #: apt-pkg/pkgcachegen.cc:117 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Eroare în timpul procesării %s (Pachet Nou)" +msgstr "Eroare apărută în timpul procesării %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:129 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Eroare în timpul procesării %s (UsePackage1)" +msgstr "Eroare apărută în timpul procesării %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:150 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Eroare în timpul procesării %s (UsePackage2)" +msgstr "Eroare apărută în timpul procesării %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:154 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Eroare în timpul procesării %s (NewFileVer1)" +msgstr "Eroare apărută în timpul procesării %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:184 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Eroare în timpul procesării %s (NewVersion1)" +msgstr "Eroare apărută în timpul procesării %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:188 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Eroare în timpul procesării %s (UsePackage3)" +msgstr "Eroare apărută în timpul procesării %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:192 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Eroare în timpul procesării %s (NewVersion2)" +msgstr "Eroare apărută în timpul procesării %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:207 msgid "Wow, you exceeded the number of package names this APT is capable of." @@ -2539,29 +2514,26 @@ msgstr "" #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "" -"Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT." +msgstr "Mamăăă, aţi depăşit numărul de versiuni de care este capabil acest APT." #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "" -"Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT." +msgstr "Mamăăă, aţi depăşit numărul de dependenţe de care este capabil acest APT." #: apt-pkg/pkgcachegen.cc:241 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Eroare în timpul procesării %s (FindPkg)" +msgstr "Eroare apărută în timpul procesării %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:254 -#, fuzzy, c-format +#, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Eroare în timpul procesării %s (CollectFileProvides)" +msgstr "Eroare apărută în timpul procesării %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "" -"Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere" +msgstr "Nu s-a găsit pachetul %s %s în timpul procesării dependenţelor de fişiere" #: apt-pkg/pkgcachegen.cc:574 #, c-format @@ -2587,7 +2559,7 @@ msgstr "Nepotrivire MD5Sum" #: apt-pkg/acquire-item.cc:645 msgid "There are no public key available for the following key IDs:\n" -msgstr "" +msgstr "Nu există nici o cheie publică disponibilă pentru următoarele identificatoare de chei:\n" #: apt-pkg/acquire-item.cc:758 #, c-format @@ -2609,8 +2581,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:853 #, c-format -msgid "" -"The package index files are corrupted. No Filename: field for package %s." +msgid "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Fişierele index de pachete sunt deteriorate. Fără câmpul 'nume fişier:' la " "pachetul %s." @@ -2716,59 +2687,59 @@ msgstr "S-au scris %i înregistrări cu %i fişiere nepotrivite\n" #: apt-pkg/indexcopy.cc:269 #, c-format msgid "Wrote %i records with %i missing files and %i mismatched files\n" -msgstr "" -"S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" +msgstr "S-au scris %i înregistrări cu %i fişiere lipsă şi %i fişiere nepotrivite\n" #: apt-pkg/deb/dpkgpm.cc:358 -#, fuzzy, c-format +#, c-format msgid "Preparing %s" -msgstr "Deschidere %s" +msgstr "Se pregăteşte %s" #: apt-pkg/deb/dpkgpm.cc:359 -#, fuzzy, c-format +#, c-format msgid "Unpacking %s" -msgstr "Deschidere %s" +msgstr "Se despachetează %s" #: apt-pkg/deb/dpkgpm.cc:364 -#, fuzzy, c-format +#, c-format msgid "Preparing to configure %s" -msgstr "Deschidere fişier de configurare %s" +msgstr "Se pregăteşte configurarea %s" #: apt-pkg/deb/dpkgpm.cc:365 -#, fuzzy, c-format +#, c-format msgid "Configuring %s" -msgstr "Conectare la %s" +msgstr "Se configurează %s" #: apt-pkg/deb/dpkgpm.cc:366 -#, fuzzy, c-format +#, c-format msgid "Installed %s" -msgstr " Instalat: " +msgstr "Instalat %s" #: apt-pkg/deb/dpkgpm.cc:371 #, c-format msgid "Preparing for removal of %s" -msgstr "" +msgstr "Se pregăteşte ştergerea lui %s" #: apt-pkg/deb/dpkgpm.cc:372 -#, fuzzy, c-format +#, c-format msgid "Removing %s" -msgstr "Deschidere %s" +msgstr "Se şterge %s" #: apt-pkg/deb/dpkgpm.cc:373 -#, fuzzy, c-format +#, c-format msgid "Removed %s" -msgstr "Recomandă" +msgstr "Şters %s" #: apt-pkg/deb/dpkgpm.cc:378 #, c-format msgid "Preparing for remove with config %s" -msgstr "" +msgstr "Se pregăteşte pentru ştergere inclusiv configurarea %s" #: apt-pkg/deb/dpkgpm.cc:379 #, c-format msgid "Removed with config %s" -msgstr "" +msgstr "Şters inclusiv configurarea %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" + @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-20 14:01+0100\n" -"PO-Revision-Date: 2005-12-22 01:10+0800\n" +"POT-Creation-Date: 2006-01-20 14:06+0100\n" +"PO-Revision-Date: 2006-03-16 15:53+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" "MIME-Version: 1.0\n" @@ -442,7 +442,7 @@ msgstr "Nasira ang DB, pinalitan ng pangalan ang talaksan sa %s.old" #: ftparchive/cachedb.cc:63 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Luma ang DB, sinusubukang maupgrade %s" +msgstr "Luma ang DB, sinusubukang maupgrade ang %s" #: ftparchive/cachedb.cc:73 #, c-format @@ -452,7 +452,7 @@ msgstr "Hindi mabuksan ang talaksang DB %s: %s" #: ftparchive/cachedb.cc:114 #, c-format msgid "File date has changed %s" -msgstr "Nagbago ang petsa ng talaksan %s" +msgstr "Nagbago ang petsa ng talaksang %s" #: ftparchive/cachedb.cc:155 msgid "Archive has no control record" @@ -541,7 +541,7 @@ msgstr " %s ay walang override entry\n" #: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " Maintainer ng %s ay %s hindi %s\n" +msgstr " Tagapangalaga ng %s ay %s hindi %s\n" #: ftparchive/contents.cc:317 #, c-format @@ -721,7 +721,7 @@ msgstr "" #: cmdline/apt-get.cc:577 #, c-format msgid "%lu upgraded, %lu newly installed, " -msgstr "%lu nai-upgrade, %lu bagong luklok, " +msgstr "%lu na nai-upgrade, %lu na bagong luklok, " #: cmdline/apt-get.cc:581 #, c-format @@ -835,12 +835,13 @@ msgstr "Kailangang kumuha ng %sB ng arkibo.\n" #: cmdline/apt-get.cc:829 #, c-format msgid "After unpacking %sB of additional disk space will be used.\n" -msgstr "Matapos magbuklat ay %sB na karagdagang puwang sa disk ay magagamit.\n" +msgstr "" +"Matapos magbuklat ay %sB na karagdagang puwang sa disk ang magagamit.\n" #: cmdline/apt-get.cc:832 #, c-format msgid "After unpacking %sB disk space will be freed.\n" -msgstr "Matapos magbuklat %sB na puwang sa disk ay mapapalaya.\n" +msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" #: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1980 #, c-format @@ -921,12 +922,12 @@ msgstr "Paunawa, pinili ang %s imbes na %s\n" #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -"Linaktawan ang %s, ito'y naka-instol na at hindi nakatakda ang upgrade.\n" +"Linaktawan ang %s, ito'y nakaluklok na at hindi nakatakda ang upgrade.\n" #: cmdline/apt-get.cc:1058 #, c-format msgid "Package %s is not installed, so not removed\n" -msgstr "Hindi naka-instol ang paketeng %s, kaya't hindi ito tinanggal\n" +msgstr "Hindi nakaluklok ang paketeng %s, kaya't hindi ito tinanggal\n" #: cmdline/apt-get.cc:1069 #, c-format @@ -935,11 +936,11 @@ msgstr "Ang paketeng %s ay paketeng birtwal na bigay ng:\n" #: cmdline/apt-get.cc:1081 msgid " [Installed]" -msgstr " [Naka-instol]" +msgstr " [Nakaluklok]" #: cmdline/apt-get.cc:1086 msgid "You should explicitly select one to install." -msgstr "Dapat ninyong piliin ang isa na instolahin." +msgstr "Dapat kayong mamili ng isa na iluluklok." #: cmdline/apt-get.cc:1091 #, c-format @@ -949,7 +950,7 @@ msgid "" "is only available from another source\n" msgstr "" "Hindi magamit ang %s, ngunit ito'y tinutukoy ng ibang pakete.\n" -"Maaaring nawawala ang pakete, o ito'y laos na, o ito'y makukuha lamang\n" +"Maaaring nawawala ang pakete, ito'y laos na, o ito'y makukuha lamang\n" "sa ibang pinagmulan.\n" #: cmdline/apt-get.cc:1110 @@ -964,7 +965,7 @@ msgstr "Ang paketeng %s ay walang kandidatong maaaring instolahin" #: cmdline/apt-get.cc:1133 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" -msgstr "Ang pag-instol muli ng %s ay hindi maaari, hindi ito makuha.\n" +msgstr "Ang pagluklok muli ng %s ay hindi maaari, hindi ito makuha.\n" #: cmdline/apt-get.cc:1141 #, c-format @@ -1047,7 +1048,7 @@ msgid "" "that package should be filed." msgstr "" "Dahil ang hiniling niyo ay mag-isang operasyon, malamang ay ang pakete ay\n" -"hindi talaga ma-instol at kailangang magpadala ng bug report tungkol sa\n" +"hindi talaga mailuklok at kailangang magpadala ng bug report tungkol sa\n" "pakete na ito." #: cmdline/apt-get.cc:1583 @@ -1061,7 +1062,7 @@ msgstr "Sirang mga pakete" #: cmdline/apt-get.cc:1612 msgid "The following extra packages will be installed:" -msgstr "Ang mga sumusunod na extra na pakete ay iinstolahin:" +msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" #: cmdline/apt-get.cc:1683 msgid "Suggested packages:" @@ -1073,7 +1074,7 @@ msgstr "Mga paketeng rekomendado:" #: cmdline/apt-get.cc:1704 msgid "Calculating upgrade... " -msgstr "Kinakalkula ang upgrade... " +msgstr "Sinusuri ang pag-upgrade... " #: cmdline/apt-get.cc:1707 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" @@ -1097,9 +1098,9 @@ msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" #: cmdline/apt-get.cc:1959 -#, fuzzy, c-format +#, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" +msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" #: cmdline/apt-get.cc:1983 #, c-format @@ -1310,7 +1311,7 @@ msgstr "Nakakuha ng %sB ng %s (%sB/s)\n" #: cmdline/acqprogress.cc:225 #, c-format msgid " [Working]" -msgstr " [May Ginagawa]" +msgstr " [May ginagawa]" #: cmdline/acqprogress.cc:271 #, c-format @@ -1367,7 +1368,7 @@ msgstr "May mga error na naganap habang nagbubuklat. Isasaayos ko ang" #: dselect/install:101 msgid "packages that were installed. This may result in duplicate errors" -msgstr "mga paketeng na-instol. Maaaring dumulot ito ng mga error na doble" +msgstr "mga paketeng naluklok. Maaaring dumulot ito ng mga error na doble" #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" @@ -1379,7 +1380,7 @@ msgid "" "above this message are important. Please fix them and run [I]nstall again" msgstr "" "sa taas nitong kalatas ang importante. Paki-ayusin ang mga ito at patakbuhin " -"muli ang [I]nstol." +"muli ang [I]luklok/Instol." #: dselect/update:30 msgid "Merging available information" @@ -1840,7 +1841,7 @@ msgstr "Bigo ang paglipat ng datos, sabi ng server ay '%s'" #. Get the files information #: methods/ftp.cc:997 msgid "Query" -msgstr "Query" +msgstr "Tanong" #: methods/ftp.cc:1106 msgid "Unable to invoke " @@ -1957,16 +1958,16 @@ msgstr "Error sa pagbasa mula sa prosesong %s" #: methods/http.cc:376 msgid "Waiting for headers" -msgstr "Naghihintay ng mga header" +msgstr "Naghihintay ng panimula" #: methods/http.cc:522 #, c-format msgid "Got a single header line over %u chars" -msgstr "Nakatanggap ng isang linyang header mula %u na mga karakter" +msgstr "Nakatanggap ng isang linyang panimula mula %u na mga karakter" #: methods/http.cc:530 msgid "Bad header line" -msgstr "Maling linyang header" +msgstr "Maling linyang panimula" #: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" @@ -2018,7 +2019,7 @@ msgstr "Error sa pagbasa mula sa server" #: methods/http.cc:1107 msgid "Bad header data" -msgstr "Maling datos sa header" +msgstr "Maling datos sa panimula" #: methods/http.cc:1124 msgid "Connection failed" @@ -2111,40 +2112,40 @@ msgstr "%c%s... Tapos" #: apt-pkg/contrib/cmndline.cc:80 #, c-format msgid "Command line option '%c' [from %s] is not known." -msgstr "Option sa command line '%c' [mula %s] ay di kilala." +msgstr "Opsyon sa command line '%c' [mula %s] ay di kilala." #: apt-pkg/contrib/cmndline.cc:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" -msgstr "Option sa command line %s ay di naintindihan." +msgstr "Opsyon sa command line %s ay di naintindihan." #: apt-pkg/contrib/cmndline.cc:127 #, c-format msgid "Command line option %s is not boolean" -msgstr "Option sa command line %s ay hindi boolean" +msgstr "Opsyon sa command line %s ay hindi boolean" #: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." -msgstr "Option %s ay nangangailangan ng argumento" +msgstr "Opsyon %s ay nangangailangan ng argumento" #: apt-pkg/contrib/cmndline.cc:201 apt-pkg/contrib/cmndline.cc:207 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -"Option %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " +"Opsyon %s: Ang pagtakda ng aytem sa pagkaayos ay nangangailangan ng " "=<halaga>." #: apt-pkg/contrib/cmndline.cc:237 #, c-format msgid "Option %s requires an integer argument, not '%s'" -msgstr "Option %s ay nangangailangan ng argumentong integer, hindi '%s'" +msgstr "Opsyon %s ay nangangailangan ng argumentong integer, hindi '%s'" #: apt-pkg/contrib/cmndline.cc:268 #, c-format msgid "Option '%s' is too long" -msgstr "Option '%s' ay labis ang haba" +msgstr "Opsyon '%s' ay labis ang haba" #: apt-pkg/contrib/cmndline.cc:301 #, c-format @@ -2279,7 +2280,7 @@ msgstr "Rekomendado" #: apt-pkg/pkgcache.cc:219 msgid "Conflicts" -msgstr "Conflict" +msgstr "Tunggali" #: apt-pkg/pkgcache.cc:219 msgid "Replaces" @@ -2584,7 +2585,7 @@ msgstr "Di tugmang MD5Sum" #: apt-pkg/acquire-item.cc:645 msgid "There are no public key available for the following key IDs:\n" -msgstr "" +msgstr "Walang public key na magagamit para sa sumusunod na key ID:\n" #: apt-pkg/acquire-item.cc:758 #, c-format diff --git a/test/testdeb.cc b/test/testdeb.cc index 5986621bb..d28f20114 100644 --- a/test/testdeb.cc +++ b/test/testdeb.cc @@ -23,7 +23,7 @@ bool Test(const char *File) return false; // Extract it. - ExtractTar Tar(Deb.GetFile(),Member->Size); + ExtractTar Tar(Deb.GetFile(),Member->Size, "gzip"); NullStream Dir; if (Tar.Go(Dir) == false) return false; diff --git a/test/versions.lst b/test/versions.lst index 008a0f2d7..efc19c4f0 100644 --- a/test/versions.lst +++ b/test/versions.lst @@ -20,6 +20,13 @@ z . -1 # Epochs 1:0.4 10.3 1 1:1.25-4 1:1.25-8 -1 +0:1.18.36 1.18.36 0 + +# Funky, but allowed, characters in upstream version +9:1.18.36:5.4-20 10:0.5.1-22 -1 +9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1 +9:1.18.36:5.4-20 9:1.18.37:4.3-22 -1 +1.18.36-0.17.35-18 1.18.36-19 1 # Junk 1:1.2.13-3 1:1.2.13-3.1 -1 |