diff options
| -rw-r--r-- | apt-pkg/contrib/hashes.cc | 1 | ||||
| -rw-r--r-- | apt-pkg/contrib/hashes.h | 4 | ||||
| -rw-r--r-- | apt-pkg/contrib/sha256.cc | 424 | ||||
| -rw-r--r-- | apt-pkg/contrib/sha256.h | 75 | ||||
| -rw-r--r-- | apt-pkg/makefile | 4 | ||||
| -rw-r--r-- | apt-pkg/tagfile.cc | 3 | ||||
| -rw-r--r-- | debian/changelog | 48 | ||||
| -rw-r--r-- | ftparchive/cachedb.cc | 269 | ||||
| -rw-r--r-- | ftparchive/cachedb.h | 40 | ||||
| -rw-r--r-- | ftparchive/writer.cc | 104 | ||||
| -rw-r--r-- | ftparchive/writer.h | 8 | ||||
| -rw-r--r-- | po/bg.po | 8 | ||||
| -rw-r--r-- | po/bs.po | 8 | ||||
| -rw-r--r-- | po/ca.po | 8 | ||||
| -rw-r--r-- | po/cs.po | 8 | ||||
| -rw-r--r-- | po/cy.po | 8 | ||||
| -rw-r--r-- | po/da.po | 8 | ||||
| -rw-r--r-- | po/de.po | 8 | ||||
| -rw-r--r-- | po/el.po | 8 | ||||
| -rw-r--r-- | po/en_GB.po | 8 | ||||
| -rw-r--r-- | po/es.po | 8 | ||||
| -rw-r--r-- | po/fi.po | 8 | ||||
| -rw-r--r-- | po/fr.po | 8 | ||||
| -rw-r--r-- | po/gl.po | 10 | ||||
| -rw-r--r-- | po/hu.po | 455 | ||||
| -rw-r--r-- | po/it.po | 8 | ||||
| -rw-r--r-- | po/ja.po | 8 | ||||
| -rw-r--r-- | po/ko.po | 426 | ||||
| -rw-r--r-- | po/nb.po | 8 | ||||
| -rw-r--r-- | po/nl.po | 8 | ||||
| -rw-r--r-- | po/nn.po | 8 | ||||
| -rw-r--r-- | po/pl.po | 8 | ||||
| -rw-r--r-- | po/pt.po | 8 | ||||
| -rw-r--r-- | po/pt_BR.po | 8 | ||||
| -rw-r--r-- | po/ro.po | 64 | ||||
| -rw-r--r-- | po/ru.po | 8 | ||||
| -rw-r--r-- | po/sk.po | 9 | ||||
| -rw-r--r-- | po/sl.po | 8 | ||||
| -rw-r--r-- | po/sv.po | 429 | ||||
| -rw-r--r-- | po/tl.po | 8 | ||||
| -rw-r--r-- | po/zh_CN.po | 8 | ||||
| -rw-r--r-- | po/zh_TW.po | 8 | ||||
| -rw-r--r-- | test/hash.cc | 7 |
43 files changed, 1628 insertions, 952 deletions
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..b75ce8a84 --- /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 * 4 + 0] << 24) + | ((u32) input[I * 4 + 1] << 16) + | ((u32) input[I * 4 + 2] << 8) + | ((u32) input[I * 4 + 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/makefile b/apt-pkg/makefile index 0e6aecc65..7e5feae53 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 79ff18de4..25e2930fa 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -343,7 +343,8 @@ static const char *iTFRewritePackageOrder[] = { "Filename", "Size", "MD5Sum", - "SHA1Sum", + "SHA1", + "SHA256", "MSDOS-Filename", // Obsolete "Description", 0}; diff --git a/debian/changelog b/debian/changelog index 0c31db6bd..04378ea50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,18 +1,42 @@ -apt (0.6.44.2) unstable; urgency=low - - * apt-pkg/depcache.cc: - - added Debug::pkgDepCache::AutoInstall (thanks to infinity) - * merged from - http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: - * sk.po: Completed to 512t - * eu.po: Completed to 512t - * fr.po: Completed to 512t - * sv.po: Completed to 512t - * Update all PO and the POT. Gives 506t6f for formerly - complete translations +apt (0.6.45) unstable; urgency=low + + * apt-pkg/contrib/sha256.cc: + - fixed the sha256 generation (closes: #378183) + * ftparchive/cachedb.cc: + - applied patch from ajt to fix Clean() function + (closes: #379576) + * Merged from Christian Perrier bzr branch: + * ko.po: Updated to 512t. Closes: #378901 + * hu.po: Updated to 512t. Closes: #376330 + * km.po: New Khmer translation: 506t6f. Closes: #375068 + * ne.po: New Nepali translation: 512t. Closes: #373729 + * vi.po: Updated to 512t. Closes: #368038 + * zh_TW.po: Remove an extra %s in one string. Closes: #370551 + * dz.po: New Dzongkha translation: 512t + * ro.po: Updated to 512t + * eu.po: Updated + * eu.po: Updated -- +apt (0.6.44.2) unstable; urgency=low + + * apt-pkg/depcache.cc: + - added Debug::pkgDepCache::AutoInstall (thanks to infinity) + * apt-pkg/acquire-item.cc: + - fix missing chmod() in the new aquire code + (thanks to Bastian Blank, Closes: #367425) + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * sk.po: Completed to 512t + * eu.po: Completed to 512t + * fr.po: Completed to 512t + * sv.po: Completed to 512t + * Update all PO and the POT. Gives 506t6f for formerly + complete translations + + -- Michael Vogt <mvo@debian.org> Wed, 14 Jun 2006 12:00:57 +0200 + apt (0.6.44.1-0.1) unstable; urgency=low * Non-maintainer upload. diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc index 9e93dff05..8a4ca0236 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; } /*}}}*/ @@ -272,16 +453,14 @@ bool CacheDB::Clean() memset(&Data,0,sizeof(Data)); while ((errno = Cursor->c_get(Cursor,&Key,&Data,DB_NEXT)) == 0) { - const char *Colon = (char *)Key.data; - for (; Colon != (char *)Key.data+Key.size && *Colon != ':'; Colon++); - if ((char *)Key.data+Key.size - Colon > 2) + const char *Colon = (char*)memrchr(Key.data, ':', Key.size); + if (Colon) { - 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 (stringcmp(Colon + 1, (char *)Key.data+Key.size,"st") == 0 || + stringcmp(Colon + 1, (char *)Key.data+Key.size,"cl") == 0 || + stringcmp(Colon + 1, (char *)Key.data+Key.size,"cn") == 0) { - if (FileExists(string(Colon+1,(const char *)Key.data+Key.size)) == true) + if (FileExists(string((const char *)Key.data,Colon)) == true) continue; } } 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() {}; @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\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" @@ -2306,15 +2306,15 @@ msgstr "незадължителен" msgid "extra" msgstr "допълнителен" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Изграждане на дървото ÑÑŠÑ Ð·Ð°Ð²Ð¸ÑимоÑти" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "ВерÑии кандидати" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Генериране на завиÑимоÑти" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2004-05-06 15:25+0100\n" "Last-Translator: Safir Å ećerović <sapphire@linux.org.ba>\n" "Language-Team: Bosnian <lokal@lugbih.org>\n" @@ -2109,15 +2109,15 @@ msgstr "opcionalno" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Gradim stablo zavisnosti" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Verzije kandidata" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Stvaranje zavisnosti" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-02-05 22:00+0100\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -2298,15 +2298,15 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "S'està construint l'arbre de dependències" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versions candidates" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Dependències que genera" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"POT-Creation-Date: 2006-05-27 13:46+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" @@ -2269,15 +2269,15 @@ msgstr "volitelný" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "VytvářÃm strom závislostÃ" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Kandidátské verze" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Generovánà závislostÃ" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-06-06 13:46+0100\n" "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n" "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n" @@ -2363,17 +2363,17 @@ msgstr "opsiynnol" msgid "extra" msgstr "ychwanegol" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 #, fuzzy msgid "Building dependency tree" msgstr "Yn Aideladu Coeden Dibyniaeth" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 #, fuzzy msgid "Candidate versions" msgstr "Fersiynau Posib" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 #, fuzzy msgid "Dependency generation" msgstr "Cynhyrchaid Dibyniaeth" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-01-20 22:23+0100\n" "Last-Translator: Claus Hindsgaul <claus_h@image.dk>\n" "Language-Team: Danish <dansk@klid.dk>\n" @@ -2283,15 +2283,15 @@ msgstr "frivillig" msgid "extra" msgstr "ekstra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Opbygger afhængighedstræ" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Kandidatversioner" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Afhængighedsgenerering" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-06-15 18:22+0200\n" "Last-Translator: Michael Piefel <piefel@debian.org>\n" "Language-Team: <de@li.org>\n" @@ -2322,15 +2322,15 @@ msgstr "optional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Abhängigkeitsbaum wird aufgebaut" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Mögliche Versionen" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Abhängigkeits-Generierung" @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el_new\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-01-18 15:16+0200\n" "Last-Translator: Konstantinos Margaritis <markos@debian.org>\n" "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n" @@ -2320,15 +2320,15 @@ msgstr "Ï€ÏοαιÏετικό" msgid "extra" msgstr "επιπλÎον" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Κατασκευή ΔÎνδÏου ΕξαÏτήσεων" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Υποψήφιες Εκδόσεις" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "ΠαÏαγωγή ΕξαÏτήσεων" diff --git a/po/en_GB.po b/po/en_GB.po index 0cc9ad7b2..34d1bdecb 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2002-11-10 20:56+0100\n" "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n" "Language-Team: en_GB <en@li.org>\n" @@ -2272,15 +2272,15 @@ msgstr "optional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Building dependency tree" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Candidate versions" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Dependency generation" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6.42.3exp1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-11-16 17:37+0100\n" "Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n" @@ -2307,15 +2307,15 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Creando árbol de dependencias" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versiones candidatas" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Generación de dependencias" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-02-15 14:09+0200\n" "Last-Translator: Tapio Lehtonen <tale@debian.org>\n" "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n" @@ -2285,15 +2285,15 @@ msgstr "valinnainen" msgid "extra" msgstr "ylimääräinen" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Muodostetaan riippuvuussuhteiden puu" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Mahdolliset versiot" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Luodaan riippuvuudet" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-05-18 09:31-0500\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -2327,15 +2327,15 @@ msgstr "optionnel" msgid "extra" msgstr "supplémentaire" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Construction de l'arbre des dépendances" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versions possibles" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Génération des dépendances" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+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" @@ -15,7 +15,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: cmdline/apt-cache.cc:135 -#, c-format +#, c-format msgid "Package %s version %s has an unmet dep:\n" msgstr "O paquete %s versión %s ten unha dependencia incumprida:\n" @@ -2297,15 +2297,15 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "A construÃr a árbore de dependencias" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versións candidatas" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Xeración de dependencias" @@ -24,12 +24,8 @@ msgstr "" msgid "Package %s version %s has an unmet dep:\n" msgstr "%s csomag %s verziójának teljesÃtetlen függÅ‘sége van:\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: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" @@ -91,8 +87,7 @@ msgstr "Slack terület összesen: " msgid "Total space accounted for: " msgstr "Terület összesen: " -#: cmdline/apt-cache.cc:446 -#: cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "%s csomag fájl szinkronon kÃvül." @@ -109,10 +104,10 @@ msgstr "Nem találtam csomagokat" msgid "Package files:" msgstr "Csomagfájlok:" -#: cmdline/apt-cache.cc:1469 -#: cmdline/apt-cache.cc:1555 +#: 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 gyorsÃtótár nincs szinkronban, nem lehet kereszthivatkozni a csomag fájlra" +msgstr "" +"A gyorsÃtótár nincs szinkronban, nem lehet kereszthivatkozni a csomag fájlra" #: cmdline/apt-cache.cc:1470 #, c-format @@ -124,8 +119,7 @@ msgstr "%4i %s\n" msgid "Pinned packages:" msgstr "RögzÃtett csomagok:" -#: cmdline/apt-cache.cc:1494 -#: cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(nem találtam)" @@ -134,8 +128,7 @@ msgstr "(nem találtam)" msgid " Installed: " msgstr " TelepÃtve: " -#: cmdline/apt-cache.cc:1517 -#: cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(nincs)" @@ -158,13 +151,9 @@ msgstr " Verziótáblázat:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: 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:2369 -#: cmdline/apt-sortpkgs.cc:144 +#: 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: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" @@ -212,7 +201,8 @@ msgstr "" " apt-cache [opciók] showpkg pkg1 [pkg2 ...]\n" " apt-cache [opciók] showsrc pkg1 [pkg2 ...]\n" "\n" -"Az apt-cache egy alacsony szintű eszköz az APT bináris gyorsÃtótár-fájljainak\n" +"Az apt-cache egy alacsony szintű eszköz az APT bináris gyorsÃtótár-" +"fájljainak\n" "a kezelésére, és azokból információk lekérdezésére\n" "\n" "Parancsok:\n" @@ -305,7 +295,8 @@ msgid "" msgstr "" "Használat:apt-extracttemplates fájl1 [fájl2 ...]\n" "\n" -"Az apt-extracttemplates egy eszköz konfigurációs- és minta-információk debian-\n" +"Az apt-extracttemplates egy eszköz konfigurációs- és minta-információk " +"debian-\n" "csomagokból való kibontására\n" "\n" "Opciók:\n" @@ -314,8 +305,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? BeállÃt egy tetszÅ‘leges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 -#: apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet Ãrni ebbe: %s" @@ -324,17 +314,13 @@ msgstr "Nem lehet Ãrni ebbe: %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Nem lehet megállapÃtani a debconf verziót. A debconf telepÃtve van?" -#: ftparchive/apt-ftparchive.cc:167 -#: ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "A csomagkiterjesztések listája túl hosszú" -#: 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 +#: 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 "Hiba a(z) %s könyvtár feldolgozásakor" @@ -415,8 +401,10 @@ msgstr "" "\n" "A 'packages' és 'sources' parancsokat a fa gyökerébÅ‘l kell futtatni.\n" "A BinaryPath-nak a rekurzÃv keresés kiindulópontjára kell mutatni és\n" -"a felülbÃrálófájlnak a felülbÃráló jelzÅ‘ket kell tartalmaznia. Az útvonal-elÅ‘tag\n" -"hozzáadódik a fájlnév mezÅ‘khöz, ha meg van adva. Felhasználására egy példa a\n" +"a felülbÃrálófájlnak a felülbÃráló jelzÅ‘ket kell tartalmaznia. Az útvonal-" +"elÅ‘tag\n" +"hozzáadódik a fájlnév mezÅ‘khöz, ha meg van adva. Felhasználására egy példa " +"a\n" "Debian archÃvumból:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -491,8 +479,7 @@ msgstr "F: " msgid "E: Errors apply to file " msgstr "H: Hibás a fájl " -#: ftparchive/writer.cc:151 -#: ftparchive/writer.cc:181 +#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Nem sikerült feloldani ezt: %s" @@ -531,12 +518,8 @@ msgstr "*** %s linkelése ehhez: %s sikertelen" 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:266 +#: 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:266 #, c-format msgid "Failed to stat %s" msgstr "%s elérése sikertelen" @@ -545,14 +528,12 @@ msgstr "%s elérése sikertelen" msgid "Archive had no package field" msgstr "Az archÃvumnak nem volt csomag mezÅ‘je" -#: ftparchive/writer.cc:394 -#: ftparchive/writer.cc:603 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbÃráló bejegyzéssel\n" -#: ftparchive/writer.cc:437 -#: ftparchive/writer.cc:689 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" @@ -562,37 +543,31 @@ msgstr " %s karbantartója %s, nem %s\n" msgid "Internal error, could not locate member %s" msgstr "BelsÅ‘ hiba, %s tag nem található" -#: ftparchive/contents.cc:353 -#: ftparchive/contents.cc:384 +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - Nem sikerült memóriát lefoglalni" -#: ftparchive/override.cc:38 -#: ftparchive/override.cc:146 +#: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" msgstr "%s megnyitása sikertelen" -#: ftparchive/override.cc:64 -#: ftparchive/override.cc:170 +#: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Deformált felülbÃrálás %s %lu. sorában #1" -#: ftparchive/override.cc:78 -#: ftparchive/override.cc:182 +#: ftparchive/override.cc:78 ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Deformált felülbÃrálás %s %lu. sorában #2" -#: ftparchive/override.cc:92 -#: ftparchive/override.cc:195 +#: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Deformált felülbÃrálás %s %lu. sorában #3" -#: ftparchive/override.cc:131 -#: ftparchive/override.cc:205 +#: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" msgstr "Nem lehet a(z)%s felülbÃrálófájlt olvasni" @@ -607,8 +582,7 @@ msgstr "'%s' tömörÃtési algoritmus ismeretlen" msgid "Compressed output %s needs a compression set" msgstr "%s tömörÃtett kimenetnek egy tömörÃtÅ‘ készletre van szüksége" -#: ftparchive/multicompress.cc:172 -#: methods/rsh.cc:91 +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Nem sikerült IPC csövet létrehozni az alfolyamathoz" @@ -654,8 +628,7 @@ msgstr "Olvasási hiba az MD5 kiszámÃtásakor" msgid "Problem unlinking %s" msgstr "Hiba %s elláncolásakor" -#: ftparchive/multicompress.cc:490 -#: apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "Nem sikerült átnevezni %s-t erre: %s" @@ -664,8 +637,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:142 -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordÃtási hiba - %s" @@ -810,8 +782,7 @@ msgstr "Valóban telepÃted e csomagokat ellenÅ‘rzés nélkül (i/N)? " msgid "Some packages could not be authenticated" msgstr "Néhány csomag nem hitelesÃthetÅ‘" -#: cmdline/apt-get.cc:711 -#: cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül" @@ -827,15 +798,11 @@ msgstr "Csomagokat kellene eltávolÃtani, de az EltávolÃtás nem engedélyeze msgid "Internal error, Ordering didn't finish" msgstr "BelsÅ‘ hiba, a rendezés nem zárult" -#: cmdline/apt-get.cc:791 -#: cmdline/apt-get.cc:1800 -#: cmdline/apt-get.cc:1833 +#: 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:1881 -#: cmdline/apt-get.cc:2117 +#: 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." @@ -864,8 +831,7 @@ msgstr "Kicsomagolás után %sB lemezterületet használok fel\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Kicsomagolás után %sB lemezterület szabadul fel.\n" -#: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" @@ -875,8 +841,7 @@ msgstr "Nem határozható meg a szabad hely itt: %s" msgid "You don't have enough free space in %s." msgstr "Nincs elég szabad hely itt: %s." -#: cmdline/apt-get.cc:864 -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet." @@ -895,8 +860,7 @@ msgstr "" "A folytatáshoz Ãrd be ezt: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "MegszakÃtva." @@ -904,9 +868,7 @@ 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:2014 +#: 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 "Sikertelen letöltés: %s %s\n" @@ -915,13 +877,14 @@ msgstr "Sikertelen letöltés: %s %s\n" 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:2023 +#: 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" #: cmdline/apt-get.cc:986 -msgid "Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?" +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Ãvumot.\n" " Próbáld ki az apt-get update -et vagy a --fix-missing -et." @@ -1019,15 +982,18 @@ msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" #: cmdline/apt-get.cc:1384 -msgid "Some index files failed to download, they have been ignored, or old ones used instead." -msgstr "Néhány index fájl letöltése meghiúsult, ezeket mellÅ‘zöm vagy régi változatukat használom." +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"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:1493 -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" @@ -1042,8 +1008,12 @@ msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javÃtásához:" #: cmdline/apt-get.cc:1549 -msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)." -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!)." +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +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:1561 msgid "" @@ -1091,9 +1061,7 @@ msgstr "Ajánlott csomagok:" msgid "Calculating upgrade... " msgstr "FrissÃtés kiszámÃtása... " -#: cmdline/apt-get.cc:1698 -#: 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" @@ -1101,17 +1069,16 @@ msgstr "Sikertelen" msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:1768 -#: cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "BelsÅ‘ hiba, hibafeloldó gond" #: 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" +msgstr "" +"Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni" -#: cmdline/apt-get.cc:1906 -#: cmdline/apt-get.cc:2135 +#: 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" @@ -1171,7 +1138,9 @@ msgstr "Hiba a gyermekfolyamatnál" #: 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" +msgstr "" +"Legalább egy csomagot adj meg, aminek a fordÃtási függÅ‘ségeit ellenÅ‘rizni " +"kell" #: cmdline/apt-get.cc:2140 #, c-format @@ -1185,18 +1154,28 @@ msgstr "Nincs fordÃtási függÅ‘sége a következÅ‘nek: %s.\n" #: cmdline/apt-get.cc:2212 #, c-format -msgid "%s dependency for %s cannot be satisfied because the package %s cannot be found" -msgstr "%s függÅ‘sége ennek: %s, ez nem elégÃthetÅ‘ ki, mert a(z) %s csomag nem található" +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +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:2264 #, c-format -msgid "%s dependency for %s cannot be satisfied because no available versions of package %s can satisfy version requirements" -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." +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +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: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." +msgstr "" +"%s függÅ‘séget %s csomaghoz nem lehet kielégÃteni: %s telepÃtett csomag túl " +"friss." #: cmdline/apt-get.cc:2324 #, c-format @@ -1364,12 +1343,8 @@ msgstr "" msgid "Bad default setting!" msgstr "Hibás alapértelmezett beállÃtás!" -#: dselect/install:51 -#: dselect/install:83 -#: dselect/install:87 -#: dselect/install:93 -#: dselect/install:104 -#: dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 msgid "Press enter to continue." msgstr "Ãœss entert a folytatáshoz." @@ -1386,7 +1361,8 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "vagy hiányzó függÅ‘ségek miatti hibákat. Ez Ãgy OK, csak az ezen üzenet" #: 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 "elÅ‘tti hibák fontosak. JavÃtsd azokat és futtasd az [I]nstallt újra" #: dselect/update:30 @@ -1401,8 +1377,7 @@ msgstr "Nem sikerült csöveket létrehozni" msgid "Failed to exec gzip " msgstr "Nem sikerült a gzipet futtatni " -#: apt-inst/contrib/extracttar.cc:180 -#: apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "Hibás archÃvum" @@ -1423,8 +1398,7 @@ msgstr "Érvénytelen archÃvum-aláÃrás" msgid "Error reading archive member header" msgstr "Hiba az archÃvum tag fejléc olvasásakor" -#: apt-inst/contrib/arfile.cc:93 -#: apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" msgstr "Érvénytelen archÃvum tag fejléc" @@ -1467,21 +1441,17 @@ msgstr "A(z) %s -> %s eltérÃtés hozzáadásának duplázása" 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 +#: 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 fájl Ãrása sikertelen" -#: apt-inst/dirstream.cc:96 -#: apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Nem sikerült a(z) %s fájlt bezárni" -#: apt-inst/extract.cc:96 -#: apt-inst/extract.cc:167 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "A(z) %s útvonal túl hosszú" @@ -1501,8 +1471,7 @@ msgstr "A(z) %s könyvtár eltérÃtve" msgid "The package is trying to write to the diversion target %s/%s" msgstr "A csomag megpróbál Ãrni a(z) %s/%s eltérÃtett célpontba" -#: apt-inst/extract.cc:157 -#: apt-inst/extract.cc:300 +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "Az eltérÃtett útvonal túl hosszú" @@ -1529,12 +1498,9 @@ msgstr "Csomagtalálat felülÃrása %s verziója nélkül" msgid "File %s/%s overwrites the one in the package %s" msgstr "A(z) %s/%s fájl felülÃrja a(z) %s csomagban levÅ‘t" -#: 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 +#: 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 nem olvasható" @@ -1544,14 +1510,12 @@ msgstr "%s nem olvasható" msgid "Unable to stat %s" msgstr "%s nem érhetÅ‘ el" -#: apt-inst/deb/dpkgdb.cc:55 -#: apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" msgstr "%s eltávolÃtása sikertelen" -#: apt-inst/deb/dpkgdb.cc:110 -#: apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" msgstr "%s létrehozása sikertelen" @@ -1566,10 +1530,8 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük" #. 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-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 "Csomaglisták olvasása" @@ -1579,24 +1541,27 @@ msgstr "Csomaglisták olvasása" msgid "Failed to change to the admin dir %sinfo" msgstr "Nem sikerült a(z) %sinfo admin könyvtárba váltani" -#: apt-inst/deb/dpkgdb.cc:201 -#: apt-inst/deb/dpkgdb.cc:355 +#: 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 "BelsÅ‘ hiba a csomagnév elhozásakor" -#: apt-inst/deb/dpkgdb.cc:205 -#: apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Fájllista olvasása" #: 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 "Nem sikerült a '%sinfo/%s' listafájlt megnyitni. Ha nem tudod helyreállÃtani ezt a fájlt, akkor ürÃtsd ki, és azonnal telepÃtsd újra a csomag ugyanezen verzióját!" +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 "" +"Nem sikerült a '%sinfo/%s' listafájlt megnyitni. Ha nem tudod helyreállÃtani " +"ezt a fájlt, akkor ürÃtsd ki, és azonnal telepÃtsd újra a csomag ugyanezen " +"verzióját!" -#: apt-inst/deb/dpkgdb.cc:229 -#: apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Nem sikerült a(z) %sinfo/%s lista fájlt olvasni" @@ -1614,8 +1579,7 @@ msgstr "Nem sikerült a(z) %sdiversions eltérÃtÅ‘ fájlt megnyitni" msgid "The diversion file is corrupted" msgstr "Az eltérÃtÅ‘ fájl hibás" -#: apt-inst/deb/dpkgdb.cc:331 -#: apt-inst/deb/dpkgdb.cc:336 +#: 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" @@ -1644,8 +1608,7 @@ msgstr "Hibás ConfFile szakasz a státusz fájlban. Offszet %lu" msgid "Error parsing MD5. Offset %lu" msgstr "MD5 értelmezési hiba. Offszet %lu" -#: apt-inst/deb/debfile.cc:42 -#: apt-inst/deb/debfile.cc:47 +#: 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 "Ez nem egy érvényes DEB archÃv, hiányzik a '%s' tag" @@ -1678,8 +1641,12 @@ msgid "Unable to read the cdrom database %s" msgstr "%s CD-ROM adatbázis nem olvasható" #: 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 "Kérlek használd az apt-cdrom parancsot a CD felismertetésére. Az apt-get update nem használható új CD-k hozzáadására" +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 "" +"Kérlek használd az apt-cdrom parancsot a CD felismertetésére. Az apt-get " +"update nem használható új CD-k hozzáadására" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" @@ -1694,22 +1661,16 @@ msgstr "Nem lehet lecsatolni az itt lévÅ‘ CD-ROM-ot: %s, talán még használod msgid "Disk not found." msgstr "Nem találom a lemezt" -#: methods/cdrom.cc:177 -#: methods/file.cc:79 -#: methods/rsh.cc:264 +#: 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:275 -#: 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:272 -#: methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "A módosÃtási idÅ‘t beállÃtása sikertelen" @@ -1730,8 +1691,7 @@ msgstr "Nem lehet a társ nevét megállapÃtani" msgid "Unable to determine the local name" msgstr "Nem lehet a helyi nevet megállapÃtani" -#: methods/ftp.cc:204 -#: methods/ftp.cc:232 +#: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" msgstr "A kiszolgáló megtagadta a kapcsolatot: %s" @@ -1747,8 +1707,12 @@ msgid "PASS failed, server said: %s" msgstr "Hibás PASS, a kiszolgáló üzenete: %s" #: methods/ftp.cc:237 -msgid "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin is empty." -msgstr "Egy proxy kiszolgáló meg lett adva login szkript nélkül, és az Acquire::ftp::ProxyLogin üres." +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"Egy proxy kiszolgáló meg lett adva login szkript nélkül, és az Acquire::ftp::" +"ProxyLogin üres." #: methods/ftp.cc:265 #, c-format @@ -1760,10 +1724,7 @@ msgstr "A login szkript '%s' parancsa hibázott, a kiszolgáló üzenete: %s" msgid "TYPE failed, server said: %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 +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "IdÅ‘túllépés a kapcsolatban" @@ -1771,31 +1732,23 @@ msgstr "IdÅ‘túllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:338 -#: apt-pkg/contrib/fileutl.cc:471 -#: methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Olvasási hiba" -#: methods/ftp.cc:345 -#: methods/rsh.cc:197 +#: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "A válasz túlcsordÃtotta a puffert." -#: methods/ftp.cc:362 -#: methods/ftp.cc:374 +#: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" msgstr "Protokoll hiba" -#: methods/ftp.cc:446 -#: apt-pkg/contrib/fileutl.cc:510 -#: methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Ãrási hiba" -#: methods/ftp.cc:687 -#: methods/ftp.cc:693 -#: methods/ftp.cc:729 +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" msgstr "Nem lehet létrehozni a socket-et" @@ -1845,9 +1798,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az idÅ‘t" msgid "Unable to accept connection" msgstr "Nem lehet elfogadni a kapcsolatot" -#: methods/ftp.cc:864 -#: methods/http.cc:958 -#: methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1856,8 +1807,7 @@ msgstr "Probléma a fájl hash értékének meghatározásakor" msgid "Unable to fetch file, server said '%s'" msgstr "Nem lehet letölteni a fájlt, a kiszolgáló üzenete: '%s'" -#: methods/ftp.cc:892 -#: methods/rsh.cc:322 +#: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Az adat socket túllépte az idÅ‘t" @@ -1907,8 +1857,7 @@ msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 -#: methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Kapcsolódás: %s" @@ -1943,7 +1892,8 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek." #: methods/gpgv.cc:198 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "BelsÅ‘ hiba: Jó aláÃrás, de meghatározhatatlan kulcs ujjlenyomat?!" #: methods/gpgv.cc:203 @@ -1964,8 +1914,11 @@ msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláÃrások érvénytelenek voltak:\n" #: 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" +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 @@ -1990,8 +1943,7 @@ msgstr "Egyetlen fejléc sort kaptam, ami több mint %u karakteres" msgid "Bad header line" msgstr "Rossz fejléc sor" -#: methods/http.cc:549 -#: methods/http.cc:556 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "A http kiszolgáló egy érvénytelen válaszfejlécet küldött" @@ -2106,8 +2058,7 @@ msgstr "Szintaktikai hiba %s: %u: Csak legfelsÅ‘ szinten használhatók elÅ‘Ãrà msgid "Syntax error %s:%u: Too many nested includes" msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include" -#: apt-pkg/contrib/configuration.cc:695 -#: apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" @@ -2137,8 +2088,7 @@ msgstr "%c%s... Kész" msgid "Command line option '%c' [from %s] is not known." msgstr "A(z) '%c' parancssori opció [a következÅ‘bÅ‘l: %s] ismeretlen." -#: apt-pkg/contrib/cmndline.cc:106 -#: apt-pkg/contrib/cmndline.cc:114 +#: 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" @@ -2149,17 +2099,16 @@ msgstr "%s parancssori opció értelmezhetetlen" msgid "Command line option %s is not boolean" msgstr "%s parancssori opció nem logikai" -#: apt-pkg/contrib/cmndline.cc:166 -#: apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." msgstr "%s opcióhoz szükséges egy argumentum" -#: apt-pkg/contrib/cmndline.cc:201 -#: apt-pkg/contrib/cmndline.cc:207 +#: 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 opció: a konfigurációs elem specifikációhoz szükséges egy =<érték> rész." +msgstr "" +"%s opció: a konfigurációs elem specifikációhoz szükséges egy =<érték> rész." #: apt-pkg/contrib/cmndline.cc:237 #, c-format @@ -2186,9 +2135,7 @@ msgstr "%s érvénytelen művelet" msgid "Unable to stat the mount point %s" msgstr "%s csatolási pont nem érhetÅ‘ el" -#: apt-pkg/contrib/cdromutl.cc:149 -#: apt-pkg/acquire.cc:427 -#: apt-pkg/clean.cc:44 +#: 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 ide váltani: %s" @@ -2333,8 +2280,7 @@ msgstr "opcionális" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:61 -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "FüggÅ‘ségi fa épÃtése" @@ -2386,8 +2332,7 @@ msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:220 -#: apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." @@ -2402,16 +2347,21 @@ msgstr "A(z) %u. sor hibás %s forráslistában (tÃpus)" msgid "Type '%s' is not known on line %u in source list %s" 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 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztÅ‘ id)" #: 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 "Ez a telepÃtési lépés átmenetileg megköveteli, hogy eltávolÃtsd a(z) %s alapvetÅ‘ csomagot ami Ãœtközési/ElÅ‘-függÅ‘ségi hurkot okoz. Ez gyakran rossz, de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót." +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 "" +"Ez a telepÃtési lépés átmenetileg megköveteli, hogy eltávolÃtsd a(z) %s " +"alapvetÅ‘ csomagot ami Ãœtközési/ElÅ‘-függÅ‘ségi hurkot okoz. Ez gyakran rossz, " +"de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót." #: apt-pkg/pkgrecords.cc:37 #, c-format @@ -2420,16 +2370,23 @@ msgstr "A(z) '%s' indexfájltÃpus nem támogatott" #: 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 "A(z) %s csomagot újra kell telepÃteni, de nem találok archÃvumot hozzá." +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 archÃvumot hozzá." #: apt-pkg/algorithms.cc:1059 -msgid "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages." -msgstr "Hiba, a pkgProblemResolver::Resolve töréseket generált, ezt visszafogott csomagok okozhatják." +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"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 visszafogott csomagok vannak a rendszeren." +msgstr "" +"A problémák nem javÃthatók, sérült visszafogott csomagok vannak a rendszeren." #: apt-pkg/acquire.cc:62 #, c-format @@ -2488,7 +2445,8 @@ 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." -msgstr "A csomaglista vagy az állapot fájl nem dolgozható fel vagy nem olvasható." +msgstr "" +"A csomaglista vagy az állapot fájl nem dolgozható fel vagy nem olvasható." #: apt-pkg/cachefile.cc:77 msgid "You may want to run apt-get update to correct these problems" @@ -2548,15 +2506,18 @@ 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." -msgstr "Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!" +msgstr "" +"Ez nem semmi, túllépted a csomagnevek számát, amit ez az APT kezelni tud!" #: apt-pkg/pkgcachegen.cc:210 msgid "Wow, you exceeded the number of versions this APT is capable of." -msgstr "Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!" +msgstr "" +"Ez nem semmi, túllépted a csomagverziók számát, amit ez az APT kezelni tud!" #: apt-pkg/pkgcachegen.cc:213 msgid "Wow, you exceeded the number of dependencies this APT is capable of." -msgstr "Ez nem semmi, túllépted a függÅ‘ségek számát, amit ez az APT kezelni tud." +msgstr "" +"Ez nem semmi, túllépted a függÅ‘ségek számát, amit ez az APT kezelni tud." #: apt-pkg/pkgcachegen.cc:241 #, c-format @@ -2571,7 +2532,8 @@ msgstr "Hiba történt %s feldolgozásakor (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:260 #, c-format msgid "Package %s %s was not found while processing file dependencies" -msgstr "%s %s csomag nem volt megtalálható a fájl függÅ‘ségeinek feldolgozása közben" +msgstr "" +"%s %s csomag nem volt megtalálható a fájl függÅ‘ségeinek feldolgozása közben" #: apt-pkg/pkgcachegen.cc:574 #, c-format @@ -2583,8 +2545,7 @@ msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" msgid "Collecting File Provides" msgstr "\"ElÅ‘készÃt\" kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:785 -#: apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsÃtótár mentésekor" @@ -2593,8 +2554,7 @@ 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:945 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "Az MD5Sum nem megfelelÅ‘" @@ -2604,18 +2564,28 @@ msgstr "Nincs elérhetÅ‘ nyilvános kulcs az alábbi kulcs azonosÃtókhoz:\n" #: apt-pkg/acquire-item.cc:753 #, c-format -msgid "I wasn't able to locate a file for the %s package. This might mean you need 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ézzel kell kijavÃtani a csomagot. (hiányzó arch. miatt)" +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ézzel " +"kell kijavÃtani a csomagot. (hiányzó arch. miatt)" #: 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ézzel kell kijavÃtani a csomagot." +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ézzel " +"kell kijavÃtani a csomagot." #: 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." +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:935 msgid "Size mismatch" @@ -2635,8 +2605,7 @@ msgstr "" "%s CD-ROM csatolási pont használata\n" "CD-ROM csatolása\n" -#: apt-pkg/cdrom.cc:516 -#: apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "AzonosÃtás.. " @@ -2777,24 +2746,32 @@ 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" - @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-02-14 11:41+0100\n" "Last-Translator: Samuele Giovanni Tonon <samu@debian.org>\n" "Language-Team: Italian <it@li.org>\n" @@ -2309,15 +2309,15 @@ msgstr "opzionale" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Generazione dell'albero delle dipendenze in corso" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versioni candidate" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Generazione delle dipendenze" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-01-25 20:55+0900\n" "Last-Translator: Kenshi Muto <kmuto@debian.org>\n" "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n" @@ -2289,15 +2289,15 @@ msgstr "ä»»æ„" msgid "extra" msgstr "特別" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "ä¾å˜é–¢ä¿‚ツリーを作æˆã—ã¦ã„ã¾ã™" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "候補ãƒãƒ¼ã‚¸ãƒ§ãƒ³" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "ä¾å˜é–¢ä¿‚ã®ç”Ÿæˆ" @@ -18,12 +18,8 @@ msgstr "" 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: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" @@ -85,8 +81,7 @@ msgstr "ì „ì²´ 빈 용량: " msgid "Total space accounted for: " msgstr "차지하는 ì „ì²´ 용량: " -#: cmdline/apt-cache.cc:446 -#: cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "꾸러미 íŒŒì¼ %s 파ì¼ì´ ë™ê¸°í™”ë˜ì§€ 않았습니다." @@ -103,8 +98,7 @@ msgstr "꾸러미가 없습니다" msgid "Package files:" msgstr "꾸러미 파ì¼:" -#: cmdline/apt-cache.cc:1469 -#: cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "ìºì‹œê°€ ë™ê¸°í™”ë˜ì§€ 않았습니다. 꾸러미 파ì¼ì„ ìƒí˜¸ ì°¸ì¡°í• ìˆ˜ 없습니다" @@ -118,8 +112,7 @@ msgstr "%4i %s\n" msgid "Pinned packages:" msgstr "í•€ 꾸러미:" -#: cmdline/apt-cache.cc:1494 -#: cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(ì—†ìŒ)" @@ -128,8 +121,7 @@ msgstr "(ì—†ìŒ)" msgid " Installed: " msgstr " 설치: " -#: cmdline/apt-cache.cc:1517 -#: cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(ì—†ìŒ)" @@ -152,13 +144,9 @@ msgstr " ë²„ì „ í…Œì´ë¸”:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: 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:2369 -#: cmdline/apt-sortpkgs.cc:144 +#: 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:2369 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" @@ -310,8 +298,7 @@ msgstr "" " -c=? ì„¤ì • 파ì¼ì„ ì½ìŠµë‹ˆë‹¤\n" " -o=? ìž„ì˜ì˜ ì˜µì…˜ì„ ì„¤ì •í•©ë‹ˆë‹¤, 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 -#: apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" msgstr "%sì— ì“¸ 수 없습니다" @@ -320,17 +307,13 @@ msgstr "%sì— ì“¸ 수 없습니다" msgid "Cannot get debconf version. Is debconf installed?" msgstr "debconf ë²„ì „ì„ ì•Œ 수 없습니다. debconfê°€ 설치ë˜ì—ˆìŠµë‹ˆê¹Œ?" -#: ftparchive/apt-ftparchive.cc:167 -#: ftparchive/apt-ftparchive.cc:341 +#: 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 +#: 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 ë””ë ‰í† ë¦¬ë¥¼ 처리하는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" @@ -489,8 +472,7 @@ msgstr "ê²½ê³ : " msgid "E: Errors apply to file " msgstr "오류: ë‹¤ìŒ íŒŒì¼ì— ì 용하는 ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤: " -#: ftparchive/writer.cc:151 -#: ftparchive/writer.cc:181 +#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "%sì˜ ê²½ë¡œë¥¼ 알아내는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" @@ -530,12 +512,8 @@ msgstr "*** %s 파ì¼ì„ %s(으)ë¡œ ë§í¬í•˜ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %së°”ì´íŠ¸ì— ë„달했습니다.\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:266 +#: 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:266 #, c-format msgid "Failed to stat %s" msgstr "%sì˜ ì •ë³´ë¥¼ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" @@ -544,14 +522,12 @@ msgstr "%sì˜ ì •ë³´ë¥¼ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" msgid "Archive had no package field" msgstr "ì•„ì¹´ì´ë¸Œì— 꾸러미 필드가 없습니다" -#: ftparchive/writer.cc:394 -#: ftparchive/writer.cc:603 +#: 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 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리ìžê°€ %s입니다 (%s 아님)\n" @@ -561,37 +537,31 @@ msgstr " %s 관리ìžê°€ %s입니다 (%s 아님)\n" msgid "Internal error, could not locate member %s" msgstr "내부 오류, %s 멤버를 ì°¾ì„ ìˆ˜ 없습니다" -#: ftparchive/contents.cc:353 -#: ftparchive/contents.cc:384 +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - 메모리를 í• ë‹¹í•˜ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: ftparchive/override.cc:38 -#: ftparchive/override.cc:146 +#: 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 +#: 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 +#: 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 +#: 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 +#: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" msgstr "override íŒŒì¼ %sì„(를) ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" @@ -606,8 +576,7 @@ msgstr "'%s' 압축 ì•Œê³ ë¦¬ì¦˜ì„ ì•Œ 수 없습니다" msgid "Compressed output %s needs a compression set" msgstr "ì••ì¶•ëœ ì¶œë ¥ë¬¼ %sì—는 압축 세트가 필요합니다" -#: ftparchive/multicompress.cc:172 -#: methods/rsh.cc:91 +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "하위 í”„ë¡œì„¸ìŠ¤ì— ëŒ€í•œ IPC 파ì´í”„를 만드는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" @@ -653,8 +622,7 @@ msgstr "MD5를 계산하는 ë™ì•ˆ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" msgid "Problem unlinking %s" msgstr "%sì˜ ë§í¬ë¥¼ í•´ì œí•˜ëŠ” ë° ë¬¸ì œê°€ 있습니다" -#: ftparchive/multicompress.cc:490 -#: apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "%s 파ì¼ì˜ ì´ë¦„ì„ %s(으)ë¡œ 바꾸는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" @@ -663,8 +631,7 @@ msgstr "%s 파ì¼ì˜ ì´ë¦„ì„ %s(으)ë¡œ 바꾸는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:142 -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "ì •ê·œì‹ ì»´íŒŒì¼ ì˜¤ë¥˜ - %s" @@ -787,7 +754,8 @@ msgstr " 완료" #: cmdline/apt-get.cc:664 msgid "You might want to run `apt-get -f install' to correct these." -msgstr "ì´ ìƒí™©ì„ ë°”ë¡œìž¡ìœ¼ë ¤ë©´ `apt-get -f install'ì„ ì‹¤í–‰í•´ì•¼ í• ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤." +msgstr "" +"ì´ ìƒí™©ì„ ë°”ë¡œìž¡ìœ¼ë ¤ë©´ `apt-get -f install'ì„ ì‹¤í–‰í•´ì•¼ í• ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤." #: cmdline/apt-get.cc:667 msgid "Unmet dependencies. Try using -f." @@ -809,8 +777,7 @@ msgstr "확ì¸í•˜ì§€ ì•Šê³ ê¾¸ëŸ¬ë¯¸ë¥¼ ì„¤ì¹˜í•˜ì‹œê² ìŠµë‹ˆê¹Œ [y/N]? " msgid "Some packages could not be authenticated" msgstr "ì¸ì¦í• 수 없는 꾸러미가 있습니다" -#: cmdline/apt-get.cc:711 -#: cmdline/apt-get.cc:858 +#: 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 옵션 ì—†ì´ ì‚¬ìš©ë˜ì—ˆìŠµë‹ˆë‹¤" @@ -826,22 +793,20 @@ msgstr "꾸러미를 지워야 하지만 지우기가 금지ë˜ì–´ 있습니다. msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. ìˆœì„œë³€ê²½ìž‘ì—…ì´ ë나지 않았습니다" -#: cmdline/apt-get.cc:791 -#: cmdline/apt-get.cc:1800 -#: cmdline/apt-get.cc:1833 +#: 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:1881 -#: cmdline/apt-get.cc:2117 +#: 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 "소스 목ë¡ì„ ì½ì„ 수 없습니다." #: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "ì´ìƒí•˜ê²Œë„ í¬ê¸°ê°€ 서로 다릅니다. apt@packages.debian.orgë¡œ ì´ë©”ì¼ì„ 보내주ì‹ì‹œì˜¤." +msgstr "" +"ì´ìƒí•˜ê²Œë„ í¬ê¸°ê°€ 서로 다릅니다. apt@packages.debian.orgë¡œ ì´ë©”ì¼ì„ 보내주ì‹" +"시오." #: cmdline/apt-get.cc:821 #, c-format @@ -863,8 +828,7 @@ msgstr "ì••ì¶•ì„ í’€ë©´ %së°”ì´íŠ¸ì˜ ë””ìŠ¤í¬ ê³µê°„ì„ ë” ì‚¬ìš©í•˜ê²Œ ë© msgid "After unpacking %sB disk space will be freed.\n" msgstr "ì••ì¶•ì„ í’€ë©´ %së°”ì´íŠ¸ì˜ ë””ìŠ¤í¬ ê³µê°„ì´ ë¹„ì›Œì§‘ë‹ˆë‹¤.\n" -#: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "%sì˜ ì—¬ìœ ê³µê°„ì˜ í¬ê¸°ë¥¼ íŒŒì•…í• ìˆ˜ 없습니다" @@ -874,10 +838,11 @@ msgstr "%sì˜ ì—¬ìœ ê³µê°„ì˜ í¬ê¸°ë¥¼ íŒŒì•…í• ìˆ˜ 없습니다" msgid "You don't have enough free space in %s." msgstr "%s ì•ˆì— ì¶©ë¶„í•œ ì—¬ìœ ê³µê°„ì´ ì—†ìŠµë‹ˆë‹¤." -#: cmdline/apt-get.cc:864 -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." -msgstr "사소한 작업만 가능하ë„ë¡(Trivial Only) ì§€ì •ë˜ì—ˆì§€ë§Œ ì´ ìž‘ì—…ì€ ì‚¬ì†Œí•œ ìž‘ì—…ì´ ì•„ë‹™ë‹ˆë‹¤." +msgstr "" +"사소한 작업만 가능하ë„ë¡(Trivial Only) ì§€ì •ë˜ì—ˆì§€ë§Œ ì´ ìž‘ì—…ì€ ì‚¬ì†Œí•œ ìž‘ì—…ì´ " +"아닙니다." # ìž…ë ¥ì„ ë°›ì•„ì•¼ 한다. 한글 ìž…ë ¥ì„ ëª» í• ìˆ˜ 있으므로 ì›ë¬¸ 그대로 사용. #: cmdline/apt-get.cc:866 @@ -895,8 +860,7 @@ msgstr "" "계ì†í•˜ì‹œë ¤ë©´ ë‹¤ìŒ ë¬¸êµ¬ë¥¼ ìž…ë ¥í•˜ì‹ì‹œì˜¤: '%s'\n" " ?] " -#: cmdline/apt-get.cc:874 -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "중단." @@ -904,9 +868,7 @@ msgstr "중단." 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:2014 +#: 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 "%s 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ %s\n" @@ -915,14 +877,17 @@ msgstr "%s 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤ %s\n" msgid "Some files failed to download" msgstr "ì¼ë¶€ 파ì¼ì„ 받는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: cmdline/apt-get.cc:980 -#: cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 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 ì˜µì…˜ì„ ì¤˜ì„œ 실행해야 í• ê²ƒìž…ë‹ˆë‹¤." +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" @@ -944,7 +909,8 @@ msgstr "주ì˜, %2$s ëŒ€ì‹ ì— %1$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" +msgstr "" +"%s 꾸러미를 건너 ëœë‹ˆë‹¤. ì´ë¯¸ 설치ë˜ì–´ ìžˆê³ ì—…ê·¸ë ˆì´ë“œë¥¼ 하지 않습니다.\n" #: cmdline/apt-get.cc:1058 #, c-format @@ -1018,15 +984,18 @@ 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 "ì¼ë¶€ ì¸ë±ìŠ¤ 파ì¼ì„ ë‚´ë ¤ë°›ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. 해당 파ì¼ì„ 무시하거나 ê³¼ê±°ì˜ ë²„ì „ì„ ëŒ€ì‹ ì‚¬ìš©í•©ë‹ˆë‹¤." +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:1493 -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "%s 꾸러미를 ì°¾ì„ ìˆ˜ 없습니다" @@ -1042,8 +1011,12 @@ msgstr "다ìŒì„ ë°”ë¡œìž¡ìœ¼ë ¤ë©´ `apt-get -f install'ì„ ì‹¤í–‰í•´ ë³´ì‹ì‹œ # FIXME: specify a solution? 무슨 솔루션? #: cmdline/apt-get.cc:1549 -msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)." -msgstr "ì˜ì¡´ì„±ì´ 맞지 않습니다. 꾸러미 ì—†ì´ 'apt-get -f install'ì„ ì‹œë„í•´ ë³´ì‹ì‹œì˜¤ (아니면 í•´ê²° ë°©ë²•ì„ ì§€ì •í•˜ì‹ì‹œì˜¤)." +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"ì˜ì¡´ì„±ì´ 맞지 않습니다. 꾸러미 ì—†ì´ 'apt-get -f install'ì„ ì‹œë„í•´ ë³´ì‹ì‹œì˜¤ " +"(아니면 í•´ê²° ë°©ë²•ì„ ì§€ì •í•˜ì‹ì‹œì˜¤)." #: cmdline/apt-get.cc:1561 msgid "" @@ -1089,9 +1062,7 @@ msgstr "추천하는 꾸러미:" msgid "Calculating upgrade... " msgstr "ì—…ê·¸ë ˆì´ë“œë¥¼ 계산하는 중입니다... " -#: cmdline/apt-get.cc:1698 -#: methods/ftp.cc:702 -#: methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "실패" @@ -1099,8 +1070,7 @@ msgstr "실패" msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:1768 -#: cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, ë¬¸ì œ í•´ê²° í”„ë¡œê·¸ëž¨ì´ ì‚¬ê³ ì³¤ìŠµë‹ˆë‹¤" @@ -1108,8 +1078,7 @@ msgstr "내부 오류, ë¬¸ì œ í•´ê²° í”„ë¡œê·¸ëž¨ì´ ì‚¬ê³ ì³¤ìŠµë‹ˆë‹¤" msgid "Must specify at least one package to fetch source for" msgstr "해당ë˜ëŠ” 소스 꾸러미를 ê°€ì ¸ì˜¬ 꾸러미를 최소한 하나 ì§€ì •í•´ì•¼ 합니다" -#: cmdline/apt-get.cc:1906 -#: cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "%sì˜ ì†ŒìŠ¤ 꾸러미를 ì°¾ì„ ìˆ˜ 없습니다" @@ -1183,18 +1152,28 @@ msgstr "%s ê¾¸ëŸ¬ë¯¸ì— ë¹Œë“œ ì˜ì¡´ì„±ì´ 없습니다.\n" #: cmdline/apt-get.cc:2212 #, c-format -msgid "%s dependency for %s cannot be satisfied because the package %s cannot be found" -msgstr "%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s 꾸러미를 ì°¾ì„ ìˆ˜ 없습니다" +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s 꾸러미를 ì°¾ì„ ìˆ˜ 없습니" +"다" #: 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 "%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s ê¾¸ëŸ¬ë¯¸ì˜ ì‚¬ìš© 가능한 ë²„ì „ 중ì—서는 ì´ ë²„ì „ 요구사í•ì„ 만족시킬 수 없습니다" +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시킬 수 없습니다. %3$s ê¾¸ëŸ¬ë¯¸ì˜ ì‚¬ìš© 가능한 버" +"ì „ 중ì—서는 ì´ ë²„ì „ 요구사í•ì„ 만족시킬 수 없습니다" #: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시키는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: 설치한 %3$s 꾸러미가 너무 최근 ë²„ì „ìž…ë‹ˆë‹¤" +msgstr "" +"%2$sì— ëŒ€í•œ %1$s ì˜ì¡´ì„±ì„ 만족시키는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤: 설치한 %3$s 꾸러미가 너" +"무 최근 ë²„ì „ìž…ë‹ˆë‹¤" #: cmdline/apt-get.cc:2324 #, c-format @@ -1349,7 +1328,8 @@ msgid "" msgstr "" "사용법: apt-sortpkgs [옵션] 파ì¼1 [파ì¼2 ...]\n" "\n" -"apt-sortpkgs는 꾸러미 파ì¼ì„ ì •ë ¬í•˜ëŠ” 간단한 ë„구입니다. -s ì˜µì…˜ì€ ë¬´ìŠ¨ 파ì¼ì¸ì§€\n" +"apt-sortpkgs는 꾸러미 파ì¼ì„ ì •ë ¬í•˜ëŠ” 간단한 ë„구입니다. -s ì˜µì…˜ì€ ë¬´ìŠ¨ 파ì¼" +"ì¸ì§€\n" "알아 내는 ë° ì“°ìž…ë‹ˆë‹¤.\n" "\n" "옵션:\n" @@ -1362,12 +1342,8 @@ msgstr "" msgid "Bad default setting!" msgstr "기본 ì„¤ì •ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤!" -#: dselect/install:51 -#: dselect/install:83 -#: dselect/install:87 -#: dselect/install:93 -#: dselect/install:104 -#: dselect/update:45 +#: 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를 누르ì‹ì‹œì˜¤." @@ -1381,10 +1357,12 @@ msgstr "ì„¤ì •í• ê²ƒìž…ë‹ˆë‹¤. ì˜¤ë¥˜ë•Œë¬¸ì— ì˜ì¡´ì„±ì„ 만족하지 못해 #: dselect/install:102 msgid "or errors caused by missing dependencies. This is OK, only the errors" -msgstr "오류가 중복ë˜ì–´ ë‚˜íƒ€ë‚ ìˆ˜ 있습니다. 하지만 ìƒê´€ì—†ê³ , ì´ ë©”ì„¸ì§€ ìœ„ì— ë‚˜ì˜¨" +msgstr "" +"오류가 중복ë˜ì–´ ë‚˜íƒ€ë‚ ìˆ˜ 있습니다. 하지만 ìƒê´€ì—†ê³ , ì´ ë©”ì„¸ì§€ ìœ„ì— ë‚˜ì˜¨" #: 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 "오류만 중요합니다. ì´ ì˜¤ë¥˜ë¥¼ ê³ ì¹œ 다ìŒì— 설치(I)를 다시 ì‹œë„하ì‹ì‹œì˜¤" #: dselect/update:30 @@ -1399,8 +1377,7 @@ msgstr "파ì´í”„ 만들기가 실패했습니다" msgid "Failed to exec gzip " msgstr "gzip ì‹¤í–‰ì´ ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: apt-inst/contrib/extracttar.cc:180 -#: apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "ì•„ì¹´ì´ë¸Œê°€ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤" @@ -1421,8 +1398,7 @@ msgstr "ì•„ì¹´ì´ë¸Œ 시그너ì³ê°€ í‹€ë ¸ìŠµë‹ˆë‹¤" msgid "Error reading archive member header" msgstr "ì•„ì¹´ì´ë¸Œ 멤버 í—¤ë”를 ì½ëŠ” ë° ì˜¤ë¥˜ê°€ ë°œìƒí–ˆìŠµë‹ˆë‹¤" -#: apt-inst/contrib/arfile.cc:93 -#: apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" msgstr "ì•„ì¹´ì´ë¸Œ 멤버 í—¤ë”ê°€ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤" @@ -1465,21 +1441,17 @@ msgstr "ì „í™˜ëœ íŒŒì¼ì„ ë‘ ë²ˆ 추가합니다 (%s -> %s)" msgid "Duplicate conf file %s/%s" msgstr "%s/%s ì„¤ì • 파ì¼ì´ 중복ë˜ì—ˆìŠµë‹ˆë‹¤" -#: apt-inst/dirstream.cc:45 -#: apt-inst/dirstream.cc:50 -#: apt-inst/dirstream.cc:53 +#: 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 +#: 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 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "경로 %sì´(ê°€) 너무 ê¹ë‹ˆë‹¤" @@ -1499,8 +1471,7 @@ msgstr "%s ë””ë ‰í† ë¦¬ê°€ ì „í™˜ë˜ì—ˆìŠµë‹ˆë‹¤" 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 +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "ì „í™˜í•˜ëŠ” 경로가 너무 ê¹ë‹ˆë‹¤" @@ -1527,12 +1498,9 @@ msgstr "ë®ì–´ 쓰는 꾸러미가 %s ê¾¸ëŸ¬ë¯¸ì˜ ì–´ë–¤ ë²„ì „ê³¼ë„ ë§žì§€ ì• 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 +#: 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ì„(를) ì½ì„ 수 없습니다" @@ -1542,14 +1510,12 @@ msgstr "%sì„(를) ì½ì„ 수 없습니다" msgid "Unable to stat %s" msgstr "%sì˜ ì •ë³´ë¥¼ ì½ì„ 수 없습니다" -#: apt-inst/deb/dpkgdb.cc:55 -#: apt-inst/deb/dpkgdb.cc:61 +#: 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 +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" msgstr "%sì„(를) 만들 수 없습니다" @@ -1564,10 +1530,8 @@ 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-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 "꾸러미 목ë¡ì„ ì½ëŠ” 중입니다" @@ -1577,24 +1541,26 @@ msgstr "꾸러미 목ë¡ì„ ì½ëŠ” 중입니다" 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: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 -#: apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 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' 파ì¼ì„ 여는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤. ì´ íŒŒì¼ì„ ë³µêµ¬í• ìˆ˜ 없다면 비워 ë†“ê³ ê°™ì€ ë²„ì „ì˜ ê¾¸ëŸ¬ë¯¸ë¥¼ 다시 설치하ì‹ì‹œì˜¤!" +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 +#: 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 파ì¼ì„ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" @@ -1612,8 +1578,7 @@ msgstr "ì „í™˜ íŒŒì¼ %sdiversions를 여는 ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" msgid "The diversion file is corrupted" msgstr "ì „í™˜ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤" -#: apt-inst/deb/dpkgdb.cc:331 -#: apt-inst/deb/dpkgdb.cc:336 +#: 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" @@ -1642,8 +1607,7 @@ msgstr "status 파ì¼ì—ì„œ ConfFile ì„¹ì…˜ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤. 오프셋 msgid "Error parsing MD5. Offset %lu" msgstr "MD5 분ì„ì— ì˜¤ë¥˜ê°€ 있습니다. 오프셋 %lu" -#: apt-inst/deb/debfile.cc:42 -#: apt-inst/deb/debfile.cc:47 +#: 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' 멤버가 없습니다" @@ -1676,8 +1640,12 @@ msgid "Unable to read the cdrom database %s" msgstr "CD-ROM ë°ì´í„°ë² ì´ìŠ¤ %sì„(를) ì½ì„ 수 없습니다" #: 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 "ì´ CD를 APTì—ì„œ ì¸ì‹í•˜ë ¤ë©´ apt-cdromì„ ì‚¬ìš©í•˜ì‹ì‹œì˜¤. apt-get update로는 새 CD를 ì¶”ê°€í• ìˆ˜ 없습니다." +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 "" +"ì´ CD를 APTì—ì„œ ì¸ì‹í•˜ë ¤ë©´ apt-cdromì„ ì‚¬ìš©í•˜ì‹ì‹œì˜¤. apt-get update로는 새 " +"CD를 ì¶”ê°€í• ìˆ˜ 없습니다." #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" @@ -1692,22 +1660,16 @@ msgstr "%s ì•ˆì˜ CD-ROMì„ ë§ˆìš´íŠ¸ í•´ì œí• ìˆ˜ 없습니다. 사용 ì¤‘ì¼ msgid "Disk not found." msgstr "디스í¬ê°€ 없습니다" -#: methods/cdrom.cc:177 -#: methods/file.cc:79 -#: methods/rsh.cc:264 +#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "파ì¼ì´ 없습니다" -#: methods/copy.cc:42 -#: methods/gpgv.cc:275 -#: 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 "íŒŒì¼ ì •ë³´ë¥¼ ì½ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" -#: methods/copy.cc:79 -#: methods/gpgv.cc:272 -#: methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "íŒŒì¼ ë³€ê²½ ì‹œê°ì„ ì„¤ì •í•˜ëŠ” ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤" @@ -1728,8 +1690,7 @@ msgstr "ìƒëŒ€ë°©ì˜ ì´ë¦„ì„ ì•Œ 수 없습니다" msgid "Unable to determine the local name" msgstr "로컬 ì´ë¦„ì„ ì•Œ 수 없습니다" -#: methods/ftp.cc:204 -#: methods/ftp.cc:232 +#: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" msgstr "서버ì—ì„œ 다ìŒê³¼ ê°™ì´ ì—°ê²°ì„ ê±°ë¶€í–ˆìŠµë‹ˆë‹¤: %s" @@ -1745,8 +1706,12 @@ 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 ê°’ì´ ë¹„ì–´ 있습니다." +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 @@ -1758,10 +1723,7 @@ msgstr "ë¡œê·¸ì¸ ìŠ¤í¬ë¦½íŠ¸ ëª…ë ¹ '%s' 실패, 서버ì—서는: %s" 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 +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "ì—°ê²° 시간 초과" @@ -1769,31 +1731,23 @@ msgstr "ì—°ê²° 시간 초과" msgid "Server closed the connection" msgstr "서버ì—ì„œ ì—°ê²°ì„ ë‹«ì•˜ìŠµë‹ˆë‹¤" -#: methods/ftp.cc:338 -#: apt-pkg/contrib/fileutl.cc:471 -#: methods/rsh.cc:190 +#: 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 +#: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "ì‘ë‹µì´ ë²„í¼ í¬ê¸°ë¥¼ 넘어갔습니다." -#: methods/ftp.cc:362 -#: methods/ftp.cc:374 +#: 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 +#: 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 +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" msgstr "ì†Œì¼“ì„ ë§Œë“¤ 수 없습니다" @@ -1843,9 +1797,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:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "íŒŒì¼ í•´ì‹±ì— ë¬¸ì œê°€ 있습니다" @@ -1854,8 +1806,7 @@ msgstr "íŒŒì¼ í•´ì‹±ì— ë¬¸ì œê°€ 있습니다" msgid "Unable to fetch file, server said '%s'" msgstr "파ì¼ì„ ê°€ì ¸ì˜¬ 수 없습니다. 서버 왈, '%s'" -#: methods/ftp.cc:892 -#: methods/rsh.cc:322 +#: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "ë°ì´í„° ì†Œì¼“ì— ì œí•œ ì‹œê°„ì´ ì´ˆê³¼í–ˆìŠµë‹ˆë‹¤" @@ -1905,8 +1856,7 @@ msgstr "%s:%sì— ì—°ê²°í• ìˆ˜ 없습니다 (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 -#: methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "%sì— ì—°ê²°í•˜ëŠ” 중입니다" @@ -1941,7 +1891,8 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Optionsì˜ ì¸ìž 목ë¡ì´ 너무 ê¹ë‹ˆë‹¤. 종료하는 중." #: methods/gpgv.cc:198 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: ì„œëª…ì€ ì˜¬ë°”ë¥´ì§€ë§Œ 키 ì§€ë¬¸ì„ í™•ì¸í• 수 없습니다!" #: methods/gpgv.cc:203 @@ -1962,7 +1913,9 @@ msgid "The following signatures were invalid:\n" msgstr "ë‹¤ìŒ ì„œëª…ì´ ì˜¬ë°”ë¥´ì§€ 않습니다:\n" #: methods/gpgv.cc:250 -msgid "The following signatures couldn't be verified because the public key is not available:\n" +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" msgstr "ë‹¤ìŒ ì„œëª…ë“¤ì€ ê³µê°œí‚¤ê°€ 없기 ë•Œë¬¸ì— ì¸ì¦í• 수 없습니다:\n" #: methods/gzip.cc:57 @@ -1988,8 +1941,7 @@ msgstr "í—¤ë” í•œ ì¤„ì— %u개가 넘는 문ìžê°€ 들어 있습니다" msgid "Bad header line" msgstr "í—¤ë” ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤" -#: methods/http.cc:549 -#: methods/http.cc:556 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "HTTP 서버ì—ì„œ ìž˜ëª»ëœ ì‘답 í—¤ë”를 보냈습니다" @@ -2103,8 +2055,7 @@ msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계ì—서만 쓸 수 있습 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 +#: 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ë©ë‹ˆë‹¤" @@ -2134,8 +2085,7 @@ msgstr "%c%s... 완료" 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:106 apt-pkg/contrib/cmndline.cc:114 #: apt-pkg/contrib/cmndline.cc:122 #, c-format msgid "Command line option %s is not understood" @@ -2146,14 +2096,12 @@ msgstr "ëª…ë ¹í–‰ 옵션 '%s' ì˜µì…˜ì„ ì•Œ 수 없습니다" msgid "Command line option %s is not boolean" msgstr "ëª…ë ¹í–‰ 옵션 '%s' ì˜µì…˜ì€ ë¶ˆë¦¬ì–¸ì´ ì•„ë‹™ë‹ˆë‹¤" -#: apt-pkg/contrib/cmndline.cc:166 -#: apt-pkg/contrib/cmndline.cc:187 +#: 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 +#: 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 옵션: ì„¤ì • í•ëª© ì§€ì •ì€ =<ê°’> 형태여야 합니다." @@ -2183,9 +2131,7 @@ msgstr "ìž˜ëª»ëœ ìž‘ì—… %s" 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 +#: 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 ë””ë ‰í† ë¦¬ë¡œ ì´ë™í• 수 없습니다" @@ -2330,8 +2276,7 @@ msgstr "옵션" msgid "extra" msgstr "별ë„" -#: apt-pkg/depcache.cc:61 -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "ì˜ì¡´ì„± 트리를 만드는 중입니다" @@ -2383,8 +2328,7 @@ msgstr "소스 리스트 %2$sì˜ %1$lu번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (dist 파 msgid "Opening %s" msgstr "%s 파ì¼ì„ 여는 중입니다" -#: apt-pkg/sourcelist.cc:220 -#: apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ë„ˆë¬´ ê¹ë‹ˆë‹¤." @@ -2399,16 +2343,21 @@ msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (타입)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 ëª©ë¡ %3$sì˜ %2$u번 ì¤„ì˜ '%1$s' íƒ€ìž…ì„ ì•Œ 수 없습니다" -#: apt-pkg/sourcelist.cc:252 -#: apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$sì˜ %1$u번 ì¤„ì´ ìž˜ëª»ë˜ì—ˆìŠµë‹ˆë‹¤ (ë²¤ë” ID)" #: 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 ì˜µì…˜ì„ ì¼œì‹ì‹œì˜¤." +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 @@ -2417,12 +2366,18 @@ 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 꾸러미를 다시 설치해야 하지만, ì´ ê¾¸ëŸ¬ë¯¸ì˜ ì•„ì¹´ì´ë¸Œë¥¼ ì°¾ì„ ìˆ˜ 없습니다." +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ê°€ ë§ê°€ì¡ŒìŠµë‹ˆë‹¤, ê³ ì • ê¾¸ëŸ¬ë¯¸ë•Œë¬¸ì— ë°œìƒí• ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤." +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." @@ -2463,7 +2418,8 @@ 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 "'%2$s' ë“œë¼ì´ë¸Œì— '%1$s'ë¡œ í‘œê¸°ëœ ë””ìŠ¤í¬ë¥¼ ì‚½ìž…í•˜ê³ ì—”í„°ë¥¼ 눌러주ì‹ì‹œì˜¤." +msgstr "" +"'%2$s' ë“œë¼ì´ë¸Œì— '%1$s'ë¡œ í‘œê¸°ëœ ë””ìŠ¤í¬ë¥¼ ì‚½ìž…í•˜ê³ ì—”í„°ë¥¼ 눌러주ì‹ì‹œì˜¤." #: apt-pkg/init.cc:120 #, c-format @@ -2579,8 +2535,7 @@ msgstr "소스 꾸러미 ëª©ë¡ %sì˜ ì •ë³´ë¥¼ ì½ì„ 수 없습니다" msgid "Collecting File Provides" msgstr "파ì¼ì—ì„œ ì œê³µí•˜ëŠ” ê²ƒì„ ëª¨ìœ¼ëŠ” 중입니다" -#: apt-pkg/pkgcachegen.cc:785 -#: apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" msgstr "소스 ìºì‹œë¥¼ ì €ìž¥í•˜ëŠ” ë° ìž…ì¶œë ¥ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤" @@ -2589,8 +2544,7 @@ msgstr "소스 ìºì‹œë¥¼ ì €ìž¥í•˜ëŠ” ë° ìž…ì¶œë ¥ 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤ msgid "rename failed, %s (%s -> %s)." msgstr "ì´ë¦„ 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 -#: apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5Sumì´ ë§žì§€ 않습니다" @@ -2600,18 +2554,28 @@ msgstr "ë‹¤ìŒ í‚¤ IDì˜ ê³µê°œí‚¤ê°€ 없습니다:\n" #: apt-pkg/acquire-item.cc:753 #, c-format -msgid "I wasn't able to locate a file for the %s package. This might mean you need to manually fix this package. (due to missing arch)" -msgstr "%s ê¾¸ëŸ¬ë¯¸ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ ê³ ì³ì•¼ í• ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. (아키í…ì³ê°€ ë¹ ì¡Œê¸° 때문입니다)" +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: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 "%s ê¾¸ëŸ¬ë¯¸ì˜ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 수ë™ìœ¼ë¡œ ì´ ê¾¸ëŸ¬ë¯¸ë¥¼ ê³ ì³ì•¼ í• ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤." +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:848 #, c-format -msgid "The package index files are corrupted. No Filename: field for package %s." -msgstr "꾸러미 ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤. %s ê¾¸ëŸ¬ë¯¸ì— Filename: 필드가 없습니다." +msgid "" +"The package index files are corrupted. No Filename: field for package %s." +msgstr "" +"꾸러미 ì¸ë±ìŠ¤ 파ì¼ì´ ì†ìƒë˜ì—ˆìŠµë‹ˆë‹¤. %s ê¾¸ëŸ¬ë¯¸ì— Filename: 필드가 없습니다." #: apt-pkg/acquire-item.cc:935 msgid "Size mismatch" @@ -2631,8 +2595,7 @@ msgstr "" "CD-ROM 마운트 위치로 %s 사용\n" "CD-ROMì„ ë§ˆìš´íŠ¸í•˜ëŠ” 중입니다\n" -#: apt-pkg/cdrom.cc:516 -#: apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "알아보는 중입니다.. " @@ -2777,4 +2740,3 @@ msgstr "ì—°ê²°ì´ ë„ˆë¬´ 빨리 ëŠì–´ì¡ŒìŠµë‹ˆë‹¤" #, fuzzy #~ msgid "Could not execute " #~ msgstr "%s ìž ê¸ˆ 파ì¼ì„ ì–»ì„ ìˆ˜ 없습니다" - @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-02-09 10:45+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n" @@ -2304,15 +2304,15 @@ msgstr "valgfri" msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Skaper oversikt over avhengighetsforhold" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versjons-kandidater" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Oppretter avhengighetsforhold" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-02-10 17:35+0100\n" "Last-Translator: Bart Cornelis <cobaco@linux.be>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -2322,15 +2322,15 @@ msgstr "optioneel" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Boom van vereisten wordt opgebouwd" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Kandidaat-versies" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Generatie vereisten" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -2287,15 +2287,15 @@ msgstr "valfri" msgid "extra" msgstr "tillegg" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Byggjer kravtre" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Kandidatversjonar" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Genererer kravforhold" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-01-23 15:32+0100\n" "Last-Translator: Bartosz Fenski <fenio@debian.org>\n" "Language-Team: Polish <pddp@debian.linux.org.pl>\n" @@ -2292,15 +2292,15 @@ msgstr "opcjonalny" msgid "extra" msgstr "dodatkowy" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Budowanie drzewa zale¿no¶ci" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Kandyduj±ce wersje" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Generowanie zale¿no¶ci" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-03-07 22:20+0000\n" "Last-Translator: Rui Az. <astronomy@mail.pt>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -2293,15 +2293,15 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Construindo Ãrvore de Dependências" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versões Candidatas" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Geração de Dependência" diff --git a/po/pt_BR.po b/po/pt_BR.po index 3a51c828b..6a53d25e2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-02-11 17:57-0200\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n" @@ -2294,15 +2294,15 @@ msgstr "opcional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Construindo Árvore de Dependências" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Versões Candidatas" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Geração de Dependência" @@ -230,7 +230,8 @@ msgstr "" #: cmdline/apt-cdrom.cc:78 msgid "Please provide a name for this Disc, such as 'Debian 2.1r1 Disk 1'" -msgstr "Vă rog furnizaÅ£i un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'" +msgstr "" +"Vă rog furnizaÅ£i un nume pentru acest disc, cum ar fi 'Debian 2.1r1 Disk 1'" #: cmdline/apt-cdrom.cc:93 msgid "Please insert a Disc in the drive and press enter" @@ -812,7 +813,8 @@ 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 "Ce ciudat.. Dimensiunile nu se potrivesc, scrieÅ£i la apt@packages.debian.org" +msgstr "" +"Ce ciudat.. Dimensiunile nu se potrivesc, scrieÅ£i la apt@packages.debian.org" #: cmdline/apt-get.cc:821 #, c-format @@ -846,7 +848,8 @@ 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!" @@ -1076,7 +1079,8 @@ msgstr "Terminat" #: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" -msgstr "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" +msgstr "" +"Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" #: cmdline/apt-get.cc:1876 msgid "Must specify at least one package to fetch source for" @@ -1362,14 +1366,17 @@ 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" @@ -1903,7 +1910,8 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Listă de argumente din Acquire::gpgv::Options prea lungă. Ies." #: methods/gpgv.cc:198 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" +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?!" @@ -1915,7 +1923,8 @@ msgstr "Cel puÅ£in o semnătură invalidă a fost întâlnită." #: methods/gpgv.cc:207 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "Nu pot executa '%s' pentru verificarea semnăturii (este instalat gnupg?)" +msgstr "" +"Nu pot executa '%s' pentru verificarea semnăturii (este instalat gnupg?)" #: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" @@ -1998,7 +2007,8 @@ 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" @@ -2063,7 +2073,8 @@ 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 @@ -2119,7 +2130,8 @@ 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 @@ -2382,8 +2394,10 @@ 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 "" @@ -2432,7 +2446,8 @@ msgstr "Metoda %s nu s-a lansat corect" #: apt-pkg/acquire-worker.cc:377 #, c-format msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." -msgstr "Vă rog introduceÅ£i discul numit: '%s' în unitatea '%s' ÅŸi apăsaÅ£i Enter." +msgstr "" +"Vă rog introduceÅ£i discul numit: '%s' în unitatea '%s' ÅŸi apăsaÅ£i Enter." #: apt-pkg/init.cc:120 #, c-format @@ -2460,7 +2475,8 @@ 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" @@ -2522,11 +2538,13 @@ 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 #, c-format @@ -2541,7 +2559,8 @@ 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 @@ -2591,7 +2610,8 @@ msgstr "" #: apt-pkg/acquire-item.cc:848 #, 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." @@ -2697,7 +2717,8 @@ 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 #, c-format @@ -2752,4 +2773,3 @@ msgstr "Åžters complet %s" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Conexiune închisă prematur" - @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-01-21 14:55+0300\n" "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -2326,15 +2326,15 @@ msgstr "необÑзательный" msgid "extra" msgstr "дополнительный" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "ПоÑтроение дерева завиÑимоÑтей" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "ВерÑии-кандидаты" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Генерирование завиÑимоÑтей" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-05-29 15:33+0200\n" "Last-Translator: Peter Mann <Peter.Mann@tuke.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" @@ -2275,15 +2275,15 @@ msgstr "voliteľný" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Vytvára sa strom závislostÃ" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Kandidátske verzie" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Generovanie závislostÃ" @@ -2732,4 +2732,3 @@ msgstr "BalÃk '%s' je úplne odstránený" #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Spojenie bolo predÄasne ukonÄené" - @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Èuhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -2278,15 +2278,15 @@ msgstr "izbirno" msgid "extra" msgstr "dodatno" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Gradnja drevesa odvisnosti" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Razlièice kandidatov" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Ustvarjanje odvisnosti" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-08 11:02+0200\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-05-18 08:35+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -20,12 +20,8 @@ msgstr "" msgid "Package %s version %s has an unmet dep:\n" msgstr "Paket %s version %s har ett beroende som inte kan tillfredsställas:\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: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" @@ -87,8 +83,7 @@ msgstr "Totalt bortkastat utrymme: " msgid "Total space accounted for: " msgstr "Totalt utrymme som kan redogöras för: " -#: cmdline/apt-cache.cc:446 -#: cmdline/apt-cache.cc:1189 +#: cmdline/apt-cache.cc:446 cmdline/apt-cache.cc:1189 #, c-format msgid "Package file %s is out of sync." msgstr "Paketfilen %s är ur synk." @@ -105,8 +100,7 @@ msgstr "Inga paket funna" msgid "Package files:" msgstr "\"Package\"-filer:" -#: cmdline/apt-cache.cc:1469 -#: cmdline/apt-cache.cc:1555 +#: cmdline/apt-cache.cc:1469 cmdline/apt-cache.cc:1555 msgid "Cache is out of sync, can't x-ref a package file" msgstr "Cachen är ur synk, kan inte korsreferera en paketfil" @@ -121,8 +115,7 @@ msgstr "%4i %s\n" msgid "Pinned packages:" msgstr "Fastnålade paket:" -#: cmdline/apt-cache.cc:1494 -#: cmdline/apt-cache.cc:1535 +#: cmdline/apt-cache.cc:1494 cmdline/apt-cache.cc:1535 msgid "(not found)" msgstr "(ej funnen)" @@ -131,8 +124,7 @@ msgstr "(ej funnen)" msgid " Installed: " msgstr " Installerad: " -#: cmdline/apt-cache.cc:1517 -#: cmdline/apt-cache.cc:1525 +#: cmdline/apt-cache.cc:1517 cmdline/apt-cache.cc:1525 msgid "(none)" msgstr "(ingen)" @@ -155,13 +147,9 @@ msgstr " Versionstabell:" msgid " %4i %s\n" msgstr " %4i %s\n" -#: 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:2369 -#: cmdline/apt-sortpkgs.cc:144 +#: 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:2369 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s %s compiled on %s %s\n" msgstr "%s %s för %s %s kompilerad den %s %s\n" @@ -313,8 +301,7 @@ msgstr "" " -c=? Läs denna inställningsfil.\n" " -o=? Ange valfri inställningsflagga. T.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 -#: apt-pkg/pkgcachegen.cc:710 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:710 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -323,17 +310,13 @@ msgstr "Kunde inte skriva till %s" msgid "Cannot get debconf version. Is debconf installed?" msgstr "Kan inte ta reda på debconfs version. Är debconf installerat?" -#: ftparchive/apt-ftparchive.cc:167 -#: ftparchive/apt-ftparchive.cc:341 +#: ftparchive/apt-ftparchive.cc:167 ftparchive/apt-ftparchive.cc:341 msgid "Package extension list is too long" msgstr "Listan över filtillägg för Packages är för lång" -#: 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 +#: 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 "Fel vid behandling av katalogen %s" @@ -492,8 +475,7 @@ msgstr "V: " msgid "E: Errors apply to file " msgstr "F: Felen gäller filen " -#: ftparchive/writer.cc:151 -#: ftparchive/writer.cc:181 +#: ftparchive/writer.cc:151 ftparchive/writer.cc:181 #, c-format msgid "Failed to resolve %s" msgstr "Misslyckades att slå upp %s" @@ -533,12 +515,8 @@ msgstr "*** Misslyckades att länka %s till %s" msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgräns på %sB nådd.\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:266 +#: 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:266 #, c-format msgid "Failed to stat %s" msgstr "Misslyckades att ta status på %s" @@ -548,15 +526,13 @@ msgstr "Misslyckades att ta status på %s" msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:394 -#: ftparchive/writer.cc:603 +#: ftparchive/writer.cc:394 ftparchive/writer.cc:603 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:437 -#: ftparchive/writer.cc:689 +#: ftparchive/writer.cc:437 ftparchive/writer.cc:689 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för %s är %s ej %s\n" @@ -566,38 +542,32 @@ msgstr " ansvarig för %s är %s ej %s\n" msgid "Internal error, could not locate member %s" msgstr "Internt fel, kunde inta hitta delen %s" -#: ftparchive/contents.cc:353 -#: ftparchive/contents.cc:384 +#: ftparchive/contents.cc:353 ftparchive/contents.cc:384 msgid "realloc - Failed to allocate memory" msgstr "realloc - Misslyckades att allokera minne" -#: ftparchive/override.cc:38 -#: ftparchive/override.cc:146 +#: ftparchive/override.cc:38 ftparchive/override.cc:146 #, c-format msgid "Unable to open %s" msgstr "Kunde inte öppna %s" # parametrar: filnamn, radnummer -#: ftparchive/override.cc:64 -#: ftparchive/override.cc:170 +#: ftparchive/override.cc:64 ftparchive/override.cc:170 #, c-format msgid "Malformed override %s line %lu #1" msgstr "Felaktig override %s rad %lu #1" -#: ftparchive/override.cc:78 -#: ftparchive/override.cc:182 +#: ftparchive/override.cc:78 ftparchive/override.cc:182 #, c-format msgid "Malformed override %s line %lu #2" msgstr "Felaktig override %s rad %lu #2" -#: ftparchive/override.cc:92 -#: ftparchive/override.cc:195 +#: ftparchive/override.cc:92 ftparchive/override.cc:195 #, c-format msgid "Malformed override %s line %lu #3" msgstr "Felaktig override %s rad %lu #3" -#: ftparchive/override.cc:131 -#: ftparchive/override.cc:205 +#: ftparchive/override.cc:131 ftparchive/override.cc:205 #, c-format msgid "Failed to read the override file %s" msgstr "Misslyckades att läsa override-filen %s" @@ -613,8 +583,7 @@ msgstr "Okänd komprimeringsalgoritm \"%s\"" msgid "Compressed output %s needs a compression set" msgstr "Komprimerad utdata %s behöver en komprimeringsuppsättning" -#: ftparchive/multicompress.cc:172 -#: methods/rsh.cc:91 +#: ftparchive/multicompress.cc:172 methods/rsh.cc:91 msgid "Failed to create IPC pipe to subprocess" msgstr "Misslyckades att skapa IPC-rör till underprocess" @@ -660,8 +629,7 @@ msgstr "Misslyckades att läsa vid beräkning av MD5" msgid "Problem unlinking %s" msgstr "Problem med att länka ut %s" -#: ftparchive/multicompress.cc:490 -#: apt-inst/extract.cc:188 +#: ftparchive/multicompress.cc:490 apt-inst/extract.cc:188 #, c-format msgid "Failed to rename %s to %s" msgstr "Misslyckades att byta namn på %s till %s" @@ -670,8 +638,7 @@ msgstr "Misslyckades att byta namn på %s till %s" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:142 -#: cmdline/apt-get.cc:1506 +#: cmdline/apt-get.cc:142 cmdline/apt-get.cc:1506 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid tolkning av reguljärt uttryck - %s" @@ -816,8 +783,7 @@ msgstr "Installera dessa paket utan verifiering [j/N]? " msgid "Some packages could not be authenticated" msgstr "Några av paketen kunde inte autentiseras" -#: cmdline/apt-get.cc:711 -#: cmdline/apt-get.cc:858 +#: cmdline/apt-get.cc:711 cmdline/apt-get.cc:858 msgid "There are problems and -y was used without --force-yes" msgstr "Problem har uppstått och -y användes utan --force-yes" @@ -833,22 +799,20 @@ msgstr "Paket måste tas bort men \"Remove\" är inaktiverat." msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:791 -#: cmdline/apt-get.cc:1800 -#: cmdline/apt-get.cc:1833 +#: cmdline/apt-get.cc:791 cmdline/apt-get.cc:1800 cmdline/apt-get.cc:1833 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen." -#: cmdline/apt-get.cc:801 -#: cmdline/apt-get.cc:1881 -#: cmdline/apt-get.cc:2117 +#: 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 "Listan över källor kunde inte läsas." #: cmdline/apt-get.cc:816 msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" -msgstr "Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian.org" +msgstr "" +"Konstigt.. storlekarna stämde inte, skicka e-post till apt@packages.debian." +"org" #: cmdline/apt-get.cc:821 #, c-format @@ -870,8 +834,7 @@ msgstr "Efter uppackning kommer %sB ytterligare diskutrymme användas.\n" msgid "After unpacking %sB disk space will be freed.\n" msgstr "Efter uppackning kommer %sB frigöras på disken.\n" -#: cmdline/apt-get.cc:846 -#: cmdline/apt-get.cc:1971 +#: cmdline/apt-get.cc:846 cmdline/apt-get.cc:1971 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte läsa av ledigt utrymme i %s" @@ -881,8 +844,7 @@ msgstr "Kunde inte läsa av ledigt utrymme i %s" msgid "You don't have enough free space in %s." msgstr "Du har inte tillräckligt ledigt utrymme i %s" -#: cmdline/apt-get.cc:864 -#: cmdline/apt-get.cc:884 +#: cmdline/apt-get.cc:864 cmdline/apt-get.cc:884 msgid "Trivial Only specified but this is not a trivial operation." msgstr "\"Trivial Only\" angavs, men detta är inte en trivial handling." @@ -902,8 +864,7 @@ msgstr "" " ?] " # Visas då man svarar nej -#: cmdline/apt-get.cc:874 -#: cmdline/apt-get.cc:893 +#: cmdline/apt-get.cc:874 cmdline/apt-get.cc:893 msgid "Abort." msgstr "Avbryter." @@ -911,9 +872,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:961 -#: cmdline/apt-get.cc:1365 -#: cmdline/apt-get.cc:2014 +#: 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 "Misslyckades att hämta %s %s\n" @@ -922,14 +881,17 @@ msgstr "Misslyckades att hämta %s %s\n" msgid "Some files failed to download" msgstr "Misslyckades att hämta vissa filer" -#: cmdline/apt-get.cc:980 -#: cmdline/apt-get.cc:2023 +#: cmdline/apt-get.cc:980 cmdline/apt-get.cc:2023 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" #: cmdline/apt-get.cc:986 -msgid "Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?" -msgstr "Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med --fix-missing." +msgid "" +"Unable to fetch some archives, maybe run apt-get update or try with --fix-" +"missing?" +msgstr "" +"Vissa arkiv kunte inte hämtas. Pröva eventuellt \"apt-get update\" eller med " +"--fix-missing." #: cmdline/apt-get.cc:990 msgid "--fix-missing and media swapping is not currently supported" @@ -951,7 +913,8 @@ msgstr "Observera, väljer %s istället för %s\n" #: cmdline/apt-get.cc:1040 #, c-format msgid "Skipping %s, it is already installed and upgrade is not set.\n" -msgstr "Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" +msgstr "" +"Hoppar över %s, det är redan installerat och uppgradering har inte valts.\n" #: cmdline/apt-get.cc:1058 #, c-format @@ -1025,15 +988,18 @@ msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" #: cmdline/apt-get.cc:1384 -msgid "Some index files failed to download, they have been ignored, or old ones used instead." -msgstr "Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla använts istället." +msgid "" +"Some index files failed to download, they have been ignored, or old ones " +"used instead." +msgstr "" +"Vissa indexfiler kunde inte hämtas, de har ignorerats eller så har de gamla " +"använts istället." #: cmdline/apt-get.cc:1403 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1493 -#: cmdline/apt-get.cc:1529 +#: cmdline/apt-get.cc:1493 cmdline/apt-get.cc:1529 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" @@ -1048,8 +1014,12 @@ msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan möjligen rätta detta genom att köra \"apt-get -f install\":" #: cmdline/apt-get.cc:1549 -msgid "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution)." -msgstr "Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket (eller ange en lösning)." +msgid "" +"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " +"solution)." +msgstr "" +"Otillfredsställda beroenden. Försök med \"apt-get -f install\" utan paket " +"(eller ange en lösning)." #: cmdline/apt-get.cc:1561 msgid "" @@ -1097,9 +1067,7 @@ msgstr "Rekommenderade paket:" msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:1698 -#: methods/ftp.cc:702 -#: methods/connect.cc:101 +#: cmdline/apt-get.cc:1698 methods/ftp.cc:702 methods/connect.cc:101 msgid "Failed" msgstr "Misslyckades" @@ -1107,8 +1075,7 @@ msgstr "Misslyckades" msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:1768 -#: cmdline/apt-get.cc:1776 +#: cmdline/apt-get.cc:1768 cmdline/apt-get.cc:1776 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren bröt sönder saker" @@ -1116,8 +1083,7 @@ msgstr "Internt fel, problemlösaren bröt sönder saker" msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange åtminstone ett paket att hämta källkod för" -#: cmdline/apt-get.cc:1906 -#: cmdline/apt-get.cc:2135 +#: cmdline/apt-get.cc:1906 cmdline/apt-get.cc:2135 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" @@ -1191,18 +1157,27 @@ msgstr "%s har inga byggberoenden.\n" #: cmdline/apt-get.cc:2212 #, c-format -msgid "%s dependency for %s cannot be satisfied because the package %s cannot be found" -msgstr "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" +msgid "" +"%s dependency for %s cannot be satisfied because the package %s cannot be " +"found" +msgstr "" +"%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte hittas" #: 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 "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga versioner av paketet %s uppfyller versionskraven" +msgid "" +"%s dependency for %s cannot be satisfied because no available versions of " +"package %s can satisfy version requirements" +msgstr "" +"%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " +"versioner av paketet %s uppfyller versionskraven" #: cmdline/apt-get.cc:2299 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" -msgstr "Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s är för nytt" +msgstr "" +"Misslyckades att uppfylla %s-beroendet för %s: Det installerade paketet %s " +"är för nytt" #: cmdline/apt-get.cc:2324 #, c-format @@ -1375,12 +1350,8 @@ msgstr "" msgid "Bad default setting!" msgstr "Ogiltig standardinställning!" -#: dselect/install:51 -#: dselect/install:83 -#: dselect/install:87 -#: dselect/install:93 -#: dselect/install:104 -#: dselect/update:45 +#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:93 +#: dselect/install:104 dselect/update:45 msgid "Press enter to continue." msgstr "Tryck Enter för att fortsätta." @@ -1400,7 +1371,8 @@ msgid "or errors caused by missing dependencies. This is OK, only the errors" msgstr "saknade beroenden. Detta är okej, bara felen ovanför detta" #: 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 "meddelande är viktiga. Försök rätta dem och [I]nstallera igen" #: dselect/update:30 @@ -1415,8 +1387,7 @@ msgstr "Misslyckades att skapa rör" msgid "Failed to exec gzip " msgstr "Misslyckades att köra gzip" -#: apt-inst/contrib/extracttar.cc:180 -#: apt-inst/contrib/extracttar.cc:206 +#: apt-inst/contrib/extracttar.cc:180 apt-inst/contrib/extracttar.cc:206 msgid "Corrupted archive" msgstr "Fördärvat arkiv" @@ -1437,8 +1408,7 @@ msgstr "Ogiltig arkivsignatur" msgid "Error reading archive member header" msgstr "Misslyckades att läsa huvud för arkivdel" -#: apt-inst/contrib/arfile.cc:93 -#: apt-inst/contrib/arfile.cc:105 +#: apt-inst/contrib/arfile.cc:93 apt-inst/contrib/arfile.cc:105 msgid "Invalid archive member header" msgstr "Ogiltigt arkivdelshuvud" @@ -1482,21 +1452,17 @@ msgstr "Omdirigering %s -> %s inlagd två gånger" msgid "Duplicate conf file %s/%s" msgstr "Duplicerad konfigurationsfil %s/%s" -#: apt-inst/dirstream.cc:45 -#: apt-inst/dirstream.cc:50 -#: apt-inst/dirstream.cc:53 +#: apt-inst/dirstream.cc:45 apt-inst/dirstream.cc:50 apt-inst/dirstream.cc:53 #, c-format msgid "Failed to write file %s" msgstr "Misslyckades att skriva filen %s" -#: apt-inst/dirstream.cc:96 -#: apt-inst/dirstream.cc:104 +#: apt-inst/dirstream.cc:96 apt-inst/dirstream.cc:104 #, c-format msgid "Failed to close file %s" msgstr "Misslyckades att stänga filen %s" -#: apt-inst/extract.cc:96 -#: apt-inst/extract.cc:167 +#: apt-inst/extract.cc:96 apt-inst/extract.cc:167 #, c-format msgid "The path %s is too long" msgstr "Sökvägen %s är för lång" @@ -1516,8 +1482,7 @@ msgstr "Katalogen %s är omdirigerad" msgid "The package is trying to write to the diversion target %s/%s" msgstr "Paketet försöker skriva till omdirigeringsmålet %s/%s" -#: apt-inst/extract.cc:157 -#: apt-inst/extract.cc:300 +#: apt-inst/extract.cc:157 apt-inst/extract.cc:300 msgid "The diversion path is too long" msgstr "Omdirigeringssökvägen är för lång" @@ -1545,12 +1510,9 @@ msgstr "Skriver över paketträff utan version för %s" msgid "File %s/%s overwrites the one in the package %s" msgstr "Filen %s/%s skriver över den i paketet %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 +#: 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 "Kunde inte läsa %s" @@ -1560,14 +1522,12 @@ msgstr "Kunde inte läsa %s" msgid "Unable to stat %s" msgstr "Kunde inte ta status på %s" -#: apt-inst/deb/dpkgdb.cc:55 -#: apt-inst/deb/dpkgdb.cc:61 +#: apt-inst/deb/dpkgdb.cc:55 apt-inst/deb/dpkgdb.cc:61 #, c-format msgid "Failed to remove %s" msgstr "Misslyckades att ta bort %s" -#: apt-inst/deb/dpkgdb.cc:110 -#: apt-inst/deb/dpkgdb.cc:112 +#: apt-inst/deb/dpkgdb.cc:110 apt-inst/deb/dpkgdb.cc:112 #, c-format msgid "Unable to create %s" msgstr "Kunde inte skapa %s" @@ -1582,10 +1542,8 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Katalogerna info och temp måste ligga på samma filsystem" #. 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-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 "Läser paketlistor" @@ -1596,24 +1554,26 @@ msgstr "Läser paketlistor" msgid "Failed to change to the admin dir %sinfo" msgstr "Kunde inte gå till adminkatalogen %sinfo" -#: apt-inst/deb/dpkgdb.cc:201 -#: apt-inst/deb/dpkgdb.cc:355 +#: 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 "Internt fel när namn på Package-fil skulle hämtas" -#: apt-inst/deb/dpkgdb.cc:205 -#: apt-inst/deb/dpkgdb.cc:386 +#: apt-inst/deb/dpkgdb.cc:205 apt-inst/deb/dpkgdb.cc:386 msgid "Reading file listing" msgstr "Läser fillista" #: 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 "Misslyckades att öppna listfilen \"%sinfo/%s\". Om du inte kan återskapa filen, skapa en tom och installera omedelbart om samma version av paketet!" +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 "" +"Misslyckades att öppna listfilen \"%sinfo/%s\". Om du inte kan återskapa " +"filen, skapa en tom och installera omedelbart om samma version av paketet!" -#: apt-inst/deb/dpkgdb.cc:229 -#: apt-inst/deb/dpkgdb.cc:242 +#: apt-inst/deb/dpkgdb.cc:229 apt-inst/deb/dpkgdb.cc:242 #, c-format msgid "Failed reading the list file %sinfo/%s" msgstr "Misslyckades att läsa listfilen %sinfo/%s" @@ -1631,8 +1591,7 @@ msgstr "Misslyckades att öppna omdirigeringsfilen %sdiversions" msgid "The diversion file is corrupted" msgstr "Omdirigeringsfilen är trasig" -#: apt-inst/deb/dpkgdb.cc:331 -#: apt-inst/deb/dpkgdb.cc:336 +#: 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" @@ -1661,8 +1620,7 @@ msgstr "Felaktiv ConfFile-sektion i statusfilen. Offset %lu" msgid "Error parsing MD5. Offset %lu" msgstr "Fel vid tolkning av MD5. Offset %lu" -#: apt-inst/deb/debfile.cc:42 -#: apt-inst/deb/debfile.cc:47 +#: 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 "Detta är inte ett giltigt DEB-arkiv, delen \"%s\" saknas" @@ -1696,8 +1654,12 @@ msgid "Unable to read the cdrom database %s" msgstr "Kunde inte läsa cd-rom-databasen %s" #: 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 "Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan inte användas för att lägga till skivor" +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 "" +"Använd apt-cdrom för att APT ska känna igen denna cd. apt-get update kan " +"inte användas för att lägga till skivor" #: methods/cdrom.cc:131 msgid "Wrong CD-ROM" @@ -1712,22 +1674,16 @@ msgstr "Kunde inte avmontera cd-rom:en i %s, den kanske fortfarande används." msgid "Disk not found." msgstr "Disk ej funnen." -#: methods/cdrom.cc:177 -#: methods/file.cc:79 -#: methods/rsh.cc:264 +#: methods/cdrom.cc:177 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" msgstr "Filen ej funnen" -#: methods/copy.cc:42 -#: methods/gpgv.cc:275 -#: 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 "Kunde inte ta status" -#: methods/copy.cc:79 -#: methods/gpgv.cc:272 -#: methods/gzip.cc:139 +#: methods/copy.cc:79 methods/gpgv.cc:272 methods/gzip.cc:139 msgid "Failed to set modification time" msgstr "Misslyckades sätta modifieringstid" @@ -1748,8 +1704,7 @@ msgstr "Kunde inte ta reda på namn på partner" msgid "Unable to determine the local name" msgstr "Kunde inte ta reda på eget namn" -#: methods/ftp.cc:204 -#: methods/ftp.cc:232 +#: methods/ftp.cc:204 methods/ftp.cc:232 #, c-format msgid "The server refused the connection and said: %s" msgstr "Servern nekade anslutningen och sade: %s" @@ -1765,8 +1720,12 @@ msgid "PASS failed, server said: %s" msgstr "PASS misslyckades, servern sade: %s" #: methods/ftp.cc:237 -msgid "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin is empty." -msgstr "En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::ProxyLogin är tom." +msgid "" +"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin " +"is empty." +msgstr "" +"En mellanserver (proxy) angavs men inget inloggningsskript, Acquire::ftp::" +"ProxyLogin är tom." #: methods/ftp.cc:265 #, c-format @@ -1778,10 +1737,7 @@ msgstr "Inloggningsskriptskommandot \"%s\" misslyckades, servern sade: %s" msgid "TYPE failed, server said: %s" msgstr "TYPE misslyckades, servern sade: %s" -#: methods/ftp.cc:329 -#: methods/ftp.cc:440 -#: methods/rsh.cc:183 -#: methods/rsh.cc:226 +#: methods/ftp.cc:329 methods/ftp.cc:440 methods/rsh.cc:183 methods/rsh.cc:226 msgid "Connection timeout" msgstr "Inget svar på förbindelsen inom tidsgränsen" @@ -1789,31 +1745,23 @@ msgstr "Inget svar på förbindelsen inom tidsgränsen" msgid "Server closed the connection" msgstr "Servern stängde förbindelsen" -#: methods/ftp.cc:338 -#: apt-pkg/contrib/fileutl.cc:471 -#: methods/rsh.cc:190 +#: methods/ftp.cc:338 apt-pkg/contrib/fileutl.cc:471 methods/rsh.cc:190 msgid "Read error" msgstr "Läsfel" -#: methods/ftp.cc:345 -#: methods/rsh.cc:197 +#: methods/ftp.cc:345 methods/rsh.cc:197 msgid "A response overflowed the buffer." msgstr "Ett svar spillde bufferten." -#: methods/ftp.cc:362 -#: methods/ftp.cc:374 +#: methods/ftp.cc:362 methods/ftp.cc:374 msgid "Protocol corruption" msgstr "Protokollet fördärvat" -#: methods/ftp.cc:446 -#: apt-pkg/contrib/fileutl.cc:510 -#: methods/rsh.cc:232 +#: methods/ftp.cc:446 apt-pkg/contrib/fileutl.cc:510 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" -#: methods/ftp.cc:687 -#: methods/ftp.cc:693 -#: methods/ftp.cc:729 +#: methods/ftp.cc:687 methods/ftp.cc:693 methods/ftp.cc:729 msgid "Could not create a socket" msgstr "Kunde inte skapa uttag (socket)" @@ -1863,9 +1811,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgräns" msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutning" -#: methods/ftp.cc:864 -#: methods/http.cc:958 -#: methods/rsh.cc:303 +#: methods/ftp.cc:864 methods/http.cc:958 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1874,8 +1820,7 @@ msgstr "Problem med att lägga filen till hashtabellen" msgid "Unable to fetch file, server said '%s'" msgstr "Kunde inte hämta filen, servern sade \"%s\"" -#: methods/ftp.cc:892 -#: methods/rsh.cc:322 +#: methods/ftp.cc:892 methods/rsh.cc:322 msgid "Data socket timed out" msgstr "Datauttag (socket) fick inte svar inom tidsgräns" @@ -1928,8 +1873,7 @@ msgstr "Kunde inte ansluta till %s:%s (%s)." #. We say this mainly because the pause here is for the #. ssh connection that is still going -#: methods/connect.cc:136 -#: methods/rsh.cc:425 +#: methods/connect.cc:136 methods/rsh.cc:425 #, c-format msgid "Connecting to %s" msgstr "Ansluter till %s" @@ -1965,8 +1909,10 @@ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentslistan från Acquire::gpgv::Options för lång. Avslutar." #: methods/gpgv.cc:198 -msgid "Internal error: Good signature, but could not determine key fingerprint?!" -msgstr "Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" +msgid "" +"Internal error: Good signature, but could not determine key fingerprint?!" +msgstr "" +"Internt fel: Korrekt signatur men kunde inte hitta nyckelns fingeravtryck?!" #: methods/gpgv.cc:203 msgid "At least one invalid signature was encountered." @@ -1975,7 +1921,8 @@ msgstr "Åtminstone en giltig signatur träffades på." #: methods/gpgv.cc:207 #, c-format msgid "Could not execute '%s' to verify signature (is gnupg installed?)" -msgstr "Kunde inte starta \"%s\" för att verifiera signatur (är gnupg installerad?)" +msgstr "" +"Kunde inte starta \"%s\" för att verifiera signatur (är gnupg installerad?)" #: methods/gpgv.cc:212 msgid "Unknown error executing gpgv" @@ -1986,8 +1933,12 @@ msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" #: methods/gpgv.cc:250 -msgid "The following signatures couldn't be verified because the public key is not available:\n" -msgstr "Följande signaturer kunde inte verifieras för att den publika nyckeln inte är tillgänglig:\n" +msgid "" +"The following signatures couldn't be verified because the public key is not " +"available:\n" +msgstr "" +"Följande signaturer kunde inte verifieras för att den publika nyckeln inte " +"är tillgänglig:\n" #: methods/gzip.cc:57 #, c-format @@ -2013,8 +1964,7 @@ msgstr "Fick en ensam huvudrad på %u tecken" msgid "Bad header line" msgstr "Trasig huvudrad" -#: methods/http.cc:549 -#: methods/http.cc:556 +#: methods/http.cc:549 methods/http.cc:556 msgid "The HTTP server sent an invalid reply header" msgstr "Http-servern sände ett ogiltigt svarshuvud" @@ -2128,8 +2078,7 @@ msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån" msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar" -#: apt-pkg/contrib/configuration.cc:695 -#: apt-pkg/contrib/configuration.cc:700 +#: apt-pkg/contrib/configuration.cc:695 apt-pkg/contrib/configuration.cc:700 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad härifrån" @@ -2159,8 +2108,7 @@ msgstr "%c%s... Färdig" msgid "Command line option '%c' [from %s] is not known." msgstr "Kommandoradsflagga \"%c\" [från %s] är ej känd." -#: apt-pkg/contrib/cmndline.cc:106 -#: apt-pkg/contrib/cmndline.cc:114 +#: 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" @@ -2171,14 +2119,12 @@ msgstr "Förstår inte kommandoradsflaggan %s" msgid "Command line option %s is not boolean" msgstr "Kommandoradsflaggan %s är inte boolsk" -#: apt-pkg/contrib/cmndline.cc:166 -#: apt-pkg/contrib/cmndline.cc:187 +#: apt-pkg/contrib/cmndline.cc:166 apt-pkg/contrib/cmndline.cc:187 #, c-format msgid "Option %s requires an argument." msgstr "Flaggan %s kräver ett värde." -#: apt-pkg/contrib/cmndline.cc:201 -#: apt-pkg/contrib/cmndline.cc:207 +#: 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 "Flagga %s: Den angivna konfigurationsposten måste innehålla =<värde>." @@ -2209,9 +2155,7 @@ msgid "Unable to stat the mount point %s" msgstr "Kunde inte ta status på monteringspunkt %s." # Felmeddelande för misslyckad chdir -#: apt-pkg/contrib/cdromutl.cc:149 -#: apt-pkg/acquire.cc:427 -#: apt-pkg/clean.cc:44 +#: 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 "Kunde inte gå till %s" @@ -2359,16 +2303,15 @@ msgstr "valfri" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 -#: apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Bygger beroendeträd" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Kandiderande versioner" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Beroendegenerering" @@ -2412,8 +2355,7 @@ msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:220 -#: apt-pkg/cdrom.cc:426 +#: apt-pkg/sourcelist.cc:220 apt-pkg/cdrom.cc:426 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u för lång i källistan %s." @@ -2428,16 +2370,22 @@ msgstr "Rad %u i källistan %s har fel format (typ)" msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är okänd på rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:252 -#: apt-pkg/sourcelist.cc:255 +#: apt-pkg/sourcelist.cc:252 apt-pkg/sourcelist.cc:255 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" #: 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 "För att genomföra denna installation måste det systemkritiska paketet %s tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. Detta är oftast en dålig idé, men om du verkligen vill göra det kan du aktivera flaggan \"APT::Force-LoopBreak\"." +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 "" +"För att genomföra denna installation måste det systemkritiska paketet %s " +"tillfälligt tas bort på grund av en beroendespiral i Conflicts/Pre-Depends. " +"Detta är oftast en dålig idé, men om du verkligen vill göra det kan du " +"aktivera flaggan \"APT::Force-LoopBreak\"." #: apt-pkg/pkgrecords.cc:37 #, c-format @@ -2446,12 +2394,18 @@ msgstr "Indexfiler av typ \"%s\" stöds inte" #: 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 "Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." +msgid "" +"The package %s needs to be reinstalled, but I can't find an archive for it." +msgstr "" +"Paketet %s måste installeras om, men jag kan inte hitta något arkiv för det." #: apt-pkg/algorithms.cc:1059 -msgid "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by held packages." -msgstr "Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på hållna paket." +msgid "" +"Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " +"held packages." +msgstr "" +"Fel, pkgProblemResolver::Resolve genererade avbrott; detta kan bero på " +"hållna paket." #: apt-pkg/algorithms.cc:1061 msgid "Unable to correct problems, you have held broken packages." @@ -2612,8 +2566,7 @@ msgstr "Kunde inte ta status på källkodspaketlistan %s" msgid "Collecting File Provides" msgstr "Samlar filberoenden" -#: apt-pkg/pkgcachegen.cc:785 -#: apt-pkg/pkgcachegen.cc:792 +#: apt-pkg/pkgcachegen.cc:785 apt-pkg/pkgcachegen.cc:792 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" @@ -2622,8 +2575,7 @@ msgstr "In-/utfel vid lagring av källcache" msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:236 -#: apt-pkg/acquire-item.cc:945 +#: apt-pkg/acquire-item.cc:236 apt-pkg/acquire-item.cc:945 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumma stämmer inte" @@ -2633,17 +2585,26 @@ msgstr "Det finns ingen publik nyckel tillgänglig för följande nyckel-id:n:\n" #: apt-pkg/acquire-item.cc:753 #, c-format -msgid "I wasn't able to locate a file for the %s package. This might mean you need to manually fix this package. (due to missing arch)" -msgstr "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du manuellt måste reparera detta paket (på grund av saknad arkitektur)." +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 "" +"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " +"manuellt måste reparera detta paket (på grund av saknad arkitektur)." #: 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 "Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du manuellt måste reparera detta paket." +msgid "" +"I wasn't able to locate file for the %s package. This might mean you need to " +"manually fix this package." +msgstr "" +"Jag kunde inte lokalisera någon fil för paketet %s. Detta kan betyda att du " +"manuellt måste reparera detta paket." #: apt-pkg/acquire-item.cc:848 #, 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 "Paketindexfilerna är trasiga. Inget \"Filename:\"-fält för paketet %s." #: apt-pkg/acquire-item.cc:935 @@ -2664,8 +2625,7 @@ msgstr "" "Använder cd-rom-monteringspunkt %s\n" "Monterar cd-rom\n" -#: apt-pkg/cdrom.cc:516 -#: apt-pkg/cdrom.cc:598 +#: apt-pkg/cdrom.cc:516 apt-pkg/cdrom.cc:598 msgid "Identifying.. " msgstr "Identifierar.. " @@ -2806,14 +2766,19 @@ msgstr "Förbindelsen stängdes i förtid" #~ msgid "Reading file list" #~ msgstr "Läser fillista" + #~ msgid "Could not execute " #~ msgstr "Kunde inte exekvera " + #~ msgid "Preparing for remove with config %s" #~ msgstr "Förbereder för borttagning med konfiguration %s" + #~ msgid "Removed with config %s" #~ msgstr "Borttagen med konfiguration %s" + #~ msgid "Unknown vendor ID '%s' in line %u of source list %s" #~ msgstr "Okänt leverantörs-id \"%s\" pÃ¥ rad %u i källistan %s" + #~ msgid "" #~ "Some broken packages were found while trying to process build-" #~ "dependencies.\n" @@ -2822,8 +2787,8 @@ msgstr "Förbindelsen stängdes i förtid" #~ "Trasiga paket hittades när byggberoenden behandlades. Du kan " #~ "möjligen\n" #~ "rätta detta genom att köra \"apt-get -f install\"." + #~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs." #~ msgstr "" #~ "Beklagar, men du har inte tillräckligt ledigt utrymme pÃ¥ %s för att " #~ "lagra alla .deb-filerna." - @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\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" @@ -2307,15 +2307,15 @@ msgstr "optional" msgid "extra" msgstr "extra" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "Ginagawa ang puno ng mga dependensiya" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "Bersyong Kandidato" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "Pagbuo ng Dependensiya" diff --git a/po/zh_CN.po b/po/zh_CN.po index f887f3328..789101a74 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.23\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2006-02-22 14:20+1300\n" "Last-Translator: Carlos Z.F. Liu <carlosliu@users.sourceforge.net>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" @@ -2258,15 +2258,15 @@ msgstr "å¯é€‰" msgid "extra" msgstr "é¢å¤–" -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "æ£åœ¨åˆ†æžè½¯ä»¶åŒ…çš„ä¾èµ–å…³ç³»æ ‘" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "候选版本" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "生æˆä¾èµ–关系" diff --git a/po/zh_TW.po b/po/zh_TW.po index 062ce5656..15d5f3cdd 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-05-16 07:33-0500\n" +"POT-Creation-Date: 2006-05-27 13:46+0200\n" "PO-Revision-Date: 2005-02-19 22:24+0800\n" "Last-Translator: Asho Yeh <asho@debian.org.tw>\n" "Language-Team: Chinese/Traditional <zh-l10n@linux.org.tw>\n" @@ -2270,15 +2270,15 @@ msgstr "次è¦" msgid "extra" msgstr "æ·»åŠ " -#: apt-pkg/depcache.cc:60 apt-pkg/depcache.cc:89 +#: apt-pkg/depcache.cc:61 apt-pkg/depcache.cc:90 msgid "Building dependency tree" msgstr "了解套件ä¾å˜é—œä¿‚ä¸" -#: apt-pkg/depcache.cc:61 +#: apt-pkg/depcache.cc:62 msgid "Candidate versions" msgstr "候é¸ç‰ˆæœ¬" -#: apt-pkg/depcache.cc:90 +#: apt-pkg/depcache.cc:91 msgid "Dependency generation" msgstr "產生套件ä¾å˜é—œä¿‚" diff --git a/test/hash.cc b/test/hash.cc index 5334c0331..cfdb4ea9d 100644 --- a/test/hash.cc +++ b/test/hash.cc @@ -1,5 +1,6 @@ #include <apt-pkg/md5.h> #include <apt-pkg/sha1.h> +#include <apt-pkg/sha256.h> #include <apt-pkg/strutl.h> #include <iostream> @@ -57,6 +58,12 @@ int main() "d174ab98d277d9f5a5611c2c9f419d9f"); Test<MD5Summation>("12345678901234567890123456789012345678901234567890123456789012345678901234567890", "57edf4a22be3c955ac49da2e2107b67a"); + + // SHA-256, From FIPS 180-2 + Test<SHA256Summation>("abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", + "248d6a61d20638b8e5c026930c3e6039a33ce45964ff2167f6ecedd419db06c1"); + + return 0; } |